/* src/vm/jit/mips/patcher.c - MIPS 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, 2008
+ CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO
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 2708 2005-06-15 13:44:10Z twisti $
+#include "config.h"
-*/
+#include <assert.h>
+#include <stdint.h>
+#include "vm/types.h"
-#include "config.h"
-#include "vm/jit/mips/types.h"
+#include "vm/jit/mips/codegen.h"
+#include "vm/jit/mips/md.h"
#include "mm/memory.h"
+
#include "native/native.h"
+
#include "vm/builtin.h"
+#include "vm/class.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/helper.h"
-#include "vm/jit/patcher.h"
+#include "vm/jit/patcher-common.h"
+
+
+#define PATCH_BACK_ORIGINAL_MCODE \
+ *((u4 *) pr->mpc) = (u4) pr->mcode; \
+ md_icacheflush((u1 *) pr->mpc, PATCHER_CALL_SIZE);
+
+
+/* patcher_patch_code **********************************************************
+
+ Just patches back the original machine code.
+
+*******************************************************************************/
+
+void patcher_patch_code(patchref_t *pr)
+{
+ PATCH_BACK_ORIGINAL_MCODE;
+}
/* patcher_get_putstatic *******************************************************
*******************************************************************************/
-bool patcher_get_putstatic(u1 *sp)
+bool patcher_get_putstatic(patchref_t *pr)
{
- u1 *ra;
- java_objectheader *o;
- u8 mcode;
- unresolved_field *uf;
- u1 *pv;
- fieldinfo *fi;
- s2 offset;
+ unresolved_field *uf;
+ u1 *datap;
+ fieldinfo *fi;
/* get stuff from the stack */
- ra = (u1 *) *((ptrint *) (sp + 3 * 8));
- o = (java_objectheader *) *((ptrint *) (sp + 2 * 8));
- mcode = *((u8 *) (sp + 1 * 8));
- uf = (unresolved_field *) *((ptrint *) (sp + 0 * 8));
- pv = (u1 *) *((ptrint *) (sp - 2 * 8));
-
- /* calculate and set the new return address */
-
- ra = ra - 2 * 4;
- *((ptrint *) (sp + 3 * 8)) = (ptrint) ra;
-
- PATCHER_MONITORENTER;
+ uf = (unresolved_field *) pr->ref;
+ datap = (u1 *) pr->datap;
/* get the fieldinfo */
- if (!(fi = helper_resolve_fieldinfo(uf))) {
- PATCHER_MONITOREXIT;
-
+ if (!(fi = resolve_field_eager(uf)))
return false;
- }
/* check if the field's class is initialized */
- if (!fi->class->initialized)
- if (!initialize_class(fi->class))
+ if (!(fi->clazz->state & CLASS_INITIALIZED))
+ if (!initialize_class(fi->clazz))
return false;
- /* patch back original code */
-
- *((u4 *) (ra + 0 * 4)) = mcode;
- *((u4 *) (ra + 1 * 4)) = mcode >> 32;
-
- /* if we show disassembly, we have to skip the nop's */
-
- if (showdisassemble)
- ra = ra + 2 * 4;
-
- /* get the offset from machine instruction */
-
- offset = (s2) (*((u4 *) ra) & 0x0000ffff);
+ PATCH_BACK_ORIGINAL_MCODE;
/* patch the field value's address */
- *((ptrint *) (pv + offset)) = (ptrint) &(fi->value);
+ *((intptr_t *) datap) = (intptr_t) fi->value;
- /* synchronize instruction cache */
-
- docacheflush(ra, 2 * 4);
+ /* synchronize data cache */
- PATCHER_MARK_PATCHED_MONITOREXIT;
+ md_dcacheflush(datap, SIZEOF_VOID_P);
return true;
}
*******************************************************************************/
-bool patcher_get_putfield(u1 *sp)
+bool patcher_get_putfield(patchref_t *pr)
{
- u1 *ra;
- java_objectheader *o;
- u8 mcode;
- unresolved_field *uf;
- fieldinfo *fi;
+ u1 *ra;
+ unresolved_field *uf;
+ fieldinfo *fi;
- ra = (u1 *) *((ptrint *) (sp + 3 * 8));
- o = (java_objectheader *) *((ptrint *) (sp + 2 * 8));
- mcode = *((u8 *) (sp + 1 * 8));
- uf = (unresolved_field *) *((ptrint *) (sp + 0 * 8));
-
- /* calculate and set the new return address */
-
- ra = ra - 2 * 4;
- *((ptrint *) (sp + 3 * 8)) = (ptrint) ra;
+ /* get stuff from the stack */
- PATCHER_MONITORENTER;
+ ra = (u1 *) pr->mpc;
+ uf = (unresolved_field *) pr->ref;
/* get the fieldinfo */
- if (!(fi = helper_resolve_fieldinfo(uf))) {
- PATCHER_MONITOREXIT;
-
+ if (!(fi = resolve_field_eager(uf)))
return false;
- }
-
- /* patch back original code */
- *((u4 *) (ra + 0 * 4)) = mcode;
- *((u4 *) (ra + 1 * 4)) = mcode >> 32;
+ PATCH_BACK_ORIGINAL_MCODE;
/* if we show disassembly, we have to skip the nop's */
- if (showdisassemble)
- ra = ra + 2 * 4;
-
- /* patch the field's offset */
-
- *((u4 *) ra) |= (s2) (fi->offset & 0x0000ffff);
+ if (opt_shownops)
+ ra = ra + PATCHER_CALL_SIZE;
+
+#if SIZEOF_VOID_P == 4
+ 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 + 1 * 4)) |= (s2) ((fi->offset + 4) & 0x0000ffff);
+# else
+ /* ATTENTION: order of these instructions depend on M_LLD_INTERN */
+ *((u4 *) (ra + 0 * 4)) |= (s2) ((fi->offset + 4) & 0x0000ffff);
+ *((u4 *) (ra + 1 * 4)) |= (s2) ((fi->offset + 0) & 0x0000ffff);
+# endif
+ }
+ else
+#endif
+ *((u4 *) (ra + 0 * 4)) |= (s2) (fi->offset & 0x0000ffff);
/* synchronize instruction cache */
- docacheflush(ra, 2 * 4);
-
- PATCHER_MARK_PATCHED_MONITOREXIT;
+ md_icacheflush(ra, 2 * 4);
return true;
}
-/* patcher_builtin_new *********************************************************
+/* patcher_resolve_classref_to_classinfo ***************************************
- Machine code:
+ ACONST:
- dfc4ff98 ld a0,-104(s8)
<patched call postition>
- dfd9ff90 ld t9,-112(s8)
- 0320f809 jalr t9
- 00000000 nop
-
-*******************************************************************************/
-
-bool patcher_builtin_new(u1 *sp)
-{
- u1 *ra;
- java_objectheader *o;
- u8 mcode;
- constant_classref *cr;
- u1 *pv;
- classinfo *c;
- s2 offset;
-
- /* get stuff from the stack */
-
- ra = (u1 *) *((ptrint *) (sp + 3 * 8));
- o = (java_objectheader *) *((ptrint *) (sp + 2 * 8));
- mcode = *((u8 *) (sp + 1 * 8));
- cr = (constant_classref *) *((ptrint *) (sp + 0 * 8));
- pv = (u1 *) *((ptrint *) (sp - 2 * 8));
-
- /* calculate and set the new return address */
-
- ra = ra - (4 + 2 * 4);
- *((ptrint *) (sp + 3 * 8)) = (ptrint) ra;
-
- PATCHER_MONITORENTER;
-
- /* get the classinfo */
-
- if (!(c = helper_resolve_classinfo(cr))) {
- PATCHER_MONITOREXIT;
-
- return false;
- }
-
- /* patch back original code */
-
- *((u4 *) (ra + 1 * 4)) = mcode;
- *((u4 *) (ra + 2 * 4)) = mcode >> 32;
-
- /* get the offset from machine instruction */
-
- offset = (s2) (*((u4 *) ra) & 0x0000ffff);
-
- /* patch the classinfo pointer */
-
- *((ptrint *) (pv + offset)) = (ptrint) c;
-
- /* if we show disassembly, we have to skip the nop's */
-
- if (showdisassemble)
- ra = ra + 2 * 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 */
-
- docacheflush(ra + 4, 2 * 4);
-
- PATCHER_MARK_PATCHED_MONITOREXIT;
-
- return true;
-}
-
-
-/* patcher_builtin_newarray ****************************************************
+ dfc4ff98 ld a0,-104(s8)
- Machine code:
+ MULTIANEWARRAY:
- dfc5ffa0 ld a1,-96(s8)
<patched call position>
- dfd9ff98 ld t9,-104(s8)
+ dfc5ff90 ld a1,-112(s8)
+ 03a03025 move a2,sp
+ dfd9ff88 ld t9,-120(s8)
0320f809 jalr t9
00000000 nop
-*******************************************************************************/
-
-bool patcher_builtin_newarray(u1 *sp)
-{
- u1 *ra;
- java_objectheader *o;
- u8 mcode;
- constant_classref *cr;
- u1 *pv;
- classinfo *c;
- s2 offset;
-
- /* get stuff from the stack */
-
- ra = (u1 *) *((ptrint *) (sp + 3 * 8));
- o = (java_objectheader *) *((ptrint *) (sp + 2 * 8));
- mcode = *((u8 *) (sp + 1 * 8));
- cr = (constant_classref *) *((ptrint *) (sp + 0 * 8));
- pv = (u1 *) *((ptrint *) (sp - 2 * 8));
-
- /* calculate and set the new return address */
-
- ra = ra - (4 + 2 * 4);
- *((ptrint *) (sp + 3 * 8)) = (ptrint) ra;
-
- PATCHER_MONITORENTER;
-
- /* get the classinfo */
-
- if (!(c = helper_resolve_classinfo(cr))) {
- PATCHER_MONITOREXIT;
-
- return false;
- }
-
- /* patch back original code */
-
- *((u4 *) (ra + 1 * 4)) = mcode;
- *((u4 *) (ra + 2 * 4)) = mcode >> 32;
-
- /* 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 */
-
- if (showdisassemble)
- ra = ra + 2 * 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 */
-
- docacheflush(ra + 4, 2 * 4);
-
- PATCHER_MARK_PATCHED_MONITOREXIT;
-
- return true;
-}
-
-
-/* patcher_builtin_multianewarray **********************************************
-
- Machine code:
+ ARRAYCHECKCAST:
<patched call position>
- 24040002 addiu a0,zero,2
- dfc5ff90 ld a1,-112(s8)
- 03a03025 move a2,sp
- dfd9ff88 ld t9,-120(s8)
+ dfc5ffc0 ld a1,-64(s8)
+ dfd9ffb8 ld t9,-72(s8)
0320f809 jalr t9
00000000 nop
*******************************************************************************/
-bool patcher_builtin_multianewarray(u1 *sp)
+bool patcher_resolve_classref_to_classinfo(patchref_t *pr)
{
- u1 *ra;
- java_objectheader *o;
- u8 mcode;
constant_classref *cr;
- u1 *pv;
+ u1 *datap;
classinfo *c;
- s2 offset;
/* get stuff from the stack */
- ra = (u1 *) *((ptrint *) (sp + 3 * 8));
- o = (java_objectheader *) *((ptrint *) (sp + 2 * 8));
- mcode = *((u8 *) (sp + 1 * 8));
- cr = (constant_classref *) *((ptrint *) (sp + 0 * 8));
- pv = (u1 *) *((ptrint *) (sp - 2 * 8));
-
- /* calculate and set the new return address */
-
- ra = ra - 2 * 4;
- *((ptrint *) (sp + 3 * 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 + 0 * 4)) = mcode;
- *((u4 *) (ra + 1 * 4)) = mcode >> 32;
-
- /* if we show disassembly, we have to skip the nop's */
-
- if (showdisassemble)
- ra = ra + 2 * 4;
-
- /* get the offset from machine instruction */
- offset = (s2) (*((u4 *) (ra + 4)) & 0x0000ffff);
+ PATCH_BACK_ORIGINAL_MCODE;
- /* patch the class' vftbl pointer */
-
- *((ptrint *) (pv + offset)) = (ptrint) c->vftbl;
+ /* patch the classinfo pointer */
- /* synchronize instruction cache */
+ *((intptr_t *) datap) = (intptr_t) c;
- docacheflush(ra, 2 * 4);
+ /* synchronize data cache */
- PATCHER_MARK_PATCHED_MONITOREXIT;
+ md_dcacheflush(datap, SIZEOF_VOID_P);
return true;
}
-/* patcher_builtin_arraycheckcast **********************************************
+/* patcher_resolve_classref_to_vftbl *******************************************
- Machine code:
+ CHECKCAST (class):
+ INSTANCEOF (class):
- dfc5ffc0 ld a1,-64(s8)
<patched call position>
- dfd9ffb8 ld t9,-72(s8)
- 0320f809 jalr t9
- 00000000 nop
+ dd030000 ld v1,0(a4)
+ dfd9ff18 ld t9,-232(s8)
*******************************************************************************/
-bool patcher_builtin_arraycheckcast(u1 *sp)
+bool patcher_resolve_classref_to_vftbl(patchref_t *pr)
{
- u1 *ra;
- java_objectheader *o;
- u8 mcode;
constant_classref *cr;
- u1 *pv;
+ u1 *datap;
classinfo *c;
- s2 offset;
/* get stuff from the stack */
- ra = (u1 *) *((ptrint *) (sp + 3 * 8));
- o = (java_objectheader *) *((ptrint *) (sp + 2 * 8));
- mcode = *((u8 *) (sp + 1 * 8));
- cr = (constant_classref *) *((ptrint *) (sp + 0 * 8));
- pv = (u1 *) *((ptrint *) (sp - 2 * 8));
+ cr = (constant_classref *) pr->ref;
+ datap = (u1 *) pr->datap;
- /* calculate and set the new return address */
-
- ra = ra - 3 * 4;
- *((ptrint *) (sp + 3 * 8)) = (ptrint) ra;
-
- 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 + 1 * 4)) = mcode;
- *((u4 *) (ra + 2 * 4)) = mcode >> 32;
-
- /* 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 (showdisassemble)
- ra = ra + 2 * 4;
-
- /* get the offset from machine instruction */
-
- offset = (s2) (*((u4 *) (ra + 1 * 4)) & 0x0000ffff);
-
- /* patch new function address */
+ /* patch super class' vftbl */
- *((ptrint *) (pv + offset)) = (ptrint) BUILTIN_arraycheckcast;
+ *((intptr_t *) datap) = (intptr_t) c->vftbl;
- /* synchronize instruction cache */
+ /* synchronize data cache */
- docacheflush(ra + 4, 2 * 4);
-
- PATCHER_MARK_PATCHED_MONITOREXIT;
+ md_dcacheflush(datap, SIZEOF_VOID_P);
return true;
}
-/* patcher_builtin_arrayinstanceof *********************************************
+/* patcher_resolve_classref_to_flags *******************************************
- Machine code:
+ CHECKCAST/INSTANCEOF:
- dfc5fe98 ld a1,-360(s8)
<patched call position>
- dfd9fe90 ld t9,-368(s8)
- 0320f809 jalr t9
+ 8fc3ff24 lw v1,-220(s8)
+ 30630200 andi v1,v1,512
+ 1060000d beq v1,zero,0x000000001051824c
00000000 nop
*******************************************************************************/
-bool patcher_builtin_arrayinstanceof(u1 *sp)
+bool patcher_resolve_classref_to_flags(patchref_t *pr)
{
- u1 *ra;
- java_objectheader *o;
- u8 mcode;
constant_classref *cr;
- u1 *pv;
+ u1 *datap;
classinfo *c;
- s4 offset;
/* get stuff from the stack */
- ra = (u1 *) *((ptrint *) (sp + 3 * 8));
- o = (java_objectheader *) *((ptrint *) (sp + 2 * 8));
- mcode = *((u8 *) (sp + 1 * 8));
- cr = (constant_classref *) *((ptrint *) (sp + 0 * 8));
- pv = (u1 *) *((ptrint *) (sp - 2 * 8));
-
- /* calculate and set the new return address */
-
- ra = ra - 3 * 4;
- *((ptrint *) (sp + 3 * 8)) = (ptrint) ra;
-
- PATCHER_MONITORENTER;
-
- /* get the classinfo */
+ cr = (constant_classref *) pr->ref;
+ datap = (u1 *) pr->datap;
- 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 + 1 * 4)) = mcode;
- *((u4 *) (ra + 2 * 4)) = mcode >> 32;
-
- /* get the offset from machine instruction */
- offset = (s2) (*((u4 *) ra) & 0x0000ffff);
+ PATCH_BACK_ORIGINAL_MCODE;
- /* patch the class' vftbl pointer */
-
- *((ptrint *) (pv + offset)) = (ptrint) c->vftbl;
-
- /* if we show disassembly, we have to skip the nop's */
-
- if (showdisassemble)
- ra = ra + 2 * 4;
-
- /* get the offset from machine instruction */
-
- offset = (s2) (*((u4 *) (ra + 1 * 4)) & 0x0000ffff);
-
- /* patch new function address */
-
- *((ptrint *) (pv + offset)) = (ptrint) BUILTIN_arrayinstanceof;
+ /* patch class flags */
- /* synchronize instruction cache */
+ *((int32_t *) datap) = (int32_t) c->flags;
- docacheflush(ra + 4, 2 * 4);
+ /* synchronize data cache */
- PATCHER_MARK_PATCHED_MONITOREXIT;
+ md_dcacheflush(datap, sizeof(int32_t));
return true;
}
******************************************************************************/
-bool patcher_invokestatic_special(u1 *sp)
+bool patcher_invokestatic_special(patchref_t *pr)
{
- u1 *ra;
- java_objectheader *o;
- u8 mcode;
unresolved_method *um;
- u1 *pv;
+ u1 *datap;
methodinfo *m;
- s4 offset;
/* get stuff from the stack */
- ra = (u1 *) *((ptrint *) (sp + 3 * 8));
- o = (java_objectheader *) *((ptrint *) (sp + 2 * 8));
- mcode = *((u8 *) (sp + 1 * 8));
- um = (unresolved_method *) *((ptrint *) (sp + 0 * 8));
- pv = (u1 *) *((ptrint *) (sp - 2 * 8));
-
- /* calculate and set the new return address */
-
- ra = ra - 2 * 4;
- *((ptrint *) (sp + 3 * 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 + 0 * 4)) = mcode;
- *((u4 *) (ra + 1 * 4)) = mcode >> 32;
-
- /* if we show disassembly, we have to skip the nop's */
-
- if (showdisassemble)
- ra = ra + 2 * 4;
-
- /* get the offset from machine instruction */
- offset = (s2) (*((u4 *) ra) & 0x0000ffff);
+ PATCH_BACK_ORIGINAL_MCODE;
/* patch stubroutine */
- *((ptrint *) (pv + offset)) = (ptrint) m->stubroutine;
+ *((ptrint *) datap) = (ptrint) m->stubroutine;
- /* synchronize instruction cache */
-
- docacheflush(ra, 2 * 4);
+ /* synchronize data cache */
- PATCHER_MARK_PATCHED_MONITOREXIT;
+ md_dcacheflush(datap, SIZEOF_VOID_P);
return true;
}
*******************************************************************************/
-bool patcher_invokevirtual(u1 *sp)
+bool patcher_invokevirtual(patchref_t *pr)
{
u1 *ra;
- java_objectheader *o;
- u8 mcode;
unresolved_method *um;
methodinfo *m;
/* get stuff from the stack */
- ra = (u1 *) *((ptrint *) (sp + 3 * 8));
- o = (java_objectheader *) *((ptrint *) (sp + 2 * 8));
- mcode = *((u8 *) (sp + 1 * 8));
- um = (unresolved_method *) *((ptrint *) (sp + 0 * 8));
-
- /* calculate and set the new return address */
-
- ra = ra - 2 * 4;
- *((ptrint *) (sp + 3 * 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 + 0 * 4)) = mcode;
- *((u4 *) (ra + 1 * 4)) = mcode >> 32;
+ PATCH_BACK_ORIGINAL_MCODE;
/* if we show disassembly, we have to skip the nop's */
- if (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 */
- docacheflush(ra, 2 * 4);
-
- PATCHER_MARK_PATCHED_MONITOREXIT;
+ md_icacheflush(ra + 1 * 4, 1 * 4);
return true;
}
*******************************************************************************/
-bool patcher_invokeinterface(u1 *sp)
+bool patcher_invokeinterface(patchref_t *pr)
{
u1 *ra;
- java_objectheader *o;
- u8 mcode;
unresolved_method *um;
methodinfo *m;
/* get stuff from the stack */
- ra = (u1 *) *((ptrint *) (sp + 3 * 8));
- o = (java_objectheader *) *((ptrint *) (sp + 2 * 8));
- mcode = *((u8 *) (sp + 1 * 8));
- um = (unresolved_method *) *((ptrint *) (sp + 0 * 8));
-
- /* calculate and set the new return address */
-
- ra = ra - 2 * 4;
- *((ptrint *) (sp + 3 * 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 + 0 * 4)) = mcode;
- *((u4 *) (ra + 1 * 4)) = mcode >> 32;
+ PATCH_BACK_ORIGINAL_MCODE;
/* if we show disassembly, we have to skip the nop's */
- if (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->clazz->index) & 0x0000ffff);
/* patch method offset */
*((s4 *) (ra + 2 * 4)) |=
- (s4) ((sizeof(methodptr) * (m - m->class->methods)) & 0x0000ffff);
-
- /* synchronize instruction cache */
-
- docacheflush(ra, 2 * 4);
-
- PATCHER_MARK_PATCHED_MONITOREXIT;
-
- 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;
- java_objectheader *o;
- u8 mcode;
- constant_classref *cr;
- u1 *pv;
- classinfo *c;
- s2 offset;
-
- /* get stuff from the stack */
-
- ra = (u1 *) *((ptrint *) (sp + 3 * 8));
- o = (java_objectheader *) *((ptrint *) (sp + 2 * 8));
- mcode = *((u8 *) (sp + 1 * 8));
- cr = (constant_classref *) *((ptrint *) (sp + 0 * 8));
- pv = (u1 *) *((ptrint *) (sp - 2 * 8));
-
- /* calculate and set the new return address */
-
- ra = ra - 2 * 4;
- *((ptrint *) (sp + 3 * 8)) = (ptrint) ra;
-
- PATCHER_MONITORENTER;
-
- /* get the fieldinfo */
-
- if (!(c = helper_resolve_classinfo(cr))) {
- PATCHER_MONITOREXIT;
-
- return false;
- }
-
- /* patch back original code */
-
- *((u4 *) (ra + 0 * 4)) = mcode;
- *((u4 *) (ra + 1 * 4)) = mcode >> 32;
-
- /* if we show disassembly, we have to skip the nop's */
-
- if (showdisassemble)
- ra = ra + 2 * 4;
-
- /* get the offset from machine instruction */
-
- offset = (s2) (*((u4 *) ra) & 0x0000ffff);
-
- /* patch class flags */
-
- *((s4 *) (pv + offset)) = (s4) c->flags;
+ (s4) ((sizeof(methodptr) * (m - m->clazz->methods)) & 0x0000ffff);
/* synchronize instruction cache */
- docacheflush(ra, 2 * 4);
-
- PATCHER_MARK_PATCHED_MONITOREXIT;
+ 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;
- java_objectheader *o;
- u8 mcode;
constant_classref *cr;
classinfo *c;
/* get stuff from the stack */
- ra = (u1 *) *((ptrint *) (sp + 3 * 8));
- o = (java_objectheader *) *((ptrint *) (sp + 2 * 8));
- mcode = *((u8 *) (sp + 1 * 8));
- cr = (constant_classref *) *((ptrint *) (sp + 0 * 8));
-
- /* calculate and set the new return address */
-
- ra = ra - 2 * 4;
- *((ptrint *) (sp + 3 * 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 + 0 * 4)) = mcode;
- *((u4 *) (ra + 1 * 4)) = mcode >> 32;
+ PATCH_BACK_ORIGINAL_MCODE;
/* if we show disassembly, we have to skip the nop's */
- if (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 */
- docacheflush(ra, 6 * 4);
-
- PATCHER_MARK_PATCHED_MONITOREXIT;
+ 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;
- java_objectheader *o;
- u8 mcode;
constant_classref *cr;
- u1 *pv;
classinfo *c;
- s2 offset;
/* get stuff from the stack */
- ra = (u1 *) *((ptrint *) (sp + 3 * 8));
- o = (java_objectheader *) *((ptrint *) (sp + 2 * 8));
- mcode = *((u8 *) (sp + 1 * 8));
- cr = (constant_classref *) *((ptrint *) (sp + 0 * 8));
- pv = (u1 *) *((ptrint *) (sp - 2 * 8));
-
- /* calculate and set the new return address */
-
- ra = ra - 2 * 4;
- *((ptrint *) (sp + 3 * 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 + 0 * 4)) = mcode;
- *((u4 *) (ra + 1 * 4)) = mcode >> 32;
+ PATCH_BACK_ORIGINAL_MCODE;
/* if we show disassembly, we have to skip the nop's */
- if (showdisassemble)
- ra = ra + 2 * 4;
-
- /* get the offset from machine instruction */
-
- offset = (s2) (*((u4 *) (ra + 1 * 4)) & 0x0000ffff);
-
- /* patch super class' vftbl */
-
- *((ptrint *) (pv + offset)) = (ptrint) c->vftbl;
-
- /* synchronize instruction cache */
-
- docacheflush(ra, 2 * 4);
-
- PATCHER_MARK_PATCHED_MONITOREXIT;
-
- return true;
-}
-
-
-/* patcher_clinit **************************************************************
-
- XXX
-
-*******************************************************************************/
-
-bool patcher_clinit(u1 *sp)
-{
- u1 *ra;
- java_objectheader *o;
- u8 mcode;
- classinfo *c;
-
- /* get stuff from the stack */
-
- ra = (u1 *) *((ptrint *) (sp + 3 * 8));
- o = (java_objectheader *) *((ptrint *) (sp + 2 * 8));
- mcode = *((u8 *) (sp + 1 * 8));
- c = (classinfo *) *((ptrint *) (sp + 0 * 8));
-
- /* calculate and set the new return address */
+ if (opt_shownops)
+ ra = ra + PATCHER_CALL_SIZE;
- ra = ra - 2 * 4;
- *((ptrint *) (sp + 3 * 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 + 0)) = mcode;
- *((u4 *) (ra + 4)) = mcode >> 32;
-
- /* synchronize instruction cache */
-
- docacheflush(ra, 2 * 4);
-
- PATCHER_MARK_PATCHED_MONITOREXIT;
-
- return true;
-}
-
-
-/* patcher_resolve_native ******************************************************
-
- XXX
-
-*******************************************************************************/
-
-bool patcher_resolve_native(u1 *sp)
-{
- u1 *ra;
- java_objectheader *o;
- u8 mcode;
- methodinfo *m;
- u1 *pv;
- functionptr f;
- s2 offset;
-
- /* get stuff from the stack */
-
- ra = (u1 *) *((ptrint *) (sp + 3 * 8));
- o = (java_objectheader *) *((ptrint *) (sp + 2 * 8));
- mcode = *((u8 *) (sp + 1 * 8));
- m = (methodinfo *) *((ptrint *) (sp + 0 * 8));
- pv = (u1 *) *((ptrint *) (sp - 2 * 8));
-
- /* calculate and set the new return address */
-
- ra = ra - 2 * 4;
- *((ptrint *) (sp + 3 * 8)) = (ptrint) ra;
-
- PATCHER_MONITORENTER;
-
- /* resolve native function */
-
- if (!(f = native_resolve_function(m))) {
- PATCHER_MONITOREXIT;
-
- return false;
- }
-
- /* patch back original code */
-
- *((u4 *) (ra + 0 * 4)) = mcode;
- *((u4 *) (ra + 1 * 4)) = mcode >> 32;
-
- /* if we show disassembly, we have to skip the nop's */
-
- if (showdisassemble)
- ra = ra + 2 * 4;
-
- /* get the offset from machine instruction */
-
- offset = (s2) (*((u4 *) ra) & 0x0000ffff);
-
- /* patch native function pointer */
+ /* patch super class index */
- *((ptrint *) (pv + offset)) = (ptrint) f;
+ *((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 */
- docacheflush(ra, 2 * 4);
-
- PATCHER_MARK_PATCHED_MONITOREXIT;
+ md_icacheflush(ra + 2 * 4, 4 * 4);
return true;
}
projects / cacao.git / blobdiff