/* src/vm/jit/alpha/patcher.c - Alpha code patching functions
- Copyright (C) 1996-2005 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 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
This file is part of CACAO.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- 02111-1307, USA.
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ 02110-1301, USA.
- Contact: cacao@complang.tuwien.ac.at
-
- Authors: Christian Thalinger
-
- Changes:
+*/
- $Id: patcher.c 2986 2005-07-11 18:56:09Z twisti $
-*/
+#include "config.h"
+#include <assert.h>
-#include "vm/jit/alpha/types.h"
+#include "vm/types.h"
#include "mm/memory.h"
+
#include "native/native.h"
+
#include "vm/builtin.h"
-#include "vm/field.h"
+#include "vm/exceptions.h"
#include "vm/initialize.h"
-#include "vm/options.h"
-#include "vm/references.h"
+
#include "vm/jit/asmpart.h"
-#include "vm/jit/helper.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_get_putstatic *******************************************************
- Machine code:
+#define PATCH_BACK_ORIGINAL_MCODE \
+ *((u4 *) pr->mpc) = (u4) pr->mcode; \
+ md_icacheflush(NULL, 0);
- <patched call position>
- a73bff98 ldq t11,-104(pv)
- a2590000 ldl a2,0(t11)
+
+/* patcher_initialize_class ****************************************************
+
+ Initalizes a given classinfo pointer. This function does not patch
+ any data.
*******************************************************************************/
-bool patcher_get_putstatic(u1 *sp)
+bool patcher_initialize_class(patchref_t *pr)
{
- u1 *ra;
- java_objectheader *o;
- u4 mcode;
- unresolved_field *uf;
- u1 *pv;
- fieldinfo *fi;
- s2 offset;
+ classinfo *c;
/* get stuff from the stack */
- ra = (u1 *) *((ptrint *) (sp + 4 * 8));
- o = (java_objectheader *) *((ptrint *) (sp + 3 * 8));
- mcode = *((u4 *) (sp + 2 * 8));
- uf = (unresolved_field *) *((ptrint *) (sp + 1 * 8));
- pv = (u1 *) *((ptrint *) (sp + 0 * 8));
-
- /* calculate and set the new return address */
-
- ra = ra - 1 * 4;
- *((ptrint *) (sp + 4 * 8)) = (ptrint) ra;
-
- PATCHER_MONITORENTER;
-
- /* get the fieldinfo */
-
- if (!(fi = helper_resolve_fieldinfo(uf))) {
- PATCHER_MONITOREXIT;
-
- return false;
- }
+ c = (classinfo *) pr->ref;
- /* check if the field's class is initialized */
-
- if (!fi->class->initialized) {
- if (!initialize_class(fi->class)) {
- PATCHER_MONITOREXIT;
+ /* check if the class is initialized */
+ if (!(c->state & CLASS_INITIALIZED))
+ if (!initialize_class(c))
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;
-
- /* get the offset from machine instruction */
-
- offset = (s2) (*((u4 *) ra) & 0x0000ffff);
- /* patch the field value's address */
-
- *((ptrint *) (pv + offset)) = (ptrint) &(fi->value);
-
- /* synchronize instruction cache */
-
- asm_sync_instruction_cache();
-
- PATCHER_MARK_PATCHED_MONITOREXIT;
+ PATCH_BACK_ORIGINAL_MCODE;
return true;
}
+/* patcher_resolve_class *****************************************************
-/* patcher_get_putfield ********************************************************
-
- Machine code:
-
- <patched call position>
- a2af0020 ldl a5,32(s6)
+ Initalizes a given classinfo pointer. This function does not patch
+ any data.
*******************************************************************************/
-bool patcher_get_putfield(u1 *sp)
+#ifdef ENABLE_VERIFIER
+bool patcher_resolve_class(patchref_t *pr)
{
- u1 *ra;
- java_objectheader *o;
- u4 mcode;
- unresolved_field *uf;
- u1 *pv;
- fieldinfo *fi;
-
- ra = (u1 *) *((ptrint *) (sp + 4 * 8));
- o = (java_objectheader *) *((ptrint *) (sp + 3 * 8));
- mcode = *((u4 *) (sp + 2 * 8));
- uf = (unresolved_field *) *((ptrint *) (sp + 1 * 8));
- pv = (u1 *) *((ptrint *) (sp + 0 * 8));
-
- /* calculate and set the new return address */
+ unresolved_class *uc;
- ra = ra - 1 * 4;
- *((ptrint *) (sp + 4 * 8)) = (ptrint) ra;
-
- PATCHER_MONITORENTER;
+ /* get stuff from the stack */
- /* get the fieldinfo */
+ uc = (unresolved_class *) pr->ref;
- if (!(fi = helper_resolve_fieldinfo(uf))) {
- 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;
-
- /* 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);
-
- /* synchronize instruction cache */
-
- asm_sync_instruction_cache();
-
- PATCHER_MARK_PATCHED_MONITOREXIT;
+ PATCH_BACK_ORIGINAL_MCODE;
return true;
}
+#endif /* ENABLE_VERIFIER */
-/* patcher_builtin_new *********************************************************
+/* patcher_resolve_classref_to_classinfo ***************************************
- Machine code:
+ ACONST:
- a61bff80 ldq a0,-128(pv)
<patched call postition>
+ a61bff80 ldq a0,-128(pv)
+
+ MULTIANEWARRAY:
+
+ <patched call position>
+ a63bff80 ldq a1,-128(pv)
+ 47de0412 mov sp,a2
a77bff78 ldq pv,-136(pv)
6b5b4000 jsr (pv)
+ ARRAYCHECKCAST:
+
+ <patched call position>
+ a63bfe60 ldq a1,-416(pv)
+ a77bfe58 ldq pv,-424(pv)
+ 6b5b4000 jsr (pv)
+
*******************************************************************************/
-bool patcher_builtin_new(u1 *sp)
+bool patcher_resolve_classref_to_classinfo(patchref_t *pr)
{
- u1 *ra;
- java_objectheader *o;
- u4 mcode;
constant_classref *cr;
- u1 *pv;
+ u1 *datap;
classinfo *c;
- s2 offset;
/* get stuff from the stack */
- ra = (u1 *) *((ptrint *) (sp + 4 * 8));
- o = (java_objectheader *) *((ptrint *) (sp + 3 * 8));
- mcode = *((u4 *) (sp + 2 * 8));
- cr = (constant_classref *) *((ptrint *) (sp + 1 * 8));
- pv = (u1 *) *((ptrint *) (sp + 0 * 8));
-
- /* calculate and set the new return address */
-
- ra = ra - 2 * 4;
- *((ptrint *) (sp + 4 * 8)) = (ptrint) ra;
-
- PATCHER_MONITORENTER;
+ cr = (constant_classref *) pr->ref;
+ datap = (u1 *) pr->datap;
/* get the classinfo */
- if (!(c = helper_resolve_classinfo(cr))) {
- PATCHER_MONITOREXIT;
-
+ if (!(c = resolve_classref_eager(cr)))
return false;
- }
-
- /* patch back original code */
- *((u4 *) (ra + 4)) = mcode;
-
- /* get the offset from machine instruction */
-
- offset = (s2) (*((u4 *) ra) & 0x0000ffff);
+ PATCH_BACK_ORIGINAL_MCODE;
/* patch the classinfo pointer */
- *((ptrint *) (pv + offset)) = (ptrint) c;
-
- /* if we show disassembly, we have to skip the nop */
-
- if (opt_showdisassemble)
- ra = ra + 4;
-
- /* get the offset from machine instruction */
-
- offset = (s2) (*((u4 *) (ra + 4)) & 0x0000ffff);
-
- /* patch new function address */
-
- *((ptrint *) (pv + offset)) = (ptrint) BUILTIN_new;
-
- /* synchronize instruction cache */
-
- asm_sync_instruction_cache();
-
- PATCHER_MARK_PATCHED_MONITOREXIT;
+ *((ptrint *) datap) = (ptrint) c;
return true;
}
-/* patcher_builtin_newarray ****************************************************
+/* patcher_resolve_classref_to_vftbl *******************************************
- Machine code:
+ CHECKCAST (class):
+ INSTANCEOF (class):
- a63bff88 ldq a1,-120(pv)
<patched call position>
- a77bff80 ldq pv,-128(pv)
- 6b5b4000 jsr (pv)
+ a7940000 ldq at,0(a4)
+ a7bbff28 ldq gp,-216(pv)
*******************************************************************************/
-bool patcher_builtin_newarray(u1 *sp)
+bool patcher_resolve_classref_to_vftbl(patchref_t *pr)
{
- u1 *ra;
- java_objectheader *o;
- u4 mcode;
constant_classref *cr;
- u1 *pv;
+ u1 *datap;
classinfo *c;
- s2 offset;
/* get stuff from the stack */
- ra = (u1 *) *((ptrint *) (sp + 4 * 8));
- o = (java_objectheader *) *((ptrint *) (sp + 3 * 8));
- mcode = *((u4 *) (sp + 2 * 8));
- cr = (constant_classref *) *((ptrint *) (sp + 1 * 8));
- pv = (u1 *) *((ptrint *) (sp + 0 * 8));
-
- /* calculate and set the new return address */
-
- ra = ra - 2 * 4;
- *((ptrint *) (sp + 4 * 8)) = (ptrint) ra;
+ cr = (constant_classref *) pr->ref;
+ datap = (u1 *) pr->datap;
- PATCHER_MONITORENTER;
-
- /* get the classinfo */
-
- if (!(c = helper_resolve_classinfo(cr))) {
- PATCHER_MONITOREXIT;
+ /* get the fieldinfo */
+ if (!(c = resolve_classref_eager(cr)))
return false;
- }
-
- /* patch back original code */
-
- *((u4 *) (ra + 4)) = mcode;
- /* get the offset from machine instruction */
-
- offset = (s2) (*((u4 *) ra) & 0x0000ffff);
-
- /* patch the class' vftbl pointer */
-
- *((ptrint *) (pv + offset)) = (ptrint) c->vftbl;
-
- /* if we show disassembly, we have to skip the nop */
+ PATCH_BACK_ORIGINAL_MCODE;
- if (opt_showdisassemble)
- ra = ra + 4;
-
- /* get the offset from machine instruction */
-
- offset = (s2) (*((u4 *) (ra + 4)) & 0x0000ffff);
-
- /* patch new function address */
-
- *((ptrint *) (pv + offset)) = (ptrint) BUILTIN_newarray;
-
- /* synchronize instruction cache */
-
- asm_sync_instruction_cache();
+ /* patch super class' vftbl */
- PATCHER_MARK_PATCHED_MONITOREXIT;
+ *((ptrint *) datap) = (ptrint) c->vftbl;
return true;
}
-/* patcher_builtin_multianewarray **********************************************
+/* patcher_resolve_classref_to_flags *******************************************
- Machine code:
+ CHECKCAST/INSTANCEOF:
<patched call position>
- 221f0002 lda a0,2(zero)
- a63bff80 ldq a1,-128(pv)
- 47de0412 mov sp,a2
- a77bff78 ldq pv,-136(pv)
- 6b5b4000 jsr (pv)
*******************************************************************************/
-bool patcher_builtin_multianewarray(u1 *sp)
+bool patcher_resolve_classref_to_flags(patchref_t *pr)
{
- u1 *ra;
- java_objectheader *o;
- u4 mcode;
constant_classref *cr;
- u1 *pv;
+ u1 *datap;
classinfo *c;
- s2 offset;
/* get stuff from the stack */
- ra = (u1 *) *((ptrint *) (sp + 4 * 8));
- o = (java_objectheader *) *((ptrint *) (sp + 3 * 8));
- mcode = *((u4 *) (sp + 2 * 8));
- cr = (constant_classref *) *((ptrint *) (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 */
+ /* get the fieldinfo */
- ra = ra - 1 * 4;
- *((ptrint *) (sp + 4 * 8)) = (ptrint) ra;
+ if (!(c = resolve_classref_eager(cr)))
+ return false;
- PATCHER_MONITORENTER;
+ PATCH_BACK_ORIGINAL_MCODE;
- /* get the classinfo */
+ /* patch class flags */
- if (!(c = helper_resolve_classinfo(cr))) {
- PATCHER_MONITOREXIT;
+ *((s4 *) datap) = (s4) c->flags;
- return false;
- }
+ return true;
+}
- /* patch back original code */
- *((u4 *) ra) = mcode;
+/* patcher_resolve_native_function *********************************************
- /* if we show disassembly, we have to skip the nop */
+ XXX
- if (opt_showdisassemble)
- ra = ra + 4;
+*******************************************************************************/
- /* get the offset from machine instruction */
+#if !defined(WITH_STATIC_CLASSPATH)
+bool patcher_resolve_native_function(patchref_t *pr)
+{
+ methodinfo *m;
+ u1 *datap;
+ functionptr f;
+
+ /* get stuff from the stack */
- offset = (s2) (*((u4 *) (ra + 4)) & 0x0000ffff);
+ m = (methodinfo *) pr->ref;
+ datap = (u1 *) pr->datap;
- /* patch the class' vftbl pointer */
+ /* resolve native function */
- *((ptrint *) (pv + offset)) = (ptrint) c->vftbl;
+ if (!(f = native_resolve_function(m)))
+ return false;
- /* synchronize instruction cache */
+ PATCH_BACK_ORIGINAL_MCODE;
- asm_sync_instruction_cache();
+ /* patch native function pointer */
- PATCHER_MARK_PATCHED_MONITOREXIT;
+ *((ptrint *) datap) = (ptrint) f;
return true;
}
+#endif /* !defined(WITH_STATIC_CLASSPATH) */
-/* patcher_builtin_arraycheckcast **********************************************
+/* patcher_get_putstatic *******************************************************
Machine code:
<patched call position>
- a63bfe60 ldq a1,-416(pv)
- a77bfe58 ldq pv,-424(pv)
- 6b5b4000 jsr (pv)
+ a73bff98 ldq t11,-104(pv)
+ a2590000 ldl a2,0(t11)
*******************************************************************************/
-bool patcher_builtin_arraycheckcast(u1 *sp)
+bool patcher_get_putstatic(patchref_t *pr)
{
- u1 *ra;
- java_objectheader *o;
- u4 mcode;
- constant_classref *cr;
- u1 *pv;
- classinfo *c;
- s2 offset;
+ unresolved_field *uf;
+ u1 *datap;
+ fieldinfo *fi;
/* get stuff from the stack */
- ra = (u1 *) *((ptrint *) (sp + 4 * 8));
- o = (java_objectheader *) *((ptrint *) (sp + 3 * 8));
- mcode = *((u4 *) (sp + 2 * 8));
- cr = (constant_classref *) *((ptrint *) (sp + 1 * 8));
- pv = (u1 *) *((ptrint *) (sp + 0 * 8));
-
- /* calculate and set the new return address */
-
- ra = ra - 1 * 4;
- *((ptrint *) (sp + 4 * 8)) = (ptrint) ra;
-
- PATCHER_MONITORENTER;
-
- /* get the classinfo */
+ uf = (unresolved_field *) pr->ref;
+ datap = (u1 *) pr->datap;
- if (!(c = helper_resolve_classinfo(cr))) {
- PATCHER_MONITOREXIT;
+ /* get the fieldinfo */
+ if (!(fi = resolve_field_eager(uf)))
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;
-
- /* get the offset from machine instruction */
-
- offset = (s2) (*((u4 *) ra) & 0x0000ffff);
-
- /* patch the class' vftbl pointer */
-
- *((ptrint *) (pv + offset)) = (ptrint) c->vftbl;
- /* get the offset from machine instruction */
-
- offset = (s2) (*((u4 *) (ra + 4)) & 0x0000ffff);
-
- /* patch new function address */
+ /* check if the field's class is initialized */
- *((ptrint *) (pv + offset)) = (ptrint) BUILTIN_arraycheckcast;
+ if (!(fi->class->state & CLASS_INITIALIZED))
+ if (!initialize_class(fi->class))
+ return false;
- /* synchronize instruction cache */
+ PATCH_BACK_ORIGINAL_MCODE;
- asm_sync_instruction_cache();
+ /* patch the field value's address */
- PATCHER_MARK_PATCHED_MONITOREXIT;
+ *((intptr_t *) datap) = (intptr_t) fi->value;
return true;
}
-/* patcher_builtin_arrayinstanceof *********************************************
+/* patcher_get_putfield ********************************************************
Machine code:
- a63bfeb0 ldq a1,-336(pv)
<patched call position>
- a77bfea8 ldq pv,-344(pv)
- 6b5b4000 jsr (pv)
+ a2af0020 ldl a5,32(s6)
*******************************************************************************/
-bool patcher_builtin_arrayinstanceof(u1 *sp)
+bool patcher_get_putfield(patchref_t *pr)
{
- u1 *ra;
- java_objectheader *o;
- u4 mcode;
- constant_classref *cr;
- u1 *pv;
- classinfo *c;
- s4 offset;
+ u1 *ra;
+ unresolved_field *uf;
+ fieldinfo *fi;
- /* get stuff from the stack */
-
- ra = (u1 *) *((ptrint *) (sp + 4 * 8));
- o = (java_objectheader *) *((ptrint *) (sp + 3 * 8));
- mcode = *((u4 *) (sp + 2 * 8));
- cr = (constant_classref *) *((ptrint *) (sp + 1 * 8));
- pv = (u1 *) *((ptrint *) (sp + 0 * 8));
-
- /* calculate and set the new return address */
-
- ra = ra - 2 * 4;
- *((ptrint *) (sp + 4 * 8)) = (ptrint) ra;
-
- PATCHER_MONITORENTER;
-
- /* get the classinfo */
+ ra = (u1 *) pr->mpc;
+ uf = (unresolved_field *) pr->ref;
- if (!(c = helper_resolve_classinfo(cr))) {
- PATCHER_MONITOREXIT;
+ /* get the fieldinfo */
+ if (!(fi = resolve_field_eager(uf)))
return false;
- }
-
- /* patch back original code */
-
- *((u4 *) (ra + 4)) = mcode;
-
- /* get the offset from machine instruction */
-
- offset = (s2) (*((u4 *) ra) & 0x0000ffff);
- /* patch the class' vftbl pointer */
-
- *((ptrint *) (pv + offset)) = (ptrint) c->vftbl;
+ PATCH_BACK_ORIGINAL_MCODE;
/* if we show disassembly, we have to skip the nop */
- if (opt_showdisassemble)
+ if (opt_shownops)
ra = ra + 4;
- /* get the offset from machine instruction */
+ /* patch the field's offset into the instruction */
- offset = (s2) (*((u4 *) (ra + 4)) & 0x0000ffff);
-
- /* patch new function address */
-
- *((ptrint *) (pv + offset)) = (ptrint) BUILTIN_arrayinstanceof;
-
- /* synchronize instruction cache */
-
- asm_sync_instruction_cache();
+ *((u4 *) ra) |= (s2) (fi->offset & 0x0000ffff);
- PATCHER_MARK_PATCHED_MONITOREXIT;
+ md_icacheflush(NULL, 0);
return true;
}
******************************************************************************/
-bool patcher_invokestatic_special(u1 *sp)
+bool patcher_invokestatic_special(patchref_t *pr)
{
- u1 *ra;
- java_objectheader *o;
- u4 mcode;
unresolved_method *um;
- u1 *pv;
+ u1 *datap;
methodinfo *m;
- s4 offset;
/* get stuff from the stack */
- ra = (u1 *) *((ptrint *) (sp + 4 * 8));
- o = (java_objectheader *) *((ptrint *) (sp + 3 * 8));
- mcode = *((u4 *) (sp + 2 * 8));
- um = (unresolved_method *) *((ptrint *) (sp + 1 * 8));
- pv = (u1 *) *((ptrint *) (sp + 0 * 8));
-
- /* calculate and set the new return address */
-
- ra = ra - 1 * 4;
- *((ptrint *) (sp + 4 * 8)) = (ptrint) ra;
-
- PATCHER_MONITORENTER;
+ um = (unresolved_method *) pr->ref;
+ datap = (u1 *) pr->datap;
/* get the fieldinfo */
- if (!(m = helper_resolve_methodinfo(um))) {
- PATCHER_MONITOREXIT;
-
+ if (!(m = resolve_method_eager(um)))
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;
-
- /* get the offset from machine instruction */
-
- offset = (s2) (*((u4 *) ra) & 0x0000ffff);
+ PATCH_BACK_ORIGINAL_MCODE;
/* patch stubroutine */
- *((ptrint *) (pv + offset)) = (ptrint) m->stubroutine;
-
- /* synchronize instruction cache */
-
- asm_sync_instruction_cache();
-
- PATCHER_MARK_PATCHED_MONITOREXIT;
+ *((ptrint *) datap) = (ptrint) m->stubroutine;
return true;
}
*******************************************************************************/
-bool patcher_invokevirtual(u1 *sp)
+bool patcher_invokevirtual(patchref_t *pr)
{
u1 *ra;
- java_objectheader *o;
- u4 mcode;
unresolved_method *um;
methodinfo *m;
/* get stuff from the stack */
- ra = (u1 *) *((ptrint *) (sp + 4 * 8));
- o = (java_objectheader *) *((ptrint *) (sp + 3 * 8));
- mcode = *((u4 *) (sp + 2 * 8));
- um = (unresolved_method *) *((ptrint *) (sp + 1 * 8));
-
- /* calculate and set the new return address */
-
- ra = ra - 1 * 4;
- *((ptrint *) (sp + 4 * 8)) = (ptrint) ra;
-
- PATCHER_MONITORENTER;
+ ra = (u1 *) pr->mpc;
+ um = (unresolved_method *) pr->ref;
/* get the fieldinfo */
- if (!(m = helper_resolve_methodinfo(um))) {
- PATCHER_MONITOREXIT;
-
+ 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 */
-
- asm_sync_instruction_cache();
-
- PATCHER_MARK_PATCHED_MONITOREXIT;
+ md_icacheflush(NULL, 0);
return true;
}
*******************************************************************************/
-bool patcher_invokeinterface(u1 *sp)
+bool patcher_invokeinterface(patchref_t *pr)
{
u1 *ra;
- java_objectheader *o;
- u4 mcode;
unresolved_method *um;
methodinfo *m;
/* get stuff from the stack */
- ra = (u1 *) *((ptrint *) (sp + 4 * 8));
- o = (java_objectheader *) *((ptrint *) (sp + 3 * 8));
- mcode = *((u4 *) (sp + 2 * 8));
- um = (unresolved_method *) *((ptrint *) (sp + 1 * 8));
-
- /* calculate and set the new return address */
-
- ra = ra - 1 * 4;
- *((ptrint *) (sp + 4 * 8)) = (ptrint) ra;
-
- PATCHER_MONITORENTER;
+ ra = (u1 *) pr->mpc;
+ um = (unresolved_method *) pr->ref;
/* get the fieldinfo */
- if (!(m = helper_resolve_methodinfo(um))) {
- PATCHER_MONITOREXIT;
-
+ 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 */
-
- asm_sync_instruction_cache();
-
- PATCHER_MARK_PATCHED_MONITOREXIT;
+ md_icacheflush(NULL, 0);
return true;
}
-/* patcher_checkcast_instanceof_flags ******************************************
+/* patcher_checkcast_interface *************************************************
Machine code:
<patched call position>
+ 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_flags(u1 *sp)
+bool patcher_checkcast_interface(patchref_t *pr)
{
u1 *ra;
- java_objectheader *o;
- u4 mcode;
constant_classref *cr;
- u1 *pv;
classinfo *c;
- s2 offset;
/* get stuff from the stack */
- ra = (u1 *) *((ptrint *) (sp + 4 * 8));
- o = (java_objectheader *) *((ptrint *) (sp + 3 * 8));
- mcode = *((u4 *) (sp + 2 * 8));
- cr = (constant_classref *) *((ptrint *) (sp + 1 * 8));
- pv = (u1 *) *((ptrint *) (sp + 0 * 8));
-
- /* calculate and set the new return address */
-
- ra = ra - 1 * 4;
- *((ptrint *) (sp + 4 * 8)) = (ptrint) ra;
-
- PATCHER_MONITORENTER;
+ ra = (u1 *) pr->mpc;
+ cr = (constant_classref *) pr->ref;
/* get the fieldinfo */
- if (!(c = helper_resolve_classinfo(cr))) {
- PATCHER_MONITOREXIT;
-
+ 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;
- /* get the offset from machine instruction */
-
- offset = (s2) (*((u4 *) ra) & 0x0000ffff);
-
- /* patch class flags */
-
- *((s4 *) (pv + offset)) = (s4) c->flags;
+ /* patch super class index */
- /* synchronize instruction cache */
+ *((s4 *) (ra + 2 * 4)) |= (s4) (-(c->index) & 0x0000ffff);
- asm_sync_instruction_cache();
+ *((s4 *) (ra + 5 * 4)) |= (s4) ((OFFSET(vftbl_t, interfacetable[0]) -
+ c->index * sizeof(methodptr*)) & 0x0000ffff);
- PATCHER_MARK_PATCHED_MONITOREXIT;
+ md_icacheflush(NULL, 0);
return true;
}
-/* patcher_checkcast_instanceof_interface **************************************
+/* patcher_instanceof_interface ************************************************
Machine code:
*******************************************************************************/
-bool patcher_checkcast_instanceof_interface(u1 *sp)
+bool patcher_instanceof_interface(patchref_t *pr)
{
u1 *ra;
- java_objectheader *o;
- u4 mcode;
constant_classref *cr;
classinfo *c;
/* get stuff from the stack */
- ra = (u1 *) *((ptrint *) (sp + 4 * 8));
- o = (java_objectheader *) *((ptrint *) (sp + 3 * 8));
- mcode = *((u4 *) (sp + 2 * 8));
- cr = (constant_classref *) *((ptrint *) (sp + 1 * 8));
-
- /* calculate and set the new return address */
-
- ra = ra - 1 * 4;
- *((ptrint *) (sp + 4 * 8)) = (ptrint) ra;
-
- PATCHER_MONITORENTER;
+ ra = (u1 *) pr->mpc;
+ cr = (constant_classref *) pr->ref;
/* get the fieldinfo */
- if (!(c = helper_resolve_classinfo(cr))) {
- PATCHER_MONITOREXIT;
-
+ 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 + 4 * 4)) |= (s4) ((OFFSET(vftbl_t, interfacetable[0]) -
c->index * sizeof(methodptr*)) & 0x0000ffff);
- /* synchronize instruction cache */
-
- asm_sync_instruction_cache();
-
- PATCHER_MARK_PATCHED_MONITOREXIT;
-
- return true;
-}
-
-
-/* patcher_checkcast_instanceof_class ******************************************
-
- Machine code:
-
- <patched call position>
- a7940000 ldq at,0(a4)
- a7bbff28 ldq gp,-216(pv)
-
-*******************************************************************************/
-
-bool patcher_checkcast_instanceof_class(u1 *sp)
-{
- u1 *ra;
- java_objectheader *o;
- u4 mcode;
- constant_classref *cr;
- u1 *pv;
- classinfo *c;
- s2 offset;
-
- /* get stuff from the stack */
-
- ra = (u1 *) *((ptrint *) (sp + 4 * 8));
- o = (java_objectheader *) *((ptrint *) (sp + 3 * 8));
- mcode = *((u4 *) (sp + 2 * 8));
- cr = (constant_classref *) *((ptrint *) (sp + 1 * 8));
- pv = (u1 *) *((ptrint *) (sp + 0 * 8));
-
- /* calculate and set the new return address */
-
- ra = ra - 1 * 4;
- *((ptrint *) (sp + 4 * 8)) = (ptrint) ra;
-
- PATCHER_MONITORENTER;
-
- /* get the fieldinfo */
-
- if (!(c = helper_resolve_classinfo(cr))) {
- PATCHER_MONITOREXIT;
-
- 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;
-
- /* get the offset from machine instruction */
-
- offset = (s2) (*((u4 *) (ra + 4)) & 0x0000ffff);
-
- /* patch super class' vftbl */
-
- *((ptrint *) (pv + offset)) = (ptrint) c->vftbl;
-
- /* synchronize instruction cache */
-
- asm_sync_instruction_cache();
-
- PATCHER_MARK_PATCHED_MONITOREXIT;
-
- return true;
-}
-
-
-/* patcher_clinit **************************************************************
-
- XXX
-
-*******************************************************************************/
-
-bool patcher_clinit(u1 *sp)
-{
- u1 *ra;
- java_objectheader *o;
- u4 mcode;
- classinfo *c;
-
- /* get stuff from the stack */
-
- ra = (u1 *) *((ptrint *) (sp + 4 * 8));
- o = (java_objectheader *) *((ptrint *) (sp + 3 * 8));
- mcode = *((u4 *) (sp + 2 * 8));
- c = (classinfo *) *((ptrint *) (sp + 1 * 8));
-
- /* calculate and set the new return address */
-
- ra = ra - 1 * 4;
- *((ptrint *) (sp + 4 * 8)) = (ptrint) ra;
-
- PATCHER_MONITORENTER;
-
- /* check if the class is initialized */
-
- if (!c->initialized) {
- if (!initialize_class(c)) {
- PATCHER_MONITOREXIT;
-
- return false;
- }
- }
-
- /* patch back original code */
-
- *((u4 *) ra) = mcode;
-
- /* synchronize instruction cache */
-
- asm_sync_instruction_cache();
-
- PATCHER_MARK_PATCHED_MONITOREXIT;
-
- return true;
-}
-
-
-/* patcher_resolve_native ******************************************************
-
- XXX
-
-*******************************************************************************/
-
-#if !defined(ENABLE_STATICVM)
-bool patcher_resolve_native(u1 *sp)
-{
- u1 *ra;
- java_objectheader *o;
- u4 mcode;
- methodinfo *m;
- u1 *pv;
- functionptr f;
- s2 offset;
-
- /* get stuff from the stack */
-
- ra = (u1 *) *((ptrint *) (sp + 4 * 8));
- o = (java_objectheader *) *((ptrint *) (sp + 3 * 8));
- mcode = *((u4 *) (sp + 2 * 8));
- m = (methodinfo *) *((ptrint *) (sp + 1 * 8));
- pv = (u1 *) *((ptrint *) (sp + 0 * 8));
-
- /* calculate and set the new return address */
-
- ra = ra - 1 * 4;
- *((ptrint *) (sp + 4 * 8)) = (ptrint) ra;
-
- PATCHER_MONITORENTER;
-
- /* resolve native function */
-
- if (!(f = native_resolve_function(m))) {
- PATCHER_MONITOREXIT;
-
- 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;
-
- /* get the offset from machine instruction */
-
- offset = (s2) (*((u4 *) ra) & 0x0000ffff);
-
- /* patch native function pointer */
-
- *((ptrint *) (pv + offset)) = (ptrint) f;
-
- /* synchronize instruction cache */
-
- asm_sync_instruction_cache();
-
- PATCHER_MARK_PATCHED_MONITOREXIT;
+ md_icacheflush(NULL, 0);
return true;
}
-#endif /* !defined(ENABLE_STATICVM) */
/*
projects / cacao.git / blobdiff