* Returns a pointer to a method which restores a previously saved sigcontext.
*/
gpointer
-mono_arch_get_restore_context_full (guint32 *code_size, MonoJumpInfo **ji, gboolean aot)
+mono_arch_get_restore_context (MonoTrampInfo **info, gboolean aot)
{
guint8 *start = NULL;
guint8 *code;
+ MonoJumpInfo *ji = NULL;
+ GSList *unwind_ops = NULL;
/* restore_contect (MonoContext *ctx) */
- *ji = NULL;
-
start = code = mono_global_codeman_reserve (256);
amd64_mov_reg_reg (code, AMD64_R11, AMD64_ARG_REG1, 8);
mono_arch_flush_icache (start, code - start);
- *code_size = code - start;
+ if (info)
+ *info = mono_tramp_info_create (g_strdup_printf ("restore_context"), start, code - start, ji, unwind_ops);
return start;
}
* @exc object in this case).
*/
gpointer
-mono_arch_get_call_filter_full (guint32 *code_size, MonoJumpInfo **ji, gboolean aot)
+mono_arch_get_call_filter (MonoTrampInfo **info, gboolean aot)
{
guint8 *start;
int i;
guint8 *code;
guint32 pos;
-
- *ji = NULL;
+ MonoJumpInfo *ji = NULL;
+ GSList *unwind_ops = NULL;
start = code = mono_global_codeman_reserve (128);
mono_arch_flush_icache (start, code - start);
- *code_size = code - start;
+ if (info)
+ *info = mono_tramp_info_create (g_strdup_printf ("call_filter"), start, code - start, ji, unwind_ops);
return start;
}
void
mono_amd64_throw_exception (guint64 dummy1, guint64 dummy2, guint64 dummy3, guint64 dummy4,
guint64 dummy5, guint64 dummy6,
- MonoObject *exc, guint64 rip, guint64 rsp,
- guint64 rbx, guint64 rbp, guint64 r12, guint64 r13,
- guint64 r14, guint64 r15, guint64 rdi, guint64 rsi,
- guint64 rax, guint64 rcx, guint64 rdx,
- guint64 rethrow)
+ mgreg_t *regs, mgreg_t rip,
+ MonoObject *exc, gboolean rethrow)
{
static void (*restore_context) (MonoContext *);
MonoContext ctx;
if (!restore_context)
restore_context = mono_get_restore_context ();
- ctx.rsp = rsp;
+ ctx.rsp = regs [AMD64_RSP];
ctx.rip = rip;
- ctx.rbx = rbx;
- ctx.rbp = rbp;
- ctx.r12 = r12;
- ctx.r13 = r13;
- ctx.r14 = r14;
- ctx.r15 = r15;
- ctx.rdi = rdi;
- ctx.rsi = rsi;
- ctx.rax = rax;
- ctx.rcx = rcx;
- ctx.rdx = rdx;
+ ctx.rbx = regs [AMD64_RBX];
+ ctx.rbp = regs [AMD64_RBP];
+ ctx.r12 = regs [AMD64_R12];
+ ctx.r13 = regs [AMD64_R13];
+ ctx.r14 = regs [AMD64_R14];
+ ctx.r15 = regs [AMD64_R15];
+ ctx.rdi = regs [AMD64_RDI];
+ ctx.rsi = regs [AMD64_RSI];
+ ctx.rax = regs [AMD64_RAX];
+ ctx.rcx = regs [AMD64_RCX];
+ ctx.rdx = regs [AMD64_RDX];
if (mono_object_isinst (exc, mono_defaults.exception_class)) {
MonoException *mono_ex = (MonoException*)exc;
g_assert_not_reached ();
}
-static gpointer
-get_throw_trampoline (gboolean rethrow, guint32 *code_size, MonoJumpInfo **ji, gboolean aot)
+void
+mono_amd64_throw_corlib_exception (guint64 dummy1, guint64 dummy2, guint64 dummy3, guint64 dummy4,
+ guint64 dummy5, guint64 dummy6,
+ mgreg_t *regs, mgreg_t rip,
+ guint32 ex_token_index, gint64 pc_offset)
{
- guint8* start;
- guint8 *code;
- GSList *unwind_ops;
+ guint32 ex_token = MONO_TOKEN_TYPE_DEF | ex_token_index;
+ MonoException *ex;
- start = code = mono_global_codeman_reserve (64);
+ ex = mono_exception_from_token (mono_defaults.exception_class->image, ex_token);
- code = start;
+ rip -= pc_offset;
- *ji = NULL;
+ /* Negate the ip adjustment done in mono_amd64_throw_exception () */
+ rip += 1;
- unwind_ops = mono_arch_get_cie_program ();
+ mono_amd64_throw_exception (dummy1, dummy2, dummy3, dummy4, dummy5, dummy6, regs, rip, (MonoObject*)ex, FALSE);
+}
- amd64_mov_reg_reg (code, AMD64_R11, AMD64_RSP, 8);
+static void
+mono_amd64_resume_unwind (guint64 dummy1, guint64 dummy2, guint64 dummy3, guint64 dummy4,
+ guint64 dummy5, guint64 dummy6,
+ mgreg_t *regs, mgreg_t rip,
+ guint32 dummy7, gint64 dummy8)
+{
+ /* Only the register parameters are valid */
+ MonoContext ctx;
- /* reverse order */
- amd64_push_imm (code, rethrow);
- amd64_push_reg (code, AMD64_RDX);
- amd64_push_reg (code, AMD64_RCX);
- amd64_push_reg (code, AMD64_RAX);
- amd64_push_reg (code, AMD64_RSI);
- amd64_push_reg (code, AMD64_RDI);
- amd64_push_reg (code, AMD64_R15);
- amd64_push_reg (code, AMD64_R14);
- amd64_push_reg (code, AMD64_R13);
- amd64_push_reg (code, AMD64_R12);
- amd64_push_reg (code, AMD64_RBP);
- amd64_push_reg (code, AMD64_RBX);
+ ctx.rsp = regs [AMD64_RSP];
+ ctx.rip = rip;
+ ctx.rbx = regs [AMD64_RBX];
+ ctx.rbp = regs [AMD64_RBP];
+ ctx.r12 = regs [AMD64_R12];
+ ctx.r13 = regs [AMD64_R13];
+ ctx.r14 = regs [AMD64_R14];
+ ctx.r15 = regs [AMD64_R15];
+ ctx.rdi = regs [AMD64_RDI];
+ ctx.rsi = regs [AMD64_RSI];
+ ctx.rax = regs [AMD64_RAX];
+ ctx.rcx = regs [AMD64_RCX];
+ ctx.rdx = regs [AMD64_RDX];
+
+ mono_resume_unwind (&ctx);
+}
- /* SP */
- amd64_lea_membase (code, AMD64_RAX, AMD64_R11, 8);
- amd64_push_reg (code, AMD64_RAX);
+/*
+ * get_throw_trampoline:
+ *
+ * Generate a call to mono_amd64_throw_exception/
+ * mono_amd64_throw_corlib_exception.
+ */
+static gpointer
+get_throw_trampoline (MonoTrampInfo **info, gboolean rethrow, gboolean corlib, gboolean llvm_abs, gboolean resume_unwind, const char *tramp_name, gboolean aot)
+{
+ guint8* start;
+ guint8 *code;
+ MonoJumpInfo *ji = NULL;
+ GSList *unwind_ops = NULL;
+ int i, buf_size, stack_size, arg_offsets [16], regs_offset;
- /* IP */
- amd64_push_membase (code, AMD64_R11, 0);
+ buf_size = 256;
+ start = code = mono_global_codeman_reserve (buf_size);
- /* Exception */
- amd64_push_reg (code, AMD64_ARG_REG1);
+ /* The stack is unaligned on entry */
+ stack_size = 192 + 8;
- mono_add_unwind_op_def_cfa_offset (unwind_ops, code, start, (15 + 1) * sizeof (gpointer));
+ code = start;
-#ifdef TARGET_WIN32
- /* align stack */
- amd64_push_imm (code, 0);
- amd64_push_imm (code, 0);
- amd64_push_imm (code, 0);
- amd64_push_imm (code, 0);
- amd64_push_imm (code, 0);
- amd64_push_imm (code, 0);
-#endif
+ if (info)
+ unwind_ops = mono_arch_get_cie_program ();
+
+ /* Alloc frame */
+ amd64_alu_reg_imm (code, X86_SUB, AMD64_RSP, stack_size);
+ if (info)
+ mono_add_unwind_op_def_cfa_offset (unwind_ops, code, start, stack_size + 8);
+
+ /*
+ * To hide linux/windows calling convention differences, we pass all arguments on
+ * the stack by passing 6 dummy values in registers.
+ */
+
+ arg_offsets [0] = 0;
+ arg_offsets [1] = sizeof (gpointer);
+ arg_offsets [2] = sizeof (gpointer) * 2;
+ arg_offsets [3] = sizeof (gpointer) * 3;
+ regs_offset = sizeof (gpointer) * 4;
+
+ /* Save registers */
+ for (i = 0; i < AMD64_NREG; ++i)
+ if (i != AMD64_RSP)
+ amd64_mov_membase_reg (code, AMD64_RSP, regs_offset + (i * sizeof (gpointer)), i, 8);
+ /* Save RSP */
+ amd64_lea_membase (code, AMD64_RAX, AMD64_RSP, stack_size + sizeof (gpointer));
+ amd64_mov_membase_reg (code, AMD64_RSP, regs_offset + (AMD64_RSP * sizeof (gpointer)), X86_EAX, 8);
+ /* Set arg1 == regs */
+ amd64_lea_membase (code, AMD64_RAX, AMD64_RSP, regs_offset);
+ amd64_mov_membase_reg (code, AMD64_RSP, arg_offsets [0], AMD64_RAX, 8);
+ /* Set arg2 == eip */
+ if (llvm_abs)
+ amd64_alu_reg_reg (code, X86_XOR, AMD64_RAX, AMD64_RAX);
+ else
+ amd64_mov_reg_membase (code, AMD64_RAX, AMD64_RSP, stack_size, 8);
+ amd64_mov_membase_reg (code, AMD64_RSP, arg_offsets [1], AMD64_RAX, 8);
+ /* Set arg3 == exc/ex_token_index */
+ if (resume_unwind)
+ amd64_mov_membase_imm (code, AMD64_RSP, arg_offsets [2], 0, 8);
+ else
+ amd64_mov_membase_reg (code, AMD64_RSP, arg_offsets [2], AMD64_ARG_REG1, 8);
+ /* Set arg4 == rethrow/pc offset */
+ if (resume_unwind) {
+ amd64_mov_membase_imm (code, AMD64_RSP, arg_offsets [3], 0, 8);
+ } else if (corlib) {
+ amd64_mov_membase_reg (code, AMD64_RSP, arg_offsets [3], AMD64_ARG_REG2, 8);
+ if (llvm_abs)
+ /*
+ * The caller is LLVM code which passes the absolute address not a pc offset,
+ * so compensate by passing 0 as 'rip' and passing the negated abs address as
+ * the pc offset.
+ */
+ amd64_neg_membase (code, AMD64_RSP, arg_offsets [3]);
+ } else {
+ amd64_mov_membase_imm (code, AMD64_RSP, arg_offsets [3], rethrow, 8);
+ }
if (aot) {
- *ji = mono_patch_info_list_prepend (*ji, code - start, MONO_PATCH_INFO_JIT_ICALL_ADDR, "mono_amd64_throw_exception");
+ ji = mono_patch_info_list_prepend (ji, code - start, MONO_PATCH_INFO_JIT_ICALL_ADDR, corlib ? (llvm_abs ? "mono_amd64_throw_corlib_exception_abs" : "mono_amd64_throw_corlib_exception") : "mono_amd64_throw_exception");
amd64_mov_reg_membase (code, AMD64_R11, AMD64_RIP, 0, 8);
} else {
- amd64_mov_reg_imm (code, AMD64_R11, mono_amd64_throw_exception);
+ amd64_mov_reg_imm (code, AMD64_R11, resume_unwind ? (mono_amd64_resume_unwind) : (corlib ? (gpointer)mono_amd64_throw_corlib_exception : (gpointer)mono_amd64_throw_exception));
}
amd64_call_reg (code, AMD64_R11);
amd64_breakpoint (code);
mono_arch_flush_icache (start, code - start);
- g_assert ((code - start) < 64);
+ g_assert ((code - start) < buf_size);
- *code_size = code - start;
-
- mono_save_trampoline_xdebug_info ("throw_exception_trampoline", start, code - start, unwind_ops);
+ if (info)
+ *info = mono_tramp_info_create (g_strdup (tramp_name), start, code - start, ji, unwind_ops);
return start;
}
* signature: void (*func) (MonoException *exc);
*
*/
-gpointer
-mono_arch_get_throw_exception_full (guint32 *code_size, MonoJumpInfo **ji, gboolean aot)
+gpointer
+mono_arch_get_throw_exception (MonoTrampInfo **info, gboolean aot)
{
- return get_throw_trampoline (FALSE, code_size, ji, aot);
+ return get_throw_trampoline (info, FALSE, FALSE, FALSE, FALSE, "throw_exception", aot);
}
gpointer
-mono_arch_get_rethrow_exception_full (guint32 *code_size, MonoJumpInfo **ji, gboolean aot)
+mono_arch_get_rethrow_exception (MonoTrampInfo **info, gboolean aot)
{
- return get_throw_trampoline (TRUE, code_size, ji, aot);
+ return get_throw_trampoline (info, TRUE, FALSE, FALSE, FALSE, "rethrow_exception", aot);
}
/**
* needs no relocations in the caller.
*/
gpointer
-mono_arch_get_throw_corlib_exception_full (guint32 *code_size, MonoJumpInfo **ji, gboolean aot)
+mono_arch_get_throw_corlib_exception (MonoTrampInfo **info, gboolean aot)
{
- static guint8* start;
- guint8 *code;
- guint64 throw_ex;
-
- start = code = mono_global_codeman_reserve (64);
-
- *ji = NULL;
-
- /* Push throw_ip */
- amd64_push_reg (code, AMD64_ARG_REG2);
-
- /* Call exception_from_token */
- amd64_mov_reg_reg (code, AMD64_ARG_REG2, AMD64_ARG_REG1, 8);
- if (aot) {
- *ji = mono_patch_info_list_prepend (*ji, code - start, MONO_PATCH_INFO_IMAGE, mono_defaults.exception_class->image);
- amd64_mov_reg_membase (code, AMD64_ARG_REG1, AMD64_RIP, 0, 8);
- *ji = mono_patch_info_list_prepend (*ji, code - start, MONO_PATCH_INFO_JIT_ICALL_ADDR, "mono_exception_from_token");
- amd64_mov_reg_membase (code, AMD64_R11, AMD64_RIP, 0, 8);
- } else {
- amd64_mov_reg_imm (code, AMD64_ARG_REG1, mono_defaults.exception_class->image);
- amd64_mov_reg_imm (code, AMD64_R11, mono_exception_from_token);
- }
-#ifdef TARGET_WIN32
- amd64_alu_reg_imm (code, X86_SUB, AMD64_RSP, 32);
-#endif
- amd64_call_reg (code, AMD64_R11);
-#ifdef TARGET_WIN32
- amd64_alu_reg_imm (code, X86_ADD, AMD64_RSP, 32);
-#endif
-
- /* Compute throw_ip */
- amd64_pop_reg (code, AMD64_ARG_REG2);
- /* return addr */
- amd64_pop_reg (code, AMD64_ARG_REG3);
- amd64_alu_reg_reg (code, X86_SUB, AMD64_ARG_REG3, AMD64_ARG_REG2);
-
- /* Put the throw_ip at the top of the misaligned stack */
- amd64_push_reg (code, AMD64_ARG_REG3);
-
- throw_ex = (guint64)mono_get_throw_exception ();
-
- /* Call throw_exception */
- amd64_mov_reg_reg (code, AMD64_ARG_REG1, AMD64_RAX, 8);
- if (aot) {
- *ji = mono_patch_info_list_prepend (*ji, code - start, MONO_PATCH_INFO_JIT_ICALL_ADDR, "mono_throw_exception");
- amd64_mov_reg_membase (code, AMD64_R11, AMD64_RIP, 0, 8);
- } else {
- amd64_mov_reg_imm (code, AMD64_R11, throw_ex);
- }
- /* The original IP is on the stack */
- amd64_jump_reg (code, AMD64_R11);
-
- g_assert ((code - start) < 64);
-
- mono_arch_flush_icache (start, code - start);
-
- *code_size = code - start;
-
- return start;
+ return get_throw_trampoline (info, FALSE, TRUE, FALSE, FALSE, "throw_corlib_exception", aot);
}
/*
- * mono_arch_find_jit_info_ext:
+ * mono_arch_find_jit_info:
*
* This function is used to gather information from @ctx, and store it in @frame_info.
* It unwinds one stack frame, and stores the resulting context into @new_ctx. @lmf
* is modified if needed.
* Returns TRUE on success, FALSE otherwise.
- * This function is a version of mono_arch_find_jit_info () where all the results are
- * returned in a StackFrameInfo structure.
*/
gboolean
-mono_arch_find_jit_info_ext (MonoDomain *domain, MonoJitTlsData *jit_tls,
+mono_arch_find_jit_info (MonoDomain *domain, MonoJitTlsData *jit_tls,
MonoJitInfo *ji, MonoContext *ctx,
MonoContext *new_ctx, MonoLMF **lmf,
StackFrameInfo *frame)
return FALSE;
}
+ /* Adjust IP */
+ rip --;
+
frame->ji = ji;
frame->type = FRAME_TYPE_MANAGED_TO_NATIVE;
return FALSE;
}
+/*
+ * handle_exception:
+ *
+ * Called by resuming from a signal handler.
+ */
+static void
+handle_signal_exception (gpointer obj, gboolean test_only)
+{
+ MonoJitTlsData *jit_tls = TlsGetValue (mono_jit_tls_id);
+ MonoContext ctx;
+ static void (*restore_context) (MonoContext *);
+
+ if (!restore_context)
+ restore_context = mono_get_restore_context ();
+
+ memcpy (&ctx, &jit_tls->ex_ctx, sizeof (MonoContext));
+
+ if (mono_debugger_handle_exception (&ctx, (MonoObject *)obj))
+ return;
+
+ mono_handle_exception (&ctx, obj, MONO_CONTEXT_GET_IP (&ctx), test_only);
+
+ restore_context (&ctx);
+}
+
/**
* mono_arch_handle_exception:
*
gboolean
mono_arch_handle_exception (void *sigctx, gpointer obj, gboolean test_only)
{
+#if defined(MONO_ARCH_USE_SIGACTION)
+ ucontext_t *ctx = (ucontext_t*)sigctx;
+
+ /*
+ * Handling the exception in the signal handler is problematic, since the original
+ * signal is disabled, and we could run arbitrary code though the debugger. So
+ * resume into the normal stack and do most work there if possible.
+ */
+ MonoJitTlsData *jit_tls = TlsGetValue (mono_jit_tls_id);
+ guint64 sp = UCONTEXT_REG_RSP (ctx);
+
+ /* Pass the ctx parameter in TLS */
+ mono_arch_sigctx_to_monoctx (ctx, &jit_tls->ex_ctx);
+ /* The others in registers */
+ UCONTEXT_REG_RDI (ctx) = (guint64)obj;
+ UCONTEXT_REG_RSI (ctx) = test_only;
+
+ /* Allocate a stack frame below the red zone */
+ sp -= 128;
+ /* The stack should be unaligned */
+ if (sp % 8 == 0)
+ sp -= 8;
+ UCONTEXT_REG_RSP (ctx) = sp;
+
+ UCONTEXT_REG_RIP (ctx) = (guint64)handle_signal_exception;
+
+ return TRUE;
+#else
MonoContext mctx;
mono_arch_sigctx_to_monoctx (sigctx, &mctx);
mono_arch_monoctx_to_sigctx (&mctx, sigctx);
return TRUE;
+#endif
}
#if defined(MONO_ARCH_USE_SIGACTION) && defined(UCONTEXT_GREGS)
void
mono_arch_sigctx_to_monoctx (void *sigctx, MonoContext *mctx)
{
-#if defined(MONO_ARCH_USE_SIGACTION) && defined(UCONTEXT_GREGS)
- ucontext_t *ctx = (ucontext_t*)sigctx;
-
- guint64 *gregs = gregs_from_ucontext (ctx);
-
- mctx->rax = gregs [REG_RAX];
- mctx->rbx = gregs [REG_RBX];
- mctx->rcx = gregs [REG_RCX];
- mctx->rdx = gregs [REG_RDX];
- mctx->rbp = gregs [REG_RBP];
- mctx->rsp = gregs [REG_RSP];
- mctx->rsi = gregs [REG_RSI];
- mctx->rdi = gregs [REG_RDI];
- mctx->rip = gregs [REG_RIP];
- mctx->r12 = gregs [REG_R12];
- mctx->r13 = gregs [REG_R13];
- mctx->r14 = gregs [REG_R14];
- mctx->r15 = gregs [REG_R15];
-#elif defined(MONO_ARCH_USE_SIGACTION)
+#if defined(MONO_ARCH_USE_SIGACTION)
ucontext_t *ctx = (ucontext_t*)sigctx;
mctx->rax = UCONTEXT_REG_RAX (ctx);
void
mono_arch_monoctx_to_sigctx (MonoContext *mctx, void *sigctx)
{
-#if defined(MONO_ARCH_USE_SIGACTION) && defined(UCONTEXT_GREGS)
- ucontext_t *ctx = (ucontext_t*)sigctx;
-
- guint64 *gregs = gregs_from_ucontext (ctx);
-
- gregs [REG_RAX] = mctx->rax;
- gregs [REG_RBX] = mctx->rbx;
- gregs [REG_RCX] = mctx->rcx;
- gregs [REG_RDX] = mctx->rdx;
- gregs [REG_RBP] = mctx->rbp;
- gregs [REG_RSP] = mctx->rsp;
- gregs [REG_RSI] = mctx->rsi;
- gregs [REG_RDI] = mctx->rdi;
- gregs [REG_RIP] = mctx->rip;
- gregs [REG_R12] = mctx->r12;
- gregs [REG_R13] = mctx->r13;
- gregs [REG_R14] = mctx->r14;
- gregs [REG_R15] = mctx->r15;
-#elif defined(MONO_ARCH_USE_SIGACTION)
+#if defined(MONO_ARCH_USE_SIGACTION)
ucontext_t *ctx = (ucontext_t*)sigctx;
UCONTEXT_REG_RAX (ctx) = mctx->rax;
gpointer
mono_arch_ip_from_context (void *sigctx)
{
-#if defined(MONO_ARCH_USE_SIGACTION) && defined(UCONTEXT_GREGS)
- ucontext_t *ctx = (ucontext_t*)sigctx;
-
- guint64 *gregs = gregs_from_ucontext (ctx);
-
- return (gpointer)gregs [REG_RIP];
-#elif defined(MONO_ARCH_USE_SIGACTION)
+#if defined(MONO_ARCH_USE_SIGACTION)
ucontext_t *ctx = (ucontext_t*)sigctx;
return (gpointer)UCONTEXT_REG_RIP (ctx);
}
gpointer
-mono_arch_get_throw_pending_exception_full (guint32 *code_size, MonoJumpInfo **ji, gboolean aot)
+mono_arch_get_throw_pending_exception (MonoTrampInfo **info, gboolean aot)
{
guint8 *code, *start;
guint8 *br[1];
gpointer throw_trampoline;
-
- *ji = NULL;
+ MonoJumpInfo *ji = NULL;
+ GSList *unwind_ops = NULL;
start = code = mono_global_codeman_reserve (128);
/* Obtain the pending exception */
if (aot) {
- *ji = mono_patch_info_list_prepend (*ji, code - start, MONO_PATCH_INFO_JIT_ICALL_ADDR, "mono_thread_get_and_clear_pending_exception");
+ ji = mono_patch_info_list_prepend (ji, code - start, MONO_PATCH_INFO_JIT_ICALL_ADDR, "mono_thread_get_and_clear_pending_exception");
amd64_mov_reg_membase (code, AMD64_R11, AMD64_RIP, 0, 8);
} else {
amd64_mov_reg_imm (code, AMD64_R11, mono_thread_get_and_clear_pending_exception);
/* Obtain the original ip and clear the flag in previous_lmf */
if (aot) {
- *ji = mono_patch_info_list_prepend (*ji, code - start, MONO_PATCH_INFO_JIT_ICALL_ADDR, "mono_amd64_get_original_ip");
+ ji = mono_patch_info_list_prepend (ji, code - start, MONO_PATCH_INFO_JIT_ICALL_ADDR, "mono_amd64_get_original_ip");
amd64_mov_reg_membase (code, AMD64_R11, AMD64_RIP, 0, 8);
} else {
amd64_mov_reg_imm (code, AMD64_R11, mono_amd64_get_original_ip);
/* Call the throw trampoline */
if (aot) {
- *ji = mono_patch_info_list_prepend (*ji, code - start, MONO_PATCH_INFO_JIT_ICALL_ADDR, "mono_amd64_throw_exception");
+ ji = mono_patch_info_list_prepend (ji, code - start, MONO_PATCH_INFO_JIT_ICALL_ADDR, "mono_amd64_throw_exception");
amd64_mov_reg_membase (code, AMD64_R11, AMD64_RIP, 0, 8);
} else {
throw_trampoline = mono_get_throw_exception ();
/* Obtain the original ip and clear the flag in previous_lmf */
if (aot) {
- *ji = mono_patch_info_list_prepend (*ji, code - start, MONO_PATCH_INFO_JIT_ICALL_ADDR, "mono_amd64_get_original_ip");
+ ji = mono_patch_info_list_prepend (ji, code - start, MONO_PATCH_INFO_JIT_ICALL_ADDR, "mono_amd64_get_original_ip");
amd64_mov_reg_membase (code, AMD64_R11, AMD64_RIP, 0, 8);
} else {
amd64_mov_reg_imm (code, AMD64_R11, mono_amd64_get_original_ip);
g_assert ((code - start) < 128);
- *code_size = code - start;
+ if (info)
+ *info = mono_tramp_info_create (g_strdup_printf ("throw_pending_exception"), start, code - start, ji, unwind_ops);
return start;
}
void
mono_arch_exceptions_init (void)
{
- guint32 code_size;
- MonoJumpInfo *ji;
+ guint8 *tramp;
if (mono_aot_only) {
- throw_pending_exception = mono_aot_get_named_code ("throw_pending_exception");
+ throw_pending_exception = mono_aot_get_trampoline ("throw_pending_exception");
} else {
/* Call this to avoid initialization races */
- throw_pending_exception = mono_arch_get_throw_pending_exception_full (&code_size, &ji, FALSE);
+ throw_pending_exception = mono_arch_get_throw_pending_exception (NULL, FALSE);
+
+ /* LLVM needs different throw trampolines */
+ tramp = get_throw_trampoline (NULL, FALSE, TRUE, FALSE, FALSE, "llvm_throw_corlib_exception_trampoline", FALSE);
+ mono_register_jit_icall (tramp, "llvm_throw_corlib_exception_trampoline", NULL, TRUE);
+
+ tramp = get_throw_trampoline (NULL, FALSE, TRUE, TRUE, FALSE, "llvm_throw_corlib_exception_abs_trampoline", FALSE);
+ mono_register_jit_icall (tramp, "llvm_throw_corlib_exception_abs_trampoline", NULL, TRUE);
+
+ tramp = get_throw_trampoline (NULL, FALSE, TRUE, TRUE, TRUE, "llvm_resume_unwind_trampoline", FALSE);
+ mono_register_jit_icall (tramp, "llvm_resume_unwind_trampoline", NULL, TRUE);
}
}
projects / mono.git / blobdiff