* Merged in twisti-branch.

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

diff --git a/src/vm/jit/sparc64/patcher.c b/src/vm/jit/sparc64/patcher.c
index 9f76e1ffeab6d065d71f98629b7414643390df66..e9467d192a458a845388223da9c84351e8ff2c54 100644 (file)
--- a/src/vm/jit/sparc64/patcher.c
+++ b/src/vm/jit/sparc64/patcher.c
@@ -614,12 +614,6 @@ bool patcher_checkcast_interface(u1 *sp)
 
        /* if we show disassembly, we have to skip the nop's */
 
-       if (opt_shownops)
-               ra = ra + PATCHER_CALL_SIZE;
-
-
-       /* if we show disassembly, we have to skip the nop's */
-
        if (opt_shownops)
                ra = ra + PATCHER_CALL_SIZE;
 
@@ -627,15 +621,16 @@ bool patcher_checkcast_interface(u1 *sp)
 
        *((s4 *) (ra + 2 * 4)) |= (s4) (-(c->index) & 0x00001fff);
 
-       *((s4 *) (ra + 5 * 4)) |= (s4) ((OFFSET(vftbl_t, interfacetable[0]) -
-                                                                        c->index * sizeof(methodptr*)) & 0x00001fff);
+       *((s4 *) (ra + (3 + EXCEPTION_CHECK_INSTRUCTIONS) * 4)) |= 
+               (s4) ((OFFSET(vftbl_t, interfacetable[0])
+               - c->index * sizeof(methodptr*)) & 0x00001fff);
 
        /* synchronize instruction cache */
 
        if (opt_shownops)
-               md_icacheflush(ra - 2 * 4, 8 * 4);
+               md_icacheflush(ra - 2 * 4, (6 + EXCEPTION_CHECK_INSTRUCTIONS) * 4);
        else
-               md_icacheflush(ra, 6 * 4);
+               md_icacheflush(ra, (4 + EXCEPTION_CHECK_INSTRUCTIONS) * 4);
 
        return true;
 }
@@ -660,8 +655,6 @@ bool patcher_instanceof_interface(u1 *sp)
        constant_classref *cr;
        classinfo         *c;
 
-       assert(0); /* test this one !!! */
-
        /* get stuff from the stack */
 
        ra = (u1 *)                *((ptrint *) (sp + 5 * 8));