typedef struct MonoAotOptions {
char *outfile;
+ char *llvm_outfile;
gboolean save_temps;
gboolean write_symbols;
gboolean metadata_only;
int jit_time, gen_time, link_time;
} MonoAotStats;
+typedef struct GotInfo {
+ GHashTable *patch_to_got_offset;
+ GHashTable **patch_to_got_offset_by_type;
+ GPtrArray *got_patches;
+} GotInfo;
+
typedef struct MonoAotCompile {
MonoImage *image;
GPtrArray *methods;
int cfgs_size;
GHashTable **patch_to_plt_entry;
GHashTable *plt_offset_to_entry;
- GHashTable *patch_to_got_offset;
- GHashTable **patch_to_got_offset_by_type;
- GPtrArray *got_patches;
+ //GHashTable *patch_to_got_offset;
+ //GHashTable **patch_to_got_offset_by_type;
+ //GPtrArray *got_patches;
+ GotInfo got_info, llvm_got_info;
GHashTable *image_hash;
GHashTable *method_to_cfg;
GHashTable *token_info_hash;
/* Maps MonoMethod* -> blob offset */
GHashTable *method_blob_hash;
guint32 *plt_got_info_offsets;
- guint32 got_offset, plt_offset, plt_got_offset_base;
- guint32 final_got_size;
+ guint32 got_offset, llvm_got_offset, plt_offset, plt_got_offset_base;
/* Number of GOT entries reserved for trampolines */
guint32 num_trampoline_got_entries;
guint32 tramp_page_size;
mono_mutex_t mutex;
gboolean use_bin_writer;
gboolean gas_line_numbers;
+ /* Whenever to emit LLVM code into a separate object file */
gboolean llvm_separate;
+ /* Whenever to emit an object file directly from llc */
+ gboolean llvm_owriter;
MonoImageWriter *w;
MonoDwarfWriter *dwarf;
FILE *fp;
GPtrArray *unwind_ops;
guint32 unwind_info_offset;
char *got_symbol_base;
+ char *llvm_got_symbol_base;
char *got_symbol;
+ char *llvm_got_symbol;
char *plt_symbol;
char *methods_symbol;
+ char *llvm_eh_frame_symbol;
GHashTable *method_label_hash;
const char *temp_prefix;
const char *user_symbol_prefix;
/* We clobber ECX, since EAX is used as MONO_ARCH_MONITOR_OBJECT_REG */
#ifdef MONO_ARCH_MONITOR_OBJECT_REG
g_assert (MONO_ARCH_MONITOR_OBJECT_REG != X86_ECX);
+#ifdef MONO_ARCH_MONITOR_LOCK_TAKEN_REG
+ g_assert (MONO_ARCH_MONITOR_LOCK_TAKEN_REG != X86_ECX);
+#endif
#endif
code = buf;
case MONO_PATCH_INFO_RGCTX_FETCH:
case MONO_PATCH_INFO_GENERIC_CLASS_INIT:
case MONO_PATCH_INFO_MONITOR_ENTER:
+ case MONO_PATCH_INFO_MONITOR_ENTER_V4:
case MONO_PATCH_INFO_MONITOR_EXIT:
case MONO_PATCH_INFO_LLVM_IMT_TRAMPOLINE:
return TRUE;
acfg->patch_to_plt_entry [patch_info->type] = g_hash_table_new (mono_patch_info_hash, mono_patch_info_equal);
res = g_hash_table_lookup (acfg->patch_to_plt_entry [patch_info->type], patch_info);
- // FIXME: This breaks the calculation of final_got_size
if (!acfg->llvm && patch_info->type == MONO_PATCH_INFO_METHOD && (patch_info->data.method->iflags & METHOD_IMPL_ATTRIBUTE_SYNCHRONIZED)) {
/*
* Allocate a separate PLT slot for each such patch, since some plt
if (!res) {
MonoJumpInfo *new_ji;
- g_assert (!acfg->final_got_size);
-
new_ji = mono_patch_info_dup_mp (acfg->mempool, patch_info);
res = mono_mempool_alloc0 (acfg->mempool, sizeof (MonoPltEntry));
* JI could be found if it exists, otherwise allocates a new one.
*/
static guint32
-get_got_offset (MonoAotCompile *acfg, MonoJumpInfo *ji)
+get_got_offset (MonoAotCompile *acfg, gboolean llvm, MonoJumpInfo *ji)
{
guint32 got_offset;
+ GotInfo *info = llvm ? &acfg->llvm_got_info : &acfg->got_info;
- got_offset = GPOINTER_TO_UINT (g_hash_table_lookup (acfg->patch_to_got_offset_by_type [ji->type], ji));
+ got_offset = GPOINTER_TO_UINT (g_hash_table_lookup (info->patch_to_got_offset_by_type [ji->type], ji));
if (got_offset)
return got_offset - 1;
- got_offset = acfg->got_offset;
- acfg->got_offset ++;
-
- if (acfg->final_got_size)
- g_assert (got_offset < acfg->final_got_size);
+ if (llvm) {
+ got_offset = acfg->llvm_got_offset;
+ acfg->llvm_got_offset ++;
+ } else {
+ got_offset = acfg->got_offset;
+ acfg->got_offset ++;
+ }
acfg->stats.got_slots ++;
acfg->stats.got_slot_types [ji->type] ++;
- g_hash_table_insert (acfg->patch_to_got_offset, ji, GUINT_TO_POINTER (got_offset + 1));
- g_hash_table_insert (acfg->patch_to_got_offset_by_type [ji->type], ji, GUINT_TO_POINTER (got_offset + 1));
- g_ptr_array_add (acfg->got_patches, ji);
+ g_hash_table_insert (info->patch_to_got_offset, ji, GUINT_TO_POINTER (got_offset + 1));
+ g_hash_table_insert (info->patch_to_got_offset_by_type [ji->type], ji, GUINT_TO_POINTER (got_offset + 1));
+ g_ptr_array_add (info->got_patches, ji);
return got_offset;
}
}
if (strcmp (acfg->image->assembly->aname.name, "mscorlib") == 0) {
- MonoMethodDesc *desc;
- MonoMethod *orig_method;
int nallocators;
/* Runtime invoke wrappers */
if (m)
add_method (acfg, m);
}
-
- /* Monitor Enter/Exit */
- desc = mono_method_desc_new ("Monitor:Enter(object,bool&)", FALSE);
- orig_method = mono_method_desc_search_in_class (desc, mono_defaults.monitor_class);
- /* This is a v4 method */
- if (orig_method) {
- method = mono_monitor_get_fast_path (orig_method);
- if (method)
- add_method (acfg, method);
- }
- mono_method_desc_free (desc);
-
- desc = mono_method_desc_new ("Monitor:Exit(object)", FALSE);
- orig_method = mono_method_desc_search_in_class (desc, mono_defaults.monitor_class);
- g_assert (orig_method);
- mono_method_desc_free (desc);
- method = mono_monitor_get_fast_path (orig_method);
- if (method)
- add_method (acfg, method);
}
/* Stelemref wrappers */
/* isinst_with_check wrapper */
add_method (acfg, mono_marshal_get_isinst_with_cache ());
-#if defined(MONO_ARCH_ENABLE_MONITOR_IL_FASTPATH)
- {
- MonoMethodDesc *desc;
- MonoMethod *m;
-
- desc = mono_method_desc_new ("Monitor:Enter(object,bool&)", FALSE);
- m = mono_method_desc_search_in_class (desc, mono_defaults.monitor_class);
- mono_method_desc_free (desc);
- if (m) {
- m = mono_monitor_get_fast_path (m);
- if (m)
- add_method (acfg, m);
- }
- }
-#endif
-
/* JIT icall wrappers */
/* FIXME: locking - this is "safe" as full-AOT threads don't mutate the icall hash*/
g_hash_table_foreach (mono_get_jit_icall_info (), add_jit_icall_wrapper, acfg);
} else {
int code_size;
- got_slot = get_got_offset (acfg, patch_info);
+ got_slot = get_got_offset (acfg, FALSE, patch_info);
arch_emit_got_access (acfg, code + i, got_slot, &code_size);
i += code_size - INST_LEN;
}
case MONO_PATCH_INFO_GENERIC_CLASS_INIT:
case MONO_PATCH_INFO_MONITOR_ENTER:
+ case MONO_PATCH_INFO_MONITOR_ENTER_V4:
case MONO_PATCH_INFO_MONITOR_EXIT:
case MONO_PATCH_INFO_SEQ_POINT_INFO:
break;
}
static void
-encode_patch_list (MonoAotCompile *acfg, GPtrArray *patches, int n_patches, int first_got_offset, guint8 *buf, guint8 **endbuf)
+encode_patch_list (MonoAotCompile *acfg, GPtrArray *patches, int n_patches, gboolean llvm, int first_got_offset, guint8 *buf, guint8 **endbuf)
{
guint8 *p = buf;
guint32 pindex, offset;
/* Nothing to do */
continue;
- offset = get_got_offset (acfg, patch_info);
+ offset = get_got_offset (acfg, llvm, patch_info);
encode_value (offset, p, &p);
}
if (n_patches)
g_assert (cfg->has_got_slots);
- encode_patch_list (acfg, patches, n_patches, first_got_offset, p, &p);
+ encode_patch_list (acfg, patches, n_patches, cfg->compile_llvm, first_got_offset, p, &p);
acfg->stats.info_size += p - buf;
{
char *debug_sym = NULL;
char *s;
+ char *prefix;
+
+ if (acfg->llvm_separate && llvm_acfg->aot_opts.static_link) {
+ /* Need to add a prefix to create unique symbols */
+ prefix = g_strdup_printf ("plt_%s_", acfg->assembly_name_sym);
+ } else {
+ prefix = g_strdup ("plt_");
+ }
switch (ji->type) {
case MONO_PATCH_INFO_METHOD:
- debug_sym = get_debug_sym (ji->data.method, "plt_", cache);
+ debug_sym = get_debug_sym (ji->data.method, prefix, cache);
break;
case MONO_PATCH_INFO_INTERNAL_METHOD:
- debug_sym = g_strdup_printf ("plt__jit_icall_%s", ji->data.name);
+ debug_sym = g_strdup_printf ("%s_jit_icall_%s", prefix, ji->data.name);
break;
case MONO_PATCH_INFO_CLASS_INIT:
s = mono_type_get_name (&ji->data.klass->byval_arg);
- debug_sym = g_strdup_printf ("plt__class_init_%s", s);
+ debug_sym = g_strdup_printf ("%s__class_init_%s", prefix, s);
g_free (s);
break;
case MONO_PATCH_INFO_RGCTX_FETCH:
- debug_sym = g_strdup_printf ("plt__rgctx_fetch_%d", acfg->label_generator ++);
+ debug_sym = g_strdup_printf ("%s_rgctx_fetch_%d", prefix, acfg->label_generator ++);
break;
case MONO_PATCH_INFO_ICALL_ADDR: {
char *s = get_debug_sym (ji->data.method, "", cache);
- debug_sym = g_strdup_printf ("plt__icall_native_%s", s);
+ debug_sym = g_strdup_printf ("%s_icall_native_%s", prefix, s);
g_free (s);
break;
}
case MONO_PATCH_INFO_JIT_ICALL_ADDR:
- debug_sym = g_strdup_printf ("plt__jit_icall_native_%s", ji->data.name);
+ debug_sym = g_strdup_printf ("%s_jit_icall_native_%s", prefix, ji->data.name);
break;
case MONO_PATCH_INFO_GENERIC_CLASS_INIT:
- debug_sym = g_strdup_printf ("plt__generic_class_init");
+ debug_sym = g_strdup_printf ("%s_generic_class_init", prefix);
break;
default:
break;
}
+ g_free (prefix);
+
return sanitize_symbol (acfg, debug_sym);
}
buf = g_malloc (buf_size);
p = buf;
- encode_patch_list (acfg, patches, patches->len, got_offset, p, &p);
+ encode_patch_list (acfg, patches, patches->len, FALSE, got_offset, p, &p);
g_assert (p - buf < buf_size);
sprintf (symbol, "%s%s_p", acfg->user_symbol_prefix, name);
mono_arch_get_nullified_class_init_trampoline (&info);
emit_trampoline (acfg, acfg->got_offset, info);
#if defined(MONO_ARCH_MONITOR_OBJECT_REG)
- mono_arch_create_monitor_enter_trampoline (&info, TRUE);
+ mono_arch_create_monitor_enter_trampoline (&info, FALSE, TRUE);
+ emit_trampoline (acfg, acfg->got_offset, info);
+#if defined(MONO_ARCH_MONITOR_LOCK_TAKEN_REG)
+ mono_arch_create_monitor_enter_trampoline (&info, TRUE, TRUE);
emit_trampoline (acfg, acfg->got_offset, info);
+#endif
mono_arch_create_monitor_exit_trampoline (&info, TRUE);
emit_trampoline (acfg, acfg->got_offset, info);
#endif
if (str_begins_with (arg, "outfile=")) {
opts->outfile = g_strdup (arg + strlen ("outfile="));
+ } else if (str_begins_with (arg, "llvm-outfile=")) {
+ opts->llvm_outfile = g_strdup (arg + strlen ("llvm-outfile="));
} else if (str_begins_with (arg, "save-temps")) {
opts->save_temps = TRUE;
} else if (str_begins_with (arg, "keep-temps")) {
} else if (str_begins_with (arg, "help") || str_begins_with (arg, "?")) {
printf ("Supported options for --aot:\n");
printf (" outfile=\n");
+ printf (" llvm-outfile=\n");
printf (" save-temps\n");
printf (" keep-temps\n");
printf (" write-symbols\n");
guint32
mono_aot_get_got_offset (MonoJumpInfo *ji)
{
- return get_got_offset (llvm_acfg, ji);
+ return get_got_offset (llvm_acfg, TRUE, ji);
}
char*
emit_llvm_file (MonoAotCompile *acfg)
{
char *command, *opts, *tempbc, *output_fname;
- int i;
- MonoJumpInfo *patch_info;
-
- /*
- * When using LLVM, we let llvm emit the got since the LLVM IL needs to refer
- * to it.
- */
-
- /* Compute the final size of the got */
- for (i = 0; i < acfg->nmethods; ++i) {
- if (acfg->cfgs [i]) {
- for (patch_info = acfg->cfgs [i]->patch_info; patch_info; patch_info = patch_info->next) {
- if (patch_info->type != MONO_PATCH_INFO_NONE) {
- if (!is_plt_patch (patch_info))
- get_got_offset (acfg, patch_info);
- else
- get_plt_entry (acfg, patch_info);
- }
- }
- }
- }
-
- acfg->final_got_size = acfg->got_offset + acfg->plt_offset;
-
- if (acfg->aot_opts.full_aot) {
- int ntype;
-
- /*
- * Need to add the got entries used by the trampolines.
- * This is only a conservative approximation.
- */
- if (strcmp (acfg->image->assembly->aname.name, "mscorlib") == 0) {
- /* For the generic + rgctx trampolines */
- acfg->final_got_size += 400;
- /* For the specific trampolines */
- for (ntype = 0; ntype < MONO_AOT_TRAMP_NUM; ++ntype)
- acfg->final_got_size += acfg->num_trampolines [ntype] * 2;
- }
- }
-
tempbc = g_strdup_printf ("%s.bc", acfg->tmpbasename);
- mono_llvm_emit_aot_module (tempbc, g_path_get_basename (acfg->image->name), acfg->final_got_size);
+ mono_llvm_emit_aot_module (tempbc, g_path_get_basename (acfg->image->name));
g_free (tempbc);
/*
/* Verbose asm slows down llc greatly */
g_string_append (acfg->llc_args, " -asm-verbose=false");
+ g_string_append (acfg->llc_args, " -disable-gnu-eh-frame -enable-mono-eh-frame");
+
if (acfg->aot_opts.mtriple)
g_string_append_printf (acfg->llc_args, " -mtriple=%s", acfg->aot_opts.mtriple);
if (acfg->llvm_separate)
- g_string_append_printf (acfg->llc_args, " -mono-eh-frame-symbol=mono_eh_frame");
+ g_string_append_printf (acfg->llc_args, " -mono-eh-frame-symbol=%s", acfg->llvm_eh_frame_symbol);
#if defined(TARGET_MACH) && defined(TARGET_ARM)
/* ios requires PIC code now */
#endif
unlink (acfg->tmpfname);
- if (acfg->llvm_separate)
- output_fname = g_strdup_printf ("%s", acfg->llvm_sfile);
- else
+ if (acfg->llvm_separate) {
+ if (acfg->llvm_owriter) {
+ /* Emit an object file directly */
+ output_fname = g_strdup_printf ("%s", acfg->llvm_ofile);
+ g_string_append_printf (acfg->llc_args, " -filetype=obj");
+ } else {
+ output_fname = g_strdup_printf ("%s", acfg->llvm_sfile);
+ }
+ } else {
output_fname = g_strdup (acfg->tmpfname);
- command = g_strdup_printf ("%sllc %s -disable-gnu-eh-frame -enable-mono-eh-frame -o \"%s\" \"%s.opt.bc\"", acfg->aot_opts.llvm_path, acfg->llc_args->str, output_fname, acfg->tmpbasename);
+ }
+ command = g_strdup_printf ("%sllc %s -o \"%s\" \"%s.opt.bc\"", acfg->aot_opts.llvm_path, acfg->llc_args->str, output_fname, acfg->tmpbasename);
aot_printf (acfg, "Executing llc: %s\n", command);
emit_label (acfg, symbol);
acfg->methods_symbol = g_strdup (symbol);
}
+ emit_label (acfg, "jit_code_start");
/*
* Emit some padding so the local symbol for the first method doesn't have the
emit_section_change (acfg, ".text", 0);
emit_alignment_code (acfg, 8);
emit_label (acfg, symbol);
+
+ emit_label (acfg, "jit_code_end");
+
/* To distinguish it from the next symbol */
emit_padding (acfg, 4);
}
static void
-emit_got_info (MonoAotCompile *acfg)
+emit_got_info (MonoAotCompile *acfg, gboolean llvm)
{
char symbol [256];
int i, first_plt_got_patch, buf_size;
guint8 *p, *buf;
guint32 *got_info_offsets;
+ GotInfo *info = llvm ? &acfg->llvm_got_info : &acfg->got_info;
/* Add the patches needed by the PLT to the GOT */
- acfg->plt_got_offset_base = acfg->got_offset;
- first_plt_got_patch = acfg->got_patches->len;
- for (i = 1; i < acfg->plt_offset; ++i) {
- MonoPltEntry *plt_entry = g_hash_table_lookup (acfg->plt_offset_to_entry, GUINT_TO_POINTER (i));
+ if (!llvm) {
+ acfg->plt_got_offset_base = acfg->got_offset;
+ first_plt_got_patch = info->got_patches->len;
+ for (i = 1; i < acfg->plt_offset; ++i) {
+ MonoPltEntry *plt_entry = g_hash_table_lookup (acfg->plt_offset_to_entry, GUINT_TO_POINTER (i));
- g_ptr_array_add (acfg->got_patches, plt_entry->ji);
+ g_ptr_array_add (info->got_patches, plt_entry->ji);
- acfg->stats.got_slot_types [plt_entry->ji->type] ++;
- }
+ acfg->stats.got_slot_types [plt_entry->ji->type] ++;
+ }
- acfg->got_offset += acfg->plt_offset;
+ acfg->got_offset += acfg->plt_offset;
+ }
/**
* FIXME:
*/
/* Encode info required to decode shared GOT entries */
- buf_size = acfg->got_patches->len * 128;
+ buf_size = info->got_patches->len * 128;
p = buf = mono_mempool_alloc (acfg->mempool, buf_size);
- got_info_offsets = mono_mempool_alloc (acfg->mempool, acfg->got_patches->len * sizeof (guint32));
- acfg->plt_got_info_offsets = mono_mempool_alloc (acfg->mempool, acfg->plt_offset * sizeof (guint32));
- /* Unused */
- if (acfg->plt_offset)
- acfg->plt_got_info_offsets [0] = 0;
- for (i = 0; i < acfg->got_patches->len; ++i) {
- MonoJumpInfo *ji = g_ptr_array_index (acfg->got_patches, i);
+ got_info_offsets = mono_mempool_alloc (acfg->mempool, info->got_patches->len * sizeof (guint32));
+ if (!llvm) {
+ acfg->plt_got_info_offsets = mono_mempool_alloc (acfg->mempool, acfg->plt_offset * sizeof (guint32));
+ /* Unused */
+ if (acfg->plt_offset)
+ acfg->plt_got_info_offsets [0] = 0;
+ }
+ for (i = 0; i < info->got_patches->len; ++i) {
+ MonoJumpInfo *ji = g_ptr_array_index (info->got_patches, i);
guint8 *p2;
p = buf;
g_assert (p - buf <= buf_size);
got_info_offsets [i] = add_to_blob (acfg, buf, p - buf);
- if (i >= first_plt_got_patch)
+ if (!llvm && i >= first_plt_got_patch)
acfg->plt_got_info_offsets [i - first_plt_got_patch + 1] = got_info_offsets [i];
acfg->stats.got_info_size += p - buf;
}
/* Emit got_info_offsets table */
- sprintf (symbol, "got_info_offsets");
+ if (llvm)
+ sprintf (symbol, "llvm_got_info_offsets");
+ else
+ sprintf (symbol, "got_info_offsets");
emit_section_change (acfg, RODATA_SECT, 1);
emit_alignment (acfg, 8);
emit_label (acfg, symbol);
/* No need to emit offsets for the got plt entries, the plt embeds them directly */
- acfg->stats.offsets_size += emit_offset_table (acfg, first_plt_got_patch, 10, (gint32*)got_info_offsets);
+ acfg->stats.offsets_size += emit_offset_table (acfg, llvm ? acfg->llvm_got_offset : first_plt_got_patch, 10, (gint32*)got_info_offsets);
}
static void
{
char symbol [256];
- if (!acfg->llvm) {
- /* Don't make GOT global so accesses to it don't need relocations */
- sprintf (symbol, "%s", acfg->got_symbol);
- emit_section_change (acfg, ".bss", 0);
- emit_alignment (acfg, 8);
- emit_local_symbol (acfg, symbol, "got_end", FALSE);
- emit_label (acfg, symbol);
- if (acfg->got_offset > 0)
- emit_zero_bytes (acfg, (int)(acfg->got_offset * sizeof (gpointer)));
+ /* Don't make GOT global so accesses to it don't need relocations */
+ sprintf (symbol, "%s", acfg->got_symbol);
+ emit_section_change (acfg, ".bss", 0);
+ emit_alignment (acfg, 8);
+ emit_local_symbol (acfg, symbol, "got_end", FALSE);
+ emit_label (acfg, symbol);
+ if (acfg->got_offset > 0)
+ emit_zero_bytes (acfg, (int)(acfg->got_offset * sizeof (gpointer)));
- sprintf (symbol, "got_end");
- emit_label (acfg, symbol);
- }
+ sprintf (symbol, "got_end");
+ emit_label (acfg, symbol);
}
typedef struct GlobalsTableEntry {
int i, table_size;
guint32 hash;
GPtrArray *table;
- char symbol [256];
+ char symbol [1024];
GlobalsTableEntry *entry, *new_entry;
if (!acfg->aot_opts.static_link)
sprintf (symbol, "name_%d", i);
emit_pointer (acfg, symbol);
+ g_assert (strlen (name) < sizeof (symbol));
sprintf (symbol, "%s", name);
emit_pointer (acfg, symbol);
}
* various problems (i.e. arm/thumb).
*/
emit_pointer (acfg, acfg->got_symbol);
+ if (acfg->llvm)
+ emit_pointer (acfg, acfg->llvm_got_symbol);
+ else
+ emit_pointer (acfg, NULL);
emit_pointer (acfg, acfg->methods_symbol);
+ emit_pointer (acfg, "jit_code_start");
+ emit_pointer (acfg, "jit_code_end");
if (acfg->llvm) {
/*
* Emit a reference to the mono_eh_frame table created by our modified LLVM compiler.
*/
- emit_pointer (acfg, "mono_eh_frame");
+ emit_pointer (acfg, acfg->llvm_eh_frame_symbol);
} else {
emit_pointer (acfg, NULL);
}
emit_pointer (acfg, "extra_method_info_offsets");
emit_pointer (acfg, "extra_method_table");
emit_pointer (acfg, "got_info_offsets");
+ if (acfg->llvm)
+ emit_pointer (acfg, "llvm_got_info_offsets");
+ else
+ emit_pointer (acfg, NULL);
emit_pointer (acfg, "methods_end");
emit_pointer (acfg, "unwind_info");
emit_pointer (acfg, "mem_end");
aot_printf (acfg, "Output file: '%s'.\n", acfg->tmpfname);
if (acfg->aot_opts.static_link)
aot_printf (acfg, "Linking symbol: '%s'.\n", acfg->static_linking_symbol);
+ if (acfg->llvm_separate)
+ aot_printf (acfg, "LLVM output file: '%s'.\n", acfg->llvm_sfile);
return 0;
}
return 1;
}
- if (acfg->llvm_separate) {
+ if (acfg->llvm_separate && !acfg->llvm_owriter) {
command = g_strdup_printf ("%s%s %s %s -o %s %s", tool_prefix, AS_NAME, AS_OPTIONS, acfg->as_args ? acfg->as_args->str : "", acfg->llvm_ofile, acfg->llvm_sfile);
aot_printf (acfg, "Executing the native assembler: %s\n", command);
if (system (command) != 0) {
return 0;
}
+static void init_got_info (GotInfo *info)
+{
+ int i;
+
+ info->patch_to_got_offset = g_hash_table_new (mono_patch_info_hash, mono_patch_info_equal);
+ info->patch_to_got_offset_by_type = g_new0 (GHashTable*, MONO_PATCH_INFO_NUM);
+ for (i = 0; i < MONO_PATCH_INFO_NUM; ++i)
+ info->patch_to_got_offset_by_type [i] = g_hash_table_new (mono_patch_info_hash, mono_patch_info_equal);
+ info->got_patches = g_ptr_array_new ();
+}
+
static MonoAotCompile*
acfg_create (MonoAssembly *ass, guint32 opts)
{
MonoImage *image = ass->image;
MonoAotCompile *acfg;
- int i;
acfg = g_new0 (MonoAotCompile, 1);
acfg->methods = g_ptr_array_new ();
acfg->method_depth = g_hash_table_new (NULL, NULL);
acfg->plt_offset_to_entry = g_hash_table_new (NULL, NULL);
acfg->patch_to_plt_entry = g_new0 (GHashTable*, MONO_PATCH_INFO_NUM);
- acfg->patch_to_got_offset = g_hash_table_new (mono_patch_info_hash, mono_patch_info_equal);
- acfg->patch_to_got_offset_by_type = g_new0 (GHashTable*, MONO_PATCH_INFO_NUM);
- for (i = 0; i < MONO_PATCH_INFO_NUM; ++i)
- acfg->patch_to_got_offset_by_type [i] = g_hash_table_new (mono_patch_info_hash, mono_patch_info_equal);
- acfg->got_patches = g_ptr_array_new ();
acfg->method_to_cfg = g_hash_table_new (NULL, NULL);
acfg->token_info_hash = g_hash_table_new_full (NULL, NULL, NULL, NULL);
acfg->method_to_pinvoke_import = g_hash_table_new_full (NULL, NULL, NULL, g_free);
acfg->plt_entry_debug_sym_cache = g_hash_table_new (g_str_hash, g_str_equal);
mono_mutex_init_recursive (&acfg->mutex);
+ init_got_info (&acfg->got_info);
+ init_got_info (&acfg->llvm_got_info);
+
return acfg;
}
+static void
+got_info_free (GotInfo *info)
+{
+ int i;
+
+ for (i = 0; i < MONO_PATCH_INFO_NUM; ++i)
+ g_hash_table_destroy (info->patch_to_got_offset_by_type [i]);
+ g_free (info->patch_to_got_offset_by_type);
+ g_hash_table_destroy (info->patch_to_got_offset);
+ g_ptr_array_free (info->got_patches, TRUE);
+}
+
static void
acfg_free (MonoAotCompile *acfg)
{
g_free (acfg->got_symbol);
g_free (acfg->plt_symbol);
g_ptr_array_free (acfg->methods, TRUE);
- g_ptr_array_free (acfg->got_patches, TRUE);
g_ptr_array_free (acfg->image_table, TRUE);
g_ptr_array_free (acfg->globals, TRUE);
g_ptr_array_free (acfg->unwind_ops, TRUE);
g_hash_table_destroy (acfg->patch_to_plt_entry [i]);
}
g_free (acfg->patch_to_plt_entry);
- g_hash_table_destroy (acfg->patch_to_got_offset);
g_hash_table_destroy (acfg->method_to_cfg);
g_hash_table_destroy (acfg->token_info_hash);
g_hash_table_destroy (acfg->method_to_pinvoke_import);
g_hash_table_destroy (acfg->plt_entry_debug_sym_cache);
g_hash_table_destroy (acfg->klass_blob_hash);
g_hash_table_destroy (acfg->method_blob_hash);
- for (i = 0; i < MONO_PATCH_INFO_NUM; ++i)
- g_hash_table_destroy (acfg->patch_to_got_offset_by_type [i]);
- g_free (acfg->patch_to_got_offset_by_type);
+ got_info_free (&acfg->got_info);
+ got_info_free (&acfg->llvm_got_info);
mono_mempool_destroy (acfg->mempool);
g_free (acfg);
}
mini_llvm_init ();
- if (!acfg->aot_opts.static_link && !acfg->aot_opts.asm_only) {
+ if (!acfg->aot_opts.asm_only || acfg->aot_opts.llvm_outfile) {
/*
* Emit all LLVM code into a separate assembly/object file and link with it
* normally.
- * FIXME:
- * Can't use it when using asm_only or static_link, since it requires changes
- * to users because we generate two files now. Also, symbol names have to be
- * prefixed by a unique prefix so multiple files can be linked together.
- * This also affects the mono_eh_frame symbol emitted by LLVM.
- * Can't use this with full aot until the trampolines are updated
- * (i.e. get rid of the emit_symbol_diff () stuff).
*/
-#if LLVM_API_VERSION >= 3 && defined(TARGET_AMD64)
+#if LLVM_API_VERSION >= 3
acfg->llvm_separate = TRUE;
+ if (!acfg->aot_opts.asm_only)
+ acfg->llvm_owriter = TRUE;
#endif
}
+ if (acfg->aot_opts.llvm_outfile && !acfg->llvm_separate) {
+ aot_printerrf (acfg, "The llvm-outputfile= option is not supported on this platform.\n");
+ return 1;
+ }
}
if (acfg->aot_opts.full_aot)
arch_init (acfg);
- acfg->got_symbol_base = g_strdup_printf ("mono_aot_%s_got", acfg->image->assembly->aname.name);
- acfg->plt_symbol = g_strdup_printf ("%smono_aot_%s_plt", acfg->llvm_label_prefix, acfg->image->assembly->aname.name);
acfg->assembly_name_sym = g_strdup (acfg->image->assembly->aname.name);
-
/* Get rid of characters which cannot occur in symbols */
- for (p = acfg->got_symbol_base; *p; ++p) {
- if (!(isalnum (*p) || *p == '_'))
- *p = '_';
- }
- for (p = acfg->plt_symbol; *p; ++p) {
- if (!(isalnum (*p) || *p == '_'))
- *p = '_';
- }
for (p = acfg->assembly_name_sym; *p; ++p) {
if (!(isalnum (*p) || *p == '_'))
*p = '_';
}
+ acfg->got_symbol_base = g_strdup_printf ("mono_aot_%s_got", acfg->assembly_name_sym);
+ acfg->llvm_got_symbol_base = g_strdup_printf ("mono_aot_%s_llvm_got", acfg->assembly_name_sym);
+ acfg->plt_symbol = g_strdup_printf ("%smono_aot_%s_plt", acfg->llvm_label_prefix, acfg->assembly_name_sym);
+
+ acfg->got_symbol = g_strdup_printf ("%s%s", acfg->llvm_label_prefix, acfg->got_symbol_base);
+ if (acfg->llvm) {
+ acfg->llvm_got_symbol = g_strdup_printf ("%s%s", acfg->llvm_label_prefix, acfg->llvm_got_symbol_base);
+ if (acfg->llvm_separate)
+ acfg->llvm_eh_frame_symbol = g_strdup_printf ("mono_aot_%s_eh_frame", acfg->assembly_name_sym);
+ else
+ acfg->llvm_eh_frame_symbol = g_strdup ("mono_eh_frame");
+ }
+
acfg->method_index = 1;
// FIXME:
#ifdef ENABLE_LLVM
if (acfg->llvm) {
llvm_acfg = acfg;
- mono_llvm_create_aot_module (acfg->got_symbol_base, acfg->llvm_separate, acfg->llvm_separate);
+ mono_llvm_create_aot_module (acfg->llvm_got_symbol_base, acfg->llvm_separate, acfg->llvm_separate);
}
#endif
ji->type = MONO_PATCH_INFO_IMAGE;
ji->data.image = acfg->image;
- get_got_offset (acfg, ji);
+ get_got_offset (acfg, FALSE, ji);
+ get_got_offset (acfg, TRUE, ji);
/* Slot 1 is reserved for the mscorlib got addr */
ji = mono_mempool_alloc0 (acfg->mempool, sizeof (MonoAotCompile));
ji->type = MONO_PATCH_INFO_MSCORLIB_GOT_ADDR;
- get_got_offset (acfg, ji);
+ get_got_offset (acfg, FALSE, ji);
+ get_got_offset (acfg, TRUE, ji);
/* This is very common */
ji = mono_mempool_alloc0 (acfg->mempool, sizeof (MonoAotCompile));
ji->type = MONO_PATCH_INFO_GC_CARD_TABLE_ADDR;
- get_got_offset (acfg, ji);
+ get_got_offset (acfg, FALSE, ji);
+ get_got_offset (acfg, TRUE, ji);
ji = mono_mempool_alloc0 (acfg->mempool, sizeof (MonoAotCompile));
ji->type = MONO_PATCH_INFO_JIT_TLS_ID;
- get_got_offset (acfg, ji);
+ get_got_offset (acfg, FALSE, ji);
+ get_got_offset (acfg, TRUE, ji);
}
TV_GETTIME (atv);
gboolean res;
if (acfg->aot_opts.asm_only) {
- g_assert (!acfg->llvm_separate);
if (acfg->aot_opts.outfile) {
acfg->tmpfname = g_strdup_printf ("%s", acfg->aot_opts.outfile);
acfg->tmpbasename = g_strdup (acfg->tmpfname);
acfg->tmpbasename = g_strdup_printf ("%s", acfg->image->name);
acfg->tmpfname = g_strdup_printf ("%s.s", acfg->tmpbasename);
}
+ if (acfg->llvm_separate) {
+ g_assert (acfg->aot_opts.llvm_outfile);
+ acfg->llvm_sfile = g_strdup (acfg->aot_opts.llvm_outfile);
+ }
} else {
acfg->tmpbasename = g_strdup_printf ("%s", "temp");
acfg->tmpfname = g_strdup_printf ("%s.s", acfg->tmpbasename);
outfile_name = NULL;
}
- acfg->got_symbol = g_strdup_printf ("%s%s", acfg->llvm_label_prefix, acfg->got_symbol_base);
-
/* Compute symbols for methods */
for (i = 0; i < acfg->nmethods; ++i) {
if (acfg->cfgs [i]) {
if (COMPILE_LLVM (cfg))
cfg->asm_symbol = g_strdup_printf ("%s%s", acfg->llvm_label_prefix, cfg->llvm_method_name);
else if (acfg->global_symbols || acfg->llvm_separate)
- cfg->asm_symbol = get_debug_sym (cfg->method, "", acfg->method_label_hash);
+ cfg->asm_symbol = get_debug_sym (cfg->orig_method, "", acfg->method_label_hash);
else
cfg->asm_symbol = g_strdup_printf ("%s%sm_%x", acfg->temp_prefix, acfg->llvm_label_prefix, method_index);
}
emit_class_name_table (acfg);
- emit_got_info (acfg);
+ emit_got_info (acfg, FALSE);
+ if (acfg->llvm)
+ emit_got_info (acfg, TRUE);
emit_exception_info (acfg);
acfg->stats.gen_time = TV_ELAPSED (atv, btv);
- if (acfg->llvm)
- g_assert (acfg->got_offset <= acfg->final_got_size);
-
if (acfg->llvm)
sprintf (llvm_stats_msg, ", LLVM: %d (%d%%)", acfg->stats.llvm_count, acfg->stats.mcount ? (acfg->stats.llvm_count * 100) / acfg->stats.mcount : 100);
else
projects / mono.git / blobdiff