/* src/vm/jit/mips/patcher.c - MIPS 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 5319 2006-09-05 12:54:10Z twisti $
-
*/
#include "config.h"
#include <assert.h>
+#include <stdint.h>
#include "vm/types.h"
+#include "vm/jit/mips/codegen.h"
+
#include "mm/memory.h"
+
#include "native/native.h"
+
#include "vm/builtin.h"
-#include "vm/class.h"
#include "vm/exceptions.h"
-#include "vm/field.h"
#include "vm/initialize.h"
-#include "vm/options.h"
-#include "vm/resolve.h"
-#include "vm/references.h"
-#include "vm/jit/asmpart.h"
-#include "vm/jit/patcher.h"
+#include "vm/jit/asmpart.h"
+#include "vm/jit/md.h"
+#include "vm/jit/patcher-common.h"
-/* patcher_wrapper *************************************************************
+#include "vmcore/class.h"
+#include "vmcore/field.h"
+#include "vmcore/options.h"
+#include "vm/resolve.h"
+#include "vmcore/references.h"
- 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.
+#define PATCH_BACK_ORIGINAL_MCODE \
+ *((u4 *) pr->mpc) = (u4) pr->mcode; \
+ md_icacheflush((u1 *) pr->mpc, PATCHER_CALL_SIZE);
-*******************************************************************************/
-java_objectheader *patcher_wrapper(u1 *sp, u1 *pv, u1 *ra)
-{
- stackframeinfo sfi;
- u1 *xpc;
- java_objectheader *o;
- functionptr f;
- bool result;
- java_objectheader *e;
+/* patcher_initialize_class ****************************************************
- /* define the patcher function */
+ Initalizes a given classinfo pointer. This function does not patch
+ any data.
- bool (*patcher_function)(u1 *);
+*******************************************************************************/
- assert(pv != NULL);
+bool patcher_initialize_class(patchref_t *pr)
+{
+ classinfo *c;
/* get stuff from the stack */
- xpc = (u1 *) *((ptrint *) (sp + 5 * 8));
- o = (java_objectheader *) *((ptrint *) (sp + 4 * 8));
- f = (functionptr) *((ptrint *) (sp + 0 * 8));
-
- /* store PV into the patcher function position */
-
- *((ptrint *) (sp + 0 * 8)) = (ptrint) pv;
-
- /* cast the passed function to a patcher function */
+ c = (classinfo *) pr->ref;
- patcher_function = (bool (*)(u1 *)) (ptrint) f;
+ /* check if the class is initialized */
- /* enter a monitor on the patching position */
+ if (!(c->state & CLASS_INITIALIZED))
+ if (!initialize_class(c))
+ return false;
- PATCHER_MONITORENTER;
+ PATCH_BACK_ORIGINAL_MCODE;
- /* create the stackframeinfo */
+ return true;
+}
- stacktrace_create_extern_stackframeinfo(&sfi, pv, sp + 6 * 8, ra, xpc);
- /* call the proper patcher function */
+/* patcher_resolve_class *****************************************************
- result = (patcher_function)(sp);
+ Initalizes a given classinfo pointer. This function does not patch
+ any data.
- /* remove the stackframeinfo */
+*******************************************************************************/
- stacktrace_remove_stackframeinfo(&sfi);
+#ifdef ENABLE_VERIFIER
+bool patcher_resolve_class(patchref_t *pr)
+{
+ unresolved_class *uc;
- /* check for return value and exit accordingly */
+ /* get stuff from the stack */
- if (result == false) {
- e = exceptions_get_and_clear_exception();
+ uc = (unresolved_class *) pr->ref;
- PATCHER_MONITOREXIT;
+ /* resolve the class and check subtype constraints */
- return e;
- }
+ if (!resolve_class_eager_no_access_check(uc))
+ return false;
- PATCHER_MARK_PATCHED_MONITOREXIT;
+ PATCH_BACK_ORIGINAL_MCODE;
- return NULL;
+ return true;
}
+#endif /* ENABLE_VERIFIER */
/* patcher_get_putstatic *******************************************************
*******************************************************************************/
-bool patcher_get_putstatic(u1 *sp)
+bool patcher_get_putstatic(patchref_t *pr)
{
- u1 *ra;
- u4 mcode[2];
unresolved_field *uf;
- s4 disp;
- u1 *pv;
+ u1 *datap;
fieldinfo *fi;
/* get stuff from the stack */
- ra = (u1 *) *((ptrint *) (sp + 5 * 8));
- mcode[0] = *((u4 *) (sp + 3 * 8));
- mcode[1] = *((u4 *) (sp + 3 * 8 + 4));
- uf = (unresolved_field *) *((ptrint *) (sp + 2 * 8));
- disp = *((s4 *) (sp + 1 * 8));
- pv = (u1 *) *((ptrint *) (sp + 0 * 8));
+ uf = (unresolved_field *) pr->ref;
+ datap = (u1 *) pr->datap;
/* get the fieldinfo */
if (!initialize_class(fi->class))
return false;
- /* patch back original code */
-
- *((u4 *) (ra + 0 * 4)) = mcode[0];
- *((u4 *) (ra + 1 * 4)) = mcode[1];
-
- /* synchronize instruction cache */
-
- md_icacheflush(ra, 2 * 4);
+ PATCH_BACK_ORIGINAL_MCODE;
/* patch the field value's address */
- *((ptrint *) (pv + disp)) = (ptrint) &(fi->value);
+ *((intptr_t *) datap) = (intptr_t) fi->value;
/* synchronize data cache */
- md_dcacheflush(pv + disp, SIZEOF_VOID_P);
+ md_dcacheflush(datap, SIZEOF_VOID_P);
return true;
}
*******************************************************************************/
-bool patcher_get_putfield(u1 *sp)
+bool patcher_get_putfield(patchref_t *pr)
{
u1 *ra;
- u4 mcode[2];
unresolved_field *uf;
fieldinfo *fi;
- ra = (u1 *) *((ptrint *) (sp + 5 * 8));
- mcode[0] = *((u4 *) (sp + 3 * 8));
- mcode[1] = *((u4 *) (sp + 3 * 8 + 4));
- uf = (unresolved_field *) *((ptrint *) (sp + 2 * 8));
+ /* get stuff from the stack */
+
+ ra = (u1 *) pr->mpc;
+ uf = (unresolved_field *) pr->ref;
/* get the fieldinfo */
if (!(fi = resolve_field_eager(uf)))
return false;
- /* patch back original code */
-
- *((u4 *) (ra + 0 * 4)) = mcode[0];
- *((u4 *) (ra + 1 * 4)) = mcode[1];
+ PATCH_BACK_ORIGINAL_MCODE;
/* if we show disassembly, we have to skip the nop's */
- if (opt_showdisassemble)
- ra = ra + 2 * 4;
-
- /* patch the field's offset */
+ if (opt_shownops)
+ ra = ra + PATCHER_CALL_SIZE;
#if SIZEOF_VOID_P == 4
- if (fi->type == TYPE_LNG) {
+ if (IS_LNG_TYPE(fi->type)) {
# if WORDS_BIGENDIAN == 1
/* ATTENTION: order of these instructions depend on M_LLD_INTERN */
*((u4 *) (ra + 0 * 4)) |= (s2) ((fi->offset + 0) & 0x0000ffff);
*((u4 *) (ra + 0 * 4)) |= (s2) ((fi->offset + 4) & 0x0000ffff);
*((u4 *) (ra + 1 * 4)) |= (s2) ((fi->offset + 0) & 0x0000ffff);
# endif
- } else
+ }
+ else
#endif
- *((u4 *) ra) |= (s2) (fi->offset & 0x0000ffff);
+ *((u4 *) (ra + 0 * 4)) |= (s2) (fi->offset & 0x0000ffff);
/* synchronize instruction cache */
- if (opt_showdisassemble) {
-#if SIZEOF_VOID_P == 4
- if (fi->type == TYPE_LNG)
- md_icacheflush(ra - 2 * 4, 4 * 4);
- else
-#endif
- md_icacheflush(ra - 2 * 4, 3 * 4);
- }
- else {
- md_icacheflush(ra, 2 * 4);
- }
+ md_icacheflush(ra, 2 * 4);
return true;
}
-/* patcher_aconst **************************************************************
+/* patcher_resolve_classref_to_classinfo ***************************************
- Machine code:
+ ACONST:
<patched call postition>
dfc4ff98 ld a0,-104(s8)
+ MULTIANEWARRAY:
+
+ <patched call position>
+ dfc5ff90 ld a1,-112(s8)
+ 03a03025 move a2,sp
+ dfd9ff88 ld t9,-120(s8)
+ 0320f809 jalr t9
+ 00000000 nop
+
+ ARRAYCHECKCAST:
+
+ <patched call position>
+ dfc5ffc0 ld a1,-64(s8)
+ dfd9ffb8 ld t9,-72(s8)
+ 0320f809 jalr t9
+ 00000000 nop
+
*******************************************************************************/
-bool patcher_aconst(u1 *sp)
+bool patcher_resolve_classref_to_classinfo(patchref_t *pr)
{
- u1 *ra;
- u4 mcode[2];
constant_classref *cr;
- s4 disp;
- u1 *pv;
+ u1 *datap;
classinfo *c;
/* get stuff from the stack */
- ra = (u1 *) *((ptrint *) (sp + 5 * 8));
- mcode[0] = *((u4 *) (sp + 3 * 8));
- mcode[1] = *((u4 *) (sp + 3 * 8 + 4));
- cr = (constant_classref *) *((ptrint *) (sp + 2 * 8));
- disp = *((s4 *) (sp + 1 * 8));
- pv = (u1 *) *((ptrint *) (sp + 0 * 8));
+ cr = (constant_classref *) pr->ref;
+ datap = (u1 *) pr->datap;
/* get the classinfo */
if (!(c = resolve_classref_eager(cr)))
return false;
- /* patch back original code */
-
- *((u4 *) (ra + 0 * 4)) = mcode[0];
- *((u4 *) (ra + 1 * 4)) = mcode[1];
-
- /* synchronize instruction cache */
-
- md_icacheflush(ra, 2 * 4);
+ PATCH_BACK_ORIGINAL_MCODE;
/* patch the classinfo pointer */
- *((ptrint *) (pv + disp)) = (ptrint) c;
+ *((intptr_t *) datap) = (intptr_t) c;
/* synchronize data cache */
- md_dcacheflush(pv + disp, SIZEOF_VOID_P);
+ md_dcacheflush(datap, SIZEOF_VOID_P);
return true;
}
-/* patcher_builtin_multianewarray **********************************************
+/* patcher_resolve_classref_to_vftbl *******************************************
- Machine code:
+ CHECKCAST (class):
+ INSTANCEOF (class):
<patched call position>
- dfc5ff90 ld a1,-112(s8)
- 03a03025 move a2,sp
- dfd9ff88 ld t9,-120(s8)
- 0320f809 jalr t9
- 00000000 nop
+ dd030000 ld v1,0(a4)
+ dfd9ff18 ld t9,-232(s8)
*******************************************************************************/
-bool patcher_builtin_multianewarray(u1 *sp)
+bool patcher_resolve_classref_to_vftbl(patchref_t *pr)
{
- u1 *ra;
- u4 mcode[2];
constant_classref *cr;
- s4 disp;
- u1 *pv;
+ u1 *datap;
classinfo *c;
/* get stuff from the stack */
- ra = (u1 *) *((ptrint *) (sp + 5 * 8));
- mcode[0] = *((u4 *) (sp + 3 * 8));
- mcode[1] = *((u4 *) (sp + 3 * 8 + 4));
- cr = (constant_classref *) *((ptrint *) (sp + 2 * 8));
- disp = *((s4 *) (sp + 1 * 8));
- pv = (u1 *) *((ptrint *) (sp + 0 * 8));
+ cr = (constant_classref *) pr->ref;
+ datap = (u1 *) pr->datap;
- /* get the classinfo */
+ /* get the fieldinfo */
if (!(c = resolve_classref_eager(cr)))
return false;
- /* patch back original code */
-
- *((u4 *) (ra + 0 * 4)) = mcode[0];
- *((u4 *) (ra + 1 * 4)) = mcode[1];
-
- /* synchronize instruction cache */
+ PATCH_BACK_ORIGINAL_MCODE;
- md_icacheflush(ra, 2 * 4);
-
- /* patch the classinfo pointer */
+ /* patch super class' vftbl */
- *((ptrint *) (pv + disp)) = (ptrint) c;
+ *((intptr_t *) datap) = (intptr_t) c->vftbl;
/* synchronize data cache */
- md_dcacheflush(pv + disp, SIZEOF_VOID_P);
+ md_dcacheflush(datap, SIZEOF_VOID_P);
return true;
}
-/* patcher_builtin_arraycheckcast **********************************************
+/* patcher_resolve_classref_to_flags *******************************************
- Machine code:
+ CHECKCAST/INSTANCEOF:
<patched call position>
- dfc5ffc0 ld a1,-64(s8)
- dfd9ffb8 ld t9,-72(s8)
- 0320f809 jalr t9
+ 8fc3ff24 lw v1,-220(s8)
+ 30630200 andi v1,v1,512
+ 1060000d beq v1,zero,0x000000001051824c
00000000 nop
*******************************************************************************/
-bool patcher_builtin_arraycheckcast(u1 *sp)
+bool patcher_resolve_classref_to_flags(patchref_t *pr)
{
- u1 *ra;
- u4 mcode[2];
constant_classref *cr;
- s4 disp;
- u1 *pv;
+ u1 *datap;
classinfo *c;
/* get stuff from the stack */
- ra = (u1 *) *((ptrint *) (sp + 5 * 8));
- mcode[0] = *((u4 *) (sp + 3 * 8));
- mcode[1] = *((u4 *) (sp + 3 * 8 + 4));
- cr = (constant_classref *) *((ptrint *) (sp + 2 * 8));
- disp = *((s4 *) (sp + 1 * 8));
- pv = (u1 *) *((ptrint *) (sp + 0 * 8));
+ cr = (constant_classref *) pr->ref;
+ datap = (u1 *) pr->datap;
- /* get the classinfo */
+ /* get the fieldinfo */
if (!(c = resolve_classref_eager(cr)))
return false;
- /* patch back original code */
+ PATCH_BACK_ORIGINAL_MCODE;
- *((u4 *) (ra + 0 * 4)) = mcode[0];
- *((u4 *) (ra + 1 * 4)) = mcode[1];
+ /* patch class flags */
- /* synchronize instruction cache */
+ *((int32_t *) datap) = (int32_t) c->flags;
- md_icacheflush(ra, 2 * 4);
+ /* synchronize data cache */
- /* patch the classinfo pointer */
+ md_dcacheflush(datap, sizeof(int32_t));
+
+ return true;
+}
- *((ptrint *) (pv + disp)) = (ptrint) c;
+
+/* patcher_resolve_native ******************************************************
+
+ XXX
+
+*******************************************************************************/
+
+#if !defined(WITH_STATIC_CLASSPATH)
+bool patcher_resolve_native_function(patchref_t *pr)
+{
+ methodinfo *m;
+ u1 *datap;
+ functionptr f;
+
+ /* get stuff from the stack */
+
+ m = (methodinfo *) pr->ref;
+ datap = (u1 *) pr->datap;
+
+ /* resolve native function */
+
+ if (!(f = native_resolve_function(m)))
+ return false;
+
+ PATCH_BACK_ORIGINAL_MCODE;
+
+ /* patch native function pointer */
+
+ *((ptrint *) datap) = (ptrint) f;
/* synchronize data cache */
- md_dcacheflush(pv + disp, SIZEOF_VOID_P);
+ md_dcacheflush(datap, SIZEOF_VOID_P);
return true;
}
+#endif /* !defined(WITH_STATIC_CLASSPATH) */
/* patcher_invokestatic_special ************************************************
******************************************************************************/
-bool patcher_invokestatic_special(u1 *sp)
+bool patcher_invokestatic_special(patchref_t *pr)
{
- u1 *ra;
- u4 mcode[2];
unresolved_method *um;
- s4 disp;
- u1 *pv;
+ u1 *datap;
methodinfo *m;
/* get stuff from the stack */
- ra = (u1 *) *((ptrint *) (sp + 5 * 8));
- mcode[0] = *((u4 *) (sp + 3 * 8));
- mcode[1] = *((u4 *) (sp + 3 * 8 + 4));
- um = (unresolved_method *) *((ptrint *) (sp + 2 * 8));
- disp = *((s4 *) (sp + 1 * 8));
- pv = (u1 *) *((ptrint *) (sp + 0 * 8));
+ um = (unresolved_method *) pr->ref;
+ datap = (u1 *) pr->datap;
/* get the fieldinfo */
if (!(m = resolve_method_eager(um)))
return false;
- /* patch back original code */
-
- *((u4 *) (ra + 0 * 4)) = mcode[0];
- *((u4 *) (ra + 1 * 4)) = mcode[1];
-
- /* synchronize instruction cache */
-
- md_icacheflush(ra, 2 * 4);
+ PATCH_BACK_ORIGINAL_MCODE;
/* patch stubroutine */
- *((ptrint *) (pv + disp)) = (ptrint) m->stubroutine;
+ *((ptrint *) datap) = (ptrint) m->stubroutine;
/* synchronize data cache */
- md_dcacheflush(pv + disp, SIZEOF_VOID_P);
+ md_dcacheflush(datap, SIZEOF_VOID_P);
return true;
}
*******************************************************************************/
-bool patcher_invokevirtual(u1 *sp)
+bool patcher_invokevirtual(patchref_t *pr)
{
u1 *ra;
- u4 mcode[2];
unresolved_method *um;
methodinfo *m;
/* get stuff from the stack */
- ra = (u1 *) *((ptrint *) (sp + 5 * 8));
- mcode[0] = *((u4 *) (sp + 3 * 8));
- mcode[1] = *((u4 *) (sp + 3 * 8 + 4));
- um = (unresolved_method *) *((ptrint *) (sp + 2 * 8));
+ ra = (u1 *) pr->mpc;
+ um = (unresolved_method *) pr->ref;
/* get the fieldinfo */
if (!(m = resolve_method_eager(um)))
return false;
- /* patch back original code */
-
- *((u4 *) (ra + 0 * 4)) = mcode[0];
- *((u4 *) (ra + 1 * 4)) = mcode[1];
+ PATCH_BACK_ORIGINAL_MCODE;
/* if we show disassembly, we have to skip the nop's */
- if (opt_showdisassemble)
- ra = ra + 2 * 4;
+ if (opt_shownops)
+ ra = ra + PATCHER_CALL_SIZE;
/* patch vftbl index */
- *((s4 *) (ra + 1 * 4)) |= (s4) ((OFFSET(vftbl_t, table[0]) +
- sizeof(methodptr) * m->vftblindex) & 0x0000ffff);
+ *((s4 *) (ra + 1 * 4)) |=
+ (s4) ((OFFSET(vftbl_t, table[0]) +
+ sizeof(methodptr) * m->vftblindex) & 0x0000ffff);
/* synchronize instruction cache */
- if (opt_showdisassemble)
- md_icacheflush(ra - 2 * 4, 4 * 4);
- else
- md_icacheflush(ra, 2 * 4);
+ md_icacheflush(ra + 1 * 4, 1 * 4);
return true;
}
*******************************************************************************/
-bool patcher_invokeinterface(u1 *sp)
+bool patcher_invokeinterface(patchref_t *pr)
{
u1 *ra;
- u4 mcode[2];
unresolved_method *um;
methodinfo *m;
/* get stuff from the stack */
- ra = (u1 *) *((ptrint *) (sp + 5 * 8));
- mcode[0] = *((u4 *) (sp + 3 * 8));
- mcode[1] = *((u4 *) (sp + 3 * 8 + 4));
- um = (unresolved_method *) *((ptrint *) (sp + 2 * 8));
+ ra = (u1 *) pr->mpc;
+ um = (unresolved_method *) pr->ref;
/* get the fieldinfo */
if (!(m = resolve_method_eager(um)))
return false;
- /* patch back original code */
-
- *((u4 *) (ra + 0 * 4)) = mcode[0];
- *((u4 *) (ra + 1 * 4)) = mcode[1];
+ PATCH_BACK_ORIGINAL_MCODE;
/* if we show disassembly, we have to skip the nop's */
- if (opt_showdisassemble)
- ra = ra + 2 * 4;
+ if (opt_shownops)
+ ra = ra + PATCHER_CALL_SIZE;
/* patch interfacetable index */
- *((s4 *) (ra + 1 * 4)) |= (s4) ((OFFSET(vftbl_t, interfacetable[0]) -
- sizeof(methodptr*) * m->class->index) & 0x0000ffff);
+ *((s4 *) (ra + 1 * 4)) |=
+ (s4) ((OFFSET(vftbl_t, interfacetable[0]) -
+ sizeof(methodptr*) * m->class->index) & 0x0000ffff);
/* patch method offset */
/* synchronize instruction cache */
- if (opt_showdisassemble)
- md_icacheflush(ra - 2 * 4, 5 * 4);
- else
- md_icacheflush(ra, 3 * 4);
-
- return true;
-}
-
-
-/* patcher_checkcast_instanceof_flags ******************************************
-
- Machine code:
-
- <patched call position>
- 8fc3ff24 lw v1,-220(s8)
- 30630200 andi v1,v1,512
- 1060000d beq v1,zero,0x000000001051824c
- 00000000 nop
-
-*******************************************************************************/
-
-bool patcher_checkcast_instanceof_flags(u1 *sp)
-{
- u1 *ra;
- u4 mcode[2];
- constant_classref *cr;
- s4 disp;
- u1 *pv;
- classinfo *c;
-
- /* get stuff from the stack */
-
- ra = (u1 *) *((ptrint *) (sp + 5 * 8));
- mcode[0] = *((u4 *) (sp + 3 * 8));
- mcode[1] = *((u4 *) (sp + 3 * 8 + 4));
- cr = (constant_classref *) *((ptrint *) (sp + 2 * 8));
- disp = *((s4 *) (sp + 1 * 8));
- pv = (u1 *) *((ptrint *) (sp + 0 * 8));
-
- /* get the fieldinfo */
-
- if (!(c = resolve_classref_eager(cr)))
- return false;
-
- /* patch back original code */
-
- *((u4 *) (ra + 0 * 4)) = mcode[0];
- *((u4 *) (ra + 1 * 4)) = mcode[1];
-
- /* synchronize instruction cache */
-
- md_icacheflush(ra, 2 * 4);
-
- /* patch class flags */
-
- *((s4 *) (pv + disp)) = (s4) c->flags;
-
- /* synchronize data cache */
-
- md_dcacheflush(pv + disp, sizeof(s4));
+ md_icacheflush(ra + 1 * 4, 2 * 4);
return true;
}
-/* patcher_checkcast_instanceof_interface **************************************
+/* patcher_checkcast_interface *************************************************
Machine code:
*******************************************************************************/
-bool patcher_checkcast_instanceof_interface(u1 *sp)
+bool patcher_checkcast_interface(patchref_t *pr)
{
u1 *ra;
- u4 mcode[2];
constant_classref *cr;
classinfo *c;
/* get stuff from the stack */
- ra = (u1 *) *((ptrint *) (sp + 5 * 8));
- mcode[0] = *((u4 *) (sp + 3 * 8));
- mcode[1] = *((u4 *) (sp + 3 * 8 + 4));
- cr = (constant_classref *) *((ptrint *) (sp + 2 * 8));
+ ra = (u1 *) pr->mpc;
+ cr = (constant_classref *) pr->ref;
/* get the fieldinfo */
if (!(c = resolve_classref_eager(cr)))
return false;
- /* patch back original code */
-
- *((u4 *) (ra + 0 * 4)) = mcode[0];
- *((u4 *) (ra + 1 * 4)) = mcode[1];
+ PATCH_BACK_ORIGINAL_MCODE;
/* if we show disassembly, we have to skip the nop's */
- if (opt_showdisassemble)
- ra = ra + 2 * 4;
+ if (opt_shownops)
+ ra = ra + PATCHER_CALL_SIZE;
/* patch super class index */
*((s4 *) (ra + 2 * 4)) |= (s4) (-(c->index) & 0x0000ffff);
-
- *((s4 *) (ra + 5 * 4)) |= (s4) ((OFFSET(vftbl_t, interfacetable[0]) -
- c->index * sizeof(methodptr*)) & 0x0000ffff);
+ /* *((s4 *) (ra + 5 * 4)) |= (s4) ((OFFSET(vftbl_t, interfacetable[0]) - */
+ /* c->index * sizeof(methodptr*)) & 0x0000ffff); */
+ *((s4 *) (ra + 6 * 4)) |=
+ (s4) ((OFFSET(vftbl_t, interfacetable[0]) -
+ c->index * sizeof(methodptr*)) & 0x0000ffff);
/* synchronize instruction cache */
- if (opt_showdisassemble)
- md_icacheflush(ra - 2 * 4, 8 * 4);
- else
- md_icacheflush(ra, 6 * 4);
+ md_icacheflush(ra + 2 * 4, 5 * 4);
return true;
}
-/* patcher_checkcast_instanceof_class ******************************************
+/* patcher_instanceof_interface ************************************************
Machine code:
<patched call position>
dd030000 ld v1,0(a4)
- dfd9ff18 ld t9,-232(s8)
+ 8c79001c lw t9,28(v1)
+ 27390000 addiu t9,t9,0
+ 1b200082 blez t9,zero,0x000000001051843c
+ 00000000 nop
+ dc790000 ld t9,0(v1)
*******************************************************************************/
-bool patcher_checkcast_instanceof_class(u1 *sp)
+bool patcher_instanceof_interface(patchref_t *pr)
{
u1 *ra;
- u4 mcode[2];
constant_classref *cr;
- s4 disp;
- u1 *pv;
classinfo *c;
/* get stuff from the stack */
- ra = (u1 *) *((ptrint *) (sp + 5 * 8));
- mcode[0] = *((u4 *) (sp + 3 * 8));
- mcode[1] = *((u4 *) (sp + 3 * 8 + 4));
- cr = (constant_classref *) *((ptrint *) (sp + 2 * 8));
- disp = *((s4 *) (sp + 1 * 8));
- pv = (u1 *) *((ptrint *) (sp + 0 * 8));
+ ra = (u1 *) pr->mpc;
+ cr = (constant_classref *) pr->ref;
/* get the fieldinfo */
if (!(c = resolve_classref_eager(cr)))
return false;
- /* patch back original code */
-
- *((u4 *) (ra + 0 * 4)) = mcode[0];
- *((u4 *) (ra + 1 * 4)) = mcode[1];
-
- /* synchronize instruction cache */
-
- md_icacheflush(ra, 2 * 4);
-
- /* patch super class' vftbl */
-
- *((ptrint *) (pv + disp)) = (ptrint) c->vftbl;
+ PATCH_BACK_ORIGINAL_MCODE;
- /* synchronize data cache */
-
- md_dcacheflush(pv + disp, SIZEOF_VOID_P);
-
- return true;
-}
-
-
-/* patcher_clinit **************************************************************
-
- No special machine code.
-
-*******************************************************************************/
-
-bool patcher_clinit(u1 *sp)
-{
- u1 *ra;
- u4 mcode[2];
- classinfo *c;
-
- /* get stuff from the stack */
-
- ra = (u1 *) *((ptrint *) (sp + 5 * 8));
- mcode[0] = *((u4 *) (sp + 3 * 8));
- mcode[1] = *((u4 *) (sp + 3 * 8 + 4));
- c = (classinfo *) *((ptrint *) (sp + 2 * 8));
-
- /* check if the class is initialized */
-
- if (!(c->state & CLASS_INITIALIZED))
- if (!initialize_class(c))
- return false;
-
- /* patch back original code */
-
- *((u4 *) (ra + 0 * 4)) = mcode[0];
- *((u4 *) (ra + 1 * 4)) = mcode[1];
-
- /* synchronize instruction cache */
-
- md_icacheflush(ra, 2 * 4);
-
- return true;
-}
-
-
-/* patcher_athrow_areturn ******************************************************
-
- Machine code:
-
- <patched call position>
-
-*******************************************************************************/
-
-#ifdef ENABLE_VERIFIER
-bool patcher_athrow_areturn(u1 *sp)
-{
- u1 *ra;
- u4 mcode[2];
- unresolved_class *uc;
- classinfo *c;
-
- /* get stuff from the stack */
-
- ra = (u1 *) *((ptrint *) (sp + 5 * 8));
- mcode[0] = *((u4 *) (sp + 3 * 8));
- mcode[1] = *((u4 *) (sp + 3 * 8 + 4));
- uc = (unresolved_class *) *((ptrint *) (sp + 2 * 8));
-
- /* resolve the class */
-
- if (!resolve_class(uc, resolveEager, false, &c))
- return false;
-
- /* patch back original code */
-
- *((u4 *) (ra + 0 * 4)) = mcode[0];
- *((u4 *) (ra + 1 * 4)) = mcode[1];
-
- /* synchronize instruction cache */
-
- md_icacheflush(ra, 2 * 4);
-
- return true;
-}
-#endif /* ENABLE_VERIFIER */
-
-
-/* patcher_resolve_native ******************************************************
-
- XXX
-
-*******************************************************************************/
-
-#if !defined(WITH_STATIC_CLASSPATH)
-bool patcher_resolve_native(u1 *sp)
-{
- u1 *ra;
- u4 mcode[2];
- methodinfo *m;
- s4 disp;
- u1 *pv;
- functionptr f;
-
- /* get stuff from the stack */
-
- ra = (u1 *) *((ptrint *) (sp + 5 * 8));
- mcode[0] = *((u4 *) (sp + 3 * 8));
- mcode[1] = *((u4 *) (sp + 3 * 8 + 4));
- m = (methodinfo *) *((ptrint *) (sp + 2 * 8));
- disp = *((s4 *) (sp + 1 * 8));
- pv = (u1 *) *((ptrint *) (sp + 0 * 8));
-
- /* resolve native function */
+ /* if we show disassembly, we have to skip the nop's */
- if (!(f = native_resolve_function(m)))
- return false;
+ if (opt_shownops)
+ ra = ra + PATCHER_CALL_SIZE;
- /* patch back original code */
+ /* patch super class index */
- *((u4 *) (ra + 0 * 4)) = mcode[0];
- *((u4 *) (ra + 1 * 4)) = mcode[1];
+ *((s4 *) (ra + 2 * 4)) |= (s4) (-(c->index) & 0x0000ffff);
+ *((s4 *) (ra + 5 * 4)) |=
+ (s4) ((OFFSET(vftbl_t, interfacetable[0]) -
+ c->index * sizeof(methodptr*)) & 0x0000ffff);
/* synchronize instruction cache */
- md_icacheflush(ra, 2 * 4);
-
- /* patch native function pointer */
-
- *((ptrint *) (pv + disp)) = (ptrint) f;
-
- /* synchronize data cache */
-
- md_dcacheflush(pv + disp, SIZEOF_VOID_P);
+ md_icacheflush(ra + 2 * 4, 4 * 4);
return true;
}
-#endif /* !defined(WITH_STATIC_CLASSPATH) */
/*
projects / cacao.git / blobdiff