#include <config.h>
#include <glib.h>
+#include <mono/metadata/abi-details.h>
#include <mono/metadata/appdomain.h>
#include <mono/metadata/metadata-internals.h>
#include <mono/metadata/marshal.h>
#include <mono/metadata/mono-debug.h>
#include <mono/metadata/mono-debug-debugger.h>
#include <mono/metadata/monitor.h>
+#include <mono/metadata/profiler-private.h>
#include <mono/metadata/gc-internal.h>
#include <mono/arch/x86/x86-codegen.h>
#include "mini.h"
#include "mini-x86.h"
+#define ALIGN_TO(val,align) ((((guint64)val) + ((align) - 1)) & ~((align) - 1))
+
/*
* mono_arch_get_unbox_trampoline:
* @m: method pointer
g_assert ((code - start) < size);
nacl_domain_code_validate (domain, &start, size, &code);
+ mono_profiler_code_buffer_new (start, code - start, MONO_PROFILER_CODE_BUFFER_UNBOX_TRAMPOLINE, m);
return start;
}
nacl_domain_code_validate (domain, &start, buf_len, &code);
mono_arch_flush_icache (start, code - start);
+ mono_profiler_code_buffer_new (start, code - start, MONO_PROFILER_CODE_BUFFER_GENERICS_TRAMPOLINE, NULL);
return start;
}
nacl_domain_code_validate (domain, &start, buf_len, &code);
mono_arch_flush_icache (start, code - start);
+ mono_profiler_code_buffer_new (start, code - start, MONO_PROFILER_CODE_BUFFER_IMT_TRAMPOLINE, NULL);
return start;
}
}
}
-void
-mono_arch_nullify_plt_entry (guint8 *code, mgreg_t *regs)
-{
- mono_arch_patch_plt_entry (code, NULL, regs, mini_get_nullified_class_init_trampoline ());
-}
-
guchar*
mono_arch_create_generic_trampoline (MonoTrampolineType tramp_type, MonoTrampInfo **info, gboolean aot)
{
char *tramp_name;
guint8 *buf, *code, *tramp;
- int pushed_args, pushed_args_caller_saved;
GSList *unwind_ops = NULL;
MonoJumpInfo *ji = NULL;
+ int i, offset, frame_size, regarray_offset, lmf_offset, caller_ip_offset, arg_offset;
unwind_ops = mono_arch_get_cie_program ();
* the ret address is at: esp + (pushed_args + 1) * sizeof (gpointer)
*/
- /* Put all registers into an array on the stack
- * 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 (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 (code, X86_SUB, X86_ESP, 4);
-
- pushed_args ++;
-
- /* save LMF begin */
-
- /* save the IP (caller ip) */
- if (tramp_type == MONO_TRAMPOLINE_JUMP)
- x86_push_imm (code, 0);
- else
- x86_push_membase (code, X86_ESP, (pushed_args + 1) * sizeof (gpointer));
-
- pushed_args++;
-
+ // FIXME: Unwind info
+
+ /* Compute frame offsets relative to the frame pointer %ebp */
+ arg_offset = sizeof (mgreg_t);
+ caller_ip_offset = 2 * sizeof (mgreg_t);
+ offset = 0;
+ offset += sizeof (MonoLMF);
+ lmf_offset = -offset;
+ offset += X86_NREG * sizeof (mgreg_t);
+ regarray_offset = -offset;
+ /* Argument area */
+ offset += 4 * sizeof (mgreg_t);
+ frame_size = ALIGN_TO (offset, MONO_ARCH_FRAME_ALIGNMENT);
+
+ /* Allocate frame */
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 (code, X86_ESP);
- /* Adjust ESP so it points to the previous frame */
- 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 (code, X86_ESP, pushed_args * sizeof (gpointer));
- else
- x86_push_imm (code, 0);
-
- pushed_args++;
-
- /* On apple, the stack is correctly aligned to 16 bytes because pushed_args is
- * 16 and there is the extra trampoline arg + the return ip pushed by call
- * FIXME: Note that if an exception happens while some args are pushed
- * on the stack, the stack will be misaligned.
- */
- g_assert (pushed_args == 16);
+ x86_mov_reg_reg (code, X86_EBP, X86_ESP, sizeof (mgreg_t));
+ /* There are three words on the stack, adding + 4 aligns the stack to 16, which is needed on osx */
+ x86_alu_reg_imm (code, X86_SUB, X86_ESP, frame_size + sizeof (mgreg_t));
+
+ /* Save all registers */
+ for (i = X86_EAX; i <= X86_EDI; ++i) {
+ int reg = i;
+
+ if (i == X86_EBP) {
+ /* Save original ebp */
+ /* EAX is already saved */
+ x86_mov_reg_membase (code, X86_EAX, X86_EBP, 0, sizeof (mgreg_t));
+ reg = X86_EAX;
+ } else if (i == X86_ESP) {
+ /* Save original esp */
+ /* EAX is already saved */
+ x86_mov_reg_reg (code, X86_EAX, X86_EBP, sizeof (mgreg_t));
+ /* Saved ebp + trampoline arg + return addr */
+ x86_alu_reg_imm (code, X86_ADD, X86_EAX, 3 * sizeof (mgreg_t));
+ reg = X86_EAX;
+ }
+ x86_mov_membase_reg (code, X86_EBP, regarray_offset + (i * sizeof (mgreg_t)), reg, sizeof (mgreg_t));
+ }
+ /* Setup LMF */
+ /* eip */
+ if (tramp_type == MONO_TRAMPOLINE_JUMP) {
+ x86_mov_membase_imm (code, X86_EBP, lmf_offset + G_STRUCT_OFFSET (MonoLMF, eip), 0, sizeof (mgreg_t));
+ } else {
+ x86_mov_reg_membase (code, X86_EAX, X86_EBP, caller_ip_offset, sizeof (mgreg_t));
+ x86_mov_membase_reg (code, X86_EBP, lmf_offset + G_STRUCT_OFFSET (MonoLMF, eip), X86_EAX, sizeof (mgreg_t));
+ }
+ /* method */
+ if ((tramp_type == MONO_TRAMPOLINE_JIT) || (tramp_type == MONO_TRAMPOLINE_JUMP)) {
+ x86_mov_reg_membase (code, X86_EAX, X86_EBP, arg_offset, sizeof (mgreg_t));
+ x86_mov_membase_reg (code, X86_EBP, lmf_offset + G_STRUCT_OFFSET (MonoLMF, method), X86_EAX, sizeof (mgreg_t));
+ } else {
+ x86_mov_membase_imm (code, X86_EBP, lmf_offset + G_STRUCT_OFFSET (MonoLMF, method), 0, sizeof (mgreg_t));
+ }
+ /* esp */
+ x86_mov_reg_membase (code, X86_EAX, X86_EBP, regarray_offset + (X86_ESP * sizeof (mgreg_t)), sizeof (mgreg_t));
+ x86_mov_membase_reg (code, X86_EBP, lmf_offset + G_STRUCT_OFFSET (MonoLMF, esp), X86_EAX, sizeof (mgreg_t));
+ /* callee save registers */
+ x86_mov_reg_membase (code, X86_EAX, X86_EBP, regarray_offset + (X86_EBX * sizeof (mgreg_t)), sizeof (mgreg_t));
+ x86_mov_membase_reg (code, X86_EBP, lmf_offset + G_STRUCT_OFFSET (MonoLMF, ebx), X86_EAX, sizeof (mgreg_t));
+ x86_mov_reg_membase (code, X86_EAX, X86_EBP, regarray_offset + (X86_EDI * sizeof (mgreg_t)), sizeof (mgreg_t));
+ x86_mov_membase_reg (code, X86_EBP, lmf_offset + G_STRUCT_OFFSET (MonoLMF, edi), X86_EAX, sizeof (mgreg_t));
+ x86_mov_reg_membase (code, X86_EAX, X86_EBP, regarray_offset + (X86_ESI * sizeof (mgreg_t)), sizeof (mgreg_t));
+ x86_mov_membase_reg (code, X86_EBP, lmf_offset + G_STRUCT_OFFSET (MonoLMF, esi), X86_EAX, sizeof (mgreg_t));
+ x86_mov_reg_membase (code, X86_EAX, X86_EBP, regarray_offset + (X86_EBP * sizeof (mgreg_t)), sizeof (mgreg_t));
+ x86_mov_membase_reg (code, X86_EBP, lmf_offset + G_STRUCT_OFFSET (MonoLMF, ebp), X86_EAX, sizeof (mgreg_t));
+
+ /* Push LMF */
/* get the address of lmf for the current thread */
if (aot) {
code = mono_arch_emit_load_aotconst (buf, code, &ji, MONO_PATCH_INFO_JIT_ICALL_ADDR, "mono_get_lmf_addr");
} else {
x86_call_code (code, mono_get_lmf_addr);
}
- /* push lmf */
- x86_push_reg (code, X86_EAX);
- /* push *lfm (previous_lmf) */
- x86_push_membase (code, X86_EAX, 0);
+ /* lmf->lmf_addr = lmf_addr (%eax) */
+ x86_mov_membase_reg (code, X86_EBP, lmf_offset + G_STRUCT_OFFSET (MonoLMF, lmf_addr), X86_EAX, sizeof (mgreg_t));
+ /* lmf->previous_lmf = *(lmf_addr) */
+ x86_mov_reg_membase (code, X86_ECX, X86_EAX, 0, sizeof (mgreg_t));
/* Signal to mono_arch_find_jit_info () that this is a trampoline frame */
- x86_alu_membase_imm (code, X86_ADD, X86_ESP, 0, 1);
- /* *(lmf) = ESP */
- 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 (code, 0);
-
- pushed_args++;
-
- /* push the method info */
- 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 (code, 0);
- else
- x86_push_membase (code, X86_ESP, (pushed_args + 1) * sizeof (gpointer));
- pushed_args++;
- /* push the address of the register array */
- x86_lea_membase (code, X86_EAX, X86_ESP, (pushed_args - 8) * sizeof (gpointer));
- x86_push_reg (code, X86_EAX);
-
- pushed_args++;
+ x86_alu_reg_imm (code, X86_ADD, X86_ECX, 1);
+ x86_mov_membase_reg (code, X86_EBP, lmf_offset + G_STRUCT_OFFSET (MonoLMF, previous_lmf), X86_ECX, sizeof (mgreg_t));
+ /* *lmf_addr = lmf */
+ x86_lea_membase (code, X86_ECX, X86_EBP, lmf_offset);
+ x86_mov_membase_reg (code, X86_EAX, 0, X86_ECX, sizeof (mgreg_t));
+
+ /* Call trampoline function */
+ /* Arg 1 - registers */
+ x86_lea_membase (code, X86_EAX, X86_EBP, regarray_offset);
+ x86_mov_membase_reg (code, X86_ESP, (0 * sizeof (mgreg_t)), X86_EAX, sizeof (mgreg_t));
+ /* Arg2 - calling code */
+ if (tramp_type == MONO_TRAMPOLINE_JUMP) {
+ x86_mov_membase_imm (code, X86_ESP, (1 * sizeof (mgreg_t)), 0, sizeof (mgreg_t));
+ } else {
+ x86_mov_reg_membase (code, X86_EAX, X86_EBP, caller_ip_offset, sizeof (mgreg_t));
+ x86_mov_membase_reg (code, X86_ESP, (1 * sizeof (mgreg_t)), X86_EAX, sizeof (mgreg_t));
+ }
+ /* Arg3 - trampoline argument */
+ x86_mov_reg_membase (code, X86_EAX, X86_EBP, arg_offset, sizeof (mgreg_t));
+ x86_mov_membase_reg (code, X86_ESP, (2 * sizeof (mgreg_t)), X86_EAX, sizeof (mgreg_t));
+ /* Arg4 - trampoline address */
+ // FIXME:
+ x86_mov_membase_imm (code, X86_ESP, (3 * sizeof (mgreg_t)), 0, sizeof (mgreg_t));
#ifdef __APPLE__
/* check the stack is aligned after the ret ip is pushed */
- /*x86_mov_reg_reg (buf, X86_EDX, X86_ESP, 4);
- x86_alu_reg_imm (buf, X86_AND, X86_EDX, 15);
- x86_alu_reg_imm (buf, X86_CMP, X86_EDX, 0);
- x86_branch_disp (buf, X86_CC_Z, 3, FALSE);
- x86_breakpoint (buf);*/
+ /*
+ x86_mov_reg_reg (code, X86_EDX, X86_ESP, 4);
+ x86_alu_reg_imm (code, X86_AND, X86_EDX, 15);
+ x86_alu_reg_imm (code, X86_CMP, X86_EDX, 0);
+ x86_branch_disp (code, X86_CC_Z, 3, FALSE);
+ x86_breakpoint (code);
+ */
#endif
- 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_code (code, tramp);
}
- x86_alu_reg_imm (code, X86_ADD, X86_ESP, 4*4);
-
- pushed_args -= 4;
+ /*
+ * Overwrite the trampoline argument with the address we need to jump to,
+ * to free %eax.
+ */
+ x86_mov_membase_reg (code, X86_EBP, arg_offset, X86_EAX, 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 (code, X86_SUB, X86_ESP, 3 * 4);
- x86_push_reg (code, X86_EAX);
+ /* Check for interruptions */
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 (code, X86_EBX);
- pushed_args--;
- x86_alu_reg_imm (code, X86_SUB, X86_EBX, 1);
-
- /* edi = lmf */
- x86_pop_reg (code, X86_EDI);
- pushed_args--;
-
- /* *(lmf) = previous_lmf */
- x86_mov_membase_reg (code, X86_EDI, 0, X86_EBX, 4);
-
- /* discard method info */
- x86_pop_reg (code, X86_ESI);
- pushed_args--;
-
- /* discard ESP */
- x86_pop_reg (code, X86_ESI);
- pushed_args--;
-
- /* restore caller saved regs */
- 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 (code, X86_ADD, X86_ESP, 4);
- pushed_args--;
-
- /* restore LMF end */
-
- if (!MONO_TRAMPOLINE_TYPE_MUST_RETURN (tramp_type)) {
- /*
- * Overwrite the method ptr with the address we need to jump to,
- * to free %eax.
- */
- x86_mov_membase_reg (code, X86_ESP, pushed_args * sizeof (gpointer), X86_EAX, 4);
+ x86_mov_reg_membase (code, X86_EAX, X86_EBP, lmf_offset + G_STRUCT_OFFSET (MonoLMF, lmf_addr), sizeof (mgreg_t));
+ x86_mov_reg_membase (code, X86_ECX, X86_EBP, lmf_offset + G_STRUCT_OFFSET (MonoLMF, previous_lmf), sizeof (mgreg_t));
+ x86_alu_reg_imm (code, X86_SUB, X86_ECX, 1);
+ x86_mov_membase_reg (code, X86_EAX, 0, X86_ECX, sizeof (mgreg_t));
+
+ /* Restore registers */
+ for (i = X86_EAX; i <= X86_EDI; ++i) {
+ if (i == X86_ESP || i == X86_EBP)
+ continue;
+ if (i == X86_EAX && !((tramp_type == MONO_TRAMPOLINE_RESTORE_STACK_PROT) || (tramp_type == MONO_TRAMPOLINE_AOT_PLT)))
+ continue;
+ x86_mov_reg_membase (code, i, X86_EBP, regarray_offset + (i * 4), 4);
}
- /* Restore caller saved registers */
- 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 (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 (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 (code, X86_ADD, X86_ESP, 10 * 4);
- pushed_args -= 10;
-
- /* We've popped one more stack item than we've pushed (the
- method ptr argument), so we must end up at -1. */
- g_assert (pushed_args == -1);
- }
+ /* Restore frame */
+ x86_leave (code);
- /*block guard trampolines are called with the stack aligned but must exit with the stack unaligned. */
- if (tramp_type == MONO_TRAMPOLINE_HANDLER_BLOCK_GUARD) {
- x86_pop_reg (code, X86_EAX);
- x86_alu_reg_imm (code, X86_ADD, X86_ESP, 0x8);
- x86_jump_reg (code, X86_EAX);
- } else {
+ if (MONO_TRAMPOLINE_TYPE_MUST_RETURN (tramp_type)) {
+ /* Load the value returned by the trampoline */
+ x86_mov_reg_membase (code, X86_EAX, X86_ESP, 0, 4);
+ /* The trampoline returns normally, pop the trampoline argument */
+ x86_alu_reg_imm (code, X86_ADD, X86_ESP, 4);
x86_ret (code);
+ } else {
+ /* The trampoline argument is at the top of the stack, and it contains the address we need to branch to */
+ if (tramp_type == MONO_TRAMPOLINE_HANDLER_BLOCK_GUARD) {
+ x86_pop_reg (code, X86_EAX);
+ x86_alu_reg_imm (code, X86_ADD, X86_ESP, 0x8);
+ x86_jump_reg (code, X86_EAX);
+ } else {
+ x86_ret (code);
+ }
}
nacl_global_codeman_validate (&buf, 256, &code);
g_assert ((code - buf) <= 256);
+ mono_profiler_code_buffer_new (buf, code - buf, MONO_PROFILER_CODE_BUFFER_HELPER, NULL);
- if (info) {
- tramp_name = mono_get_generic_trampoline_name (tramp_type);
- *info = mono_tramp_info_create (tramp_name, buf, code - buf, ji, unwind_ops);
- g_free (tramp_name);
- }
+ tramp_name = mono_get_generic_trampoline_name (tramp_type);
+ *info = mono_tramp_info_create (tramp_name, buf, code - buf, ji, unwind_ops);
+ g_free (tramp_name);
return buf;
}
nacl_global_codeman_validate (&buf, tramp_size, &code);
mono_arch_flush_icache (buf, code - buf);
+ mono_profiler_code_buffer_new (buf, code - buf, MONO_PROFILER_CODE_BUFFER_HELPER, NULL);
- if (info)
- *info = mono_tramp_info_create ("nullified_class_init_trampoline", buf, code - buf, NULL, NULL);
+ *info = mono_tramp_info_create ("nullified_class_init_trampoline", buf, code - buf, NULL, NULL);
return buf;
}
nacl_domain_code_validate (domain, &code, NACL_SIZE (4, kNaClAlignment), &buf);
mono_arch_flush_icache (code, buf - code);
+ mono_profiler_code_buffer_new (code, buf - code, MONO_PROFILER_CODE_BUFFER_SPECIFIC_TRAMPOLINE, mono_get_generic_trampoline_simple_name (tramp_type));
if (code_len)
*code_len = buf - code;
x86_mov_reg_membase (code, X86_EAX, X86_ESP, 4, 4);
if (!mrgctx) {
/* load rgctx ptr from vtable */
- x86_mov_reg_membase (code, X86_EAX, X86_EAX, G_STRUCT_OFFSET (MonoVTable, runtime_generic_context), 4);
+ x86_mov_reg_membase (code, X86_EAX, X86_EAX, MONO_STRUCT_OFFSET (MonoVTable, runtime_generic_context), 4);
/* is the rgctx ptr null? */
x86_test_reg_reg (code, X86_EAX, X86_EAX);
/* if yes, jump to actual trampoline */
nacl_global_codeman_validate (&buf, tramp_size, &code);
mono_arch_flush_icache (buf, code - buf);
+ mono_profiler_code_buffer_new (buf, code - buf, MONO_PROFILER_CODE_BUFFER_GENERICS_TRAMPOLINE, NULL);
g_assert (code - buf <= tramp_size);
- if (info) {
- char *name = mono_get_rgctx_fetch_trampoline_name (slot);
- *info = mono_tramp_info_create (name, buf, code - buf, ji, unwind_ops);
- g_free (name);
- }
+ char *name = mono_get_rgctx_fetch_trampoline_name (slot);
+ *info = mono_tramp_info_create (name, buf, code - buf, ji, unwind_ops);
+ g_free (name);
return buf;
}
nacl_global_codeman_validate (&buf, tramp_size, &code);
mono_arch_flush_icache (buf, code - buf);
+ mono_profiler_code_buffer_new (buf, code - buf, MONO_PROFILER_CODE_BUFFER_GENERICS_TRAMPOLINE, NULL);
g_assert (code - buf <= tramp_size);
- if (info)
- *info = mono_tramp_info_create ("rgctx_fetch_trampoline_general", buf, code - buf, ji, unwind_ops);
-
- return buf;
-}
-
-gpointer
-mono_arch_create_generic_class_init_trampoline (MonoTrampInfo **info, gboolean aot)
-{
- guint8 *tramp;
- guint8 *code, *buf;
- static int byte_offset = -1;
- 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);
-
- x86_test_membase_imm (code, MONO_ARCH_VTABLE_REG, byte_offset, bitmask);
- jump = code;
- x86_branch8 (code, X86_CC_Z, -1, 1);
-
- x86_ret (code);
-
- x86_patch (jump, code);
-
- /* Push the vtable so the stack is the same as in a specific trampoline */
- x86_push_reg (code, MONO_ARCH_VTABLE_REG);
-
- 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);
- }
-
- 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 ("generic_class_init_trampoline", buf, code - buf, ji, unwind_ops);
+ *info = mono_tramp_info_create ("rgctx_fetch_trampoline_general", buf, code - buf, ji, unwind_ops);
return buf;
}
*
*/
gpointer
-mono_arch_create_monitor_enter_trampoline (MonoTrampInfo **info, gboolean aot)
+mono_arch_create_monitor_enter_trampoline (MonoTrampInfo **info, gboolean is_v4, 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, *jump_sync_thin_hash = NULL;
+ guint8 *jump_lock_taken_true = NULL;
int tramp_size;
- int owner_offset, nest_offset, dummy;
+ int status_offset, nest_offset;
MonoJumpInfo *ji = NULL;
GSList *unwind_ops = NULL;
g_assert (MONO_ARCH_MONITOR_OBJECT_REG == X86_EAX);
+#ifdef MONO_ARCH_MONITOR_LOCK_TAKEN_REG
+ g_assert (MONO_ARCH_MONITOR_LOCK_TAKEN_REG == X86_EDX);
+#else
+ g_assert (!is_v4);
+#endif
- mono_monitor_threads_sync_members_offset (&owner_offset, &nest_offset, &dummy);
- g_assert (MONO_THREADS_SYNC_MEMBER_SIZE (owner_offset) == sizeof (gpointer));
+ mono_monitor_threads_sync_members_offset (&status_offset, &nest_offset);
+ g_assert (MONO_THREADS_SYNC_MEMBER_SIZE (status_offset) == sizeof (guint32));
g_assert (MONO_THREADS_SYNC_MEMBER_SIZE (nest_offset) == sizeof (guint32));
- owner_offset = MONO_THREADS_SYNC_MEMBER_OFFSET (owner_offset);
+ status_offset = MONO_THREADS_SYNC_MEMBER_OFFSET (status_offset);
nest_offset = MONO_THREADS_SYNC_MEMBER_OFFSET (nest_offset);
- tramp_size = NACL_SIZE (96, 128);
+ tramp_size = NACL_SIZE (128, 192);
code = buf = mono_global_codeman_reserve (tramp_size);
+ x86_push_reg (code, X86_EAX);
if (mono_thread_get_tls_offset () != -1) {
+ if (is_v4) {
+ x86_test_membase_imm (code, X86_EDX, 0, 1);
+ /* if *lock_taken is 1, jump to actual trampoline */
+ jump_lock_taken_true = code;
+ x86_branch8 (code, X86_CC_NZ, -1, 1);
+ x86_push_reg (code, X86_EDX);
+ }
/* MonoObject* obj is in EAX */
/* is obj null? */
x86_test_reg_reg (code, X86_EAX, X86_EAX);
x86_branch8 (code, X86_CC_Z, -1, 1);
/* load obj->synchronization to ECX */
- x86_mov_reg_membase (code, X86_ECX, X86_EAX, G_STRUCT_OFFSET (MonoObject, synchronisation), 4);
+ x86_mov_reg_membase (code, X86_ECX, X86_EAX, MONO_STRUCT_OFFSET (MonoObject, synchronisation), 4);
if (mono_gc_is_moving ()) {
/*if bit zero is set it's a thin hash*/
code = mono_x86_emit_tls_get (code, X86_EDX, mono_thread_get_tls_offset ());
}
/* load TID into EDX */
- x86_mov_reg_membase (code, X86_EDX, X86_EDX, G_STRUCT_OFFSET (MonoInternalThread, tid), 4);
+ x86_mov_reg_membase (code, X86_EDX, X86_EDX, MONO_STRUCT_OFFSET (MonoInternalThread, small_id), 4);
- /* is synchronization->owner null? */
- x86_alu_membase_imm (code, X86_CMP, X86_ECX, owner_offset, 0);
+ /* is synchronization->owner free */
+ x86_mov_reg_membase (code, X86_EAX, X86_ECX, status_offset, 4);
+ x86_test_reg_imm (code, X86_EAX, OWNER_MASK);
/* if not, jump to next case */
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 (code, X86_EAX);
- /* zero EAX */
- x86_alu_reg_reg (code, X86_XOR, X86_EAX, X86_EAX);
+ /* Form new status */
+ x86_alu_reg_reg (code, X86_OR, X86_EDX, X86_EAX);
/* compare and exchange */
x86_prefix (code, X86_LOCK_PREFIX);
- x86_cmpxchg_membase_reg (code, X86_ECX, owner_offset, X86_EDX);
+ x86_cmpxchg_membase_reg (code, X86_ECX, status_offset, X86_EDX);
/* if not successful, jump to actual trampoline */
jump_cmpxchg_failed = code;
x86_branch8 (code, X86_CC_NZ, -1, 1);
/* if successful, pop and return */
+ if (is_v4) {
+ x86_pop_reg (code, X86_EDX);
+ x86_mov_membase_imm (code, X86_EDX, 0, 1, 1);
+ }
x86_pop_reg (code, X86_EAX);
x86_ret (code);
/* next case: synchronization->owner is not null */
x86_patch (jump_tid, code);
/* is synchronization->owner == TID? */
- x86_alu_membase_reg (code, X86_CMP, X86_ECX, owner_offset, X86_EDX);
+ x86_alu_reg_imm (code, X86_AND, X86_EAX, OWNER_MASK);
+ x86_alu_reg_reg (code, X86_CMP, X86_EAX, X86_EDX);
/* if not, jump to actual trampoline */
jump_other_owner = code;
x86_branch8 (code, X86_CC_NZ, -1, 1);
/* if yes, increment nest */
x86_inc_membase (code, X86_ECX, nest_offset);
+ if (is_v4) {
+ x86_pop_reg (code, X86_EDX);
+ x86_mov_membase_imm (code, X86_EDX, 0, 1, 1);
+ }
+ x86_pop_reg (code, X86_EAX);
/* return */
x86_ret (code);
- /* push obj */
+ /* obj is pushed, 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_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);
- 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);
+
+ if (is_v4) {
+ x86_pop_reg (code, X86_EDX);
+ x86_patch (jump_lock_taken_true, code);
}
- } else {
- /* push obj and jump to the actual trampoline */
- x86_push_reg (code, X86_EAX);
- if (aot) {
+ }
+
+ if (aot) {
+ /* We are calling the generic trampoline directly, the argument is pushed
+ * on the stack just like a specific trampoline.
+ */
+ if (is_v4)
+ code = mono_arch_emit_load_aotconst (buf, code, &ji, MONO_PATCH_INFO_JIT_ICALL_ADDR, "generic_trampoline_monitor_enter_v4");
+ else
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);
- }
+ x86_jump_reg (code, X86_EAX);
+ } else {
+ if (is_v4)
+ x86_jump_code (code, mono_get_trampoline_code (MONO_TRAMPOLINE_MONITOR_ENTER_V4));
+ else
+ x86_jump_code (code, mono_get_trampoline_code (MONO_TRAMPOLINE_MONITOR_ENTER));
}
mono_arch_flush_icache (buf, code - buf);
g_assert (code - buf <= tramp_size);
nacl_global_codeman_validate (&buf, tramp_size, &code);
+ mono_profiler_code_buffer_new (buf, code - buf, MONO_PROFILER_CODE_BUFFER_MONITOR, NULL);
- if (info)
+ if (is_v4)
+ *info = mono_tramp_info_create ("monitor_enter_v4_trampoline", buf, code - buf, ji, unwind_ops);
+ else
*info = mono_tramp_info_create ("monitor_enter_trampoline", buf, code - buf, ji, unwind_ops);
return buf;
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, *jump_sync_thin_hash = NULL;
- guint8 *jump_next;
+ guint8 *jump_next, *jump_cmpxchg_failed;
int tramp_size;
- int owner_offset, nest_offset, entry_count_offset;
+ int status_offset, nest_offset;
MonoJumpInfo *ji = NULL;
GSList *unwind_ops = NULL;
g_assert (MONO_ARCH_MONITOR_OBJECT_REG == X86_EAX);
- mono_monitor_threads_sync_members_offset (&owner_offset, &nest_offset, &entry_count_offset);
- g_assert (MONO_THREADS_SYNC_MEMBER_SIZE (owner_offset) == sizeof (gpointer));
+ mono_monitor_threads_sync_members_offset (&status_offset, &nest_offset);
+ g_assert (MONO_THREADS_SYNC_MEMBER_SIZE (status_offset) == sizeof (guint32));
g_assert (MONO_THREADS_SYNC_MEMBER_SIZE (nest_offset) == sizeof (guint32));
- g_assert (MONO_THREADS_SYNC_MEMBER_SIZE (entry_count_offset) == sizeof (gint32));
- owner_offset = MONO_THREADS_SYNC_MEMBER_OFFSET (owner_offset);
+ status_offset = MONO_THREADS_SYNC_MEMBER_OFFSET (status_offset);
nest_offset = MONO_THREADS_SYNC_MEMBER_OFFSET (nest_offset);
- entry_count_offset = MONO_THREADS_SYNC_MEMBER_OFFSET (entry_count_offset);
- tramp_size = NACL_SIZE (96, 128);
+ tramp_size = NACL_SIZE (128, 192);
code = buf = mono_global_codeman_reserve (tramp_size);
+ x86_push_reg (code, X86_EAX);
if (mono_thread_get_tls_offset () != -1) {
/* MonoObject* obj is in EAX */
/* is obj null? */
x86_branch8 (code, X86_CC_Z, -1, 1);
/* load obj->synchronization to ECX */
- x86_mov_reg_membase (code, X86_ECX, X86_EAX, G_STRUCT_OFFSET (MonoObject, synchronisation), 4);
+ x86_mov_reg_membase (code, X86_ECX, X86_EAX, MONO_STRUCT_OFFSET (MonoObject, synchronisation), 4);
if (mono_gc_is_moving ()) {
/*if bit zero is set it's a thin hash*/
code = mono_x86_emit_tls_get (code, X86_EDX, mono_thread_get_tls_offset ());
}
/* load TID into EDX */
- x86_mov_reg_membase (code, X86_EDX, X86_EDX, G_STRUCT_OFFSET (MonoInternalThread, tid), 4);
+ x86_mov_reg_membase (code, X86_EDX, X86_EDX, MONO_STRUCT_OFFSET (MonoInternalThread, small_id), 4);
/* is synchronization->owner == TID */
- x86_alu_membase_reg (code, X86_CMP, X86_ECX, owner_offset, X86_EDX);
+ x86_mov_reg_membase (code, X86_EAX, X86_ECX, status_offset, 4);
+ x86_alu_reg_reg (code, X86_XOR, X86_EDX, X86_EAX);
+ x86_test_reg_imm (code, X86_EDX, OWNER_MASK);
/* if no, jump to actual trampoline */
jump_not_owned = code;
x86_branch8 (code, X86_CC_NZ, -1, 1);
/* if not, jump to next case */
jump_next = code;
x86_branch8 (code, X86_CC_NZ, -1, 1);
- /* if yes, is synchronization->entry_count zero? */
- x86_alu_membase_imm (code, X86_CMP, X86_ECX, entry_count_offset, 0);
- /* if not, jump to actual trampoline */
+ /* if yes, is synchronization->entry_count greater than zero? */
+ x86_test_reg_imm (code, X86_EAX, ENTRY_COUNT_WAITERS);
+ /* if yes, jump to actual trampoline */
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 (code, X86_ECX, owner_offset, 0, 4);
+ /* if not, try to set synchronization->owner to null and return */
+ x86_mov_reg_reg (code, X86_EDX, X86_EAX, 4);
+ x86_alu_reg_imm (code, X86_AND, X86_EDX, ENTRY_COUNT_MASK);
+ /* compare and exchange */
+ x86_prefix (code, X86_LOCK_PREFIX);
+ /* EAX contains the previous status */
+ x86_cmpxchg_membase_reg (code, X86_ECX, status_offset, X86_EDX);
+ /* if not successful, jump to actual trampoline */
+ jump_cmpxchg_failed = code;
+ x86_branch8 (code, X86_CC_NZ, -1, 1);
+
+ x86_pop_reg (code, X86_EAX);
x86_ret (code);
/* next case: synchronization->nest is not 1 */
x86_patch (jump_next, code);
/* decrease synchronization->nest and return */
x86_dec_membase (code, X86_ECX, nest_offset);
+ x86_pop_reg (code, X86_EAX);
x86_ret (code);
/* push obj and jump to the actual trampoline */
if (jump_sync_thin_hash)
x86_patch (jump_sync_thin_hash, code);
x86_patch (jump_have_waiters, code);
+ x86_patch (jump_cmpxchg_failed, 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);
+ /* obj is pushed, jump to the actual trampoline */
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);
mono_arch_flush_icache (buf, code - buf);
g_assert (code - buf <= tramp_size);
+ mono_profiler_code_buffer_new (buf, code - buf, MONO_PROFILER_CODE_BUFFER_MONITOR, NULL);
- if (info)
- *info = mono_tramp_info_create ("monitor_exit_trampoline", buf, code - buf, ji, unwind_ops);
+ *info = mono_tramp_info_create ("monitor_exit_trampoline", buf, code - buf, ji, unwind_ops);
return buf;
}
#else
gpointer
-mono_arch_create_monitor_enter_trampoline (MonoTrampInfo **info, gboolean aot)
+mono_arch_create_monitor_enter_trampoline (MonoTrampInfo **info, gboolean is_v4, gboolean aot)
{
g_assert_not_reached ();
return NULL;
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);
+ x86_mov_reg_membase (code, X86_EAX, X86_EAX, MONO_STRUCT_OFFSET (MonoJitTlsData, handler_block_return_address), 4);
} else {
/*Slow path uses a c helper*/
x86_call_code (code, handler_block_trampoline_helper);
nacl_global_codeman_validate (&buf, tramp_size, &code);
mono_arch_flush_icache (buf, code - buf);
+ mono_profiler_code_buffer_new (buf, code - buf, MONO_PROFILER_CODE_BUFFER_HELPER, NULL);
g_assert (code - buf <= tramp_size);
- if (info)
- *info = mono_tramp_info_create ("handler_block_trampoline", buf, code - buf, ji, unwind_ops);
+ *info = mono_tramp_info_create ("handler_block_trampoline", buf, code - buf, ji, unwind_ops);
return buf;
}
nacl_domain_code_validate (domain, &start, buf_len, &code);
mono_arch_flush_icache (start, code - start);
+ mono_profiler_code_buffer_new (start, code - start, MONO_PROFILER_CODE_BUFFER_GENERICS_TRAMPOLINE, NULL);
return start;
}
gpointer
mono_arch_get_gsharedvt_trampoline (MonoTrampInfo **info, gboolean aot)
{
- if (info)
- *info = NULL;
+ *info = NULL;
return NULL;
}
projects / mono.git / blobdiff