#include <mono/metadata/monitor.h>
#include <mono/arch/x86/x86-codegen.h>
-#ifdef HAVE_VALGRIND_MEMCHECK_H
-#include <valgrind/memcheck.h>
-#endif
+#include <mono/utils/memcheck.h>
#include "mini.h"
#include "mini-x86.h"
if (MONO_TYPE_ISSTRUCT (mono_method_signature (m)->ret))
this_pos = 8;
- mono_domain_lock (domain);
- start = code = mono_code_manager_reserve (domain->code_mp, 16);
- mono_domain_unlock (domain);
+ 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);
return start;
}
+gpointer
+mono_arch_get_static_rgctx_trampoline (MonoMethod *m, MonoMethodRuntimeGenericContext *mrgctx, gpointer addr)
+{
+ guint8 *code, *start;
+ int buf_len;
+
+ MonoDomain *domain = mono_domain_get ();
+
+ buf_len = 10;
+
+ start = code = mono_domain_code_reserve (domain, buf_len);
+
+ x86_mov_reg_imm (code, MONO_ARCH_RGCTX_REG, mrgctx);
+ x86_jump_code (code, addr);
+ g_assert ((code - start) <= buf_len);
+
+ mono_arch_flush_icache (start, code - start);
+
+ return start;
+}
+
+gpointer
+mono_arch_get_llvm_imt_trampoline (MonoDomain *domain, MonoMethod *m, int vt_offset)
+{
+ guint8 *code, *start;
+ int buf_len;
+ int this_offset;
+
+ buf_len = 32;
+
+ start = code = mono_domain_code_reserve (domain, buf_len);
+
+ this_offset = mono_x86_get_this_arg_offset (NULL, mono_method_signature (m));
+
+ /* Set imt arg */
+ x86_mov_reg_imm (code, MONO_ARCH_IMT_REG, m);
+ /* Load this */
+ x86_mov_reg_membase (code, X86_EAX, X86_ESP, this_offset + 4, 4);
+ /* Load vtable address */
+ x86_mov_reg_membase (code, X86_EAX, X86_EAX, 0, 4);
+ x86_jump_membase (code, X86_EAX, vt_offset);
+
+ g_assert ((code - start) < buf_len);
+
+ mono_arch_flush_icache (start, code - start);
+
+ return start;
+}
+
void
mono_arch_patch_callsite (guint8 *method_start, guint8 *orig_code, guint8 *addr)
{
gboolean can_write = mono_breakpoint_clean_code (method_start, orig_code, 8, buf, sizeof (buf));
code = buf + 8;
- if (mono_running_on_valgrind ())
- can_write = FALSE;
/* go to the start of the call instruction
*
if (can_write) {
InterlockedExchange ((gint32*)(orig_code + 2), (guint)addr - ((guint)orig_code + 1) - 5);
-#ifdef HAVE_VALGRIND_MEMCHECK_H
- /* Tell valgrind to recompile the patched code */
- //VALGRIND_DISCARD_TRANSLATIONS (code + 2, code + 6);
-#endif
+ /* Tell valgrind to recompile the patched code */
+ VALGRIND_DISCARD_TRANSLATIONS (orig_code + 2, 4);
}
} else if (code [1] == 0xe9) {
/* A PLT entry: jmp <DISP> */
}
void
-mono_arch_patch_plt_entry (guint8 *code, guint8 *addr)
+mono_arch_patch_plt_entry (guint8 *code, gpointer *got, mgreg_t *regs, guint8 *addr)
{
- /* A PLT entry: jmp <DISP> */
- g_assert (code [0] == 0xe9);
+ guint32 offset;
+
+ /* Patch the jump table entry used by the plt entry */
+
+ /* A PLT entry: jmp *<DISP>(%ebx) */
+ g_assert (code [0] == 0xff);
+ g_assert (code [1] == 0xa3);
- if (!mono_running_on_valgrind ())
- InterlockedExchange ((gint32*)(code + 1), (guint)addr - (guint)code - 5);
+ offset = *(guint32*)(code + 2);
+
+ if (!got)
+ got = (gpointer*)(gsize) regs [MONO_ARCH_GOT_REG];
+ *(guint8**)((guint8*)got + offset) = addr;
}
void
-mono_arch_nullify_class_init_trampoline (guint8 *code, gssize *regs)
+mono_arch_nullify_class_init_trampoline (guint8 *code, mgreg_t *regs)
{
guint8 buf [16];
gboolean can_write = mono_breakpoint_clean_code (NULL, code, 6, buf, sizeof (buf));
/* Then atomically change the first 4 bytes to a nop as well */
ops = 0x90909090;
InterlockedExchange ((gint32*)code, ops);
-#ifdef HAVE_VALGRIND_MEMCHECK_H
/* FIXME: the calltree skin trips on the self modifying code above */
/* Tell valgrind to recompile the patched code */
- //VALGRIND_DISCARD_TRANSLATIONS (code, code + 8);
-#endif
+ //VALGRIND_DISCARD_TRANSLATIONS (code, 8);
}
} else if (code [0] == 0x90 || code [0] == 0xeb) {
/* Already changed by another thread */
/* call *<OFFSET>(<REG>) -> Call made from AOT code */
gpointer *vtable_slot;
- vtable_slot = mono_arch_get_vcall_slot_addr (code + 5, (gpointer*)regs);
+ vtable_slot = mono_get_vcall_slot_addr (code + 5, regs);
g_assert (vtable_slot);
*vtable_slot = nullified_class_init_trampoline;
}
void
-mono_arch_nullify_plt_entry (guint8 *code)
+mono_arch_nullify_plt_entry (guint8 *code, mgreg_t *regs)
{
- if (!mono_running_on_valgrind ()) {
- guint32 ops;
-
- ops = 0xfeeb;
- InterlockedExchange ((gint32*)code, ops);
-
- /* Then change the other bytes to a nop */
- code [2] = 0x90;
- code [3] = 0x90;
- code [4] = 0x90;
+ if (mono_aot_only && !nullified_class_init_trampoline)
+ nullified_class_init_trampoline = mono_aot_get_trampoline ("nullified_class_init_trampoline");
- /* 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_full (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;
code = buf = mono_global_codeman_reserve (256);
/* Put all registers into an array on the stack
* If this code is changed, make sure to update the offset value in
- * mono_arch_find_this_argument () in mini-x86.c.
+ * 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 ++;
/* 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++;
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;
/* 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++;
x86_breakpoint (buf);*/
#endif
- tramp = (guint8*)mono_get_trampoline_func (tramp_type);
- x86_call_code (buf, tramp);
+ 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 */
- x86_push_reg (buf, X86_EAX);
- x86_call_code (buf, (guint8*)mono_thread_force_interruption_checkpoint);
- x86_pop_reg (buf, X86_EAX);
+ /* Align the stack on osx */
+ 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 */
* 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
g_assert (pushed_args == -1);
}
- x86_ret (buf);
+ x86_ret (code);
+
+ g_assert ((code - buf) <= 256);
- g_assert ((buf - code) <= 256);
+ if (info)
+ *info = mono_tramp_info_create (g_strdup_printf ("generic_trampoline_%d", 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;
+
+ code = buf = mono_global_codeman_reserve (16);
+ x86_ret (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);
+
+ return buf;
}
#define TRAMPOLINE_SIZE 10
tramp = mono_get_trampoline_code (tramp_type);
- mono_domain_lock (domain);
- code = buf = mono_code_manager_reserve_align (domain->code_mp, TRAMPOLINE_SIZE, 4);
- mono_domain_unlock (domain);
+ code = buf = mono_domain_code_reserve_align (domain, TRAMPOLINE_SIZE, 4);
x86_push_imm (buf, arg1);
x86_jump_code (buf, tramp);
}
gpointer
-mono_arch_create_rgctx_lazy_fetch_trampoline (guint32 slot)
+mono_arch_create_rgctx_lazy_fetch_trampoline_full (guint32 slot, MonoTrampInfo **info, gboolean aot)
{
guint8 *tramp;
guint8 *code, *buf;
int depth, index;
int i;
gboolean mrgctx;
+ MonoJumpInfo *ji = NULL;
+ GSList *unwind_ops = NULL;
mrgctx = MONO_RGCTX_SLOT_IS_MRGCTX (slot);
index = MONO_RGCTX_SLOT_INDEX (slot);
if (mrgctx)
- index += sizeof (MonoMethodRuntimeGenericContext) / sizeof (gpointer);
+ index += MONO_SIZEOF_METHOD_RUNTIME_GENERIC_CONTEXT / sizeof (gpointer);
for (depth = 0; ; ++depth) {
int size = mono_class_rgctx_get_array_size (depth, mrgctx);
index -= size - 1;
}
- tramp_size = 36 + 6 * depth;
+ tramp_size = (aot ? 64 : 36) + 6 * depth;
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, sizeof (MonoMethodRuntimeGenericContext), 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);
+ mono_arch_flush_icache (buf, code - buf);
- g_assert (buf - code <= tramp_size);
+ g_assert (code - buf <= tramp_size);
- return code;
+ if (info)
+ *info = mono_tramp_info_create (g_strdup_printf ("rgctx_fetch_trampoline_%u", slot), buf, code - buf, ji, unwind_ops);
+
+ return buf;
}
gpointer
-mono_arch_create_generic_class_init_trampoline (void)
+mono_arch_create_generic_class_init_trampoline_full (MonoTrampInfo **info, gboolean aot)
{
guint8 *tramp;
guint8 *code, *buf;
static guint8 bitmask;
guint8 *jump;
int tramp_size;
+ GSList *unwind_ops = NULL;
+ MonoJumpInfo *ji = NULL;
tramp_size = 64;
/* 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);
+ if (info)
+ *info = mono_tramp_info_create (g_strdup_printf ("generic_class_init_trampoline"), buf, code - buf, ji, unwind_ops);
+
return buf;
}
*
*/
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_full (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;
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);
if (mono_thread_get_tls_offset () != -1) {
/* MonoObject* obj is in EAX */
/* is obj 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 */
- jump_obj_null = buf;
- x86_branch8 (buf, X86_CC_Z, -1, 1);
+ jump_obj_null = code;
+ x86_branch8 (code, X86_CC_Z, -1, 1);
/* load obj->synchronization to ECX */
- x86_mov_reg_membase (buf, X86_ECX, X86_EAX, G_STRUCT_OFFSET (MonoObject, synchronisation), 4);
+ x86_mov_reg_membase (code, X86_ECX, X86_EAX, G_STRUCT_OFFSET (MonoObject, synchronisation), 4);
/* is synchronization null? */
- x86_test_reg_reg (buf, X86_ECX, X86_ECX);
+ x86_test_reg_reg (code, X86_ECX, X86_ECX);
/* if yes, jump to actual trampoline */
- jump_sync_null = buf;
- x86_branch8 (buf, X86_CC_Z, -1, 1);
+ jump_sync_null = code;
+ x86_branch8 (code, X86_CC_Z, -1, 1);
- /* load MonoThread* into EDX */
- buf = mono_x86_emit_tls_get (buf, X86_EDX, mono_thread_get_tls_offset ());
+ /* load MonoInternalThread* into EDX */
+ code = mono_x86_emit_tls_get (code, X86_EDX, mono_thread_get_tls_offset ());
/* load TID into EDX */
- x86_mov_reg_membase (buf, X86_EDX, X86_EDX, G_STRUCT_OFFSET (MonoThread, tid), 4);
+ x86_mov_reg_membase (code, X86_EDX, X86_EDX, G_STRUCT_OFFSET (MonoInternalThread, tid), 4);
/* is synchronization->owner null? */
- x86_alu_membase_imm (buf, X86_CMP, X86_ECX, owner_offset, 0);
+ x86_alu_membase_imm (code, X86_CMP, X86_ECX, owner_offset, 0);
/* if not, jump to next case */
- jump_tid = buf;
- x86_branch8 (buf, X86_CC_NZ, -1, 1);
+ jump_tid = code;
+ x86_branch8 (code, X86_CC_NZ, -1, 1);
/* if yes, try a compare-exchange with the TID */
/* free up register EAX, needed for the zero */
- x86_push_reg (buf, X86_EAX);
+ x86_push_reg (code, X86_EAX);
/* zero EAX */
- x86_alu_reg_reg (buf, X86_XOR, X86_EAX, X86_EAX);
+ x86_alu_reg_reg (code, X86_XOR, X86_EAX, X86_EAX);
/* compare and exchange */
- x86_prefix (buf, X86_LOCK_PREFIX);
- x86_cmpxchg_membase_reg (buf, X86_ECX, owner_offset, X86_EDX);
+ x86_prefix (code, X86_LOCK_PREFIX);
+ x86_cmpxchg_membase_reg (code, X86_ECX, owner_offset, X86_EDX);
/* if not successful, jump to actual trampoline */
- jump_cmpxchg_failed = buf;
- x86_branch8 (buf, X86_CC_NZ, -1, 1);
+ jump_cmpxchg_failed = code;
+ x86_branch8 (code, X86_CC_NZ, -1, 1);
/* if successful, pop and return */
- x86_pop_reg (buf, X86_EAX);
- x86_ret (buf);
+ x86_pop_reg (code, X86_EAX);
+ x86_ret (code);
/* next case: synchronization->owner is not null */
- x86_patch (jump_tid, buf);
+ x86_patch (jump_tid, code);
/* is synchronization->owner == TID? */
- x86_alu_membase_reg (buf, X86_CMP, X86_ECX, owner_offset, X86_EDX);
+ x86_alu_membase_reg (code, X86_CMP, X86_ECX, owner_offset, X86_EDX);
/* if not, jump to actual trampoline */
- jump_other_owner = buf;
- x86_branch8 (buf, X86_CC_NZ, -1, 1);
+ jump_other_owner = code;
+ x86_branch8 (code, X86_CC_NZ, -1, 1);
/* if yes, increment nest */
- x86_inc_membase (buf, X86_ECX, nest_offset);
+ x86_inc_membase (code, X86_ECX, nest_offset);
/* return */
- x86_ret (buf);
+ x86_ret (code);
/* push obj */
- x86_patch (jump_obj_null, buf);
- x86_patch (jump_sync_null, buf);
- x86_patch (jump_other_owner, buf);
- x86_push_reg (buf, X86_EAX);
+ x86_patch (jump_obj_null, 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, buf);
- x86_jump_code (buf, tramp);
+ x86_patch (jump_cmpxchg_failed, code);
+ 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 (buf, X86_EAX);
- x86_jump_code (buf, tramp);
+ 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_enter");
+ x86_jump_reg (code, X86_EAX);
+ } else {
+ x86_jump_code (code, tramp);
+ }
}
- mono_arch_flush_icache (buf, buf - code);
- g_assert (buf - code <= tramp_size);
+ mono_arch_flush_icache (buf, code - buf);
+ g_assert (code - buf <= tramp_size);
- return code;
-}
+ if (info)
+ *info = mono_tramp_info_create (g_strdup_printf ("monitor_enter_trampoline"), buf, code - buf, ji, unwind_ops);
-gpointer
-mono_arch_create_monitor_exit_trampoline (void)
-{
- guint32 code_size;
- MonoJumpInfo *ji;
-
- 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_full (MonoTrampInfo **info, gboolean aot)
{
guint8 *tramp = mono_get_trampoline_code (MONO_TRAMPOLINE_MONITOR_EXIT);
guint8 *code, *buf;
- guint8 *jump_obj_null, *jump_have_waiters;
+ guint8 *jump_obj_null, *jump_have_waiters, *jump_sync_null, *jump_not_owned;
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);
if (mono_thread_get_tls_offset () != -1) {
/* MonoObject* obj is in EAX */
/* is obj 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 */
- jump_obj_null = buf;
- x86_branch8 (buf, X86_CC_Z, -1, 1);
+ jump_obj_null = code;
+ x86_branch8 (code, X86_CC_Z, -1, 1);
/* load obj->synchronization to ECX */
- x86_mov_reg_membase (buf, X86_ECX, X86_EAX, G_STRUCT_OFFSET (MonoObject, synchronisation), 4);
+ x86_mov_reg_membase (code, X86_ECX, X86_EAX, G_STRUCT_OFFSET (MonoObject, synchronisation), 4);
/* is synchronization null? */
- x86_test_reg_reg (buf, X86_ECX, X86_ECX);
- /* if not, jump to next case */
- jump_next = buf;
- x86_branch8 (buf, X86_CC_NZ, -1, 1);
- /* if yes, just return */
- x86_ret (buf);
+ 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);
/* next case: synchronization is not null */
- x86_patch (jump_next, buf);
- /* load MonoThread* into EDX */
- buf = mono_x86_emit_tls_get (buf, X86_EDX, mono_thread_get_tls_offset ());
+ /* load MonoInternalThread* into EDX */
+ code = mono_x86_emit_tls_get (code, X86_EDX, mono_thread_get_tls_offset ());
/* load TID into EDX */
- x86_mov_reg_membase (buf, X86_EDX, X86_EDX, G_STRUCT_OFFSET (MonoThread, tid), 4);
+ x86_mov_reg_membase (code, X86_EDX, X86_EDX, G_STRUCT_OFFSET (MonoInternalThread, tid), 4);
/* is synchronization->owner == TID */
- x86_alu_membase_reg (buf, X86_CMP, X86_ECX, owner_offset, X86_EDX);
- /* if yes, jump to next case */
- jump_next = buf;
- x86_branch8 (buf, X86_CC_Z, -1, 1);
- /* if not, just return */
- x86_ret (buf);
+ x86_alu_membase_reg (code, X86_CMP, X86_ECX, owner_offset, X86_EDX);
+ /* if no, jump to actual trampoline */
+ jump_not_owned = code;
+ x86_branch8 (code, X86_CC_NZ, -1, 1);
/* next case: synchronization->owner == TID */
- x86_patch (jump_next, buf);
/* is synchronization->nest == 1 */
- x86_alu_membase_imm (buf, X86_CMP, X86_ECX, nest_offset, 1);
+ x86_alu_membase_imm (code, X86_CMP, X86_ECX, nest_offset, 1);
/* if not, jump to next case */
- jump_next = buf;
- x86_branch8 (buf, X86_CC_NZ, -1, 1);
+ jump_next = code;
+ x86_branch8 (code, X86_CC_NZ, -1, 1);
/* if yes, is synchronization->entry_count zero? */
- x86_alu_membase_imm (buf, X86_CMP, X86_ECX, entry_count_offset, 0);
+ x86_alu_membase_imm (code, X86_CMP, X86_ECX, entry_count_offset, 0);
/* if not, jump to actual trampoline */
- jump_have_waiters = buf;
- x86_branch8 (buf, X86_CC_NZ, -1 , 1);
+ jump_have_waiters = code;
+ x86_branch8 (code, X86_CC_NZ, -1 , 1);
/* if yes, set synchronization->owner to null and return */
- x86_mov_membase_imm (buf, X86_ECX, owner_offset, 0, 4);
- x86_ret (buf);
+ x86_mov_membase_imm (code, X86_ECX, owner_offset, 0, 4);
+ x86_ret (code);
/* next case: synchronization->nest is not 1 */
- x86_patch (jump_next, buf);
+ x86_patch (jump_next, code);
/* decrease synchronization->nest and return */
- x86_dec_membase (buf, X86_ECX, nest_offset);
- x86_ret (buf);
+ x86_dec_membase (code, X86_ECX, nest_offset);
+ x86_ret (code);
/* push obj and jump to the actual trampoline */
- x86_patch (jump_obj_null, buf);
- x86_patch (jump_have_waiters, buf);
- x86_push_reg (buf, X86_EAX);
- x86_jump_code (buf, tramp);
+ x86_patch (jump_obj_null, code);
+ x86_patch (jump_have_waiters, code);
+ x86_patch (jump_not_owned, code);
+ x86_patch (jump_sync_null, code);
+ }
+
+ /* 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 (buf, X86_EAX);
- x86_jump_code (buf, tramp);
+ x86_jump_code (code, tramp);
}
- mono_arch_flush_icache (buf, buf - code);
- g_assert (buf - code <= tramp_size);
+ 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 code;
+ return buf;
}
#else
gpointer
x86_push_imm (code, func_arg);
x86_call_code (code, (guint8*)func);
}
+
+static void
+handler_block_trampoline_helper (gpointer *ptr)
+{
+ MonoJitTlsData *jit_tls = TlsGetValue (mono_jit_tls_id);
+ *ptr = jit_tls->handler_block_return_address;
+}
+
+gpointer
+mono_arch_create_handler_block_trampoline (void)
+{
+ guint8 *tramp = mono_get_trampoline_code (MONO_TRAMPOLINE_HANDLER_BLOCK_GUARD);
+ guint8 *code, *buf;
+ int tramp_size = 64;
+ code = buf = mono_global_codeman_reserve (tramp_size);
+
+ /*
+ This trampoline restore the call chain of the handler block then jumps into the code that deals with it.
+ */
+
+ if (mono_get_jit_tls_offset () != -1) {
+ 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*/
+ x86_push_reg (code, X86_EAX);
+ x86_jump_code (code, tramp);
+ } else {
+ /*Slow path uses a c helper*/
+ x86_push_reg (code, X86_ESP);
+ x86_push_imm (code, tramp);
+ x86_jump_code (code, handler_block_trampoline_helper);
+ }
+
+ mono_arch_flush_icache (buf, code - buf);
+ g_assert (code - buf <= tramp_size);
+
+ 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 + 6);
+}
projects / mono.git / blobdiff