static MonoW32ExceptionHandler ill_handler;
static MonoW32ExceptionHandler segv_handler;
-static LPTOP_LEVEL_EXCEPTION_FILTER old_handler;
+LPTOP_LEVEL_EXCEPTION_FILTER mono_old_win_toplevel_exception_filter;
+guint64 mono_win_chained_exception_filter_result;
+gboolean mono_win_chained_exception_filter_didrun;
#ifndef PROCESS_CALLBACK_FILTER_ENABLED
# define PROCESS_CALLBACK_FILTER_ENABLED 1
#endif
#define W32_SEH_HANDLE_EX(_ex) \
- if (_ex##_handler) _ex##_handler(0, er, sctx)
+ if (_ex##_handler) _ex##_handler(0, ep, sctx)
/*
* mono_win32_get_handle_stackoverflow (void):
struct sigcontext* sctx;
LONG res;
+ mono_win_chained_exception_filter_didrun = FALSE;
res = EXCEPTION_CONTINUE_EXECUTION;
er = ep->ExceptionRecord;
g_free (sctx);
+ if (mono_win_chained_exception_filter_didrun)
+ res = mono_win_chained_exception_filter_result;
+
return res;
}
if (!restore_stack)
restore_stack = mono_win32_get_handle_stackoverflow ();
- old_handler = SetUnhandledExceptionFilter(seh_handler);
+ mono_old_win_toplevel_exception_filter = SetUnhandledExceptionFilter(seh_handler);
}
void win32_seh_cleanup()
{
- if (old_handler) SetUnhandledExceptionFilter(old_handler);
+ if (mono_old_win_toplevel_exception_filter) SetUnhandledExceptionFilter(mono_old_win_toplevel_exception_filter);
}
void win32_seh_set_handler(int type, MonoW32ExceptionHandler handler)
return FALSE;
}
-#ifdef __sun
-#define REG_EAX EAX
-#define REG_EBX EBX
-#define REG_ECX ECX
-#define REG_EDX EDX
-#define REG_EBP EBP
-#define REG_ESP ESP
-#define REG_ESI ESI
-#define REG_EDI EDI
-#define REG_EIP EIP
-#endif
-
void
mono_arch_sigctx_to_monoctx (void *sigctx, MonoContext *mctx)
{
-#if defined (__native_client__)
- printf("WARNING: mono_arch_sigctx_to_monoctx() called!\n");
- mctx->eax = 0xDEADBEEF;
- mctx->ebx = 0xDEADBEEF;
- mctx->ecx = 0xDEADBEEF;
- mctx->edx = 0xDEADBEEF;
- mctx->ebp = 0xDEADBEEF;
- mctx->esp = 0xDEADBEEF;
- mctx->esi = 0xDEADBEEF;
- mctx->edi = 0xDEADBEEF;
- mctx->eip = 0xDEADBEEF;
-#else
-#ifdef MONO_ARCH_USE_SIGACTION
- ucontext_t *ctx = (ucontext_t*)sigctx;
-
- mctx->eax = UCONTEXT_REG_EAX (ctx);
- mctx->ebx = UCONTEXT_REG_EBX (ctx);
- mctx->ecx = UCONTEXT_REG_ECX (ctx);
- mctx->edx = UCONTEXT_REG_EDX (ctx);
- mctx->ebp = UCONTEXT_REG_EBP (ctx);
- mctx->esp = UCONTEXT_REG_ESP (ctx);
- mctx->esi = UCONTEXT_REG_ESI (ctx);
- mctx->edi = UCONTEXT_REG_EDI (ctx);
- mctx->eip = UCONTEXT_REG_EIP (ctx);
-#else
- struct sigcontext *ctx = (struct sigcontext *)sigctx;
-
- mctx->eax = ctx->SC_EAX;
- mctx->ebx = ctx->SC_EBX;
- mctx->ecx = ctx->SC_ECX;
- mctx->edx = ctx->SC_EDX;
- mctx->ebp = ctx->SC_EBP;
- mctx->esp = ctx->SC_ESP;
- mctx->esi = ctx->SC_ESI;
- mctx->edi = ctx->SC_EDI;
- mctx->eip = ctx->SC_EIP;
-#endif
-#endif /* if defined(__native_client__) */
+ mono_sigctx_to_monoctx (sigctx, mctx);
}
void
mono_arch_monoctx_to_sigctx (MonoContext *mctx, void *sigctx)
{
-#if defined(__native_client__)
- printf("WARNING: mono_arch_monoctx_to_sigctx() called!\n");
-#else
-#ifdef MONO_ARCH_USE_SIGACTION
- ucontext_t *ctx = (ucontext_t*)sigctx;
-
- UCONTEXT_REG_EAX (ctx) = mctx->eax;
- UCONTEXT_REG_EBX (ctx) = mctx->ebx;
- UCONTEXT_REG_ECX (ctx) = mctx->ecx;
- UCONTEXT_REG_EDX (ctx) = mctx->edx;
- UCONTEXT_REG_EBP (ctx) = mctx->ebp;
- UCONTEXT_REG_ESP (ctx) = mctx->esp;
- UCONTEXT_REG_ESI (ctx) = mctx->esi;
- UCONTEXT_REG_EDI (ctx) = mctx->edi;
- UCONTEXT_REG_EIP (ctx) = mctx->eip;
-#else
- struct sigcontext *ctx = (struct sigcontext *)sigctx;
-
- ctx->SC_EAX = mctx->eax;
- ctx->SC_EBX = mctx->ebx;
- ctx->SC_ECX = mctx->ecx;
- ctx->SC_EDX = mctx->edx;
- ctx->SC_EBP = mctx->ebp;
- ctx->SC_ESP = mctx->esp;
- ctx->SC_ESI = mctx->esi;
- ctx->SC_EDI = mctx->edi;
- ctx->SC_EIP = mctx->eip;
-#endif
-#endif /* __native_client__ */
-}
+ mono_monoctx_to_sigctx (mctx, sigctx);
+}
gpointer
mono_arch_ip_from_context (void *sigctx)