* We define our own version here and use it instead.
*/
+#if __APPLE__
+#define my_ucontext ucontext_t
+#else
typedef struct my_ucontext {
unsigned long uc_flags;
struct my_ucontext *uc_link;
* we don't use them for now...
*/
} my_ucontext;
+#endif
#define restore_regs_from_context(ctx_reg,ip_reg,tmp_reg) do { \
- int reg; \
ARM_LDR_IMM (code, ip_reg, ctx_reg, G_STRUCT_OFFSET (MonoContext, eip)); \
ARM_ADD_REG_IMM8 (code, tmp_reg, ctx_reg, G_STRUCT_OFFSET(MonoContext, regs)); \
ARM_LDMIA (code, tmp_reg, MONO_ARM_REGSAVE_MASK); \
* The first argument in r0 is the pointer to the context.
*/
gpointer
-mono_arch_get_restore_context (void)
+mono_arch_get_restore_context_full (guint32 *code_size, MonoJumpInfo **ji, gboolean aot)
{
guint8 *code;
- static guint8 start [128];
- static int inited = 0;
+ guint8 *start;
+
+ *ji = NULL;
- if (inited)
- return start;
- inited = 1;
+ start = code = mono_global_codeman_reserve (128);
- code = start;
restore_regs_from_context (ARMREG_R0, ARMREG_R1, ARMREG_R2);
/* restore also the stack pointer, FIXME: handle sp != fp */
ARM_LDR_IMM (code, ARMREG_SP, ARMREG_R0, G_STRUCT_OFFSET (MonoContext, ebp));
/* never reached */
ARM_DBRK (code);
- g_assert ((code - start) < sizeof(start));
+ g_assert ((code - start) < 128);
+
mono_arch_flush_icache (start, code - start);
+
+ *code_size = code - start;
+
return start;
}
* @exc object in this case).
*/
gpointer
-mono_arch_get_call_filter (void)
+mono_arch_get_call_filter_full (guint32 *code_size, MonoJumpInfo **ji, gboolean aot)
{
- static guint8 start [320];
- static int inited = 0;
guint8 *code;
- int alloc_size, pos, i;
+ guint8* start;
- if (inited)
- return start;
+ *ji = NULL;
- inited = 1;
/* call_filter (MonoContext *ctx, unsigned long eip, gpointer exc) */
- code = start;
+ start = code = mono_global_codeman_reserve (320);
/* save all the regs on the stack */
ARM_MOV_REG_REG (code, ARMREG_IP, ARMREG_SP);
/* epilog */
ARM_POP_NWB (code, 0xff0 | ((1 << ARMREG_SP) | (1 << ARMREG_PC)));
- g_assert ((code - start) < sizeof(start));
+ g_assert ((code - start) < 320);
+
mono_arch_flush_icache (start, code - start);
+
+ *code_size = code - start;
+
return start;
}
-static void
-throw_exception (MonoObject *exc, unsigned long eip, unsigned long esp, gulong *int_regs, gdouble *fp_regs)
+void
+mono_arm_throw_exception (MonoObject *exc, unsigned long eip, unsigned long esp, gulong *int_regs, gdouble *fp_regs)
{
static void (*restore_context) (MonoContext *);
MonoContext ctx;
gboolean rethrow = eip & 1;
if (!restore_context)
- restore_context = mono_arch_get_restore_context ();
+ restore_context = mono_get_restore_context ();
eip &= ~1; /* clear the optional rethrow bit */
/* adjust eip so that it point into the call instruction */
*
*/
static gpointer
-mono_arch_get_throw_exception_generic (guint8 *start, int size, int by_token, gboolean rethrow)
+mono_arch_get_throw_exception_generic (int size, int by_token, gboolean rethrow, guint32 *code_size, MonoJumpInfo **ji, gboolean aot)
{
+ guint8 *start;
guint8 *code;
- int alloc_size, pos, i;
- code = start;
+ *ji = NULL;
+
+ code = start = mono_global_codeman_reserve (size);
/* save all the regs on the stack */
ARM_MOV_REG_REG (code, ARMREG_IP, ARMREG_SP);
/* we encode rethrow in the ip, so we avoid args on the stack */
ARM_ORR_REG_IMM8 (code, ARMREG_R1, ARMREG_R1, rethrow);
- code = mono_arm_emit_load_imm (code, ARMREG_IP, GPOINTER_TO_UINT (throw_exception));
+ if (aot) {
+ *ji = mono_patch_info_list_prepend (*ji, code - start, MONO_PATCH_INFO_JIT_ICALL_ADDR, "mono_arm_throw_exception");
+ 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 (mono_arm_throw_exception));
+ }
ARM_MOV_REG_REG (code, ARMREG_LR, ARMREG_PC);
ARM_MOV_REG_REG (code, ARMREG_PC, ARMREG_IP);
/* we should never reach this breakpoint */
ARM_DBRK (code);
g_assert ((code - start) < size);
mono_arch_flush_icache (start, code - start);
+
+ *code_size = code - start;
+
return start;
}
*
*/
gpointer
-mono_arch_get_rethrow_exception (void)
+mono_arch_get_rethrow_exception_full (guint32 *code_size, MonoJumpInfo **ji, gboolean aot)
{
- static guint8 start [132];
- static int inited = 0;
-
- if (inited)
- return start;
- mono_arch_get_throw_exception_generic (start, sizeof (start), FALSE, TRUE);
- inited = 1;
- return start;
+ return mono_arch_get_throw_exception_generic (132, FALSE, TRUE, code_size, ji, aot);
}
+
/**
* arch_get_throw_exception:
*
*
*/
gpointer
-mono_arch_get_throw_exception (void)
+mono_arch_get_throw_exception_full (guint32 *code_size, MonoJumpInfo **ji, gboolean aot)
{
- static guint8 start [132];
- static int inited = 0;
-
- if (inited)
- return start;
- mono_arch_get_throw_exception_generic (start, sizeof (start), FALSE, FALSE);
- inited = 1;
- return start;
+ return mono_arch_get_throw_exception_generic (132, FALSE, FALSE, code_size, ji, aot);
}
gpointer
-mono_arch_get_throw_exception_by_name (void)
+mono_arch_get_throw_exception_by_name_full (guint32 *code_size, MonoJumpInfo **ji, gboolean aot)
{
- static guint8* start;
- static gboolean inited = FALSE;
+ guint8* start;
guint8 *code;
- if (inited)
- return start;
+ *ji = NULL;
start = code = mono_global_codeman_reserve (64);
/* Not used on ARM */
ARM_DBRK (code);
+ *code_size = code - start;
+
return start;
}
* On ARM, the ip is passed instead of an offset.
*/
gpointer
-mono_arch_get_throw_corlib_exception (void)
+mono_arch_get_throw_corlib_exception_full (guint32 *code_size, MonoJumpInfo **ji, gboolean aot)
{
- static guint8 start [168];
- static int inited = 0;
-
- if (inited)
- return start;
- mono_arch_get_throw_exception_generic (start, sizeof (start), TRUE, FALSE);
- inited = 1;
- return start;
+ return mono_arch_get_throw_exception_generic (168, TRUE, FALSE, code_size, ji, aot);
}
/* mono_arch_find_jit_info:
*/
MonoJitInfo *
mono_arch_find_jit_info (MonoDomain *domain, MonoJitTlsData *jit_tls, MonoJitInfo *res, MonoJitInfo *prev_ji,
- MonoContext *ctx, MonoContext *new_ctx, char **trace, MonoLMF **lmf,
- int *native_offset, gboolean *managed)
+ MonoContext *ctx, MonoContext *new_ctx, MonoLMF **lmf, gboolean *managed)
{
MonoJitInfo *ji;
gpointer ip = MONO_CONTEXT_GET_IP (ctx);
new_ctx->eip = *(gulong*)sp;
sp += sizeof (gulong);
new_ctx->ebp = new_ctx->esp;
+ /* Needed by get_exception_catch_class () */
+ new_ctx->regs [ARMREG_R11] = new_ctx->esp;
}
if (*lmf && (MONO_CONTEXT_GET_BP (ctx) >= (gpointer)(*lmf)->ebp)) {
*new_ctx = *ctx;
- if (!(*lmf)->method)
- return (gpointer)-1;
-
if ((ji = mono_jit_info_table_find (domain, (gpointer)(*lmf)->eip))) {
} else {
+ if (!(*lmf)->method)
+ return (gpointer)-1;
memset (res, 0, sizeof (MonoJitInfo));
res->method = (*lmf)->method;
}
#else
my_ucontext *my_uc = sigctx;
- mctx->eip = my_uc->sig_ctx.arm_pc;
- mctx->ebp = my_uc->sig_ctx.arm_sp;
- memcpy (&mctx->regs, &my_uc->sig_ctx.arm_r4, sizeof (gulong) * 8);
+ mctx->eip = UCONTEXT_REG_PC (my_uc);
+ mctx->ebp = UCONTEXT_REG_SP (my_uc);
+ memcpy (&mctx->regs, &UCONTEXT_REG_R4 (my_uc), sizeof (gulong) * 8);
#endif
}
#else
my_ucontext *my_uc = ctx;
- my_uc->sig_ctx.arm_pc = mctx->eip;
- my_uc->sig_ctx.arm_sp = mctx->ebp;
- memcpy (&my_uc->sig_ctx.arm_r4, &mctx->regs, sizeof (gulong) * 8);
+ UCONTEXT_REG_PC (my_uc) = mctx->eip;
+ UCONTEXT_REG_SP (my_uc) = mctx->ebp;
+ memcpy (&UCONTEXT_REG_R4 (my_uc), &mctx->regs, sizeof (gulong) * 8);
#endif
}
return (gpointer)uc->uc_mcontext.gregs [ARMREG_PC];
#else
my_ucontext *my_uc = sigctx;
- return (void*)my_uc->sig_ctx.arm_pc;
+ return (void*) UCONTEXT_REG_PC (my_uc);
#endif
}
projects / mono.git / blobdiff