X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Fmini%2Ftramp-x86.c;h=7da21c2e44cf59b646203bd9cc3479d38783ecbc;hb=9342e7d1d4e5d0d3248de33d05b2c2b993314bd6;hp=3a9095e59271132daf01d8816b77af5ca76bf2b0;hpb=8ef4e4703172fd32ada3f74b22df5203b4683493;p=mono.git diff --git a/mono/mini/tramp-x86.c b/mono/mini/tramp-x86.c index 3a9095e5927..7da21c2e44c 100644 --- a/mono/mini/tramp-x86.c +++ b/mono/mini/tramp-x86.c @@ -17,6 +17,7 @@ #include #include #include +#include #include #include @@ -28,7 +29,6 @@ static guint8* nullified_class_init_trampoline; /* * mono_arch_get_unbox_trampoline: - * @gsctx: the generic sharing context * @m: method pointer * @addr: pointer to native code for @m * @@ -37,21 +37,20 @@ static guint8* nullified_class_init_trampoline; * unboxing before calling the method */ gpointer -mono_arch_get_unbox_trampoline (MonoGenericSharingContext *gsctx, MonoMethod *m, gpointer addr) +mono_arch_get_unbox_trampoline (MonoMethod *m, gpointer addr) { guint8 *code, *start; int this_pos = 4; MonoDomain *domain = mono_domain_get (); - if (MONO_TYPE_ISSTRUCT (mono_method_signature (m)->ret)) - this_pos = 8; - start = code = mono_domain_code_reserve (domain, 16); x86_alu_membase_imm (code, X86_ADD, X86_ESP, this_pos, sizeof (MonoObject)); x86_jump_code (code, addr); g_assert ((code - start) < 16); + nacl_domain_code_validate (domain, &start, 16, &code); + return start; } @@ -71,6 +70,7 @@ mono_arch_get_static_rgctx_trampoline (MonoMethod *m, MonoMethodRuntimeGenericCo x86_jump_code (code, addr); g_assert ((code - start) <= buf_len); + nacl_domain_code_validate (domain, &start, buf_len, &code); mono_arch_flush_icache (start, code - start); return start; @@ -99,6 +99,8 @@ mono_arch_get_llvm_imt_trampoline (MonoDomain *domain, MonoMethod *m, int vt_off g_assert ((code - start) < buf_len); + nacl_domain_code_validate (domain, &start, buf_len, &code); + mono_arch_flush_icache (start, code - start); return start; @@ -107,6 +109,7 @@ mono_arch_get_llvm_imt_trampoline (MonoDomain *domain, MonoMethod *m, int vt_off void mono_arch_patch_callsite (guint8 *method_start, guint8 *orig_code, guint8 *addr) { +#if defined(__default_codegen__) guint8 *code; guint8 buf [8]; gboolean can_write = mono_breakpoint_clean_code (method_start, orig_code, 8, buf, sizeof (buf)); @@ -138,16 +141,97 @@ mono_arch_patch_callsite (guint8 *method_start, guint8 *orig_code, guint8 *addr) code [4], code [5], code [6]); g_assert_not_reached (); } +#elif defined(__native_client__) + /* Target must be bundle-aligned */ + g_assert (((guint32)addr & kNaClAlignmentMask) == 0); + + /* 0xe8 = call , 0xe9 = jump */ + if ((orig_code [-5] == 0xe8) || orig_code [-6] == 0xe9) { + int ret; + gint32 offset = (gint32)addr - (gint32)orig_code; + guint8 buf[sizeof(gint32)]; + *((gint32*)(buf)) = offset; + ret = nacl_dyncode_modify (orig_code - sizeof(gint32), buf, sizeof(gint32)); + g_assert (ret == 0); + } else { + printf ("Invalid trampoline sequence %p: %02x %02x %02x %02x %02x\n", orig_code, orig_code [-5], orig_code [-4], orig_code [-3], orig_code [-2], orig_code[-1]); + g_assert_not_reached (); + } +#endif } void mono_arch_patch_plt_entry (guint8 *code, gpointer *got, mgreg_t *regs, guint8 *addr) { - /* A PLT entry: jmp */ - g_assert (code [0] == 0xe9); + guint32 offset; + + /* Patch the jump table entry used by the plt entry */ + +#if defined(__native_client_codegen__) || defined(__native_client__) + /* for both compiler and runtime */ + /* A PLT entry: */ + /* mov (%ebx), %ecx */ + /* and 0xffffffe0, %ecx */ + /* jmp *%ecx */ + g_assert (code [0] == 0x8b); + g_assert (code [1] == 0x8b); + + offset = *(guint32*)(code + 2); +#elif defined(__default_codegen__) + /* A PLT entry: jmp *(%ebx) */ + g_assert (code [0] == 0xff); + g_assert (code [1] == 0xa3); + + offset = *(guint32*)(code + 2); +#endif /* __native_client_codegen__ */ + if (!got) + got = (gpointer*)(gsize) regs [MONO_ARCH_GOT_REG]; + *(guint8**)((guint8*)got + offset) = addr; +} + +static gpointer +get_vcall_slot (guint8 *code, mgreg_t *regs, int *displacement) +{ + const int kBufSize = NACL_SIZE (8, 16); + guint8 buf [64]; + guint8 reg = 0; + gint32 disp = 0; + + mono_breakpoint_clean_code (NULL, code, kBufSize, buf, kBufSize); + code = buf + 8; + + *displacement = 0; + + if ((code [0] == 0xff) && ((code [1] & 0x18) == 0x10) && ((code [1] >> 6) == 2)) { + reg = code [1] & 0x07; + disp = *((gint32*)(code + 2)); +#if defined(__native_client_codegen__) || defined(__native_client__) + } else if ((code[1] == 0x83) && (code[2] == 0xe1) && (code[4] == 0xff) && + (code[5] == 0xd1) && (code[-5] == 0x8b)) { + disp = *((gint32*)(code - 3)); + reg = code[-4] & 0x07; + } else if ((code[-2] == 0x8b) && (code[1] == 0x83) && (code[4] == 0xff)) { + reg = code[-1] & 0x07; + disp = (signed char)code[0]; +#endif + } else { + g_assert_not_reached (); + return NULL; + } - if (!mono_running_on_valgrind ()) - InterlockedExchange ((gint32*)(code + 1), (guint)addr - (guint)code - 5); + *displacement = disp; + return (gpointer)regs [reg]; +} + +static gpointer* +get_vcall_slot_addr (guint8* code, mgreg_t *regs) +{ + gpointer vt; + int displacement; + vt = get_vcall_slot (code, regs, &displacement); + if (!vt) + return NULL; + return (gpointer*)((char*)vt + displacement); } void @@ -161,6 +245,7 @@ mono_arch_nullify_class_init_trampoline (guint8 *code, mgreg_t *regs) code -= 5; if (code [0] == 0xe8) { +#if defined(__default_codegen__) if (!mono_running_on_valgrind ()) { guint32 ops; /* @@ -187,6 +272,9 @@ mono_arch_nullify_class_init_trampoline (guint8 *code, mgreg_t *regs) /* Tell valgrind to recompile the patched code */ //VALGRIND_DISCARD_TRANSLATIONS (code, 8); } +#elif defined(__native_client_codegen__) + mono_arch_patch_callsite (code, code + 5, nullified_class_init_trampoline); +#endif } else if (code [0] == 0x90 || code [0] == 0xeb) { /* Already changed by another thread */ ; @@ -194,7 +282,7 @@ mono_arch_nullify_class_init_trampoline (guint8 *code, mgreg_t *regs) /* call *() -> Call made from AOT code */ gpointer *vtable_slot; - vtable_slot = mono_get_vcall_slot_addr (code + 5, regs); + vtable_slot = get_vcall_slot_addr (code + 5, regs); g_assert (vtable_slot); *vtable_slot = nullified_class_init_trampoline; @@ -208,28 +296,21 @@ mono_arch_nullify_class_init_trampoline (guint8 *code, mgreg_t *regs) void mono_arch_nullify_plt_entry (guint8 *code, mgreg_t *regs) { - if (!mono_running_on_valgrind ()) { - guint32 ops; + if (mono_aot_only && !nullified_class_init_trampoline) + nullified_class_init_trampoline = mono_aot_get_trampoline ("nullified_class_init_trampoline"); - ops = 0xfeeb; - InterlockedExchange ((gint32*)code, ops); - - /* Then change the other bytes to a nop */ - code [2] = 0x90; - code [3] = 0x90; - code [4] = 0x90; - - /* Change the first byte to a nop */ - ops = 0xc3; - InterlockedExchange ((gint32*)code, ops); - } + mono_arch_patch_plt_entry (code, NULL, regs, nullified_class_init_trampoline); } guchar* -mono_arch_create_trampoline_code (MonoTrampolineType tramp_type) +mono_arch_create_generic_trampoline (MonoTrampolineType tramp_type, MonoTrampInfo **info, gboolean aot) { guint8 *buf, *code, *tramp; int pushed_args, pushed_args_caller_saved; + GSList *unwind_ops = NULL; + MonoJumpInfo *ji = NULL; + + unwind_ops = mono_arch_get_cie_program (); code = buf = mono_global_codeman_reserve (256); @@ -242,19 +323,19 @@ mono_arch_create_trampoline_code (MonoTrampolineType tramp_type) * If this code is changed, make sure to update the offset value in * mono_arch_get_this_arg_from_call () in mini-x86.c. */ - x86_push_reg (buf, X86_EDI); - x86_push_reg (buf, X86_ESI); - x86_push_reg (buf, X86_EBP); - x86_push_reg (buf, X86_ESP); - x86_push_reg (buf, X86_EBX); - x86_push_reg (buf, X86_EDX); - x86_push_reg (buf, X86_ECX); - x86_push_reg (buf, X86_EAX); + x86_push_reg (code, X86_EDI); + x86_push_reg (code, X86_ESI); + x86_push_reg (code, X86_EBP); + x86_push_reg (code, X86_ESP); + x86_push_reg (code, X86_EBX); + x86_push_reg (code, X86_EDX); + x86_push_reg (code, X86_ECX); + x86_push_reg (code, X86_EAX); pushed_args_caller_saved = pushed_args = 8; /* Align stack on apple */ - x86_alu_reg_imm (buf, X86_SUB, X86_ESP, 4); + x86_alu_reg_imm (code, X86_SUB, X86_ESP, 4); pushed_args ++; @@ -262,31 +343,31 @@ mono_arch_create_trampoline_code (MonoTrampolineType tramp_type) /* save the IP (caller ip) */ if (tramp_type == MONO_TRAMPOLINE_JUMP) - x86_push_imm (buf, 0); + x86_push_imm (code, 0); else - x86_push_membase (buf, X86_ESP, (pushed_args + 1) * sizeof (gpointer)); + x86_push_membase (code, X86_ESP, (pushed_args + 1) * sizeof (gpointer)); pushed_args++; - x86_push_reg (buf, X86_EBP); - x86_push_reg (buf, X86_ESI); - x86_push_reg (buf, X86_EDI); - x86_push_reg (buf, X86_EBX); + x86_push_reg (code, X86_EBP); + x86_push_reg (code, X86_ESI); + x86_push_reg (code, X86_EDI); + x86_push_reg (code, X86_EBX); pushed_args += 4; /* save ESP */ - x86_push_reg (buf, X86_ESP); + x86_push_reg (code, X86_ESP); /* Adjust ESP so it points to the previous frame */ - x86_alu_membase_imm (buf, X86_ADD, X86_ESP, 0, (pushed_args + 2) * 4); + x86_alu_membase_imm (code, X86_ADD, X86_ESP, 0, (pushed_args + 2) * 4); pushed_args ++; /* save method info */ if ((tramp_type == MONO_TRAMPOLINE_JIT) || (tramp_type == MONO_TRAMPOLINE_JUMP)) - x86_push_membase (buf, X86_ESP, pushed_args * sizeof (gpointer)); + x86_push_membase (code, X86_ESP, pushed_args * sizeof (gpointer)); else - x86_push_imm (buf, 0); + x86_push_imm (code, 0); pushed_args++; @@ -298,15 +379,20 @@ mono_arch_create_trampoline_code (MonoTrampolineType tramp_type) g_assert (pushed_args == 16); /* get the address of lmf for the current thread */ - x86_call_code (buf, mono_get_lmf_addr); + if (aot) { + code = mono_arch_emit_load_aotconst (buf, code, &ji, MONO_PATCH_INFO_JIT_ICALL_ADDR, "mono_get_lmf_addr"); + x86_call_reg (code, X86_EAX); + } else { + x86_call_code (code, mono_get_lmf_addr); + } /* push lmf */ - x86_push_reg (buf, X86_EAX); + x86_push_reg (code, X86_EAX); /* push *lfm (previous_lmf) */ - x86_push_membase (buf, X86_EAX, 0); + x86_push_membase (code, X86_EAX, 0); /* Signal to mono_arch_find_jit_info () that this is a trampoline frame */ - x86_alu_membase_imm (buf, X86_ADD, X86_ESP, 0, 1); + x86_alu_membase_imm (code, X86_ADD, X86_ESP, 0, 1); /* *(lmf) = ESP */ - x86_mov_membase_reg (buf, X86_EAX, 0, X86_ESP, 4); + x86_mov_membase_reg (code, X86_EAX, 0, X86_ESP, 4); /* save LFM end */ pushed_args += 2; @@ -314,24 +400,24 @@ mono_arch_create_trampoline_code (MonoTrampolineType tramp_type) /* starting the call sequence */ /* FIXME: Push the trampoline address */ - x86_push_imm (buf, 0); + x86_push_imm (code, 0); pushed_args++; /* push the method info */ - x86_push_membase (buf, X86_ESP, pushed_args * sizeof (gpointer)); + x86_push_membase (code, X86_ESP, pushed_args * sizeof (gpointer)); pushed_args++; /* push the return address onto the stack */ if (tramp_type == MONO_TRAMPOLINE_JUMP) - x86_push_imm (buf, 0); + x86_push_imm (code, 0); else - x86_push_membase (buf, X86_ESP, (pushed_args + 1) * sizeof (gpointer)); + x86_push_membase (code, X86_ESP, (pushed_args + 1) * sizeof (gpointer)); pushed_args++; /* push the address of the register array */ - x86_lea_membase (buf, X86_EAX, X86_ESP, (pushed_args - 8) * sizeof (gpointer)); - x86_push_reg (buf, X86_EAX); + x86_lea_membase (code, X86_EAX, X86_ESP, (pushed_args - 8) * sizeof (gpointer)); + x86_push_reg (code, X86_EAX); pushed_args++; @@ -344,54 +430,67 @@ mono_arch_create_trampoline_code (MonoTrampolineType tramp_type) x86_breakpoint (buf);*/ #endif - tramp = (guint8*)mono_get_trampoline_func (tramp_type); - x86_call_code (buf, tramp); + mono_add_unwind_op_def_cfa (unwind_ops, code, buf, X86_ESP, ((pushed_args + 2) * 4)); + + if (aot) { + char *icall_name = g_strdup_printf ("trampoline_func_%d", tramp_type); + code = mono_arch_emit_load_aotconst (buf, code, &ji, MONO_PATCH_INFO_JIT_ICALL_ADDR, icall_name); + x86_call_reg (code, X86_EAX); + } else { + tramp = (guint8*)mono_get_trampoline_func (tramp_type); + x86_call_code (code, tramp); + } - x86_alu_reg_imm (buf, X86_ADD, X86_ESP, 4*4); + x86_alu_reg_imm (code, X86_ADD, X86_ESP, 4*4); pushed_args -= 4; /* Check for thread interruption */ /* This is not perf critical code so no need to check the interrupt flag */ /* Align the stack on osx */ - x86_alu_reg_imm (buf, X86_SUB, X86_ESP, 3 * 4); - x86_push_reg (buf, X86_EAX); - x86_call_code (buf, (guint8*)mono_thread_force_interruption_checkpoint); - x86_pop_reg (buf, X86_EAX); - x86_alu_reg_imm (buf, X86_ADD, X86_ESP, 3 * 4); + x86_alu_reg_imm (code, X86_SUB, X86_ESP, 3 * 4); + x86_push_reg (code, X86_EAX); + if (aot) { + code = mono_arch_emit_load_aotconst (buf, code, &ji, MONO_PATCH_INFO_JIT_ICALL_ADDR, "mono_thread_force_interruption_checkpoint"); + x86_call_reg (code, X86_EAX); + } else { + x86_call_code (code, (guint8*)mono_thread_force_interruption_checkpoint); + } + x86_pop_reg (code, X86_EAX); + x86_alu_reg_imm (code, X86_ADD, X86_ESP, 3 * 4); /* Restore LMF */ /* ebx = previous_lmf */ - x86_pop_reg (buf, X86_EBX); + x86_pop_reg (code, X86_EBX); pushed_args--; - x86_alu_reg_imm (buf, X86_SUB, X86_EBX, 1); + x86_alu_reg_imm (code, X86_SUB, X86_EBX, 1); /* edi = lmf */ - x86_pop_reg (buf, X86_EDI); + x86_pop_reg (code, X86_EDI); pushed_args--; /* *(lmf) = previous_lmf */ - x86_mov_membase_reg (buf, X86_EDI, 0, X86_EBX, 4); + x86_mov_membase_reg (code, X86_EDI, 0, X86_EBX, 4); /* discard method info */ - x86_pop_reg (buf, X86_ESI); + x86_pop_reg (code, X86_ESI); pushed_args--; /* discard ESP */ - x86_pop_reg (buf, X86_ESI); + x86_pop_reg (code, X86_ESI); pushed_args--; /* restore caller saved regs */ - x86_pop_reg (buf, X86_EBX); - x86_pop_reg (buf, X86_EDI); - x86_pop_reg (buf, X86_ESI); - x86_pop_reg (buf, X86_EBP); + x86_pop_reg (code, X86_EBX); + x86_pop_reg (code, X86_EDI); + x86_pop_reg (code, X86_ESI); + x86_pop_reg (code, X86_EBP); pushed_args -= 4; /* discard save IP */ - x86_alu_reg_imm (buf, X86_ADD, X86_ESP, 4); + x86_alu_reg_imm (code, X86_ADD, X86_ESP, 4); pushed_args--; /* restore LMF end */ @@ -401,23 +500,23 @@ mono_arch_create_trampoline_code (MonoTrampolineType tramp_type) * Overwrite the method ptr with the address we need to jump to, * to free %eax. */ - x86_mov_membase_reg (buf, X86_ESP, pushed_args * sizeof (gpointer), X86_EAX, 4); + x86_mov_membase_reg (code, X86_ESP, pushed_args * sizeof (gpointer), X86_EAX, 4); } /* Restore caller saved registers */ - x86_mov_reg_membase (buf, X86_ECX, X86_ESP, (pushed_args - pushed_args_caller_saved + X86_ECX) * 4, 4); - x86_mov_reg_membase (buf, X86_EDX, X86_ESP, (pushed_args - pushed_args_caller_saved + X86_EDX) * 4, 4); + x86_mov_reg_membase (code, X86_ECX, X86_ESP, (pushed_args - pushed_args_caller_saved + X86_ECX) * 4, 4); + x86_mov_reg_membase (code, X86_EDX, X86_ESP, (pushed_args - pushed_args_caller_saved + X86_EDX) * 4, 4); if ((tramp_type == MONO_TRAMPOLINE_RESTORE_STACK_PROT) || (tramp_type == MONO_TRAMPOLINE_AOT_PLT)) - x86_mov_reg_membase (buf, X86_EAX, X86_ESP, (pushed_args - pushed_args_caller_saved + X86_EAX) * 4, 4); + x86_mov_reg_membase (code, X86_EAX, X86_ESP, (pushed_args - pushed_args_caller_saved + X86_EAX) * 4, 4); if (!MONO_TRAMPOLINE_TYPE_MUST_RETURN (tramp_type)) { /* Pop saved reg array + stack align */ - x86_alu_reg_imm (buf, X86_ADD, X86_ESP, 9 * 4); + x86_alu_reg_imm (code, X86_ADD, X86_ESP, 9 * 4); pushed_args -= 9; g_assert (pushed_args == 0); } else { /* Pop saved reg array + stack align + method ptr */ - x86_alu_reg_imm (buf, X86_ADD, X86_ESP, 10 * 4); + x86_alu_reg_imm (code, X86_ADD, X86_ESP, 10 * 4); pushed_args -= 10; /* We've popped one more stack item than we've pushed (the @@ -425,17 +524,42 @@ mono_arch_create_trampoline_code (MonoTrampolineType tramp_type) g_assert (pushed_args == -1); } - x86_ret (buf); + x86_ret (code); - g_assert ((buf - code) <= 256); + nacl_global_codeman_validate (&buf, 256, &code); + g_assert ((code - buf) <= 256); + + if (info) + *info = mono_tramp_info_create (mono_get_generic_trampoline_name (tramp_type), buf, code - buf, ji, unwind_ops); if (tramp_type == MONO_TRAMPOLINE_CLASS_INIT) { /* Initialize the nullified class init trampoline used in the AOT case */ - nullified_class_init_trampoline = buf = mono_global_codeman_reserve (16); - x86_ret (buf); + nullified_class_init_trampoline = mono_arch_get_nullified_class_init_trampoline (NULL); } - return code; + return buf; +} + +gpointer +mono_arch_get_nullified_class_init_trampoline (MonoTrampInfo **info) +{ + guint8 *code, *buf; + int tramp_size = NACL_SIZE (16, kNaClAlignment); + + code = buf = mono_global_codeman_reserve (tramp_size); + x86_ret (code); + + nacl_global_codeman_validate (&buf, tramp_size, &code); + + mono_arch_flush_icache (buf, code - buf); + + if (info) + *info = mono_tramp_info_create (g_strdup_printf ("nullified_class_init_trampoline"), buf, code - buf, NULL, NULL); + + if (mono_jit_map_is_enabled ()) + mono_emit_jit_tramp (buf, code - buf, "nullified_class_init_trampoline"); + + return buf; } #define TRAMPOLINE_SIZE 10 @@ -447,12 +571,14 @@ mono_arch_create_specific_trampoline (gpointer arg1, MonoTrampolineType tramp_ty tramp = mono_get_trampoline_code (tramp_type); - code = buf = mono_domain_code_reserve_align (domain, TRAMPOLINE_SIZE, 4); + code = buf = mono_domain_code_reserve_align (domain, TRAMPOLINE_SIZE, NACL_SIZE (4, kNaClAlignment)); x86_push_imm (buf, arg1); x86_jump_code (buf, tramp); g_assert ((buf - code) <= TRAMPOLINE_SIZE); + nacl_domain_code_validate (domain, &code, NACL_SIZE (4, kNaClAlignment), &buf); + mono_arch_flush_icache (code, buf - code); if (code_len) @@ -462,7 +588,7 @@ mono_arch_create_specific_trampoline (gpointer arg1, MonoTrampolineType tramp_ty } gpointer -mono_arch_create_rgctx_lazy_fetch_trampoline (guint32 slot) +mono_arch_create_rgctx_lazy_fetch_trampoline (guint32 slot, MonoTrampInfo **info, gboolean aot) { guint8 *tramp; guint8 *code, *buf; @@ -471,6 +597,10 @@ mono_arch_create_rgctx_lazy_fetch_trampoline (guint32 slot) int depth, index; int i; gboolean mrgctx; + MonoJumpInfo *ji = NULL; + GSList *unwind_ops = NULL; + + unwind_ops = mono_arch_get_cie_program (); mrgctx = MONO_RGCTX_SLOT_IS_MRGCTX (slot); index = MONO_RGCTX_SLOT_INDEX (slot); @@ -484,68 +614,82 @@ mono_arch_create_rgctx_lazy_fetch_trampoline (guint32 slot) index -= size - 1; } - tramp_size = 36 + 6 * depth; +#if defined(__default_codegen__) + tramp_size = (aot ? 64 : 36) + 6 * depth; +#elif defined(__native_client_codegen__) + tramp_size = (aot ? 64 : 36) + 2 * kNaClAlignment + + 6 * (depth + kNaClAlignment); +#endif code = buf = mono_global_codeman_reserve (tramp_size); rgctx_null_jumps = g_malloc (sizeof (guint8*) * (depth + 2)); /* load vtable/mrgctx ptr */ - x86_mov_reg_membase (buf, X86_EAX, X86_ESP, 4, 4); + x86_mov_reg_membase (code, X86_EAX, X86_ESP, 4, 4); if (!mrgctx) { /* load rgctx ptr from vtable */ - x86_mov_reg_membase (buf, X86_EAX, X86_EAX, G_STRUCT_OFFSET (MonoVTable, runtime_generic_context), 4); + x86_mov_reg_membase (code, X86_EAX, X86_EAX, G_STRUCT_OFFSET (MonoVTable, runtime_generic_context), 4); /* is the rgctx ptr null? */ - x86_test_reg_reg (buf, X86_EAX, X86_EAX); + x86_test_reg_reg (code, X86_EAX, X86_EAX); /* if yes, jump to actual trampoline */ - rgctx_null_jumps [0] = buf; - x86_branch8 (buf, X86_CC_Z, -1, 1); + rgctx_null_jumps [0] = code; + x86_branch8 (code, X86_CC_Z, -1, 1); } for (i = 0; i < depth; ++i) { /* load ptr to next array */ if (mrgctx && i == 0) - x86_mov_reg_membase (buf, X86_EAX, X86_EAX, MONO_SIZEOF_METHOD_RUNTIME_GENERIC_CONTEXT, 4); + x86_mov_reg_membase (code, X86_EAX, X86_EAX, MONO_SIZEOF_METHOD_RUNTIME_GENERIC_CONTEXT, 4); else - x86_mov_reg_membase (buf, X86_EAX, X86_EAX, 0, 4); + x86_mov_reg_membase (code, X86_EAX, X86_EAX, 0, 4); /* is the ptr null? */ - x86_test_reg_reg (buf, X86_EAX, X86_EAX); + x86_test_reg_reg (code, X86_EAX, X86_EAX); /* if yes, jump to actual trampoline */ - rgctx_null_jumps [i + 1] = buf; - x86_branch8 (buf, X86_CC_Z, -1, 1); + rgctx_null_jumps [i + 1] = code; + x86_branch8 (code, X86_CC_Z, -1, 1); } /* fetch slot */ - x86_mov_reg_membase (buf, X86_EAX, X86_EAX, sizeof (gpointer) * (index + 1), 4); + x86_mov_reg_membase (code, X86_EAX, X86_EAX, sizeof (gpointer) * (index + 1), 4); /* is the slot null? */ - x86_test_reg_reg (buf, X86_EAX, X86_EAX); + x86_test_reg_reg (code, X86_EAX, X86_EAX); /* if yes, jump to actual trampoline */ - rgctx_null_jumps [depth + 1] = buf; - x86_branch8 (buf, X86_CC_Z, -1, 1); + rgctx_null_jumps [depth + 1] = code; + x86_branch8 (code, X86_CC_Z, -1, 1); /* otherwise return */ - x86_ret (buf); + x86_ret (code); for (i = mrgctx ? 1 : 0; i <= depth + 1; ++i) - x86_patch (rgctx_null_jumps [i], buf); + x86_patch (rgctx_null_jumps [i], code); g_free (rgctx_null_jumps); - x86_mov_reg_membase (buf, MONO_ARCH_VTABLE_REG, X86_ESP, 4, 4); + x86_mov_reg_membase (code, MONO_ARCH_VTABLE_REG, X86_ESP, 4, 4); - tramp = mono_arch_create_specific_trampoline (GUINT_TO_POINTER (slot), MONO_TRAMPOLINE_RGCTX_LAZY_FETCH, mono_get_root_domain (), NULL); + if (aot) { + code = mono_arch_emit_load_aotconst (buf, code, &ji, MONO_PATCH_INFO_JIT_ICALL_ADDR, g_strdup_printf ("specific_trampoline_lazy_fetch_%u", slot)); + x86_jump_reg (code, X86_EAX); + } else { + tramp = mono_arch_create_specific_trampoline (GUINT_TO_POINTER (slot), MONO_TRAMPOLINE_RGCTX_LAZY_FETCH, mono_get_root_domain (), NULL); - /* jump to the actual trampoline */ - x86_jump_code (buf, tramp); + /* jump to the actual trampoline */ + x86_jump_code (code, tramp); + } - mono_arch_flush_icache (code, buf - code); + nacl_global_codeman_validate (&buf, tramp_size, &code); + mono_arch_flush_icache (buf, code - buf); + + g_assert (code - buf <= tramp_size); - g_assert (buf - code <= tramp_size); + if (info) + *info = mono_tramp_info_create (mono_get_rgctx_fetch_trampoline_name (slot), buf, code - buf, ji, unwind_ops); - return code; + return buf; } gpointer -mono_arch_create_generic_class_init_trampoline (void) +mono_arch_create_generic_class_init_trampoline (MonoTrampInfo **info, gboolean aot) { guint8 *tramp; guint8 *code, *buf; @@ -553,11 +697,15 @@ mono_arch_create_generic_class_init_trampoline (void) static guint8 bitmask; guint8 *jump; int tramp_size; + GSList *unwind_ops = NULL; + MonoJumpInfo *ji = NULL; tramp_size = 64; code = buf = mono_global_codeman_reserve (tramp_size); + unwind_ops = mono_arch_get_cie_program (); + if (byte_offset < 0) mono_marshal_find_bitfield_offset (MonoVTable, initialized, &byte_offset, &bitmask); @@ -572,14 +720,27 @@ mono_arch_create_generic_class_init_trampoline (void) /* Push the vtable so the stack is the same as in a specific trampoline */ x86_push_reg (code, MONO_ARCH_VTABLE_REG); - tramp = mono_get_trampoline_code (MONO_TRAMPOLINE_GENERIC_CLASS_INIT); + if (aot) { + code = mono_arch_emit_load_aotconst (buf, code, &ji, MONO_PATCH_INFO_JIT_ICALL_ADDR, "generic_trampoline_generic_class_init"); + x86_jump_reg (code, X86_EAX); + } else { + tramp = mono_get_trampoline_code (MONO_TRAMPOLINE_GENERIC_CLASS_INIT); - /* jump to the actual trampoline */ - x86_jump_code (code, tramp); + /* jump to the actual trampoline */ + x86_jump_code (code, tramp); + } mono_arch_flush_icache (code, code - buf); g_assert (code - buf <= tramp_size); +#ifdef __native_client_codegen__ + g_assert (code - buf <= kNaClAlignment); +#endif + + nacl_global_codeman_validate (&buf, tramp_size, &code); + + if (info) + *info = mono_tramp_info_create (g_strdup_printf ("generic_class_init_trampoline"), buf, code - buf, ji, unwind_ops); return buf; } @@ -604,22 +765,15 @@ mono_arch_create_generic_class_init_trampoline (void) * */ gpointer -mono_arch_create_monitor_enter_trampoline (void) -{ - guint32 code_size; - MonoJumpInfo *ji; - - return mono_arch_create_monitor_enter_trampoline_full (&code_size, &ji, FALSE); -} - -gpointer -mono_arch_create_monitor_enter_trampoline_full (guint32 *code_size, MonoJumpInfo **ji, gboolean aot) +mono_arch_create_monitor_enter_trampoline (MonoTrampInfo **info, gboolean aot) { guint8 *tramp = mono_get_trampoline_code (MONO_TRAMPOLINE_MONITOR_ENTER); guint8 *code, *buf; - guint8 *jump_obj_null, *jump_sync_null, *jump_other_owner, *jump_cmpxchg_failed, *jump_tid; + guint8 *jump_obj_null, *jump_sync_null, *jump_other_owner, *jump_cmpxchg_failed, *jump_tid, *jump_sync_thin_hash = NULL; int tramp_size; int owner_offset, nest_offset, dummy; + MonoJumpInfo *ji = NULL; + GSList *unwind_ops = NULL; g_assert (MONO_ARCH_MONITOR_OBJECT_REG == X86_EAX); @@ -629,7 +783,7 @@ mono_arch_create_monitor_enter_trampoline_full (guint32 *code_size, MonoJumpInfo owner_offset = MONO_THREADS_SYNC_MEMBER_OFFSET (owner_offset); nest_offset = MONO_THREADS_SYNC_MEMBER_OFFSET (nest_offset); - tramp_size = 64; + tramp_size = NACL_SIZE (64, 128); code = buf = mono_global_codeman_reserve (tramp_size); @@ -643,8 +797,21 @@ mono_arch_create_monitor_enter_trampoline_full (guint32 *code_size, MonoJumpInfo /* load obj->synchronization to ECX */ x86_mov_reg_membase (code, X86_ECX, X86_EAX, G_STRUCT_OFFSET (MonoObject, synchronisation), 4); + + if (mono_gc_is_moving ()) { + /*if bit zero is set it's a thin hash*/ + /*FIXME use testb encoding*/ + x86_test_reg_imm (code, X86_ECX, 0x01); + jump_sync_thin_hash = code; + x86_branch8 (code, X86_CC_NE, -1, 1); + + /*clear bits used by the gc*/ + x86_alu_reg_imm (code, X86_AND, X86_ECX, ~0x3); + } + /* is synchronization null? */ x86_test_reg_reg (code, X86_ECX, X86_ECX); + /* if yes, jump to actual trampoline */ jump_sync_null = code; x86_branch8 (code, X86_CC_Z, -1, 1); @@ -689,42 +856,55 @@ mono_arch_create_monitor_enter_trampoline_full (guint32 *code_size, MonoJumpInfo /* push obj */ x86_patch (jump_obj_null, code); + if (jump_sync_thin_hash) + x86_patch (jump_sync_thin_hash, code); x86_patch (jump_sync_null, code); x86_patch (jump_other_owner, code); x86_push_reg (code, X86_EAX); /* jump to the actual trampoline */ x86_patch (jump_cmpxchg_failed, code); - x86_jump_code (code, tramp); + if (aot) { + /* We are calling the generic trampoline directly, the argument is pushed + * on the stack just like a specific trampoline. + */ + code = mono_arch_emit_load_aotconst (buf, code, &ji, MONO_PATCH_INFO_JIT_ICALL_ADDR, "generic_trampoline_monitor_enter"); + x86_jump_reg (code, X86_EAX); + } else { + x86_jump_code (code, tramp); + } } else { /* push obj and jump to the actual trampoline */ x86_push_reg (code, X86_EAX); - x86_jump_code (code, tramp); + if (aot) { + code = mono_arch_emit_load_aotconst (buf, code, &ji, MONO_PATCH_INFO_JIT_ICALL_ADDR, "generic_trampoline_monitor_enter"); + x86_jump_reg (code, X86_EAX); + } else { + x86_jump_code (code, tramp); + } } mono_arch_flush_icache (buf, code - buf); g_assert (code - buf <= tramp_size); - return buf; -} + nacl_global_codeman_validate (&buf, tramp_size, &code); -gpointer -mono_arch_create_monitor_exit_trampoline (void) -{ - guint32 code_size; - MonoJumpInfo *ji; + if (info) + *info = mono_tramp_info_create (g_strdup_printf ("monitor_enter_trampoline"), buf, code - buf, ji, unwind_ops); - return mono_arch_create_monitor_exit_trampoline_full (&code_size, &ji, FALSE); + return buf; } gpointer -mono_arch_create_monitor_exit_trampoline_full (guint32 *code_size, MonoJumpInfo **ji, gboolean aot) +mono_arch_create_monitor_exit_trampoline (MonoTrampInfo **info, gboolean aot) { guint8 *tramp = mono_get_trampoline_code (MONO_TRAMPOLINE_MONITOR_EXIT); guint8 *code, *buf; - guint8 *jump_obj_null, *jump_have_waiters, *jump_sync_null, *jump_not_owned; + guint8 *jump_obj_null, *jump_have_waiters, *jump_sync_null, *jump_not_owned, *jump_sync_thin_hash = NULL; guint8 *jump_next; int tramp_size; int owner_offset, nest_offset, entry_count_offset; + MonoJumpInfo *ji = NULL; + GSList *unwind_ops = NULL; g_assert (MONO_ARCH_MONITOR_OBJECT_REG == X86_EAX); @@ -736,7 +916,7 @@ mono_arch_create_monitor_exit_trampoline_full (guint32 *code_size, MonoJumpInfo nest_offset = MONO_THREADS_SYNC_MEMBER_OFFSET (nest_offset); entry_count_offset = MONO_THREADS_SYNC_MEMBER_OFFSET (entry_count_offset); - tramp_size = 64; + tramp_size = NACL_SIZE (96, 128); code = buf = mono_global_codeman_reserve (tramp_size); @@ -750,6 +930,18 @@ mono_arch_create_monitor_exit_trampoline_full (guint32 *code_size, MonoJumpInfo /* load obj->synchronization to ECX */ x86_mov_reg_membase (code, X86_ECX, X86_EAX, G_STRUCT_OFFSET (MonoObject, synchronisation), 4); + + if (mono_gc_is_moving ()) { + /*if bit zero is set it's a thin hash*/ + /*FIXME use testb encoding*/ + x86_test_reg_imm (code, X86_ECX, 0x01); + jump_sync_thin_hash = code; + x86_branch8 (code, X86_CC_NE, -1, 1); + + /*clear bits used by the gc*/ + x86_alu_reg_imm (code, X86_AND, X86_ECX, ~0x3); + } + /* is synchronization null? */ x86_test_reg_reg (code, X86_ECX, X86_ECX); /* if yes, jump to actual trampoline */ @@ -790,37 +982,49 @@ mono_arch_create_monitor_exit_trampoline_full (guint32 *code_size, MonoJumpInfo /* push obj and jump to the actual trampoline */ x86_patch (jump_obj_null, code); + if (jump_sync_thin_hash) + x86_patch (jump_sync_thin_hash, code); x86_patch (jump_have_waiters, code); x86_patch (jump_not_owned, code); x86_patch (jump_sync_null, code); + } - x86_push_reg (code, X86_EAX); - x86_jump_code (code, tramp); + /* push obj and jump to the actual trampoline */ + x86_push_reg (code, X86_EAX); + if (aot) { + code = mono_arch_emit_load_aotconst (buf, code, &ji, MONO_PATCH_INFO_JIT_ICALL_ADDR, "generic_trampoline_monitor_exit"); + x86_jump_reg (code, X86_EAX); } else { - /* push obj and jump to the actual trampoline */ - x86_push_reg (code, X86_EAX); x86_jump_code (code, tramp); } + nacl_global_codeman_validate (&buf, tramp_size, &code); + mono_arch_flush_icache (buf, code - buf); g_assert (code - buf <= tramp_size); + if (info) + *info = mono_tramp_info_create (g_strdup_printf ("monitor_exit_trampoline"), buf, code - buf, ji, unwind_ops); + return buf; } + #else + gpointer -mono_arch_create_monitor_enter_trampoline (void) +mono_arch_create_monitor_enter_trampoline (MonoTrampInfo **info, gboolean aot) { g_assert_not_reached (); return NULL; } gpointer -mono_arch_create_monitor_exit_trampoline (void) +mono_arch_create_monitor_exit_trampoline (MonoTrampInfo **info, gboolean aot) { g_assert_not_reached (); return NULL; } + #endif void @@ -856,17 +1060,44 @@ mono_arch_create_handler_block_trampoline (void) code = mono_x86_emit_tls_get (code, X86_EAX, mono_get_jit_tls_offset ()); x86_mov_reg_membase (code, X86_EAX, X86_EAX, G_STRUCT_OFFSET (MonoJitTlsData, handler_block_return_address), 4); /*simulate a call*/ + /*Fix stack alignment*/ + x86_alu_reg_imm (code, X86_SUB, X86_ESP, 0x8); x86_push_reg (code, X86_EAX); x86_jump_code (code, tramp); } else { /*Slow path uses a c helper*/ + x86_alu_reg_imm (code, X86_SUB, X86_ESP, 0x8); x86_push_reg (code, X86_ESP); x86_push_imm (code, tramp); x86_jump_code (code, handler_block_trampoline_helper); } + nacl_global_codeman_validate (&buf, tramp_size, &code); + mono_arch_flush_icache (buf, code - buf); g_assert (code - buf <= tramp_size); + if (mono_jit_map_is_enabled ()) + mono_emit_jit_tramp (buf, code - buf, "handler_block_trampoline"); + return buf; } + +guint8* +mono_arch_get_call_target (guint8 *code) +{ + if (code [-5] == 0xe8) { + guint32 disp = *(guint32*)(code - 4); + guint8 *target = code + disp; + + return target; + } else { + return NULL; + } +} + +guint32 +mono_arch_get_plt_info_offset (guint8 *plt_entry, mgreg_t *regs, guint8 *code) +{ + return *(guint32*)(plt_entry + NACL_SIZE (6, 12)); +}