Author: zoltan
Date: 2006-09-11 14:58:45 -0400 (Mon, 11 Sep 2006)
New Revision: 65250

Modified:
   trunk/mono/mono/mini/ChangeLog
   trunk/mono/mono/mini/exceptions-amd64.c
   trunk/mono/mono/mini/mini-amd64.c
   trunk/mono/mono/mini/mini-amd64.h
Log:
2006-09-11  Zoltan Varga  <[EMAIL PROTECTED]>

        * mini-amd64.h mini-amd64.c exceptions-amd64.c: Move all dependencies 
on the
        layout of ucontext_t to helper functions in exceptions-amd64.c, as on 
x86. Add
        some changes from the freebsd ports tree.


Modified: trunk/mono/mono/mini/ChangeLog
===================================================================
--- trunk/mono/mono/mini/ChangeLog      2006-09-11 18:34:57 UTC (rev 65249)
+++ trunk/mono/mono/mini/ChangeLog      2006-09-11 18:58:45 UTC (rev 65250)
@@ -1,5 +1,9 @@
 2006-09-11  Zoltan Varga  <[EMAIL PROTECTED]>
 
+       * mini-amd64.h mini-amd64.c exceptions-amd64.c: Move all dependencies 
on the
+       layout of ucontext_t to helper functions in exceptions-amd64.c, as on 
x86. Add
+       some changes from the freebsd ports tree.
+
        * mini-amd64.h exceptions-amd64.c: Fix the amd64 build. Get rid of the 
SC_
        constants.
        

Modified: trunk/mono/mono/mini/exceptions-amd64.c
===================================================================
--- trunk/mono/mono/mini/exceptions-amd64.c     2006-09-11 18:34:57 UTC (rev 
65249)
+++ trunk/mono/mono/mini/exceptions-amd64.c     2006-09-11 18:58:45 UTC (rev 
65250)
@@ -619,42 +619,57 @@
 gboolean
 mono_arch_handle_exception (void *sigctx, gpointer obj, gboolean test_only)
 {
-       ucontext_t *ctx = (ucontext_t*)sigctx;
        MonoContext mctx;
 
-       mctx.rax = ctx->uc_mcontext.gregs [REG_RAX];
-       mctx.rbx = ctx->uc_mcontext.gregs [REG_RBX];
-       mctx.rcx = ctx->uc_mcontext.gregs [REG_RCX];
-       mctx.rdx = ctx->uc_mcontext.gregs [REG_RDX];
-       mctx.rbp = ctx->uc_mcontext.gregs [REG_RBP];
-       mctx.rsp = ctx->uc_mcontext.gregs [REG_RSP];
-       mctx.rsi = ctx->uc_mcontext.gregs [REG_RSI];
-       mctx.rdi = ctx->uc_mcontext.gregs [REG_RDI];
-       mctx.rip = ctx->uc_mcontext.gregs [REG_RIP];
-       mctx.r12 = ctx->uc_mcontext.gregs [REG_R12];
-       mctx.r13 = ctx->uc_mcontext.gregs [REG_R13];
-       mctx.r14 = ctx->uc_mcontext.gregs [REG_R14];
-       mctx.r15 = ctx->uc_mcontext.gregs [REG_R15];
+       mono_arch_sigctx_to_monoctx (sigctx, &mctx);
 
-       mono_handle_exception (&mctx, obj, (gpointer)mctx.rip, test_only);
+       mono_handle_exception (&mctx, obj, MONO_CONTEXT_GET_IP (&mctx), 
test_only);
 
-       ctx->uc_mcontext.gregs [REG_RAX] = mctx.rax;
-       ctx->uc_mcontext.gregs [REG_RBX] = mctx.rbx;
-       ctx->uc_mcontext.gregs [REG_RCX] = mctx.rcx;
-       ctx->uc_mcontext.gregs [REG_RDX] = mctx.rdx;
-       ctx->uc_mcontext.gregs [REG_RBP] = mctx.rbp;
-       ctx->uc_mcontext.gregs [REG_RSP] = mctx.rsp;
-       ctx->uc_mcontext.gregs [REG_RSI] = mctx.rsi;
-       ctx->uc_mcontext.gregs [REG_RDI] = mctx.rdi;
-       ctx->uc_mcontext.gregs [REG_RIP] = mctx.rip;
-       ctx->uc_mcontext.gregs [REG_R12] = mctx.r12;
-       ctx->uc_mcontext.gregs [REG_R13] = mctx.r13;
-       ctx->uc_mcontext.gregs [REG_R14] = mctx.r14;
-       ctx->uc_mcontext.gregs [REG_R15] = mctx.r15;
+       mono_arch_monoctx_to_sigctx (&mctx, sigctx);
 
        return TRUE;
 }
 
+void
+mono_arch_sigctx_to_monoctx (void *sigctx, MonoContext *mctx)
+{
+       ucontext_t *ctx = (ucontext_t*)sigctx;
+
+       mctx->rax = ctx->uc_mcontext.gregs [REG_RAX];
+       mctx->rbx = ctx->uc_mcontext.gregs [REG_RBX];
+       mctx->rcx = ctx->uc_mcontext.gregs [REG_RCX];
+       mctx->rdx = ctx->uc_mcontext.gregs [REG_RDX];
+       mctx->rbp = ctx->uc_mcontext.gregs [REG_RBP];
+       mctx->rsp = ctx->uc_mcontext.gregs [REG_RSP];
+       mctx->rsi = ctx->uc_mcontext.gregs [REG_RSI];
+       mctx->rdi = ctx->uc_mcontext.gregs [REG_RDI];
+       mctx->rip = ctx->uc_mcontext.gregs [REG_RIP];
+       mctx->r12 = ctx->uc_mcontext.gregs [REG_R12];
+       mctx->r13 = ctx->uc_mcontext.gregs [REG_R13];
+       mctx->r14 = ctx->uc_mcontext.gregs [REG_R14];
+       mctx->r15 = ctx->uc_mcontext.gregs [REG_R15];
+}
+
+void
+mono_arch_monoctx_to_sigctx (MonoContext *mctx, void *sigctx)
+{
+       ucontext_t *ctx = (ucontext_t*)sigctx;
+
+       ctx->uc_mcontext.gregs [REG_RAX] = mctx->rax;
+       ctx->uc_mcontext.gregs [REG_RBX] = mctx->rbx;
+       ctx->uc_mcontext.gregs [REG_RCX] = mctx->rcx;
+       ctx->uc_mcontext.gregs [REG_RDX] = mctx->rdx;
+       ctx->uc_mcontext.gregs [REG_RBP] = mctx->rbp;
+       ctx->uc_mcontext.gregs [REG_RSP] = mctx->rsp;
+       ctx->uc_mcontext.gregs [REG_RSI] = mctx->rsi;
+       ctx->uc_mcontext.gregs [REG_RDI] = mctx->rdi;
+       ctx->uc_mcontext.gregs [REG_RIP] = mctx->rip;
+       ctx->uc_mcontext.gregs [REG_R12] = mctx->r12;
+       ctx->uc_mcontext.gregs [REG_R13] = mctx->r13;
+       ctx->uc_mcontext.gregs [REG_R14] = mctx->r14;
+       ctx->uc_mcontext.gregs [REG_R15] = mctx->r15;
+}
+
 gpointer
 mono_arch_ip_from_context (void *sigctx)
 {

Modified: trunk/mono/mono/mini/mini-amd64.c
===================================================================
--- trunk/mono/mono/mini/mini-amd64.c   2006-09-11 18:34:57 UTC (rev 65249)
+++ trunk/mono/mono/mini/mini-amd64.c   2006-09-11 18:58:45 UTC (rev 65250)
@@ -4792,12 +4792,6 @@
 
 #define IS_REX(inst) (((inst) >= 0x40) && ((inst) <= 0x4f))
 
-static int reg_to_ucontext_reg [] = {
-       REG_RAX, REG_RCX, REG_RDX, REG_RBX, REG_RSP, REG_RBP, REG_RSI, REG_RDI,
-       REG_R8, REG_R9, REG_R10, REG_R11, REG_R12, REG_R13, REG_R14, REG_R15,
-       REG_RIP
-};
-
 /*
  * Determine whenever the trap whose info is in SIGINFO is caused by
  * integer overflow.
@@ -4805,12 +4799,15 @@
 gboolean
 mono_arch_is_int_overflow (void *sigctx, void *info)
 {
-       ucontext_t *ctx = (ucontext_t*)sigctx;
+       MonoContext ctx;
        guint8* rip;
        int reg;
+       gint64 value;
 
-       rip = (guint8*)ctx->uc_mcontext.gregs [REG_RIP];
+       mono_arch_sigctx_to_monoctx (sigctx, &ctx);
 
+       rip = (guint8*)ctx.rip;
+
        if (IS_REX (rip [0])) {
                reg = amd64_rex_b (rip [0]);
                rip ++;
@@ -4822,7 +4819,49 @@
                /* idiv REG */
                reg += x86_modrm_rm (rip [1]);
 
-               if (ctx->uc_mcontext.gregs [reg_to_ucontext_reg [reg]] == -1)
+               switch (reg) {
+               case AMD64_RAX:
+                       value = ctx.rax;
+                       break;
+               case AMD64_RBX:
+                       value = ctx.rbx;
+                       break;
+               case AMD64_RCX:
+                       value = ctx.rcx;
+                       break;
+               case AMD64_RDX:
+                       value = ctx.rdx;
+                       break;
+               case AMD64_RBP:
+                       value = ctx.rbp;
+                       break;
+               case AMD64_RSP:
+                       value = ctx.rsp;
+                       break;
+               case AMD64_RSI:
+                       value = ctx.rsi;
+                       break;
+               case AMD64_RDI:
+                       value = ctx.rdi;
+                       break;
+               case AMD64_R12:
+                       value = ctx.r12;
+                       break;
+               case AMD64_R13:
+                       value = ctx.r13;
+                       break;
+               case AMD64_R14:
+                       value = ctx.r14;
+                       break;
+               case AMD64_R15:
+                       value = ctx.r15;
+                       break;
+               default:
+                       g_assert_not_reached ();
+                       reg = -1;
+               }                       
+
+               if (value == -1)
                        return TRUE;
        }
 

Modified: trunk/mono/mono/mini/mini-amd64.h
===================================================================
--- trunk/mono/mono/mini/mini-amd64.h   2006-09-11 18:34:57 UTC (rev 65249)
+++ trunk/mono/mono/mini/mini-amd64.h   2006-09-11 18:58:45 UTC (rev 65250)
@@ -201,6 +201,28 @@
 
 #endif /* PLATFORM_WIN32 */
 
+#ifdef __FreeBSD__
+
+#define REG_RAX 7
+#define REG_RCX 4
+#define REG_RDX 3
+#define REG_RBX 8
+#define REG_RSP 23
+#define REG_RBP 9
+#define REG_RSI 2
+#define REG_RDI 1
+#define REG_R8  5
+#define REG_R9  6
+#define REG_R10 10
+#define REG_R11 11
+#define REG_R12 12
+#define REG_R13 13
+#define REG_R14 14
+#define REG_R15 15
+#define REG_RIP 20
+
+#endif /* __FreeBSD__ */
+
 #define MONO_ARCH_NO_EMULATE_LONG_SHIFT_OPS
 #define MONO_ARCH_NO_EMULATE_LONG_MUL_OPTS
 

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to