* src/vm/jit/alpha/linux/md-os.c (md_replace_executionstate_read):

[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 59a9527895ea46ba75156eb8044b31b4620a9fee..253465b71d9e6d22f99f17f97de0b75cde0d2e80 100644 (file)
--- a/src/vm/jit/alpha/patcher.c
+++ b/src/vm/jit/alpha/patcher.c
@@ -31,6 +31,8 @@
 
 #include "vm/types.h"
 
+#include "vm/jit/alpha/md.h"
+
 #include "mm/memory.h"
 
 #include "native/native.h"
@@ -41,7 +43,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"
 
@@ -57,59 +58,17 @@
     md_icacheflush(NULL, 0);
 
 
-/* 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_resolve_classref_to_classinfo ***************************************
 
@@ -232,38 +191,6 @@ bool patcher_resolve_classref_to_flags(patchref_t *pr)
 }
 
 
-/* patcher_resolve_native_function *********************************************
-
-   XXX
-
-*******************************************************************************/
-
-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;
-}
-
-
 /* patcher_get_putstatic *******************************************************
 
    Machine code: