#include <mono/metadata/tabledefs.h>
#include <mono/metadata/mono-debug-debugger.h>
#include <mono/metadata/monitor.h>
-#include <mono/metadata/monitor.h>
+#include <mono/metadata/profiler-private.h>
#include <mono/metadata/gc-internal.h>
#include <mono/arch/amd64/amd64-codegen.h>
#include "mini.h"
#include "mini-amd64.h"
+#include "debugger-agent.h"
#if defined(__native_client_codegen__) && defined(__native_client__)
#include <malloc.h>
#include <nacl/nacl_dyncode.h>
#endif
+#define ALIGN_TO(val,align) ((((guint64)val) + ((align) - 1)) & ~((align) - 1))
+
#define IS_REX(inst) (((inst) >= 0x40) && ((inst) <= 0x4f))
/*
nacl_domain_code_validate (domain, &start, size, &code);
mono_arch_flush_icache (start, code - start);
+ 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;
}
gboolean disp_32bit = ((((gint64)addr - (gint64)orig_code)) < (1 << 30)) && ((((gint64)addr - (gint64)orig_code)) > -(1 << 30));
if ((((guint64)(addr)) >> 32) != 0 && !disp_32bit) {
-#ifdef MONO_ARCH_NOMAP32BIT
- /* Print some diagnostics */
- MonoJitInfo *ji = mono_jit_info_table_find (mono_domain_get (), (char*)orig_code);
- if (ji)
- fprintf (stderr, "At %s, offset 0x%zx\n", mono_method_full_name (jinfo_get_method (ji), TRUE), (guint8*)orig_code - (guint8*)ji->code_start);
- fprintf (stderr, "Addr: %p\n", addr);
- ji = mono_jit_info_table_find (mono_domain_get (), (char*)addr);
- if (ji)
- fprintf (stderr, "Callee: %s\n", mono_method_full_name (jinfo_get_method (ji), TRUE));
- g_assert_not_reached ();
-#else
/*
- * This might happen when calling AOTed code. Create a thunk.
+ * This might happen with LLVM or when calling AOTed code. Create a thunk.
*/
guint8 *thunk_start, *thunk_code;
addr = thunk_start;
g_assert ((((guint64)(addr)) >> 32) == 0);
mono_arch_flush_icache (thunk_start, thunk_code - thunk_start);
-#endif
+ mono_profiler_code_buffer_new (thunk_start, thunk_code - thunk_start, MONO_PROFILER_CODE_BUFFER_HELPER, NULL);
}
if (can_write) {
InterlockedExchange ((gint32*)(orig_code - 4), ((gint64)addr - (gint64)orig_code));
*(guint64*)thunk_code = (guint64)addr;
addr = thunk_start;
mono_arch_flush_icache (thunk_start, thunk_code - thunk_start);
+ mono_profiler_code_buffer_new (thunk_start, thunk_code - thunk_start, MONO_PROFILER_CODE_BUFFER_HELPER, NULL);
return addr;
}
{
char *tramp_name;
guint8 *buf, *code, *tramp, *br [2], *r11_save_code, *after_r11_save_code;
- int i, lmf_offset, offset, res_offset, arg_offset, rax_offset, tramp_offset, saved_regs_offset;
+ int i, lmf_offset, offset, res_offset, arg_offset, rax_offset, tramp_offset, ctx_offset, saved_regs_offset;
int saved_fpregs_offset, rbp_offset, framesize, orig_rsp_to_rbp_offset, cfa_offset;
gboolean has_caller;
GSList *unwind_ops = NULL;
code = buf = mono_global_codeman_reserve (kMaxCodeSize);
- framesize = kMaxCodeSize + sizeof (MonoLMFTramp);
- framesize = (framesize + (MONO_ARCH_FRAME_ALIGNMENT - 1)) & ~ (MONO_ARCH_FRAME_ALIGNMENT - 1);
+ /* Compute stack frame size and offsets */
+ offset = 0;
+ rbp_offset = -offset;
+
+ offset += sizeof(mgreg_t);
+ rax_offset = -offset;
+
+ offset += sizeof(mgreg_t);
+ tramp_offset = -offset;
+
+ offset += sizeof(gpointer);
+ arg_offset = -offset;
+
+ offset += sizeof(mgreg_t);
+ res_offset = -offset;
+
+ offset += sizeof (MonoContext);
+ ctx_offset = -offset;
+ saved_regs_offset = ctx_offset + MONO_STRUCT_OFFSET (MonoContext, gregs);
+ saved_fpregs_offset = ctx_offset + MONO_STRUCT_OFFSET (MonoContext, fregs);
+
+ offset += sizeof (MonoLMFTramp);
+ lmf_offset = -offset;
+
+ framesize = ALIGN_TO (offset, MONO_ARCH_FRAME_ALIGNMENT);
orig_rsp_to_rbp_offset = 0;
r11_save_code = code;
- /* Reserve 5 bytes for the mov_membase_reg to save R11 */
- code += 5;
+ /* Reserve space for the mov_membase_reg to save R11 */
+ code += 8;
after_r11_save_code = code;
// CFA = sp + 16 (the trampoline address is on the stack)
mono_add_unwind_op_def_cfa_reg (unwind_ops, code, buf, AMD64_RBP);
amd64_alu_reg_imm (code, X86_SUB, AMD64_RSP, framesize);
- offset = 0;
- rbp_offset = - offset;
-
- offset += sizeof(mgreg_t);
- rax_offset = - offset;
-
- offset += sizeof(mgreg_t);
- tramp_offset = - offset;
-
- offset += sizeof(gpointer);
- arg_offset = - offset;
-
/* Compute the trampoline address from the return address */
if (aot) {
#if defined(__default_codegen__)
}
amd64_mov_membase_reg (code, AMD64_RBP, tramp_offset, AMD64_R11, sizeof(gpointer));
- offset += sizeof(mgreg_t);
- res_offset = - offset;
-
/* Save all registers */
-
- offset += AMD64_NREG * sizeof(mgreg_t);
- saved_regs_offset = - offset;
for (i = 0; i < AMD64_NREG; ++i) {
if (i == AMD64_RBP) {
/* RAX is already saved */
amd64_mov_reg_membase (code, AMD64_RAX, AMD64_RBP, rbp_offset, sizeof(mgreg_t));
amd64_mov_membase_reg (code, AMD64_RBP, saved_regs_offset + (i * sizeof(mgreg_t)), AMD64_RAX, sizeof(mgreg_t));
+ } else if (i == AMD64_RIP) {
+ if (has_caller)
+ amd64_mov_reg_membase (code, AMD64_R11, AMD64_RBP, 8, sizeof(gpointer));
+ else
+ amd64_mov_reg_imm (code, AMD64_R11, 0);
+ amd64_mov_membase_reg (code, AMD64_RBP, saved_regs_offset + (i * sizeof(mgreg_t)), AMD64_R11, sizeof(mgreg_t));
+ } else if (i == AMD64_RSP) {
+ amd64_mov_reg_reg (code, AMD64_R11, AMD64_RSP, sizeof(mgreg_t));
+ amd64_alu_reg_imm (code, X86_ADD, AMD64_R11, framesize + 16);
+ amd64_mov_membase_reg (code, AMD64_RBP, saved_regs_offset + (i * sizeof(mgreg_t)), AMD64_R11, sizeof(mgreg_t));
} else if (i != AMD64_R11) {
amd64_mov_membase_reg (code, AMD64_RBP, saved_regs_offset + (i * sizeof(mgreg_t)), i, sizeof(mgreg_t));
} else {
g_assert (r11_save_code == after_r11_save_code);
}
}
- offset += 8 * sizeof(mgreg_t);
- saved_fpregs_offset = - offset;
for (i = 0; i < 8; ++i)
amd64_movsd_membase_reg (code, AMD64_RBP, saved_fpregs_offset + (i * sizeof(mgreg_t)), i);
if (tramp_type != MONO_TRAMPOLINE_GENERIC_CLASS_INIT &&
tramp_type != MONO_TRAMPOLINE_MONITOR_ENTER &&
+ tramp_type != MONO_TRAMPOLINE_MONITOR_ENTER_V4 &&
tramp_type != MONO_TRAMPOLINE_MONITOR_EXIT &&
tramp_type != MONO_TRAMPOLINE_HANDLER_BLOCK_GUARD) {
/* Obtain the trampoline argument which is encoded in the instruction stream */
/* Load the GOT offset */
amd64_mov_reg_membase (code, AMD64_R11, AMD64_RBP, tramp_offset, sizeof(gpointer));
#if defined(__default_codegen__)
- amd64_mov_reg_membase (code, AMD64_RAX, AMD64_R11, 7, 4);
+ /*
+ * r11 points to a call *<offset>(%rip) instruction, load the
+ * pc-relative offset from the instruction itself.
+ */
+ amd64_mov_reg_membase (code, AMD64_RAX, AMD64_R11, 3, 4);
+ /* 7 is the length of the call, 8 is the offset to the next got slot */
+ amd64_alu_reg_imm_size (code, X86_ADD, AMD64_RAX, 7 + sizeof (gpointer), sizeof(gpointer));
#elif defined(__native_client_codegen__)
/* The arg is hidden in a "push imm32" instruction, */
/* add one to skip the opcode. */
/* Save LMF begin */
- offset += sizeof (MonoLMFTramp);
- lmf_offset = - offset;
-
/* Save ip */
if (has_caller)
amd64_mov_reg_membase (code, AMD64_R11, AMD64_RBP, 8, sizeof(gpointer));
else
amd64_mov_reg_imm (code, AMD64_R11, 0);
amd64_mov_membase_reg (code, AMD64_RBP, lmf_offset + MONO_STRUCT_OFFSET (MonoLMF, rip), AMD64_R11, sizeof(mgreg_t));
- /* Save fp */
- amd64_mov_reg_membase (code, AMD64_R11, AMD64_RSP, framesize, sizeof(mgreg_t));
- amd64_mov_membase_reg (code, AMD64_RBP, lmf_offset + MONO_STRUCT_OFFSET (MonoLMF, rbp), AMD64_R11, sizeof(mgreg_t));
/* Save sp */
amd64_mov_reg_reg (code, AMD64_R11, AMD64_RSP, sizeof(mgreg_t));
amd64_alu_reg_imm (code, X86_ADD, AMD64_R11, framesize + 16);
amd64_mov_membase_reg (code, AMD64_RBP, lmf_offset + MONO_STRUCT_OFFSET (MonoLMF, rsp), AMD64_R11, sizeof(mgreg_t));
- /* Save pointer to registers */
- amd64_lea_membase (code, AMD64_R11, AMD64_RBP, saved_regs_offset);
- amd64_mov_membase_reg (code, AMD64_RBP, lmf_offset + MONO_STRUCT_OFFSET (MonoLMFTramp, regs), AMD64_R11, sizeof(mgreg_t));
+ /* Save pointer to context */
+ amd64_lea_membase (code, AMD64_R11, AMD64_RBP, ctx_offset);
+ amd64_mov_membase_reg (code, AMD64_RBP, lmf_offset + MONO_STRUCT_OFFSET (MonoLMFTramp, ctx), AMD64_R11, sizeof(mgreg_t));
if (aot) {
code = mono_arch_emit_load_aotconst (buf, code, &ji, MONO_PATCH_INFO_JIT_ICALL_ADDR, "mono_get_lmf_addr");
for (i = 0; i < AMD64_NREG; ++i)
if (AMD64_IS_ARGUMENT_REG (i) || i == AMD64_R10 || i == AMD64_RAX)
amd64_mov_reg_membase (code, i, AMD64_RBP, saved_regs_offset + (i * sizeof(mgreg_t)), sizeof(mgreg_t));
-
for (i = 0; i < 8; ++i)
amd64_movsd_reg_membase (code, i, AMD64_RBP, saved_fpregs_offset + (i * sizeof(mgreg_t)));
nacl_global_codeman_validate (&buf, kMaxCodeSize, &code);
mono_arch_flush_icache (buf, code - buf);
+ 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, 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, &buf, size, &code);
mono_arch_flush_icache (buf, size);
+ mono_profiler_code_buffer_new (buf, code - buf, MONO_PROFILER_CODE_BUFFER_SPECIFIC_TRAMPOLINE, mono_get_generic_trampoline_simple_name (tramp_type));
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) {
- 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;
}
-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);
-
- if (byte_offset < 0)
- mono_marshal_find_bitfield_offset (MonoVTable, initialized, &byte_offset, &bitmask);
-
- amd64_test_membase_imm_size (code, MONO_AMD64_ARG_REG1, byte_offset, bitmask, 1);
- jump = code;
- amd64_branch8 (code, X86_CC_Z, -1, 1);
-
- amd64_ret (code);
-
- x86_patch (jump, code);
-
- if (aot) {
- code = mono_arch_emit_load_aotconst (buf, code, &ji, MONO_PATCH_INFO_JIT_ICALL_ADDR, "specific_trampoline_generic_class_init");
- amd64_jump_reg (code, AMD64_R11);
- } else {
- tramp = mono_arch_create_specific_trampoline (NULL, MONO_TRAMPOLINE_GENERIC_CLASS_INIT, mono_get_root_domain (), NULL);
-
- /* jump to the actual trampoline */
- amd64_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 ("generic_class_init_trampoline", buf, code - buf, ji, unwind_ops);
-
- return buf;
-}
+#ifdef MONO_ARCH_MONITOR_OBJECT_REG
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;
guint8 *code, *buf;
guint8 *jump_obj_null, *jump_sync_null, *jump_cmpxchg_failed, *jump_other_owner, *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;
int obj_reg = MONO_AMD64_ARG_REG1;
- int sync_reg = MONO_AMD64_ARG_REG2;
- int tid_reg = MONO_AMD64_ARG_REG3;
+ int lock_taken_reg = MONO_AMD64_ARG_REG2;
+ int sync_reg = MONO_AMD64_ARG_REG3;
+ int tid_reg = MONO_AMD64_ARG_REG4;
+ int status_reg = AMD64_RAX;
g_assert (MONO_ARCH_MONITOR_OBJECT_REG == obj_reg);
+#ifdef MONO_ARCH_MONITOR_LOCK_TAKEN_REG
+ g_assert (MONO_ARCH_MONITOR_LOCK_TAKEN_REG == lock_taken_reg);
+#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 = 96;
+ tramp_size = 128;
code = buf = mono_global_codeman_reserve (tramp_size);
jump_obj_null = code;
amd64_branch8 (code, X86_CC_Z, -1, 1);
+ if (is_v4) {
+ amd64_test_membase_imm (code, lock_taken_reg, 0, 1);
+ /* if *lock_taken is 1, jump to actual trampoline */
+ jump_lock_taken_true = code;
+ x86_branch8 (code, X86_CC_NZ, -1, 1);
+ }
+
/* load obj->synchronization to sync_reg */
amd64_mov_reg_membase (code, sync_reg, obj_reg, MONO_STRUCT_OFFSET (MonoObject, synchronisation), 8);
/* load MonoInternalThread* into tid_reg */
code = mono_amd64_emit_tls_get (code, tid_reg, mono_thread_get_tls_offset ());
/* load TID into tid_reg */
- amd64_mov_reg_membase (code, tid_reg, tid_reg, MONO_STRUCT_OFFSET (MonoInternalThread, tid), 8);
+ amd64_mov_reg_membase (code, tid_reg, tid_reg, MONO_STRUCT_OFFSET (MonoInternalThread, small_id), 4);
- /* is synchronization->owner null? */
- amd64_alu_membase_imm_size (code, X86_CMP, sync_reg, owner_offset, 0, 8);
+ /* is synchronization->owner free */
+ amd64_mov_reg_membase (code, status_reg, sync_reg, status_offset, 4);
+ amd64_test_reg_imm_size (code, status_reg, OWNER_MASK, 4);
/* if not, jump to next case */
jump_tid = code;
amd64_branch8 (code, X86_CC_NZ, -1, 1);
/* if yes, try a compare-exchange with the TID */
g_assert (tid_reg != X86_EAX);
- /* zero RAX */
- amd64_alu_reg_reg (code, X86_XOR, AMD64_RAX, AMD64_RAX);
+ /* Form new status in tid_reg */
+ amd64_alu_reg_reg_size (code, X86_OR, tid_reg, status_reg, 4);
/* compare and exchange */
amd64_prefix (code, X86_LOCK_PREFIX);
- amd64_cmpxchg_membase_reg_size (code, sync_reg, owner_offset, tid_reg, 8);
+ amd64_cmpxchg_membase_reg_size (code, sync_reg, status_offset, tid_reg, 4);
/* if not successful, jump to actual trampoline */
jump_cmpxchg_failed = code;
amd64_branch8 (code, X86_CC_NZ, -1, 1);
/* if successful, return */
+ if (is_v4)
+ amd64_mov_membase_imm (code, lock_taken_reg, 0, 1, 1);
amd64_ret (code);
/* next case: synchronization->owner is not null */
x86_patch (jump_tid, code);
/* is synchronization->owner == TID? */
- amd64_alu_membase_reg_size (code, X86_CMP, sync_reg, owner_offset, tid_reg, 8);
+ amd64_alu_reg_imm_size (code, X86_AND, status_reg, OWNER_MASK, 4);
+ amd64_alu_reg_reg_size (code, X86_CMP, status_reg, tid_reg, 4);
/* if not, jump to actual trampoline */
jump_other_owner = code;
amd64_branch8 (code, X86_CC_NZ, -1, 1);
/* if yes, increment nest */
amd64_inc_membase_size (code, sync_reg, nest_offset, 4);
/* return */
+ if (is_v4)
+ amd64_mov_membase_imm (code, lock_taken_reg, 0, 1, 1);
amd64_ret (code);
x86_patch (jump_obj_null, code);
x86_patch (jump_sync_null, code);
x86_patch (jump_cmpxchg_failed, code);
x86_patch (jump_other_owner, code);
+ if (is_v4)
+ x86_patch (jump_lock_taken_true, code);
}
/* jump to the actual trampoline */
amd64_mov_reg_reg (code, MONO_AMD64_ARG_REG1, obj_reg, sizeof (mgreg_t));
if (aot) {
- code = mono_arch_emit_load_aotconst (buf, code, &ji, MONO_PATCH_INFO_JIT_ICALL_ADDR, "specific_trampoline_monitor_enter");
+ if (is_v4)
+ code = mono_arch_emit_load_aotconst (buf, code, &ji, MONO_PATCH_INFO_JIT_ICALL_ADDR, "specific_trampoline_monitor_enter_v4");
+ else
+ code = mono_arch_emit_load_aotconst (buf, code, &ji, MONO_PATCH_INFO_JIT_ICALL_ADDR, "specific_trampoline_monitor_enter");
amd64_jump_reg (code, AMD64_R11);
} else {
- tramp = mono_arch_create_specific_trampoline (NULL, MONO_TRAMPOLINE_MONITOR_ENTER, mono_get_root_domain (), NULL);
+ if (is_v4)
+ tramp = mono_arch_create_specific_trampoline (NULL, MONO_TRAMPOLINE_MONITOR_ENTER_V4, mono_get_root_domain (), NULL);
+ else
+ tramp = mono_arch_create_specific_trampoline (NULL, MONO_TRAMPOLINE_MONITOR_ENTER, mono_get_root_domain (), NULL);
/* jump to the actual trampoline */
amd64_jump_code (code, tramp);
nacl_global_codeman_validate (&buf, tramp_size, &code);
mono_arch_flush_icache (code, code - buf);
+ mono_profiler_code_buffer_new (buf, code - buf, MONO_PROFILER_CODE_BUFFER_MONITOR, NULL);
g_assert (code - buf <= tramp_size);
- 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;
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_obj_null, *jump_have_waiters, *jump_sync_null, *jump_not_owned, *jump_cmpxchg_failed;
+ guint8 *jump_next, *jump_sync_thin_hash = NULL;
int tramp_size;
- int owner_offset, nest_offset, entry_count_offset;
+ int status_offset, nest_offset;
MonoJumpInfo *ji = NULL;
GSList *unwind_ops = NULL;
int obj_reg = MONO_AMD64_ARG_REG1;
int sync_reg = MONO_AMD64_ARG_REG2;
+ int status_reg = MONO_AMD64_ARG_REG3;
g_assert (obj_reg == MONO_ARCH_MONITOR_OBJECT_REG);
- 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 = 112;
/* load MonoInternalThread* into RAX */
code = mono_amd64_emit_tls_get (code, AMD64_RAX, mono_thread_get_tls_offset ());
/* load TID into RAX */
- amd64_mov_reg_membase (code, AMD64_RAX, AMD64_RAX, MONO_STRUCT_OFFSET (MonoInternalThread, tid), 8);
+ amd64_mov_reg_membase (code, AMD64_RAX, AMD64_RAX, MONO_STRUCT_OFFSET (MonoInternalThread, small_id), 4);
/* is synchronization->owner == TID */
- amd64_alu_membase_reg_size (code, X86_CMP, sync_reg, owner_offset, AMD64_RAX, 8);
+ amd64_mov_reg_membase (code, status_reg, sync_reg, status_offset, 4);
+ amd64_alu_reg_reg_size (code, X86_XOR, AMD64_RAX, status_reg, 4);
+ amd64_test_reg_imm_size (code, AMD64_RAX, OWNER_MASK, 4);
+
/* if no, jump to actual trampoline */
jump_not_owned = code;
amd64_branch8 (code, X86_CC_NZ, -1, 1);
/* if not, jump to next case */
jump_next = code;
amd64_branch8 (code, X86_CC_NZ, -1, 1);
- /* if yes, is synchronization->entry_count zero? */
- amd64_alu_membase_imm_size (code, X86_CMP, sync_reg, entry_count_offset, 0, 4);
+ /* if yes, is synchronization->entry_count greater than zero */
+ amd64_test_reg_imm_size (code, status_reg, ENTRY_COUNT_WAITERS, 4);
/* if not, jump to actual trampoline */
jump_have_waiters = code;
amd64_branch8 (code, X86_CC_NZ, -1 , 1);
- /* if yes, set synchronization->owner to null and return */
- amd64_mov_membase_imm (code, sync_reg, owner_offset, 0, 8);
+ /* if yes, try to set synchronization->owner to null and return */
+ g_assert (status_reg != AMD64_RAX);
+ /* old status in RAX */
+ amd64_mov_reg_reg (code, AMD64_RAX, status_reg, 4);
+ /* form new status */
+ amd64_alu_reg_imm_size (code, X86_AND, status_reg, ENTRY_COUNT_MASK, 4);
+ /* compare and exchange */
+ amd64_prefix (code, X86_LOCK_PREFIX);
+ amd64_cmpxchg_membase_reg_size (code, sync_reg, status_offset, status_reg, 4);
+ /* if not successful, jump to actual trampoline */
+ jump_cmpxchg_failed = code;
+ amd64_branch8 (code, X86_CC_NZ, -1, 1);
amd64_ret (code);
/* next case: synchronization->nest is not 1 */
amd64_dec_membase_size (code, sync_reg, nest_offset, 4);
amd64_ret (code);
+ if (jump_sync_thin_hash)
+ x86_patch (jump_sync_thin_hash, code);
x86_patch (jump_obj_null, code);
x86_patch (jump_have_waiters, code);
x86_patch (jump_not_owned, code);
+ x86_patch (jump_cmpxchg_failed, code);
x86_patch (jump_sync_null, code);
}
nacl_global_codeman_validate (&buf, tramp_size, &code);
mono_arch_flush_icache (code, code - buf);
+ mono_profiler_code_buffer_new (buf, code - buf, MONO_PROFILER_CODE_BUFFER_MONITOR, NULL);
g_assert (code - buf <= tramp_size);
- 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 is_v4, gboolean aot)
+{
+ g_assert_not_reached ();
+ return NULL;
+}
+
+gpointer
+mono_arch_create_monitor_exit_trampoline (MonoTrampInfo **info, gboolean aot)
+{
+ g_assert_not_reached ();
+ return NULL;
+}
+
+#endif
+
void
mono_arch_invalidate_method (MonoJitInfo *ji, void *func, gpointer func_arg)
{
}
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;
}
return *(guint32*)(plt_entry + 6);
#endif
}
+
+/*
+ * mono_arch_create_sdb_trampoline:
+ *
+ * Return a trampoline which captures the current context, passes it to
+ * debugger_agent_single_step_from_context ()/debugger_agent_breakpoint_from_context (),
+ * then restores the (potentially changed) context.
+ */
+guint8*
+mono_arch_create_sdb_trampoline (gboolean single_step, MonoTrampInfo **info, gboolean aot)
+{
+ int tramp_size = 256;
+ int i, framesize, ctx_offset, cfa_offset, gregs_offset;
+ guint8 *code, *buf;
+ GSList *unwind_ops = NULL;
+ MonoJumpInfo *ji = NULL;
+
+ code = buf = mono_global_codeman_reserve (tramp_size);
+
+ framesize = sizeof (MonoContext);
+ framesize = ALIGN_TO (framesize, MONO_ARCH_FRAME_ALIGNMENT);
+
+ // CFA = sp + 8
+ cfa_offset = 8;
+ mono_add_unwind_op_def_cfa (unwind_ops, code, buf, AMD64_RSP, 8);
+ // IP saved at CFA - 8
+ mono_add_unwind_op_offset (unwind_ops, code, buf, AMD64_RIP, -cfa_offset);
+
+ amd64_push_reg (code, AMD64_RBP);
+ cfa_offset += sizeof(mgreg_t);
+ mono_add_unwind_op_def_cfa_offset (unwind_ops, code, buf, cfa_offset);
+ mono_add_unwind_op_offset (unwind_ops, code, buf, AMD64_RBP, - cfa_offset);
+
+ amd64_mov_reg_reg (code, AMD64_RBP, AMD64_RSP, sizeof(mgreg_t));
+ mono_add_unwind_op_def_cfa_reg (unwind_ops, code, buf, AMD64_RBP);
+ amd64_alu_reg_imm (code, X86_SUB, AMD64_RSP, framesize);
+
+ ctx_offset = 0;
+ gregs_offset = ctx_offset + MONO_STRUCT_OFFSET (MonoContext, gregs);
+
+ /* Initialize a MonoContext structure on the stack */
+ for (i = 0; i < AMD64_NREG; ++i) {
+ if (i != AMD64_RIP && i != AMD64_RSP && i != AMD64_RBP)
+ amd64_mov_membase_reg (code, AMD64_RSP, gregs_offset + (i * sizeof (mgreg_t)), i, sizeof (mgreg_t));
+ }
+ amd64_mov_reg_membase (code, AMD64_R11, AMD64_RBP, 0, sizeof (mgreg_t));
+ amd64_mov_membase_reg (code, AMD64_RSP, gregs_offset + (AMD64_RBP * sizeof (mgreg_t)), AMD64_R11, sizeof (mgreg_t));
+ amd64_lea_membase (code, AMD64_R11, AMD64_RBP, 2 * sizeof (mgreg_t));
+ amd64_mov_membase_reg (code, AMD64_RSP, gregs_offset + (AMD64_RSP * sizeof (mgreg_t)), AMD64_R11, sizeof (mgreg_t));
+ amd64_mov_reg_membase (code, AMD64_R11, AMD64_RBP, sizeof (mgreg_t), sizeof (mgreg_t));
+ amd64_mov_membase_reg (code, AMD64_RSP, gregs_offset + (AMD64_RIP * sizeof (mgreg_t)), AMD64_R11, sizeof (mgreg_t));
+
+ /* Call the single step/breakpoint function in sdb */
+ amd64_lea_membase (code, AMD64_ARG_REG1, AMD64_RSP, ctx_offset);
+
+ if (aot) {
+ if (single_step)
+ code = mono_arch_emit_load_aotconst (buf, code, &ji, MONO_PATCH_INFO_JIT_ICALL_ADDR, "debugger_agent_single_step_from_context");
+ else
+ code = mono_arch_emit_load_aotconst (buf, code, &ji, MONO_PATCH_INFO_JIT_ICALL_ADDR, "debugger_agent_breakpoint_from_context");
+ amd64_call_reg (code, AMD64_R11);
+ } else {
+ if (single_step)
+ amd64_call_code (code, debugger_agent_single_step_from_context);
+ else
+ amd64_call_code (code, debugger_agent_breakpoint_from_context);
+ }
+
+ /* Restore registers from ctx */
+ for (i = 0; i < AMD64_NREG; ++i) {
+ if (i != AMD64_RIP && i != AMD64_RSP && i != AMD64_RBP)
+ amd64_mov_reg_membase (code, AMD64_RSP, i, gregs_offset + (i * sizeof (mgreg_t)), sizeof (mgreg_t));
+ }
+ amd64_mov_reg_membase (code, AMD64_R11, AMD64_RSP, gregs_offset + (AMD64_RBP * sizeof (mgreg_t)), sizeof (mgreg_t));
+ amd64_mov_membase_reg (code, AMD64_RBP, 0, AMD64_R11, sizeof (mgreg_t));
+ amd64_mov_reg_membase (code, AMD64_R11, AMD64_RSP, gregs_offset + (AMD64_RIP * sizeof (mgreg_t)), sizeof (mgreg_t));
+ amd64_mov_membase_reg (code, AMD64_RBP, sizeof (mgreg_t), AMD64_R11, sizeof (mgreg_t));
+
+ amd64_leave (code);
+ amd64_ret (code);
+
+ mono_arch_flush_icache (code, code - buf);
+ g_assert (code - buf <= tramp_size);
+
+ const char *tramp_name = single_step ? "sdb_single_step_trampoline" : "sdb_breakpoint_trampoline";
+ *info = mono_tramp_info_create (tramp_name, buf, code - buf, ji, unwind_ops);
+
+ return buf;
+}
projects / mono.git / blobdiff