/* 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 4530 2006-02-21 09:11:53Z twisti $
+ $Id: patcher.c 7486 2007-03-08 13:50:07Z twisti $
*/
#include "config.h"
+
+#include <assert.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/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;
-
- /* 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));
-
- PATCHER_MONITORENTER;
-
- /* get the fieldinfo */
-
- if (!(fi = resolve_field_eager(uf))) {
- PATCHER_MONITOREXIT;
-
- return false;
- }
+ functionptr f;
+ bool result;
+ java_objectheader *e;
- /* check if the field's class is initialized */
+ /* define the patcher function */
- if (!(fi->class->state & CLASS_INITIALIZED)) {
- if (!initialize_class(fi->class)) {
- PATCHER_MONITOREXIT;
+ bool (*patcher_function)(u1 *);
- return false;
- }
- }
+ assert(pv != NULL);
- /* patch back original code */
+ /* get stuff from the stack */
- *((u4 *) ra) = mcode;
+ xpc = (u1 *) *((ptrint *) (sp + 5 * 4));
+ o = (java_objectheader *) *((ptrint *) (sp + 4 * 4));
+ f = (functionptr) *((ptrint *) (sp + 0 * 4));
- /* synchronize instruction cache */
+ /* Correct RA is calculated in codegen.c and stored in the patcher
+ stub stack. There's no need to adjust xpc. */
- asm_cacheflush(ra, 4);
+ /* store PV into the patcher function position */
- /* patch the field value's address */
+ *((ptrint *) (sp + 0 * 4)) = (ptrint) pv;
- *((ptrint *) (pv + disp)) = (ptrint) &(fi->value);
+ /* cast the passed function to a patcher function */
- PATCHER_MARK_PATCHED_MONITOREXIT;
+ patcher_function = (bool (*)(u1 *)) (ptrint) f;
- return true;
-}
+ /* enter a monitor on the patching position */
+ PATCHER_MONITORENTER;
-/* patcher_get_putfield ********************************************************
+ /* create the stackframeinfo */
- Machine code:
+ stacktrace_create_extern_stackframeinfo(&sfi, pv, sp + 8 * 4, ra, xpc);
- <patched call position>
- 811f0014 lwz r8,20(r31)
+ /* call the proper patcher function */
-*******************************************************************************/
+ result = (patcher_function)(sp);
-bool patcher_get_putfield(u1 *sp)
-{
- u1 *ra;
- java_objectheader *o;
- u4 mcode;
- unresolved_field *uf;
- u1 *pv;
- fieldinfo *fi;
+ /* remove the stackframeinfo */
- 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));
+ stacktrace_remove_stackframeinfo(&sfi);
- PATCHER_MONITORENTER;
+ /* check for return value and exit accordingly */
- /* get the fieldinfo */
+ if (result == false) {
+ e = exceptions_get_and_clear_exception();
- if (!(fi = resolve_field_eager(uf))) {
PATCHER_MONITOREXIT;
- return false;
+ return e;
}
/* 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 */
+ mcode = *((u4 *) (sp + 3 * 4));
- if (fi->type == TYPE_LNG) {
- /* if the field has type long, we have to patch two instructions */
-
- *((u4 *) ra) |= (s2) ((fi->offset + 4) & 0x0000ffff);
- *((u4 *) (ra + 4)) |= (s2) (fi->offset & 0x0000ffff);
-
- } else {
- *((u4 *) ra) |= (s2) (fi->offset & 0x0000ffff);
- }
+ *((u4 *) xpc) = mcode;
/* synchronize instruction cache */
- asm_cacheflush(ra, 8);
+ md_icacheflush(xpc, 4);
PATCHER_MARK_PATCHED_MONITOREXIT;
- return true;
+ return NULL;
}
-/* patcher_aconst **************************************************************
+/* patcher_initialize_class ****************************************************
- Machine code:
-
- <patched call postition>
- 806dffc4 lwz r3,-60(r13)
- 81adffc0 lwz r13,-64(r13)
- 7da903a6 mtctr r13
- 4e800421 bctrl
+ Initalizes a given classinfo pointer. This function does not patch
+ any data.
*******************************************************************************/
-bool patcher_aconst(u1 *sp)
+bool patcher_initialize_class(u1 *sp)
{
- u1 *ra;
- java_objectheader *o;
- u4 mcode;
- constant_classref *cr;
- s4 disp;
- u1 *pv;
- classinfo *c;
+ 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;
-
- /* get the classinfo */
-
- if (!(c = resolve_classref_eager(cr))) {
- PATCHER_MONITOREXIT;
+ c = (classinfo *) *((ptrint *) (sp + 2 * 4));
- return false;
- }
-
- /* patch back original code */
-
- *((u4 *) ra) = mcode;
-
- /* synchronize instruction cache */
-
- asm_cacheflush(ra, 4);
-
- /* patch the classinfo pointer */
-
- *((ptrint *) (pv + disp)) = (ptrint) c;
+ /* check if the class is initialized */
- PATCHER_MARK_PATCHED_MONITOREXIT;
+ if (!(c->state & CLASS_INITIALIZED))
+ if (!initialize_class(c))
+ return false;
return true;
}
-/* patcher_builtin_multianewarray **********************************************
-
- Machine code:
+/* patcher_resolve_class *******************************************************
- <patched call position>
- 808dffc0 lwz r4,-64(r13)
- 38a10038 addi r5,r1,56
- 81adffbc lwz r13,-68(r13)
- 7da903a6 mtctr r13
- 4e800421 bctrl
+ Resolves a given unresolved_class pointer. This function does not
+ patch any data.
*******************************************************************************/
-bool patcher_builtin_multianewarray(u1 *sp)
+#ifdef ENABLE_VERIFIER
+bool patcher_resolve_class(u1 *sp)
{
- u1 *ra;
- java_objectheader *o;
- u4 mcode;
- constant_classref *cr;
- s4 disp;
- u1 *pv;
- classinfo *c;
+ unresolved_class *uc;
/* 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));
+ uc = (unresolved_class *) *((ptrint *) (sp + 2 * 4));
- PATCHER_MONITORENTER;
-
- /* get the classinfo */
-
- if (!(c = resolve_classref_eager(cr))) {
- 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;
+ return true;
+}
+#endif /* ENABLE_VERIFIER */
- /* synchronize instruction cache */
- asm_cacheflush(ra, 4);
+/* patcher_resolve_classref_to_classinfo ***************************************
- /* patch the classinfo pointer */
+ ACONST:
- *((ptrint *) (pv + disp)) = (ptrint) c;
+ <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_builtin_arraycheckcast **********************************************
- Machine code:
+ ARRAYCHECKCAST:
<patched call position>
808dffd8 lwz r4,-40(r13)
*******************************************************************************/
-bool patcher_builtin_arraycheckcast(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 */
-
- asm_cacheflush(ra, 4);
/* patch the classinfo pointer */
*((ptrint *) (pv + disp)) = (ptrint) c;
- PATCHER_MARK_PATCHED_MONITOREXIT;
+ /* synchronize data cache */
+
+ md_dcacheflush(pv + disp, SIZEOF_VOID_P);
return true;
}
-/* patcher_invokestatic_special ************************************************
+/* patcher_resolve_classref_to_vftbl *******************************************
- Machine code:
+ CHECKCAST (class):
<patched call position>
- 81adffd8 lwz r13,-40(r13)
- 7da903a6 mtctr r13
- 4e800421 bctrl
+ 81870000 lwz r12,0(r7)
+ 800c0014 lwz r0,20(r12)
+ 818dff78 lwz r12,-136(r13)
-******************************************************************************/
-bool patcher_invokestatic_special(u1 *sp)
+ INSTANCEOF (class):
+
+ <patched call position>
+ 817d0000 lwz r11,0(r29)
+ 818dff8c lwz r12,-116(r13)
+
+*******************************************************************************/
+
+bool patcher_resolve_classref_to_vftbl(u1 *sp)
{
- u1 *ra;
- java_objectheader *o;
- u4 mcode;
- unresolved_method *um;
+ constant_classref *cr;
s4 disp;
u1 *pv;
- methodinfo *m;
+ 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));
- um = (unresolved_method *) *((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 fieldinfo */
- if (!(m = resolve_method_eager(um))) {
- 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 super class' vftbl */
- /* patch stubroutine */
+ *((ptrint *) (pv + disp)) = (ptrint) c->vftbl;
- *((ptrint *) (pv + disp)) = (ptrint) m->stubroutine;
+ /* synchronize data cache */
- PATCHER_MARK_PATCHED_MONITOREXIT;
+ md_dcacheflush(pv + disp, SIZEOF_VOID_P);
return true;
}
-/* patcher_invokevirtual *******************************************************
+/* patcher_resolve_classref_to_flags *******************************************
- Machine code:
+ CHECKCAST/INSTANCEOF:
<patched call position>
- 81830000 lwz r12,0(r3)
- 81ac0088 lwz r13,136(r12)
- 7da903a6 mtctr r13
- 4e800421 bctrl
+ 818dff7c lwz r12,-132(r13)
*******************************************************************************/
-bool patcher_invokevirtual(u1 *sp)
+bool patcher_resolve_classref_to_flags(u1 *sp)
{
- u1 *ra;
- java_objectheader *o;
- u4 mcode;
- unresolved_method *um;
- methodinfo *m;
+ constant_classref *cr;
+ 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));
- um = (unresolved_method *) *((ptrint *) (sp + 2 * 4));
-
- PATCHER_MONITORENTER;
+ cr = (constant_classref *) *((ptrint *) (sp + 2 * 4));
+ disp = *((s4 *) (sp + 1 * 4));
+ pv = (u1 *) *((ptrint *) (sp + 0 * 4));
/* get the fieldinfo */
- if (!(m = resolve_method_eager(um))) {
- PATCHER_MONITOREXIT;
-
+ if (!(c = resolve_classref_eager(cr)))
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 */
-
- *((s4 *) (ra + 4)) |= (s4) ((OFFSET(vftbl_t, table[0]) +
- sizeof(methodptr) * m->vftblindex) & 0x0000ffff);
+ /* patch class flags */
- /* synchronize instruction cache */
+ *((s4 *) (pv + disp)) = (s4) c->flags;
- asm_cacheflush(ra, 2 * 4);
+ /* synchronize data cache */
- PATCHER_MARK_PATCHED_MONITOREXIT;
+ md_dcacheflush(pv + disp, SIZEOF_VOID_P);
return true;
}
-/* patcher_invokeinterface *****************************************************
-
- Machine code:
+/* patcher_resolve_native_function *********************************************
- <patched call position>
- 81830000 lwz r12,0(r3)
- 818cffd0 lwz r12,-48(r12)
- 81ac000c lwz r13,12(r12)
- 7da903a6 mtctr r13
- 4e800421 bctrl
+ XXX
*******************************************************************************/
-bool patcher_invokeinterface(u1 *sp)
+#if !defined(WITH_STATIC_CLASSPATH)
+bool patcher_resolve_native_function(u1 *sp)
{
- u1 *ra;
- java_objectheader *o;
- u4 mcode;
- unresolved_method *um;
- methodinfo *m;
+ 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));
- um = (unresolved_method *) *((ptrint *) (sp + 2 * 4));
-
- PATCHER_MONITORENTER;
-
- /* get the fieldinfo */
+ m = (methodinfo *) *((ptrint *) (sp + 2 * 4));
+ disp = *((s4 *) (sp + 1 * 4));
+ pv = (u1 *) *((ptrint *) (sp + 0 * 4));
- 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;
-
- /* if we show disassembly, we have to skip the nop */
-
- if (opt_showdisassemble)
- ra = ra + 4;
- /* patch interfacetable index */
-
- *((s4 *) (ra + 1 * 4)) |= (s4) ((OFFSET(vftbl_t, interfacetable[0]) -
- sizeof(methodptr*) * m->class->index) & 0x0000ffff);
-
- /* patch method offset */
-
- *((s4 *) (ra + 2 * 4)) |=
- (s4) ((sizeof(methodptr) * (m - m->class->methods)) & 0x0000ffff);
+ /* patch native function pointer */
- /* synchronize instruction cache */
+ *((ptrint *) (pv + disp)) = (ptrint) f;
- asm_cacheflush(ra, 3 * 4);
+ /* synchronize data cache */
- PATCHER_MARK_PATCHED_MONITOREXIT;
+ md_dcacheflush(pv + disp, SIZEOF_VOID_P);
return true;
}
+#endif /* !defined(WITH_STATIC_CLASSPATH) */
-/* patcher_checkcast_instanceof_flags ******************************************
+/* patcher_get_putstatic *******************************************************
Machine code:
<patched call position>
- 818dff7c lwz r12,-132(r13)
+ 816dffc8 lwz r11,-56(r13)
+ 80ab0000 lwz r5,0(r11)
*******************************************************************************/
-bool patcher_checkcast_instanceof_flags(u1 *sp)
+bool patcher_get_putstatic(u1 *sp)
{
- u1 *ra;
- java_objectheader *o;
- u4 mcode;
- constant_classref *cr;
- s4 disp;
- u1 *pv;
- classinfo *c;
+ 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));
- cr = (constant_classref *) *((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 (!(c = resolve_classref_eager(cr))) {
- PATCHER_MONITOREXIT;
-
+ if (!(fi = resolve_field_eager(uf)))
return false;
- }
- /* patch back original code */
-
- *((u4 *) ra) = mcode;
+ /* check if the field's class is initialized */
- /* synchronize instruction cache */
+ if (!(fi->class->state & CLASS_INITIALIZED))
+ if (!initialize_class(fi->class))
+ return false;
- asm_cacheflush(ra, 4);
+ /* patch the field value's address */
- /* patch class flags */
+ *((ptrint *) (pv + disp)) = (ptrint) &(fi->value);
- *((s4 *) (pv + disp)) = (s4) c->flags;
+ /* synchronize data cache */
- PATCHER_MARK_PATCHED_MONITOREXIT;
+ md_dcacheflush(pv + disp, SIZEOF_VOID_P);
return true;
}
-/* patcher_checkcast_instanceof_interface **************************************
+/* patcher_get_putfield ********************************************************
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)
+ 811f0014 lwz r8,20(r31)
*******************************************************************************/
-bool patcher_checkcast_instanceof_interface(u1 *sp)
+bool patcher_get_putfield(u1 *sp)
{
- u1 *ra;
- java_objectheader *o;
- u4 mcode;
- 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));
- cr = (constant_classref *) *((ptrint *) (sp + 2 * 4));
+ u1 *ra;
+ unresolved_field *uf;
+ u1 *pv;
+ fieldinfo *fi;
+ s2 disp;
- 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 (!(c = resolve_classref_eager(cr))) {
- 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;
-
- /* patch super class 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 + 2 * 4)) |= (s4) (-(c->index) & 0x0000ffff);
+ disp = *((u4 *) (ra + 1 * 4));
- *((s4 *) (ra + 4 * 4)) |= (s4) ((OFFSET(vftbl_t, interfacetable[0]) -
- c->index * sizeof(methodptr*)) & 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 */
- asm_cacheflush(ra, 5 * 4);
-
- PATCHER_MARK_PATCHED_MONITOREXIT;
+ md_icacheflush(ra + 1 * 4, 2 * 4);
return true;
}
-/* patcher_checkcast_class *****************************************************
+/* patcher_invokestatic_special ************************************************
Machine code:
<patched call position>
- 81870000 lwz r12,0(r7)
- 800c0014 lwz r0,20(r12)
- 818dff78 lwz r12,-136(r13)
+ 81adffd8 lwz r13,-40(r13)
+ 7da903a6 mtctr r13
+ 4e800421 bctrl
-*******************************************************************************/
+******************************************************************************/
-bool patcher_checkcast_class(u1 *sp)
+bool patcher_invokestatic_special(u1 *sp)
{
- u1 *ra;
- java_objectheader *o;
- u4 mcode;
- constant_classref *cr;
+ unresolved_method *um;
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 */
- asm_cacheflush(ra, 4);
+ /* patch stubroutine */
- /* patch super class' vftbl */
+ *((ptrint *) (pv + disp)) = (ptrint) m->stubroutine;
- *((ptrint *) (pv + disp)) = (ptrint) c->vftbl;
+ /* synchronize data cache */
- PATCHER_MARK_PATCHED_MONITOREXIT;
+ md_dcacheflush(pv + disp, SIZEOF_VOID_P);
return true;
}
-/* patcher_instanceof_class ****************************************************
+/* patcher_invokevirtual *******************************************************
Machine code:
<patched call position>
- 817d0000 lwz r11,0(r29)
- 818dff8c lwz r12,-116(r13)
+ 81830000 lwz r12,0(r3)
+ 81ac0088 lwz r13,136(r12)
+ 7da903a6 mtctr r13
+ 4e800421 bctrl
*******************************************************************************/
-bool patcher_instanceof_class(u1 *sp)
+bool patcher_invokevirtual(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 vftbl index */
- asm_cacheflush(ra, 4);
+ disp = (OFFSET(vftbl_t, table[0]) + sizeof(methodptr) * m->vftblindex);
- /* patch super class' vftbl */
+ *((s4 *) (ra + 1 * 4)) |= (disp & 0x0000ffff);
- *((ptrint *) (pv + disp)) = (ptrint) c->vftbl;
+ /* synchronize instruction cache */
- PATCHER_MARK_PATCHED_MONITOREXIT;
+ md_icacheflush(ra + 1 * 4, 1 * 4);
return true;
}
-/* patcher_clinit **************************************************************
+/* patcher_invokeinterface *****************************************************
- XXX
+ 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
*******************************************************************************/
-bool patcher_clinit(u1 *sp)
+bool patcher_invokeinterface(u1 *sp)
{
u1 *ra;
- java_objectheader *o;
- u4 mcode;
- 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));
- c = (classinfo *) *((ptrint *) (sp + 2 * 4));
+ ra = (u1 *) *((ptrint *) (sp + 5 * 4));
+ um = (unresolved_method *) *((ptrint *) (sp + 2 * 4));
- PATCHER_MONITORENTER;
+ /* get the fieldinfo */
- /* check if the class is initialized */
+ if (!(m = resolve_method_eager(um)))
+ return false;
- if (!(c->state & CLASS_INITIALIZED)) {
- if (!initialize_class(c)) {
- PATCHER_MONITOREXIT;
+ /* if we show NOPs, we have to skip them */
- return false;
- }
- }
+ if (opt_shownops)
+ ra = ra + 1 * 4;
- /* patch back original code */
+ /* patch interfacetable index */
- *((u4 *) ra) = mcode;
+ disp = OFFSET(vftbl_t, interfacetable[0]) -
+ sizeof(methodptr*) * m->class->index;
- /* synchronize instruction cache */
+ /* XXX TWISTI: check displacement */
- asm_cacheflush(ra, 4);
+ *((s4 *) (ra + 1 * 4)) |= (disp & 0x0000ffff);
- PATCHER_MARK_PATCHED_MONITOREXIT;
+ /* 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 + 1 * 4, 2 * 4);
return true;
}
-/* patcher_athrow_areturn ******************************************************
+/* patcher_checkcast_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_checkcast_interface(u1 *sp)
{
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 *) *((ptrint *) (sp + 5 * 4));
+ cr = (constant_classref *) *((ptrint *) (sp + 2 * 4));
- PATCHER_MONITORENTER;
+ /* get the fieldinfo */
- /* resolve the class */
+ if (!(c = resolve_classref_eager(cr)))
+ return false;
- if (!resolve_class(uc, resolveEager, false, &c)) {
- PATCHER_MONITOREXIT;
+ /* if we show NOPs, we have to skip them */
- return false;
- }
+ if (opt_shownops)
+ ra = ra + 1 * 4;
- /* patch back original code */
+ /* patch super class index */
- *((u4 *) ra) = mcode;
+ disp = -(c->index);
- /* synchronize instruction cache */
+ *((s4 *) (ra + 2 * 4)) |= (disp & 0x0000ffff);
- asm_cacheflush(ra, 4);
+ disp = OFFSET(vftbl_t, interfacetable[0]) - c->index * sizeof(methodptr*);
- PATCHER_MARK_PATCHED_MONITOREXIT;
+ *((s4 *) (ra + 5 * 4)) |= (disp & 0x0000ffff);
+
+ /* synchronize instruction cache */
+
+ md_icacheflush(ra + 2 * 4, 4 * 4);
return true;
}
-#endif /* ENABLE_VERIFIER */
-/* patcher_resolve_native ******************************************************
+/* patcher_instanceof_interface ************************************************
- XXX
+ 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)
*******************************************************************************/
-#if !defined(WITH_STATIC_CLASSPATH)
-bool patcher_resolve_native(u1 *sp)
+bool patcher_instanceof_interface(u1 *sp)
{
u1 *ra;
- java_objectheader *o;
- u4 mcode;
- methodinfo *m;
+ constant_classref *cr;
+ classinfo *c;
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 = (u1 *) *((ptrint *) (sp + 5 * 4));
+ cr = (constant_classref *) *((ptrint *) (sp + 2 * 4));
- ra = ra - 1 * 4;
- *((ptrint *) (sp + 5 * 4)) = (ptrint) ra;
-
- PATCHER_MONITORENTER;
+ /* get the fieldinfo */
- /* resolve native function */
+ if (!(c = resolve_classref_eager(cr)))
+ return false;
- if (!(f = native_resolve_function(m))) {
- PATCHER_MONITOREXIT;
+ /* if we show NOPs, we have to skip them */
- return false;
- }
+ if (opt_shownops)
+ ra = ra + 1 * 4;
- /* patch back original code */
+ /* patch super class index */
- *((u4 *) ra) = mcode;
+ disp = -(c->index);
- /* synchronize instruction cache */
+ *((s4 *) (ra + 2 * 4)) |= (disp & 0x0000ffff);
- asm_cacheflush(ra, 4);
+ disp = OFFSET(vftbl_t, interfacetable[0]) - c->index * sizeof(methodptr*);
- /* patch native function pointer */
+ *((s4 *) (ra + 4 * 4)) |= (disp & 0x0000ffff);
- *((ptrint *) (pv + disp)) = (ptrint) f;
+ /* 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