refactor stuff

[mate.git] / ffi / trap.c

diff --git a/ffi/trap.c b/ffi/trap.c
index 14a8034d10324d0ca38279629b8f5e302ce88f3f..1058004a1046afe6432f82fbceb9ab3b4194066a 100644 (file)
--- a/ffi/trap.c
+++ b/ffi/trap.c
@@ -1,6 +1,11 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+#include "../debug.h"
+
+/* TODO(bernhard): use {u,}int* types */
+
+#define __USE_GNU
 // Note by hs: my signal.h includes sys/uconctext which conflicts with
 // asm/ucontext - this hack kinda solves the problem for me ;-) 
 // so feel free to blame me for that s**t
@@ -14,66 +19,42 @@
 #define __USE_XOPEN2K8
 #endif
 
-#include <asm/ucontext.h>
-
-unsigned int getMethodEntry(unsigned int, void *, void *);
+#include <sys/ucontext.h>
 
-#define NEW_MAP(prefix) \
-       void* prefix ## _map = NULL; \
-       void set_ ## prefix ## map(void *map) \
-       { \
-               printf("set_%s: 0x%08x\n", #prefix , (unsigned int) map); \
-               prefix ## _map = map; \
-       } \
-       void *get_ ## prefix ## map() \
-       { \
-               printf("get_%s: 0x%08x\n", #prefix , (unsigned int) prefix ## _map); \
-               return prefix ## _map; \
-       }
+unsigned int mateHandler(unsigned int, unsigned int, unsigned int, unsigned int);
 
-NEW_MAP(method)
-NEW_MAP(trap)
-NEW_MAP(class)
-
-
-void mainresult(unsigned int a)
-{
-       printf("mainresult: 0x%08x\n", a);
-}
+#ifdef DBG_TRAP
+#define dprintf(args...) do { printf (args); } while (0);
+#else
+#define dprintf(args...)
+#endif
 
-void callertrap(int nSignal, siginfo_t *info, void *ctx)
+void chandler(int nSignal, siginfo_t *info, void *ctx)
 {
-       struct ucontext *uctx = (struct ucontext *) ctx;
-       unsigned int from = (unsigned int) uctx->uc_mcontext.eip - 2;
-       unsigned int patchme = getMethodEntry(from, method_map, trap_map);
+       mcontext_t *mctx = &((ucontext_t *) ctx)->uc_mcontext;
 
-       printf("callertrap(mctx)  by 0x%08x\n", from);
+       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];
+       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, *(unsigned int*) esp);
 
-       unsigned int *to_patch = (unsigned int *) (from + 1);
-       unsigned char *insn = (unsigned char *) from;
-       *insn = 0xe8; // call opcode
-       printf(" to_patch: 0x%08x\n", (unsigned int) to_patch);
-       printf("*to_patch: 0x%08x\n", *to_patch);
-       if (*to_patch != 0x90ffff90) {
-               printf("something is wrong here. abort\n");
-               exit(0);
-       }
-       *to_patch = patchme - (from + 5);
-       printf("*to_patch: 0x%08x\n", *to_patch);
-       uctx->uc_mcontext.eip = (unsigned long) insn;
-       // while (1) ;
+       mctx->gregs[REG_EIP] = mateHandler(eip, eax, ebx, esp);
 }
 
 void register_signal(void)
 {
+       struct sigaction illaction;
+       illaction.sa_sigaction = chandler;
+       sigemptyset(&illaction.sa_mask);
+       illaction.sa_flags = SA_SIGINFO | SA_RESTART | SA_NODEFER;
+       sigaction(SIGILL, &illaction, NULL);
+
        struct sigaction segvaction;
-       segvaction.sa_sigaction = callertrap;
+       segvaction.sa_sigaction = chandler;
        sigemptyset(&segvaction.sa_mask);
-       segvaction.sa_flags = SA_SIGINFO | SA_RESTART;
-       sigaction(SIGILL, &segvaction, NULL);
-}
-
-unsigned int getaddr(void)
-{
-       return (unsigned int) mainresult;
+       segvaction.sa_flags = SA_SIGINFO | SA_RESTART | SA_NODEFER;
+       sigaction(SIGSEGV, &segvaction, NULL);
 }