#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"
*******************************************************************************/
+#if 0
java_objectheader *patcher_wrapper(u1 *sp, u1 *pv, u1 *ra)
{
stackframeinfo sfi;
return NULL;
}
+#endif
-/* Helper
- */
-static void patcher_patch_back(u1 *sp)
+
+#define PATCH_BACK_ORIGINAL_MCODE *((u8*)(pr->mpc)) = pr->mcode
+
+/* patcher_initialize_class ****************************************************
+
+ just patch back original code
+
+*******************************************************************************/
+
+
+void patcher_patch_code(patchref_t *pr)
{
+#if 0
u1* xpc = (u1 *) *((ptrint *) (sp + 6 * 4));
u4 mcode = *((u4*) (sp + 3 * 4));
u4 xmcode = *((u4*) (sp + 2 * 4));
*((u4*)(xpc)) = mcode;
*((u4*)(xpc+4)) = xmcode;
- md_icacheflush(xpc, 8);
+#endif
+
+ PATCH_BACK_ORIGINAL_MCODE;
+ md_icacheflush((void*)pr->mpc, 8);
+
}
+
+#if 0
/* patcher_initialize_class ****************************************************
Initalizes a given classinfo pointer. This function does not patch
*******************************************************************************/
-bool patcher_initialize_class(u1 *sp)
+bool patcher_initialize_class(patchref_t *pr)
{
classinfo *c;
u4 xpc, mcode, xmcode;
return true;
}
+#endif
/* patcher_invokevirtual *******************************************************
*******************************************************************************/
-bool patcher_invokevirtual(u1 *sp)
+bool patcher_invokevirtual(patchref_t *pr)
{
u1 *ra;
unresolved_method *um;
s2 disp;
/* get stuff from the stack */
- ra = (u1 *) *((ptrint *) (sp + 6 * 4));
- um = (unresolved_method *) *((ptrint *) (sp + 1 * 4));
+ ra = (u1 *) pr->mpc;
+ um = (unresolved_method *) pr->ref;
/* get the fieldinfo */
if (!(m = resolve_method_eager(um)))
return false;
/* patch back original code */
- patcher_patch_back(sp);
+ PATCH_BACK_ORIGINAL_MCODE;
/* if we show NOPs, we have to skip them */
if (opt_shownops) ra += PATCHER_CALL_SIZE;
******************************************************************************/
-bool patcher_invokestatic_special(u1 *sp)
+bool patcher_invokestatic_special(patchref_t *pr)
{
unresolved_method *um;
s4 disp;
methodinfo *m;
/* get stuff from the stack */
- disp = *((s4 *) (sp + 6 * 4));
- um = (unresolved_method *) *((ptrint *) (sp + 1 * 4));
+ disp = pr->mpc;
+ um = (unresolved_method *) pr->ref;
/* get the fieldinfo */
if (!(m = resolve_method_eager(um)))
return false;
/* patch back original code */
- patcher_patch_back(sp);
+ PATCH_BACK_ORIGINAL_MCODE;
/* patch stubroutine */
if (opt_shownops) disp += PATCHER_CALL_SIZE;
/* synchronize inst cache */
- md_icacheflush(disp+2, SIZEOF_VOID_P);
+ md_icacheflush((void*)(disp+2), SIZEOF_VOID_P);
return true;
}
+#if 0
/* patcher_resolve_class *******************************************************
Resolves a given unresolved_class pointer. This function does not
*******************************************************************************/
#ifdef ENABLE_VERIFIER
-bool patcher_resolve_class(u1 *sp)
+bool patcher_resolve_class(patchref_t *pr)
{
unresolved_class *uc;
classinfo *c;
return false;
/* patch back original code */
- patcher_patch_back(sp);
+ PATCH_BACK_ORIGINAL_MCODE;
return true;
}
#endif /* ENABLE_VERIFIER */
+#endif
+#if 0
/* patcher_resolve_classref_to_classinfo ***************************************
ACONST:
0x4028f2ca: 2479 0000 0000 moveal 0x00000000,%a2
*******************************************************************************/
-bool patcher_resolve_classref_to_classinfo(u1 *sp)
+bool patcher_resolve_classref_to_classinfo(patchref_t *pr)
{
constant_classref *cr;
s4 disp;
return false;
/* patch back original code */
- patcher_patch_back(sp);
+ PATCH_BACK_ORIGINAL_MCODE;
/* patch the classinfo pointer */
if (opt_shownops) disp += PATCHER_CALL_SIZE;
return true;
}
+#endif
/* patcher_get_putstatic *******************************************************
*******************************************************************************/
-bool patcher_get_putstatic(u1 *sp)
+bool patcher_get_putstatic(patchref_t *pr)
{
- u1 *ra;
unresolved_field *uf;
s4 disp;
- u1 *pv;
fieldinfo *fi;
/* get stuff from the stack */
- uf = (unresolved_field *) *((ptrint *) (sp + 1 * 4));
- disp = *((s4 *) (sp + 6 * 4));
+ uf = (unresolved_field *) pr->ref;
+ disp = pr->mpc;
/* get the fieldinfo */
if (!(fi = resolve_field_eager(uf)))
return false;
/* patch back original code */
- patcher_patch_back(sp);
+ PATCH_BACK_ORIGINAL_MCODE;
/* patch the field value's address */
if (opt_shownops) disp += PATCHER_CALL_SIZE;
*((intptr_t *) (disp+2)) = (intptr_t) fi->value;
/* synchronize inst cache */
- md_icacheflush(disp+2, SIZEOF_VOID_P);
+ md_icacheflush((void*)(disp+2), SIZEOF_VOID_P);
return true;
}
*******************************************************************************/
-bool patcher_get_putfield(u1 *sp)
+bool patcher_get_putfield(patchref_t *pr)
{
u1 *ra;
unresolved_field *uf;
fieldinfo *fi;
- s2 disp;
- ra = (u1 *) *((ptrint *) (sp + 6 * 4));
- uf = (unresolved_field *) *((ptrint *) (sp + 1 * 4));
+ ra = (u1 *) pr->mpc;
+ uf = (unresolved_field *) pr->ref;
/* get the fieldinfo */
if (!(fi = resolve_field_eager(uf)))
return false;
/* patch back original code */
- patcher_patch_back(sp);
+ PATCH_BACK_ORIGINAL_MCODE;
/* if we show NOPs, we have to skip them */
if (opt_shownops) ra += PATCHER_CALL_SIZE;
*******************************************************************************/
-bool patcher_resolve_classref_to_flags(u1 *sp)
+bool patcher_resolve_classref_to_flags(patchref_t *pr)
{
constant_classref *cr;
s4 disp;
classinfo *c;
/* get stuff from the stack */
- cr = (constant_classref *) *((ptrint *) (sp + 1 * 4));
- disp = *((s4 *) (sp + 6 * 4));
+ cr = (constant_classref *) pr->ref;
+ disp = pr->mpc;
/* get the fieldinfo */
if (!(c = resolve_classref_eager(cr)))
return false;
/* patch back original code */
- patcher_patch_back(sp);
+ PATCH_BACK_ORIGINAL_MCODE;
/* patch class flags */
if (opt_shownops) disp += PATCHER_CALL_SIZE;
*((s4 *) (disp + 2)) = (s4) c->flags;
/* synchronize insn cache */
- md_icacheflush(disp + 2, SIZEOF_VOID_P);
+ md_icacheflush((void*)(disp + 2), SIZEOF_VOID_P);
return true;
}
*******************************************************************************/
-bool patcher_resolve_classref_to_vftbl(u1 *sp)
+bool patcher_resolve_classref_to_vftbl(patchref_t *pr)
{
constant_classref *cr;
s4 disp;
classinfo *c;
/* get stuff from the stack */
- cr = (constant_classref *) *((ptrint *) (sp + 1 * 4));
- disp = *((s4 *) (sp + 6 * 4));
+ cr = (constant_classref *) pr->ref;
+ disp = pr->mpc;
/* get the fieldinfo */
if (!(c = resolve_classref_eager(cr)))
return false;
/* patch back original code */
- patcher_patch_back(sp);
+ PATCH_BACK_ORIGINAL_MCODE;
/* patch super class' vftbl */
if (opt_shownops) disp += PATCHER_CALL_SIZE;
*((s4 *) (disp+2)) = (s4) c->vftbl;
/* synchronize insin cache */
- md_icacheflush(disp+2, SIZEOF_VOID_P);
+ md_icacheflush((void*)(disp+2), SIZEOF_VOID_P);
return true;
}
*******************************************************************************/
-bool patcher_instanceof_interface(u1 *sp)
+bool patcher_instanceof_interface(patchref_t *pr)
{
u1 *ra;
constant_classref *cr;
/* get stuff from the stack */
- ra = (u1 *) *((ptrint *) (sp + 6 * 4));
- cr = (constant_classref *) *((ptrint *) (sp + 1 * 4));
+ ra = (u1 *) pr->mpc;
+ cr = (constant_classref *) pr->ref;
/* get the fieldinfo */
if (!(c = resolve_classref_eager(cr)))
return false;
/* patch back original code */
- patcher_patch_back(sp);
+ PATCH_BACK_ORIGINAL_MCODE;
/* if we show NOPs, we have to skip them */
if (opt_shownops) ra += PATCHER_CALL_SIZE;
*((s2 *) (ra + 20)) = disp;
/* synchronize instruction cache */
- md_icacheflush(ra + 10, 12);
+ md_icacheflush((void*)(ra + 10), 12);
return true;
}
*******************************************************************************/
-bool patcher_checkcast_interface(u1 *sp)
+bool patcher_checkcast_interface(patchref_t *pr)
{
u1 *ra;
constant_classref *cr;
s4 disp;
/* get stuff from the stack */
- ra = (u1 *) *((ptrint *) (sp + 6 * 4));
- cr = (constant_classref *) *((ptrint *) (sp + 1 * 4));
+ ra = (u1 *) pr->mpc;
+ cr = (constant_classref *) pr->ref;
/* get the fieldinfo */
if (!(c = resolve_classref_eager(cr)))
return false;
/* patch back original code */
- patcher_patch_back(sp);
+ PATCH_BACK_ORIGINAL_MCODE;
/* if we show NOPs, we have to skip them */
if (opt_shownops) ra += PATCHER_CALL_SIZE;
*((s2 *) (ra + 24)) = disp;
/* synchronize instruction cache */
- md_icacheflush(ra + 10, 16);
+ md_icacheflush((void*)(ra + 10), 16);
return true;
}
+#if 0
/* patcher_resolve_native_function *********************************************
XXX
*******************************************************************************/
-bool patcher_resolve_native_function(u1 *sp)
+bool patcher_resolve_native_function(patchref_t *pr)
{
methodinfo *m;
s4 disp;
functionptr f;
/* get stuff from the stack */
- m = (methodinfo *) *((ptrint *) (sp + 1 * 4));
- disp = *((s4 *) (sp + 6 * 4));
+ m = (methodinfo *) pr->ref;
+ disp = pr->mpc;
/* resolve native function */
if (!(f = native_resolve_function(m)))
return false;
/* patch back original code */
- patcher_patch_back(sp);
+ PATCH_BACK_ORIGINAL_MCODE;
/* patch native function pointer */
if (opt_shownops) disp += PATCHER_CALL_SIZE;
*((ptrint *) (disp + 2)) = (ptrint) f;
/* synchronize data cache */
- md_icacheflush(disp + 2, SIZEOF_VOID_P);
+ md_icacheflush((void*)(disp + 2), SIZEOF_VOID_P);
return true;
}
-
+#endif
/* patcher_invokeinterface *****************************************************
*******************************************************************************/
-bool patcher_invokeinterface(u1 *sp)
+bool patcher_invokeinterface(patchref_t *pr)
{
u1 *ra;
unresolved_method *um;
s4 disp;
/* get stuff from the stack */
- ra = (u1 *) *((ptrint *) (sp + 6 * 4));
- um = (unresolved_method *) *((ptrint *) (sp + 1 * 4));
+ ra = (u1 *) pr->mpc;
+ um = (unresolved_method *) pr->ref;
/* get the fieldinfo */
return false;
/* patch back original code */
- patcher_patch_back(sp);
+ PATCH_BACK_ORIGINAL_MCODE;
/* if we show NOPs, we have to skip them */
if (opt_shownops) ra += PATCHER_CALL_SIZE;
*((uint16_t *) (ra + 7 * 2)) = disp;
/* synchronize instruction cache */
- md_icacheflush(ra + 5 * 2, 2 * 2);
+ md_icacheflush((void*)(ra + 5 * 2), 2 * 2);
return true;
}
projects / cacao.git / blobdiff