* src/vm/jit/mips/codegen.h (M_RESERVED): New macro.

* src/vm/jit/mips/emit.c (emit_trap): Use M_RESERVED.
* src/vm/jit/mips/linux/md-os.c (md_signal_handler_sigsegv): Removed
patcher code.
(md_signal_handler_sigill): New function.
* src/vm/jit/mips/md-trap.h: Use a large number for TRAP_PATCHER.
* src/vm/signal.c (signal_init) [__MIPS__]: Register
md_signal_handler_sigill.
* src/vm/signallocal.h (md_signal_handler_sigill) [__MIPS__]: Added
defined.

diff --git a/src/vm/jit/mips/codegen.h b/src/vm/jit/mips/codegen.h
index 188ad6eb779cbc60e39a8692ccfa42ec19783d4e..f1819f84887019bfde43a03560182b44a9a74603 100644 (file)
--- a/src/vm/jit/mips/codegen.h
+++ b/src/vm/jit/mips/codegen.h
@@ -167,6 +167,8 @@
 
 /* macros for all used commands (see a MIPS-manual for description) ***********/
 
+#define M_RESERVED              M_RTYPE(0x3b, 0, 0, 0, 0, 0)
+
 /* load/store macros use the form OPERATION(source/dest, base, offset)        */
 
 #define M_LDA(a,b,disp) \

diff --git a/src/vm/jit/mips/emit.c b/src/vm/jit/mips/emit.c
index d78218e7183a2763610ae0694270964cde36efb6..86fbb11c4bdefed381822b9f901d3c7ba3a485d2 100644 (file)
--- a/src/vm/jit/mips/emit.c
+++ b/src/vm/jit/mips/emit.c
@@ -615,14 +615,11 @@ void emit_trap_compiler(codegendata *cd)
 
 uint32_t emit_trap(codegendata *cd)
 {
-       uint32_t mcode;
+       // Get machine code which is patched back in later. The trap is 1
+       // instruction word long.
+       uint32_t mcode = *((uint32_t*) cd->mcodeptr);
 
-       /* Get machine code which is patched back in later. The
-          trap is 1 instruction word long. */
-
-       mcode = *((uint32_t *) cd->mcodeptr);
-
-       M_ALD_INTERN(REG_ZERO, REG_ZERO, TRAP_PATCHER);
+       M_RESERVED;
 
        return mcode;
 }

diff --git a/src/vm/jit/mips/linux/md-os.c b/src/vm/jit/mips/linux/md-os.c
index e94b20d76faa8d962f9b7d5b6f4f726d1e780d6b..f7b6601de5b8556c29b47905d88115ebc1df5156 100644 (file)
--- a/src/vm/jit/mips/linux/md-os.c
+++ b/src/vm/jit/mips/linux/md-os.c
@@ -215,28 +215,71 @@ void md_signal_handler_sigsegv(int sig, siginfo_t *siginfo, void *_p)
 
                /* fall-through */
 
-       case TRAP_PATCHER:
-               if (p == NULL) {
-                       /* We set the PC again because the cause may have changed
-                          the XPC. */
+       default:
+               _gregs[REG_ITMP1_XPTR] = (uintptr_t) p;
+               _gregs[REG_ITMP2_XPC]  = (uintptr_t) xpc;
+#if defined(__UCLIBC__)
+               _gregs[CTX_EPC]        = (uintptr_t) asm_handle_exception;
+#else
+               _mc->pc                = (uintptr_t) asm_handle_exception;
+#endif
+       }
+}
+
+
+/**
+ * Signal handler for patcher calls.
+ */
+void md_signal_handler_sigill(int sig, siginfo_t* siginfo, void* _p)
+{
+       ucontext_t* _uc = (struct ucontext *) _p;
+       mcontext_t* _mc = &_uc->uc_mcontext;
+       greg_t* _gregs;
 
 #if defined(__UCLIBC__)
-                       _gregs[CTX_EPC] = (uintptr_t) xpc;
+       _gregs = _mc->gpregs;
+#else  
+       _gregs = _mc->gregs;
+#endif
+
+       // In glibc's ucontext.h the registers are defined as long long
+       // int, even for MIPS32, so we cast them.  This is not the case
+       // for uClibc.
+       void* pv  = (void*) (uintptr_t) _gregs[REG_PV];
+       void* sp  = (void*) (uintptr_t) _gregs[REG_SP];
+       void* ra  = (void*) (uintptr_t) _gregs[REG_RA]; // The RA is correct for leaf methods.
+
+#if defined(__UCLIBC__)
+       void* xpc = (void*) (uintptr_t) _gregs[CTX_EPC];
 #else
-                       _mc->pc         = (uintptr_t) xpc;
+       void* xpc = (void*) (uintptr_t) _mc->pc;
 #endif
-                       break;
-               }
 
-               /* fall-through */
-               
-       default:
+       // This signal is always a patcher.
+       int      type = TRAP_PATCHER;
+       intptr_t val  = 0;
+
+       // Handle the trap.
+       void* p = trap_handle(type, val, pv, sp, ra, xpc, _p);
+
+       // Set registers if we have an exception, continue execution
+       // otherwise.
+       if (p != NULL) {
                _gregs[REG_ITMP1_XPTR] = (uintptr_t) p;
                _gregs[REG_ITMP2_XPC]  = (uintptr_t) xpc;
 #if defined(__UCLIBC__)
                _gregs[CTX_EPC]        = (uintptr_t) asm_handle_exception;
 #else
                _mc->pc                = (uintptr_t) asm_handle_exception;
+#endif
+       }
+       else {
+               // We set the PC again because the cause may have changed the
+               // XPC.
+#if defined(__UCLIBC__)
+               _gregs[CTX_EPC] = (uintptr_t) xpc;
+#else
+               _mc->pc         = (uintptr_t) xpc;
 #endif
        }
 }

diff --git a/src/vm/jit/mips/md-trap.h b/src/vm/jit/mips/md-trap.h
index dbbee3249abe6a67ee770a66b72ee0bea901ca65..9ea8bd5c6350190601980e3f65ead85962566e5a 100644 (file)
--- a/src/vm/jit/mips/md-trap.h
+++ b/src/vm/jit/mips/md-trap.h
@@ -53,13 +53,15 @@ enum {
 
        TRAP_ClassCastException             = 5,
        TRAP_CHECK_EXCEPTION                = 6,
-       TRAP_PATCHER                        = 7,
+       TRAP_COMPILER                       = 7,
 
        /* Don't use 8 (could be a normal load offset). */
 
-       TRAP_COMPILER                       = 9,
-       TRAP_COUNTDOWN                      = 10,
-       TRAP_END
+       TRAP_COUNTDOWN                      = 9,
+       TRAP_END,
+
+       // This is handled via SIGILL.
+       TRAP_PATCHER                        = 99 // A large number.
 };
 
 #endif /* _MD_TRAP_H */

diff --git a/src/vm/signal.c b/src/vm/signal.c
index f5bf57ab958388d4f720bde385bcefe6cd439aed..345db3dd2b2bc281c5efb9ef73c4dfe1f2407b82 100644 (file)
--- a/src/vm/signal.c
+++ b/src/vm/signal.c
@@ -139,7 +139,7 @@ bool signal_init(void)
                                                           SA_NODEFER | SA_SIGINFO);
 #  endif
 
-#  if defined(__ALPHA__) || defined(__ARM__) || defined(__I386__) || defined(__POWERPC__) || defined(__POWERPC64__) || defined(__S390__) || defined(__X86_64__) || defined(__M68K__)
+#  if defined(__ALPHA__) || defined(__ARM__) || defined(__I386__) || defined(__MIPS__) || defined(__POWERPC__) || defined(__POWERPC64__) || defined(__S390__) || defined(__X86_64__) || defined(__M68K__)
                /* XXX use better defines for that (in arch.h) */
                /* SIGILL handler */
 

diff --git a/src/vm/signallocal.h b/src/vm/signallocal.h
index 6727fd97a8e4ab27aa77185a208bbc1ff7f3db8f..469d949a47a05ec7a0904247dbc18bccf271e26e 100644 (file)
--- a/src/vm/signallocal.h
+++ b/src/vm/signallocal.h
@@ -64,7 +64,7 @@ void md_signal_handler_sigsegv(int sig, siginfo_t *siginfo, void *_p);
 void md_signal_handler_sigfpe(int sig, siginfo_t *siginfo, void *_p);
 #endif
 
-#if defined(__ALPHA__) || defined(__ARM__) || defined(__I386__) || defined(__POWERPC__) || defined(__POWERPC64__) || defined(__S390__) || defined(__X86_64__) || defined(__M68K__)
+#if defined(__ALPHA__) || defined(__ARM__) || defined(__I386__) || defined(__MIPS__) || defined(__POWERPC__) || defined(__POWERPC64__) || defined(__S390__) || defined(__X86_64__) || defined(__M68K__)
 /* XXX use better defines for that (in arch.h) */
 void md_signal_handler_sigill(int sig, siginfo_t *siginfo, void *_p);
 #endif