#include "vm/jit/mips/md-abi.h"
#include "mm/gc.hpp"
-#include "mm/memory.h"
+#include "mm/memory.hpp"
-#include "vm/signallocal.h"
+#include "vm/signallocal.hpp"
#include "vm/os.hpp"
#include "vm/jit/asmpart.h"
#include "vm/jit/executionstate.h"
-#include "vm/jit/trap.h"
+#include "vm/jit/trap.hpp"
/* md_init *********************************************************************
intptr_t val;
intptr_t addr;
int type;
- void *p;
_uc = (struct ucontext *) _p;
_mc = &_uc->uc_mcontext;
/* Handle the trap. */
- p = trap_handle(type, val, pv, sp, ra, xpc, _p);
-
- /* Set registers. */
-
- switch (type) {
- case TRAP_COMPILER:
- if (p != NULL) {
- _gregs[REG_PV] = (uintptr_t) p;
-#if defined(__UCLIBC__)
- _gregs[CTX_EPC] = (uintptr_t) p;
-#else
- _mc->pc = (uintptr_t) p;
-#endif
- break;
- }
-
- /* Get and set the PV from the parent Java method. */
-
- pv = md_codegen_get_pv_from_pc(ra);
-
- _gregs[REG_PV] = (uintptr_t) pv;
-
- /* Get the exception object. */
-
- p = builtin_retrieve_exception();
-
- assert(p != NULL);
-
- /* fall-through */
-
- 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
- }
+ trap_handle(type, val, pv, sp, ra, xpc, _p);
}
// 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 {
+ // Set registers
+ if (p == NULL) {
// We set the PC again because the cause may have changed the
// XPC.
#if defined(__UCLIBC__)