/* src/vm/jit/powerpc64/patcher.c - PowerPC64 code patching functions
- 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
+ Copyright (C) 1996-2005, 2006, 2007, 2008
+ CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO
This file is part of CACAO.
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA.
- $Id: patcher.c 8268 2007-08-07 13:24:43Z twisti $
-
*/
#include "vm/types.h"
+#include "vm/jit/powerpc64/md.h"
+
#include "mm/memory.h"
#include "native/native.h"
#include "vm/initialize.h"
#include "vm/jit/asmpart.h"
-#include "vm/jit/md.h"
#include "vm/jit/methodheader.h"
-#include "vm/jit/patcher.h"
+#include "vm/jit/patcher-common.h"
#include "vm/jit/stacktrace.h"
#include "vmcore/class.h"
#include "vm/resolve.h"
-/* patcher_wrapper *************************************************************
+/* patcher_patch_code **********************************************************
- 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.
+ Just patches back the original machine code.
*******************************************************************************/
-java_objectheader *patcher_wrapper(u1 *sp, u1 *pv, u1 *ra)
+void patcher_patch_code(patchref_t *pr)
{
- stackframeinfo sfi;
- u1 *xpc;
- java_objectheader *o;
- functionptr f;
- bool result;
- java_objectheader *e;
-
- /* define the patcher function */
-
- bool (*patcher_function)(u1 *);
-
- assert(pv != NULL);
-
- /* 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 */
-
- patcher_function = (bool (*)(u1 *)) (ptrint) f;
-
- /* enter a monitor on the patching position */
-
- PATCHER_MONITORENTER;
-
- /* create the stackframeinfo */
-
- stacktrace_create_extern_stackframeinfo(&sfi, pv, sp + 8 * 8, ra, xpc);
-
- /* call the proper patcher function */
-
- result = (patcher_function)(sp);
-
- /* remove the stackframeinfo */
-
- stacktrace_remove_stackframeinfo(&sfi);
-
- /* check for return value and exit accordingly */
-
- if (result == false) {
- e = exceptions_get_and_clear_exception();
-
- PATCHER_MONITOREXIT;
+ /* patch back original code */
- return e;
- }
+ *((u4 *) pr->mpc) = pr->mcode;
- PATCHER_MARK_PATCHED_MONITOREXIT;
+ /* synchronize instruction cache */
- return NULL;
+ md_icacheflush(pr->mpc, 4);
}
*******************************************************************************/
-bool patcher_get_putstatic(u1 *sp)
+bool patcher_get_putstatic(patchref_t *pr)
{
u1 *ra;
u4 mcode;
unresolved_field *uf;
- s4 disp;
- u1 *pv;
+ u1 *datap;
fieldinfo *fi;
/* 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));
+ ra = (u1 *) pr->mpc;
+ mcode = pr->mcode;
+ uf = (unresolved_field *) pr->ref;
+ datap = (u1 *) pr->datap;
/* get the fieldinfo */
/* check if the field's class is initialized */
- if (!(fi->class->state & CLASS_INITIALIZED))
- if (!initialize_class(fi->class))
+ if (!(fi->clazz->state & CLASS_INITIALIZED))
+ if (!initialize_class(fi->clazz))
return false;
/* patch back original code */
/* patch the field value's address */
- *((intptr_t *) (pv + disp)) = (intptr_t) 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;
unresolved_field *uf;
- u1 *pv;
fieldinfo *fi;
- ra = (u1 *) *((ptrint *) (sp + 5 * 8));
- mcode = *((u4 *) (sp + 3 * 8));
- uf = (unresolved_field *) *((ptrint *) (sp + 2 * 8));
- pv = (u1 *) *((ptrint *) (sp + 1 * 8));
+ ra = (u1 *) pr->mpc;
+ mcode = pr->mcode;
+ uf = (unresolved_field *) pr->ref;
/* get the fieldinfo */
*((u4 *) ra) = mcode;
+ /* synchronize instruction cache */
+
+ md_icacheflush(ra, 4);
+
/* if we show disassembly, we have to skip the nop */
if (opt_shownops)
}
-/* patcher_aconst **************************************************************
-
- Machine code:
-
- <patched call postition>
- -------- ld r3,-64(r14)
- -------- ld r14,-72(r14)
- -------- mtcr r14
- -------- bctrl
-
-*******************************************************************************/
-
-bool patcher_aconst(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));
-
- /* get the classinfo */
-
- 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 */
-
- *((ptrint *) (pv + disp)) = (ptrint) c;
-
- /* synchronize data cache */
-
- md_dcacheflush(pv + disp, SIZEOF_VOID_P);
-
- return true;
-}
-
-
-/* patcher_builtin_multianewarray **********************************************
-
- Machine code:
-
- <patched call position>
- 808dffc0 lwz r4,-64(r13)
- 38a10038 addi r5,r1,56
- 81adffbc lwz r13,-68(r13)
- 7da903a6 mtctr r13
- 4e800421 bctrl
-
-*******************************************************************************/
-
-bool patcher_builtin_multianewarray(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));
-
- /* get the classinfo */
-
- 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 */
-
- *((ptrint *) (pv + disp)) = (ptrint) c;
-
- /* synchronize data cache */
-
- md_dcacheflush(pv + disp, SIZEOF_VOID_P);
-
- return true;
-}
-
-
-/* patcher_builtin_arraycheckcast **********************************************
-
- Machine code:
-
- <patched call position>
- 808dffd8 lwz r4,-40(r13)
- 81adffd4 lwz r13,-44(r13)
- 7da903a6 mtctr r13
- 4e800421 bctrl
-
-*******************************************************************************/
-
-bool patcher_builtin_arraycheckcast(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));
-
- /* get the classinfo */
-
- 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 */
-
- *((ptrint *) (pv + disp)) = (ptrint) c;
-
- /* synchronize data cache */
-
- md_dcacheflush(pv + disp, SIZEOF_VOID_P);
-
- return true;
-}
-
-
/* patcher_invokestatic_special ************************************************
Machine code:
******************************************************************************/
-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));
+ ra = (u1 *) pr->mpc;
+ mcode = pr->mcode;
+ um = (unresolved_method *) pr->ref;
+ datap = (u1 *) pr->datap;
/* get the fieldinfo */
/* 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;
/* get stuff from the stack */
- ra = (u1 *) *((ptrint *) (sp + 5 * 8));
- mcode = *((u4 *) (sp + 3 * 8));
- um = (unresolved_method *) *((ptrint *) (sp + 2 * 8));
+ ra = (u1 *) pr->mpc;
+ mcode = pr->mcode;
+ um = (unresolved_method *) pr->ref;
/* get the fieldinfo */
*((u4 *) ra) = mcode;
+ /* synchronize instruction cache */
+
+ md_icacheflush(ra, 4);
+
/* if we show disassembly, we have to skip the nop */
if (opt_shownops)
*******************************************************************************/
-bool patcher_invokeinterface(u1 *sp)
+bool patcher_invokeinterface(patchref_t *pr)
{
u1 *ra;
u4 mcode;
/* get stuff from the stack */
- ra = (u1 *) *((ptrint *) (sp + 5 * 8));
- mcode = *((u4 *) (sp + 3 * 8));
- um = (unresolved_method *) *((ptrint *) (sp + 2 * 8));
+ ra = (u1 *) pr->mpc;
+ mcode = pr->mcode;
+ um = (unresolved_method *) pr->ref;
/* get the fieldinfo */
*((u4 *) ra) = mcode;
+ /* synchronize instruction cache */
+
+ md_icacheflush(ra, 4);
+
/* if we show disassembly, we have to skip the nop */
if (opt_shownops)
/* patch interfacetable index */
disp = OFFSET(vftbl_t, interfacetable[0]) -
- sizeof(methodptr*) * m->class->index;
+ sizeof(methodptr*) * m->clazz->index;
/* XXX TWISTI: check displacement */
/* patch method offset */
- disp = sizeof(methodptr) * (m - m->class->methods);
+ disp = sizeof(methodptr) * (m - m->clazz->methods);
/* XXX TWISTI: check displacement */
}
-/* patcher_checkcast_instanceof_flags ******************************************
-
- Machine code:
-
- <patched call position>
- 818dff7c lwz r12,-132(r13)
-
-*******************************************************************************/
-
-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));
-
- /* 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 class flags */
-
- *((s4 *) (pv + disp)) = (s4) c->flags;
-
- /* synchronize data cache */
-
- md_dcacheflush(pv + disp, SIZEOF_VOID_P);
-
- return true;
-}
/* patcher_checkcast_interface **************************************
Machine code:
800c0000 lwz r0,0(r12)
*******************************************************************************/
-bool patcher_checkcast_interface(u1 *sp)
+
+bool patcher_checkcast_interface(patchref_t *pr)
{
- u1 *ra;
+ u1 *ra;
constant_classref *cr;
- classinfo *c;
- s4 disp;
- u4 mcode;
+ classinfo *c;
+ s4 disp;
+ u4 mcode;
/* get stuff from stack */
- ra = (u1*) *((ptrint *)(sp + 5*8));
- mcode = *((u4*) (sp + 3*8));
- cr = (constant_classref*) *((ptrint*)(sp+2*8));
+ ra = (u1 *) pr->mpc;
+ mcode = pr->mcode;
+ cr = (constant_classref *) pr->ref;
/* get the fieldinfo */
if (!(c = resolve_classref_eager(cr))) {
/* patch back original code */
*((u4 *) ra) = mcode;
+ /* synchronize instruction cache */
+
+ md_icacheflush(ra, 4);
+
/* if we show NOPs, we have to skip them */
- if (opt_shownops) {
+ if (opt_shownops)
ra = ra +4;
- }
/* patch super class index */
disp = -(c->index);
*******************************************************************************/
-bool patcher_instanceof_interface(u1 *sp)
+bool patcher_instanceof_interface(patchref_t *pr)
{
u1 *ra;
u4 mcode;
/* get stuff from the stack */
- ra = (u1 *) *((ptrint *) (sp + 5 * 8));
- mcode = *((u4 *) (sp + 3 * 8));
- cr = (constant_classref *) *((ptrint *) (sp + 2 * 8));
+ ra = (u1 *) pr->mpc;
+ mcode = pr->mcode;
+ cr = (constant_classref *) pr->ref;
/* get the fieldinfo */
*((u4 *) ra) = mcode;
+ /* synchronize instruction cache */
+
+ md_icacheflush(ra, 4);
+
/* if we show disassembly, we have to skip the nop */
if (opt_shownops)
}
-/* patcher_checkcast_class *****************************************************
-
- Machine code:
-
- <patched call position>
- 81870000 lwz r12,0(r7)
- 800c0014 lwz r0,20(r12)
- 818dff78 lwz r12,-136(r13)
-
-*******************************************************************************/
-
-bool patcher_checkcast_class(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));
-
- /* 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 super class' vftbl */
-
- *((ptrint *) (pv + disp)) = (ptrint) c->vftbl;
-
- /* synchronize data cache */
-
- md_dcacheflush(pv + disp, SIZEOF_VOID_P);
-
- return true;
-}
-
/* patcher_resolve_classref_to_classinfo ***************************************
ACONST:
*******************************************************************************/
-bool patcher_resolve_classref_to_classinfo(u1 *sp)
+bool patcher_resolve_classref_to_classinfo(patchref_t *pr)
{
constant_classref *cr;
- s4 disp;
- u1 *pv, *ra;
- u4 mcode;
+ u1 *datap, *ra;
+ u4 mcode;
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));
+ ra = (u1 *) pr->mpc;
+ mcode = pr->mcode;
+ cr = (constant_classref *) pr->ref;
+ datap = (u1 *) pr->datap;
/* get the classinfo */
/* patch the classinfo pointer */
- *((ptrint *) (pv + disp)) = (ptrint) c;
+ *((ptrint *) datap) = (ptrint) c;
/* synchronize data cache */
- md_dcacheflush(pv + disp, SIZEOF_VOID_P);
+ md_dcacheflush(datap, SIZEOF_VOID_P);
return true;
}
-
-/* patcher_instanceof_class ****************************************************
-
- Machine code:
-
- <patched call position>
- 817d0000 lwz r11,0(r29)
- 818dff8c lwz r12,-116(r13)
-
-*******************************************************************************/
-
-bool patcher_instanceof_class(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));
-
- /* 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 super class' vftbl */
-
- *((ptrint *) (pv + disp)) = (ptrint) c->vftbl;
-
- /* synchronize data cache */
-
- md_dcacheflush(pv + disp, SIZEOF_VOID_P);
-
- return true;
-}
-
/* patcher_resolve_classref_to_vftbl *******************************************
CHECKCAST (class):
*******************************************************************************/
-bool patcher_resolve_classref_to_vftbl(u1 *sp)
+bool patcher_resolve_classref_to_vftbl(patchref_t *pr)
{
constant_classref *cr;
- s4 disp;
- u1 *pv, *ra;
- u4 mcode;
+ u1 *datap, *ra;
+ u4 mcode;
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));
+ ra = (u1 *) pr->mpc;
+ mcode = pr->mcode;
+ cr = (constant_classref *) pr->ref;
+ datap = (u1 *) pr->datap;
/* get the fieldinfo */
/* patch super class' vftbl */
- *((ptrint *) (pv + disp)) = (ptrint) c->vftbl;
+ *((ptrint *) datap) = (ptrint) c->vftbl;
/* synchronize data cache */
- md_dcacheflush(pv + disp, SIZEOF_VOID_P);
+ md_dcacheflush(datap, SIZEOF_VOID_P);
return true;
}
*******************************************************************************/
-bool patcher_resolve_classref_to_flags(u1 *sp)
+bool patcher_resolve_classref_to_flags(patchref_t *pr)
{
constant_classref *cr;
- s4 disp;
- u1 *pv, *ra;
- u4 mcode;
+ u1 *datap, *ra;
+ u4 mcode;
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));
+ ra = (u1 *) pr->mpc;
+ mcode = pr->mcode;
+ cr = (constant_classref *) pr->ref;
+ datap = (u1 *) pr->datap;
/* get the fieldinfo */
/* patch class flags */
- *((s4 *) (pv + disp)) = (s4) c->flags;
-
- /* synchronize data cache */
-
- md_dcacheflush(pv + disp, SIZEOF_VOID_P);
-
- return true;
-}
-
-/* patcher_clinit **************************************************************
-
- XXX
-
-*******************************************************************************/
-
-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));
-
- /* 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(ra, 4);
-
- 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;
-
- /* get stuff from the stack */
-
- ra = (u1 *) *((ptrint *) (sp + 5 * 8));
- mcode = *((u4 *) (sp + 3 * 8));
- uc = (unresolved_class *) *((ptrint *) (sp + 2 * 8));
-
- /* resolve the class and check subtype constraints */
-
- if (!resolve_class_eager_no_access_check(uc))
- return false;
-
- /* patch back original code */
-
- *((u4 *) ra) = mcode;
-
- /* synchronize instruction cache */
-
- md_icacheflush(ra, 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;
- 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));
-
- /* resolve native function */
-
- if (!(f = native_resolve_function(m)))
- return false;
-
- /* patch back original code */
-
- *((u4 *) ra) = mcode;
-
- /* synchronize instruction cache */
-
- md_icacheflush(ra, 4);
-
- /* patch native function pointer */
-
- *((ptrint *) (pv + disp)) = (ptrint) f;
+ *((s4 *) datap) = (s4) c->flags;
/* synchronize data cache */
- md_dcacheflush(pv + disp, SIZEOF_VOID_P);
+ md_dcacheflush(datap, SIZEOF_VOID_P);
return true;
}
-#endif /* !defined(WITH_STATIC_CLASSPATH) */
/*
projects / cacao.git / blobdiff