*/
-/* we have the stack pointer, not the base pointer in sigcontext */
-#define MONO_CONTEXT_SET_IP(ctx,ip) do { (ctx)->sc_ir = (int)ip; } while (0);
-#define MONO_CONTEXT_SET_BP(ctx,bp) do { (ctx)->sc_sp = (int)bp; } while (0);
-
-#define MONO_CONTEXT_GET_IP(ctx) ((gpointer)((ctx)->sc_ir))
-#define MONO_CONTEXT_GET_BP(ctx) ((gpointer)((ctx)->sc_sp))
-
-#ifdef __APPLE__
-
-typedef struct {
- unsigned long sp;
- unsigned long unused1;
- unsigned long lr;
-} MonoPPCStackFrame;
-
-#else
-
-typedef struct {
- unsigned long sp;
- unsigned long lr;
-} MonoPPCStackFrame;
-
-#endif
-
-/* disbale this for now */
-#undef MONO_USE_EXC_TABLES
-
-#ifdef MONO_USE_EXC_TABLES
-
-/*************************************/
-/* STACK UNWINDING STUFF */
-/*************************************/
-
-/* These definitions are from unwind-dw2.c in glibc 2.2.5 */
-
-/* For x86 */
-#define DWARF_FRAME_REGISTERS 17
-
-typedef struct frame_state
-{
- void *cfa;
- void *eh_ptr;
- long cfa_offset;
- long args_size;
- long reg_or_offset[DWARF_FRAME_REGISTERS+1];
- unsigned short cfa_reg;
- unsigned short retaddr_column;
- char saved[DWARF_FRAME_REGISTERS+1];
-} frame_state;
-
-#if 0
-
-static long
-get_sigcontext_reg (struct sigcontext *ctx, int dwarf_regnum)
-{
- switch (dwarf_regnum) {
- case X86_EAX:
- return ctx->SC_EAX;
- case X86_EBX:
- return ctx->SC_EBX;
- case X86_ECX:
- return ctx->SC_ECX;
- case X86_EDX:
- return ctx->SC_EDX;
- case X86_ESI:
- return ctx->SC_ESI;
- case X86_EDI:
- return ctx->SC_EDI;
- case X86_EBP:
- return ctx->SC_EBP;
- case X86_ESP:
- return ctx->SC_ESP;
- default:
- g_assert_not_reached ();
- }
-
- return 0;
-}
-
-static void
-set_sigcontext_reg (struct sigcontext *ctx, int dwarf_regnum, long value)
-{
- switch (dwarf_regnum) {
- case X86_EAX:
- ctx->SC_EAX = value;
- break;
- case X86_EBX:
- ctx->SC_EBX = value;
- break;
- case X86_ECX:
- ctx->SC_ECX = value;
- break;
- case X86_EDX:
- ctx->SC_EDX = value;
- break;
- case X86_ESI:
- ctx->SC_ESI = value;
- break;
- case X86_EDI:
- ctx->SC_EDI = value;
- break;
- case X86_EBP:
- ctx->SC_EBP = value;
- break;
- case X86_ESP:
- ctx->SC_ESP = value;
- break;
- case 8:
- ctx->SC_EIP = value;
- break;
- default:
- g_assert_not_reached ();
- }
-}
-
-typedef struct frame_state * (*framesf) (void *, struct frame_state *);
-
-static framesf frame_state_for = NULL;
-
-static gboolean inited = FALSE;
-
-typedef char ** (*get_backtrace_symbols_type) (void *__const *__array, int __size);
-
-static get_backtrace_symbols_type get_backtrace_symbols = NULL;
-
-static void
-init_frame_state_for (void)
-{
- GModule *module;
-
- /*
- * There are two versions of __frame_state_for: one in libgcc.a and the
- * other in glibc.so. We need the version from glibc.
- * For more info, see this:
- * http://gcc.gnu.org/ml/gcc/2002-08/msg00192.html
- */
- if ((module = g_module_open ("libc.so.6", G_MODULE_BIND_LAZY))) {
-
- if (!g_module_symbol (module, "__frame_state_for", (gpointer*)&frame_state_for))
- frame_state_for = NULL;
-
- if (!g_module_symbol (module, "backtrace_symbols", (gpointer*)&get_backtrace_symbols)) {
- get_backtrace_symbols = NULL;
- frame_state_for = NULL;
- }
-
- g_module_close (module);
- }
-
- inited = TRUE;
-}
-
-#endif
-
-/* mono_arch_has_unwind_info:
- *
- * Tests if a function has an DWARF exception table able to restore
- * all caller saved registers.
- */
-gboolean
-mono_arch_has_unwind_info (MonoMethod *method)
-{
-#if 0
- struct frame_state state_in;
- struct frame_state *res;
-
- if (!inited)
- init_frame_state_for ();
-
- if (!frame_state_for)
- return FALSE;
-
- g_assert (method->addr);
-
- memset (&state_in, 0, sizeof (state_in));
-
- /* offset 10 is just a guess, but it works for all methods tested */
- if ((res = frame_state_for ((char *)method->addr + 10, &state_in))) {
-
- if (res->saved [X86_EBX] != 1 ||
- res->saved [X86_EDI] != 1 ||
- res->saved [X86_EBP] != 1 ||
- res->saved [X86_ESI] != 1) {
- return FALSE;
- }
- return TRUE;
- } else {
- return FALSE;
- }
-#else
- return FALSE;
-#endif
-}
-
-struct stack_frame
-{
- void *next;
- void *return_address;
-};
-
-static MonoJitInfo *
-ppc_unwind_native_frame (MonoDomain *domain, MonoJitTlsData *jit_tls, MonoContext *ctx,
- MonoContext *new_ctx, MonoLMF *lmf, char **trace)
-{
-#if 0
- struct stack_frame *frame;
- gpointer max_stack;
- MonoJitInfo *ji;
- struct frame_state state_in;
- struct frame_state *res;
-
- if (trace)
- *trace = NULL;
-
- if (!inited)
- init_frame_state_for ();
-
- if (!frame_state_for)
- return FALSE;
-
- frame = MONO_CONTEXT_GET_BP (ctx);
-
- max_stack = lmf && lmf->method ? lmf : jit_tls->end_of_stack;
-
- *new_ctx = *ctx;
-
- memset (&state_in, 0, sizeof (state_in));
-
- while ((gpointer)frame->next < (gpointer)max_stack) {
- gpointer ip, addr = frame->return_address;
- void *cfa;
- char *tmp, **symbols;
-
- if (trace) {
- ip = MONO_CONTEXT_GET_IP (new_ctx);
- symbols = get_backtrace_symbols (&ip, 1);
- if (*trace)
- tmp = g_strdup_printf ("%s\nin (unmanaged) %s", *trace, symbols [0]);
- else
- tmp = g_strdup_printf ("in (unmanaged) %s", symbols [0]);
-
- free (symbols);
- g_free (*trace);
- *trace = tmp;
- }
-
- if ((res = frame_state_for (addr, &state_in))) {
- int i;
-
- cfa = (gint8*) (get_sigcontext_reg (new_ctx, res->cfa_reg) + res->cfa_offset);
- frame = (struct stack_frame *)((gint8*)cfa - 8);
- for (i = 0; i < DWARF_FRAME_REGISTERS + 1; i++) {
- int how = res->saved[i];
- long val;
- g_assert ((how == 0) || (how == 1));
-
- if (how == 1) {
- val = * (long*) ((gint8*)cfa + res->reg_or_offset[i]);
- set_sigcontext_reg (new_ctx, i, val);
- }
- }
- new_ctx->SC_ESP = (long)cfa;
-
- if (res->saved [X86_EBX] == 1 &&
- res->saved [X86_EDI] == 1 &&
- res->saved [X86_EBP] == 1 &&
- res->saved [X86_ESI] == 1 &&
- (ji = mono_jit_info_table_find (domain, frame->return_address))) {
- //printf ("FRAME CFA %s\n", mono_method_full_name (ji->method, TRUE));
- return ji;
- }
-
- } else {
- //printf ("FRAME %p %p %p\n", frame, MONO_CONTEXT_GET_IP (new_ctx), mono_jit_info_table_find (domain, MONO_CONTEXT_GET_IP (new_ctx)));
-
- MONO_CONTEXT_SET_IP (new_ctx, frame->return_address);
- frame = frame->next;
- MONO_CONTEXT_SET_BP (new_ctx, frame);
-
- /* stop if !frame or when we detect an unexpected managed frame */
- if (!frame || mono_jit_info_table_find (domain, frame->return_address)) {
- if (trace) {
- g_free (*trace);
- *trace = NULL;
- }
- return NULL;
- }
- }
- }
-
- //if (!lmf)
- //g_assert_not_reached ();
-
- if (trace) {
- g_free (*trace);
- *trace = NULL;
- }
-#endif
- return NULL;
-}
-
-#endif
#define restore_regs_from_context(ctx_reg,ip_reg,tmp_reg) do { \
int reg; \
ppc_break (code);
g_assert ((code - start) < sizeof(start));
+ mono_arch_flush_icache (start, code - start);
return start;
}
ppc_blr (code);
g_assert ((code - start) < sizeof(start));
+ mono_arch_flush_icache (start, code - start);
return start;
}
static void
-throw_exception (MonoObject *exc, unsigned long eip, unsigned long esp, gulong *int_regs, gdouble *fp_regs)
+throw_exception (MonoObject *exc, unsigned long eip, unsigned long esp, gulong *int_regs, gdouble *fp_regs, gboolean rethrow)
{
static void (*restore_context) (MonoContext *);
MonoContext ctx;
memcpy (&ctx.regs, int_regs, sizeof (gulong) * MONO_SAVED_GREGS);
memcpy (&ctx.fregs, fp_regs, sizeof (double) * MONO_SAVED_FREGS);
+ if (mono_object_isinst (exc, mono_defaults.exception_class)) {
+ MonoException *mono_ex = (MonoException*)exc;
+ if (!rethrow)
+ mono_ex->stack_trace = NULL;
+ }
arch_handle_exception (&ctx, exc, FALSE);
restore_context (&ctx);
*
*/
static gpointer
-mono_arch_get_throw_exception_generic (guint8 *start, int size, int by_name)
+mono_arch_get_throw_exception_generic (guint8 *start, int size, int by_name, gboolean rethrow)
{
guint8 *code;
int alloc_size, pos, i;
ppc_mr (code, ppc_r5, ppc_r3);
ppc_load (code, ppc_r3, mono_defaults.corlib);
ppc_load (code, ppc_r4, "System");
- ppc_bl (code, 0);
- ppc_patch (code - 4, mono_exception_from_name);
+ ppc_load (code, ppc_r0, mono_exception_from_name);
+ ppc_mtctr (code, ppc_r0);
+ ppc_bcctrl (code, PPC_BR_ALWAYS, 0);
}
/* call throw_exception (exc, ip, sp, int_regs, fp_regs) */
/* pointer to the saved int regs */
pos -= sizeof (gulong) * MONO_SAVED_GREGS;
ppc_addi (code, ppc_r6, ppc_sp, pos);
+ ppc_li (code, ppc_r8, rethrow);
- ppc_bl (code, 0);
- ppc_patch (code - 4, throw_exception);
+ ppc_load (code, ppc_r0, throw_exception);
+ ppc_mtctr (code, ppc_r0);
+ ppc_bcctrl (code, PPC_BR_ALWAYS, 0);
/* we should never reach this breakpoint */
ppc_break (code);
g_assert ((code - start) < size);
+ mono_arch_flush_icache (start, code - start);
return start;
}
+/**
+ * mono_arch_get_rethrow_exception:
+ *
+ * Returns a function pointer which can be used to rethrow
+ * exceptions. The returned function has the following
+ * signature: void (*func) (MonoException *exc);
+ *
+ */
+gpointer
+mono_arch_get_rethrow_exception (void)
+{
+ 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;
+}
/**
* arch_get_throw_exception:
*
gpointer
mono_arch_get_throw_exception (void)
{
- static guint8 start [128];
+ static guint8 start [132];
static int inited = 0;
if (inited)
return start;
- mono_arch_get_throw_exception_generic (start, sizeof (start), FALSE);
+ mono_arch_get_throw_exception_generic (start, sizeof (start), FALSE, FALSE);
inited = 1;
return start;
}
gpointer
mono_arch_get_throw_exception_by_name (void)
{
- static guint8 start [160];
+ static guint8 start [168];
static int inited = 0;
if (inited)
return start;
- mono_arch_get_throw_exception_generic (start, sizeof (start), TRUE);
+ mono_arch_get_throw_exception_generic (start, sizeof (start), TRUE, FALSE);
inited = 1;
return start;
}
static MonoArray *
-glist_to_array (GList *list)
+glist_to_array (GList *list, MonoClass *eclass)
{
MonoDomain *domain = mono_domain_get ();
MonoArray *res;
return NULL;
len = g_list_length (list);
- res = mono_array_new (domain, mono_defaults.int_class, len);
+ res = mono_array_new (domain, eclass, len);
for (i = 0; list; list = list->next, i++)
mono_array_set (res, gpointer, i, list->data);
g_free (source_location);
g_free (tmpaddr);
}
-#if 0
- offset = -1;
- /* restore caller saved registers */
- if (ji->used_regs & X86_EBX_MASK) {
- new_ctx->SC_EBX = *((int *)ctx->SC_EBP + offset);
- offset--;
- }
- if (ji->used_regs & X86_EDI_MASK) {
- new_ctx->SC_EDI = *((int *)ctx->SC_EBP + offset);
- offset--;
- }
- if (ji->used_regs & X86_ESI_MASK) {
- new_ctx->SC_ESI = *((int *)ctx->SC_EBP + offset);
- }
-
- new_ctx->SC_ESP = ctx->SC_EBP;
- /* we substract 1, so that the IP points into the call instruction */
- new_ctx->SC_EIP = *((int *)ctx->SC_EBP + 1) - 1;
- new_ctx->SC_EBP = *((int *)ctx->SC_EBP);
-#endif
sframe = (MonoPPCStackFrame*)MONO_CONTEXT_GET_BP (ctx);
MONO_CONTEXT_SET_BP (new_ctx, sframe->sp);
- if (ji->used_regs) {
+ if (ji->method->save_lmf) {
+ memcpy (&new_ctx->fregs, (char*)sframe->sp - sizeof (double) * MONO_SAVED_FREGS, sizeof (double) * MONO_SAVED_FREGS);
+ memcpy (&new_ctx->regs, (char*)sframe->sp - sizeof (double) * MONO_SAVED_FREGS - sizeof (gulong) * MONO_SAVED_GREGS, sizeof (gulong) * MONO_SAVED_GREGS);
+ } else if (ji->used_regs) {
/* keep updated with emit_prolog in mini-ppc.c */
offset = 0;
/* FIXME handle floating point args
sframe = (MonoPPCStackFrame*)sframe->sp;
/* we substract 4, so that the IP points into the call instruction */
MONO_CONTEXT_SET_IP (new_ctx, sframe->lr - 4);
- *res = *ji;
- return res;
-#ifdef MONO_USE_EXC_TABLES
- } else if ((ji = ppc_unwind_native_frame (domain, jit_tls, ctx, new_ctx, *lmf, trace))) {
- *res = *ji;
- return res;
-#endif
+
+ return ji;
} else if (*lmf) {
*new_ctx = *ctx;
if (!(*lmf)->method)
return (gpointer)-1;
- if (trace)
- *trace = g_strdup_printf ("in (unmanaged) %s", mono_method_full_name ((*lmf)->method, TRUE));
+ if (trace) {
+ char *fname = mono_method_full_name ((*lmf)->method, TRUE);
+ *trace = g_strdup_printf ("in (unmanaged) %s", fname);
+ g_free (fname);
+ }
if ((ji = mono_jit_info_table_find (domain, (gpointer)(*lmf)->eip))) {
- *res = *ji;
} else {
memset (res, 0, sizeof (MonoJitInfo));
res->method = (*lmf)->method;
}
-#if 0
- new_ctx->SC_ESI = (*lmf)->esi;
- new_ctx->SC_EDI = (*lmf)->edi;
- new_ctx->SC_EBX = (*lmf)->ebx;
- new_ctx->SC_EBP = (*lmf)->ebp;
- new_ctx->SC_EIP = (*lmf)->eip;
- /* the lmf is always stored on the stack, so the following
- * expression points to a stack location which can be used as ESP */
- new_ctx->SC_ESP = (unsigned long)&((*lmf)->eip);
-#endif
/*sframe = (MonoPPCStackFrame*)MONO_CONTEXT_GET_BP (ctx);
MONO_CONTEXT_SET_BP (new_ctx, sframe->sp);
MONO_CONTEXT_SET_IP (new_ctx, sframe->lr);*/
memcpy (&new_ctx->fregs, (*lmf)->fregs, sizeof (double) * MONO_SAVED_FREGS);
*lmf = (*lmf)->previous_lmf;
- return res;
-
+ return ji ? ji : res;
}
return NULL;
}
-MonoArray *
-ves_icall_get_trace (MonoException *exc, gint32 skip, MonoBoolean need_file_info)
-{
- MonoDomain *domain = mono_domain_get ();
- MonoArray *res;
- MonoArray *ta = exc->trace_ips;
- int i, len;
-
- len = mono_array_length (ta);
-
- res = mono_array_new (domain, mono_defaults.stack_frame_class, len > skip ? len - skip : 0);
-
- for (i = skip; i < len; i++) {
- MonoJitInfo *ji;
- MonoStackFrame *sf = (MonoStackFrame *)mono_object_new (domain, mono_defaults.stack_frame_class);
- gpointer ip = mono_array_get (ta, gpointer, i);
-
- ji = mono_jit_info_table_find (domain, ip);
- g_assert (ji != NULL);
-
- sf->method = mono_method_get_object (domain, ji->method, NULL);
- sf->native_offset = (char *)ip - (char *)ji->code_start;
-
- sf->il_offset = mono_debug_il_offset_from_address (ji->method, sf->native_offset, domain);
-
- if (need_file_info) {
- gchar *filename;
-
- filename = mono_debug_source_location_from_address (ji->method, sf->native_offset, &sf->line, domain);
-
- sf->filename = filename? mono_string_new (domain, filename): NULL;
- sf->column = 0;
-
- g_free (filename);
- }
-
- mono_array_set (res, gpointer, i, sf);
- }
-
- return res;
-}
-
void
-mono_jit_walk_stack (MonoStackWalk func, gpointer user_data) {
+mono_jit_walk_stack (MonoStackWalk func, gboolean do_il_offset, gpointer user_data) {
MonoDomain *domain = mono_domain_get ();
MonoJitTlsData *jit_tls = TlsGetValue (mono_jit_tls_id);
MonoLMF *lmf = jit_tls->lmf;
#else
__asm__ volatile("lwz %0,0(1)" : "=r" (sframe));
#endif
- MONO_CONTEXT_SET_IP (&ctx, sframe->lr);
+ //MONO_CONTEXT_SET_IP (&ctx, sframe->lr);
MONO_CONTEXT_SET_BP (&ctx, sframe->sp);
+ sframe = (MonoPPCStackFrame*)sframe->sp;
+ MONO_CONTEXT_SET_IP (&ctx, sframe->lr);
while (MONO_CONTEXT_GET_BP (&ctx) < jit_tls->end_of_stack) {
if (ji == (gpointer)-1)
return;
- il_offset = mono_debug_il_offset_from_address (ji->method, native_offset, domain);
+ il_offset = do_il_offset ? mono_debug_il_offset_from_address (ji->method, native_offset, domain): -1;
if (func (ji->method, native_offset, il_offset, managed, user_data))
return;
MonoLMF *lmf = jit_tls->lmf;
MonoJitInfo *ji, rji;
MonoContext ctx, new_ctx;
+ MonoPPCStackFrame *sframe;
- MONO_CONTEXT_SET_IP (&ctx, ves_icall_get_frame_info);
- MONO_CONTEXT_SET_BP (&ctx, __builtin_frame_address (0));
+#ifdef __APPLE__
+ __asm__ volatile("lwz %0,0(r1)" : "=r" (sframe));
+#else
+ __asm__ volatile("lwz %0,0(1)" : "=r" (sframe));
+#endif
+ MONO_CONTEXT_SET_BP (&ctx, sframe->sp);
+ sframe = (MonoPPCStackFrame*)sframe->sp;
+ MONO_CONTEXT_SET_IP (&ctx, sframe->lr);
+ /*MONO_CONTEXT_SET_IP (&ctx, ves_icall_get_frame_info);
+ MONO_CONTEXT_SET_BP (&ctx, __builtin_frame_address (0));*/
skip++;
/* skip all wrappers ??*/
if (ji->method->wrapper_type == MONO_WRAPPER_RUNTIME_INVOKE ||
ji->method->wrapper_type == MONO_WRAPPER_REMOTING_INVOKE_WITH_CHECK ||
+ ji->method->wrapper_type == MONO_WRAPPER_XDOMAIN_INVOKE ||
+ ji->method->wrapper_type == MONO_WRAPPER_XDOMAIN_DISPATCH ||
ji->method->wrapper_type == MONO_WRAPPER_REMOTING_INVOKE)
continue;
MonoLMF *lmf = jit_tls->lmf;
GList *trace_ips = NULL;
MonoException *mono_ex;
- MonoString *initial_stack_trace;
+ MonoArray *initial_trace_ips = NULL;
+ int frame_count = 0;
+ gboolean has_dynamic_methods = FALSE;
g_assert (ctx != NULL);
if (!obj) {
if (mono_object_isinst (obj, mono_defaults.exception_class)) {
mono_ex = (MonoException*)obj;
- initial_stack_trace = mono_ex->stack_trace;
+ initial_trace_ips = mono_ex->trace_ips;
} else {
mono_ex = NULL;
}
while (1) {
MonoContext new_ctx;
- char *trace = NULL;
-
+
setup_context (&new_ctx);
ji = mono_arch_find_jit_info (domain, jit_tls, &rji, &rji, ctx, &new_ctx,
- test_only ? &trace : NULL, &lmf, NULL, NULL);
+ NULL, &lmf, NULL, NULL);
if (!ji) {
g_warning ("Exception inside function without unwind info");
g_assert_not_reached ();
}
if (ji != (gpointer)-1) {
+ frame_count ++;
if (test_only && ji->method->wrapper_type != MONO_WRAPPER_RUNTIME_INVOKE && mono_ex) {
- char *tmp, *strace;
-
- if (!initial_stack_trace) {
- trace_ips = g_list_append (trace_ips, MONO_CONTEXT_GET_IP (ctx));
-
- if (!mono_ex->stack_trace)
- strace = g_strdup ("");
- else
- strace = mono_string_to_utf8 (mono_ex->stack_trace);
-
- tmp = g_strdup_printf ("%s%s\n", strace, trace);
- g_free (strace);
-
- mono_ex->stack_trace = mono_string_new (domain, tmp);
+ /*
+ * Avoid overwriting the stack trace if the exception is
+ * rethrown. Also avoid giant stack traces during a stack
+ * overflow.
+ */
+ if (!initial_trace_ips && (frame_count < 1000)) {
+ trace_ips = g_list_prepend (trace_ips, MONO_CONTEXT_GET_IP (ctx));
- g_free (tmp);
}
}
+ if (ji->method->dynamic)
+ has_dynamic_methods = TRUE;
+
if (ji->num_clauses) {
int i;
for (i = 0; i < ji->num_clauses; i++) {
MonoJitExceptionInfo *ei = &ji->clauses [i];
+ gboolean filtered = FALSE;
if (ei->try_start <= MONO_CONTEXT_GET_IP (ctx) &&
MONO_CONTEXT_GET_IP (ctx) <= ei->try_end) {
/* catch block */
+
+ if ((ei->flags == MONO_EXCEPTION_CLAUSE_NONE) || (ei->flags == MONO_EXCEPTION_CLAUSE_FILTER)) {
+ /* store the exception object int cfg->excvar */
+ g_assert (ei->exvar_offset);
+ /* need to use the frame pointer (ppc_r31), not r1 (regs start from register r13): methods with clauses always have r31 */
+ *((gpointer *)((char *)(ctx->regs [ppc_r31-13]) + ei->exvar_offset)) = obj;
+ }
+
+ if (ei->flags == MONO_EXCEPTION_CLAUSE_FILTER)
+ filtered = call_filter (ctx, ei->data.filter, mono_ex);
+
if ((ei->flags == MONO_EXCEPTION_CLAUSE_NONE &&
- mono_object_isinst (obj, mono_class_get (ji->method->klass->image, ei->data.token))) ||
- ((ei->flags == MONO_EXCEPTION_CLAUSE_FILTER &&
- call_filter (ctx, ei->data.filter, obj)))) {
+ mono_object_isinst (obj, ei->data.catch_class)) || filtered) {
if (test_only) {
- if (mono_ex)
- mono_ex->trace_ips = glist_to_array (trace_ips);
+ if (mono_ex && !initial_trace_ips) {
+ trace_ips = g_list_reverse (trace_ips);
+ mono_ex->trace_ips = glist_to_array (trace_ips, mono_defaults.int_class);
+ if (has_dynamic_methods)
+ /* These methods could go away anytime, so compute the stack trace now */
+ mono_ex->stack_trace = ves_icall_System_Exception_get_trace (mono_ex);
+ }
g_list_free (trace_ips);
- g_free (trace);
return TRUE;
}
if (mono_jit_trace_calls != NULL)
g_print ("EXCEPTION: catch found at clause %d of %s\n", i, mono_method_full_name (ji->method, TRUE));
/*printf ("stack for catch: %p\n", MONO_CONTEXT_GET_BP (ctx));*/
MONO_CONTEXT_SET_IP (ctx, ei->handler_start);
- /* need to use the frame pointer (ppc_r31), not r1 (regs start from register r13): methods with clauses always have r31 */
- *((gpointer *)((char *)(ctx->regs [ppc_r31-13]) + ji->exvar_offset)) = obj;
jit_tls->lmf = lmf;
- g_free (trace);
return 0;
}
if (!test_only && ei->try_start <= MONO_CONTEXT_GET_IP (ctx) &&
}
}
- g_free (trace);
-
*ctx = new_ctx;
setup_context (ctx);
jit_tls->abort_func (obj);
g_assert_not_reached ();
} else {
- if (mono_ex)
- mono_ex->trace_ips = glist_to_array (trace_ips);
+ if (mono_ex && !initial_trace_ips) {
+ trace_ips = g_list_reverse (trace_ips);
+ mono_ex->trace_ips = glist_to_array (trace_ips, mono_defaults.int_class);
+ if (has_dynamic_methods)
+ /* These methods could go away anytime, so compute the stack trace now */
+ mono_ex->stack_trace = ves_icall_System_Exception_get_trace (mono_ex);
+ }
g_list_free (trace_ips);
return FALSE;
}