Thanks to visit codestin.com
Credit goes to github.com

Skip to content

[llvm] Make GOT a typed struct #13803

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alexanderkyte merged 1 commit into from
Apr 5, 2019
Merged

[llvm] Make GOT a typed struct #13803

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 46 additions & 8 deletions mono/mini/mini-llvm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@ typedef struct {
GHashTable *objc_selector_to_var;
GPtrArray *cfgs;
int unbox_tramp_num, unbox_tramp_elemsize;
GHashTable *got_idx_to_type;
} MonoLLVMModule;

/*
Expand Down Expand Up @@ -1651,6 +1652,25 @@ get_aotconst_name (MonoJumpInfoType type, gconstpointer data, int got_offset)
return name;
}

static int
compute_aot_got_offset (MonoLLVMModule *module, MonoJumpInfo *ji, LLVMTypeRef llvm_type)
{
guint32 got_offset = mono_aot_get_got_offset (ji);

LLVMTypeRef lookup_type = (LLVMTypeRef) g_hash_table_lookup (module->got_idx_to_type, GINT_TO_POINTER (got_offset));

if (!lookup_type) {
lookup_type = llvm_type;
} else if (llvm_type != lookup_type) {
lookup_type = module->ptr_type;
} else {
return got_offset;
}

g_hash_table_insert (module->got_idx_to_type, GINT_TO_POINTER (got_offset), lookup_type);
return got_offset;
}

static LLVMValueRef
get_aotconst_typed (EmitContext *ctx, MonoJumpInfoType type, gconstpointer data, LLVMTypeRef llvm_type)
{
Expand All @@ -1672,7 +1692,7 @@ get_aotconst_typed (EmitContext *ctx, MonoJumpInfoType type, gconstpointer data,
ji->next = cfg->patch_info;
cfg->patch_info = ji;

got_offset = mono_aot_get_got_offset (cfg->patch_info);
got_offset = compute_aot_got_offset (ctx->module, cfg->patch_info, llvm_type);
ctx->module->max_got_offset = MAX (ctx->module->max_got_offset, got_offset);
/*
* If the got slot is shared, it means its initialized when the aot image is loaded, so we don't need to
Expand Down Expand Up @@ -2927,7 +2947,7 @@ emit_init_icall_wrapper (MonoLLVMModule *module, MonoAotInitSubtype subtype)
ji = g_new0 (MonoJumpInfo, 1);
ji->type = MONO_PATCH_INFO_AOT_MODULE;
ji = mono_aot_patch_info_dup (ji);
got_offset = mono_aot_get_got_offset (ji);
got_offset = compute_aot_got_offset (module, ji, IntPtrType ());
module->max_got_offset = MAX (module->max_got_offset, got_offset);
indexes [0] = LLVMConstInt (LLVMInt32Type (), 0, FALSE);
indexes [1] = LLVMConstInt (LLVMInt32Type (), got_offset, FALSE);
Expand All @@ -2941,7 +2961,7 @@ emit_init_icall_wrapper (MonoLLVMModule *module, MonoAotInitSubtype subtype)
ji->type = MONO_PATCH_INFO_JIT_ICALL;
ji->data.name = icall_name;
ji = mono_aot_patch_info_dup (ji);
got_offset = mono_aot_get_got_offset (ji);
got_offset = compute_aot_got_offset (module, ji, sig);
module->max_got_offset = MAX (module->max_got_offset, got_offset);
indexes [0] = LLVMConstInt (LLVMInt32Type (), 0, FALSE);
indexes [1] = LLVMConstInt (LLVMInt32Type (), got_offset, FALSE);
Expand Down Expand Up @@ -3023,7 +3043,7 @@ emit_gc_safepoint_poll (MonoLLVMModule *module)
ji = g_new0 (MonoJumpInfo, 1);
ji->type = MONO_PATCH_INFO_GC_SAFE_POINT_FLAG;
ji = mono_aot_patch_info_dup (ji);
got_offset = mono_aot_get_got_offset (ji);
got_offset = compute_aot_got_offset (module, ji, IntPtrType ());
module->max_got_offset = MAX (module->max_got_offset, got_offset);
indexes [0] = LLVMConstInt (LLVMInt32Type (), 0, FALSE);
indexes [1] = LLVMConstInt (LLVMInt32Type (), got_offset, FALSE);
Expand All @@ -3041,7 +3061,7 @@ emit_gc_safepoint_poll (MonoLLVMModule *module)
ji->type = MONO_PATCH_INFO_JIT_ICALL;
ji->data.name = "mono_threads_state_poll";
ji = mono_aot_patch_info_dup (ji);
got_offset = mono_aot_get_got_offset (ji);
got_offset = compute_aot_got_offset (module, ji, sig);
module->max_got_offset = MAX (module->max_got_offset, got_offset);
indexes [0] = LLVMConstInt (LLVMInt32Type (), 0, FALSE);
indexes [1] = LLVMConstInt (LLVMInt32Type (), got_offset, FALSE);
Expand Down Expand Up @@ -5803,7 +5823,8 @@ process_bb (EmitContext *ctx, MonoBasicBlock *bb)
cfg->patch_info = ji;

//mono_add_patch_info (cfg, 0, (MonoJumpInfoType)ins->inst_i1, ins->inst_p0);
got_offset = mono_aot_get_got_offset (cfg->patch_info);
got_offset = compute_aot_got_offset (ctx->module, cfg->patch_info, NULL);

ctx->module->max_got_offset = MAX (ctx->module->max_got_offset, got_offset);
if (!mono_aot_is_shared_got_offset (got_offset)) {
//mono_print_ji (ji);
Expand Down Expand Up @@ -9212,6 +9233,7 @@ mono_llvm_create_aot_module (MonoAssembly *assembly, const char *global_prefix,
LLVMTypeRef got_type = LLVMArrayType (module->ptr_type, 0);

module->got_var = LLVMAddGlobal (module->lmodule, got_type, "mono_dummy_got");
module->got_idx_to_type = g_hash_table_new (NULL, NULL);
LLVMSetInitializer (module->got_var, LLVMConstNull (got_type));
}

Expand Down Expand Up @@ -9295,7 +9317,8 @@ mono_llvm_fixup_aot_module (void)
mono_llvm_replace_uses_of (placeholder, lmethod);
g_hash_table_insert (patches_to_null, site->ji, site->ji);
} else {
int got_offset = mono_aot_get_got_offset (site->ji);
int got_offset = compute_aot_got_offset (module, site->ji, site->type);

module->max_got_offset = MAX (module->max_got_offset, got_offset);

LLVMBuilderRef builder = LLVMCreateBuilder ();
Expand Down Expand Up @@ -9639,8 +9662,23 @@ mono_llvm_emit_aot_module (const char *filename, const char *cu_name)
* Create the real got variable and replace all uses of the dummy variable with
* the real one.
*/
got_type = LLVMArrayType (module->ptr_type, module->max_got_offset + 1);
int size = module->max_got_offset + 1;
LLVMTypeRef *members = g_malloc0 (sizeof (LLVMValueRef) * size);
for (int i = 0; i < size; i++) {
LLVMTypeRef lookup_type = NULL;

lookup_type = g_hash_table_lookup (module->got_idx_to_type, GINT_TO_POINTER (i));

if (!lookup_type)
lookup_type = module->ptr_type;

members [i] = LLVMPointerType (lookup_type, 0);
}

got_type = LLVMStructCreateNamed (module->context, g_strdup_printf ("MONO_GOT_%s", cu_name));
LLVMStructSetBody (got_type, members, size, FALSE);
real_got = LLVMAddGlobal (module->lmodule, got_type, module->got_symbol);

LLVMSetInitializer (real_got, LLVMConstNull (got_type));
if (module->external_symbols) {
LLVMSetLinkage (real_got, LLVMExternalLinkage);
Expand Down