Skip to content

Commit a6a0ca7

Browse files
committed
Cleanup #2
1 parent be5c83c commit a6a0ca7

File tree

2 files changed

+17
-12
lines changed

2 files changed

+17
-12
lines changed

src/aotcompile.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,6 @@ typedef struct {
9494
std::map<jl_code_instance_t*, std::tuple<uint32_t, uint32_t>> jl_fvar_map;
9595
std::vector<void*> jl_value_to_llvm;
9696
std::vector<jl_code_instance_t*> jl_external_to_llvm;
97-
int32_t external_fns_begin;
9897
} jl_native_code_desc_t;
9998

10099
extern "C" JL_DLLEXPORT

src/staticdata.c

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1781,9 +1781,10 @@ static void jl_update_all_fptrs(jl_serializer_state *s)
17811781
jl_register_fptrs(sysimage_base, &fvars, linfos, sysimg_fvars_max);
17821782
}
17831783

1784-
static void write_gvars(jl_serializer_state *s, arraylist_t *globals) JL_NOTSAFEPOINT
1784+
static uint32_t write_gvars(jl_serializer_state *s, arraylist_t *globals, arraylist_t *external_fns) JL_NOTSAFEPOINT
17851785
{
1786-
ios_ensureroom(s->gvar_record, globals->len * sizeof(reloc_t));
1786+
size_t len = globals->len + external_fns->leng
1787+
ios_ensureroom(s->gvar_record, len * sizeof(reloc_t));
17871788
for (size_t i = 0; i < globals->len; i++) {
17881789
void *g = globals->items[i];
17891790
void *b = ptrhash_get(&bindings, g);
@@ -1796,10 +1797,17 @@ static void write_gvars(jl_serializer_state *s, arraylist_t *globals) JL_NOTSAFE
17961797
uintptr_t reloc = get_reloc_for_item(item, 0);
17971798
write_reloc_t(s->gvar_record, reloc);
17981799
}
1800+
for (size_t i = 0; i < external_fns->len; i++) {
1801+
jl_codeinstance_t *ci = external_fns->items[i];
1802+
uintptr_t item = backref_id(s, (void*)ci, s->link_ids_external_fnvars);
1803+
uintptr_t reloc = get_reloc_for_item(item, 0);
1804+
write_reloc_t(s->gvar_record, reloc);
1805+
}
1806+
return globals->len + 1;
17991807
}
18001808

18011809
// Pointer relocation for native-code referenced global variables
1802-
static void jl_update_all_gvars(jl_serializer_state *s, int32_t external_fns_begin)
1810+
static void jl_update_all_gvars(jl_serializer_state *s, uint32_t external_fns_begin)
18031811
{
18041812
if (sysimg_gvars_base == NULL)
18051813
return;
@@ -1820,10 +1828,9 @@ static void jl_update_all_gvars(jl_serializer_state *s, int32_t external_fns_beg
18201828
}
18211829
else {
18221830
uintptr_t v = get_item_for_reloc(s, base, size, offset, s->link_ids_external_fnvars, &external_fns_link_index);
1823-
jl_breakpoint((jl_value_t*)v);
18241831
jl_code_instance_t *codeinst = (jl_code_instance_t*) v;
1825-
// TODO: use side-table to decide if call location is specsig or not instead of assuming
1826-
*sysimg_gvars(sysimg_gvars_base, gvname_index) = codeinst->isspecsig ? codeinst->specptr.fptr : codeinst->invoke;
1832+
assert(codeinst->isspecsig);
1833+
*sysimg_gvars(sysimg_gvars_base, gvname_index) = codeinst->specptr.fptr;
18271834
}
18281835
}
18291836
gvname_index += 1;
@@ -2315,12 +2322,12 @@ static void jl_save_system_image_to_stream(ios_t *f,
23152322
}
23162323
}
23172324

2325+
uint32_t external_fns_begin = 0;
23182326
{ // step 2: build all the sysimg sections
23192327
write_padding(&sysimg, sizeof(uintptr_t));
23202328
jl_write_values(&s);
23212329
jl_write_relocations(&s);
2322-
write_gvars(&s, &gvars);
2323-
// TODO write external_fns;
2330+
external_fns_begin = write_gvars(&s, &gvars, &external_fns);
23242331
}
23252332

23262333
if (sysimg.size > ((uintptr_t)1 << RELOC_TAG_OFFSET)) {
@@ -2421,9 +2428,7 @@ static void jl_save_system_image_to_stream(ios_t *f,
24212428
ios_write(f, (char*)jl_array_data(s.link_ids_gvars), jl_array_len(s.link_ids_gvars)*sizeof(uint64_t));
24222429
write_uint32(f, jl_array_len(s.link_ids_external_fnvars));
24232430
ios_write(f, (char*)jl_array_data(s.link_ids_external_fnvars), jl_array_len(s.link_ids_external_fnvars)*sizeof(uint64_t));
2424-
// write the gvar boundary between global variables and external functions
2425-
write_int32(f, jl_get_llvm_external_fns_begin(native_functions));
2426-
2431+
write_uint32(f, external_fns_begin);
24272432
jl_write_arraylist(s.s, &s.ccallable_list);
24282433
}
24292434
// Write the build_id key
@@ -2441,6 +2446,7 @@ static void jl_save_system_image_to_stream(ios_t *f,
24412446
arraylist_free(&s.relocs_list);
24422447
arraylist_free(&s.gctags_list);
24432448
arraylist_free(&gvars);
2449+
arraylist_free(&external_fns);
24442450
htable_free(&field_replace);
24452451
if (worklist)
24462452
htable_free(&external_objects);

0 commit comments

Comments
 (0)