* src/vmcore/field.h (fieldinfo): Renamed class to clazz.

[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 bf35d8cb3ce00b760ee984620b5c522809fb9bd9..f990bbe99fdcac16251520844b4b0d69f25646fd 100644 (file)
--- a/src/vm/jit/alpha/patcher.c
+++ b/src/vm/jit/alpha/patcher.c
@@ -1,9 +1,7 @@
 /* src/vm/jit/alpha/patcher.c - Alpha code patching functions
 
-   Copyright (C) 1996-2005, 2006, 2007 R. Grafl, A. Krall, C. Kruegel,
-   C. Oates, R. Obermaisser, M. Platter, M. Probst, S. Ring,
-   E. Steiner, C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich,
-   J. Wenninger, Institut f. Computersprachen - TU Wien
+   Copyright (C) 1996-2005, 2006, 2007, 2008
+   CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO
 
    This file is part of CACAO.
 
@@ -22,8 +20,6 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id: patcher.c 8186 2007-07-05 23:48:16Z michi $
-
 */
 
 
@@ -33,6 +29,8 @@
 
 #include "vm/types.h"
 
+#include "vm/jit/alpha/md.h"
+
 #include "mm/memory.h"
 
 #include "native/native.h"
@@ -43,7 +41,6 @@
 
 #include "vm/jit/asmpart.h"
 #include "vm/jit/patcher-common.h"
-#include "vm/jit/md.h"
 #include "vm/jit/methodheader.h"
 #include "vm/jit/stacktrace.h"
 
@@ -59,58 +56,16 @@
     md_icacheflush(NULL, 0);
 
 
-/* patcher_initialize_class ****************************************************
-
-   Initalizes a given classinfo pointer.  This function does not patch
-   any data.
-
-*******************************************************************************/
-
-bool patcher_initialize_class(patchref_t *pr)
-{
-       classinfo *c;
-
-       /* get stuff from the stack */
-
-       c = (classinfo *) pr->ref;
-
-       /* check if the class is initialized */
-
-       if (!(c->state & CLASS_INITIALIZED))
-               if (!initialize_class(c))
-                       return false;
-
-       PATCH_BACK_ORIGINAL_MCODE;
-
-       return true;
-}
+/* patcher_patch_code **********************************************************
 
-/* patcher_resolve_class *****************************************************
-
-   Initalizes a given classinfo pointer.  This function does not patch
-   any data.
+   Just patches back the original machine code.
 
 *******************************************************************************/
 
-#ifdef ENABLE_VERIFIER
-bool patcher_resolve_class(patchref_t *pr)
+void patcher_patch_code(patchref_t *pr)
 {
-       unresolved_class *uc;
-
-       /* get stuff from the stack */
-
-       uc = (unresolved_class *) pr->ref;
-
-       /* resolve the class and check subtype constraints */
-
-       if (!resolve_class_eager_no_access_check(uc))
-               return false;
-
        PATCH_BACK_ORIGINAL_MCODE;
-
-       return true;
 }
-#endif /* ENABLE_VERIFIER */
 
 
 /* patcher_resolve_classref_to_classinfo ***************************************
@@ -234,40 +189,6 @@ bool patcher_resolve_classref_to_flags(patchref_t *pr)
 }
 
 
-/* patcher_resolve_native_function *********************************************
-
-   XXX
-
-*******************************************************************************/
-
-#if !defined(WITH_STATIC_CLASSPATH)
-bool patcher_resolve_native_function(patchref_t *pr)
-{
-       methodinfo  *m;
-       u1          *datap;
-       functionptr  f;
-
-       /* get stuff from the stack */
-
-       m     = (methodinfo *) pr->ref;
-       datap = (u1 *)         pr->datap;
-
-       /* resolve native function */
-
-       if (!(f = native_resolve_function(m)))
-               return false;
-
-       PATCH_BACK_ORIGINAL_MCODE;
-
-       /* patch native function pointer */
-
-       *((ptrint *) datap) = (ptrint) f;
-
-       return true;
-}
-#endif /* !defined(WITH_STATIC_CLASSPATH) */
-
-
 /* patcher_get_putstatic *******************************************************
 
    Machine code:
@@ -296,15 +217,15 @@ bool patcher_get_putstatic(patchref_t *pr)
 
        /* check if the field's class is initialized */
 
-       if (!(fi->class->state & CLASS_INITIALIZED))
-               if (!initialize_class(fi->class))
+       if (!(fi->clazz->state & CLASS_INITIALIZED))
+               if (!initialize_class(fi->clazz))
                        return false;
 
        PATCH_BACK_ORIGINAL_MCODE;
 
        /* patch the field value's address */
 
-       *((ptrint *) datap) = (ptrint) &(fi->value);
+       *((intptr_t *) datap) = (intptr_t) fi->value;
 
        return true;
 }
@@ -469,12 +390,12 @@ bool patcher_invokeinterface(patchref_t *pr)
        /* patch interfacetable index */
 
        *((s4 *) (ra + 4)) |= (s4) ((OFFSET(vftbl_t, interfacetable[0]) -
-                                                                sizeof(methodptr*) * m->class->index) & 0x0000ffff);
+                                                                sizeof(methodptr*) * m->clazz->index) & 0x0000ffff);
 
        /* patch method offset */
 
        *((s4 *) (ra + 4 + 4)) |=
-               (s4) ((sizeof(methodptr) * (m - m->class->methods)) & 0x0000ffff);
+               (s4) ((sizeof(methodptr) * (m - m->clazz->methods)) & 0x0000ffff);
 
        md_icacheflush(NULL, 0);