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

vfasl: save relocations if flag is set

Browse Source 
original commit: 23ba508373fbcbe1fcba367bce86f60a54bbf4f1
This commit is contained in:
Matthew Flatt 2019-01-02 15:32:08 -07:00
parent 2b090ef32c
commit 0ac2f40d18
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
c/vfasl.c
View File

@ -247,10 +247,10 @@ ptr S_vfasl(ptr bv, void *stream, iptr offset, iptr input_len)
for (s = 0; s < vspaces_count; s++) { for (s = 0; s < vspaces_count; s++) {
uptr sz = vspace_offsets[s+1] - vspace_offsets[s]; uptr sz = vspace_offsets[s+1] - vspace_offsets[s];
if (sz > 0) { if (sz > 0) {
if (s == vspace_reloc) { if ((s == vspace_reloc) && !S_G.retain_static_relocation) {
thread_find_room(tc, typemod, sz, vspaces[s]); thread_find_room(tc, typemod, sz, vspaces[s])
} else { } else {
find_room(vspace_spaces[s], static_generation, typemod, sz, vspaces[s]); find_room(vspace_spaces[s], static_generation, typemod, sz, vspaces[s])
} }
if (S_fasl_stream_read(stream, vspaces[s], sz) < 0) if (S_fasl_stream_read(stream, vspaces[s], sz) < 0)
S_error("fasl-read", "input truncated"); S_error("fasl-read", "input truncated");
@ -264,12 +264,12 @@ ptr S_vfasl(ptr bv, void *stream, iptr offset, iptr input_len)
data = (ptr)0; /* => initialize below */ data = (ptr)0; /* => initialize below */
to_static = 1; to_static = 1;
} else { } else {
thread_find_room(tc, typemod, header.data_size, data); thread_find_room(tc, typemod, header.data_size, data)
if (S_fasl_stream_read(stream, data, header.data_size) < 0) if (S_fasl_stream_read(stream, data, header.data_size) < 0)
S_error("fasl-read", "input truncated"); S_error("fasl-read", "input truncated");
} }
thread_find_room(tc, typemod, ptr_align(header.table_size), table); thread_find_room(tc, typemod, ptr_align(header.table_size), table)
if (S_fasl_stream_read(stream, table, header.table_size) < 0) if (S_fasl_stream_read(stream, table, header.table_size) < 0)
S_error("fasl-read", "input truncated"); S_error("fasl-read", "input truncated");
} }
@ -1419,7 +1419,7 @@ static void relink_code(ptr co, ptr sym_base, ptr *vspaces, uptr *vspace_offsets
t = CODERELOC(co); t = CODERELOC(co);
t = ptr_add(vspaces[vspace_reloc], (uptr)t - vspace_offsets[vspace_reloc]); t = ptr_add(vspaces[vspace_reloc], (uptr)t - vspace_offsets[vspace_reloc]);
if (to_static) if (to_static && !S_G.retain_static_relocation)
CODERELOC(co) = (ptr)0; CODERELOC(co) = (ptr)0;
else { else {
CODERELOC(co) = t; CODERELOC(co) = t;
@ -1667,7 +1667,7 @@ static ptr vfasl_hash_table_ref(vfasl_hash_table *ht, ptr key) {
static ptr vfasl_malloc(uptr sz) { static ptr vfasl_malloc(uptr sz) {
ptr tc = get_thread_context(); ptr tc = get_thread_context();
ptr p; ptr p;
thread_find_room(tc, typemod, ptr_align(sz), p); thread_find_room(tc, typemod, ptr_align(sz), p)
return p; return p;
} }