Merged with new-trap-decoding branch at rev a792088a3f04 (branch closed).
[cacao.git] / src / vm / jit / powerpc64 / patcher.c
index d480039831125d806cefe1b8242132d39abb2092..f5875a04ebf91b4addcb754f0353a36635d5762c 100644 (file)
@@ -1,9 +1,8 @@
 /* src/vm/jit/powerpc64/patcher.c - PowerPC64 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
+   Copyright (C) 2008 Theobroma Systems Ltd.
 
    This file is part of CACAO.
 
 
 #include "vm/types.h"
 
-#include "mm/memory.h"
+#include "vm/jit/powerpc64/md.h"
 
-#include "native/native.h"
+#include "mm/memory.hpp"
 
-#include "vm/builtin.h"
-#include "vm/exceptions.h"
-#include "vm/initialize.h"
+#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/references.h"
+#include "vm/resolve.hpp"
 
 #include "vm/jit/asmpart.h"
-#include "vm/jit/md.h"
 #include "vm/jit/methodheader.h"
-#include "vm/jit/patcher-common.h"
-#include "vm/jit/stacktrace.h"
+#include "vm/jit/patcher-common.hpp"
+
+
+/* patcher_patch_code **********************************************************
+
+   Just patches back the original machine code.
+
+*******************************************************************************/
+
+void patcher_patch_code(patchref_t *pr)
+{
+       // Patch back original code.
+       *((uint32_t*) pr->mpc) = pr->mcode;
 
-#include "vmcore/class.h"
-#include "vmcore/field.h"
-#include "vmcore/options.h"
-#include "vmcore/references.h"
-#include "vm/resolve.h"
+       // Synchronize instruction cache.
+       md_icacheflush((void*) pr->mpc, 1 * 4);
+}
 
 
 /* patcher_get_putstatic *******************************************************
 
 *******************************************************************************/
 
-bool patcher_get_putstatic(patchref_t *pr)
+bool patcher_get_putstatic(patchref_tpr)
 {
-       u1               *ra;
-       u4                mcode;
-       unresolved_field *uf;
-       u1               *datap;
-       fieldinfo        *fi;
-
-       /* get stuff from the stack */
+       unresolved_field* uf    = (unresolved_field*) pr->ref;
+       uintptr_t*        datap = (uintptr_t*)        pr->datap;
 
-       ra    = (u1 *)                pr->mpc;
-       mcode =                       pr->mcode;
-       uf    = (unresolved_field *)  pr->ref;
-       datap = (u1 *)                pr->datap;
+       // 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 */
-
-       *((u4 *) ra) = mcode;
-
-       /* synchronize instruction cache */
-
-       md_icacheflush(ra, 4);
-
-       /* patch the field value's address */
-
-       *((intptr_t *) datap) = (intptr_t) fi->value;
-
-       /* synchronize data cache */
+       // Patch the field value's address.
+       *datap = (uintptr_t) fi->value;
 
+       // Synchronize data cache.
        md_dcacheflush(datap, SIZEOF_VOID_P);
 
+       // Patch back the original code.
+       patcher_patch_code(pr);
+
        return true;
 }
 
@@ -118,42 +114,22 @@ bool patcher_get_putstatic(patchref_t *pr)
 
 *******************************************************************************/
 
-bool patcher_get_putfield(patchref_t *pr)
+bool patcher_get_putfield(patchref_tpr)
 {
-       u1               *ra;
-       u4                mcode;
-       unresolved_field *uf;
-       fieldinfo        *fi;
-
-       ra    = (u1 *)                pr->mpc;
-       mcode =                       pr->mcode;
-       uf    = (unresolved_field *)  pr->ref;
+       unresolved_field* uf = (unresolved_field*) pr->ref;
 
-       /* get the fieldinfo */
+       // Resolve the field.
+       fieldinfo* fi = resolve_field_eager(uf);
 
-       if (!(fi = resolve_field_eager(uf)))
+       if (fi == NULL)
                return false;
 
-       /* patch back original code */
-
-       *((u4 *) ra) = mcode;
-
-       /* synchronize instruction cache */
-
-       md_icacheflush(ra, 4);
-
-       /* if we show disassembly, we have to skip the nop */
+       // Patch the field offset in the patcher.  We also need this to
+       // validate patchers.
+       pr->mcode |= (int16_t) (fi->offset & 0x0000ffff);
 
-       if (opt_shownops)
-               ra = ra + 4;
-
-       /* patch the field's offset */
-
-       *((u4 *) ra) |= (s2) (fi->offset & 0x0000ffff);
-
-       /* synchronize instruction cache */
-
-       md_icacheflush(ra, 8);
+       // Patch back the original code.
+       patcher_patch_code(pr);
 
        return true;
 }
@@ -170,42 +146,26 @@ bool patcher_get_putfield(patchref_t *pr)
 
 ******************************************************************************/
 
-bool patcher_invokestatic_special(patchref_t *pr)
+bool patcher_invokestatic_special(patchref_tpr)
 {
-       u1                *ra;
-       u4                 mcode;
-       unresolved_method *um;
-       u1                *datap;
-       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 *)                pr->mpc;
-       mcode =                       pr->mcode;
-       um    = (unresolved_method *) pr->ref;
-       datap = (u1 *)                pr->datap;
-
-       /* get the fieldinfo */
-
-       if (!(m = resolve_method_eager(um)))
+       if (m == NULL)
                return false;
 
-       /* patch back original code */
-
-       *((u4 *) ra) = mcode;
-
-       /* synchronize instruction cache */
-
-       md_icacheflush(ra, 4);
-
-       /* patch stubroutine */
-
-       *((ptrint *) datap) = (ptrint) m->stubroutine;
-
-       /* synchronize data cache */
+       // Patch stubroutine.
+       *datap = (uintptr_t) m->stubroutine;
 
+       // Synchronize data cache.
        md_dcacheflush(datap, SIZEOF_VOID_P);
 
+       // Patch back the original code.
+       patcher_patch_code(pr);
+
        return true;
 }
 
@@ -222,47 +182,27 @@ bool patcher_invokestatic_special(patchref_t *pr)
 
 *******************************************************************************/
 
-bool patcher_invokevirtual(patchref_t *pr)
+bool patcher_invokevirtual(patchref_tpr)
 {
-       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 *)                pr->mpc;
-       mcode =                       pr->mcode;
-       um    = (unresolved_method *) pr->ref;
+       // 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;
+       // Patch vftbl index.
+       int32_t disp = (OFFSET(vftbl_t, table[0]) + sizeof(methodptr) * m->vftblindex);
 
-       /* synchronize instruction cache */
+       pc[1] |= (disp & 0x0000ffff);
 
-       md_icacheflush(ra, 4);
+       // Synchronize instruction cache.
+       md_icacheflush(pc + 1, 1 * 4);
 
-       /* if we show disassembly, we have to skip the nop */
-
-       if (opt_shownops)
-               ra = ra + 4;
-
-       /* patch vftbl index */
-
-       disp = (OFFSET(vftbl_t, table[0]) + sizeof(methodptr) * m->vftblindex);
-
-       *((s4 *) (ra + 4)) |= (disp & 0x0000ffff);
-
-       /* synchronize instruction cache */
-
-       md_icacheflush(ra, 2 * 4);
+       // Patch back the original code.
+       patcher_patch_code(pr);
 
        return true;
 }
@@ -281,110 +221,39 @@ bool patcher_invokevirtual(patchref_t *pr)
 
 *******************************************************************************/
 
-bool patcher_invokeinterface(patchref_t *pr)
+bool patcher_invokeinterface(patchref_tpr)
 {
-       u1                *ra;
-       u4                 mcode;
-       unresolved_method *um;
-       methodinfo        *m;
-       s4                 disp;
-
-       /* get stuff from the stack */
-
-       ra    = (u1 *)                pr->mpc;
-       mcode =                       pr->mcode;
-       um    = (unresolved_method *) pr->ref;
+       uint32_t*          pc = (uint32_t*)          pr->mpc;
+       unresolved_method* um = (unresolved_method*) pr->ref;
 
-       /* get the fieldinfo */
+       // Resolve the method.
+       methodinfo* m = resolve_method_eager(um);
 
-       if (!(m = resolve_method_eager(um)))
+       if (m == NULL)
                return false;
 
-       /* patch back original code */
+       // Patch interfacetable index.
+       int32_t disp = OFFSET(vftbl_t, interfacetable[0]) - sizeof(methodptr*) * m->clazz->index;
 
-       *((u4 *) ra) = mcode;
+       // XXX TWISTI: check displacement
+       pc[1] |= (disp & 0x0000ffff);
 
-       /* synchronize instruction cache */
+       // Patch method offset.
+       disp = sizeof(methodptr) * (m - m->clazz->methods);
 
-       md_icacheflush(ra, 4);
+       // XXX TWISTI: check displacement
+       pc[2] |= (disp & 0x0000ffff);
 
-       /* if we show disassembly, we have to skip the nop */
+       // Synchronize instruction cache.
+       md_icacheflush(pc + 1, 2 * 4);
 
-       if (opt_shownops)
-               ra = ra + 4;
-
-       /* patch interfacetable index */
-
-       disp = OFFSET(vftbl_t, interfacetable[0]) -
-               sizeof(methodptr*) * m->class->index;
-
-       /* XXX TWISTI: check displacement */
-
-       *((s4 *) (ra + 1 * 4)) |= (disp & 0x0000ffff);
-
-       /* patch method offset */
-
-       disp = sizeof(methodptr) * (m - m->class->methods);
-
-       /* 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 ******************************************
-
-   Machine code:
-
-   <patched call position>
-   818dff7c    lwz   r12,-132(r13)
-
-*******************************************************************************/
-
-bool patcher_checkcast_instanceof_flags(patchref_t *pr)
-{
-       u1                *ra;
-       u4                 mcode;
-       constant_classref *cr;
-       u1                *datap;
-       classinfo         *c;
-
-       /* get stuff from the stack */
-
-       ra    = (u1 *)                pr->mpc;
-       mcode =                       pr->mcode;
-       cr    = (constant_classref *) pr->ref;
-       datap = (u1 *)                pr->datap;
-
-       /* get the fieldinfo */
-
-       if (!(c = resolve_classref_eager(cr)))
-               return false;
-
-       /* patch back original code */
-
-       *((u4 *) ra) = mcode;
-
-       /* synchronize instruction cache */
-
-       md_icacheflush(ra, 4);
-
-       /* patch class flags */
-
-       *((s4 *) datap) = (s4) c->flags;
-
-       /* synchronize data cache */
-
-       md_dcacheflush(datap, SIZEOF_VOID_P);
-
-       return true;
-}
 /* patcher_checkcast_interface **************************************
 
    Machine code:
@@ -398,46 +267,30 @@ bool patcher_checkcast_instanceof_flags(patchref_t *pr)
    800c0000    lwz   r0,0(r12)
 
 *******************************************************************************/
-bool patcher_checkcast_interface(patchref_t *pr)
-{
-       u1 *ra;
-       constant_classref *cr;
-       classinfo *c;
-       s4 disp;
-       u4 mcode;
-
-       /* get stuff from stack */
-       ra    = (u1 *)                pr->mpc;
-       mcode =                       pr->mcode;
-       cr    = (constant_classref *) pr->ref;
-
-       /* get the fieldinfo */
-       if (!(c = resolve_classref_eager(cr)))  {
-               return false;
-       }
-
-       /* patch back original code */
-       *((u4 *) ra) = mcode;
 
-       /* synchronize instruction cache */
-
-       md_icacheflush(ra, 4);
+bool patcher_checkcast_interface(patchref_t* pr)
+{
+       uint32_t*          pc = (uint32_t*)          pr->mpc;
+       constant_classref* cr = (constant_classref*) pr->ref;
 
-       /* if we show NOPs, we have to skip them */
-       if (opt_shownops)
-               ra = ra +4;
+       // Resolve the class.
+       classinfo* c = resolve_classref_eager(cr);
 
-       /* patch super class index */
-       disp = -(c->index);
+       if (c == NULL)
+               return false;
 
-       *((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[5] |= (disp & 0x0000ffff);
 
-       *((s4 *)(ra + 5*4)) |= (disp & 0x0000ffff);
+       // Synchronize instruction cache.
+       md_icacheflush(pc + 2, 4 * 4);
 
-       /* sync instruction cache */
-       md_icacheflush(ra, 6*4);
+       // Patch back the original code.
+       patcher_patch_code(pr);
 
        return true;
 }
@@ -456,106 +309,34 @@ bool patcher_checkcast_interface(patchref_t *pr)
 
 *******************************************************************************/
 
-bool patcher_instanceof_interface(patchref_t *pr)
+bool patcher_instanceof_interface(patchref_tpr)
 {
-       u1                *ra;
-       u4                 mcode;
-       constant_classref *cr;
-       classinfo         *c;
-       s4                 disp;
-
-       /* get stuff from the stack */
+       uint32_t*          pc = (uint32_t*)          pr->mpc;
+       constant_classref* cr = (constant_classref*) pr->ref;
 
-       ra    = (u1 *)                pr->mpc;
-       mcode =                       pr->mcode;
-       cr    = (constant_classref *) pr->ref;
+       // 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;
-
-       /* synchronize instruction cache */
-
-       md_icacheflush(ra, 4);
-
-       /* if we show disassembly, we have to skip the nop */
-
-       if (opt_shownops)
-               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(patchref_t *pr)
-{
-       u1                *ra;
-       u4                 mcode;
-       constant_classref *cr;
-       u1                *datap;
-       classinfo         *c;
-
-       /* get stuff from the stack */
-
-       ra    = (u1 *)                pr->mpc;
-       mcode =                       pr->mcode;
-       cr    = (constant_classref *) pr->ref;
-       datap = (u1 *)                pr->datap;
-
-       /* get the fieldinfo */
-
-       if (!(c = resolve_classref_eager(cr)))
-               return false;
-
-       /* patch back original code */
-
-       *((u4 *) ra) = mcode;
-
-       /* synchronize instruction cache */
-
-       md_icacheflush(ra, 4);
-
-       /* patch super class' vftbl */
-
-       *((ptrint *) datap) = (ptrint) c->vftbl;
-
-       /* synchronize data cache */
-
-       md_dcacheflush(datap, SIZEOF_VOID_P);
-
-       return true;
-}
-
 /* patcher_resolve_classref_to_classinfo ***************************************
 
    ACONST:
@@ -587,95 +368,30 @@ bool patcher_checkcast_class(patchref_t *pr)
 
 *******************************************************************************/
 
-bool patcher_resolve_classref_to_classinfo(patchref_t *pr)
+bool patcher_resolve_classref_to_classinfo(patchref_tpr)
 {
-       constant_classref *cr;
-       u1                *datap, *ra;
-       u4         mcode;
-       classinfo         *c;
-
-       /* get stuff from the stack */
+       constant_classref* cr    = (constant_classref*) pr->ref;
+       uintptr_t*         datap = (uintptr_t*)         pr->datap;
 
-       ra    = (u1 *)                pr->mpc;
-       mcode =                       pr->mcode;
-       cr    = (constant_classref *) pr->ref;
-       datap = (u1 *)                pr->datap;
+       // Resolve the class.
+       classinfo* c = resolve_classref_eager(cr);
 
-       /* get the classinfo */
-
-       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 the classinfo pointer */
-
-       *((ptrint *) datap) = (ptrint) c;
-
-       /* synchronize data cache */
+       // Patch the classinfo pointer.
+       *datap = (uintptr_t) c;
 
+       // Synchronize data cache.
        md_dcacheflush(datap, SIZEOF_VOID_P);
 
-       return true;
-}
-
-
-
-/* patcher_instanceof_class ****************************************************
-
-   Machine code:
-
-   <patched call position>
-   817d0000    lwz   r11,0(r29)
-   818dff8c    lwz   r12,-116(r13)
-
-*******************************************************************************/
-
-bool patcher_instanceof_class(patchref_t *pr)
-{
-       u1                *ra;
-       u4                 mcode;
-       constant_classref *cr;
-       u1                *datap;
-       classinfo         *c;
-
-       /* get stuff from the stack */
-
-       ra    = (u1 *)                pr->mpc;
-       mcode =                       pr->mcode;
-       cr    = (constant_classref *) pr->ref;
-       datap = (u1 *)                pr->datap;
-
-       /* get the fieldinfo */
-
-       if (!(c = resolve_classref_eager(cr)))
-               return false;
-
-       /* patch back original code */
-
-       *((u4 *) ra) = mcode;
-
-       /* synchronize instruction cache */
-
-       md_icacheflush(ra, 4);
-
-       /* patch super class' vftbl */
-
-       *((ptrint *) datap) = (ptrint) c->vftbl;
-
-       /* synchronize data cache */
-
-       md_dcacheflush(datap, SIZEOF_VOID_P);
+       // Patch back the original code.
+       patcher_patch_code(pr);
 
        return true;
 }
 
+
 /* patcher_resolve_classref_to_vftbl *******************************************
 
    CHECKCAST (class):
@@ -694,41 +410,26 @@ bool patcher_instanceof_class(patchref_t *pr)
 
 *******************************************************************************/
 
-bool patcher_resolve_classref_to_vftbl(patchref_t *pr)
+bool patcher_resolve_classref_to_vftbl(patchref_tpr)
 {
-       constant_classref *cr;
-       u1                *datap, *ra;
-       u4         mcode;
-       classinfo         *c;
+       constant_classref* cr    = (constant_classref*) pr->ref;
+       uintptr_t*         datap = (uintptr_t*)         pr->datap;
 
-       /* get stuff from the stack */
+       // Resolve the class.
+       classinfo* c = resolve_classref_eager(cr);
 
-       ra    = (u1 *)                pr->mpc;
-       mcode =                       pr->mcode;
-       cr    = (constant_classref *) pr->ref;
-       datap = (u1 *)                pr->datap;
-
-       /* 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' vftbl */
-
-       *((ptrint *) datap) = (ptrint) c->vftbl;
-
-       /* synchronize data cache */
+       // Patch super class' vftbl.
+       *datap = (uintptr_t) c->vftbl;
 
+       // Synchronize data cache.
        md_dcacheflush(datap, SIZEOF_VOID_P);
 
+       // Patch back the original code.
+       patcher_patch_code(pr);
+
        return true;
 }
 
@@ -741,161 +442,25 @@ bool patcher_resolve_classref_to_vftbl(patchref_t *pr)
 
 *******************************************************************************/
 
-bool patcher_resolve_classref_to_flags(patchref_t *pr)
+bool patcher_resolve_classref_to_flags(patchref_tpr)
 {
-       constant_classref *cr;
-       u1                *datap, *ra;
-       u4         mcode;
-       classinfo         *c;
-
-       /* get stuff from the stack */
+       constant_classref* cr    = (constant_classref*) pr->ref;
+       int32_t*           datap = (int32_t*)           pr->datap;
 
-       ra    = (u1 *)                pr->mpc;
-       mcode =                       pr->mcode;
-       cr    = (constant_classref *) pr->ref;
-       datap = (u1 *)                pr->datap;
+       // 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;
-
-       /* synchronize instruction cache */
-
-       md_icacheflush(ra, 4);
-
-       /* patch class flags */
-
-       *((s4 *) datap) = (s4) c->flags;
-
-       /* synchronize data cache */
+       // Patch class flags.
+       *datap = (int32_t) c->flags;
 
+       // Synchronize data cache.
        md_dcacheflush(datap, SIZEOF_VOID_P);
 
-       return true;
-}
-
-/* patcher_initialize_class ****************************************************
-
-   XXX
-
-*******************************************************************************/
-
-bool patcher_initialize_class(patchref_t *pr)
-{
-       u1        *ra;
-       u4         mcode;
-       classinfo *c;
-
-       /* get stuff from the stack */
-
-       ra    = (u1 *)        pr->mpc;
-       mcode =               pr->mcode;
-       c     = (classinfo *) pr->ref;
-
-       /* 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;
-}
-
-
-/* patcher_athrow_areturn ******************************************************
-
-   Machine code:
-
-   <patched call position>
-
-*******************************************************************************/
-
-#ifdef ENABLE_VERIFIER
-bool patcher_athrow_areturn(patchref_t *pr)
-{
-       u1               *ra;
-       u4                mcode;
-       unresolved_class *uc;
-
-       /* get stuff from the stack */
-
-       ra    = (u1 *)               pr->mpc;
-       mcode =                      pr->mcode;
-       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 code */
-
-       *((u4 *) ra) = mcode;
-
-       /* synchronize instruction cache */
-
-       md_icacheflush(ra, 4);
-
-       return true;
-}
-#endif /* ENABLE_VERIFIER */
-
-
-/* patcher_resolve_native_function *********************************************
-
-   XXX
-
-*******************************************************************************/
-
-bool patcher_resolve_native_function(patchref_t *pr)
-{
-       u1          *ra;
-       u4           mcode;
-       methodinfo  *m;
-       u1          *datap;
-       functionptr  f;
-
-       /* get stuff from the stack */
-
-
-       ra    = (u1 *)                pr->mpc;
-       mcode =                       pr->mcode;
-       m     = (methodinfo *)        pr->ref;
-       datap = (u1 *)                pr->datap;
-
-       /* resolve native function */
-
-       if (!(f = native_resolve_function(m)))
-               return false;
-
-       /* patch back original code */
-
-       *((u4 *) ra) = mcode;
-
-       /* synchronize instruction cache */
-
-       md_icacheflush(ra, 4);
-
-       /* patch native function pointer */
-
-       *((ptrint *) datap) = (ptrint) f;
-
-       /* synchronize data cache */
-
-       md_dcacheflush(datap, SIZEOF_VOID_P);
+       // Patch back the original code.
+       patcher_patch_code(pr);
 
        return true;
 }