* 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 ecaad23fb784ff37b00ec63a57563eb6c2c75b69..e9467d192a458a845388223da9c84351e8ff2c54 100644 (file)
--- a/src/vm/jit/sparc64/patcher.c
+++ b/src/vm/jit/sparc64/patcher.c
@@ -22,10 +22,6 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   Contact: cacao@cacaojvm.org
-
-   Authors: Christian Thalinger
-            Alexander Jordan
    $Id: patcher.c 5164 2006-07-19 15:54:01Z twisti $
 
 */
@@ -37,22 +33,27 @@
 
 #include "vm/types.h"
 
+#include "mm/memory.h"
+
+#include "vm/jit/sparc64/md-abi.h"
 #include "vm/jit/sparc64/codegen.h"
 
-#include "mm/memory.h"
 #include "native/native.h"
 #include "vm/builtin.h"
-#include "vm/class.h"
 #include "vm/exceptions.h"
-#include "vm/field.h"
 #include "vm/initialize.h"
-#include "vm/options.h"
-#include "vm/resolve.h"
-#include "vm/references.h"
+
 #include "vm/jit/asmpart.h"
 #include "vm/jit/patcher.h"
-
-#include "vm/jit/sparc64/md-abi.h"
+#include "vm/jit/md.h"
+#include "vm/jit/methodheader.h"
+#include "vm/jit/stacktrace.h"
+
+#include "vmcore/class.h"
+#include "vmcore/field.h"
+#include "vmcore/options.h"
+#include "vmcore/references.h"
+#include "vm/resolve.h"
 
 
 /* patcher_wrapper *************************************************************
@@ -216,23 +217,11 @@ bool patcher_get_putstatic(u1 *sp)
 bool patcher_get_putfield(u1 *sp)
 {
        u1               *ra;
-#if SIZEOF_VOID_P == 8
-       u8                mcode;
-#else
-       u4                mcode[2];
-#endif
        unresolved_field *uf;
        fieldinfo        *fi;
 
-       assert(0);
 
        ra       = (u1 *)               *((ptrint *) (sp + 5 * 8));
-#if SIZEOF_VOID_P == 8
-       mcode    =                      *((u8 *)     (sp + 3 * 8));
-#else
-       mcode[0] =                      *((u4 *)     (sp + 3 * 8));
-       mcode[1] =                      *((u4 *)     (sp + 3 * 8 + 4));
-#endif
        uf       = (unresolved_field *) *((ptrint *) (sp + 2 * 8));
 
        /* get the fieldinfo */
@@ -240,50 +229,22 @@ bool patcher_get_putfield(u1 *sp)
        if (!(fi = resolve_field_eager(uf)))
                return false;
 
-       /* patch back original code */
-
-#if SIZEOF_VOID_P == 8
-       *((u4 *) (ra + 0 * 4)) = mcode;
-       *((u4 *) (ra + 1 * 4)) = mcode >> 32;
-#else
-       *((u4 *) (ra + 0 * 4)) = mcode[0];
-       *((u4 *) (ra + 1 * 4)) = mcode[1];
-#endif
-
        /* if we show disassembly, we have to skip the nop's */
 
        if (opt_shownops) {
-               ra = ra + PATCHER_CALL_SIZE;
+               /* patch the field's offset into the instruction */
 
-#if SIZEOF_VOID_P == 4
-       if (fi->type == TYPE_LNG) {
-# if WORDS_BIGENDIAN == 1
-               /* ATTENTION: order of these instructions depend on M_LLD_INTERN */
-               *((u4 *) (ra + 0 * 4)) |= (s2) ((fi->offset + 0) & 0x0000ffff);
-               *((u4 *) (ra + 1 * 4)) |= (s2) ((fi->offset + 4) & 0x0000ffff);
-# else
-               /* ATTENTION: order of these instructions depend on M_LLD_INTERN */
-               *((u4 *) (ra + 0 * 4)) |= (s2) ((fi->offset + 4) & 0x0000ffff);
-               *((u4 *) (ra + 1 * 4)) |= (s2) ((fi->offset + 0) & 0x0000ffff);
-# endif
-       } else
-#endif
-               *((u4 *) ra) |= (s2) (fi->offset & 0x0000ffff);
+               *((u4 *) (ra + 2 * 4)) |= (s2) (fi->offset & 0x00001fff);
 
-       /* synchronize instruction cache */
+               /* synchronize instruction cache */
 
-       if (opt_showdisassemble) {
-#if SIZEOF_VOID_P == 4
-               if (fi->type == TYPE_LNG)
-                       md_icacheflush(ra - 2 * 4, 4 * 4);
-               else
-#endif
-                       md_icacheflush(ra - 2 * 4, 3 * 4);
+               md_icacheflush(ra + 2 * 4, 1 * 4);
        }
        else {
-               md_icacheflush(ra, 2 * 4);
+               /* otherwise store the patched instruction on the stack */
+
+               *((u4 *) (sp + 3 * 8)) |= (s2) (fi->offset & 0x00001fff);
        }
-}
 
        return true;
 }
@@ -653,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;
 
@@ -666,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;
 }
@@ -699,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));
@@ -810,15 +764,14 @@ bool patcher_clinit(u1 *sp)
 bool patcher_athrow_areturn(u1 *sp)
 {
        unresolved_class *uc;
-       classinfo        *c;
 
        /* get stuff from the stack */
 
        uc       = (unresolved_class *) *((ptrint *) (sp + 2 * 8));
 
-       /* resolve the class */
+       /* resolve the class and check subtype constraints */
 
-       if (!resolve_class(uc, resolveEager, false, &c))
+       if (!resolve_class_eager_no_access_check(uc))
                return false;
 
        return true;