invokevirtual: implement lazy class loading right

[mate.git] / ffi / trap.c

diff --git a/ffi/trap.c b/ffi/trap.c
index 75d4c1729081a95d8ce857084d153b9eae472763..4e526f23275d8967c9d05ed03899a7c29181aee1 100644 (file)
--- a/ffi/trap.c
+++ b/ffi/trap.c
@@ -22,7 +22,7 @@
 
 #include <sys/ucontext.h>
 
-ptrdiff_t mateHandler(ptrdiff_t, ptrdiff_t, ptrdiff_t, ptrdiff_t, ptrdiff_t);
+ptrdiff_t mateHandler(ptrdiff_t, ptrdiff_t, ptrdiff_t, ptrdiff_t);
 
 #ifdef DBG_TRAP
 #define dprintf(args...) do { printf (args); } while (0);
@@ -40,11 +40,12 @@ void chandler(int nSignal, siginfo_t *info, void *ctx)
        ptrdiff_t ebx = (ptrdiff_t) regs[REG_EBX];
        ptrdiff_t esp = (ptrdiff_t) regs[REG_ESP];
        ptrdiff_t esi = (ptrdiff_t) regs[REG_ESI];
-       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 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));
 
-       ptrdiff_t ret = mateHandler(eip, eax, ebx, esp, esi);
+       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",