/* src/vm/jit/powerpc/patcher.c - PowerPC code patching functions
- Copyright (C) 1996-2005, 2006 R. Grafl, A. Krall, C. Kruegel,
+ 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
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA.
- Contact: cacao@cacaojvm.org
-
- Authors: Christian Thalinger
-
- Changes:
-
- $Id: patcher.c 4575 2006-03-09 13:46:36Z twisti $
-
*/
#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/field.h"
+#include "vm/exceptions.h"
#include "vm/initialize.h"
-#include "vm/options.h"
-#include "vm/resolve.h"
-#include "vm/references.h"
+
#include "vm/jit/asmpart.h"
-#include "vm/jit/patcher.h"
+#include "vm/jit/md.h"
+#include "vm/jit/methodheader.h"
+#include "vm/jit/patcher-common.h"
+#include "vm/jit/stacktrace.h"
+
+#include "vmcore/class.h"
+#include "vmcore/field.h"
+#include "vmcore/options.h"
+#include "vm/resolve.h"
+#include "vmcore/references.h"
-/* patcher_get_putstatic *******************************************************
+#define PATCH_BACK_ORIGINAL_MCODE \
+ *((u4 *) pr->mpc) = (u4) pr->mcode; \
+ md_icacheflush((u1 *) pr->mpc, 4);
- Machine code:
- <patched call position>
- 816dffc8 lwz r11,-56(r13)
- 80ab0000 lwz r5,0(r11)
+/* patcher_initialize_class ****************************************************
+
+ Initalizes a given classinfo pointer. This function does not patch
+ any data.
*******************************************************************************/
-bool patcher_get_putstatic(u1 *sp)
+bool patcher_initialize_class(patchref_t *pr)
{
- u1 *ra;
- java_objectheader *o;
- u4 mcode;
- unresolved_field *uf;
- s4 disp;
- u1 *pv;
- fieldinfo *fi;
+ classinfo *c;
/* get stuff from the stack */
- ra = (u1 *) *((ptrint *) (sp + 5 * 4));
- o = (java_objectheader *) *((ptrint *) (sp + 4 * 4));
- mcode = *((u4 *) (sp + 3 * 4));
- uf = (unresolved_field *) *((ptrint *) (sp + 2 * 4));
- disp = *((s4 *) (sp + 1 * 4));
- pv = (u1 *) *((ptrint *) (sp + 0 * 4));
+ c = (classinfo *) pr->ref;
- PATCHER_MONITORENTER;
-
- /* get the fieldinfo */
-
- if (!(fi = resolve_field_eager(uf))) {
- PATCHER_MONITOREXIT;
-
- return false;
- }
-
- /* check if the field's class is initialized */
-
- if (!(fi->class->state & CLASS_INITIALIZED)) {
- if (!initialize_class(fi->class)) {
- PATCHER_MONITOREXIT;
+ /* 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 */
- asm_cacheflush(ra, 4);
-
- /* patch the field value's address */
-
- *((ptrint *) (pv + disp)) = (ptrint) &(fi->value);
-
- PATCHER_MARK_PATCHED_MONITOREXIT;
+ PATCH_BACK_ORIGINAL_MCODE;
return true;
}
-/* patcher_get_putfield ********************************************************
+/* patcher_resolve_class *******************************************************
- Machine code:
-
- <patched call position>
- 811f0014 lwz r8,20(r31)
+ Resolves a given unresolved_class pointer. This function does not
+ patch any data.
*******************************************************************************/
-bool patcher_get_putfield(u1 *sp)
+#ifdef ENABLE_VERIFIER
+bool patcher_resolve_class(patchref_t *pr)
{
- u1 *ra;
- java_objectheader *o;
- u4 mcode;
- unresolved_field *uf;
- u1 *pv;
- fieldinfo *fi;
+ unresolved_class *uc;
- ra = (u1 *) *((ptrint *) (sp + 5 * 4));
- o = (java_objectheader *) *((ptrint *) (sp + 4 * 4));
- mcode = *((u4 *) (sp + 3 * 4));
- uf = (unresolved_field *) *((ptrint *) (sp + 2 * 4));
- pv = (u1 *) *((ptrint *) (sp + 1 * 4));
-
- PATCHER_MONITORENTER;
+ /* get stuff from the stack */
- /* get the fieldinfo */
+ uc = (unresolved_class *) pr->ref;
- if (!(fi = resolve_field_eager(uf))) {
- PATCHER_MONITOREXIT;
+ /* resolve the class and check subtype constraints */
+ if (!resolve_class_eager_no_access_check(uc))
return false;
- }
-
- /* patch back original code */
-
- *((u4 *) ra) = mcode;
- /* if we show disassembly, we have to skip the nop */
+ PATCH_BACK_ORIGINAL_MCODE;
- 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. */
+ return true;
+}
+#endif /* ENABLE_VERIFIER */
- 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);
+/* patcher_resolve_classref_to_classinfo ***************************************
- } 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);
- }
+ ACONST:
- /* synchronize instruction cache */
-
- asm_cacheflush(ra, 8);
+ <patched call postition>
+ 806dffc4 lwz r3,-60(r13)
+ 81adffc0 lwz r13,-64(r13)
+ 7da903a6 mtctr r13
+ 4e800421 bctrl
- PATCHER_MARK_PATCHED_MONITOREXIT;
- 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_aconst **************************************************************
- Machine code:
+ ARRAYCHECKCAST:
- <patched call postition>
- 806dffc4 lwz r3,-60(r13)
- 81adffc0 lwz r13,-64(r13)
+ <patched call position>
+ 808dffd8 lwz r4,-40(r13)
+ 81adffd4 lwz r13,-44(r13)
7da903a6 mtctr r13
4e800421 bctrl
*******************************************************************************/
-bool patcher_aconst(u1 *sp)
+bool patcher_resolve_classref_to_classinfo(patchref_t *pr)
{
- u1 *ra;
- java_objectheader *o;
- u4 mcode;
constant_classref *cr;
- s4 disp;
- u1 *pv;
+ u1 *datap;
classinfo *c;
/* get stuff from the stack */
- ra = (u1 *) *((ptrint *) (sp + 5 * 4));
- o = (java_objectheader *) *((ptrint *) (sp + 4 * 4));
- mcode = *((u4 *) (sp + 3 * 4));
- cr = (constant_classref *) *((ptrint *) (sp + 2 * 4));
- disp = *((s4 *) (sp + 1 * 4));
- pv = (u1 *) *((ptrint *) (sp + 0 * 4));
-
- PATCHER_MONITORENTER;
+ cr = (constant_classref *) pr->ref;
+ datap = (u1 *) pr->datap;
/* get the classinfo */
- if (!(c = resolve_classref_eager(cr))) {
- PATCHER_MONITOREXIT;
-
+ if (!(c = resolve_classref_eager(cr)))
return false;
- }
- /* patch back original code */
-
- *((u4 *) ra) = mcode;
-
- /* synchronize instruction cache */
-
- asm_cacheflush(ra, 4);
+ PATCH_BACK_ORIGINAL_MCODE;
/* patch the classinfo pointer */
- *((ptrint *) (pv + disp)) = (ptrint) c;
+ *((ptrint *) datap) = (ptrint) c;
+
+ /* synchronize data cache */
- PATCHER_MARK_PATCHED_MONITOREXIT;
+ md_dcacheflush(datap, SIZEOF_VOID_P);
return true;
}
-/* patcher_builtin_multianewarray **********************************************
+/* patcher_resolve_classref_to_vftbl *******************************************
- Machine code:
+ CHECKCAST (class):
<patched call position>
- 808dffc0 lwz r4,-64(r13)
- 38a10038 addi r5,r1,56
- 81adffbc lwz r13,-68(r13)
- 7da903a6 mtctr r13
- 4e800421 bctrl
+ 81870000 lwz r12,0(r7)
+ 800c0014 lwz r0,20(r12)
+ 818dff78 lwz r12,-136(r13)
+
+
+ INSTANCEOF (class):
+
+ <patched call position>
+ 817d0000 lwz r11,0(r29)
+ 818dff8c lwz r12,-116(r13)
*******************************************************************************/
-bool patcher_builtin_multianewarray(u1 *sp)
+bool patcher_resolve_classref_to_vftbl(patchref_t *pr)
{
- u1 *ra;
- java_objectheader *o;
- u4 mcode;
constant_classref *cr;
- s4 disp;
- u1 *pv;
+ u1 *datap;
classinfo *c;
/* get stuff from the stack */
- ra = (u1 *) *((ptrint *) (sp + 5 * 4));
- o = (java_objectheader *) *((ptrint *) (sp + 4 * 4));
- mcode = *((u4 *) (sp + 3 * 4));
- cr = (constant_classref *) *((ptrint *) (sp + 2 * 4));
- disp = *((s4 *) (sp + 1 * 4));
- pv = (u1 *) *((ptrint *) (sp + 0 * 4));
-
- PATCHER_MONITORENTER;
+ cr = (constant_classref *) pr->ref;
+ datap = (u1 *) pr->datap;
- /* get the classinfo */
-
- if (!(c = resolve_classref_eager(cr))) {
- PATCHER_MONITOREXIT;
+ /* get the fieldinfo */
+ if (!(c = resolve_classref_eager(cr)))
return false;
- }
-
- /* patch back original code */
- *((u4 *) ra) = mcode;
+ PATCH_BACK_ORIGINAL_MCODE;
- /* synchronize instruction cache */
-
- asm_cacheflush(ra, 4);
+ /* patch super class' vftbl */
- /* patch the classinfo pointer */
+ *((ptrint *) datap) = (ptrint) c->vftbl;
- *((ptrint *) (pv + disp)) = (ptrint) c;
+ /* synchronize data cache */
- PATCHER_MARK_PATCHED_MONITOREXIT;
+ md_dcacheflush(datap, SIZEOF_VOID_P);
return true;
}
-/* patcher_builtin_arraycheckcast **********************************************
+/* patcher_resolve_classref_to_flags *******************************************
- Machine code:
+ CHECKCAST/INSTANCEOF:
<patched call position>
- 808dffd8 lwz r4,-40(r13)
- 81adffd4 lwz r13,-44(r13)
- 7da903a6 mtctr r13
- 4e800421 bctrl
+ 818dff7c lwz r12,-132(r13)
*******************************************************************************/
-bool patcher_builtin_arraycheckcast(u1 *sp)
+bool patcher_resolve_classref_to_flags(patchref_t *pr)
{
- u1 *ra;
- java_objectheader *o;
- u4 mcode;
constant_classref *cr;
- s4 disp;
- u1 *pv;
+ u1 *datap;
classinfo *c;
/* get stuff from the stack */
- ra = (u1 *) *((ptrint *) (sp + 5 * 4));
- o = (java_objectheader *) *((ptrint *) (sp + 4 * 4));
- mcode = *((u4 *) (sp + 3 * 4));
- cr = (constant_classref *) *((ptrint *) (sp + 2 * 4));
- disp = *((s4 *) (sp + 1 * 4));
- pv = (u1 *) *((ptrint *) (sp + 0 * 4));
+ cr = (constant_classref *) pr->ref;
+ datap = (u1 *) pr->datap;
- PATCHER_MONITORENTER;
-
- /* get the classinfo */
-
- if (!(c = resolve_classref_eager(cr))) {
- PATCHER_MONITOREXIT;
+ /* get the fieldinfo */
+ if (!(c = resolve_classref_eager(cr)))
return false;
- }
- /* patch back original code */
+ PATCH_BACK_ORIGINAL_MCODE;
- *((u4 *) ra) = mcode;
-
- /* synchronize instruction cache */
-
- asm_cacheflush(ra, 4);
+ /* patch class flags */
- /* patch the classinfo pointer */
+ *((s4 *) datap) = (s4) c->flags;
- *((ptrint *) (pv + disp)) = (ptrint) c;
+ /* synchronize data cache */
- PATCHER_MARK_PATCHED_MONITOREXIT;
+ md_dcacheflush(datap, SIZEOF_VOID_P);
return true;
}
-/* patcher_invokestatic_special ************************************************
+/* patcher_resolve_native_function *********************************************
- Machine code:
-
- <patched call position>
- 81adffd8 lwz r13,-40(r13)
- 7da903a6 mtctr r13
- 4e800421 bctrl
+ XXX
-******************************************************************************/
+*******************************************************************************/
-bool patcher_invokestatic_special(u1 *sp)
+#if !defined(WITH_STATIC_CLASSPATH)
+bool patcher_resolve_native_function(patchref_t *pr)
{
- u1 *ra;
- java_objectheader *o;
- u4 mcode;
- unresolved_method *um;
- s4 disp;
- u1 *pv;
- methodinfo *m;
+ methodinfo *m;
+ u1 *datap;
+ functionptr f;
/* get stuff from the stack */
- ra = (u1 *) *((ptrint *) (sp + 5 * 4));
- o = (java_objectheader *) *((ptrint *) (sp + 4 * 4));
- mcode = *((u4 *) (sp + 3 * 4));
- um = (unresolved_method *) *((ptrint *) (sp + 2 * 4));
- disp = *((s4 *) (sp + 1 * 4));
- pv = (u1 *) *((ptrint *) (sp + 0 * 4));
-
- PATCHER_MONITORENTER;
-
- /* get the fieldinfo */
+ m = (methodinfo *) pr->ref;
+ datap = (u1 *) pr->datap;
- if (!(m = resolve_method_eager(um))) {
- PATCHER_MONITOREXIT;
+ /* resolve native function */
+ if (!(f = native_resolve_function(m)))
return false;
- }
- /* patch back original code */
-
- *((u4 *) ra) = mcode;
-
- /* synchronize instruction cache */
+ PATCH_BACK_ORIGINAL_MCODE;
- asm_cacheflush(ra, 4);
+ /* patch native function pointer */
- /* patch stubroutine */
+ *((ptrint *) datap) = (ptrint) f;
- *((ptrint *) (pv + disp)) = (ptrint) m->stubroutine;
+ /* synchronize data cache */
- PATCHER_MARK_PATCHED_MONITOREXIT;
+ md_dcacheflush(datap, SIZEOF_VOID_P);
return true;
}
+#endif /* !defined(WITH_STATIC_CLASSPATH) */
-/* patcher_invokevirtual *******************************************************
+/* patcher_get_putstatic *******************************************************
Machine code:
<patched call position>
- 81830000 lwz r12,0(r3)
- 81ac0088 lwz r13,136(r12)
- 7da903a6 mtctr r13
- 4e800421 bctrl
+ 816dffc8 lwz r11,-56(r13)
+ 80ab0000 lwz r5,0(r11)
*******************************************************************************/
-bool patcher_invokevirtual(u1 *sp)
+bool patcher_get_putstatic(patchref_t *pr)
{
- u1 *ra;
- java_objectheader *o;
- u4 mcode;
- unresolved_method *um;
- methodinfo *m;
+ u1 *ra;
+ unresolved_field *uf;
+ u1 *datap;
+ fieldinfo *fi;
/* get stuff from the stack */
- ra = (u1 *) *((ptrint *) (sp + 5 * 4));
- o = (java_objectheader *) *((ptrint *) (sp + 4 * 4));
- mcode = *((u4 *) (sp + 3 * 4));
- um = (unresolved_method *) *((ptrint *) (sp + 2 * 4));
-
- PATCHER_MONITORENTER;
+ ra = (u1 *) pr->mpc;
+ uf = (unresolved_field *) pr->ref;
+ datap = (u1 *) pr->datap;
/* get the fieldinfo */
- if (!(m = resolve_method_eager(um))) {
- PATCHER_MONITOREXIT;
-
+ 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 */
+ /* check if the field's class is initialized */
- if (opt_showdisassemble)
- ra = ra + 4;
+ if (!(fi->class->state & CLASS_INITIALIZED))
+ if (!initialize_class(fi->class))
+ return false;
- /* patch vftbl index */
+ PATCH_BACK_ORIGINAL_MCODE;
- *((s4 *) (ra + 4)) |= (s4) ((OFFSET(vftbl_t, table[0]) +
- sizeof(methodptr) * m->vftblindex) & 0x0000ffff);
+ /* patch the field value's address */
- /* synchronize instruction cache */
+ *((intptr_t *) datap) = (intptr_t) fi->value;
- asm_cacheflush(ra, 2 * 4);
+ /* synchronize data cache */
- PATCHER_MARK_PATCHED_MONITOREXIT;
+ md_dcacheflush(datap, SIZEOF_VOID_P);
return true;
}
-/* patcher_invokeinterface *****************************************************
+/* patcher_get_putfield ********************************************************
Machine code:
<patched call position>
- 81830000 lwz r12,0(r3)
- 818cffd0 lwz r12,-48(r12)
- 81ac000c lwz r13,12(r12)
- 7da903a6 mtctr r13
- 4e800421 bctrl
+ 811f0014 lwz r8,20(r31)
*******************************************************************************/
-bool patcher_invokeinterface(u1 *sp)
+bool patcher_get_putfield(patchref_t *pr)
{
- u1 *ra;
- java_objectheader *o;
- u4 mcode;
- unresolved_method *um;
- methodinfo *m;
-
- /* get stuff from the stack */
+ u1 *ra;
+ unresolved_field *uf;
+ fieldinfo *fi;
+ s2 disp;
- ra = (u1 *) *((ptrint *) (sp + 5 * 4));
- o = (java_objectheader *) *((ptrint *) (sp + 4 * 4));
- mcode = *((u4 *) (sp + 3 * 4));
- um = (unresolved_method *) *((ptrint *) (sp + 2 * 4));
-
- PATCHER_MONITORENTER;
+ ra = (u1 *) pr->mpc;
+ uf = (unresolved_field *) pr->ref;
/* get the fieldinfo */
- if (!(m = resolve_method_eager(um))) {
- PATCHER_MONITOREXIT;
-
+ if (!(fi = resolve_field_eager(uf)))
return false;
- }
- /* patch back original code */
+ PATCH_BACK_ORIGINAL_MCODE;
- *((u4 *) ra) = mcode;
+ /* if we show NOPs, we have to skip them */
- /* if we show disassembly, we have to skip the nop */
+ if (opt_shownops)
+ ra = ra + 1 * 4;
- if (opt_showdisassemble)
- ra = ra + 4;
+ /* patch the field's offset */
- /* patch interfacetable index */
+ if (IS_LNG_TYPE(fi->type)) {
+ /* 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. */
- *((s4 *) (ra + 1 * 4)) |= (s4) ((OFFSET(vftbl_t, interfacetable[0]) -
- sizeof(methodptr*) * m->class->index) & 0x0000ffff);
+ disp = *((u4 *) (ra + 0 * 4));
- /* patch method offset */
-
- *((s4 *) (ra + 2 * 4)) |=
- (s4) ((sizeof(methodptr) * (m - m->class->methods)) & 0x0000ffff);
+ if (disp == 4) {
+ *((u4 *) (ra + 0 * 4)) &= 0xffff0000;
+ *((u4 *) (ra + 0 * 4)) |= (s2) ((fi->offset + 4) & 0x0000ffff);
+ *((u4 *) (ra + 1 * 4)) |= (s2) ((fi->offset + 0) & 0x0000ffff);
+ }
+ else {
+ *((u4 *) (ra + 0 * 4)) |= (s2) ((fi->offset + 0) & 0x0000ffff);
+ *((u4 *) (ra + 1 * 4)) &= 0xffff0000;
+ *((u4 *) (ra + 1 * 4)) |= (s2) ((fi->offset + 4) & 0x0000ffff);
+ }
+ }
+ else
+ *((u4 *) (ra + 0 * 4)) |= (s2) (fi->offset & 0x0000ffff);
/* synchronize instruction cache */
- asm_cacheflush(ra, 3 * 4);
-
- PATCHER_MARK_PATCHED_MONITOREXIT;
+ md_icacheflush(ra + 0 * 4, 2 * 4);
return true;
}
-/* patcher_checkcast_instanceof_flags ******************************************
+/* patcher_invokestatic_special ************************************************
Machine code:
<patched call position>
- 818dff7c lwz r12,-132(r13)
+ 81adffd8 lwz r13,-40(r13)
+ 7da903a6 mtctr r13
+ 4e800421 bctrl
-*******************************************************************************/
+******************************************************************************/
-bool patcher_checkcast_instanceof_flags(u1 *sp)
+bool patcher_invokestatic_special(patchref_t *pr)
{
- u1 *ra;
- java_objectheader *o;
- u4 mcode;
- constant_classref *cr;
- s4 disp;
- u1 *pv;
- classinfo *c;
+ unresolved_method *um;
+ u1 *datap;
+ methodinfo *m;
/* get stuff from the stack */
- ra = (u1 *) *((ptrint *) (sp + 5 * 4));
- o = (java_objectheader *) *((ptrint *) (sp + 4 * 4));
- mcode = *((u4 *) (sp + 3 * 4));
- cr = (constant_classref *) *((ptrint *) (sp + 2 * 4));
- disp = *((s4 *) (sp + 1 * 4));
- pv = (u1 *) *((ptrint *) (sp + 0 * 4));
-
- PATCHER_MONITORENTER;
+ um = (unresolved_method *) pr->ref;
+ datap = (u1 *) pr->datap;
/* get the fieldinfo */
- if (!(c = resolve_classref_eager(cr))) {
- PATCHER_MONITOREXIT;
-
+ if (!(m = resolve_method_eager(um)))
return false;
- }
- /* patch back original code */
+ PATCH_BACK_ORIGINAL_MCODE;
- *((u4 *) ra) = mcode;
-
- /* synchronize instruction cache */
-
- asm_cacheflush(ra, 4);
+ /* patch stubroutine */
- /* patch class flags */
+ *((ptrint *) datap) = (ptrint) m->stubroutine;
- *((s4 *) (pv + disp)) = (s4) c->flags;
+ /* synchronize data cache */
- PATCHER_MARK_PATCHED_MONITOREXIT;
+ md_dcacheflush(datap, SIZEOF_VOID_P);
return true;
}
-/* patcher_checkcast_instanceof_interface **************************************
+/* patcher_invokevirtual *******************************************************
Machine code:
<patched call position>
- 81870000 lwz r12,0(r7)
- 800c0010 lwz r0,16(r12)
- 34000000 addic. r0,r0,0
- 408101fc ble- 0x3002e518
- 800c0000 lwz r0,0(r12)
+ 81830000 lwz r12,0(r3)
+ 81ac0088 lwz r13,136(r12)
+ 7da903a6 mtctr r13
+ 4e800421 bctrl
*******************************************************************************/
-bool patcher_checkcast_instanceof_interface(u1 *sp)
+bool patcher_invokevirtual(patchref_t *pr)
{
u1 *ra;
- java_objectheader *o;
- u4 mcode;
- constant_classref *cr;
- classinfo *c;
+ unresolved_method *um;
+ methodinfo *m;
+ s4 disp;
/* get stuff from the stack */
- ra = (u1 *) *((ptrint *) (sp + 5 * 4));
- o = (java_objectheader *) *((ptrint *) (sp + 4 * 4));
- mcode = *((u4 *) (sp + 3 * 4));
- cr = (constant_classref *) *((ptrint *) (sp + 2 * 4));
-
- PATCHER_MONITORENTER;
+ ra = (u1 *) pr->mpc;
+ um = (unresolved_method *) pr->ref;
/* get the fieldinfo */
- if (!(c = resolve_classref_eager(cr))) {
- PATCHER_MONITOREXIT;
-
+ if (!(m = resolve_method_eager(um)))
return false;
- }
- /* patch back original code */
+ PATCH_BACK_ORIGINAL_MCODE;
- *((u4 *) ra) = mcode;
+ /* if we show NOPs, we have to skip them */
- /* if we show disassembly, we have to skip the nop */
+ if (opt_shownops)
+ ra = ra + 1 * 4;
- if (opt_showdisassemble)
- ra = ra + 4;
-
- /* patch super class index */
+ /* patch vftbl index */
- *((s4 *) (ra + 2 * 4)) |= (s4) (-(c->index) & 0x0000ffff);
+ disp = (OFFSET(vftbl_t, table[0]) + sizeof(methodptr) * m->vftblindex);
- *((s4 *) (ra + 4 * 4)) |= (s4) ((OFFSET(vftbl_t, interfacetable[0]) -
- c->index * sizeof(methodptr*)) & 0x0000ffff);
+ *((s4 *) (ra + 1 * 4)) |= (disp & 0x0000ffff);
/* synchronize instruction cache */
- asm_cacheflush(ra, 5 * 4);
-
- PATCHER_MARK_PATCHED_MONITOREXIT;
+ md_icacheflush(ra + 1 * 4, 1 * 4);
return true;
}
-/* patcher_checkcast_class *****************************************************
+/* patcher_invokeinterface *****************************************************
Machine code:
<patched call position>
- 81870000 lwz r12,0(r7)
- 800c0014 lwz r0,20(r12)
- 818dff78 lwz r12,-136(r13)
+ 81830000 lwz r12,0(r3)
+ 818cffd0 lwz r12,-48(r12)
+ 81ac000c lwz r13,12(r12)
+ 7da903a6 mtctr r13
+ 4e800421 bctrl
*******************************************************************************/
-bool patcher_checkcast_class(u1 *sp)
+bool patcher_invokeinterface(patchref_t *pr)
{
u1 *ra;
- java_objectheader *o;
- u4 mcode;
- constant_classref *cr;
+ unresolved_method *um;
+ methodinfo *m;
s4 disp;
- u1 *pv;
- classinfo *c;
/* get stuff from the stack */
- ra = (u1 *) *((ptrint *) (sp + 5 * 4));
- o = (java_objectheader *) *((ptrint *) (sp + 4 * 4));
- mcode = *((u4 *) (sp + 3 * 4));
- cr = (constant_classref *) *((ptrint *) (sp + 2 * 4));
- disp = *((s4 *) (sp + 1 * 4));
- pv = (u1 *) *((ptrint *) (sp + 0 * 4));
-
- PATCHER_MONITORENTER;
+ ra = (u1 *) pr->mpc;
+ um = (unresolved_method *) pr->ref;
/* get the fieldinfo */
- if (!(c = resolve_classref_eager(cr))) {
- PATCHER_MONITOREXIT;
-
+ if (!(m = resolve_method_eager(um)))
return false;
- }
- /* patch back original code */
+ PATCH_BACK_ORIGINAL_MCODE;
- *((u4 *) ra) = mcode;
+ /* if we show NOPs, we have to skip them */
- /* synchronize instruction cache */
+ if (opt_shownops)
+ ra = ra + 1 * 4;
+
+ /* patch interfacetable index */
- asm_cacheflush(ra, 4);
+ disp = OFFSET(vftbl_t, interfacetable[0]) -
+ sizeof(methodptr*) * m->class->index;
- /* patch super class' vftbl */
+ /* XXX TWISTI: check displacement */
+
+ *((s4 *) (ra + 1 * 4)) |= (disp & 0x0000ffff);
- *((ptrint *) (pv + disp)) = (ptrint) c->vftbl;
+ /* patch method offset */
+
+ disp = sizeof(methodptr) * (m - m->class->methods);
+
+ /* XXX TWISTI: check displacement */
+
+ *((s4 *) (ra + 2 * 4)) |= (disp & 0x0000ffff);
+
+ /* synchronize instruction cache */
- PATCHER_MARK_PATCHED_MONITOREXIT;
+ md_icacheflush(ra + 1 * 4, 2 * 4);
return true;
}
-/* patcher_instanceof_class ****************************************************
+/* patcher_checkcast_interface *************************************************
Machine code:
<patched call position>
- 817d0000 lwz r11,0(r29)
- 818dff8c lwz r12,-116(r13)
+ 81870000 lwz r12,0(r7)
+ 800c0010 lwz r0,16(r12)
+ 34000000 addic. r0,r0,0
+ 41810008 bgt- 0x014135d8
+ 83c00003 lwz r30,3(0)
+ 800c0000 lwz r0,0(r12)
*******************************************************************************/
-bool patcher_instanceof_class(u1 *sp)
+bool patcher_checkcast_interface(patchref_t *pr)
{
u1 *ra;
- java_objectheader *o;
- u4 mcode;
constant_classref *cr;
- s4 disp;
- u1 *pv;
classinfo *c;
+ s4 disp;
/* get stuff from the stack */
- ra = (u1 *) *((ptrint *) (sp + 5 * 4));
- o = (java_objectheader *) *((ptrint *) (sp + 4 * 4));
- mcode = *((u4 *) (sp + 3 * 4));
- cr = (constant_classref *) *((ptrint *) (sp + 2 * 4));
- disp = *((s4 *) (sp + 1 * 4));
- pv = (u1 *) *((ptrint *) (sp + 0 * 4));
-
- PATCHER_MONITORENTER;
+ ra = (u1 *) pr->mpc;
+ cr = (constant_classref *) pr->ref;
/* get the fieldinfo */
- if (!(c = resolve_classref_eager(cr))) {
- PATCHER_MONITOREXIT;
-
+ if (!(c = resolve_classref_eager(cr)))
return false;
- }
-
- /* patch back original code */
- *((u4 *) ra) = mcode;
+ PATCH_BACK_ORIGINAL_MCODE;
- /* synchronize instruction cache */
+ /* if we show NOPs, we have to skip them */
- asm_cacheflush(ra, 4);
-
- /* patch super class' vftbl */
+ if (opt_shownops)
+ ra = ra + 1 * 4;
- *((ptrint *) (pv + disp)) = (ptrint) c->vftbl;
-
- PATCHER_MARK_PATCHED_MONITOREXIT;
-
- return true;
-}
-
-
-/* patcher_clinit **************************************************************
-
- XXX
-
-*******************************************************************************/
-
-bool patcher_clinit(u1 *sp)
-{
- u1 *ra;
- java_objectheader *o;
- u4 mcode;
- classinfo *c;
-
- /* get stuff from the stack */
-
- ra = (u1 *) *((ptrint *) (sp + 5 * 4));
- o = (java_objectheader *) *((ptrint *) (sp + 4 * 4));
- mcode = *((u4 *) (sp + 3 * 4));
- c = (classinfo *) *((ptrint *) (sp + 2 * 4));
+ /* patch super class index */
- PATCHER_MONITORENTER;
+ disp = -(c->index);
- /* check if the class is initialized */
+ *((s4 *) (ra + 2 * 4)) |= (disp & 0x0000ffff);
- if (!(c->state & CLASS_INITIALIZED)) {
- if (!initialize_class(c)) {
- PATCHER_MONITOREXIT;
+ disp = OFFSET(vftbl_t, interfacetable[0]) - c->index * sizeof(methodptr*);
- return false;
- }
- }
-
- /* patch back original code */
-
- *((u4 *) ra) = mcode;
+ *((s4 *) (ra + 5 * 4)) |= (disp & 0x0000ffff);
/* synchronize instruction cache */
- asm_cacheflush(ra, 4);
-
- PATCHER_MARK_PATCHED_MONITOREXIT;
+ md_icacheflush(ra + 2 * 4, 4 * 4);
return true;
}
-/* patcher_athrow_areturn ******************************************************
+/* patcher_instanceof_interface ************************************************
Machine code:
<patched call position>
+ 81870000 lwz r12,0(r7)
+ 800c0010 lwz r0,16(r12)
+ 34000000 addic. r0,r0,0
+ 41810008 bgt- 0x014135d8
+ 83c00003 lwz r30,3(0)
+ 800c0000 lwz r0,0(r12)
*******************************************************************************/
-#ifdef ENABLE_VERIFIER
-bool patcher_athrow_areturn(u1 *sp)
+bool patcher_instanceof_interface(patchref_t *pr)
{
u1 *ra;
- java_objectheader *o;
- u4 mcode;
- unresolved_class *uc;
+ constant_classref *cr;
classinfo *c;
+ s4 disp;
/* get stuff from the stack */
- ra = (u1 *) *((ptrint *) (sp + 5 * 4));
- o = (java_objectheader *) *((ptrint *) (sp + 4 * 4));
- mcode = *((u4 *) (sp + 3 * 4));
- uc = (unresolved_class *) *((ptrint *) (sp + 2 * 4));
+ ra = (u1 *) pr->mpc;
+ cr = (constant_classref *) pr->ref;
- PATCHER_MONITORENTER;
-
- /* resolve the class */
-
- if (!resolve_class(uc, resolveEager, false, &c)) {
- PATCHER_MONITOREXIT;
+ /* get the fieldinfo */
+ if (!(c = resolve_classref_eager(cr)))
return false;
- }
-
- /* patch back original code */
-
- *((u4 *) ra) = mcode;
-
- /* synchronize instruction cache */
-
- asm_cacheflush(ra, 4);
-
- PATCHER_MARK_PATCHED_MONITOREXIT;
-
- return true;
-}
-#endif /* ENABLE_VERIFIER */
-
-
-/* patcher_resolve_native ******************************************************
- XXX
-
-*******************************************************************************/
-
-#if !defined(WITH_STATIC_CLASSPATH)
-bool patcher_resolve_native(u1 *sp)
-{
- u1 *ra;
- java_objectheader *o;
- u4 mcode;
- methodinfo *m;
- s4 disp;
- u1 *pv;
- functionptr f;
-
- /* get stuff from the stack */
+ PATCH_BACK_ORIGINAL_MCODE;
- ra = (u1 *) *((ptrint *) (sp + 5 * 4));
- o = (java_objectheader *) *((ptrint *) (sp + 4 * 4));
- mcode = *((u4 *) (sp + 3 * 4));
- m = (methodinfo *) *((ptrint *) (sp + 2 * 4));
- disp = *((s4 *) (sp + 1 * 4));
- pv = (u1 *) *((ptrint *) (sp + 0 * 4));
+ /* if we show NOPs, we have to skip them */
- /* calculate and set the new return address */
+ if (opt_shownops)
+ ra = ra + 1 * 4;
- ra = ra - 1 * 4;
- *((ptrint *) (sp + 5 * 4)) = (ptrint) ra;
-
- PATCHER_MONITORENTER;
-
- /* resolve native function */
+ /* patch super class index */
- if (!(f = native_resolve_function(m))) {
- PATCHER_MONITOREXIT;
+ disp = -(c->index);
- return false;
- }
+ *((s4 *) (ra + 2 * 4)) |= (disp & 0x0000ffff);
- /* patch back original code */
+ disp = OFFSET(vftbl_t, interfacetable[0]) - c->index * sizeof(methodptr*);
- *((u4 *) ra) = mcode;
+ *((s4 *) (ra + 4 * 4)) |= (disp & 0x0000ffff);
/* synchronize instruction cache */
- asm_cacheflush(ra, 4);
-
- /* patch native function pointer */
-
- *((ptrint *) (pv + disp)) = (ptrint) f;
-
- PATCHER_MARK_PATCHED_MONITOREXIT;
+ md_icacheflush(ra + 2 * 4, 3 * 4);
return true;
}
-#endif /* !defined(WITH_STATIC_CLASSPATH) */
/*