invokevirtual: implement lazy class loading right

[mate.git] / ffi / trap.c

diff --git a/ffi/trap.c b/ffi/trap.c
index e0878b2bb0a296989934bf48b9314c355fb0d0df..4e526f23275d8967c9d05ed03899a7c29181aee1 100644 (file)
--- a/ffi/trap.c
+++ b/ffi/trap.c
@@ -1,5 +1,6 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <stddef.h>
 
 #include "../debug.h"
 
@@ -21,8 +22,7 @@
 
 #include <sys/ucontext.h>
 
-unsigned int mallocObject(int);
-unsigned int mateHandler(unsigned int, unsigned int, unsigned int, unsigned int);
+ptrdiff_t mateHandler(ptrdiff_t, ptrdiff_t, ptrdiff_t, ptrdiff_t);
 
 #ifdef DBG_TRAP
 #define dprintf(args...) do { printf (args); } while (0);
@@ -30,21 +30,32 @@ unsigned int mateHandler(unsigned int, unsigned int, unsigned int, unsigned int)
 #define dprintf(args...)
 #endif
 
-void mainresult(unsigned int a)
-{
-       dprintf("mainresult: 0x%08x\n", a);
-}
-
 void chandler(int nSignal, siginfo_t *info, void *ctx)
 {
        mcontext_t *mctx = &((ucontext_t *) ctx)->uc_mcontext;
+       greg_t *regs = mctx->gregs;
 
-       unsigned int eip = (unsigned int) mctx->gregs[REG_EIP];
-       unsigned int eax = (unsigned int) mctx->gregs[REG_EAX];
-       unsigned int ebx = (unsigned int) mctx->gregs[REG_EBX];
-       unsigned int esp = (unsigned int) mctx->gregs[REG_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);
+       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)
@@ -61,13 +72,3 @@ void register_signal(void)
        segvaction.sa_flags = SA_SIGINFO | SA_RESTART | SA_NODEFER;
        sigaction(SIGSEGV, &segvaction, NULL);
 }
-
-unsigned int getaddr(void)
-{
-       return (unsigned int) mainresult;
-}
-
-unsigned int getMallocObjectAddr(void)
-{
-       return (unsigned int) mallocObject;
-}