* changed src/vm/jit/m68k/asmpart.S (asm_patcher_wrapper): Removed.

[cacao.git] / src / vm / jit / m68k / codegen.c

diff --git a/src/vm/jit/m68k/codegen.c b/src/vm/jit/m68k/codegen.c
index 51c60c2ca3267ad5d9ab48c19ee6414b7de776b9..02c79329c2baf28a20bef93f16da9ff015a0fb22 100644 (file)
--- a/src/vm/jit/m68k/codegen.c
+++ b/src/vm/jit/m68k/codegen.c
@@ -52,12 +52,12 @@
 
 #include "vm/jit/asmpart.h"
 #include "vm/jit/codegen-common.h"
+#include "vm/jit/patcher-common.h"
 #include "vm/jit/dseg.h"
 #include "vm/jit/emit-common.h"
 #include "vm/jit/jit.h"
 #include "vm/jit/abi.h"
 #include "vm/jit/parse.h"
-#include "vm/jit/patcher.h"
 #include "vm/jit/reg.h"
 #include "vm/jit/replace.h"
 #include "vm/jit/stacktrace.h"
@@ -78,7 +78,6 @@ bool codegen_emit(jitdata *jd)
        varinfo            *var;
        basicblock         *bptr;
        instruction        *iptr;
-       exception_entry    *ex;
        u2                  currentline;
        methodinfo         *lm;             /* local methodinfo for ICMD_INVOKE*  */
        unresolved_method  *um;
@@ -155,16 +154,6 @@ bool codegen_emit(jitdata *jd)
 
                dseg_addlinenumbertablesize(cd);
 
-               (void) dseg_add_unique_s4(cd, jd->exceptiontablelength); /* ExTableSize   */
-
-               /* create exception table */
-               for (ex = jd->exceptiontable; ex != NULL; ex = ex->down) {
-                       dseg_add_target(cd, ex->start);
-                       dseg_add_target(cd, ex->end);
-                       dseg_add_target(cd, ex->handler);
-                       (void) dseg_add_unique_address(cd, ex->catchtype.any);
-               }
-
 #if defined(ENABLE_PROFILING)
                assert(0);
 #endif
@@ -2383,7 +2372,7 @@ nowperformreturn:
        dseg_createlinenumbertable(cd);
 
        /* generate stubs */
-       emit_patcher_stubs(jd);
+       emit_patcher_traps(jd);
 
        return true;
 }
@@ -2606,7 +2595,7 @@ void codegen_emit_stub_native(jitdata *jd, methoddesc *nmd, functionptr f, int s
        M_JSR_IMM(0);
 
        /* generate patcher stub call code */
-       emit_patcher_stubs(jd);
+       emit_patcher_traps(jd);
 }