athrow: add trapskeleton for it

[mate.git] / ffi / trap.c

diff --git a/ffi/trap.c b/ffi/trap.c
index 301f2060ce47f5252bb4d2dfd73112efa069d9a7..f6281d013ad770c7a23aebdebcaa284049dbca98 100644 (file)
--- a/ffi/trap.c
+++ b/ffi/trap.c
@@ -2,8 +2,6 @@
 #include <stdlib.h>
 #include <stddef.h>
 
-#include "../debug.h"
-
 /* TODO(bernhard): use {u,}int* types */
 
 #define __USE_GNU
@@ -22,7 +20,7 @@
 
 #include <sys/ucontext.h>
 
-ptrdiff_t mateHandler(ptrdiff_t, ptrdiff_t, ptrdiff_t, ptrdiff_t);
+ptrdiff_t mateHandler(ptrdiff_t, ptrdiff_t, ptrdiff_t, ptrdiff_t, ptrdiff_t);
 
 #ifdef DBG_TRAP
 #define dprintf(args...) do { printf (args); } while (0);
@@ -33,16 +31,29 @@ ptrdiff_t mateHandler(ptrdiff_t, ptrdiff_t, ptrdiff_t, ptrdiff_t);
 void chandler(int nSignal, siginfo_t *info, void *ctx)
 {
        mcontext_t *mctx = &((ucontext_t *) ctx)->uc_mcontext;
+       greg_t *regs = mctx->gregs;
 
-       ptrdiff_t eip = (ptrdiff_t) mctx->gregs[REG_EIP];
-       ptrdiff_t eax = (ptrdiff_t) mctx->gregs[REG_EAX];
-       ptrdiff_t ebx = (ptrdiff_t) mctx->gregs[REG_EBX];
-       ptrdiff_t esp = (ptrdiff_t) mctx->gregs[REG_ESP];
-       dprintf("trap: type %d, eip 0x%08x, eax 0x%08x, ebx 0x%08x, "
-                       "esp 0x%08x, *esp 0x%08x\n", nSignal, eip,
-                       eax, ebx, esp, *(ptrdiff_t*) esp);
+       ptrdiff_t eip = (ptrdiff_t) regs[REG_EIP];
+       ptrdiff_t eax = (ptrdiff_t) regs[REG_EAX];
+       ptrdiff_t ebx = (ptrdiff_t) regs[REG_EBX];
+       ptrdiff_t esp = (ptrdiff_t) regs[REG_ESP];
+       ptrdiff_t esi = (ptrdiff_t) regs[REG_ESI];
+       ptrdiff_t ebp = (ptrdiff_t) regs[REG_EBP];
+       dprintf("trap: type %d, eip 0x%08x, eax 0x%08x, ebx 0x%08x, \n"
+                       "esp 0x%08x, *esp 0x%08x, *(ebp+8) 0x%08x\n", nSignal, eip,
+                       eax, ebx, esp, *(ptrdiff_t*) esp, *(ptrdiff_t *) (ebp + 8));
 
-       mctx->gregs[REG_EIP] = mateHandler(eip, eax, ebx, esp);
+       ptrdiff_t ret = mateHandler(eip, eax, ebx, esi, esp);
+       if (ret == -1) {
+               dprintf("regdump @ EIP: 0x%08x\n", regs[REG_EIP]);
+               dprintf("\tEAX: 0x%08lx EBX: 0x%08lx ECX: 0x%08lx EDX: 0x%08lx\n",
+                       regs[REG_EAX], regs[REG_EBX], regs[REG_ECX], regs[REG_EDX]);
+               dprintf("\tESI: 0x%08lx EDI: 0x%08lx EBP: 0x%08lx ESP: 0x%08lx\n",
+                       regs[REG_ESI], regs[REG_EDI], regs[REG_EBP], regs[REG_ESP]);
+               mctx->gregs[REG_EIP] = eip + 6;
+       } else {
+               mctx->gregs[REG_EIP] = ret;
+       }
 }
 
 void register_signal(void)