suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vfasl repair: terminate segments as needed

Browse Source 
When starting a new segment to keep an object on a single segment,
terminate the old one with e forwarding marker.

original commit: 1f1db6d3d2cd930455a3592f2d76a465b30a5592
This commit is contained in:
Matthew Flatt 2019-01-01 15:40:09 -07:00
parent e97b763478
commit 2b090ef32c
1 changed files with 31 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
c/vfasl.c
View File

@ -286,31 +286,32 @@ ptr S_vfasl(ptr bv, void *stream, iptr offset, iptr input_len)
bm = ptr_add(singletonrefs, header.singletonref_count * sizeof(vfoff)); bm = ptr_add(singletonrefs, header.singletonref_count * sizeof(vfoff));
bm_end = ptr_add(table, header.table_size); bm_end = ptr_add(table, header.table_size);
if (0) #if 0
printf("\n" printf("\n"
"hdr %ld\n" "hdr %ld\n"
"syms %ld\n" "syms %ld\n"
"rtds %ld\n" "rtds %ld\n"
"clos %ld\n" "clos %ld\n"
"code %ld\n" "code %ld\n"
"rloc %ld\n" "rloc %ld\n"
"data %ld\n" "data %ld\n"
"othr %ld\n" "othr %ld\n"
"tabl %ld symref %ld rtdref %ld sglref %ld\n", "tabl %ld symref %ld rtdref %ld sglref %ld\n",
sizeof(vfasl_header), sizeof(vfasl_header),
VSPACE_LENGTH(vspace_symbol), VSPACE_LENGTH(vspace_symbol),
VSPACE_LENGTH(vspace_rtd), VSPACE_LENGTH(vspace_rtd),
VSPACE_LENGTH(vspace_closure), VSPACE_LENGTH(vspace_closure),
VSPACE_LENGTH(vspace_code), VSPACE_LENGTH(vspace_code),
VSPACE_LENGTH(vspace_reloc), VSPACE_LENGTH(vspace_reloc),
VSPACE_LENGTH(vspace_data), VSPACE_LENGTH(vspace_data),
(VSPACE_LENGTH(vspace_impure) (VSPACE_LENGTH(vspace_impure)
+ VSPACE_LENGTH(vspace_pure_typed) + VSPACE_LENGTH(vspace_pure_typed)
+ VSPACE_LENGTH(vspace_impure_record)), + VSPACE_LENGTH(vspace_impure_record)),
header.table_size, header.table_size,
header.symref_count * sizeof(vfoff), header.symref_count * sizeof(vfoff),
header.rtdref_count * sizeof(vfoff), header.rtdref_count * sizeof(vfoff),
header.singletonref_count * sizeof(vfoff)); header.singletonref_count * sizeof(vfoff));
#endif
/* We have to convert an offset relative to the start of data in the /* We have to convert an offset relative to the start of data in the
vfasl format to an offset relative to an individual space, at vfasl format to an offset relative to an individual space, at
@ -897,7 +898,6 @@ static ptr vfasl_find_room(vfasl_info *vfi, int s, ITYPE t, iptr n) {
switch (s) { switch (s) {
case vspace_symbol: case vspace_symbol:
case vspace_pure_typed:
case vspace_impure_record: case vspace_impure_record:
/* For these spaces, in case they will be loaded into the static /* For these spaces, in case they will be loaded into the static
generation, objects must satisfy an extra constraint: an object generation, objects must satisfy an extra constraint: an object
@ -914,12 +914,16 @@ static ptr vfasl_find_room(vfasl_info *vfi, int s, ITYPE t, iptr n) {
vfi->spaces[s].total_bytes += delta; vfi->spaces[s].total_bytes += delta;
/* Mark the end of the old segment */
c = vfi->spaces[s].first;
p = ptr_add(c->bytes, c->used);
FWDMARKER(p) = forward_marker;
/* Create a new chunk so the old one tracks the current /* Create a new chunk so the old one tracks the current
swept-to-used region, and the new chunk starts a new swept-to-used region, and the new chunk starts a new
segment. If the old chunk doesn't have leftover bytes segment. If the old chunk doesn't have leftover bytes
(because we're in the first pass), then we'll need to (because we're in the first pass), then we'll need to
clean out this useless chunk below. */ clean out this useless chunk below. */
c = vfi->spaces[s].first;
new_c = vfasl_malloc(sizeof(vfasl_chunk)); new_c = vfasl_malloc(sizeof(vfasl_chunk));
new_c->bytes = ptr_add(c->bytes, c->used + delta); new_c->bytes = ptr_add(c->bytes, c->used + delta);
new_c->length = c->length - (c->used + delta); new_c->length = c->length - (c->used + delta);