Merged trunk and subtype.

[cacao.git] / src / vm / jit / alpha / patcher.c

diff --git a/src/vm/jit/alpha/patcher.c b/src/vm/jit/alpha/patcher.c
index 219e60771e34114937adb43c3ebd7574940a6062..1f3a9342273fdcdd32c6632f1652a3a7f9ffc6c3 100644 (file)
--- a/src/vm/jit/alpha/patcher.c
+++ b/src/vm/jit/alpha/patcher.c
@@ -35,20 +35,18 @@
 
 #include "native/native.h"
 
-#include "vm/builtin.h"
-#include "vm/exceptions.h"
+#include "vm/jit/builtin.hpp"
+#include "vm/class.h"
+#include "vm/field.hpp"
 #include "vm/initialize.h"
+#include "vm/options.h"
+#include "vm/references.h"
+#include "vm/resolve.h"
 
 #include "vm/jit/asmpart.h"
-#include "vm/jit/patcher-common.h"
+#include "vm/jit/patcher-common.hpp"
 #include "vm/jit/methodheader.h"
 
-#include "vmcore/class.h"
-#include "vmcore/field.h"
-#include "vmcore/options.h"
-#include "vmcore/references.h"
-#include "vm/resolve.h"
-
 
 #define PATCH_BACK_ORIGINAL_MCODE \
        *((u4 *) pr->mpc) = (u4) pr->mcode; \
@@ -255,11 +253,6 @@ bool patcher_get_putfield(patchref_t *pr)
 
        PATCH_BACK_ORIGINAL_MCODE;
 
-       /* if we show disassembly, we have to skip the nop */
-
-       if (opt_shownops)
-               ra = ra + 4;
-
        /* patch the field's offset into the instruction */
 
        *((u4 *) ra) |= (s2) (fi->offset & 0x0000ffff);
@@ -335,11 +328,6 @@ bool patcher_invokevirtual(patchref_t *pr)
 
        PATCH_BACK_ORIGINAL_MCODE;
 
-       /* if we show disassembly, we have to skip the nop */
-
-       if (opt_shownops)
-               ra = ra + 4;
-
        /* patch vftbl index */
 
        *((s4 *) (ra + 4)) |= (s4) ((OFFSET(vftbl_t, table[0]) +
@@ -381,11 +369,6 @@ bool patcher_invokeinterface(patchref_t *pr)
 
        PATCH_BACK_ORIGINAL_MCODE;
 
-       /* if we show disassembly, we have to skip the nop */
-
-       if (opt_shownops)
-               ra = ra + 4;
-
        /* patch interfacetable index */
 
        *((s4 *) (ra + 4)) |= (s4) ((OFFSET(vftbl_t, interfacetable[0]) -
@@ -433,11 +416,6 @@ bool patcher_checkcast_interface(patchref_t *pr)
 
        PATCH_BACK_ORIGINAL_MCODE;
 
-       /* if we show disassembly, we have to skip the nop */
-
-       if (opt_shownops)
-               ra = ra + 4;
-
        /* patch super class index */
 
        *((s4 *) (ra + 2 * 4)) |= (s4) (-(c->index) & 0x0000ffff);
@@ -482,11 +460,6 @@ bool patcher_instanceof_interface(patchref_t *pr)
 
        PATCH_BACK_ORIGINAL_MCODE;
 
-       /* if we show disassembly, we have to skip the nop */
-
-       if (opt_shownops)
-               ra = ra + 4;
-
        /* patch super class index */
 
        *((s4 *) (ra + 2 * 4)) |= (s4) (-(c->index) & 0x0000ffff);