Merged with new-trap-decoding branch at rev a792088a3f04 (branch closed).
[cacao.git] / src / vm / jit / powerpc64 / patcher.c
index e2af4dd3c1db20c0315fd23de51e4bf9354ffffd..f5875a04ebf91b4addcb754f0353a36635d5762c 100644 (file)
@@ -1,9 +1,8 @@
 /* src/vm/jit/powerpc64/patcher.c - PowerPC64 code patching functions
 
-   Copyright (C) 1996-2005, 2006 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
+   Copyright (C) 2008 Theobroma Systems Ltd.
 
    This file is part of CACAO.
 
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   Contact: cacao@cacaojvm.org
-
-   Authors: Christian Thalinger
-
-   Changes:
-
-   $Id: patcher.c 5261 2006-08-22 15:49:25Z tbfg $
-
 */
 
 
 #include "config.h"
 
 #include <assert.h>
+#include <stdint.h>
 
 #include "vm/types.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/jit/powerpc64/md.h"
+
+#include "mm/memory.hpp"
+
+#include "native/native.hpp"
+
+#include "vm/jit/builtin.hpp"
+#include "vm/class.hpp"
+#include "vm/field.hpp"
+#include "vm/initialize.hpp"
 #include "vm/options.h"
-#include "vm/resolve.h"
 #include "vm/references.h"
+#include "vm/resolve.hpp"
+
 #include "vm/jit/asmpart.h"
-#include "vm/jit/patcher.h"
 #include "vm/jit/methodheader.h"
+#include "vm/jit/patcher-common.hpp"
 
 
-/* patcher_wrapper *************************************************************
-
-   Wrapper for all patchers.  It also creates the stackframe info
-   structure.
+/* patcher_patch_code **********************************************************
 
-   If the return value of the patcher function is false, it gets the
-   exception object, clears the exception pointer and returns the
-   exception.
+   Just patches back the original machine code.
 
 *******************************************************************************/
 
-java_objectheader *patcher_wrapper(u1 *sp, u1 *pv, u1 *ra)
+void patcher_patch_code(patchref_t *pr)
 {
-       stackframeinfo     sfi;
-       u1                *xpc;
-       java_objectheader *o;
-       functionptr        f;
-       bool               result;
-       java_objectheader *e;
-
-       /* define the patcher function */
-
-       bool (*patcher_function)(u1 *);
-
-       assert(pv != NULL);
-
-       /* get stuff from the stack */
-
-       xpc = (u1 *)                *((ptrint *) (sp + 5 * 8));
-       o   = (java_objectheader *) *((ptrint *) (sp + 4 * 8));
-       f   = (functionptr)         *((ptrint *) (sp + 0 * 8));
-
-       /* store PV into the patcher function position */
-
-       *((ptrint *) (sp + 0 * 8)) = (ptrint) pv;
-
-       /* cast the passed function to a patcher function */
+       // Patch back original code.
+       *((uint32_t*) pr->mpc) = pr->mcode;
 
-       patcher_function = (bool (*)(u1 *)) (ptrint) f;
-
-       /* enter a monitor on the patching position */
-
-       PATCHER_MONITORENTER;
-
-       /* create the stackframeinfo */
-
-       stacktrace_create_extern_stackframeinfo(&sfi, pv, sp + 8 * 8, ra, xpc);
-
-       /* call the proper patcher function */
-
-       result = (patcher_function)(sp);
-
-       /* remove the stackframeinfo */
-
-       stacktrace_remove_stackframeinfo(&sfi);
-
-       /* check for return value and exit accordingly */
-
-       if (result == false) {
-               e = exceptions_get_and_clear_exception();
-
-               PATCHER_MONITOREXIT;
-
-               return e;
-       }
-
-       PATCHER_MARK_PATCHED_MONITOREXIT;
-
-       return NULL;
+       // Synchronize instruction cache.
+       md_icacheflush((void*) pr->mpc, 1 * 4);
 }
 
 
@@ -136,49 +76,30 @@ java_objectheader *patcher_wrapper(u1 *sp, u1 *pv, u1 *ra)
 
 *******************************************************************************/
 
-bool patcher_get_putstatic(u1 *sp)
+bool patcher_get_putstatic(patchref_t* pr)
 {
-       u1               *ra;
-       u4                mcode;
-       unresolved_field *uf;
-       s4                disp;
-       u1               *pv;
-       fieldinfo        *fi;
-
-       /* get stuff from the stack */
+       unresolved_field* uf    = (unresolved_field*) pr->ref;
+       uintptr_t*        datap = (uintptr_t*)        pr->datap;
 
-       ra    = (u1 *)                *((ptrint *) (sp + 5 * 8));
-       mcode =                       *((u4 *)     (sp + 3 * 8));
-       uf    = (unresolved_field *)  *((ptrint *) (sp + 2 * 8));
-       disp  =                       *((s4 *)     (sp + 1 * 8));
-       pv    = (u1 *)                *((ptrint *) (sp + 0 * 8));
+       // Resolve the field.
+       fieldinfo* fi = resolve_field_eager(uf);
 
-       /* get the fieldinfo */
-
-       if (!(fi = resolve_field_eager(uf)))
+       if (fi == NULL)
                return false;
 
-       /* check if the field's class is initialized */
-
-       if (!(fi->class->state & CLASS_INITIALIZED))
-               if (!initialize_class(fi->class))
+       // Check if the field's class is initialized.
+       if (!(fi->clazz->state & CLASS_INITIALIZED))
+               if (!initialize_class(fi->clazz))
                        return false;
 
-       /* patch back original code */
+       // Patch the field value's address.
+       *datap = (uintptr_t) fi->value;
 
-       *((u4 *) ra) = mcode;
+       // Synchronize data cache.
+       md_dcacheflush(datap, SIZEOF_VOID_P);
 
-       /* synchronize instruction cache */
-
-       md_icacheflush(ra, 4);
-
-       /* patch the field value's address */
-
-       *((ptrint *) (pv + disp)) = (ptrint) &(fi->value);
-
-       /* synchronize data cache */
-
-       md_dcacheflush(pv + disp, SIZEOF_VOID_P);
+       // Patch back the original code.
+       patcher_patch_code(pr);
 
        return true;
 }
@@ -193,228 +114,22 @@ bool patcher_get_putstatic(u1 *sp)
 
 *******************************************************************************/
 
-bool patcher_get_putfield(u1 *sp)
-{
-       u1               *ra;
-       u4                mcode;
-       unresolved_field *uf;
-       u1               *pv;
-       fieldinfo        *fi;
-
-       ra    = (u1 *)                *((ptrint *) (sp + 5 * 8));
-       mcode =                       *((u4 *)     (sp + 3 * 8));
-       uf    = (unresolved_field *)  *((ptrint *) (sp + 2 * 8));
-       pv    = (u1 *)                *((ptrint *) (sp + 1 * 8));
-
-       /* get the fieldinfo */
-
-       if (!(fi = resolve_field_eager(uf)))
-               return false;
-
-       /* patch back original code */
-
-       *((u4 *) ra) = mcode;
-
-       /* if we show disassembly, we have to skip the nop */
-
-       if (opt_showdisassemble)
-               ra = ra + 4;
-
-       /* patch the field's offset */
-
-       if (fi->type == TYPE_LNG) {
-               s2 disp;
-
-               /* If the field has type long, we have to patch two
-                  instructions.  But we have to check which instruction is
-                  first.  We do that with the offset of the first
-                  instruction. */
-
-               disp = *((u4 *) (ra + 0));
-
-#if WORDS_BIGENDIAN == 1
-               if (disp == 4) {
-                       *((u4 *) (ra + 0)) |= (s2) ((fi->offset + 4) & 0x0000ffff);
-                       *((u4 *) (ra + 4)) |= (s2) ((fi->offset + 0) & 0x0000ffff);
-
-               } else {
-                       *((u4 *) (ra + 0)) |= (s2) ((fi->offset + 0) & 0x0000ffff);
-                       *((u4 *) (ra + 4)) |= (s2) ((fi->offset + 4) & 0x0000ffff);
-               }
-#else
-#error Fix me for LE
-#endif
-       }
-       else {
-               *((u4 *) ra) |= (s2) (fi->offset & 0x0000ffff);
-       }
-
-       /* synchronize instruction cache */
-
-       md_icacheflush(ra, 8);
-
-       return true;
-}
-
-
-/* patcher_aconst **************************************************************
-
-   Machine code:
-
-   <patched call postition>
-   806dffc4    lwz   r3,-60(r13)
-   81adffc0    lwz   r13,-64(r13)
-   7da903a6    mtctr r13
-   4e800421    bctrl
-
-*******************************************************************************/
-
-bool patcher_aconst(u1 *sp)
-{
-       u1                *ra;
-       u4                 mcode;
-       constant_classref *cr;
-       s4                 disp;
-       u1                *pv;
-       classinfo         *c;
-
-       /* get stuff from the stack */
-
-       ra    = (u1 *)                *((ptrint *) (sp + 5 * 8));
-       mcode =                       *((u4 *)     (sp + 3 * 8));
-       cr    = (constant_classref *) *((ptrint *) (sp + 2 * 8));
-       disp  =                       *((s4 *)     (sp + 1 * 8));
-       pv    = (u1 *)                *((ptrint *) (sp + 0 * 8));
-
-       /* get the classinfo */
-
-       if (!(c = resolve_classref_eager(cr)))
-               return false;
-
-       /* patch back original code */
-
-       *((u4 *) ra) = mcode;
-
-       /* synchronize instruction cache */
-
-       md_icacheflush(ra, 4);
-
-       /* patch the classinfo pointer */
-
-       *((ptrint *) (pv + disp)) = (ptrint) c;
-
-       /* synchronize data cache */
-
-       md_dcacheflush(pv + disp, SIZEOF_VOID_P);
-
-       return true;
-}
-
-
-/* patcher_builtin_multianewarray **********************************************
-
-   Machine code:
-
-   <patched call position>
-   808dffc0    lwz   r4,-64(r13)
-   38a10038    addi  r5,r1,56
-   81adffbc    lwz   r13,-68(r13)
-   7da903a6    mtctr r13
-   4e800421    bctrl
-
-*******************************************************************************/
-
-bool patcher_builtin_multianewarray(u1 *sp)
+bool patcher_get_putfield(patchref_t* pr)
 {
-       u1                *ra;
-       u4                 mcode;
-       constant_classref *cr;
-       s4                 disp;
-       u1                *pv;
-       classinfo         *c;
-
-       /* get stuff from the stack */
-
-       ra    = (u1 *)                *((ptrint *) (sp + 5 * 8));
-       mcode =                       *((u4 *)     (sp + 3 * 8));
-       cr    = (constant_classref *) *((ptrint *) (sp + 2 * 8));
-       disp  =                       *((s4 *)     (sp + 1 * 8));
-       pv    = (u1 *)                *((ptrint *) (sp + 0 * 8));
+       unresolved_field* uf = (unresolved_field*) pr->ref;
 
-       /* get the classinfo */
+       // Resolve the field.
+       fieldinfo* fi = resolve_field_eager(uf);
 
-       if (!(c = resolve_classref_eager(cr)))
+       if (fi == NULL)
                return false;
 
-       /* patch back original code */
-
-       *((u4 *) ra) = mcode;
-
-       /* synchronize instruction cache */
-
-       md_icacheflush(ra, 4);
-
-       /* patch the classinfo pointer */
-
-       *((ptrint *) (pv + disp)) = (ptrint) c;
-
-       /* synchronize data cache */
+       // Patch the field offset in the patcher.  We also need this to
+       // validate patchers.
+       pr->mcode |= (int16_t) (fi->offset & 0x0000ffff);
 
-       md_dcacheflush(pv + disp, SIZEOF_VOID_P);
-
-       return true;
-}
-
-
-/* patcher_builtin_arraycheckcast **********************************************
-
-   Machine code:
-
-   <patched call position>
-   808dffd8    lwz   r4,-40(r13)
-   81adffd4    lwz   r13,-44(r13)
-   7da903a6    mtctr r13
-   4e800421    bctrl
-
-*******************************************************************************/
-
-bool patcher_builtin_arraycheckcast(u1 *sp)
-{
-       u1                *ra;
-       u4                 mcode;
-       constant_classref *cr;
-       s4                 disp;
-       u1                *pv;
-       classinfo         *c;
-
-       /* get stuff from the stack */
-
-       ra    = (u1 *)                *((ptrint *) (sp + 5 * 8));
-       mcode =                       *((u4 *)     (sp + 3 * 8));
-       cr    = (constant_classref *) *((ptrint *) (sp + 2 * 8));
-       disp  =                       *((s4 *)     (sp + 1 * 8));
-       pv    = (u1 *)                *((ptrint *) (sp + 0 * 8));
-
-       /* get the classinfo */
-
-       if (!(c = resolve_classref_eager(cr)))
-               return false;
-
-       /* patch back original code */
-
-       *((u4 *) ra) = mcode;
-
-       /* synchronize instruction cache */
-
-       md_icacheflush(ra, 4);
-
-       /* patch the classinfo pointer */
-
-       *((ptrint *) (pv + disp)) = (ptrint) c;
-
-       /* synchronize data cache */
-
-       md_dcacheflush(pv + disp, SIZEOF_VOID_P);
+       // Patch back the original code.
+       patcher_patch_code(pr);
 
        return true;
 }
@@ -431,43 +146,25 @@ bool patcher_builtin_arraycheckcast(u1 *sp)
 
 ******************************************************************************/
 
-bool patcher_invokestatic_special(u1 *sp)
+bool patcher_invokestatic_special(patchref_t* pr)
 {
-       u1                *ra;
-       u4                 mcode;
-       unresolved_method *um;
-       s4                 disp;
-       u1                *pv;
-       methodinfo        *m;
+       unresolved_method* um    = (unresolved_method*) pr->ref;
+       uintptr_t*         datap = (uintptr_t*)         pr->datap;
 
-       /* get stuff from the stack */
+       // Resolve the method.
+       methodinfo* m = resolve_method_eager(um);
 
-       ra    = (u1 *)                *((ptrint *) (sp + 5 * 8));
-       mcode =                       *((u4 *)     (sp + 3 * 8));
-       um    = (unresolved_method *) *((ptrint *) (sp + 2 * 8));
-       disp  =                       *((s4 *)     (sp + 1 * 8));
-       pv    = (u1 *)                *((ptrint *) (sp + 0 * 8));
-
-       /* get the fieldinfo */
-
-       if (!(m = resolve_method_eager(um)))
+       if (m == NULL)
                return false;
 
-       /* patch back original code */
-
-       *((u4 *) ra) = mcode;
-
-       /* synchronize instruction cache */
+       // Patch stubroutine.
+       *datap = (uintptr_t) m->stubroutine;
 
-       md_icacheflush(ra, 4);
+       // Synchronize data cache.
+       md_dcacheflush(datap, SIZEOF_VOID_P);
 
-       /* patch stubroutine */
-
-       *((ptrint *) (pv + disp)) = (ptrint) m->stubroutine;
-
-       /* synchronize data cache */
-
-       md_dcacheflush(pv + disp, SIZEOF_VOID_P);
+       // Patch back the original code.
+       patcher_patch_code(pr);
 
        return true;
 }
@@ -485,43 +182,27 @@ bool patcher_invokestatic_special(u1 *sp)
 
 *******************************************************************************/
 
-bool patcher_invokevirtual(u1 *sp)
+bool patcher_invokevirtual(patchref_t* pr)
 {
-       u1                *ra;
-       u4                 mcode;
-       unresolved_method *um;
-       methodinfo        *m;
-       s4                 disp;
-
-       /* get stuff from the stack */
+       uint32_t*          pc = (uint32_t*)          pr->mpc;
+       unresolved_method* um = (unresolved_method*) pr->ref;
 
-       ra    = (u1 *)                *((ptrint *) (sp + 5 * 8));
-       mcode =                       *((u4 *)     (sp + 3 * 8));
-       um    = (unresolved_method *) *((ptrint *) (sp + 2 * 8));
+       // Resolve the method.
+       methodinfo* m = resolve_method_eager(um);
 
-       /* get the fieldinfo */
-
-       if (!(m = resolve_method_eager(um)))
+       if (m == NULL)
                return false;
 
-       /* patch back original code */
-
-       *((u4 *) ra) = mcode;
-
-       /* if we show disassembly, we have to skip the nop */
-
-       if (opt_showdisassemble)
-               ra = ra + 4;
+       // Patch vftbl index.
+       int32_t disp = (OFFSET(vftbl_t, table[0]) + sizeof(methodptr) * m->vftblindex);
 
-       /* patch vftbl index */
+       pc[1] |= (disp & 0x0000ffff);
 
-       disp = (OFFSET(vftbl_t, table[0]) + sizeof(methodptr) * m->vftblindex);
+       // Synchronize instruction cache.
+       md_icacheflush(pc + 1, 1 * 4);
 
-       *((s4 *) (ra + 4)) |= (disp & 0x0000ffff);
-
-       /* synchronize instruction cache */
-
-       md_icacheflush(ra, 2 * 4);
+       // Patch back the original code.
+       patcher_patch_code(pr);
 
        return true;
 }
@@ -540,111 +221,82 @@ bool patcher_invokevirtual(u1 *sp)
 
 *******************************************************************************/
 
-bool patcher_invokeinterface(u1 *sp)
+bool patcher_invokeinterface(patchref_t* pr)
 {
-       u1                *ra;
-       u4                 mcode;
-       unresolved_method *um;
-       methodinfo        *m;
-       s4                 disp;
-
-       /* get stuff from the stack */
+       uint32_t*          pc = (uint32_t*)          pr->mpc;
+       unresolved_method* um = (unresolved_method*) pr->ref;
 
-       ra    = (u1 *)                *((ptrint *) (sp + 5 * 8));
-       mcode =                       *((u4 *)     (sp + 3 * 8));
-       um    = (unresolved_method *) *((ptrint *) (sp + 2 * 8));
+       // Resolve the method.
+       methodinfo* m = resolve_method_eager(um);
 
-       /* get the fieldinfo */
-
-       if (!(m = resolve_method_eager(um)))
+       if (m == NULL)
                return false;
 
-       /* patch back original code */
-
-       *((u4 *) ra) = mcode;
-
-       /* if we show disassembly, we have to skip the nop */
-
-       if (opt_showdisassemble)
-               ra = ra + 4;
-
-       /* patch interfacetable index */
-
-       disp = OFFSET(vftbl_t, interfacetable[0]) -
-               sizeof(methodptr*) * m->class->index;
+       // Patch interfacetable index.
+       int32_t disp = OFFSET(vftbl_t, interfacetable[0]) - sizeof(methodptr*) * m->clazz->index;
 
-       /* XXX TWISTI: check displacement */
+       // XXX TWISTI: check displacement
+       pc[1] |= (disp & 0x0000ffff);
 
-       *((s4 *) (ra + 1 * 4)) |= (disp & 0x0000ffff);
+       // Patch method offset.
+       disp = sizeof(methodptr) * (m - m->clazz->methods);
 
-       /* patch method offset */
+       // XXX TWISTI: check displacement
+       pc[2] |= (disp & 0x0000ffff);
 
-       disp = sizeof(methodptr) * (m - m->class->methods);
+       // Synchronize instruction cache.
+       md_icacheflush(pc + 1, 2 * 4);
 
-       /* XXX TWISTI: check displacement */
-
-       *((s4 *) (ra + 2 * 4)) |= (disp & 0x0000ffff);
-
-       /* synchronize instruction cache */
-
-       md_icacheflush(ra, 3 * 4);
+       // Patch back the original code.
+       patcher_patch_code(pr);
 
        return true;
 }
 
 
-/* patcher_checkcast_instanceof_flags ******************************************
+/* patcher_checkcast_interface **************************************
 
    Machine code:
 
    <patched call position>
-   818dff7c    lwz   r12,-132(r13)
+   81870000    lwz   r12,0(r7)
+   800c0010    lwz   r0,16(r12)
+   34000000    addic.        r0,r0,0
+   408101fc    bgt-  0x3002e518                FIXME
+   83c00003    lwz   r30,3(0)          FIXME
+   800c0000    lwz   r0,0(r12)
 
 *******************************************************************************/
 
-bool patcher_checkcast_instanceof_flags(u1 *sp)
+bool patcher_checkcast_interface(patchref_t* pr)
 {
-       u1                *ra;
-       u4                 mcode;
-       constant_classref *cr;
-       s4                 disp;
-       u1                *pv;
-       classinfo         *c;
+       uint32_t*          pc = (uint32_t*)          pr->mpc;
+       constant_classref* cr = (constant_classref*) pr->ref;
 
-       /* get stuff from the stack */
+       // Resolve the class.
+       classinfo* c = resolve_classref_eager(cr);
 
-       ra    = (u1 *)                *((ptrint *) (sp + 5 * 8));
-       mcode =                       *((u4 *)     (sp + 3 * 8));
-       cr    = (constant_classref *) *((ptrint *) (sp + 2 * 8));
-       disp  =                       *((s4 *)     (sp + 1 * 8));
-       pv    = (u1 *)                *((ptrint *) (sp + 0 * 8));
-
-       /* get the fieldinfo */
-
-       if (!(c = resolve_classref_eager(cr)))
+       if (c == NULL)
                return false;
 
-       /* patch back original code */
-
-       *((u4 *) ra) = mcode;
-
-       /* synchronize instruction cache */
-
-       md_icacheflush(ra, 4);
+       // Patch super class index.
+       int32_t disp = -(c->index);
+       pc[2] |= (disp & 0x0000ffff);
 
-       /* patch class flags */
-
-       *((s4 *) (pv + disp)) = (s4) c->flags;
+       disp = OFFSET(vftbl_t, interfacetable[0]) - c->index * sizeof(methodptr*);
+       pc[5] |= (disp & 0x0000ffff);
 
-       /* synchronize data cache */
+       // Synchronize instruction cache.
+       md_icacheflush(pc + 2, 4 * 4);
 
-       md_dcacheflush(pv + disp, SIZEOF_VOID_P);
+       // Patch back the original code.
+       patcher_patch_code(pr);
 
        return true;
 }
 
 
-/* patcher_checkcast_instanceof_interface **************************************
+/* patcher_instanceof_interface **************************************
 
    Machine code:
 
@@ -657,286 +309,161 @@ bool patcher_checkcast_instanceof_flags(u1 *sp)
 
 *******************************************************************************/
 
-bool patcher_checkcast_instanceof_interface(u1 *sp)
+bool patcher_instanceof_interface(patchref_t* pr)
 {
-       u1                *ra;
-       u4                 mcode;
-       constant_classref *cr;
-       classinfo         *c;
-       s4                 disp;
-
-       /* get stuff from the stack */
-
-       ra    = (u1 *)                *((ptrint *) (sp + 5 * 8));
-       mcode =                       *((u4 *)     (sp + 3 * 8));
-       cr    = (constant_classref *) *((ptrint *) (sp + 2 * 8));
+       uint32_t*          pc = (uint32_t*)          pr->mpc;
+       constant_classref* cr = (constant_classref*) pr->ref;
 
-       /* get the fieldinfo */
+       // Resolve the class.
+       classinfo* c = resolve_classref_eager(cr);
 
-       if (!(c = resolve_classref_eager(cr)))
+       if (c == NULL)
                return false;
 
-       /* patch back original code */
-
-       *((u4 *) ra) = mcode;
-
-       /* if we show disassembly, we have to skip the nop */
-
-       if (opt_showdisassemble)
-               ra = ra + 4;
-
-       /* patch super class index */
-
-       disp = -(c->index);
-
-       *((s4 *) (ra + 2 * 4)) |= (disp & 0x0000ffff);
+       // Patch super class index.
+       int32_t disp = -(c->index);
+       pc[2] |= (disp & 0x0000ffff);
 
        disp = OFFSET(vftbl_t, interfacetable[0]) - c->index * sizeof(methodptr*);
+       pc[4] |= (disp & 0x0000ffff);
 
-       *((s4 *) (ra + 4 * 4)) |= (disp & 0x0000ffff);
+       // Synchronize instruction cache.
+       md_icacheflush(pc + 2, 3 * 4);
 
-       /* synchronize instruction cache */
-
-       md_icacheflush(ra, 5 * 4);
+       // Patch back the original code.
+       patcher_patch_code(pr);
 
        return true;
 }
 
 
-/* patcher_checkcast_class *****************************************************
-
-   Machine code:
-
-   <patched call position>
-   81870000    lwz   r12,0(r7)
-   800c0014    lwz   r0,20(r12)
-   818dff78    lwz   r12,-136(r13)
-
-*******************************************************************************/
-
-bool patcher_checkcast_class(u1 *sp)
-{
-       u1                *ra;
-       u4                 mcode;
-       constant_classref *cr;
-       s4                 disp;
-       u1                *pv;
-       classinfo         *c;
-
-       /* get stuff from the stack */
-
-       ra    = (u1 *)                *((ptrint *) (sp + 5 * 8));
-       mcode =                       *((u4 *)     (sp + 3 * 8));
-       cr    = (constant_classref *) *((ptrint *) (sp + 2 * 8));
-       disp  =                       *((s4 *)     (sp + 1 * 8));
-       pv    = (u1 *)                *((ptrint *) (sp + 0 * 8));
-
-       /* get the fieldinfo */
-
-       if (!(c = resolve_classref_eager(cr)))
-               return false;
-
-       /* patch back original code */
-
-       *((u4 *) ra) = mcode;
+/* patcher_resolve_classref_to_classinfo ***************************************
 
-       /* synchronize instruction cache */
+   ACONST:
 
-       md_icacheflush(ra, 4);
-
-       /* patch super class' vftbl */
-
-       *((ptrint *) (pv + disp)) = (ptrint) c->vftbl;
+   <patched call postition>
+   806dffc4    lwz   r3,-60(r13)
+   81adffc0    lwz   r13,-64(r13)
+   7da903a6    mtctr r13
+   4e800421    bctrl
 
-       /* synchronize data cache */
 
-       md_dcacheflush(pv + disp, SIZEOF_VOID_P);
-
-       return true;
-}
+   MULTIANEWARRAY:
 
+   <patched call position>
+   808dffc0    lwz   r4,-64(r13)
+   38a10038    addi  r5,r1,56
+   81adffbc    lwz   r13,-68(r13)
+   7da903a6    mtctr r13
+   4e800421    bctrl
 
-/* patcher_instanceof_class ****************************************************
 
-   Machine code:
+   ARRAYCHECKCAST:
 
    <patched call position>
-   817d0000    lwz   r11,0(r29)
-   818dff8c    lwz   r12,-116(r13)
+   808dffd8    lwz   r4,-40(r13)
+   81adffd4    lwz   r13,-44(r13)
+   7da903a6    mtctr r13
+   4e800421    bctrl
 
 *******************************************************************************/
 
-bool patcher_instanceof_class(u1 *sp)
+bool patcher_resolve_classref_to_classinfo(patchref_t* pr)
 {
-       u1                *ra;
-       u4                 mcode;
-       constant_classref *cr;
-       s4                 disp;
-       u1                *pv;
-       classinfo         *c;
-
-       /* get stuff from the stack */
+       constant_classref* cr    = (constant_classref*) pr->ref;
+       uintptr_t*         datap = (uintptr_t*)         pr->datap;
 
-       ra    = (u1 *)                *((ptrint *) (sp + 5 * 8));
-       mcode =                       *((u4 *)     (sp + 3 * 8));
-       cr    = (constant_classref *) *((ptrint *) (sp + 2 * 8));
-       disp  =                       *((s4 *)     (sp + 1 * 8));
-       pv    = (u1 *)                *((ptrint *) (sp + 0 * 8));
+       // Resolve the class.
+       classinfo* c = resolve_classref_eager(cr);
 
-       /* get the fieldinfo */
-
-       if (!(c = resolve_classref_eager(cr)))
+       if (c == NULL)
                return false;
 
-       /* patch back original code */
-
-       *((u4 *) ra) = mcode;
+       // Patch the classinfo pointer.
+       *datap = (uintptr_t) c;
 
-       /* synchronize instruction cache */
+       // Synchronize data cache.
+       md_dcacheflush(datap, SIZEOF_VOID_P);
 
-       md_icacheflush(ra, 4);
-
-       /* patch super class' vftbl */
-
-       *((ptrint *) (pv + disp)) = (ptrint) c->vftbl;
-
-       /* synchronize data cache */
-
-       md_dcacheflush(pv + disp, SIZEOF_VOID_P);
+       // Patch back the original code.
+       patcher_patch_code(pr);
 
        return true;
 }
 
 
-/* patcher_clinit **************************************************************
+/* patcher_resolve_classref_to_vftbl *******************************************
 
-   XXX
-
-*******************************************************************************/
-
-bool patcher_clinit(u1 *sp)
-{
-       u1        *ra;
-       u4         mcode;
-       classinfo *c;
-
-       /* get stuff from the stack */
-
-       ra    = (u1 *)        *((ptrint *) (sp + 5 * 8));
-       mcode =               *((u4 *)     (sp + 3 * 8));
-       c     = (classinfo *) *((ptrint *) (sp + 2 * 8));
-
-       /* check if the class is initialized */
-
-       if (!(c->state & CLASS_INITIALIZED))
-               if (!initialize_class(c))
-                       return false;
-
-       /* patch back original code */
-
-       *((u4 *) ra) = mcode;
-
-       /* synchronize instruction cache */
-
-       md_icacheflush(ra, 4);
-
-       return true;
-}
+   CHECKCAST (class):
 
+   <patched call position>
+   81870000    lwz   r12,0(r7)
+   800c0014    lwz   r0,20(r12)
+   818dff78    lwz   r12,-136(r13)
 
-/* patcher_athrow_areturn ******************************************************
 
-   Machine code:
+   INSTANCEOF (class):
 
    <patched call position>
+   817d0000    lwz   r11,0(r29)
+   818dff8c    lwz   r12,-116(r13)
 
 *******************************************************************************/
 
-#ifdef ENABLE_VERIFIER
-bool patcher_athrow_areturn(u1 *sp)
+bool patcher_resolve_classref_to_vftbl(patchref_t* pr)
 {
-       u1               *ra;
-       u4                mcode;
-       unresolved_class *uc;
-       classinfo        *c;
-
-       /* get stuff from the stack */
-
-       ra    = (u1 *)               *((ptrint *) (sp + 5 * 8));
-       mcode =                      *((u4 *)     (sp + 3 * 8));
-       uc    = (unresolved_class *) *((ptrint *) (sp + 2 * 8));
+       constant_classref* cr    = (constant_classref*) pr->ref;
+       uintptr_t*         datap = (uintptr_t*)         pr->datap;
 
-       /* resolve the class */
+       // Resolve the class.
+       classinfo* c = resolve_classref_eager(cr);
 
-       if (!resolve_class(uc, resolveEager, false, &c))
+       if (c == NULL)
                return false;
 
-       /* patch back original code */
+       // Patch super class' vftbl.
+       *datap = (uintptr_t) c->vftbl;
 
-       *((u4 *) ra) = mcode;
+       // Synchronize data cache.
+       md_dcacheflush(datap, SIZEOF_VOID_P);
 
-       /* synchronize instruction cache */
-
-       md_icacheflush(ra, 4);
+       // Patch back the original code.
+       patcher_patch_code(pr);
 
        return true;
 }
-#endif /* ENABLE_VERIFIER */
 
+/* patcher_resolve_classref_to_flags *******************************************
 
-/* patcher_resolve_native ******************************************************
+   CHECKCAST/INSTANCEOF:
 
-   XXX
+   <patched call position>
+   818dff7c    lwz   r12,-132(r13)
 
 *******************************************************************************/
 
-#if !defined(WITH_STATIC_CLASSPATH)
-bool patcher_resolve_native(u1 *sp)
+bool patcher_resolve_classref_to_flags(patchref_t* pr)
 {
-       u1          *ra;
-       u4           mcode;
-       methodinfo  *m;
-       s4           disp;
-       u1          *pv;
-       functionptr  f;
-
-       /* get stuff from the stack */
+       constant_classref* cr    = (constant_classref*) pr->ref;
+       int32_t*           datap = (int32_t*)           pr->datap;
 
-       ra    = (u1 *)                *((ptrint *) (sp + 5 * 8));
-       mcode =                       *((u4 *)     (sp + 3 * 8));
-       m     = (methodinfo *)        *((ptrint *) (sp + 2 * 8));
-       disp  =                       *((s4 *)     (sp + 1 * 8));
-       pv    = (u1 *)                *((ptrint *) (sp + 0 * 8));
+       // Resolve the class.
+       classinfo* c = resolve_classref_eager(cr);
 
-       /* calculate and set the new return address */
-
-       ra = ra - 1 * 4;
-       *((ptrint *) (sp + 5 * 8)) = (ptrint) ra;
-
-       /* resolve native function */
-
-       if (!(f = native_resolve_function(m)))
+       if (c == NULL)
                return false;
 
-       /* patch back original code */
-
-       *((u4 *) ra) = mcode;
-
-       /* synchronize instruction cache */
-
-       md_icacheflush(ra, 4);
-
-       /* patch native function pointer */
-
-       *((ptrint *) (pv + disp)) = (ptrint) f;
+       // Patch class flags.
+       *datap = (int32_t) c->flags;
 
-       /* synchronize data cache */
+       // Synchronize data cache.
+       md_dcacheflush(datap, SIZEOF_VOID_P);
 
-       md_dcacheflush(pv + disp, SIZEOF_VOID_P);
+       // Patch back the original code.
+       patcher_patch_code(pr);
 
        return true;
 }
-#endif /* !defined(WITH_STATIC_CLASSPATH) */
 
 
 /*