#include <glib.h>
#include <signal.h>
#include <string.h>
+
+#ifndef MONO_CROSS_COMPILE
#ifdef HAVE_ASM_SIGCONTEXT_H
#include <asm/sigcontext.h>
#endif /* def HAVE_ASM_SIGCONTEXT_H */
+#endif
+
#ifdef HAVE_UCONTEXT_H
#include <ucontext.h>
#endif /* def HAVE_UCONTEXT_H */
#include <mono/arch/arm/arm-codegen.h>
+#include <mono/arch/arm/arm-vfp-codegen.h>
#include <mono/metadata/appdomain.h>
#include <mono/metadata/tabledefs.h>
#include <mono/metadata/threads.h>
ctx_reg = ARMREG_R0;
- /* move eip to PC */
- ARM_LDR_IMM (code, ARMREG_IP, ctx_reg, G_STRUCT_OFFSET (MonoContext, eip));
- ARM_STR_IMM (code, ARMREG_IP, ctx_reg, G_STRUCT_OFFSET (MonoContext, regs) + (ARMREG_PC * 4));
- /* move sp to SP */
- ARM_LDR_IMM (code, ARMREG_IP, ctx_reg, G_STRUCT_OFFSET (MonoContext, esp));
- ARM_STR_IMM (code, ARMREG_IP, ctx_reg, G_STRUCT_OFFSET (MonoContext, regs) + (ARMREG_SP * 4));
- /* move ebp to FP */
- ARM_LDR_IMM (code, ARMREG_IP, ctx_reg, G_STRUCT_OFFSET (MonoContext, ebp));
- ARM_STR_IMM (code, ARMREG_IP, ctx_reg, G_STRUCT_OFFSET (MonoContext, regs) + (ARMREG_FP * 4));
+#if defined(ARM_FPU_VFP)
+ ARM_ADD_REG_IMM8 (code, ARMREG_IP, ctx_reg, G_STRUCT_OFFSET (MonoContext, fregs));
+ ARM_FLDMD (code, ARM_VFP_D0, 16, ARMREG_IP);
+#endif
+
+ /* move pc to PC */
+ ARM_LDR_IMM (code, ARMREG_IP, ctx_reg, G_STRUCT_OFFSET (MonoContext, pc));
+ ARM_STR_IMM (code, ARMREG_IP, ctx_reg, G_STRUCT_OFFSET (MonoContext, regs) + (ARMREG_PC * sizeof (mgreg_t)));
/* restore everything */
ARM_ADD_REG_IMM8 (code, ARMREG_IP, ctx_reg, G_STRUCT_OFFSET(MonoContext, regs));
/* restore all the regs from ctx (in r0), but not sp, the stack pointer */
ctx_reg = ARMREG_R0;
- ARM_LDR_IMM (code, ARMREG_IP, ctx_reg, G_STRUCT_OFFSET (MonoContext, eip));
- ARM_ADD_REG_IMM8 (code, ARMREG_LR, ctx_reg, G_STRUCT_OFFSET(MonoContext, regs) + (4 * 4));
+ ARM_LDR_IMM (code, ARMREG_IP, ctx_reg, G_STRUCT_OFFSET (MonoContext, pc));
+ ARM_ADD_REG_IMM8 (code, ARMREG_LR, ctx_reg, G_STRUCT_OFFSET(MonoContext, regs) + (MONO_ARM_FIRST_SAVED_REG * sizeof (mgreg_t)));
ARM_LDM (code, ARMREG_LR, MONO_ARM_REGSAVE_MASK);
/* call handler at eip (r1) and set the first arg with the exception (r2) */
ARM_MOV_REG_REG (code, ARMREG_R0, ARMREG_R2);
}
void
-mono_arm_throw_exception (MonoObject *exc, unsigned long eip, unsigned long esp, gulong *int_regs, gdouble *fp_regs)
+mono_arm_throw_exception (MonoObject *exc, mgreg_t pc, mgreg_t sp, mgreg_t *int_regs, gdouble *fp_regs)
{
static void (*restore_context) (MonoContext *);
MonoContext ctx;
- gboolean rethrow = eip & 1;
+ gboolean rethrow = pc & 1;
if (!restore_context)
restore_context = mono_get_restore_context ();
- eip &= ~1; /* clear the optional rethrow bit */
+ pc &= ~1; /* clear the optional rethrow bit */
/* adjust eip so that it point into the call instruction */
- eip -= 4;
+ pc -= 4;
/*printf ("stack in throw: %p\n", esp);*/
MONO_CONTEXT_SET_BP (&ctx, int_regs [ARMREG_FP - 4]);
- MONO_CONTEXT_SET_SP (&ctx, esp);
- MONO_CONTEXT_SET_IP (&ctx, eip);
- memcpy (((guint8*)&ctx.regs) + (4 * 4), int_regs, sizeof (gulong) * 8);
- /* memcpy (&ctx.fregs, fp_regs, sizeof (double) * MONO_SAVED_FREGS); */
+ MONO_CONTEXT_SET_SP (&ctx, sp);
+ MONO_CONTEXT_SET_IP (&ctx, pc);
+ memcpy (((guint8*)&ctx.regs) + (ARMREG_R4 * sizeof (mgreg_t)), int_regs, 8 * sizeof (mgreg_t));
+ memcpy (&ctx.fregs, fp_regs, sizeof (double) * 16);
if (mono_object_isinst (exc, mono_defaults.exception_class)) {
MonoException *mono_ex = (MonoException*)exc;
if (!rethrow)
mono_ex->stack_trace = NULL;
}
- mono_handle_exception (&ctx, exc, (gpointer)(eip + 4), FALSE);
+ mono_handle_exception (&ctx, exc);
restore_context (&ctx);
g_assert_not_reached ();
}
void
-mono_arm_throw_exception_by_token (guint32 type_token, unsigned long eip, unsigned long esp, gulong *int_regs, gdouble *fp_regs)
+mono_arm_throw_exception_by_token (guint32 type_token, mgreg_t pc, mgreg_t sp, mgreg_t *int_regs, gdouble *fp_regs)
{
- mono_arm_throw_exception ((MonoObject*)mono_exception_from_token (mono_defaults.corlib, type_token), eip, esp, int_regs, fp_regs);
+ /* Clear thumb bit */
+ pc &= ~1;
+
+ mono_arm_throw_exception ((MonoObject*)mono_exception_from_token (mono_defaults.corlib, type_token), pc, sp, int_regs, fp_regs);
+}
+
+void
+mono_arm_resume_unwind (guint32 dummy1, mgreg_t pc, mgreg_t sp, mgreg_t *int_regs, gdouble *fp_regs)
+{
+ MonoContext ctx;
+
+ pc &= ~1; /* clear the optional rethrow bit */
+ /* adjust eip so that it point into the call instruction */
+ pc -= 4;
+
+ MONO_CONTEXT_SET_BP (&ctx, int_regs [ARMREG_FP - 4]);
+ MONO_CONTEXT_SET_SP (&ctx, sp);
+ MONO_CONTEXT_SET_IP (&ctx, pc);
+ memcpy (((guint8*)&ctx.regs) + (ARMREG_R4 * sizeof (mgreg_t)), int_regs, 8 * sizeof (mgreg_t));
+
+ mono_resume_unwind (&ctx);
}
/**
- * arch_get_throw_exception_generic:
+ * get_throw_trampoline:
*
* Returns a function pointer which can be used to raise
* exceptions. The returned function has the following
*
*/
static gpointer
-mono_arch_get_throw_exception_generic (int size, gboolean corlib, gboolean rethrow, MonoTrampInfo **info, gboolean aot)
+get_throw_trampoline (int size, gboolean corlib, gboolean rethrow, gboolean llvm, gboolean resume_unwind, const char *tramp_name, MonoTrampInfo **info, gboolean aot)
{
guint8 *start;
guint8 *code;
MonoJumpInfo *ji = NULL;
GSList *unwind_ops = NULL;
+ int cfa_offset;
code = start = mono_global_codeman_reserve (size);
+ mono_add_unwind_op_def_cfa (unwind_ops, code, start, ARMREG_SP, 0);
+
/* save all the regs on the stack */
ARM_MOV_REG_REG (code, ARMREG_IP, ARMREG_SP);
ARM_PUSH (code, MONO_ARM_REGSAVE_MASK);
+ cfa_offset = MONO_ARM_NUM_SAVED_REGS * sizeof (mgreg_t);
+ mono_add_unwind_op_def_cfa (unwind_ops, code, start, ARMREG_SP, cfa_offset);
+ mono_add_unwind_op_offset (unwind_ops, code, start, ARMREG_LR, - sizeof (mgreg_t));
+
+ /* Save fp regs */
+ ARM_SUB_REG_IMM8 (code, ARMREG_SP, ARMREG_SP, sizeof (double) * 16);
+ cfa_offset += sizeof (double) * 16;
+ mono_add_unwind_op_def_cfa_offset (unwind_ops, code, start, cfa_offset);
+#if defined(ARM_FPU_VFP)
+ ARM_FSTMD (code, ARM_VFP_D0, 16, ARMREG_SP);
+#endif
+
+ /* Param area */
+ ARM_SUB_REG_IMM8 (code, ARMREG_SP, ARMREG_SP, 8);
+ cfa_offset += 8;
+ mono_add_unwind_op_def_cfa_offset (unwind_ops, code, start, cfa_offset);
+
/* call throw_exception (exc, ip, sp, int_regs, fp_regs) */
/* caller sp */
- ARM_ADD_REG_IMM8 (code, ARMREG_R2, ARMREG_SP, 10 * 4); /* 10 saved regs */
+ ARM_ADD_REG_IMM8 (code, ARMREG_R2, ARMREG_SP, cfa_offset);
/* exc is already in place in r0 */
if (corlib) {
/* The caller ip is already in R1 */
+ if (llvm)
+ /* Negate the ip adjustment done in mono_arm_throw_exception */
+ ARM_ADD_REG_IMM8 (code, ARMREG_R1, ARMREG_R1, 4);
} else {
ARM_MOV_REG_REG (code, ARMREG_R1, ARMREG_LR); /* caller ip */
}
- /* FIXME: pointer to the saved fp regs */
- /*pos = alloc_size - sizeof (double) * MONO_SAVED_FREGS;
- ppc_addi (code, ppc_r7, ppc_sp, pos);*/
- /* pointer to the saved int regs */
- ARM_MOV_REG_REG (code, ARMREG_R3, ARMREG_SP); /* the pushed regs */
- /* we encode rethrow in the ip, so we avoid args on the stack */
+ /* int regs */
+ ARM_ADD_REG_IMM8 (code, ARMREG_R3, ARMREG_SP, (cfa_offset - (MONO_ARM_NUM_SAVED_REGS * sizeof (mgreg_t))));
+ /* we encode rethrow in the ip */
ARM_ORR_REG_IMM8 (code, ARMREG_R1, ARMREG_R1, rethrow);
+ /* fp regs */
+ ARM_ADD_REG_IMM8 (code, ARMREG_LR, ARMREG_SP, 8);
+ ARM_STR_IMM (code, ARMREG_LR, ARMREG_SP, 0);
if (aot) {
- ji = mono_patch_info_list_prepend (ji, code - start, MONO_PATCH_INFO_JIT_ICALL_ADDR, corlib ? "mono_arm_throw_exception_by_token" : "mono_arm_throw_exception");
+ const char *icall_name;
+
+ if (resume_unwind)
+ icall_name = "mono_arm_resume_unwind";
+ else if (corlib)
+ icall_name = "mono_arm_throw_exception_by_token";
+ else
+ icall_name = "mono_arm_throw_exception";
+
+ ji = mono_patch_info_list_prepend (ji, code - start, MONO_PATCH_INFO_JIT_ICALL_ADDR, icall_name);
ARM_LDR_IMM (code, ARMREG_IP, ARMREG_PC, 0);
ARM_B (code, 0);
*(gpointer*)(gpointer)code = NULL;
code += 4;
ARM_LDR_REG_REG (code, ARMREG_IP, ARMREG_PC, ARMREG_IP);
} else {
- code = mono_arm_emit_load_imm (code, ARMREG_IP, GPOINTER_TO_UINT (corlib ? (gpointer)mono_arm_throw_exception_by_token : (gpointer)mono_arm_throw_exception));
+ code = mono_arm_emit_load_imm (code, ARMREG_IP, GPOINTER_TO_UINT (resume_unwind ? (gpointer)mono_arm_resume_unwind : (corlib ? (gpointer)mono_arm_throw_exception_by_token : (gpointer)mono_arm_throw_exception)));
}
ARM_MOV_REG_REG (code, ARMREG_LR, ARMREG_PC);
ARM_MOV_REG_REG (code, ARMREG_PC, ARMREG_IP);
mono_arch_flush_icache (start, code - start);
if (info)
- *info = mono_tramp_info_create (g_strdup_printf (corlib ? "throw_corlib_exception" : (rethrow ? "rethrow_exception" : "throw_exception")), start, code - start, ji, unwind_ops);
+ *info = mono_tramp_info_create (g_strdup_printf (tramp_name), start, code - start, ji, unwind_ops);
return start;
}
/**
- * mono_arch_get_rethrow_exception:
+ * arch_get_throw_exception:
*
- * Returns a function pointer which can be used to rethrow
+ * Returns a function pointer which can be used to raise
* exceptions. The returned function has the following
* signature: void (*func) (MonoException *exc);
+ * For example to raise an arithmetic exception you can use:
+ *
+ * x86_push_imm (code, mono_get_exception_arithmetic ());
+ * x86_call_code (code, arch_get_throw_exception ());
*
*/
-gpointer
-mono_arch_get_rethrow_exception (MonoTrampInfo **info, gboolean aot)
+gpointer
+mono_arch_get_throw_exception (MonoTrampInfo **info, gboolean aot)
{
- return mono_arch_get_throw_exception_generic (132, FALSE, TRUE, info, aot);
+ return get_throw_trampoline (132, FALSE, FALSE, FALSE, FALSE, "throw_exception", info, aot);
}
/**
- * arch_get_throw_exception:
+ * mono_arch_get_rethrow_exception:
*
- * Returns a function pointer which can be used to raise
+ * Returns a function pointer which can be used to rethrow
* exceptions. The returned function has the following
* signature: void (*func) (MonoException *exc);
- * For example to raise an arithmetic exception you can use:
- *
- * x86_push_imm (code, mono_get_exception_arithmetic ());
- * x86_call_code (code, arch_get_throw_exception ());
*
*/
-gpointer
-mono_arch_get_throw_exception (MonoTrampInfo **info, gboolean aot)
+gpointer
+mono_arch_get_rethrow_exception (MonoTrampInfo **info, gboolean aot)
{
- return mono_arch_get_throw_exception_generic (132, FALSE, FALSE, info, aot);
+ return get_throw_trampoline (132, FALSE, TRUE, FALSE, FALSE, "rethrow_exception", info, aot);
}
/**
gpointer
mono_arch_get_throw_corlib_exception (MonoTrampInfo **info, gboolean aot)
{
- return mono_arch_get_throw_exception_generic (168, TRUE, FALSE, info, aot);
+ return get_throw_trampoline (168, TRUE, FALSE, FALSE, FALSE, "throw_corlib_exception", info, aot);
}
+GSList*
+mono_arm_get_exception_trampolines (gboolean aot)
+{
+ MonoTrampInfo *info;
+ GSList *tramps = NULL;
+
+ /* LLVM uses the normal trampolines, but with a different name */
+ get_throw_trampoline (168, TRUE, FALSE, FALSE, FALSE, "llvm_throw_corlib_exception_trampoline", &info, aot);
+ tramps = g_slist_prepend (tramps, info);
+
+ get_throw_trampoline (168, TRUE, FALSE, TRUE, FALSE, "llvm_throw_corlib_exception_abs_trampoline", &info, aot);
+ tramps = g_slist_prepend (tramps, info);
+
+ get_throw_trampoline (168, FALSE, FALSE, FALSE, TRUE, "llvm_resume_unwind_trampoline", &info, aot);
+ tramps = g_slist_prepend (tramps, info);
+
+ return tramps;
+}
+
+void
+mono_arch_exceptions_init (void)
+{
+ guint8 *tramp;
+ GSList *tramps, *l;
+
+ if (mono_aot_only) {
+ tramp = mono_aot_get_trampoline ("llvm_throw_corlib_exception_trampoline");
+ mono_register_jit_icall (tramp, "llvm_throw_corlib_exception_trampoline", NULL, TRUE);
+ tramp = mono_aot_get_trampoline ("llvm_throw_corlib_exception_abs_trampoline");
+ mono_register_jit_icall (tramp, "llvm_throw_corlib_exception_abs_trampoline", NULL, TRUE);
+ tramp = mono_aot_get_trampoline ("llvm_resume_unwind_trampoline");
+ mono_register_jit_icall (tramp, "llvm_resume_unwind_trampoline", NULL, TRUE);
+ } else {
+ tramps = mono_arm_get_exception_trampolines (FALSE);
+ for (l = tramps; l; l = l->next) {
+ MonoTrampInfo *info = l->data;
+
+ mono_register_jit_icall (info->code, g_strdup (info->name), NULL, TRUE);
+ mono_save_trampoline_xdebug_info (info);
+ mono_tramp_info_free (info);
+ }
+ g_slist_free (tramps);
+ }
+}
+
/*
- * mono_arch_find_jit_info_ext:
+ * mono_arch_find_jit_info:
*
* See exceptions-amd64.c for docs;
*/
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,
+ MonoContext *new_ctx, MonoLMF **lmf,
+ mgreg_t **save_locations,
StackFrameInfo *frame)
{
gpointer ip = MONO_CONTEXT_GET_IP (ctx);
memset (frame, 0, sizeof (StackFrameInfo));
frame->ji = ji;
- frame->managed = FALSE;
*new_ctx = *ctx;
frame->type = FRAME_TYPE_MANAGED;
- if (!ji->method->wrapper_type || ji->method->wrapper_type == MONO_WRAPPER_DYNAMIC_METHOD)
- frame->managed = TRUE;
-
if (ji->from_aot)
unwind_info = mono_aot_get_unwind_info (ji, &unwind_info_len);
else
for (i = 0; i < 16; ++i)
regs [i] = new_ctx->regs [i];
- regs [ARMREG_SP] = new_ctx->esp;
mono_unwind_frame (unwind_info, unwind_info_len, ji->code_start,
(guint8*)ji->code_start + ji->code_size,
- ip, regs, MONO_MAX_IREGS, &cfa);
+ ip, regs, MONO_MAX_IREGS,
+ save_locations, MONO_MAX_IREGS, &cfa);
for (i = 0; i < 16; ++i)
new_ctx->regs [i] = regs [i];
- new_ctx->eip = regs [ARMREG_LR];
- new_ctx->esp = (gsize)cfa;
- new_ctx->ebp = new_ctx->esp;
+ new_ctx->pc = regs [ARMREG_LR];
+ new_ctx->regs [ARMREG_SP] = (gsize)cfa;
- if (*lmf && (MONO_CONTEXT_GET_BP (ctx) >= (gpointer)(*lmf)->ebp)) {
+ if (*lmf && (MONO_CONTEXT_GET_SP (ctx) >= (gpointer)(*lmf)->sp)) {
/* remove any unused lmf */
*lmf = (gpointer)(((gsize)(*lmf)->previous_lmf) & ~3);
}
+ /* Clear thumb bit */
+ new_ctx->pc &= ~1;
+
/* we substract 1, so that the IP points into the call instruction */
- new_ctx->eip--;
+ new_ctx->pc--;
return TRUE;
} else if (*lmf) {
frame->type = FRAME_TYPE_MANAGED_TO_NATIVE;
- if ((ji = mini_jit_info_table_find (domain, (gpointer)(*lmf)->eip, NULL))) {
+ if ((ji = mini_jit_info_table_find (domain, (gpointer)(*lmf)->ip, NULL))) {
frame->ji = ji;
} else {
if (!(*lmf)->method)
frame->method = (*lmf)->method;
}
- memcpy (&new_ctx->regs [0], &(*lmf)->iregs [0], sizeof (gulong) * 13);
- /* SP is skipped */
- new_ctx->regs [ARMREG_LR] = (*lmf)->iregs [ARMREG_LR - 1];
- /* This is the sp for the current frame */
- new_ctx->esp = (*lmf)->iregs [ARMREG_FP];
- new_ctx->eip = (*lmf)->iregs [13];
- new_ctx->ebp = new_ctx->esp;
+ /*
+ * The LMF is saved at the start of the method using:
+ * ARM_MOV_REG_REG (code, ARMREG_IP, ARMREG_SP)
+ * ARM_PUSH (code, 0x5ff0);
+ * So it stores the register state as it existed at the caller. We need to
+ * produce the register state which existed at the time of the call which
+ * transitioned to native call, so we save the sp/fp/ip in the LMF.
+ */
+ memcpy (&new_ctx->regs [0], &(*lmf)->iregs [0], sizeof (mgreg_t) * 13);
+ new_ctx->pc = (*lmf)->ip;
+ new_ctx->regs [ARMREG_SP] = (*lmf)->sp;
+ new_ctx->regs [ARMREG_FP] = (*lmf)->fp;
+
+ /* Clear thumb bit */
+ new_ctx->pc &= ~1;
+
+ /* we substract 1, so that the IP points into the call instruction */
+ new_ctx->pc--;
*lmf = (gpointer)(((gsize)(*lmf)->previous_lmf) & ~3);
return FALSE;
}
+#if MONO_ARCH_HAVE_SIGCTX_TO_MONOCTX
void
mono_arch_sigctx_to_monoctx (void *sigctx, MonoContext *mctx)
{
-#if BROKEN_LINUX
- g_assert_not_reached ();
-#else
- arm_ucontext *my_uc = sigctx;
-
- mctx->eip = UCONTEXT_REG_PC (my_uc);
- mctx->esp = UCONTEXT_REG_SP (my_uc);
- memcpy (&mctx->regs, &UCONTEXT_REG_R0 (my_uc), sizeof (gulong) * 16);
-#endif
- mctx->ebp = mctx->regs [ARMREG_FP];
+ mono_sigctx_to_monoctx (sigctx, mctx);
}
void
mono_arch_monoctx_to_sigctx (MonoContext *mctx, void *ctx)
{
-#if BROKEN_LINUX
- g_assert_not_reached ();
-#else
- arm_ucontext *my_uc = ctx;
-
- UCONTEXT_REG_PC (my_uc) = mctx->eip;
- UCONTEXT_REG_SP (my_uc) = mctx->ebp;
- /* The upper registers are not guaranteed to be valid */
- memcpy (&UCONTEXT_REG_R0 (my_uc), &mctx->regs, sizeof (gulong) * 12);
-#endif
+ mono_monoctx_to_sigctx (mctx, ctx);
}
+#endif /* MONO_ARCH_HAVE_SIGCTX_TO_MONOCTX */
/*
* handle_exception:
* Called by resuming from a signal handler.
*/
static void
-handle_signal_exception (gpointer obj, gboolean test_only)
+handle_signal_exception (gpointer obj)
{
- MonoJitTlsData *jit_tls = TlsGetValue (mono_jit_tls_id);
+ MonoJitTlsData *jit_tls = mono_native_tls_get_value (mono_jit_tls_id);
MonoContext ctx;
static void (*restore_context) (MonoContext *);
memcpy (&ctx, &jit_tls->ex_ctx, sizeof (MonoContext));
- mono_handle_exception (&ctx, obj, MONO_CONTEXT_GET_IP (&ctx), test_only);
+ mono_handle_exception (&ctx, obj);
restore_context (&ctx);
}
+/*
+ * This works around a gcc 4.5 bug:
+ * https://bugs.launchpad.net/ubuntu/+source/gcc-4.5/+bug/721531
+ */
+#if defined(__GNUC__)
+__attribute__((noinline))
+#endif
+static gpointer
+get_handle_signal_exception_addr (void)
+{
+ return handle_signal_exception;
+}
+
/*
* This is the function called from the signal handler
*/
gboolean
-mono_arch_handle_exception (void *ctx, gpointer obj, gboolean test_only)
+mono_arch_handle_exception (void *ctx, gpointer obj)
{
-#if defined(MONO_CROSS_COMPILE)
+#if defined(MONO_CROSS_COMPILE) || !defined(MONO_ARCH_HAVE_SIGCTX_TO_MONOCTX)
g_assert_not_reached ();
#elif defined(MONO_ARCH_USE_SIGACTION)
arm_ucontext *sigctx = ctx;
* 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);
+ MonoJitTlsData *jit_tls = mono_native_tls_get_value (mono_jit_tls_id);
guint64 sp = UCONTEXT_REG_SP (sigctx);
/* Pass the ctx parameter in TLS */
mono_arch_sigctx_to_monoctx (sigctx, &jit_tls->ex_ctx);
/* The others in registers */
UCONTEXT_REG_R0 (sigctx) = (gsize)obj;
- UCONTEXT_REG_R1 (sigctx) = test_only;
/* Allocate a stack frame */
sp -= 16;
UCONTEXT_REG_SP (sigctx) = sp;
- UCONTEXT_REG_PC (sigctx) = (gsize)handle_signal_exception;
+ UCONTEXT_REG_PC (sigctx) = (gsize)get_handle_signal_exception_addr ();
+#ifdef UCONTEXT_REG_CPSR
+ if ((gsize)UCONTEXT_REG_PC (sigctx) & 1)
+ /* Transition to thumb */
+ UCONTEXT_REG_CPSR (sigctx) |= (1 << 5);
+ else
+ /* Transition to ARM */
+ UCONTEXT_REG_CPSR (sigctx) &= ~(1 << 5);
+#endif
return TRUE;
#else
mono_arch_sigctx_to_monoctx (ctx, &mctx);
- result = mono_handle_exception (&mctx, obj, (gpointer)mctx.eip, test_only);
+ result = mono_handle_exception (&mctx, obj);
/* restore the context so that returning from the signal handler will invoke
* the catch clause
*/
gpointer
mono_arch_ip_from_context (void *sigctx)
{
-#if BROKEN_LINUX
+#ifdef MONO_CROSS_COMPILE
+ g_assert_not_reached ();
+#elif defined(__native_client__)
g_assert_not_reached ();
#else
arm_ucontext *my_uc = sigctx;
#endif
}
-gboolean
-mono_arch_has_unwind_info (gconstpointer addr)
+void
+mono_arch_setup_async_callback (MonoContext *ctx, void (*async_cb)(void *fun), gpointer user_data)
{
- return FALSE;
+ mgreg_t sp = (mgreg_t)MONO_CONTEXT_GET_SP (ctx);
+
+ // FIXME:
+ g_assert (!user_data);
+
+ /* Allocate a stack frame */
+ sp -= 16;
+ MONO_CONTEXT_SET_SP (ctx, sp);
+ MONO_CONTEXT_SET_IP (ctx, async_cb);
+
+ // FIXME: thumb/arm
}
+/*
+ * mono_arch_setup_resume_sighandler_ctx:
+ *
+ * Setup CTX so execution continues at FUNC.
+ */
+void
+mono_arch_setup_resume_sighandler_ctx (MonoContext *ctx, gpointer func)
+{
+ MONO_CONTEXT_SET_IP (ctx,func);
+ if ((mgreg_t)MONO_CONTEXT_GET_IP (ctx) & 1)
+ /* Transition to thumb */
+ ctx->cpsr |= (1 << 5);
+ else
+ /* Transition to ARM */
+ ctx->cpsr &= ~(1 << 5);
+}
projects / mono.git / blobdiff