* Moved all files from vmcore/ to vm/.

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

diff --git a/src/vm/jit/mips/patcher.c b/src/vm/jit/mips/patcher.c
index 8ad124171a6d825d8339193cd0a9e40df5c5319b..2a0a9dd9adabfc755f81247768a2f58c8e910d73 100644 (file)
--- a/src/vm/jit/mips/patcher.c
+++ b/src/vm/jit/mips/patcher.c
@@ -1,9 +1,7 @@
 /* src/vm/jit/mips/patcher.c - MIPS 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 8268 2007-08-07 13:24:43Z twisti $
-
 */
 
 
@@ -35,86 +31,41 @@
 #include "vm/types.h"
 
 #include "vm/jit/mips/codegen.h"
+#include "vm/jit/mips/md.h"
 
 #include "mm/memory.h"
 
 #include "native/native.h"
 
 #include "vm/builtin.h"
-#include "vm/exceptions.h"
+#include "vm/class.h"
+#include "vm/field.h"
 #include "vm/initialize.h"
+#include "vm/options.h"
+#include "vm/references.h"
+#include "vm/resolve.h"
 
 #include "vm/jit/asmpart.h"
-#include "vm/jit/md.h"
 #include "vm/jit/patcher-common.h"
 
-#include "vmcore/class.h"
-#include "vmcore/field.h"
-#include "vmcore/options.h"
-#include "vm/resolve.h"
-#include "vmcore/references.h"
-
 
 #define PATCH_BACK_ORIGINAL_MCODE \
        *((u4 *) pr->mpc) = (u4) pr->mcode; \
        md_icacheflush((u1 *) pr->mpc, PATCHER_CALL_SIZE);
 
 
-/* patcher_initialize_class ****************************************************
+/* patcher_patch_code **********************************************************
 
-   Initalizes a given classinfo pointer.  This function does not patch
-   any data.
+   Just patches back the original machine code.
 
 *******************************************************************************/
 
-bool patcher_initialize_class(patchref_t *pr)
+void patcher_patch_code(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_resolve_class *****************************************************
-
-   Initalizes a given classinfo pointer.  This function does not patch
-   any data.
-
-*******************************************************************************/
-
-#ifdef ENABLE_VERIFIER
-bool patcher_resolve_class(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_get_putstatic *******************************************************
 
    Machine code:
@@ -143,8 +94,8 @@ 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;
@@ -356,44 +307,6 @@ bool patcher_resolve_classref_to_flags(patchref_t *pr)
 }
 
 
-/* patcher_resolve_native ******************************************************
-
-   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;
-
-       /* synchronize data cache */
-
-       md_dcacheflush(datap, SIZEOF_VOID_P);
-
-       return true;
-}
-#endif /* !defined(WITH_STATIC_CLASSPATH) */
-
-
 /* patcher_invokestatic_special ************************************************
 
    Machine code:
@@ -524,12 +437,12 @@ bool patcher_invokeinterface(patchref_t *pr)
 
        *((s4 *) (ra + 1 * 4)) |=
                (s4) ((OFFSET(vftbl_t, interfacetable[0]) -
-                          sizeof(methodptr*) * m->class->index) & 0x0000ffff);
+                          sizeof(methodptr*) * m->clazz->index) & 0x0000ffff);
 
        /* patch method offset */
 
        *((s4 *) (ra + 2 * 4)) |=
-               (s4) ((sizeof(methodptr) * (m - m->class->methods)) & 0x0000ffff);
+               (s4) ((sizeof(methodptr) * (m - m->clazz->methods)) & 0x0000ffff);
 
        /* synchronize instruction cache */