/* src/vm/jit/alpha/patcher.c - Alpha 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 5094 2006-07-10 13:51:38Z twisti $
-
*/
#include "vm/types.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/references.h"
-#include "vm/resolve.h"
+
#include "vm/jit/asmpart.h"
-#include "vm/jit/patcher.h"
+#include "vm/jit/patcher-common.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 "vmcore/references.h"
+#include "vm/resolve.h"
-/* patcher_wrapper *************************************************************
-
- 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(NULL, 0);
-*******************************************************************************/
-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));
+ c = (classinfo *) pr->ref;
- /* store PV into the patcher function position */
+ /* check if the class is initialized */
- *((ptrint *) (sp + 0 * 8)) = (ptrint) pv;
+ if (!(c->state & CLASS_INITIALIZED))
+ if (!initialize_class(c))
+ return false;
- /* cast the passed function to a patcher function */
+ PATCH_BACK_ORIGINAL_MCODE;
- patcher_function = (bool (*)(u1 *)) (ptrint) f;
+ return true;
+}
- /* enter a monitor on the patching position */
+/* patcher_resolve_class *****************************************************
- PATCHER_MONITORENTER;
+ Initalizes a given classinfo pointer. This function does not patch
+ any data.
- /* create the stackframeinfo */
+*******************************************************************************/
- stacktrace_create_extern_stackframeinfo(&sfi, pv, sp + 6 * 8, ra, xpc);
+#ifdef ENABLE_VERIFIER
+bool patcher_resolve_class(patchref_t *pr)
+{
+ unresolved_class *uc;
- /* call the proper patcher function */
+ /* get stuff from the stack */
- result = (patcher_function)(sp);
+ uc = (unresolved_class *) pr->ref;
- /* remove the stackframeinfo */
+ /* resolve the class and check subtype constraints */
- stacktrace_remove_stackframeinfo(&sfi);
+ if (!resolve_class_eager_no_access_check(uc))
+ return false;
- /* check for return value and exit accordingly */
+ PATCH_BACK_ORIGINAL_MCODE;
- if (result == false) {
- e = exceptions_get_and_clear_exception();
+ return true;
+}
+#endif /* ENABLE_VERIFIER */
- PATCHER_MONITOREXIT;
- return e;
- }
+/* patcher_resolve_classref_to_classinfo ***************************************
- PATCHER_MARK_PATCHED_MONITOREXIT;
+ ACONST:
- return NULL;
-}
+ <patched call postition>
+ a61bff80 ldq a0,-128(pv)
+ MULTIANEWARRAY:
-/* patcher_get_putstatic *******************************************************
+ <patched call position>
+ a63bff80 ldq a1,-128(pv)
+ 47de0412 mov sp,a2
+ a77bff78 ldq pv,-136(pv)
+ 6b5b4000 jsr (pv)
- Machine code:
+ ARRAYCHECKCAST:
<patched call position>
- a73bff98 ldq t11,-104(pv)
- a2590000 ldl a2,0(t11)
+ a63bfe60 ldq a1,-416(pv)
+ a77bfe58 ldq pv,-424(pv)
+ 6b5b4000 jsr (pv)
*******************************************************************************/
-bool patcher_get_putstatic(u1 *sp)
+bool patcher_resolve_classref_to_classinfo(patchref_t *pr)
{
- u1 *ra;
- u4 mcode;
- unresolved_field *uf;
- s4 disp;
- u1 *pv;
- fieldinfo *fi;
+ constant_classref *cr;
+ u1 *datap;
+ classinfo *c;
/* get stuff from the stack */
- ra = (u1 *) *((ptrint *) (sp + 5 * 8));
- mcode = *((u4 *) (sp + 3 * 8));
- uf = (unresolved_field *) *((ptrint *) (sp + 2 * 8));
- disp = *((s4 *) (sp + 1 * 8));
- pv = (u1 *) *((ptrint *) (sp + 0 * 8));
+ cr = (constant_classref *) pr->ref;
+ datap = (u1 *) pr->datap;
- /* calculate and set the new return address */
-
- ra = ra - 1 * 4;
- *((ptrint *) (sp + 5 * 8)) = (ptrint) ra;
-
- /* get the fieldinfo */
+ /* get the classinfo */
- if (!(fi = resolve_field_eager(uf)))
+ if (!(c = resolve_classref_eager(cr)))
return false;
- /* check if the field's class is initialized */
-
- if (!(fi->class->state & CLASS_INITIALIZED))
- if (!initialize_class(fi->class))
- return false;
-
- /* patch back original code */
-
- *((u4 *) ra) = mcode;
-
- /* synchronize instruction cache */
-
- md_icacheflush(NULL, 0);
+ PATCH_BACK_ORIGINAL_MCODE;
- /* patch the field value's address */
+ /* patch the classinfo pointer */
- *((ptrint *) (pv + disp)) = (ptrint) &(fi->value);
+ *((ptrint *) datap) = (ptrint) c;
return true;
}
-/* patcher_get_putfield ********************************************************
+/* patcher_resolve_classref_to_vftbl *******************************************
- Machine code:
+ CHECKCAST (class):
+ INSTANCEOF (class):
<patched call position>
- a2af0020 ldl a5,32(s6)
+ a7940000 ldq at,0(a4)
+ a7bbff28 ldq gp,-216(pv)
*******************************************************************************/
-bool patcher_get_putfield(u1 *sp)
+bool patcher_resolve_classref_to_vftbl(patchref_t *pr)
{
- u1 *ra;
- u4 mcode;
- unresolved_field *uf;
- fieldinfo *fi;
-
- ra = (u1 *) *((ptrint *) (sp + 5 * 8));
- mcode = *((u4 *) (sp + 3 * 8));
- uf = (unresolved_field *) *((ptrint *) (sp + 2 * 8));
+ constant_classref *cr;
+ u1 *datap;
+ classinfo *c;
- /* calculate and set the new return address */
+ /* get stuff from the stack */
- ra = ra - 1 * 4;
- *((ptrint *) (sp + 5 * 8)) = (ptrint) ra;
+ cr = (constant_classref *) pr->ref;
+ datap = (u1 *) pr->datap;
/* get the fieldinfo */
- if (!(fi = resolve_field_eager(uf)))
+ 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 the field's offset */
-
- *((u4 *) ra) |= (s2) (fi->offset & 0x0000ffff);
+ PATCH_BACK_ORIGINAL_MCODE;
- /* synchronize instruction cache */
+ /* patch super class' vftbl */
- md_icacheflush(NULL, 0);
+ *((ptrint *) datap) = (ptrint) c->vftbl;
return true;
}
-/* patcher_aconst **************************************************************
+/* patcher_resolve_classref_to_flags *******************************************
- Machine code:
+ CHECKCAST/INSTANCEOF:
- <patched call postition>
- a61bff80 ldq a0,-128(pv)
+ <patched call position>
*******************************************************************************/
-bool patcher_aconst(u1 *sp)
+bool patcher_resolve_classref_to_flags(patchref_t *pr)
{
- u1 *ra;
- u4 mcode;
constant_classref *cr;
- s4 disp;
- u1 *pv;
+ u1 *datap;
classinfo *c;
/* get stuff from the stack */
- ra = (u1 *) *((ptrint *) (sp + 5 * 8));
- mcode = *((u4 *) (sp + 3 * 8));
- 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;
- /* calculate and set the new return address */
-
- ra = ra - 1 * 4;
- *((ptrint *) (sp + 5 * 8)) = (ptrint) ra;
-
- /* get the classinfo */
+ /* get the fieldinfo */
if (!(c = resolve_classref_eager(cr)))
return false;
- /* patch back original code */
+ PATCH_BACK_ORIGINAL_MCODE;
- *((u4 *) ra) = mcode;
+ /* patch class flags */
- /* synchronize instruction cache */
+ *((s4 *) datap) = (s4) c->flags;
- md_icacheflush(NULL, 0);
+ return true;
+}
- /* patch the classinfo pointer */
- *((ptrint *) (pv + disp)) = (ptrint) c;
+/* patcher_resolve_native_function *********************************************
+
+ 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;
return true;
}
+#endif /* !defined(WITH_STATIC_CLASSPATH) */
-/* patcher_builtin_multianewarray **********************************************
+/* patcher_get_putstatic *******************************************************
Machine code:
<patched call position>
- a63bff80 ldq a1,-128(pv)
- 47de0412 mov sp,a2
- a77bff78 ldq pv,-136(pv)
- 6b5b4000 jsr (pv)
+ a73bff98 ldq t11,-104(pv)
+ a2590000 ldl a2,0(t11)
*******************************************************************************/
-bool patcher_builtin_multianewarray(u1 *sp)
+bool patcher_get_putstatic(patchref_t *pr)
{
- u1 *ra;
- u4 mcode;
- constant_classref *cr;
- s4 disp;
- u1 *pv;
- classinfo *c;
+ unresolved_field *uf;
+ u1 *datap;
+ fieldinfo *fi;
/* get stuff from the stack */
- ra = (u1 *) *((ptrint *) (sp + 5 * 8));
- mcode = *((u4 *) (sp + 3 * 8));
- cr = (constant_classref *) *((ptrint *) (sp + 2 * 8));
- disp = *((s4 *) (sp + 1 * 8));
- pv = (u1 *) *((ptrint *) (sp + 0 * 8));
+ uf = (unresolved_field *) pr->ref;
+ datap = (u1 *) pr->datap;
- /* calculate and set the new return address */
-
- ra = ra - 1 * 4;
- *((ptrint *) (sp + 5 * 8)) = (ptrint) ra;
-
- /* get the classinfo */
+ /* get the fieldinfo */
- if (!(c = resolve_classref_eager(cr)))
+ 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;
- md_icacheflush(NULL, 0);
+ PATCH_BACK_ORIGINAL_MCODE;
- /* patch the classinfo pointer */
+ /* patch the field value's address */
- *((ptrint *) (pv + disp)) = (ptrint) c;
+ *((intptr_t *) datap) = (intptr_t) fi->value;
return true;
}
-/* patcher_builtin_arraycheckcast **********************************************
+/* patcher_get_putfield ********************************************************
Machine code:
<patched call position>
- a63bfe60 ldq a1,-416(pv)
- a77bfe58 ldq pv,-424(pv)
- 6b5b4000 jsr (pv)
+ a2af0020 ldl a5,32(s6)
*******************************************************************************/
-bool patcher_builtin_arraycheckcast(u1 *sp)
+bool patcher_get_putfield(patchref_t *pr)
{
- u1 *ra;
- u4 mcode;
- constant_classref *cr;
- s4 disp;
- u1 *pv;
- classinfo *c;
-
- /* get stuff from the stack */
-
- ra = (u1 *) *((ptrint *) (sp + 5 * 8));
- mcode = *((u4 *) (sp + 3 * 8));
- cr = (constant_classref *) *((ptrint *) (sp + 2 * 8));
- disp = *((s4 *) (sp + 1 * 8));
- pv = (u1 *) *((ptrint *) (sp + 0 * 8));
-
- /* calculate and set the new return address */
+ u1 *ra;
+ unresolved_field *uf;
+ fieldinfo *fi;
- ra = ra - 1 * 4;
- *((ptrint *) (sp + 5 * 8)) = (ptrint) ra;
+ ra = (u1 *) pr->mpc;
+ uf = (unresolved_field *) pr->ref;
- /* get the classinfo */
+ /* get the fieldinfo */
- if (!(c = resolve_classref_eager(cr)))
+ if (!(fi = resolve_field_eager(uf)))
return false;
- /* patch back original code */
+ PATCH_BACK_ORIGINAL_MCODE;
- *((u4 *) ra) = mcode;
+ /* if we show disassembly, we have to skip the nop */
- /* synchronize instruction cache */
+ if (opt_shownops)
+ ra = ra + 4;
- md_icacheflush(NULL, 0);
+ /* patch the field's offset into the instruction */
- /* patch the classinfo pointer */
+ *((u4 *) ra) |= (s2) (fi->offset & 0x0000ffff);
- *((ptrint *) (pv + disp)) = (ptrint) c;
+ md_icacheflush(NULL, 0);
return true;
}
******************************************************************************/
-bool patcher_invokestatic_special(u1 *sp)
+bool patcher_invokestatic_special(patchref_t *pr)
{
- u1 *ra;
- u4 mcode;
unresolved_method *um;
- s4 disp;
- u1 *pv;
+ u1 *datap;
methodinfo *m;
/* get stuff from the stack */
- ra = (u1 *) *((ptrint *) (sp + 5 * 8));
- mcode = *((u4 *) (sp + 3 * 8));
- um = (unresolved_method *) *((ptrint *) (sp + 2 * 8));
- disp = *((s4 *) (sp + 1 * 8));
- pv = (u1 *) *((ptrint *) (sp + 0 * 8));
-
- /* calculate and set the new return address */
-
- ra = ra - 1 * 4;
- *((ptrint *) (sp + 5 * 8)) = (ptrint) ra;
+ 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) = mcode;
-
- /* synchronize instruction cache */
-
- md_icacheflush(NULL, 0);
+ PATCH_BACK_ORIGINAL_MCODE;
/* patch stubroutine */
- *((ptrint *) (pv + disp)) = (ptrint) m->stubroutine;
+ *((ptrint *) datap) = (ptrint) m->stubroutine;
return true;
}
*******************************************************************************/
-bool patcher_invokevirtual(u1 *sp)
+bool patcher_invokevirtual(patchref_t *pr)
{
u1 *ra;
- u4 mcode;
unresolved_method *um;
methodinfo *m;
/* get stuff from the stack */
- ra = (u1 *) *((ptrint *) (sp + 5 * 8));
- mcode = *((u4 *) (sp + 3 * 8));
- um = (unresolved_method *) *((ptrint *) (sp + 2 * 8));
-
- /* calculate and set the new return address */
-
- ra = ra - 1 * 4;
- *((ptrint *) (sp + 5 * 8)) = (ptrint) ra;
+ 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) = mcode;
+ PATCH_BACK_ORIGINAL_MCODE;
/* if we show disassembly, we have to skip the nop */
- if (opt_showdisassemble)
+ if (opt_shownops)
ra = ra + 4;
/* patch vftbl index */
*((s4 *) (ra + 4)) |= (s4) ((OFFSET(vftbl_t, table[0]) +
sizeof(methodptr) * m->vftblindex) & 0x0000ffff);
- /* synchronize instruction cache */
-
md_icacheflush(NULL, 0);
return true;
*******************************************************************************/
-bool patcher_invokeinterface(u1 *sp)
+bool patcher_invokeinterface(patchref_t *pr)
{
u1 *ra;
- u4 mcode;
unresolved_method *um;
methodinfo *m;
/* get stuff from the stack */
- ra = (u1 *) *((ptrint *) (sp + 5 * 8));
- mcode = *((u4 *) (sp + 3 * 8));
- um = (unresolved_method *) *((ptrint *) (sp + 2 * 8));
-
- /* calculate and set the new return address */
-
- ra = ra - 1 * 4;
- *((ptrint *) (sp + 5 * 8)) = (ptrint) ra;
+ 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) = mcode;
+ PATCH_BACK_ORIGINAL_MCODE;
/* if we show disassembly, we have to skip the nop */
- if (opt_showdisassemble)
+ if (opt_shownops)
ra = ra + 4;
/* patch interfacetable index */
*((s4 *) (ra + 4 + 4)) |=
(s4) ((sizeof(methodptr) * (m - m->class->methods)) & 0x0000ffff);
- /* synchronize instruction cache */
-
md_icacheflush(NULL, 0);
return true;
}
-/* patcher_checkcast_instanceof_flags ******************************************
-
- Machine code:
-
- <patched call position>
-
-*******************************************************************************/
-
-bool patcher_checkcast_instanceof_flags(u1 *sp)
-{
- u1 *ra;
- u4 mcode;
- constant_classref *cr;
- s4 disp;
- u1 *pv;
- classinfo *c;
-
- /* get stuff from the stack */
-
- ra = (u1 *) *((ptrint *) (sp + 5 * 8));
- mcode = *((u4 *) (sp + 3 * 8));
- cr = (constant_classref *) *((ptrint *) (sp + 2 * 8));
- disp = *((s4 *) (sp + 1 * 8));
- pv = (u1 *) *((ptrint *) (sp + 0 * 8));
-
- /* calculate and set the new return address */
-
- ra = ra - 1 * 4;
- *((ptrint *) (sp + 5 * 8)) = (ptrint) ra;
-
- /* get the fieldinfo */
-
- if (!(c = resolve_classref_eager(cr)))
- return false;
-
- /* patch back original code */
-
- *((u4 *) ra) = mcode;
-
- /* synchronize instruction cache */
-
- md_icacheflush(NULL, 0);
-
- /* patch class flags */
-
- *((s4 *) (pv + disp)) = (s4) c->flags;
-
- 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;
constant_classref *cr;
classinfo *c;
/* get stuff from the stack */
- ra = (u1 *) *((ptrint *) (sp + 5 * 8));
- mcode = *((u4 *) (sp + 3 * 8));
- cr = (constant_classref *) *((ptrint *) (sp + 2 * 8));
-
- /* calculate and set the new return address */
-
- ra = ra - 1 * 4;
- *((ptrint *) (sp + 5 * 8)) = (ptrint) ra;
+ 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) = mcode;
+ PATCH_BACK_ORIGINAL_MCODE;
/* if we show disassembly, we have to skip the nop */
- if (opt_showdisassemble)
+ if (opt_shownops)
ra = ra + 4;
/* patch super class index */
*((s4 *) (ra + 2 * 4)) |= (s4) (-(c->index) & 0x0000ffff);
- *((s4 *) (ra + 4 * 4)) |= (s4) ((OFFSET(vftbl_t, interfacetable[0]) -
+ *((s4 *) (ra + 5 * 4)) |= (s4) ((OFFSET(vftbl_t, interfacetable[0]) -
c->index * sizeof(methodptr*)) & 0x0000ffff);
- /* synchronize instruction cache */
-
md_icacheflush(NULL, 0);
return true;
}
-/* patcher_checkcast_instanceof_class ******************************************
+/* patcher_instanceof_interface ************************************************
Machine code:
<patched call position>
- a7940000 ldq at,0(a4)
- a7bbff28 ldq gp,-216(pv)
+ a78e0000 ldq at,0(s5)
+ a3bc001c ldl gp,28(at)
+ 23bdfffd lda gp,-3(gp)
+ efa0002e ble gp,0x00000200002bf6b0
+ a7bcffe8 ldq gp,-24(at)
*******************************************************************************/
-bool patcher_checkcast_instanceof_class(u1 *sp)
+bool patcher_instanceof_interface(patchref_t *pr)
{
u1 *ra;
- u4 mcode;
constant_classref *cr;
- s4 disp;
- u1 *pv;
classinfo *c;
/* get stuff from the stack */
- ra = (u1 *) *((ptrint *) (sp + 5 * 8));
- mcode = *((u4 *) (sp + 3 * 8));
- cr = (constant_classref *) *((ptrint *) (sp + 2 * 8));
- disp = *((s4 *) (sp + 1 * 8));
- pv = (u1 *) *((ptrint *) (sp + 0 * 8));
-
- /* calculate and set the new return address */
-
- ra = ra - 1 * 4;
- *((ptrint *) (sp + 5 * 8)) = (ptrint) ra;
+ 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) = mcode;
-
- /* synchronize instruction cache */
-
- md_icacheflush(NULL, 0);
-
- /* patch super class' vftbl */
-
- *((ptrint *) (pv + disp)) = (ptrint) c->vftbl;
-
- return true;
-}
-
-
-/* patcher_clinit **************************************************************
-
- XXX
+ PATCH_BACK_ORIGINAL_MCODE;
-*******************************************************************************/
-
-bool patcher_clinit(u1 *sp)
-{
- u1 *ra;
- u4 mcode;
- classinfo *c;
-
- /* get stuff from the stack */
-
- ra = (u1 *) *((ptrint *) (sp + 5 * 8));
- mcode = *((u4 *) (sp + 3 * 8));
- c = (classinfo *) *((ptrint *) (sp + 2 * 8));
-
- /* calculate and set the new return address */
-
- ra = ra - 1 * 4;
- *((ptrint *) (sp + 5 * 8)) = (ptrint) ra;
-
- /* check if the class is initialized */
-
- if (!(c->state & CLASS_INITIALIZED))
- if (!initialize_class(c))
- return false;
-
- /* patch back original code */
-
- *((u4 *) ra) = mcode;
-
- /* synchronize instruction cache */
-
- md_icacheflush(NULL, 0);
-
- return true;
-}
-
-
-/* patcher_athrow_areturn ******************************************************
-
- Machine code:
-
- <patched call position>
-
-*******************************************************************************/
-
-#ifdef ENABLE_VERIFIER
-bool patcher_athrow_areturn(u1 *sp)
-{
- u1 *ra;
- u4 mcode;
- unresolved_class *uc;
- classinfo *c;
-
- /* get stuff from the stack */
-
- ra = (u1 *) *((ptrint *) (sp + 5 * 8));
- mcode = *((u4 *) (sp + 3 * 8));
- uc = (unresolved_class *) *((ptrint *) (sp + 2 * 8));
-
- /* calculate and set the new return address */
-
- ra = ra - 1 * 4;
- *((ptrint *) (sp + 5 * 8)) = (ptrint) ra;
-
- /* resolve the class */
-
- if (!resolve_class(uc, resolveEager, false, &c))
- return false;
-
- /* patch back original code */
-
- *((u4 *) ra) = mcode;
-
- /* synchronize instruction cache */
-
- md_icacheflush(NULL, 0);
-
- return true;
-}
-#endif /* ENABLE_VERIFIER */
-
-
-/* patcher_resolve_native ******************************************************
-
- XXX
-
-*******************************************************************************/
-
-#if !defined(WITH_STATIC_CLASSPATH)
-bool patcher_resolve_native(u1 *sp)
-{
- u1 *ra;
- u4 mcode;
- methodinfo *m;
- s4 disp;
- u1 *pv;
- functionptr f;
-
- /* get stuff from the stack */
-
- ra = (u1 *) *((ptrint *) (sp + 5 * 8));
- mcode = *((u4 *) (sp + 3 * 8));
- m = (methodinfo *) *((ptrint *) (sp + 2 * 8));
- disp = *((s4 *) (sp + 1 * 8));
- pv = (u1 *) *((ptrint *) (sp + 0 * 8));
-
- /* calculate and set the new return address */
-
- ra = ra - 1 * 4;
- *((ptrint *) (sp + 5 * 8)) = (ptrint) ra;
-
- /* resolve native function */
+ /* if we show disassembly, we have to skip the nop */
- if (!(f = native_resolve_function(m)))
- return false;
+ if (opt_shownops)
+ ra = ra + 4;
- /* patch back original code */
+ /* patch super class index */
- *((u4 *) ra) = mcode;
+ *((s4 *) (ra + 2 * 4)) |= (s4) (-(c->index) & 0x0000ffff);
- /* synchronize instruction cache */
+ *((s4 *) (ra + 4 * 4)) |= (s4) ((OFFSET(vftbl_t, interfacetable[0]) -
+ c->index * sizeof(methodptr*)) & 0x0000ffff);
md_icacheflush(NULL, 0);
- /* patch native function pointer */
-
- *((ptrint *) (pv + disp)) = (ptrint) f;
-
return true;
}
-#endif /* !defined(WITH_STATIC_CLASSPATH) */
/*
projects / cacao.git / blobdiff