106 lines
3.6 KiB
Plaintext
106 lines
3.6 KiB
Plaintext
$OpenBSD: patch-mono_mini_exceptions-amd64_c,v 1.3 2010/03/23 08:25:26 robert Exp $
|
|
--- mono/mini/exceptions-amd64.c.orig Tue Mar 23 08:56:35 2010
|
|
+++ mono/mini/exceptions-amd64.c Tue Mar 23 08:59:41 2010
|
|
@@ -711,7 +711,7 @@ mono_arch_handle_exception (void *sigctx, gpointer obj
|
|
return TRUE;
|
|
}
|
|
|
|
-#ifdef MONO_ARCH_USE_SIGACTION
|
|
+#if defined(MONO_ARCH_USE_SIGACTION) && defined(UCONTEXT_GREGS)
|
|
static inline guint64*
|
|
gregs_from_ucontext (ucontext_t *ctx)
|
|
{
|
|
@@ -721,7 +721,7 @@ gregs_from_ucontext (ucontext_t *ctx)
|
|
void
|
|
mono_arch_sigctx_to_monoctx (void *sigctx, MonoContext *mctx)
|
|
{
|
|
-#ifdef MONO_ARCH_USE_SIGACTION
|
|
+#if defined(MONO_ARCH_USE_SIGACTION) && defined(UCONTEXT_GREGS)
|
|
ucontext_t *ctx = (ucontext_t*)sigctx;
|
|
|
|
guint64 *gregs = gregs_from_ucontext (ctx);
|
|
@@ -739,6 +739,22 @@ mono_arch_sigctx_to_monoctx (void *sigctx, MonoContext
|
|
mctx->r13 = gregs [REG_R13];
|
|
mctx->r14 = gregs [REG_R14];
|
|
mctx->r15 = gregs [REG_R15];
|
|
+#elif defined(MONO_ARCH_USE_SIGACTION)
|
|
+ ucontext_t *ctx = (ucontext_t*)sigctx;
|
|
+
|
|
+ mctx->rax = UCONTEXT_REG_RAX (ctx);
|
|
+ mctx->rbx = UCONTEXT_REG_RBX (ctx);
|
|
+ mctx->rcx = UCONTEXT_REG_RCX (ctx);
|
|
+ mctx->rdx = UCONTEXT_REG_RDX (ctx);
|
|
+ mctx->rbp = UCONTEXT_REG_RBP (ctx);
|
|
+ mctx->rsp = UCONTEXT_REG_RSP (ctx);
|
|
+ mctx->rsi = UCONTEXT_REG_RSI (ctx);
|
|
+ mctx->rdi = UCONTEXT_REG_RDI (ctx);
|
|
+ mctx->rip = UCONTEXT_REG_RIP (ctx);
|
|
+ mctx->r12 = UCONTEXT_REG_R12 (ctx);
|
|
+ mctx->r13 = UCONTEXT_REG_R13 (ctx);
|
|
+ mctx->r14 = UCONTEXT_REG_R14 (ctx);
|
|
+ mctx->r15 = UCONTEXT_REG_R15 (ctx);
|
|
#else
|
|
MonoContext *ctx = (MonoContext *)sigctx;
|
|
|
|
@@ -761,7 +777,7 @@ mono_arch_sigctx_to_monoctx (void *sigctx, MonoContext
|
|
void
|
|
mono_arch_monoctx_to_sigctx (MonoContext *mctx, void *sigctx)
|
|
{
|
|
-#ifdef MONO_ARCH_USE_SIGACTION
|
|
+#if defined(MONO_ARCH_USE_SIGACTION) && defined(UCONTEXT_GREGS)
|
|
ucontext_t *ctx = (ucontext_t*)sigctx;
|
|
|
|
guint64 *gregs = gregs_from_ucontext (ctx);
|
|
@@ -779,6 +795,22 @@ mono_arch_monoctx_to_sigctx (MonoContext *mctx, void *
|
|
gregs [REG_R13] = mctx->r13;
|
|
gregs [REG_R14] = mctx->r14;
|
|
gregs [REG_R15] = mctx->r15;
|
|
+#elif defined(MONO_ARCH_USE_SIGACTION)
|
|
+ ucontext_t *ctx = (ucontext_t*)sigctx;
|
|
+
|
|
+ UCONTEXT_REG_RAX (ctx) = mctx->rax;
|
|
+ UCONTEXT_REG_RBX (ctx) = mctx->rbx;
|
|
+ UCONTEXT_REG_RCX (ctx) = mctx->rcx;
|
|
+ UCONTEXT_REG_RDX (ctx) = mctx->rdx;
|
|
+ UCONTEXT_REG_RBP (ctx) = mctx->rbp;
|
|
+ UCONTEXT_REG_RSP (ctx) = mctx->rsp;
|
|
+ UCONTEXT_REG_RSI (ctx) = mctx->rsi;
|
|
+ UCONTEXT_REG_RDI (ctx) = mctx->rdi;
|
|
+ UCONTEXT_REG_RIP (ctx) = mctx->rip;
|
|
+ UCONTEXT_REG_R12 (ctx) = mctx->r12;
|
|
+ UCONTEXT_REG_R13 (ctx) = mctx->r13;
|
|
+ UCONTEXT_REG_R14 (ctx) = mctx->r14;
|
|
+ UCONTEXT_REG_R15 (ctx) = mctx->r15;
|
|
#else
|
|
MonoContext *ctx = (MonoContext *)sigctx;
|
|
|
|
@@ -801,14 +833,16 @@ mono_arch_monoctx_to_sigctx (MonoContext *mctx, void *
|
|
gpointer
|
|
mono_arch_ip_from_context (void *sigctx)
|
|
{
|
|
-
|
|
-#ifdef MONO_ARCH_USE_SIGACTION
|
|
-
|
|
+#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)
|
|
+ ucontext_t *ctx = (ucontext_t*)sigctx;
|
|
+
|
|
+ return (gpointer)UCONTEXT_REG_RIP (ctx);
|
|
#else
|
|
MonoContext *ctx = sigctx;
|
|
return (gpointer)ctx->rip;
|
|
@@ -865,7 +899,7 @@ altstack_handle_and_restore (void *sigctx, gpointer ob
|
|
void
|
|
mono_arch_handle_altstack_exception (void *sigctx, gpointer fault_addr, gboolean stack_ovf)
|
|
{
|
|
-#ifdef MONO_ARCH_USE_SIGACTION
|
|
+#if defined(MONO_ARCH_USE_SIGACTION) && defined(UCONTEXT_GREGS)
|
|
MonoException *exc = NULL;
|
|
ucontext_t *ctx = (ucontext_t*)sigctx;
|
|
guint64 *gregs = gregs_from_ucontext (ctx);
|