/* 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 5035 2006-06-19 21:00:05Z twisti $
+ $Id: patcher.c 7486 2007-03-08 13:50:07Z twisti $
*/
#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/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 *******************************************************
- Machine code:
+/* patcher_wrapper *************************************************************
- <patched call position>
- 816dffc8 lwz r11,-56(r13)
- 80ab0000 lwz r5,0(r11)
+ Wrapper for all patchers. It also creates the stackframe info
+ structure.
+
+ If the return value of the patcher function is false, it gets the
+ exception object, clears the exception pointer and returns the
+ exception.
*******************************************************************************/
-bool patcher_get_putstatic(u1 *sp)
+java_objectheader *patcher_wrapper(u1 *sp, u1 *pv, u1 *ra)
{
- u1 *ra;
+ stackframeinfo sfi;
+ u1 *xpc;
java_objectheader *o;
u4 mcode;
- unresolved_field *uf;
- s4 disp;
- u1 *pv;
- fieldinfo *fi;
+ functionptr f;
+ bool result;
+ java_objectheader *e;
+
+ /* define the patcher function */
+
+ bool (*patcher_function)(u1 *);
+
+ assert(pv != NULL);
/* 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));
+ xpc = (u1 *) *((ptrint *) (sp + 5 * 4));
+ o = (java_objectheader *) *((ptrint *) (sp + 4 * 4));
+ f = (functionptr) *((ptrint *) (sp + 0 * 4));
- PATCHER_MONITORENTER;
+ /* Correct RA is calculated in codegen.c and stored in the patcher
+ stub stack. There's no need to adjust xpc. */
- /* get the fieldinfo */
+ /* store PV into the patcher function position */
- if (!(fi = resolve_field_eager(uf))) {
- PATCHER_MONITOREXIT;
+ *((ptrint *) (sp + 0 * 4)) = (ptrint) pv;
- return false;
- }
+ /* cast the passed function to a patcher function */
- /* check if the field's class is initialized */
+ patcher_function = (bool (*)(u1 *)) (ptrint) f;
- if (!(fi->class->state & CLASS_INITIALIZED)) {
- if (!initialize_class(fi->class)) {
- PATCHER_MONITOREXIT;
+ /* enter a monitor on the patching position */
- return false;
- }
- }
+ PATCHER_MONITORENTER;
- /* patch back original code */
+ /* create the stackframeinfo */
- *((u4 *) ra) = mcode;
+ stacktrace_create_extern_stackframeinfo(&sfi, pv, sp + 8 * 4, ra, xpc);
- /* synchronize instruction cache */
+ /* call the proper patcher function */
- md_icacheflush(ra, 4);
+ result = (patcher_function)(sp);
- /* patch the field value's address */
+ /* remove the stackframeinfo */
- *((ptrint *) (pv + disp)) = (ptrint) &(fi->value);
+ stacktrace_remove_stackframeinfo(&sfi);
- /* synchronize data cache */
+ /* check for return value and exit accordingly */
- md_dcacheflush(pv + disp, SIZEOF_VOID_P);
+ if (result == false) {
+ e = exceptions_get_and_clear_exception();
- PATCHER_MARK_PATCHED_MONITOREXIT;
+ PATCHER_MONITOREXIT;
- return true;
-}
+ return e;
+ }
+ /* patch back original code */
-/* patcher_get_putfield ********************************************************
+ mcode = *((u4 *) (sp + 3 * 4));
- Machine code:
+ *((u4 *) xpc) = mcode;
- <patched call position>
- 811f0014 lwz r8,20(r31)
+ /* synchronize instruction cache */
-*******************************************************************************/
+ md_icacheflush(xpc, 4);
-bool patcher_get_putfield(u1 *sp)
-{
- u1 *ra;
- java_objectheader *o;
- u4 mcode;
- unresolved_field *uf;
- u1 *pv;
- fieldinfo *fi;
+ PATCHER_MARK_PATCHED_MONITOREXIT;
- 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));
+ return NULL;
+}
- PATCHER_MONITORENTER;
- /* get the fieldinfo */
+/* patcher_initialize_class ****************************************************
- if (!(fi = resolve_field_eager(uf))) {
- PATCHER_MONITOREXIT;
+ Initalizes a given classinfo pointer. This function does not patch
+ any data.
- return false;
- }
+*******************************************************************************/
- /* patch back original code */
+bool patcher_initialize_class(u1 *sp)
+{
+ classinfo *c;
- *((u4 *) ra) = mcode;
+ /* get stuff from the stack */
- /* if we show disassembly, we have to skip the nop */
+ c = (classinfo *) *((ptrint *) (sp + 2 * 4));
- if (opt_showdisassemble)
- ra = ra + 4;
+ /* check if the class is initialized */
- /* patch the field's offset */
+ if (!(c->state & CLASS_INITIALIZED))
+ if (!initialize_class(c))
+ return false;
- if (fi->type == TYPE_LNG) {
- s2 disp;
+ return true;
+}
- /* 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));
+/* patcher_resolve_class *******************************************************
-#if WORDS_BIGENDIAN == 1
- if (disp == 4) {
- *((u4 *) (ra + 0)) |= (s2) ((fi->offset + 4) & 0x0000ffff);
- *((u4 *) (ra + 4)) |= (s2) ((fi->offset + 0) & 0x0000ffff);
+ Resolves a given unresolved_class pointer. This function does not
+ patch any data.
- } 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 */
+#ifdef ENABLE_VERIFIER
+bool patcher_resolve_class(u1 *sp)
+{
+ unresolved_class *uc;
- md_icacheflush(ra, 8);
+ /* get stuff from the stack */
- PATCHER_MARK_PATCHED_MONITOREXIT;
+ uc = (unresolved_class *) *((ptrint *) (sp + 2 * 4));
+
+ /* resolve the class and check subtype constraints */
+
+ if (!resolve_class_eager_no_access_check(uc))
+ return false;
return true;
}
+#endif /* ENABLE_VERIFIER */
-/* patcher_aconst **************************************************************
+/* patcher_resolve_classref_to_classinfo ***************************************
- Machine code:
+ ACONST:
<patched call postition>
806dffc4 lwz r3,-60(r13)
7da903a6 mtctr r13
4e800421 bctrl
+
+ MULTIANEWARRAY:
+
+ <patched call position>
+ 808dffc0 lwz r4,-64(r13)
+ 38a10038 addi r5,r1,56
+ 81adffbc lwz r13,-68(r13)
+ 7da903a6 mtctr r13
+ 4e800421 bctrl
+
+
+ ARRAYCHECKCAST:
+
+ <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(u1 *sp)
{
- u1 *ra;
- java_objectheader *o;
- u4 mcode;
constant_classref *cr;
s4 disp;
u1 *pv;
/* 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 *) *((ptrint *) (sp + 2 * 4));
+ disp = *((s4 *) (sp + 1 * 4));
+ pv = (u1 *) *((ptrint *) (sp + 0 * 4));
/* 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 */
-
- md_icacheflush(ra, 4);
/* patch the classinfo pointer */
md_dcacheflush(pv + disp, SIZEOF_VOID_P);
- PATCHER_MARK_PATCHED_MONITOREXIT;
-
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(u1 *sp)
{
- u1 *ra;
- java_objectheader *o;
- u4 mcode;
constant_classref *cr;
s4 disp;
u1 *pv;
/* 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;
-
- /* get the classinfo */
+ cr = (constant_classref *) *((ptrint *) (sp + 2 * 4));
+ disp = *((s4 *) (sp + 1 * 4));
+ pv = (u1 *) *((ptrint *) (sp + 0 * 4));
- 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;
- /* synchronize instruction cache */
-
- md_icacheflush(ra, 4);
-
- /* patch the classinfo pointer */
+ /* patch super class' vftbl */
- *((ptrint *) (pv + disp)) = (ptrint) c;
+ *((ptrint *) (pv + disp)) = (ptrint) c->vftbl;
/* synchronize data cache */
md_dcacheflush(pv + disp, SIZEOF_VOID_P);
- PATCHER_MARK_PATCHED_MONITOREXIT;
-
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(u1 *sp)
{
- u1 *ra;
- java_objectheader *o;
- u4 mcode;
constant_classref *cr;
s4 disp;
u1 *pv;
/* 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 *) *((ptrint *) (sp + 2 * 4));
+ disp = *((s4 *) (sp + 1 * 4));
+ pv = (u1 *) *((ptrint *) (sp + 0 * 4));
- PATCHER_MONITORENTER;
+ /* get the fieldinfo */
- /* get the classinfo */
+ if (!(c = resolve_classref_eager(cr)))
+ return false;
- if (!(c = resolve_classref_eager(cr))) {
- PATCHER_MONITOREXIT;
+ /* patch class flags */
- return false;
- }
+ *((s4 *) (pv + disp)) = (s4) c->flags;
- /* patch back original code */
+ /* synchronize data cache */
- *((u4 *) ra) = mcode;
+ md_dcacheflush(pv + disp, SIZEOF_VOID_P);
- /* synchronize instruction cache */
+ return true;
+}
- md_icacheflush(ra, 4);
- /* patch the classinfo pointer */
+/* patcher_resolve_native_function *********************************************
- *((ptrint *) (pv + disp)) = (ptrint) c;
+ XXX
+
+*******************************************************************************/
+
+#if !defined(WITH_STATIC_CLASSPATH)
+bool patcher_resolve_native_function(u1 *sp)
+{
+ methodinfo *m;
+ s4 disp;
+ u1 *pv;
+ functionptr f;
+
+ /* get stuff from the stack */
+
+ m = (methodinfo *) *((ptrint *) (sp + 2 * 4));
+ disp = *((s4 *) (sp + 1 * 4));
+ pv = (u1 *) *((ptrint *) (sp + 0 * 4));
+
+ /* resolve native function */
+
+ if (!(f = native_resolve_function(m)))
+ return false;
+
+ /* patch native function pointer */
+
+ *((ptrint *) (pv + disp)) = (ptrint) f;
/* synchronize data cache */
md_dcacheflush(pv + disp, SIZEOF_VOID_P);
- PATCHER_MARK_PATCHED_MONITOREXIT;
-
return true;
}
+#endif /* !defined(WITH_STATIC_CLASSPATH) */
-/* patcher_invokestatic_special ************************************************
+/* patcher_get_putstatic *******************************************************
Machine code:
<patched call position>
- 81adffd8 lwz r13,-40(r13)
- 7da903a6 mtctr r13
- 4e800421 bctrl
+ 816dffc8 lwz r11,-56(r13)
+ 80ab0000 lwz r5,0(r11)
-******************************************************************************/
+*******************************************************************************/
-bool patcher_invokestatic_special(u1 *sp)
+bool patcher_get_putstatic(u1 *sp)
{
- u1 *ra;
- java_objectheader *o;
- u4 mcode;
- unresolved_method *um;
- s4 disp;
- u1 *pv;
- methodinfo *m;
+ u1 *ra;
+ u4 mcode;
+ unresolved_field *uf;
+ s4 disp;
+ u1 *pv;
+ 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));
+ uf = (unresolved_field *) *((ptrint *) (sp + 2 * 4));
disp = *((s4 *) (sp + 1 * 4));
pv = (u1 *) *((ptrint *) (sp + 0 * 4));
- PATCHER_MONITORENTER;
-
/* 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;
- /* synchronize instruction cache */
+ /* check if the field's class is initialized */
- md_icacheflush(ra, 4);
+ if (!(fi->class->state & CLASS_INITIALIZED))
+ if (!initialize_class(fi->class))
+ return false;
- /* patch stubroutine */
+ /* patch the field value's address */
- *((ptrint *) (pv + disp)) = (ptrint) m->stubroutine;
+ *((ptrint *) (pv + disp)) = (ptrint) &(fi->value);
/* synchronize data cache */
md_dcacheflush(pv + disp, SIZEOF_VOID_P);
- PATCHER_MARK_PATCHED_MONITOREXIT;
-
return true;
}
-/* patcher_invokevirtual *******************************************************
+/* patcher_get_putfield ********************************************************
Machine code:
<patched call position>
- 81830000 lwz r12,0(r3)
- 81ac0088 lwz r13,136(r12)
- 7da903a6 mtctr r13
- 4e800421 bctrl
+ 811f0014 lwz r8,20(r31)
*******************************************************************************/
-bool patcher_invokevirtual(u1 *sp)
+bool patcher_get_putfield(u1 *sp)
{
- u1 *ra;
- java_objectheader *o;
- u4 mcode;
- unresolved_method *um;
- methodinfo *m;
- s4 disp;
+ u1 *ra;
+ unresolved_field *uf;
+ u1 *pv;
+ fieldinfo *fi;
+ s2 disp;
- /* 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 *) *((ptrint *) (sp + 5 * 4));
+ uf = (unresolved_field *) *((ptrint *) (sp + 2 * 4));
+ pv = (u1 *) *((ptrint *) (sp + 1 * 4));
/* 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 NOPs, we have to skip them */
- /* if we show disassembly, we have to skip the nop */
+ if (opt_shownops) {
+ /* patch the field's offset */
- if (opt_showdisassemble)
- ra = ra + 4;
+ 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. */
- /* patch vftbl index */
-
- disp = (OFFSET(vftbl_t, table[0]) + sizeof(methodptr) * m->vftblindex);
+ disp = *((u4 *) (ra + 1 * 4));
- *((s4 *) (ra + 4)) |= (disp & 0x0000ffff);
+ if (disp == 4) {
+ *((u4 *) (ra + 1 * 4)) |= (s2) ((fi->offset + 4) & 0x0000ffff);
+ *((u4 *) (ra + 2 * 4)) |= (s2) ((fi->offset + 0) & 0x0000ffff);
+ }
+ else {
+ *((u4 *) (ra + 1 * 4)) |= (s2) ((fi->offset + 0) & 0x0000ffff);
+ *((u4 *) (ra + 2 * 4)) |= (s2) ((fi->offset + 4) & 0x0000ffff);
+ }
+ }
+ else
+ *((u4 *) (ra + 1 * 4)) |= (s2) (fi->offset & 0x0000ffff);
+ }
+ else {
+ if (IS_LNG_TYPE(fi->type)) {
+
+ disp = *((u4 *) (sp + 3 * 4));
+
+ /* We patch the first instruction in the patcher stub
+ stack and the second in the code. The first
+ instruction is patched back later in
+ patcher_wrapper. */
+
+ if (disp == 4) {
+ *((u4 *) (sp + 3 * 4)) |= (s2) ((fi->offset + 4) & 0x0000ffff);
+ *((u4 *) (ra + 1 * 4)) |= (s2) ((fi->offset + 0) & 0x0000ffff);
+ }
+ else {
+ *((u4 *) (sp + 3 * 4)) |= (s2) ((fi->offset + 0) & 0x0000ffff);
+ *((u4 *) (ra + 1 * 4)) |= (s2) ((fi->offset + 4) & 0x0000ffff);
+ }
+ }
+ else
+ *((u4 *) (sp + 3 * 4)) |= (s2) (fi->offset & 0x0000ffff);
+ }
/* synchronize instruction cache */
- md_icacheflush(ra, 2 * 4);
-
- PATCHER_MARK_PATCHED_MONITOREXIT;
+ md_icacheflush(ra + 1 * 4, 2 * 4);
return true;
}
-/* patcher_invokeinterface *****************************************************
+/* patcher_invokestatic_special ************************************************
Machine code:
<patched call position>
- 81830000 lwz r12,0(r3)
- 818cffd0 lwz r12,-48(r12)
- 81ac000c lwz r13,12(r12)
+ 81adffd8 lwz r13,-40(r13)
7da903a6 mtctr r13
4e800421 bctrl
-*******************************************************************************/
+******************************************************************************/
-bool patcher_invokeinterface(u1 *sp)
+bool patcher_invokestatic_special(u1 *sp)
{
- u1 *ra;
- java_objectheader *o;
- u4 mcode;
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));
- um = (unresolved_method *) *((ptrint *) (sp + 2 * 4));
-
- PATCHER_MONITORENTER;
-
- /* get the fieldinfo */
-
- if (!(m = resolve_method_eager(um))) {
- PATCHER_MONITOREXIT;
-
- 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;
-
- /* 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);
-
- PATCHER_MARK_PATCHED_MONITOREXIT;
-
- return true;
-}
-
-
-/* patcher_checkcast_instanceof_flags ******************************************
-
- Machine code:
-
- <patched call position>
- 818dff7c lwz r12,-132(r13)
-
-*******************************************************************************/
-
-bool patcher_checkcast_instanceof_flags(u1 *sp)
-{
- u1 *ra;
- java_objectheader *o;
- u4 mcode;
- constant_classref *cr;
s4 disp;
u1 *pv;
- classinfo *c;
+ 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 *) *((ptrint *) (sp + 2 * 4));
+ disp = *((s4 *) (sp + 1 * 4));
+ pv = (u1 *) *((ptrint *) (sp + 0 * 4));
/* get the fieldinfo */
- if (!(c = resolve_classref_eager(cr))) {
- PATCHER_MONITOREXIT;
-
+ if (!(m = resolve_method_eager(um)))
return false;
- }
- /* patch back original code */
-
- *((u4 *) ra) = mcode;
-
- /* synchronize instruction cache */
-
- md_icacheflush(ra, 4);
-
- /* patch class flags */
+ /* patch stubroutine */
- *((s4 *) (pv + disp)) = (s4) c->flags;
+ *((ptrint *) (pv + disp)) = (ptrint) m->stubroutine;
/* synchronize data cache */
md_dcacheflush(pv + disp, SIZEOF_VOID_P);
- PATCHER_MARK_PATCHED_MONITOREXIT;
-
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(u1 *sp)
{
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 *) *((ptrint *) (sp + 5 * 4));
+ um = (unresolved_method *) *((ptrint *) (sp + 2 * 4));
/* get the fieldinfo */
- if (!(c = resolve_classref_eager(cr))) {
- PATCHER_MONITOREXIT;
-
+ if (!(m = resolve_method_eager(um)))
return false;
- }
- /* patch back original code */
+ /* if we show NOPs, we have to skip them */
- *((u4 *) ra) = mcode;
+ if (opt_shownops)
+ ra = ra + 1 * 4;
- /* 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 vftbl index */
- disp = OFFSET(vftbl_t, interfacetable[0]) - c->index * sizeof(methodptr*);
+ disp = (OFFSET(vftbl_t, table[0]) + sizeof(methodptr) * m->vftblindex);
- *((s4 *) (ra + 4 * 4)) |= (disp & 0x0000ffff);
+ *((s4 *) (ra + 1 * 4)) |= (disp & 0x0000ffff);
/* synchronize instruction cache */
- md_icacheflush(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(u1 *sp)
{
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 *) *((ptrint *) (sp + 5 * 4));
+ um = (unresolved_method *) *((ptrint *) (sp + 2 * 4));
/* get the fieldinfo */
- if (!(c = resolve_classref_eager(cr))) {
- PATCHER_MONITOREXIT;
-
+ if (!(m = resolve_method_eager(um)))
return false;
- }
- /* patch back original code */
+ /* if we show NOPs, we have to skip them */
- *((u4 *) ra) = mcode;
+ if (opt_shownops)
+ ra = ra + 1 * 4;
- /* synchronize instruction cache */
+ /* patch interfacetable index */
- md_icacheflush(ra, 4);
+ disp = OFFSET(vftbl_t, interfacetable[0]) -
+ sizeof(methodptr*) * m->class->index;
- /* patch super class' vftbl */
+ /* XXX TWISTI: check displacement */
- *((ptrint *) (pv + disp)) = (ptrint) c->vftbl;
+ *((s4 *) (ra + 1 * 4)) |= (disp & 0x0000ffff);
- /* synchronize data cache */
+ /* patch method offset */
- md_dcacheflush(pv + disp, SIZEOF_VOID_P);
+ disp = sizeof(methodptr) * (m - m->class->methods);
- PATCHER_MARK_PATCHED_MONITOREXIT;
+ /* XXX TWISTI: check displacement */
+
+ *((s4 *) (ra + 2 * 4)) |= (disp & 0x0000ffff);
+
+ /* synchronize instruction cache */
+
+ 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(u1 *sp)
{
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 *) *((ptrint *) (sp + 5 * 4));
+ cr = (constant_classref *) *((ptrint *) (sp + 2 * 4));
/* 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;
-
- /* synchronize instruction cache */
-
- md_icacheflush(ra, 4);
+ /* if we show NOPs, we have to skip them */
- /* patch super class' vftbl */
+ if (opt_shownops)
+ ra = ra + 1 * 4;
- *((ptrint *) (pv + disp)) = (ptrint) c->vftbl;
-
- /* synchronize data cache */
-
- md_dcacheflush(pv + disp, SIZEOF_VOID_P);
-
- 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));
-
- PATCHER_MONITORENTER;
-
- /* check if the class is initialized */
+ /* patch super class index */
- if (!(c->state & CLASS_INITIALIZED)) {
- if (!initialize_class(c)) {
- 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 + 5 * 4)) |= (disp & 0x0000ffff);
/* synchronize instruction cache */
- md_icacheflush(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(u1 *sp)
{
u1 *ra;
- java_objectheader *o;
- u4 mcode;
- unresolved_class *uc;
+ constant_classref *cr;
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));
- uc = (unresolved_class *) *((ptrint *) (sp + 2 * 4));
-
- PATCHER_MONITORENTER;
-
- /* resolve the class */
-
- if (!resolve_class(uc, resolveEager, false, &c)) {
- PATCHER_MONITOREXIT;
-
- return false;
- }
-
- /* patch back original code */
-
- *((u4 *) ra) = mcode;
-
- /* synchronize instruction cache */
-
- md_icacheflush(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 */
- 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));
-
- /* calculate and set the new return address */
-
- ra = ra - 1 * 4;
- *((ptrint *) (sp + 5 * 4)) = (ptrint) ra;
+ ra = (u1 *) *((ptrint *) (sp + 5 * 4));
+ cr = (constant_classref *) *((ptrint *) (sp + 2 * 4));
- PATCHER_MONITORENTER;
-
- /* resolve native function */
-
- if (!(f = native_resolve_function(m))) {
- PATCHER_MONITOREXIT;
+ /* get the fieldinfo */
+ if (!(c = resolve_classref_eager(cr)))
return false;
- }
- /* patch back original code */
+ /* if we show NOPs, we have to skip them */
- *((u4 *) ra) = mcode;
+ if (opt_shownops)
+ ra = ra + 1 * 4;
- /* synchronize instruction cache */
+ /* patch super class index */
- md_icacheflush(ra, 4);
+ disp = -(c->index);
- /* patch native function pointer */
+ *((s4 *) (ra + 2 * 4)) |= (disp & 0x0000ffff);
- *((ptrint *) (pv + disp)) = (ptrint) f;
+ disp = OFFSET(vftbl_t, interfacetable[0]) - c->index * sizeof(methodptr*);
- /* synchronize data cache */
+ *((s4 *) (ra + 4 * 4)) |= (disp & 0x0000ffff);
- md_dcacheflush(pv + disp, SIZEOF_VOID_P);
+ /* synchronize instruction cache */
- PATCHER_MARK_PATCHED_MONITOREXIT;
+ md_icacheflush(ra + 2 * 4, 3 * 4);
return true;
}
-#endif /* !defined(WITH_STATIC_CLASSPATH) */
/*
projects / cacao.git / blobdiff