X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Fmini%2Faot-compiler.c;h=58d9bea5d9175e66f733004e136e42e018e6ccb1;hb=c2d511e567dd2d535056dc79b745f88b4fb64afa;hp=2333477d69c56bf4c224ee871738434d77a7eae1;hpb=547ebbdb45086af56e48abc141c006996cea1925;p=mono.git diff --git a/mono/mini/aot-compiler.c b/mono/mini/aot-compiler.c index 2333477d69c..58d9bea5d91 100644 --- a/mono/mini/aot-compiler.c +++ b/mono/mini/aot-compiler.c @@ -9,8 +9,6 @@ */ /* Remaining AOT-only work: - * - reduce the length of the wrapper names. - * - aot IMT tables, so we don't have two kinds of aot code. * - optimize the trampolines, generate more code in the arch files. * - make things more consistent with how elf works, for example, use ELF * relocations. @@ -101,6 +99,7 @@ typedef struct MonoAotOptions { int nthreads; int ntrampolines; gboolean print_skipped_methods; + char *tool_prefix; } MonoAotOptions; typedef struct MonoAotStats { @@ -156,7 +155,10 @@ typedef struct MonoAotCompile { GPtrArray *unwind_ops; guint32 unwind_info_offset; char *got_symbol; + char *plt_symbol; GHashTable *method_label_hash; + const char *temp_prefix; + guint32 label_generator; } MonoAotCompile; #define mono_acfg_lock(acfg) EnterCriticalSection (&((acfg)->mutex)) @@ -194,7 +196,7 @@ patch_types [MONO_PATCH_INFO_NUM + 1] = { NULL }; -static const char* +static G_GNUC_UNUSED const char* get_patch_name (int info) { return patch_types [info]; @@ -311,11 +313,18 @@ emit_global (MonoAotCompile *acfg, const char *name, gboolean func) { if (acfg->aot_opts.no_dlsym) { g_ptr_array_add (acfg->globals, g_strdup (name)); + img_writer_emit_local_symbol (acfg->w, name, NULL, func); } else { img_writer_emit_global (acfg->w, name, func); } } +static void +emit_symbol_size (MonoAotCompile *acfg, const char *name, const char *end_label) +{ + img_writer_emit_symbol_size (acfg->w, name, end_label); +} + static void emit_string_symbol (MonoAotCompile *acfg, const char *name, const char *value) { @@ -414,10 +423,24 @@ encode_sleb128 (gint32 value, guint8 *buf, guint8 **endbuf) /* ARCHITECTURE SPECIFIC CODE */ -#if defined(TARGET_X86) || defined(TARGET_AMD64) || defined(TARGET_ARM) +#if defined(TARGET_X86) || defined(TARGET_AMD64) || defined(TARGET_ARM) || defined(TARGET_POWERPC) #define EMIT_DWARF_INFO 1 #endif +#if defined(TARGET_ARM) +#define AOT_FUNC_ALIGNMENT 4 +#else +#define AOT_FUNC_ALIGNMENT 16 +#endif + +#if defined(TARGET_POWERPC64) && !defined(__mono_ilp32__) +#define PPC_LD_OP "ld" +#define PPC_LDX_OP "ldx" +#else +#define PPC_LD_OP "lwz" +#define PPC_LDX_OP "lwzx" +#endif + /* * arch_emit_direct_call: * @@ -447,11 +470,45 @@ arch_emit_direct_call (MonoAotCompile *acfg, const char *target, int *call_size) fprintf (acfg->fp, "bl %s\n", target); } *call_size = 4; +#elif defined(TARGET_POWERPC) + if (acfg->use_bin_writer) { + g_assert_not_reached (); + } else { + img_writer_emit_unset_mode (acfg->w); + fprintf (acfg->fp, "bl %s\n", target); + *call_size = 4; + } #else g_assert_not_reached (); #endif } +/* + * PPC32 design: + * - we use an approach similar to the x86 abi: reserve a register (r30) to hold + * the GOT pointer. + * - The full-aot trampolines need access to the GOT of mscorlib, so we store + * in in the 2. slot of every GOT, and require every method to place the GOT + * address in r30, even when it doesn't access the GOT otherwise. This way, + * the trampolines can compute the mscorlib GOT address by loading 4(r30). + */ + +/* + * PPC64 design: + * PPC64 uses function descriptors which greatly complicate all code, since + * these are used very inconsistently in the runtime. Some functions like + * mono_compile_method () return ftn descriptors, while others like the + * trampoline creation functions do not. + * We assume that all GOT slots contain function descriptors, and create + * descriptors in aot-runtime.c when needed. + * The ppc64 abi uses r2 to hold the address of the TOC/GOT, which is loaded + * from function descriptors, we could do the same, but it would require + * rewriting all the ppc/aot code to handle function descriptors properly. + * So instead, we use the same approach as on PPC32. + * This is a horrible mess, but fixing it would probably lead to an even bigger + * one. + */ + #ifdef MONO_ARCH_AOT_SUPPORTED /* * arch_emit_got_offset: @@ -463,11 +520,36 @@ arch_emit_direct_call (MonoAotCompile *acfg, const char *target, int *call_size) static void arch_emit_got_offset (MonoAotCompile *acfg, guint8 *code, int *code_size) { +#if defined(TARGET_POWERPC64) + g_assert (!acfg->use_bin_writer); + img_writer_emit_unset_mode (acfg->w); + /* + * The ppc32 code doesn't seem to work on ppc64, the assembler complains about + * unsupported relocations. So we store the got address into the .Lgot_addr + * symbol which is in the text segment, compute its address, and load it. + */ + fprintf (acfg->fp, ".L%d:\n", acfg->label_generator); + fprintf (acfg->fp, "lis 0, (.Lgot_addr + 4 - .L%d)@h\n", acfg->label_generator); + fprintf (acfg->fp, "ori 0, 0, (.Lgot_addr + 4 - .L%d)@l\n", acfg->label_generator); + fprintf (acfg->fp, "add 30, 30, 0\n"); + fprintf (acfg->fp, "%s 30, 0(30)\n", PPC_LD_OP); + acfg->label_generator ++; + *code_size = 16; +#elif defined(TARGET_POWERPC) + g_assert (!acfg->use_bin_writer); + img_writer_emit_unset_mode (acfg->w); + fprintf (acfg->fp, ".L%d:\n", acfg->label_generator); + fprintf (acfg->fp, "lis 0, (%s + 4 - .L%d)@h\n", acfg->got_symbol, acfg->label_generator); + fprintf (acfg->fp, "ori 0, 0, (%s + 4 - .L%d)@l\n", acfg->got_symbol, acfg->label_generator); + acfg->label_generator ++; + *code_size = 8; +#else guint32 offset = mono_arch_get_patch_offset (code); emit_bytes (acfg, code, offset); emit_symbol_diff (acfg, acfg->got_symbol, ".", offset); *code_size = offset + 4; +#endif } /* @@ -486,15 +568,27 @@ arch_emit_got_access (MonoAotCompile *acfg, guint8 *code, int got_slot, int *cod /* Emit the offset */ #ifdef TARGET_AMD64 emit_symbol_diff (acfg, acfg->got_symbol, ".", (unsigned int) ((got_slot * sizeof (gpointer)) - 4)); + *code_size = mono_arch_get_patch_offset (code) + 4; #elif defined(TARGET_X86) emit_int32 (acfg, (unsigned int) ((got_slot * sizeof (gpointer)))); + *code_size = mono_arch_get_patch_offset (code) + 4; #elif defined(TARGET_ARM) emit_symbol_diff (acfg, acfg->got_symbol, ".", (unsigned int) ((got_slot * sizeof (gpointer))) - 12); + *code_size = mono_arch_get_patch_offset (code) + 4; +#elif defined(TARGET_POWERPC) + { + guint8 buf [32]; + guint8 *code; + + code = buf; + ppc_load32 (code, ppc_r0, got_slot * sizeof (gpointer)); + g_assert (code - buf == 8); + emit_bytes (acfg, buf, code - buf); + *code_size = code - buf; + } #else g_assert_not_reached (); #endif - - *code_size = mono_arch_get_patch_offset (code) + 4; } #endif @@ -514,7 +608,7 @@ arch_emit_plt_entry (MonoAotCompile *acfg, int index) } else { /* Need to make sure this is 9 bytes long */ emit_byte (acfg, '\xe9'); - emit_symbol_diff (acfg, "plt", ".", -4); + emit_symbol_diff (acfg, acfg->plt_symbol, ".", -4); emit_int32 (acfg, acfg->plt_got_info_offsets [index]); } #elif defined(TARGET_AMD64) @@ -541,7 +635,8 @@ arch_emit_plt_entry (MonoAotCompile *acfg, int index) * - implement IMT support */ code = buf; - if (acfg->use_bin_writer) { + if (acfg->use_bin_writer && FALSE) { + /* FIXME: mono_arch_patch_plt_entry () needs to decode this */ /* We only emit 1 relocation since we implement it ourselves anyway */ img_writer_emit_reloc (acfg->w, R_ARM_ALU_PC_G0_NC, acfg->got_symbol, ((acfg->plt_got_offset_base + index) * sizeof (gpointer)) - 8); /* FIXME: A 2 instruction encoding is sufficient in most cases */ @@ -549,19 +644,37 @@ arch_emit_plt_entry (MonoAotCompile *acfg, int index) ARM_ADD_REG_IMM (code, ARMREG_IP, ARMREG_IP, 0, 0); ARM_LDR_IMM (code, ARMREG_PC, ARMREG_IP, 0); emit_bytes (acfg, buf, code - buf); - /* FIXME: Get rid of this */ - emit_symbol_diff (acfg, acfg->got_symbol, ".", ((acfg->plt_got_offset_base + index) * sizeof (gpointer))); /* Used by mono_aot_get_plt_info_offset */ emit_int32 (acfg, acfg->plt_got_info_offsets [index]); } else { - ARM_LDR_IMM (code, ARMREG_IP, ARMREG_PC, 4); - ARM_ADD_REG_REG (code, ARMREG_IP, ARMREG_PC, ARMREG_IP); - ARM_LDR_IMM (code, ARMREG_PC, ARMREG_IP, 0); + ARM_LDR_IMM (code, ARMREG_IP, ARMREG_PC, 0); + ARM_LDR_REG_REG (code, ARMREG_PC, ARMREG_PC, ARMREG_IP); emit_bytes (acfg, buf, code - buf); - emit_symbol_diff (acfg, acfg->got_symbol, ".", ((acfg->plt_got_offset_base + index) * sizeof (gpointer))); + emit_symbol_diff (acfg, acfg->got_symbol, ".", ((acfg->plt_got_offset_base + index) * sizeof (gpointer)) - 4); /* Used by mono_aot_get_plt_info_offset */ emit_int32 (acfg, acfg->plt_got_info_offsets [index]); } + /* + * The plt_got_info_offset is computed automatically by + * mono_aot_get_plt_info_offset (), so no need to save it here. + */ +#elif defined(TARGET_POWERPC) + guint32 offset = (acfg->plt_got_offset_base + index) * sizeof (gpointer); + + /* The GOT address is guaranteed to be in r30 by OP_LOAD_GOTADDR */ + g_assert (!acfg->use_bin_writer); + img_writer_emit_unset_mode (acfg->w); + fprintf (acfg->fp, "lis 11, %d@h\n", offset); + fprintf (acfg->fp, "ori 11, 11, %d@l\n", offset); + fprintf (acfg->fp, "add 11, 11, 30\n"); + fprintf (acfg->fp, "%s 11, 0(11)\n", PPC_LD_OP); +#ifdef PPC_USES_FUNCTION_DESCRIPTOR + fprintf (acfg->fp, "%s 2, %d(11)\n", PPC_LD_OP, (int)sizeof (gpointer)); + fprintf (acfg->fp, "%s 11, 0(11)\n", PPC_LD_OP); +#endif + fprintf (acfg->fp, "mtctr 11\n"); + fprintf (acfg->fp, "bctr\n"); + emit_int32 (acfg, acfg->plt_got_info_offsets [index]); #else g_assert_not_reached (); #endif @@ -604,23 +717,65 @@ arch_emit_specific_trampoline (MonoAotCompile *acfg, int offset, int *tramp_size guint8 buf [128]; guint8 *code; - /* This should be exactly 28 bytes long */ - *tramp_size = 28; + /* This should be exactly 20 bytes long */ + *tramp_size = 20; code = buf; ARM_PUSH (code, 0x5fff); - ARM_LDR_IMM (code, ARMREG_R1, ARMREG_PC, 8); + ARM_LDR_IMM (code, ARMREG_R1, ARMREG_PC, 4); /* Load the value from the GOT */ ARM_LDR_REG_REG (code, ARMREG_R1, ARMREG_PC, ARMREG_R1); /* Branch to it */ - ARM_MOV_REG_REG (code, ARMREG_LR, ARMREG_PC); - ARM_MOV_REG_REG (code, ARMREG_PC, ARMREG_R1); + ARM_BLX_REG (code, ARMREG_R1); - g_assert (code - buf == 20); + g_assert (code - buf == 16); /* Emit it */ emit_bytes (acfg, buf, code - buf); - emit_symbol_diff (acfg, acfg->got_symbol, ".", (offset * sizeof (gpointer)) - 4 + 8); - emit_symbol_diff (acfg, acfg->got_symbol, ".", ((offset + 1) * sizeof (gpointer)) - 4 + 8); + /* + * Only one offset is needed, since the second one would be equal to the + * first one. + */ + emit_symbol_diff (acfg, acfg->got_symbol, ".", (offset * sizeof (gpointer)) - 4 + 4); + //emit_symbol_diff (acfg, acfg->got_symbol, ".", ((offset + 1) * sizeof (gpointer)) - 4 + 8); +#elif defined(TARGET_POWERPC) + guint8 buf [128]; + guint8 *code; + + *tramp_size = 4; + code = buf; + + g_assert (!acfg->use_bin_writer); + + /* + * PPC has no ip relative addressing, so we need to compute the address + * of the mscorlib got. That is slow and complex, so instead, we store it + * in the second got slot of every aot image. The caller already computed + * the address of its got and placed it into r30. + */ + img_writer_emit_unset_mode (acfg->w); + /* Load mscorlib got address */ + fprintf (acfg->fp, "%s 0, %d(30)\n", PPC_LD_OP, (int)sizeof (gpointer)); + /* Load generic trampoline address */ + fprintf (acfg->fp, "lis 11, %d@h\n", (int)(offset * sizeof (gpointer))); + fprintf (acfg->fp, "ori 11, 11, %d@l\n", (int)(offset * sizeof (gpointer))); + fprintf (acfg->fp, "%s 11, 11, 0\n", PPC_LDX_OP); +#ifdef PPC_USES_FUNCTION_DESCRIPTOR + fprintf (acfg->fp, "%s 11, 0(11)\n", PPC_LD_OP); +#endif + fprintf (acfg->fp, "mtctr 11\n"); + /* Load trampoline argument */ + /* On ppc, we pass it normally to the generic trampoline */ + fprintf (acfg->fp, "lis 11, %d@h\n", (int)((offset + 1) * sizeof (gpointer))); + fprintf (acfg->fp, "ori 11, 11, %d@l\n", (int)((offset + 1) * sizeof (gpointer))); + fprintf (acfg->fp, "%s 0, 11, 0\n", PPC_LDX_OP); + /* Branch to generic trampoline */ + fprintf (acfg->fp, "bctr\n"); + +#ifdef PPC_USES_FUNCTION_DESCRIPTOR + *tramp_size = 10 * 4; +#else + *tramp_size = 9 * 4; +#endif #else g_assert_not_reached (); #endif @@ -674,6 +829,16 @@ arch_emit_unbox_trampoline (MonoAotCompile *acfg, MonoMethod *method, MonoGeneri } else { fprintf (acfg->fp, "\n\tb %s\n", call_target); } +#elif defined(TARGET_POWERPC) + int this_pos = 3; + + if (MONO_TYPE_ISSTRUCT (mono_method_signature (method)->ret)) + this_pos = 4; + + g_assert (!acfg->use_bin_writer); + + fprintf (acfg->fp, "\n\taddi %d, %d, %d\n", this_pos, this_pos, (int)sizeof (MonoObject)); + fprintf (acfg->fp, "\n\tb %s\n", call_target); #else g_assert_not_reached (); #endif @@ -726,6 +891,46 @@ arch_emit_static_rgctx_trampoline (MonoAotCompile *acfg, int offset, int *tramp_ emit_bytes (acfg, buf, code - buf); emit_symbol_diff (acfg, acfg->got_symbol, ".", (offset * sizeof (gpointer)) - 4 + 8); emit_symbol_diff (acfg, acfg->got_symbol, ".", ((offset + 1) * sizeof (gpointer)) - 4 + 4); +#elif defined(TARGET_POWERPC) + guint8 buf [128]; + guint8 *code; + + *tramp_size = 4; + code = buf; + + g_assert (!acfg->use_bin_writer); + + /* + * PPC has no ip relative addressing, so we need to compute the address + * of the mscorlib got. That is slow and complex, so instead, we store it + * in the second got slot of every aot image. The caller already computed + * the address of its got and placed it into r30. + */ + img_writer_emit_unset_mode (acfg->w); + /* Load mscorlib got address */ + fprintf (acfg->fp, "%s 0, %d(30)\n", PPC_LD_OP, (int)sizeof (gpointer)); + /* Load rgctx */ + fprintf (acfg->fp, "lis 11, %d@h\n", (int)(offset * sizeof (gpointer))); + fprintf (acfg->fp, "ori 11, 11, %d@l\n", (int)(offset * sizeof (gpointer))); + fprintf (acfg->fp, "%s %d, 11, 0\n", PPC_LDX_OP, MONO_ARCH_RGCTX_REG); + /* Load target address */ + fprintf (acfg->fp, "lis 11, %d@h\n", (int)((offset + 1) * sizeof (gpointer))); + fprintf (acfg->fp, "ori 11, 11, %d@l\n", (int)((offset + 1) * sizeof (gpointer))); + fprintf (acfg->fp, "%s 11, 11, 0\n", PPC_LDX_OP); +#ifdef PPC_USES_FUNCTION_DESCRIPTOR + fprintf (acfg->fp, "%s 2, %d(11)\n", PPC_LD_OP, (int)sizeof (gpointer)); + fprintf (acfg->fp, "%s 11, 0(11)\n", PPC_LD_OP); +#endif + fprintf (acfg->fp, "mtctr 11\n"); + /* Branch to the target address */ + fprintf (acfg->fp, "bctr\n"); + +#ifdef PPC_USES_FUNCTION_DESCRIPTOR + *tramp_size = 11 * 4; +#else + *tramp_size = 9 * 4; +#endif + #else g_assert_not_reached (); #endif @@ -797,15 +1002,15 @@ arch_emit_imt_thunk (MonoAotCompile *acfg, int offset, int *tramp_size) /* The IMT method is in v5 */ - /* Only IP is available, but we need at least two free registers */ - ARM_PUSH1 (code, ARMREG_R1); + /* Need at least two free registers, plus a slot for storing the pc */ + ARM_PUSH (code, (1 << ARMREG_R0)|(1 << ARMREG_R1)|(1 << ARMREG_R2)); labels [0] = code; /* Load the parameter from the GOT */ - ARM_LDR_IMM (code, ARMREG_IP, ARMREG_PC, 0); - ARM_LDR_REG_REG (code, ARMREG_IP, ARMREG_PC, ARMREG_IP); + ARM_LDR_IMM (code, ARMREG_R0, ARMREG_PC, 0); + ARM_LDR_REG_REG (code, ARMREG_R0, ARMREG_PC, ARMREG_R0); labels [1] = code; - ARM_LDR_IMM (code, ARMREG_R1, ARMREG_IP, 0); + ARM_LDR_IMM (code, ARMREG_R1, ARMREG_R0, 0); ARM_CMP_REG_REG (code, ARMREG_R1, ARMREG_V5); labels [2] = code; ARM_B_COND (code, ARMCOND_EQ, 0); @@ -816,16 +1021,19 @@ arch_emit_imt_thunk (MonoAotCompile *acfg, int offset, int *tramp_size) ARM_B_COND (code, ARMCOND_EQ, 0); /* Loop footer */ - ARM_ADD_REG_IMM8 (code, ARMREG_IP, ARMREG_IP, sizeof (gpointer) * 2); + ARM_ADD_REG_IMM8 (code, ARMREG_R0, ARMREG_R0, sizeof (gpointer) * 2); labels [4] = code; ARM_B (code, 0); arm_patch (labels [4], labels [1]); /* Match */ arm_patch (labels [2], code); - ARM_POP1 (code, ARMREG_R1); - ARM_LDR_IMM (code, ARMREG_IP, ARMREG_IP, 4); - ARM_LDR_IMM (code, ARMREG_PC, ARMREG_IP, 0); + ARM_LDR_IMM (code, ARMREG_R0, ARMREG_R0, 4); + ARM_LDR_IMM (code, ARMREG_R0, ARMREG_R0, 0); + /* Save it to the third stack slot */ + ARM_STR_IMM (code, ARMREG_R0, ARMREG_SP, 8); + /* Restore the registers and branch */ + ARM_POP (code, (1 << ARMREG_R0)|(1 << ARMREG_R1)|(1 << ARMREG_PC)); /* No match */ arm_patch (labels [3], code); @@ -833,12 +1041,59 @@ arch_emit_imt_thunk (MonoAotCompile *acfg, int offset, int *tramp_size) /* Fixup offset */ code2 = labels [0]; - ARM_LDR_IMM (code2, ARMREG_IP, ARMREG_PC, (code - (labels [0] + 8))); + ARM_LDR_IMM (code2, ARMREG_R0, ARMREG_PC, (code - (labels [0] + 8))); emit_bytes (acfg, buf, code - buf); emit_symbol_diff (acfg, acfg->got_symbol, ".", (offset * sizeof (gpointer)) + (code - (labels [0] + 8)) - 4); *tramp_size = code - buf + 4; +#elif defined(TARGET_POWERPC) + guint8 buf [128]; + guint8 *code, *labels [16]; + + code = buf; + + /* Load the mscorlib got address */ + ppc_ldptr (code, ppc_r11, sizeof (gpointer), ppc_r30); + /* Load the parameter from the GOT */ + ppc_load (code, ppc_r0, offset * sizeof (gpointer)); + ppc_ldptr_indexed (code, ppc_r11, ppc_r11, ppc_r0); + + /* Load and check key */ + labels [1] = code; + ppc_ldptr (code, ppc_r0, 0, ppc_r11); + ppc_cmp (code, 0, sizeof (gpointer) == 8 ? 1 : 0, ppc_r0, MONO_ARCH_IMT_REG); + labels [2] = code; + ppc_bc (code, PPC_BR_TRUE, PPC_BR_EQ, 0); + + /* End-of-loop check */ + ppc_cmpi (code, 0, sizeof (gpointer) == 8 ? 1 : 0, ppc_r0, 0); + labels [3] = code; + ppc_bc (code, PPC_BR_TRUE, PPC_BR_EQ, 0); + + /* Loop footer */ + ppc_addi (code, ppc_r11, ppc_r11, 2 * sizeof (gpointer)); + labels [4] = code; + ppc_b (code, 0); + mono_ppc_patch (labels [4], labels [1]); + + /* Match */ + mono_ppc_patch (labels [2], code); + ppc_ldptr (code, ppc_r11, sizeof (gpointer), ppc_r11); + /* r11 now contains the value of the vtable slot */ + /* this is not a function descriptor on ppc64 */ + ppc_ldptr (code, ppc_r11, 0, ppc_r11); + ppc_mtctr (code, ppc_r11); + ppc_bcctr (code, PPC_BR_ALWAYS, 0); + + /* Fail */ + mono_ppc_patch (labels [3], code); + /* FIXME: */ + ppc_break (code); + + *tramp_size = code - buf; + + emit_bytes (acfg, buf, code - buf); #else g_assert_not_reached (); #endif @@ -858,6 +1113,12 @@ arch_get_cie_program (void) mono_add_unwind_op_def_cfa (l, (guint8*)NULL, (guint8*)NULL, AMD64_RSP, 8); mono_add_unwind_op_offset (l, (guint8*)NULL, (guint8*)NULL, AMD64_RIP, -8); + return l; +#elif defined(TARGET_POWERPC) + GSList *l = NULL; + + mono_add_unwind_op_def_cfa (l, (guint8*)NULL, (guint8*)NULL, ppc_r1, 0); + return l; #else return NULL; @@ -1164,7 +1425,6 @@ encode_method_ref (MonoAotCompile *acfg, MonoMethod *method, guint8 *buf, guint8 else g_assert_not_reached (); break; - case MONO_WRAPPER_STATIC_RGCTX_INVOKE: case MONO_WRAPPER_SYNCHRONIZED: case MONO_WRAPPER_MANAGED_TO_NATIVE: case MONO_WRAPPER_RUNTIME_INVOKE: { @@ -1450,7 +1710,7 @@ static void add_wrappers (MonoAotCompile *acfg) { MonoMethod *method, *m; - int i, j, nallocators; + int i, j; MonoMethodSignature *sig, *csig; guint32 token; @@ -1465,62 +1725,6 @@ add_wrappers (MonoAotCompile *acfg) * names. */ - /* FIXME: Collect these automatically */ - - /* Runtime invoke wrappers */ - - /* void runtime-invoke () [.cctor] */ - csig = mono_metadata_signature_alloc (mono_defaults.corlib, 0); - csig->ret = &mono_defaults.void_class->byval_arg; - add_method (acfg, get_runtime_invoke_sig (csig)); - - /* void runtime-invoke () [Finalize] */ - csig = mono_metadata_signature_alloc (mono_defaults.corlib, 0); - csig->hasthis = 1; - csig->ret = &mono_defaults.void_class->byval_arg; - add_method (acfg, get_runtime_invoke_sig (csig)); - - /* void runtime-invoke (string) [exception ctor] */ - csig = mono_metadata_signature_alloc (mono_defaults.corlib, 1); - csig->hasthis = 1; - csig->ret = &mono_defaults.void_class->byval_arg; - csig->params [0] = &mono_defaults.string_class->byval_arg; - add_method (acfg, get_runtime_invoke_sig (csig)); - - /* void runtime-invoke (string, string) [exception ctor] */ - csig = mono_metadata_signature_alloc (mono_defaults.corlib, 2); - csig->hasthis = 1; - csig->ret = &mono_defaults.void_class->byval_arg; - csig->params [0] = &mono_defaults.string_class->byval_arg; - csig->params [1] = &mono_defaults.string_class->byval_arg; - add_method (acfg, get_runtime_invoke_sig (csig)); - - /* string runtime-invoke () [Exception.ToString ()] */ - csig = mono_metadata_signature_alloc (mono_defaults.corlib, 0); - csig->hasthis = 1; - csig->ret = &mono_defaults.string_class->byval_arg; - add_method (acfg, get_runtime_invoke_sig (csig)); - - /* void runtime-invoke (string, Exception) [exception ctor] */ - csig = mono_metadata_signature_alloc (mono_defaults.corlib, 2); - csig->hasthis = 1; - csig->ret = &mono_defaults.void_class->byval_arg; - csig->params [0] = &mono_defaults.string_class->byval_arg; - csig->params [1] = &mono_defaults.exception_class->byval_arg; - add_method (acfg, get_runtime_invoke_sig (csig)); - - /* Assembly runtime-invoke (string, bool) [DoAssemblyResolve] */ - csig = mono_metadata_signature_alloc (mono_defaults.corlib, 2); - csig->hasthis = 1; - csig->ret = &(mono_class_from_name ( - mono_defaults.corlib, "System.Reflection", "Assembly"))->byval_arg; - csig->params [0] = &mono_defaults.string_class->byval_arg; - csig->params [1] = &mono_defaults.boolean_class->byval_arg; - add_method (acfg, get_runtime_invoke_sig (csig)); - - /* runtime-invoke used by finalizers */ - add_method (acfg, mono_marshal_get_runtime_invoke (mono_class_get_method_from_name_flags (mono_defaults.object_class, "Finalize", 0, 0), TRUE)); - for (i = 0; i < acfg->image->tables [MONO_TABLE_METHOD].rows; ++i) { MonoMethod *method; guint32 token = MONO_TOKEN_METHOD_DEF | (i + 1); @@ -1552,13 +1756,74 @@ add_wrappers (MonoAotCompile *acfg) } if (strcmp (acfg->image->assembly->aname.name, "mscorlib") == 0) { +#ifdef MONO_ARCH_HAVE_TLS_GET MonoMethodDesc *desc; MonoMethod *orig_method; + int nallocators; +#endif + + /* Runtime invoke wrappers */ + + /* void runtime-invoke () [.cctor] */ + csig = mono_metadata_signature_alloc (mono_defaults.corlib, 0); + csig->ret = &mono_defaults.void_class->byval_arg; + add_method (acfg, get_runtime_invoke_sig (csig)); + + /* void runtime-invoke () [Finalize] */ + csig = mono_metadata_signature_alloc (mono_defaults.corlib, 0); + csig->hasthis = 1; + csig->ret = &mono_defaults.void_class->byval_arg; + add_method (acfg, get_runtime_invoke_sig (csig)); + + /* void runtime-invoke (string) [exception ctor] */ + csig = mono_metadata_signature_alloc (mono_defaults.corlib, 1); + csig->hasthis = 1; + csig->ret = &mono_defaults.void_class->byval_arg; + csig->params [0] = &mono_defaults.string_class->byval_arg; + add_method (acfg, get_runtime_invoke_sig (csig)); + + /* void runtime-invoke (string, string) [exception ctor] */ + csig = mono_metadata_signature_alloc (mono_defaults.corlib, 2); + csig->hasthis = 1; + csig->ret = &mono_defaults.void_class->byval_arg; + csig->params [0] = &mono_defaults.string_class->byval_arg; + csig->params [1] = &mono_defaults.string_class->byval_arg; + add_method (acfg, get_runtime_invoke_sig (csig)); + + /* string runtime-invoke () [Exception.ToString ()] */ + csig = mono_metadata_signature_alloc (mono_defaults.corlib, 0); + csig->hasthis = 1; + csig->ret = &mono_defaults.string_class->byval_arg; + add_method (acfg, get_runtime_invoke_sig (csig)); + + /* void runtime-invoke (string, Exception) [exception ctor] */ + csig = mono_metadata_signature_alloc (mono_defaults.corlib, 2); + csig->hasthis = 1; + csig->ret = &mono_defaults.void_class->byval_arg; + csig->params [0] = &mono_defaults.string_class->byval_arg; + csig->params [1] = &mono_defaults.exception_class->byval_arg; + add_method (acfg, get_runtime_invoke_sig (csig)); + + /* Assembly runtime-invoke (string, bool) [DoAssemblyResolve] */ + csig = mono_metadata_signature_alloc (mono_defaults.corlib, 2); + csig->hasthis = 1; + csig->ret = &(mono_class_from_name ( + mono_defaults.corlib, "System.Reflection", "Assembly"))->byval_arg; + csig->params [0] = &mono_defaults.string_class->byval_arg; + csig->params [1] = &mono_defaults.boolean_class->byval_arg; + add_method (acfg, get_runtime_invoke_sig (csig)); + + /* runtime-invoke used by finalizers */ + add_method (acfg, mono_marshal_get_runtime_invoke (mono_class_get_method_from_name_flags (mono_defaults.object_class, "Finalize", 0, 0), TRUE)); /* JIT icall wrappers */ /* FIXME: locking */ g_hash_table_foreach (mono_get_jit_icall_info (), add_jit_icall_wrapper, acfg); + /* stelemref */ + add_method (acfg, mono_marshal_get_stelemref ()); + +#ifdef MONO_ARCH_HAVE_TLS_GET /* Managed Allocators */ nallocators = mono_gc_get_managed_allocator_types (); for (i = 0; i < nallocators; ++i) { @@ -1567,9 +1832,6 @@ add_wrappers (MonoAotCompile *acfg) add_method (acfg, m); } - /* stelemref */ - add_method (acfg, mono_marshal_get_stelemref ()); - /* Monitor Enter/Exit */ desc = mono_method_desc_new ("Monitor:Enter", FALSE); orig_method = mono_method_desc_search_in_class (desc, mono_defaults.monitor_class); @@ -1586,8 +1848,15 @@ add_wrappers (MonoAotCompile *acfg) method = mono_monitor_get_fast_path (orig_method); if (method) add_method (acfg, method); +#endif } + /* + * remoting-invoke-with-check wrappers are very frequent, so avoid emitting them, + * we use the original method instead at runtime. + * Since full-aot doesn't support remoting, this is not a problem. + */ +#if 0 /* remoting-invoke wrappers */ for (i = 0; i < acfg->image->tables [MONO_TABLE_METHOD].rows; ++i) { MonoMethodSignature *sig; @@ -1603,6 +1872,7 @@ add_wrappers (MonoAotCompile *acfg) add_method (acfg, m); } } +#endif /* delegate-invoke wrappers */ for (i = 0; i < acfg->image->tables [MONO_TABLE_TYPEDEF].rows; ++i) { @@ -1656,15 +1926,13 @@ add_wrappers (MonoAotCompile *acfg) klass = mono_class_get (acfg->image, token); if (klass->valuetype && !klass->generic_container && ((klass->flags & TYPE_ATTRIBUTE_LAYOUT_MASK) != TYPE_ATTRIBUTE_AUTO_LAYOUT)) { - MonoMarshalType *info; gboolean can_marshal = TRUE; - int j; - - info = mono_marshal_load_type_info (klass); + gpointer iter = NULL; + MonoClassField *field; /* Only allow a few field types to avoid asserts in the marshalling code */ - for (j = 0; j < info->num_fields; j++) { - switch (info->fields [j].field->type->type) { + while ((field = mono_class_get_fields (klass, &iter))) { + switch (field->type->type) { case MONO_TYPE_I4: case MONO_TYPE_U4: case MONO_TYPE_I1: @@ -1754,15 +2022,6 @@ add_generic_class (MonoAotCompile *acfg, MonoClass *klass) if (!klass->generic_class && !klass->rank) return; - /* - * Add rgctx wrappers for cctors since those are called by the runtime, so - * there is no methodspec for them. This is needed even for shared classes, - * since rgctx wrappers belong to inflated methods. - */ - method = mono_class_get_cctor (klass); - if (method && mono_method_needs_static_rgctx_invoke (method, FALSE)) - add_extra_method (acfg, mono_marshal_get_static_rgctx_invoke (method)); - iter = NULL; while ((method = mono_class_get_methods (klass, &iter))) { if (mono_method_is_generic_sharable_impl (method, FALSE)) @@ -1780,6 +2039,14 @@ add_generic_class (MonoAotCompile *acfg, MonoClass *klass) add_extra_method (acfg, method); } + if (klass->delegate) { + method = mono_get_delegate_invoke (klass); + + method = mono_marshal_get_delegate_invoke (method, NULL); + + add_method (acfg, method); + } + /* * For ICollection, where T is a vtype, add instances of the helper methods * in Array, since a T[] could be cast to ICollection. @@ -1821,6 +2088,18 @@ add_generic_class (MonoAotCompile *acfg, MonoClass *klass) } } +static void +add_array_wrappers (MonoAotCompile *acfg, MonoClass *klass) +{ + int i; + + mono_class_setup_methods (klass); + for (i = 0; i < klass->method.count; ++i) { + if (klass->methods [i]->wrapper_type == MONO_WRAPPER_MANAGED_TO_MANAGED) + add_extra_method (acfg, klass->methods [i]); + } +} + /* * add_generic_instances: * @@ -1889,6 +2168,157 @@ add_generic_instances (MonoAotCompile *acfg) add_generic_class (acfg, mono_class_from_mono_type (header->locals [j])); } } + + if (acfg->image == mono_defaults.corlib) { + /* Add GenericComparer instances for primitive types for Enum.ToString () */ + MonoClass *klass = mono_class_from_name (acfg->image, "System.Collections.Generic", "GenericComparer`1"); + + if (klass) { + MonoGenericContext ctx; + MonoType *args [16]; + + memset (&ctx, 0, sizeof (ctx)); + + args [0] = &mono_defaults.byte_class->byval_arg; + ctx.class_inst = mono_metadata_get_generic_inst (1, args); + add_generic_class (acfg, mono_class_inflate_generic_class (klass, &ctx)); + + args [0] = &mono_defaults.sbyte_class->byval_arg; + ctx.class_inst = mono_metadata_get_generic_inst (1, args); + add_generic_class (acfg, mono_class_inflate_generic_class (klass, &ctx)); + + args [0] = &mono_defaults.int16_class->byval_arg; + ctx.class_inst = mono_metadata_get_generic_inst (1, args); + add_generic_class (acfg, mono_class_inflate_generic_class (klass, &ctx)); + + args [0] = &mono_defaults.uint16_class->byval_arg; + ctx.class_inst = mono_metadata_get_generic_inst (1, args); + add_generic_class (acfg, mono_class_inflate_generic_class (klass, &ctx)); + + args [0] = &mono_defaults.int32_class->byval_arg; + ctx.class_inst = mono_metadata_get_generic_inst (1, args); + add_generic_class (acfg, mono_class_inflate_generic_class (klass, &ctx)); + + args [0] = &mono_defaults.uint32_class->byval_arg; + ctx.class_inst = mono_metadata_get_generic_inst (1, args); + add_generic_class (acfg, mono_class_inflate_generic_class (klass, &ctx)); + + args [0] = &mono_defaults.int64_class->byval_arg; + ctx.class_inst = mono_metadata_get_generic_inst (1, args); + add_generic_class (acfg, mono_class_inflate_generic_class (klass, &ctx)); + + args [0] = &mono_defaults.uint64_class->byval_arg; + ctx.class_inst = mono_metadata_get_generic_inst (1, args); + add_generic_class (acfg, mono_class_inflate_generic_class (klass, &ctx)); + } + + /* Add GenericEqualityComparer instances for primitive types */ + klass = mono_class_from_name (acfg->image, "System.Collections.Generic", "GenericEqualityComparer`1"); + + if (klass) { + MonoGenericContext ctx; + MonoType *args [16]; + + memset (&ctx, 0, sizeof (ctx)); + + args [0] = &mono_defaults.byte_class->byval_arg; + ctx.class_inst = mono_metadata_get_generic_inst (1, args); + add_generic_class (acfg, mono_class_inflate_generic_class (klass, &ctx)); + + args [0] = &mono_defaults.sbyte_class->byval_arg; + ctx.class_inst = mono_metadata_get_generic_inst (1, args); + add_generic_class (acfg, mono_class_inflate_generic_class (klass, &ctx)); + + args [0] = &mono_defaults.int16_class->byval_arg; + ctx.class_inst = mono_metadata_get_generic_inst (1, args); + add_generic_class (acfg, mono_class_inflate_generic_class (klass, &ctx)); + + args [0] = &mono_defaults.uint16_class->byval_arg; + ctx.class_inst = mono_metadata_get_generic_inst (1, args); + add_generic_class (acfg, mono_class_inflate_generic_class (klass, &ctx)); + + args [0] = &mono_defaults.int32_class->byval_arg; + ctx.class_inst = mono_metadata_get_generic_inst (1, args); + add_generic_class (acfg, mono_class_inflate_generic_class (klass, &ctx)); + + args [0] = &mono_defaults.uint32_class->byval_arg; + ctx.class_inst = mono_metadata_get_generic_inst (1, args); + add_generic_class (acfg, mono_class_inflate_generic_class (klass, &ctx)); + + args [0] = &mono_defaults.int64_class->byval_arg; + ctx.class_inst = mono_metadata_get_generic_inst (1, args); + add_generic_class (acfg, mono_class_inflate_generic_class (klass, &ctx)); + + args [0] = &mono_defaults.uint64_class->byval_arg; + ctx.class_inst = mono_metadata_get_generic_inst (1, args); + add_generic_class (acfg, mono_class_inflate_generic_class (klass, &ctx)); + } + + /* Emit the array wrapper methods for arrays of primitive types */ + add_array_wrappers (acfg, mono_array_class_get (mono_defaults.byte_class, 1)); + add_array_wrappers (acfg, mono_array_class_get (mono_defaults.sbyte_class, 1)); + add_array_wrappers (acfg, mono_array_class_get (mono_defaults.int16_class, 1)); + add_array_wrappers (acfg, mono_array_class_get (mono_defaults.uint16_class, 1)); + add_array_wrappers (acfg, mono_array_class_get (mono_defaults.int32_class, 1)); + add_array_wrappers (acfg, mono_array_class_get (mono_defaults.uint32_class, 1)); + add_array_wrappers (acfg, mono_array_class_get (mono_defaults.int64_class, 1)); + add_array_wrappers (acfg, mono_array_class_get (mono_defaults.single_class, 1)); + add_array_wrappers (acfg, mono_array_class_get (mono_defaults.double_class, 1)); + /* These are not handled by generic sharing */ + add_array_wrappers (acfg, mono_array_class_get (mono_defaults.object_class, 1)); + add_array_wrappers (acfg, mono_array_class_get (mono_defaults.string_class, 1)); + + /* Add instances of Array.GetGenericValueImpl */ + { + MonoGenericContext ctx; + MonoType *args [16]; + MonoMethod *method; + + memset (&ctx, 0, sizeof (ctx)); + + /* + * managed-to-native wrappers are not shared, so have to generate + * these for ref types too. + */ + klass = mono_array_class_get (mono_defaults.int_class, 1)->parent; + method = mono_class_get_method_from_name (klass, "GetGenericValueImpl", 2); + + if (method) { + /* String */ + args [0] = &mono_defaults.string_class->byval_arg; + ctx.method_inst = mono_metadata_get_generic_inst (1, args); + add_extra_method (acfg, mono_marshal_get_native_wrapper (mono_class_inflate_generic_method (method, &ctx), TRUE, TRUE)); + } + } + } +} + +/* + * is_direct_callable: + * + * Return whenever the method identified by JI is directly callable without + * going through the PLT. + */ +static gboolean +is_direct_callable (MonoAotCompile *acfg, MonoMethod *method, MonoJumpInfo *patch_info) +{ + if ((patch_info->type == MONO_PATCH_INFO_METHOD) && (patch_info->data.method->klass->image == acfg->image)) { + MonoCompile *callee_cfg = g_hash_table_lookup (acfg->method_to_cfg, patch_info->data.method); + if (callee_cfg) { + gboolean direct_callable = TRUE; + + if (direct_callable && !(!callee_cfg->has_got_slots && (callee_cfg->method->klass->flags & TYPE_ATTRIBUTE_BEFORE_FIELD_INIT))) + direct_callable = FALSE; + if ((callee_cfg->method->iflags & METHOD_IMPL_ATTRIBUTE_SYNCHRONIZED) && (!method || method->wrapper_type != MONO_WRAPPER_SYNCHRONIZED)) + // FIXME: Maybe call the wrapper directly ? + direct_callable = FALSE; + + if (direct_callable) + return TRUE; + } + } + + return FALSE; } /* @@ -1945,6 +2375,7 @@ emit_and_reloc_code (MonoAotCompile *acfg, MonoMethod *method, guint8 *code, gui arch_emit_got_offset (acfg, code + i, &code_size); i += code_size - 1; skip = TRUE; + patch_info->type = MONO_PATCH_INFO_NONE; break; } default: { @@ -1954,23 +2385,14 @@ emit_and_reloc_code (MonoAotCompile *acfg, MonoMethod *method, guint8 *code, gui * the same assembly and requires no initialization. */ direct_call = FALSE; - if (!got_only && (patch_info->type == MONO_PATCH_INFO_METHOD) && (patch_info->data.method->klass->image == method->klass->image)) { - MonoCompile *callee_cfg = g_hash_table_lookup (acfg->method_to_cfg, patch_info->data.method); - if (callee_cfg) { - gboolean direct_callable = TRUE; - - if (direct_callable && !(!callee_cfg->has_got_slots && (callee_cfg->method->klass->flags & TYPE_ATTRIBUTE_BEFORE_FIELD_INIT))) - direct_callable = FALSE; - if ((callee_cfg->method->iflags & METHOD_IMPL_ATTRIBUTE_SYNCHRONIZED) && method->wrapper_type != MONO_WRAPPER_SYNCHRONIZED) - // FIXME: Maybe call the wrapper directly ? - direct_callable = FALSE; - if (direct_callable) { - //printf ("DIRECT: %s %s\n", method ? mono_method_full_name (method, TRUE) : "", mono_method_full_name (callee_cfg->method, TRUE)); - direct_call = TRUE; - sprintf (direct_call_target, ".Lm_%x", get_method_index (acfg, callee_cfg->orig_method)); - patch_info->type = MONO_PATCH_INFO_NONE; - acfg->stats.direct_calls ++; - } + if ((patch_info->type == MONO_PATCH_INFO_METHOD) && (patch_info->data.method->klass->image == acfg->image)) { + if (!got_only && is_direct_callable (acfg, method, patch_info)) { + MonoCompile *callee_cfg = g_hash_table_lookup (acfg->method_to_cfg, patch_info->data.method); + //printf ("DIRECT: %s %s\n", method ? mono_method_full_name (method, TRUE) : "", mono_method_full_name (callee_cfg->method, TRUE)); + direct_call = TRUE; + sprintf (direct_call_target, "%sm_%x", acfg->temp_prefix, get_method_index (acfg, callee_cfg->orig_method)); + patch_info->type = MONO_PATCH_INFO_NONE; + acfg->stats.direct_calls ++; } acfg->stats.all_calls ++; @@ -1981,7 +2403,7 @@ emit_and_reloc_code (MonoAotCompile *acfg, MonoMethod *method, guint8 *code, gui if (plt_offset != -1) { /* This patch has a PLT entry, so we must emit a call to the PLT entry */ direct_call = TRUE; - sprintf (direct_call_target, ".Lp_%d", plt_offset); + sprintf (direct_call_target, "%sp_%d", acfg->temp_prefix, plt_offset); /* Nullify the patch */ patch_info->type = MONO_PATCH_INFO_NONE; @@ -2027,14 +2449,69 @@ emit_and_reloc_code (MonoAotCompile *acfg, MonoMethod *method, guint8 *code, gui } } +/* + * sanitize_symbol: + * + * Modify SYMBOL so it only includes characters permissible in symbols. + */ +static void +sanitize_symbol (char *symbol) +{ + int i, len = strlen (symbol); + + for (i = 0; i < len; ++i) + if (!isalnum (symbol [i]) && (symbol [i] != '_')) + symbol [i] = '_'; +} + +static char* +get_debug_sym (MonoMethod *method, const char *prefix, GHashTable *cache) +{ + char *name1, *name2, *cached; + int i, j, len, count; + + name1 = mono_method_full_name (method, TRUE); + len = strlen (name1); + name2 = malloc (strlen (prefix) + len + 16); + memcpy (name2, prefix, strlen (prefix)); + j = strlen (prefix); + for (i = 0; i < len; ++i) { + if (isalnum (name1 [i])) { + name2 [j ++] = name1 [i]; + } else if (name1 [i] == ' ' && name1 [i + 1] == '(' && name1 [i + 2] == ')') { + i += 2; + } else if (name1 [i] == ',' && name1 [i + 1] == ' ') { + name2 [j ++] = '_'; + i++; + } else if (name1 [i] == '(' || name1 [i] == ')' || name1 [i] == '>') { + } else + name2 [j ++] = '_'; + } + name2 [j] = '\0'; + + g_free (name1); + + count = 0; + while (g_hash_table_lookup (cache, name2)) { + sprintf (name2 + j, "_%d", count); + count ++; + } + + cached = g_strdup (name2); + g_hash_table_insert (cache, cached, cached); + + return name2; +} + static void emit_method_code (MonoAotCompile *acfg, MonoCompile *cfg) { MonoMethod *method; int method_index; guint8 *code; + char *debug_sym = NULL; char symbol [128]; - int func_alignment = 16; + int func_alignment = AOT_FUNC_ALIGNMENT; MonoMethodHeader *header; method = cfg->orig_method; @@ -2043,54 +2520,44 @@ emit_method_code (MonoAotCompile *acfg, MonoCompile *cfg) method_index = get_method_index (acfg, method); + /* Emit unbox trampoline */ + if (acfg->aot_opts.full_aot && cfg->orig_method->klass->valuetype && (method->flags & METHOD_ATTRIBUTE_VIRTUAL)) { + char call_target [256]; + + if (!method->wrapper_type && !method->is_inflated) { + g_assert (method->token); + sprintf (symbol, "ut_%d", mono_metadata_token_index (method->token) - 1); + } else { + sprintf (symbol, "ut_e_%d", get_method_index (acfg, method)); + } + + emit_section_change (acfg, ".text", 0); + emit_global (acfg, symbol, TRUE); + emit_label (acfg, symbol); + + sprintf (call_target, "%sm_%x", acfg->temp_prefix, method_index); + + arch_emit_unbox_trampoline (acfg, cfg->orig_method, cfg->generic_sharing_context, call_target); + } + /* Make the labels local */ - sprintf (symbol, ".Lm_%x", method_index); + sprintf (symbol, "%sm_%x", acfg->temp_prefix, method_index); emit_alignment (acfg, func_alignment); emit_label (acfg, symbol); if (acfg->aot_opts.write_symbols) { - char *name1, *name2, *cached; - int i, j, len, count; - /* * Write a C style symbol for every method, this has two uses: * - it works on platforms where the dwarf debugging info is not * yet supported. * - it allows the setting of breakpoints of aot-ed methods. */ - name1 = mono_method_full_name (method, TRUE); - len = strlen (name1); - name2 = malloc (len + 1); - j = 0; - for (i = 0; i < len; ++i) { - if (isalnum (name1 [i])) { - name2 [j ++] = name1 [i]; - } else if (name1 [i] == ' ' && name1 [i + 1] == '(' && name1 [i + 2] == ')') { - i += 2; - } else if (name1 [i] == ',' && name1 [i + 1] == ' ') { - name2 [j ++] = '_'; - i++; - } else if (name1 [i] == '(' || name1 [i] == ')' || name1 [i] == '>') { - } else - name2 [j ++] = '_'; - } - name2 [j] = '\0'; - - count = 0; - while (g_hash_table_lookup (acfg->method_label_hash, name2)) { - sprintf (name2 + j, "_%d", count); - count ++; - } - - cached = g_strdup (name2); - g_hash_table_insert (acfg->method_label_hash, cached, cached); + debug_sym = get_debug_sym (method, "", acfg->method_label_hash); - sprintf (symbol, ".Lme_%x", method_index); - emit_local_symbol (acfg, name2, symbol, TRUE); - emit_label (acfg, name2); - g_free (name1); - g_free (name2); + sprintf (symbol, "%sme_%x", acfg->temp_prefix, method_index); + emit_local_symbol (acfg, debug_sym, symbol, TRUE); + emit_label (acfg, debug_sym); } if (cfg->verbose_level > 0) @@ -2104,7 +2571,12 @@ emit_method_code (MonoAotCompile *acfg, MonoCompile *cfg) emit_line (acfg); - sprintf (symbol, ".Lme_%x", method_index); + if (acfg->aot_opts.write_symbols) { + emit_symbol_size (acfg, debug_sym, "."); + g_free (debug_sym); + } + + sprintf (symbol, "%sme_%x", acfg->temp_prefix, method_index); emit_label (acfg, symbol); } @@ -2124,6 +2596,8 @@ encode_patch (MonoAotCompile *acfg, MonoJumpInfo *patch_info, guint8 *buf, guint case MONO_PATCH_INFO_IMAGE: encode_value (get_image_index (acfg, patch_info->data.image), p, &p); break; + case MONO_PATCH_INFO_MSCORLIB_GOT_ADDR: + break; case MONO_PATCH_INFO_METHOD_REL: encode_value ((gint)patch_info->data.offset, p, &p); break; @@ -2236,9 +2710,6 @@ encode_patch_list (MonoAotCompile *acfg, GPtrArray *patches, int n_patches, int encode_value (n_patches, p, &p); - if (n_patches) - encode_value (first_got_offset, p, &p); - for (pindex = 0; pindex < patches->len; ++pindex) { patch_info = g_ptr_array_index (patches, pindex); @@ -2275,7 +2746,7 @@ emit_method_info (MonoAotCompile *acfg, MonoCompile *cfg) method_index = get_method_index (acfg, method); /* Make the labels local */ - sprintf (symbol, ".Lm_%x_p", method_index); + sprintf (symbol, "%sm_%x_p", acfg->temp_prefix, method_index); /* Sort relocations */ patches = g_ptr_array_new (); @@ -2405,7 +2876,7 @@ emit_exception_debug_info (MonoAotCompile *acfg, MonoCompile *cfg) method_index = get_method_index (acfg, method); /* Make the labels local */ - sprintf (symbol, ".Le_%x_p", method_index); + sprintf (symbol, "%se_%x_p", acfg->temp_prefix, method_index); if (!acfg->aot_opts.nodebug) { mono_debug_serialize_debug_info (cfg, &debug_info, &debug_info_size); @@ -2421,7 +2892,7 @@ emit_exception_debug_info (MonoAotCompile *acfg, MonoCompile *cfg) use_unwind_ops = cfg->unwind_ops != NULL; #endif - flags = (jinfo->has_generic_jit_info ? 1 : 0) | (use_unwind_ops ? 2 : 0); + flags = (jinfo->has_generic_jit_info ? 1 : 0) | (use_unwind_ops ? 2 : 0) | (header->num_clauses ? 4 : 0); encode_value (jinfo->code_size, p, &p); encode_value (flags, p, &p); @@ -2442,19 +2913,28 @@ emit_exception_debug_info (MonoAotCompile *acfg, MonoCompile *cfg) } /* Exception table */ - if (header->num_clauses) { - for (k = 0; k < header->num_clauses; ++k) { - MonoJitExceptionInfo *ei = &jinfo->clauses [k]; + if (jinfo->num_clauses) + encode_value (jinfo->num_clauses, p, &p); - encode_value (ei->exvar_offset, p, &p); + for (k = 0; k < jinfo->num_clauses; ++k) { + MonoJitExceptionInfo *ei = &jinfo->clauses [k]; - if (ei->flags == MONO_EXCEPTION_CLAUSE_FILTER) - encode_value ((gint)((guint8*)ei->data.filter - code), p, &p); + encode_value (ei->exvar_offset, p, &p); - encode_value ((gint)((guint8*)ei->try_start - code), p, &p); - encode_value ((gint)((guint8*)ei->try_end - code), p, &p); - encode_value ((gint)((guint8*)ei->handler_start - code), p, &p); + if (ei->flags == MONO_EXCEPTION_CLAUSE_FILTER) + encode_value ((gint)((guint8*)ei->data.filter - code), p, &p); + else { + if (ei->data.catch_class) { + encode_value (1, p, &p); + encode_klass_ref (acfg, ei->data.catch_class, p, &p); + } else { + encode_value (0, p, &p); + } } + + encode_value ((gint)((guint8*)ei->try_start - code), p, &p); + encode_value ((gint)((guint8*)ei->try_end - code), p, &p); + encode_value ((gint)((guint8*)ei->handler_start - code), p, &p); } if (jinfo->has_generic_jit_info) { @@ -2558,7 +3038,7 @@ emit_klass_info (MonoAotCompile *acfg, guint32 token) acfg->stats.class_info_size += p - buf; /* Emit the info */ - sprintf (symbol, ".LK_I_%x", token - MONO_TOKEN_TYPE_DEF - 1); + sprintf (symbol, "%sK_I_%x", acfg->temp_prefix, token - MONO_TOKEN_TYPE_DEF - 1); emit_label (acfg, symbol); g_assert (p - buf < buf_size); @@ -2580,6 +3060,9 @@ emit_plt (MonoAotCompile *acfg) { char symbol [128]; int i; + GHashTable *cache; + + cache = g_hash_table_new (g_str_hash, g_str_equal); emit_line (acfg); sprintf (symbol, "plt"); @@ -2593,28 +3076,83 @@ emit_plt (MonoAotCompile *acfg) emit_alignment (acfg, 16); #endif emit_label (acfg, symbol); + emit_label (acfg, acfg->plt_symbol); for (i = 0; i < acfg->plt_offset; ++i) { char label [128]; + char *debug_sym = NULL; - sprintf (label, ".Lp_%d", i); + sprintf (label, "%sp_%d", acfg->temp_prefix, i); emit_label (acfg, label); + if (acfg->aot_opts.write_symbols) { + MonoJumpInfo *ji = g_hash_table_lookup (acfg->plt_offset_to_patch, GUINT_TO_POINTER (i)); + char *debug_sym = NULL; + + if (ji) { + switch (ji->type) { + case MONO_PATCH_INFO_METHOD: + debug_sym = get_debug_sym (ji->data.method, "plt_", cache); + break; + case MONO_PATCH_INFO_INTERNAL_METHOD: + debug_sym = g_strdup_printf ("plt__jit_icall_%s", ji->data.name); + break; + case MONO_PATCH_INFO_CLASS_INIT: + debug_sym = g_strdup_printf ("plt__class_init_%s", mono_type_get_name (&ji->data.klass->byval_arg)); + sanitize_symbol (debug_sym); + break; + case MONO_PATCH_INFO_RGCTX_FETCH: + debug_sym = g_strdup_printf ("plt__rgctx_fetch_%d", 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); + g_free (s); + break; + } + case MONO_PATCH_INFO_JIT_ICALL_ADDR: + debug_sym = g_strdup_printf ("plt__jit_icall_native_%s", ji->data.name); + break; + case MONO_PATCH_INFO_GENERIC_CLASS_INIT: + debug_sym = g_strdup_printf ("plt__generic_class_init"); + break; + default: + break; + } + + if (debug_sym) { + emit_local_symbol (acfg, debug_sym, NULL, TRUE); + emit_label (acfg, debug_sym); + } + } + } + /* * The first plt entry is used to transfer code to the AOT loader. */ arch_emit_plt_entry (acfg, i); + + if (debug_sym) { + emit_symbol_size (acfg, debug_sym, "."); + g_free (debug_sym); + } } + emit_symbol_size (acfg, acfg->plt_symbol, "."); + sprintf (symbol, "plt_end"); emit_global (acfg, symbol, TRUE); emit_label (acfg, symbol); + + g_hash_table_destroy (cache); } static G_GNUC_UNUSED void emit_trampoline (MonoAotCompile *acfg, const char *name, guint8 *code, guint32 code_size, int got_offset, MonoJumpInfo *ji, GSList *unwind_ops) { + char start_symbol [256]; char symbol [256]; guint32 buf_size; MonoJumpInfo *patch_info; @@ -2623,14 +3161,14 @@ emit_trampoline (MonoAotCompile *acfg, const char *name, guint8 *code, /* Emit code */ - sprintf (symbol, "%s", name); + sprintf (start_symbol, "%s", name); emit_section_change (acfg, ".text", 0); - emit_global (acfg, symbol, TRUE); + emit_global (acfg, start_symbol, TRUE); emit_alignment (acfg, 16); - emit_label (acfg, symbol); + emit_label (acfg, start_symbol); - sprintf (symbol, ".Lnamed_%s", name); + sprintf (symbol, "%snamed_%s", acfg->temp_prefix, name); emit_label (acfg, symbol); /* @@ -2639,12 +3177,15 @@ emit_trampoline (MonoAotCompile *acfg, const char *name, guint8 *code, */ emit_and_reloc_code (acfg, NULL, code, code_size, ji, TRUE); + emit_symbol_size (acfg, start_symbol, "."); + /* Emit info */ /* Sort relocations */ patches = g_ptr_array_new (); for (patch_info = ji; patch_info; patch_info = patch_info->next) - g_ptr_array_add (patches, patch_info); + if (patch_info->type != MONO_PATCH_INFO_NONE) + g_ptr_array_add (patches, patch_info); g_ptr_array_sort (patches, compare_patches); buf_size = patches->len * 128 + 128; @@ -2667,7 +3208,7 @@ emit_trampoline (MonoAotCompile *acfg, const char *name, guint8 *code, char symbol2 [256]; sprintf (symbol, "%s", name); - sprintf (symbol2, ".Lnamed_%s", name); + sprintf (symbol2, "%snamed_%s", acfg->temp_prefix, name); if (acfg->dwarf) mono_dwarf_writer_emit_trampoline (acfg->dwarf, symbol, symbol2, NULL, NULL, code_size, unwind_ops); @@ -2744,7 +3285,6 @@ emit_trampolines (MonoAotCompile *acfg) emit_trampoline (acfg, "throw_pending_exception", code, code_size, acfg->got_offset, ji, NULL); #endif -#if defined(TARGET_AMD64) || defined(TARGET_ARM) for (i = 0; i < 128; ++i) { int offset; @@ -2758,9 +3298,7 @@ emit_trampolines (MonoAotCompile *acfg) sprintf (symbol, "rgctx_fetch_trampoline_%u", offset); emit_trampoline (acfg, symbol, code, code_size, acfg->got_offset, ji, NULL); } -#endif -#if defined(TARGET_AMD64) || defined(TARGET_ARM) { GSList *l; @@ -2773,7 +3311,6 @@ emit_trampolines (MonoAotCompile *acfg) l = l->next; } } -#endif #endif /* #ifdef MONO_ARCH_HAVE_FULL_AOT_TRAMPOLINES */ @@ -2863,32 +3400,6 @@ emit_trampolines (MonoAotCompile *acfg) acfg->num_trampoline_got_entries = tramp_got_offset - acfg->got_offset; } - /* Unbox trampolines */ - for (i = 0; i < acfg->methods->len; ++i) { - MonoMethod *method = g_ptr_array_index (acfg->methods, i); - MonoCompile *cfg; - char call_target [256]; - - cfg = g_hash_table_lookup (acfg->method_to_cfg, method); - if (!cfg || !cfg->orig_method->klass->valuetype || !(method->flags & METHOD_ATTRIBUTE_VIRTUAL)) - continue; - - if (!method->wrapper_type && !method->is_inflated) { - g_assert (method->token); - sprintf (symbol, "ut_%d", mono_metadata_token_index (method->token) - 1); - } else { - sprintf (symbol, "ut_e_%d", get_method_index (acfg, method)); - } - - emit_section_change (acfg, ".text", 0); - emit_global (acfg, symbol, TRUE); - emit_label (acfg, symbol); - - sprintf (call_target, ".Lm_%x", get_method_index (acfg, cfg->orig_method)); - - arch_emit_unbox_trampoline (acfg, cfg->orig_method, cfg->generic_sharing_context, call_target); - } - acfg->got_offset += acfg->num_trampoline_got_entries; } @@ -2935,6 +3446,8 @@ mono_aot_parse_options (const char *aot_options, MonoAotOptions *opts) opts->nodebug = TRUE; } else if (str_begins_with (arg, "ntrampolines=")) { opts->ntrampolines = atoi (arg + strlen ("ntrampolines=")); + } else if (str_begins_with (arg, "tool-prefix=")) { + opts->tool_prefix = g_strdup (arg + strlen ("tool-prefix=")); } else { fprintf (stderr, "AOT : Unknown argument '%s'.\n", arg); exit (1); @@ -2994,9 +3507,6 @@ can_encode_patch (MonoAotCompile *acfg, MonoJumpInfo *patch_info) case MONO_WRAPPER_REMOTING_INVOKE: case MONO_WRAPPER_UNKNOWN: break; - case MONO_WRAPPER_STATIC_RGCTX_INVOKE: - g_assert (!acfg->aot_opts.full_aot); - break; default: //printf ("Skip (wrapper call): %d -> %s\n", patch_info->type, mono_method_full_name (patch_info->data.method, TRUE)); return FALSE; @@ -3196,6 +3706,13 @@ compile_method (MonoAotCompile *acfg, MonoMethod *method) } break; } + case MONO_PATCH_INFO_VTABLE: { + MonoClass *klass = patch_info->data.klass; + + if (klass->generic_class && !mono_generic_context_is_sharable (&klass->generic_class->context, FALSE)) + add_generic_class (acfg, klass); + break; + } default: break; } @@ -3394,6 +3911,14 @@ emit_code (MonoAotCompile *acfg) char symbol [256]; GList *l; +#if defined(TARGET_POWERPC64) + sprintf (symbol, ".Lgot_addr"); + emit_section_change (acfg, ".text", 0); + emit_alignment (acfg, 8); + emit_label (acfg, symbol); + emit_pointer (acfg, acfg->got_symbol); +#endif + sprintf (symbol, "methods"); emit_section_change (acfg, ".text", 0); emit_global (acfg, symbol, TRUE); @@ -3427,7 +3952,7 @@ emit_code (MonoAotCompile *acfg) for (i = 0; i < acfg->nmethods; ++i) { if (acfg->cfgs [i]) { - sprintf (symbol, ".Lm_%x", i); + sprintf (symbol, "%sm_%x", acfg->temp_prefix, i); emit_symbol_diff (acfg, symbol, "methods", 0); } else { emit_int32 (acfg, 0xffffffff); @@ -3469,7 +3994,7 @@ emit_info (MonoAotCompile *acfg) for (i = 0; i < acfg->nmethods; ++i) { if (acfg->cfgs [i]) { - sprintf (symbol, ".Lm_%x_p", i); + sprintf (symbol, "%sm_%x_p", acfg->temp_prefix, i); emit_symbol_diff (acfg, symbol, "mi", 0); } else { emit_int32 (acfg, 0); @@ -3934,7 +4459,7 @@ emit_exception_info (MonoAotCompile *acfg) for (i = 0; i < acfg->nmethods; ++i) { if (acfg->cfgs [i]) { - sprintf (symbol, ".Le_%x_p", i); + sprintf (symbol, "%se_%x_p", acfg->temp_prefix, i); emit_symbol_diff (acfg, symbol, "ex", 0); } else { emit_int32 (acfg, 0); @@ -4001,7 +4526,7 @@ emit_class_info (MonoAotCompile *acfg) emit_label (acfg, symbol); for (i = 0; i < acfg->image->tables [MONO_TABLE_TYPEDEF].rows; ++i) { - sprintf (symbol, ".LK_I_%x", i); + sprintf (symbol, "%sK_I_%x", acfg->temp_prefix, i); emit_symbol_diff (acfg, symbol, "class_info", 0); } emit_line (acfg); @@ -4156,6 +4681,9 @@ emit_got_info (MonoAotCompile *acfg) 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); @@ -4186,7 +4714,8 @@ emit_got_info (MonoAotCompile *acfg) emit_alignment (acfg, 8); emit_label (acfg, symbol); - for (i = 0; i < acfg->got_patches->len; ++i) + /* No need to emit offsets for the got plt entries, the plt embeds them directly */ + for (i = 0; i < first_plt_got_patch; ++i) emit_int32 (acfg, got_info_offsets [i]); acfg->stats.got_info_offsets_size = acfg->got_patches->len * 4; @@ -4198,7 +4727,7 @@ emit_got (MonoAotCompile *acfg) char symbol [256]; /* Don't make GOT global so accesses to it don't need relocations */ - sprintf (symbol, acfg->got_symbol); + sprintf (symbol, "%s", acfg->got_symbol); emit_section_change (acfg, ".bss", 0); emit_alignment (acfg, 8); emit_local_symbol (acfg, symbol, "got_end", FALSE); @@ -4337,6 +4866,7 @@ emit_file_info (MonoAotCompile *acfg) emit_int32 (acfg, acfg->plt_got_offset_base); emit_int32 (acfg, (int)(acfg->got_offset * sizeof (gpointer))); emit_int32 (acfg, acfg->plt_offset); + emit_int32 (acfg, acfg->nmethods); for (i = 0; i < MONO_AOT_TRAMP_NUM; ++i) emit_int32 (acfg, acfg->num_trampolines [i]); @@ -4360,10 +4890,10 @@ emit_dwarf_info (MonoAotCompile *acfg) if (!cfg) continue; - sprintf (symbol, ".Lm_%x", i); - sprintf (symbol2, ".Lme_%x", i); + sprintf (symbol, "%sm_%x", acfg->temp_prefix, i); + sprintf (symbol2, "%sme_%x", acfg->temp_prefix, i); - mono_dwarf_writer_emit_method (acfg->dwarf, cfg, cfg->method, symbol, symbol2, NULL, 0, cfg->args, cfg->locals, cfg->unwind_ops, NULL); + mono_dwarf_writer_emit_method (acfg->dwarf, cfg, cfg->method, symbol, symbol2, cfg->jit_info->code_start, cfg->jit_info->code_size, cfg->args, cfg->locals, cfg->unwind_ops, mono_debug_find_method (cfg->jit_info->method, mono_domain_get ())); } #endif } @@ -4473,13 +5003,21 @@ compile_asm (MonoAotCompile *acfg) { char *command, *objfile; char *outfile_name, *tmp_outfile_name; + const char *tool_prefix = acfg->aot_opts.tool_prefix ? acfg->aot_opts.tool_prefix : ""; #if defined(TARGET_AMD64) #define AS_OPTIONS "--64" +#elif defined(TARGET_POWERPC64) +#define AS_OPTIONS "-a64 -mppc64" +#define LD_OPTIONS "-m elf64ppc" #elif defined(sparc) && SIZEOF_VOID_P == 8 #define AS_OPTIONS "-xarch=v9" #else #define AS_OPTIONS "" +#endif + +#ifndef LD_OPTIONS +#define LD_OPTIONS "" #endif if (acfg->aot_opts.asm_only) { @@ -4497,7 +5035,7 @@ compile_asm (MonoAotCompile *acfg) } else { objfile = g_strdup_printf ("%s.o", acfg->tmpfname); } - command = g_strdup_printf ("as %s %s -o %s", AS_OPTIONS, acfg->tmpfname, objfile); + command = g_strdup_printf ("%sas %s %s -o %s", tool_prefix, AS_OPTIONS, acfg->tmpfname, objfile); printf ("Executing the native assembler: %s\n", command); if (system (command) != 0) { g_free (command); @@ -4528,7 +5066,7 @@ compile_asm (MonoAotCompile *acfg) #elif defined(PLATFORM_WIN32) command = g_strdup_printf ("gcc -shared --dll -mno-cygwin -o %s %s.o", tmp_outfile_name, acfg->tmpfname); #else - command = g_strdup_printf ("ld -shared -o %s %s.o", tmp_outfile_name, acfg->tmpfname); + command = g_strdup_printf ("%sld %s -shared -o %s %s.o", tool_prefix, LD_OPTIONS, tmp_outfile_name, acfg->tmpfname); #endif printf ("Executing the native linker: %s\n", command); if (system (command) != 0) { @@ -4551,7 +5089,7 @@ compile_asm (MonoAotCompile *acfg) * gas generates 'mapping symbols' each time code and data is mixed, which * happens a lot in emit_and_reloc_code (), so we need to get rid of them. */ - command = g_strdup_printf ("strip --strip-symbol=\\$a --strip-symbol=\\$d %s", tmp_outfile_name); + command = g_strdup_printf ("%sstrip --strip-symbol=\\$a --strip-symbol=\\$d %s", tool_prefix, tmp_outfile_name); printf ("Stripping the binary: %s\n", command); if (system (command) != 0) { g_free (tmp_outfile_name); @@ -4617,6 +5155,8 @@ acfg_free (MonoAotCompile *acfg) g_free (acfg->cfgs [i]); g_free (acfg->cfgs); g_free (acfg->static_linking_symbol); + 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); @@ -4651,7 +5191,7 @@ mono_compile_assembly (MonoAssembly *ass, guint32 opts, const char *aot_options) memset (&acfg->aot_opts, 0, sizeof (acfg->aot_opts)); acfg->aot_opts.write_symbols = TRUE; - acfg->aot_opts.ntrampolines = 10240; + acfg->aot_opts.ntrampolines = 1024; mono_aot_parse_options (aot_options, &acfg->aot_opts); @@ -4667,43 +5207,8 @@ mono_compile_assembly (MonoAssembly *ass, guint32 opts, const char *aot_options) if (acfg->aot_opts.static_link) acfg->aot_opts.asm_writer = TRUE; - if (!acfg->aot_opts.asm_only && !acfg->aot_opts.asm_writer && bin_writer_supported ()) { - if (acfg->aot_opts.outfile) - outfile_name = g_strdup_printf ("%s", acfg->aot_opts.outfile); - else - outfile_name = g_strdup_printf ("%s%s", acfg->image->name, SHARED_EXT); - - tmp_outfile_name = g_strdup_printf ("%s.tmp", outfile_name); - - acfg->fp = fopen (tmp_outfile_name, "w"); - g_assert (acfg->fp); - - acfg->w = img_writer_create (acfg->fp, TRUE); - acfg->use_bin_writer = TRUE; - } else { - if (acfg->aot_opts.asm_only) { - if (acfg->aot_opts.outfile) - acfg->tmpfname = g_strdup_printf ("%s", acfg->aot_opts.outfile); - else - acfg->tmpfname = g_strdup_printf ("%s.s", acfg->image->name); - acfg->fp = fopen (acfg->tmpfname, "w+"); - } else { - int i = g_file_open_tmp ("mono_aot_XXXXXX", &acfg->tmpfname, NULL); - acfg->fp = fdopen (i, "w+"); - } - g_assert (acfg->fp); - - acfg->w = img_writer_create (acfg->fp, FALSE); - - tmp_outfile_name = NULL; - outfile_name = NULL; - } - load_profile_files (acfg); - if (!acfg->aot_opts.nodebug) - acfg->dwarf = mono_dwarf_writer_create (acfg->w, NULL); - acfg->num_trampolines [MONO_AOT_TRAMP_SPECIFIC] = acfg->aot_opts.full_aot ? acfg->aot_opts.ntrampolines : 0; #ifdef MONO_ARCH_HAVE_STATIC_RGCTX_TRAMPOLINE acfg->num_trampolines [MONO_AOT_TRAMP_STATIC_RGCTX] = acfg->aot_opts.full_aot ? 1024 : 0; @@ -4711,13 +5216,17 @@ mono_compile_assembly (MonoAssembly *ass, guint32 opts, const char *aot_options) acfg->num_trampolines [MONO_AOT_TRAMP_IMT_THUNK] = acfg->aot_opts.full_aot ? 128 : 0; acfg->got_symbol = g_strdup_printf ("mono_aot_%s_got", acfg->image->assembly->aname.name); + acfg->plt_symbol = g_strdup_printf ("mono_aot_%s_plt", acfg->image->assembly->aname.name); /* Get rid of characters which cannot occur in symbols */ - p = acfg->got_symbol; for (p = acfg->got_symbol; *p; ++p) { if (!(isalnum (*p) || *p == '_')) *p = '_'; } + for (p = acfg->plt_symbol; *p; ++p) { + if (!(isalnum (*p) || *p == '_')) + *p = '_'; + } acfg->method_index = 1; @@ -4738,6 +5247,11 @@ mono_compile_assembly (MonoAssembly *ass, guint32 opts, const char *aot_options) ji->data.image = acfg->image; get_got_offset (acfg, 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); } TV_GETTIME (atv); @@ -4750,6 +5264,50 @@ mono_compile_assembly (MonoAssembly *ass, guint32 opts, const char *aot_options) TV_GETTIME (atv); + if (!acfg->aot_opts.asm_only && !acfg->aot_opts.asm_writer && bin_writer_supported ()) { + if (acfg->aot_opts.outfile) + outfile_name = g_strdup_printf ("%s", acfg->aot_opts.outfile); + else + outfile_name = g_strdup_printf ("%s%s", acfg->image->name, SHARED_EXT); + + /* + * Can't use g_file_open_tmp () as it will be deleted at exit, and + * it might be in another file system so the rename () won't work. + */ + tmp_outfile_name = g_strdup_printf ("%s.tmp", outfile_name); + + acfg->fp = fopen (tmp_outfile_name, "w"); + if (!acfg->fp) { + printf ("Unable to create temporary file '%s': %s\n", tmp_outfile_name, strerror (errno)); + return 1; + } + + acfg->w = img_writer_create (acfg->fp, TRUE); + acfg->use_bin_writer = TRUE; + } else { + if (acfg->aot_opts.asm_only) { + if (acfg->aot_opts.outfile) + acfg->tmpfname = g_strdup_printf ("%s", acfg->aot_opts.outfile); + else + acfg->tmpfname = g_strdup_printf ("%s.s", acfg->image->name); + acfg->fp = fopen (acfg->tmpfname, "w+"); + } else { + int i = g_file_open_tmp ("mono_aot_XXXXXX", &acfg->tmpfname, NULL); + acfg->fp = fdopen (i, "w+"); + } + g_assert (acfg->fp); + + acfg->w = img_writer_create (acfg->fp, FALSE); + + tmp_outfile_name = NULL; + outfile_name = NULL; + } + + acfg->temp_prefix = img_writer_get_temp_label_prefix (acfg->w); + + if (!acfg->aot_opts.nodebug) + acfg->dwarf = mono_dwarf_writer_create (acfg->w, NULL, FALSE); + img_writer_emit_start (acfg->w); if (acfg->dwarf) @@ -4785,8 +5343,10 @@ mono_compile_assembly (MonoAssembly *ass, guint32 opts, const char *aot_options) emit_globals (acfg); - if (acfg->dwarf) + if (acfg->dwarf) { emit_dwarf_info (acfg); + mono_dwarf_writer_close (acfg->dwarf); + } emit_mem_end (acfg); @@ -4794,7 +5354,7 @@ mono_compile_assembly (MonoAssembly *ass, guint32 opts, const char *aot_options) acfg->stats.gen_time = TV_ELAPSED (atv, btv); - printf ("Code: %d Info: %d Ex Info: %d Unwind Info: %d Class Info: %d PLT: %d GOT Info: %d GOT Info Offsets: %d GOT: %d\n", acfg->stats.code_size, acfg->stats.info_size, acfg->stats.ex_info_size, acfg->stats.unwind_info_size, acfg->stats.class_info_size, acfg->plt_offset, acfg->stats.got_info_size, acfg->stats.got_info_offsets_size, (int)(acfg->got_offset * sizeof (gpointer))); + printf ("Code: %d Info: %d Ex Info: %d Unwind Info: %d Class Info: %d PLT: %d GOT Info: %d GOT Info Offsets: %d GOT: %d Offsets: %d\n", acfg->stats.code_size, acfg->stats.info_size, acfg->stats.ex_info_size, acfg->stats.unwind_info_size, acfg->stats.class_info_size, acfg->plt_offset, acfg->stats.got_info_size, acfg->stats.got_info_offsets_size, (int)(acfg->got_offset * sizeof (gpointer)), (int)(acfg->nmethods * 3 * sizeof (gpointer))); TV_GETTIME (atv); res = img_writer_emit_writeout (acfg->w); @@ -4803,7 +5363,12 @@ mono_compile_assembly (MonoAssembly *ass, guint32 opts, const char *aot_options) return res; } if (acfg->use_bin_writer) { - rename (tmp_outfile_name, outfile_name); + int err = rename (tmp_outfile_name, outfile_name); + + if (err) { + printf ("Unable to rename '%s' to '%s': %s\n", tmp_outfile_name, outfile_name, strerror (errno)); + return 1; + } } else { res = compile_asm (acfg); if (res != 0) { @@ -4884,7 +5449,7 @@ mono_xdebug_init (void) /* This file will contain the IL code for methods which don't have debug info */ il_file = fopen ("xdb.il", "w"); - xdebug_writer = mono_dwarf_writer_create (w, il_file); + xdebug_writer = mono_dwarf_writer_create (w, il_file, TRUE); /* Emit something so the file has a text segment */ img_writer_emit_section_change (w, ".text", 0);