/* src/vm/jit/powerpc/patcher.c - PowerPC 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
+ Copyright (C) 2008 Theobroma Systems Ltd.
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.
-
- Contact: cacao@complang.tuwien.ac.at
-
- Authors: Christian Thalinger
-
- Changes:
-
- $Id: patcher.c 3353 2005-10-05 13:30:10Z edwin $
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ 02110-1301, USA.
*/
#include "config.h"
+
+#include <assert.h>
+#include <stdint.h>
+
#include "vm/types.h"
+#include "vm/jit/powerpc/md.h"
+
#include "mm/memory.h"
-#include "native/native.h"
-#include "vm/builtin.h"
-#include "vm/field.h"
-#include "vm/initialize.h"
+
+#include "native/native.hpp"
+
+#include "vm/jit/builtin.hpp"
+#include "vm/class.hpp"
+#include "vm/field.hpp"
+#include "vm/initialize.hpp"
#include "vm/options.h"
#include "vm/references.h"
+#include "vm/resolve.hpp"
+
#include "vm/jit/asmpart.h"
-#include "vm/jit/helper.h"
-#include "vm/jit/patcher.h"
+#include "vm/jit/methodheader.h"
+#include "vm/jit/patcher-common.hpp"
-/* patcher_get_putstatic *******************************************************
+/* patcher_patch_code **********************************************************
- Machine code:
-
- <patched call position>
- 816dffc8 lwz r11,-56(r13)
- 80ab0000 lwz r5,0(r11)
+ Just patches back the original machine code.
*******************************************************************************/
-bool patcher_get_putstatic(u1 *sp)
+void patcher_patch_code(patchref_t *pr)
{
- u1 *ra;
- java_objectheader *o;
- u4 mcode;
- unresolved_field *uf;
- s4 disp;
- u1 *pv;
- fieldinfo *fi;
-
- /* get stuff from the stack */
-
- ra = (u1 *) *((ptrint *) (sp + 5 * 4));
- o = (java_objectheader *) *((ptrint *) (sp + 4 * 4));
- mcode = *((u4 *) (sp + 3 * 4));
- uf = (unresolved_field *) *((ptrint *) (sp + 2 * 4));
- disp = *((s4 *) (sp + 1 * 4));
- pv = (u1 *) *((ptrint *) (sp + 0 * 4));
-
- /* calculate and set the new return address */
-
- ra = ra - 4;
- *((ptrint *) (sp + 5 * 4)) = (ptrint) ra;
-
- PATCHER_MONITORENTER;
-
- /* get the fieldinfo */
-
- if (!(fi = helper_resolve_fieldinfo(uf))) {
- PATCHER_MONITOREXIT;
+ // Patch back original code.
+ *((uint32_t*) pr->mpc) = pr->mcode;
- return false;
- }
-
- /* check if the field's class is initialized */
-
- if (!fi->class->initialized) {
- if (!initialize_class(fi->class)) {
- PATCHER_MONITOREXIT;
-
- return false;
- }
- }
-
- /* patch back original code */
-
- *((u4 *) ra) = mcode;
-
- /* synchronize instruction cache */
-
- asm_cacheflush(ra, 4);
-
- /* patch the field value's address */
-
- *((ptrint *) (pv + disp)) = (ptrint) &(fi->value);
-
- PATCHER_MARK_PATCHED_MONITOREXIT;
-
- return true;
+ // Synchronize instruction cache.
+ md_icacheflush((void*) pr->mpc, 1 * 4);
}
-/* patcher_get_putfield ********************************************************
-
- Machine code:
-
- <patched call position>
- 811f0014 lwz r8,20(r31)
-
-*******************************************************************************/
-
-bool patcher_get_putfield(u1 *sp)
+/**
+ * Check if the trap instruction at the given PC is valid.
+ *
+ * @param pc Program counter.
+ *
+ * @return true if valid, false otherwise.
+ */
+bool patcher_is_valid_trap_instruction_at(void* pc)
{
- u1 *ra;
- java_objectheader *o;
- u4 mcode;
- unresolved_field *uf;
- u1 *pv;
- fieldinfo *fi;
-
- ra = (u1 *) *((ptrint *) (sp + 5 * 4));
- o = (java_objectheader *) *((ptrint *) (sp + 4 * 4));
- mcode = *((u4 *) (sp + 3 * 4));
- uf = (unresolved_field *) *((ptrint *) (sp + 2 * 4));
- pv = (u1 *) *((ptrint *) (sp + 1 * 4));
-
- /* calculate and set the new return address */
-
- ra = ra - 4;
- *((ptrint *) (sp + 5 * 4)) = (ptrint) ra;
-
- PATCHER_MONITORENTER;
-
- /* get the fieldinfo */
-
- if (!(fi = helper_resolve_fieldinfo(uf))) {
- 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;
-
- /* patch the field's offset */
-
- if (fi->type == TYPE_LNG) {
- /* if the field has type long, we have to patch two instructions */
-
- *((u4 *) ra) |= (s2) ((fi->offset + 4) & 0x0000ffff);
- *((u4 *) (ra + 4)) |= (s2) (fi->offset & 0x0000ffff);
-
- } else {
- *((u4 *) ra) |= (s2) (fi->offset & 0x0000ffff);
- }
+ uint32_t mcode = *((uint32_t*) pc);
- /* synchronize instruction cache */
-
- asm_cacheflush(ra, 8);
-
- PATCHER_MARK_PATCHED_MONITOREXIT;
-
- return true;
+ // Check for the undefined instruction we use.
+ return (mcode == 0x00000000);
}
-/* patcher_builtin_new *********************************************************
+/* patcher_resolve_classref_to_classinfo ***************************************
- Machine code:
+ ACONST:
- 806dffc4 lwz r3,-60(r13)
<patched call postition>
+ 806dffc4 lwz r3,-60(r13)
81adffc0 lwz r13,-64(r13)
7da903a6 mtctr r13
4e800421 bctrl
- NOTICE: Only the displacement for the function address is passed,
- but the address of the classinfo pointer is one below (above, in
- addresses speaking). This is for sure.
-*******************************************************************************/
+ MULTIANEWARRAY:
-bool patcher_builtin_new(u1 *sp)
-{
- u1 *ra;
- java_objectheader *o;
- u4 mcode;
- constant_classref *cr;
- s4 disp;
- u1 *pv;
- classinfo *c;
-
- /* get stuff from the stack */
+ <patched call position>
+ 808dffc0 lwz r4,-64(r13)
+ 38a10038 addi r5,r1,56
+ 81adffbc lwz r13,-68(r13)
+ 7da903a6 mtctr r13
+ 4e800421 bctrl
- ra = (u1 *) *((ptrint *) (sp + 5 * 4));
- o = (java_objectheader *) *((ptrint *) (sp + 4 * 4));
- mcode = *((u4 *) (sp + 3 * 4));
- cr = (constant_classref *) *((ptrint *) (sp + 2 * 4));
- disp = *((s4 *) (sp + 1 * 4));
- pv = (u1 *) *((ptrint *) (sp + 0 * 4));
- /* calculate and set the new return address */
+ ARRAYCHECKCAST:
- ra = ra - (2 * 4);
- *((ptrint *) (sp + 5 * 4)) = (ptrint) ra;
+ <patched call position>
+ 808dffd8 lwz r4,-40(r13)
+ 81adffd4 lwz r13,-44(r13)
+ 7da903a6 mtctr r13
+ 4e800421 bctrl
- PATCHER_MONITORENTER;
+*******************************************************************************/
- /* get the classinfo */
+bool patcher_resolve_classref_to_classinfo(patchref_t *pr)
+{
+ constant_classref * cr = (constant_classref*) pr->ref;
+ uintptr_t* datap = (uintptr_t*) pr->datap;
- if (!(c = helper_resolve_classinfo_nonabstract(cr))) {
- PATCHER_MONITOREXIT;
+ // Resolve the class.
+ classinfo* c = resolve_classref_eager(cr);
+ if (c == NULL)
return false;
- }
-
- /* patch back original code */
-
- *((u4 *) (ra + 4)) = mcode;
-
- /* synchronize instruction cache */
-
- asm_cacheflush(ra + 4, 4);
- /* patch the classinfo pointer */
+ // Patch the class pointer.
+ *datap = (uintptr_t) c;
- *((ptrint *) (pv + (disp + SIZEOF_VOID_P))) = (ptrint) c;
+ // Synchronize data cache.
+ md_dcacheflush(datap, SIZEOF_VOID_P);
- /* patch new function address */
-
- *((ptrint *) (pv + disp)) = (ptrint) BUILTIN_new;
-
- PATCHER_MARK_PATCHED_MONITOREXIT;
+ // Patch back the original code.
+ patcher_patch_code(pr);
return true;
}
-/* patcher_builtin_newarray ****************************************************
+/* patcher_resolve_classref_to_vftbl *******************************************
- Machine code:
+ CHECKCAST (class):
- 808dffc8 lwz r4,-56(r13)
<patched call position>
- 81adffc4 lwz r13,-60(r13)
- 7da903a6 mtctr r13
- 4e800421 bctrl
-
- NOTICE: Only the displacement for the function address is passed,
- but the address of the vftbl pointer is one below (above, in
- addresses speaking). This is for sure.
-
-*******************************************************************************/
-
-bool patcher_builtin_newarray(u1 *sp)
-{
- u1 *ra;
- java_objectheader *o;
- u4 mcode;
- constant_classref *cr;
- u1 *pv;
- s4 disp;
- classinfo *c;
-
- /* get stuff from the stack */
+ 81870000 lwz r12,0(r7)
+ 800c0014 lwz r0,20(r12)
+ 818dff78 lwz r12,-136(r13)
- ra = (u1 *) *((ptrint *) (sp + 5 * 4));
- o = (java_objectheader *) *((ptrint *) (sp + 4 * 4));
- mcode = *((u4 *) (sp + 3 * 4));
- cr = (constant_classref *) *((ptrint *) (sp + 2 * 4));
- disp = *((s4 *) (sp + 1 * 4));
- pv = (u1 *) *((ptrint *) (sp + 0 * 4));
- /* calculate and set the new return address */
+ INSTANCEOF (class):
- ra = ra - 2 * 4;
- *((ptrint *) (sp + 5 * 4)) = (ptrint) ra;
+ <patched call position>
+ 817d0000 lwz r11,0(r29)
+ 818dff8c lwz r12,-116(r13)
- PATCHER_MONITORENTER;
+*******************************************************************************/
- /* get the classinfo */
+bool patcher_resolve_classref_to_vftbl(patchref_t *pr)
+{
+ constant_classref* cr = (constant_classref*) pr->ref;
+ uintptr_t* datap = (uintptr_t*) pr->datap;
- if (!(c = helper_resolve_classinfo(cr))) {
- PATCHER_MONITOREXIT;
+ // Resolve the class.
+ classinfo* c = resolve_classref_eager(cr);
+ if (c == NULL)
return false;
- }
-
- /* patch back original code */
-
- *((u4 *) (ra + 4)) = mcode;
-
- /* synchronize instruction cache */
- asm_cacheflush(ra + 4, 4);
+ // Patch super class' vftbl.
+ *datap = (uintptr_t) c->vftbl;
- /* patch the class' vftbl pointer */
+ // Synchronize data cache.
+ md_dcacheflush(datap, SIZEOF_VOID_P);
- *((ptrint *) (pv + (disp + SIZEOF_VOID_P))) = (ptrint) c->vftbl;
-
- /* patch new function address */
-
- *((ptrint *) (pv + disp)) = (ptrint) BUILTIN_newarray;
-
- PATCHER_MARK_PATCHED_MONITOREXIT;
+ // Patch back the original code.
+ patcher_patch_code(pr);
return true;
}
-/* patcher_builtin_multianewarray **********************************************
+/* patcher_resolve_classref_to_flags *******************************************
- Machine code:
+ CHECKCAST/INSTANCEOF:
<patched call position>
- 808dffc0 lwz r4,-64(r13)
- 38a10038 addi r5,r1,56
- 81adffbc lwz r13,-68(r13)
- 7da903a6 mtctr r13
- 4e800421 bctrl
+ 818dff7c lwz r12,-132(r13)
*******************************************************************************/
-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;
- s4 disp;
- u1 *pv;
- classinfo *c;
-
- /* get stuff from the stack */
-
- ra = (u1 *) *((ptrint *) (sp + 5 * 4));
- o = (java_objectheader *) *((ptrint *) (sp + 4 * 4));
- mcode = *((u4 *) (sp + 3 * 4));
- cr = (constant_classref *) *((ptrint *) (sp + 2 * 4));
- disp = *((s4 *) (sp + 1 * 4));
- pv = (u1 *) *((ptrint *) (sp + 0 * 4));
-
- /* calculate and set the new return address */
-
- ra = ra - 4;
- *((ptrint *) (sp + 5 * 4)) = (ptrint) ra;
-
- PATCHER_MONITORENTER;
-
- /* get the classinfo */
+ constant_classref* cr = (constant_classref*) pr->ref;
+ int32_t* datap = (int32_t*) pr->datap;
- if (!(c = helper_resolve_classinfo(cr))) {
- PATCHER_MONITOREXIT;
+ // Resolve the class.
+ classinfo* c = resolve_classref_eager(cr);
+ if (c == NULL)
return false;
- }
-
- /* patch back original code */
-
- *((u4 *) ra) = mcode;
- /* synchronize instruction cache */
+ // Patch class flags.
+ *datap = c->flags;
- asm_cacheflush(ra, 4);
+ // Synchronize data cache.
+ md_dcacheflush(datap, SIZEOF_VOID_P);
- /* patch the class' vftbl pointer */
-
- *((ptrint *) (pv + disp)) = (ptrint) c->vftbl;
-
- PATCHER_MARK_PATCHED_MONITOREXIT;
+ // Patch back the original code.
+ patcher_patch_code(pr);
return true;
}
-/* patcher_builtin_arraycheckcast **********************************************
+/* patcher_get_putstatic *******************************************************
Machine code:
<patched call position>
- 808dffd8 lwz r4,-40(r13)
- 81adffd4 lwz r13,-44(r13)
- 7da903a6 mtctr r13
- 4e800421 bctrl
-
- NOTICE: Only the displacement of the vftbl pointer address is
- passed, but the address of the function pointer is one above
- (below, in addresses speaking). This is for sure.
+ 816dffc8 lwz r11,-56(r13)
+ 80ab0000 lwz r5,0(r11)
*******************************************************************************/
-bool patcher_builtin_arraycheckcast(u1 *sp)
+bool patcher_get_putstatic(patchref_t *pr)
{
- u1 *ra;
- java_objectheader *o;
- u4 mcode;
- constant_classref *cr;
- s4 disp;
- u1 *pv;
- classinfo *c;
-
- /* get stuff from the stack */
-
- ra = (u1 *) *((ptrint *) (sp + 5 * 4));
- o = (java_objectheader *) *((ptrint *) (sp + 4 * 4));
- mcode = *((u4 *) (sp + 3 * 4));
- cr = (constant_classref *) *((ptrint *) (sp + 2 * 4));
- disp = *((s4 *) (sp + 1 * 4));
- pv = (u1 *) *((ptrint *) (sp + 0 * 4));
-
- /* calculate and set the new return address */
-
- ra = ra - 1 * 4;
- *((ptrint *) (sp + 5 * 4)) = (ptrint) ra;
+ unresolved_field* uf = (unresolved_field*) pr->ref;
+ uintptr_t* datap = (uintptr_t*) pr->datap;
- PATCHER_MONITORENTER;
-
- /* get the classinfo */
-
- if (!(c = helper_resolve_classinfo(cr))) {
- PATCHER_MONITOREXIT;
+ // Resolve the field.
+ fieldinfo* fi = resolve_field_eager(uf);
+ if (fi == NULL)
return false;
- }
-
- /* patch back original code */
-
- *((u4 *) ra) = mcode;
- /* synchronize instruction cache */
-
- asm_cacheflush(ra, 4);
-
- /* patch the class' vftbl pointer */
-
- *((ptrint *) (pv + disp)) = (ptrint) c->vftbl;
+ // Check if the field's class is initialized.
+ if (!(fi->clazz->state & CLASS_INITIALIZED))
+ if (!initialize_class(fi->clazz))
+ return false;
- /* patch new function address */
+ // Patch the field value's address.
+ *datap = (uintptr_t) fi->value;
- *((ptrint *) (pv + (disp - SIZEOF_VOID_P))) =
- (ptrint) BUILTIN_arraycheckcast;
+ // Synchronize data cache.
+ md_dcacheflush(datap, SIZEOF_VOID_P);
- PATCHER_MARK_PATCHED_MONITOREXIT;
+ // Patch back the original code.
+ patcher_patch_code(pr);
return true;
}
-/* patcher_builtin_arrayinstanceof *********************************************
+/* patcher_get_putfield ********************************************************
Machine code:
- 808dff50 lwz r4,-176(r13)
<patched call position>
- 81adff4c lwz r13,-180(r13)
- 7da903a6 mtctr r13
- 4e800421 bctrl
-
- NOTICE: Only the displacement for the function address is passed,
- but the address of the vftbl pointer is one below (above, in
- addresses speaking). This is for sure.
+ 811f0014 lwz r8,20(r31)
*******************************************************************************/
-bool patcher_builtin_arrayinstanceof(u1 *sp)
+bool patcher_get_putfield(patchref_t *pr)
{
- u1 *ra;
- java_objectheader *o;
- u4 mcode;
- constant_classref *cr;
- s4 disp;
- u1 *pv;
- classinfo *c;
-
- /* get stuff from the stack */
-
- ra = (u1 *) *((ptrint *) (sp + 5 * 4));
- o = (java_objectheader *) *((ptrint *) (sp + 4 * 4));
- mcode = *((u4 *) (sp + 3 * 4));
- cr = (constant_classref *) *((ptrint *) (sp + 2 * 4));
- disp = *((s4 *) (sp + 1 * 4));
- pv = (u1 *) *((ptrint *) (sp + 0 * 4));
+ uint32_t* pc = (uint32_t*) pr->mpc;
+ unresolved_field* uf = (unresolved_field*) pr->ref;
- /* calculate and set the new return address */
-
- ra = ra - 2 * 4;
- *((ptrint *) (sp + 5 * 4)) = (ptrint) ra;
-
- PATCHER_MONITORENTER;
-
- /* get the classinfo */
-
- if (!(c = helper_resolve_classinfo(cr))) {
- PATCHER_MONITOREXIT;
+ // Resolve the field.
+ fieldinfo* fi = resolve_field_eager(uf);
+ if (fi == NULL)
return false;
- }
-
- /* patch back original code */
- *((u4 *) (ra + 4)) = mcode;
+ // Patch the field's offset.
+ if (IS_LNG_TYPE(fi->type)) {
+ /* If the field has type long, we have to patch two
+ instructions. But we have to check which instruction
+ is first. We do that with the offset of the first
+ instruction. */
- /* synchronize instruction cache */
+ uint32_t disp = (pr->mcode & 0x0000ffff);
- asm_cacheflush(ra + 4, 4);
-
- /* patch the class' vftbl pointer */
-
- *((ptrint *) (pv + (disp + SIZEOF_VOID_P))) = (ptrint) c->vftbl;
-
- /* patch new function address */
+ if (disp == 4) {
+ pr->mcode &= 0xffff0000;
+ pr->mcode |= ((fi->offset + 4) & 0x0000ffff);
+ pc[1] |= ((fi->offset + 0) & 0x0000ffff);
+ }
+ else {
+ pr->mcode |= ((fi->offset + 0) & 0x0000ffff);
+ pc[1] &= 0xffff0000;
+ pc[1] |= ((fi->offset + 4) & 0x0000ffff);
+ }
- *((ptrint *) (pv + disp)) = (ptrint) BUILTIN_arrayinstanceof;
+ // Synchronize instruction cache.
+ md_icacheflush(pc + 1, 1 * 4);
+ }
+ else {
+ pr->mcode |= (fi->offset & 0x0000ffff);
+ }
- PATCHER_MARK_PATCHED_MONITOREXIT;
+ // Patch back the original code.
+ patcher_patch_code(pr);
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;
- s4 disp;
- u1 *pv;
- methodinfo *m;
-
- /* get stuff from the stack */
-
- ra = (u1 *) *((ptrint *) (sp + 5 * 4));
- o = (java_objectheader *) *((ptrint *) (sp + 4 * 4));
- mcode = *((u4 *) (sp + 3 * 4));
- um = (unresolved_method *) *((ptrint *) (sp + 2 * 4));
- disp = *((s4 *) (sp + 1 * 4));
- pv = (u1 *) *((ptrint *) (sp + 0 * 4));
-
- /* calculate and set the new return address */
-
- ra = ra - 4;
- *((ptrint *) (sp + 5 * 4)) = (ptrint) ra;
-
- PATCHER_MONITORENTER;
+ unresolved_method* um = (unresolved_method*) pr->ref;
+ uintptr_t* datap = (uintptr_t*) pr->datap;
- /* get the fieldinfo */
-
- if (!(m = helper_resolve_methodinfo(um))) {
- PATCHER_MONITOREXIT;
+ // Resolve the method.
+ methodinfo* m = resolve_method_eager(um);
+ if (m == NULL)
return false;
- }
-
- /* patch back original code */
-
- *((u4 *) ra) = mcode;
-
- /* synchronize instruction cache */
-
- asm_cacheflush(ra, 4);
- /* patch stubroutine */
+ // Patch stubroutine.
+ *datap = (uintptr_t) m->stubroutine;
- *((ptrint *) (pv + disp)) = (ptrint) m->stubroutine;
+ // Synchronize data cache.
+ md_dcacheflush(datap, SIZEOF_VOID_P);
- PATCHER_MARK_PATCHED_MONITOREXIT;
+ // Patch back the original code.
+ patcher_patch_code(pr);
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;
+ uint32_t* pc = (uint32_t*) pr->mpc;
+ unresolved_method* um = (unresolved_method*) pr->ref;
- /* get stuff from the stack */
-
- ra = (u1 *) *((ptrint *) (sp + 5 * 4));
- o = (java_objectheader *) *((ptrint *) (sp + 4 * 4));
- mcode = *((u4 *) (sp + 3 * 4));
- um = (unresolved_method *) *((ptrint *) (sp + 2 * 4));
-
- /* calculate and set the new return address */
-
- ra = ra - 4;
- *((ptrint *) (sp + 5 * 4)) = (ptrint) ra;
-
- PATCHER_MONITORENTER;
-
- /* get the fieldinfo */
-
- if (!(m = helper_resolve_methodinfo(um))) {
- PATCHER_MONITOREXIT;
+ // Resolve the method.
+ methodinfo* m = resolve_method_eager(um);
+ if (m == NULL)
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 vftbl index */
+ // Patch vftbl index.
+ int32_t disp = (OFFSET(vftbl_t, table[0]) + sizeof(methodptr) * m->vftblindex);
- *((s4 *) (ra + 4)) |= (s4) ((OFFSET(vftbl_t, table[0]) +
- sizeof(methodptr) * m->vftblindex) & 0x0000ffff);
+ pc[1] |= (disp & 0x0000ffff);
- /* synchronize instruction cache */
+ // Synchronize instruction cache.
+ md_icacheflush(pc + 1, 1 * 4);
- asm_cacheflush(ra, 2 * 4);
-
- PATCHER_MARK_PATCHED_MONITOREXIT;
+ // Patch back the original code.
+ patcher_patch_code(pr);
return true;
}
*******************************************************************************/
-bool patcher_invokeinterface(u1 *sp)
-{
- u1 *ra;
- java_objectheader *o;
- u4 mcode;
- unresolved_method *um;
- methodinfo *m;
-
- /* get stuff from the stack */
-
- ra = (u1 *) *((ptrint *) (sp + 5 * 4));
- o = (java_objectheader *) *((ptrint *) (sp + 4 * 4));
- mcode = *((u4 *) (sp + 3 * 4));
- um = (unresolved_method *) *((ptrint *) (sp + 2 * 4));
-
- /* calculate and set the new return address */
-
- ra = ra - 4;
- *((ptrint *) (sp + 5 * 4)) = (ptrint) ra;
-
- PATCHER_MONITORENTER;
-
- /* get the fieldinfo */
-
- if (!(m = helper_resolve_methodinfo(um))) {
- 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;
-
- /* patch interfacetable index */
-
- *((s4 *) (ra + 1 * 4)) |= (s4) ((OFFSET(vftbl_t, interfacetable[0]) -
- sizeof(methodptr*) * m->class->index) & 0x0000ffff);
-
- /* patch method offset */
-
- *((s4 *) (ra + 2 * 4)) |=
- (s4) ((sizeof(methodptr) * (m - m->class->methods)) & 0x0000ffff);
-
- /* synchronize instruction cache */
-
- asm_cacheflush(ra, 3 * 4);
-
- PATCHER_MARK_PATCHED_MONITOREXIT;
-
- return true;
-}
-
-
-/* patcher_checkcast_instanceof_flags ******************************************
-
- Machine code:
-
- <patched call position>
- 818dff7c lwz r12,-132(r13)
-
-*******************************************************************************/
-
-bool patcher_checkcast_instanceof_flags(u1 *sp)
+bool patcher_invokeinterface(patchref_t *pr)
{
- u1 *ra;
- java_objectheader *o;
- u4 mcode;
- constant_classref *cr;
- s4 disp;
- u1 *pv;
- classinfo *c;
-
- /* get stuff from the stack */
-
- ra = (u1 *) *((ptrint *) (sp + 5 * 4));
- o = (java_objectheader *) *((ptrint *) (sp + 4 * 4));
- mcode = *((u4 *) (sp + 3 * 4));
- cr = (constant_classref *) *((ptrint *) (sp + 2 * 4));
- disp = *((s4 *) (sp + 1 * 4));
- pv = (u1 *) *((ptrint *) (sp + 0 * 4));
-
- /* calculate and set the new return address */
-
- ra = ra - 4;
- *((ptrint *) (sp + 5 * 4)) = (ptrint) ra;
+ uint32_t* pc = (uint32_t*) pr->mpc;
+ unresolved_method* um = (unresolved_method*) pr->ref;
- PATCHER_MONITORENTER;
-
- /* get the fieldinfo */
-
- if (!(c = helper_resolve_classinfo(cr))) {
- PATCHER_MONITOREXIT;
+ // Resolve the method.
+ methodinfo* m = resolve_method_eager(um);
+ if (m == NULL)
return false;
- }
- /* patch back original code */
+ // Patch interfacetable index.
+ int32_t disp = OFFSET(vftbl_t, interfacetable[0]) - sizeof(methodptr*) * m->clazz->index;
- *((u4 *) ra) = mcode;
+ /* XXX TWISTI: check displacement */
+ pc[1] |= (disp & 0x0000ffff);
- /* synchronize instruction cache */
+ // Patch method offset.
+ disp = sizeof(methodptr) * (m - m->clazz->methods);
- asm_cacheflush(ra, 4);
+ /* XXX TWISTI: check displacement */
+ pc[2] |= (disp & 0x0000ffff);
- /* patch class flags */
+ // Synchronize instruction cache.
+ md_icacheflush(pc + 1, 2 * 4);
- *((s4 *) (pv + disp)) = (s4) c->flags;
-
- PATCHER_MARK_PATCHED_MONITOREXIT;
+ // Patch back the original code.
+ patcher_patch_code(pr);
return true;
}
-/* patcher_checkcast_instanceof_interface **************************************
+/* patcher_checkcast_interface *************************************************
Machine code:
<patched call position>
- 81870000 lwz r12,0(r7)
- 800c0010 lwz r0,16(r12)
- 34000000 addic. r0,r0,0
- 408101fc ble- 0x3002e518
- 800c0000 lwz r0,0(r12)
+ 81870000 lwz r12,0(r7)
+ 800c0010 lwz r0,16(r12)
+ 34000000 addic. r0,r0,0
+ 41810008 bgt- 0x014135d8
+ 83c00003 lwz r30,3(0)
+ 800c0000 lwz r0,0(r12)
*******************************************************************************/
-bool patcher_checkcast_instanceof_interface(u1 *sp)
+bool patcher_checkcast_interface(patchref_t *pr)
{
- u1 *ra;
- java_objectheader *o;
- u4 mcode;
- constant_classref *cr;
- classinfo *c;
+ uint32_t* pc = (uint32_t*) pr->mpc;
+ constant_classref* cr = (constant_classref*) pr->ref;
- /* get stuff from the stack */
-
- ra = (u1 *) *((ptrint *) (sp + 5 * 4));
- o = (java_objectheader *) *((ptrint *) (sp + 4 * 4));
- mcode = *((u4 *) (sp + 3 * 4));
- cr = (constant_classref *) *((ptrint *) (sp + 2 * 4));
-
- /* calculate and set the new return address */
-
- ra = ra - 4;
- *((ptrint *) (sp + 5 * 4)) = (ptrint) ra;
-
- PATCHER_MONITORENTER;
-
- /* get the fieldinfo */
-
- if (!(c = helper_resolve_classinfo(cr))) {
- PATCHER_MONITOREXIT;
+ // Resolve the class.
+ classinfo* c = resolve_classref_eager(cr);
+ if (c == NULL)
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 super class index */
+ // Patch super class index.
+ int32_t disp = -(c->index);
+ pc[2] |= (disp & 0x0000ffff);
- *((s4 *) (ra + 2 * 4)) |= (s4) (-(c->index) & 0x0000ffff);
+ disp = OFFSET(vftbl_t, interfacetable[0]) - c->index * sizeof(methodptr*);
+ pc[5] |= (disp & 0x0000ffff);
- *((s4 *) (ra + 4 * 4)) |= (s4) ((OFFSET(vftbl_t, interfacetable[0]) -
- c->index * sizeof(methodptr*)) & 0x0000ffff);
+ // Synchronize instruction cache.
+ md_icacheflush(pc + 2, 4 * 4);
- /* synchronize instruction cache */
-
- asm_cacheflush(ra, 5 * 4);
-
- PATCHER_MARK_PATCHED_MONITOREXIT;
+ // Patch back the original code.
+ patcher_patch_code(pr);
return true;
}
-/* patcher_checkcast_class *****************************************************
+/* patcher_instanceof_interface ************************************************
Machine code:
<patched call position>
- 81870000 lwz r12,0(r7)
- 800c0014 lwz r0,20(r12)
- 818dff78 lwz r12,-136(r13)
+ 81870000 lwz r12,0(r7)
+ 800c0010 lwz r0,16(r12)
+ 34000000 addic. r0,r0,0
+ 41810008 bgt- 0x014135d8
+ 83c00003 lwz r30,3(0)
+ 800c0000 lwz r0,0(r12)
*******************************************************************************/
-bool patcher_checkcast_class(u1 *sp)
+bool patcher_instanceof_interface(patchref_t *pr)
{
- u1 *ra;
- java_objectheader *o;
- u4 mcode;
- constant_classref *cr;
- s4 disp;
- u1 *pv;
- classinfo *c;
-
- /* get stuff from the stack */
-
- ra = (u1 *) *((ptrint *) (sp + 5 * 4));
- o = (java_objectheader *) *((ptrint *) (sp + 4 * 4));
- mcode = *((u4 *) (sp + 3 * 4));
- cr = (constant_classref *) *((ptrint *) (sp + 2 * 4));
- disp = *((s4 *) (sp + 1 * 4));
- pv = (u1 *) *((ptrint *) (sp + 0 * 4));
-
- /* calculate and set the new return address */
-
- ra = ra - 4;
- *((ptrint *) (sp + 5 * 4)) = (ptrint) ra;
-
- PATCHER_MONITORENTER;
-
- /* get the fieldinfo */
+ uint32_t* pc = (uint32_t*) pr->mpc;
+ constant_classref* cr = (constant_classref*) pr->ref;
- if (!(c = helper_resolve_classinfo(cr))) {
- PATCHER_MONITOREXIT;
+ // Resolve the class.
+ classinfo* c = resolve_classref_eager(cr);
+ if (c == NULL)
return false;
- }
-
- /* patch back original code */
-
- *((u4 *) ra) = mcode;
-
- /* synchronize instruction cache */
-
- asm_cacheflush(ra, 4);
-
- /* patch super class' vftbl */
-
- *((ptrint *) (pv + disp)) = (ptrint) c->vftbl;
-
- PATCHER_MARK_PATCHED_MONITOREXIT;
-
- 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;
- java_objectheader *o;
- u4 mcode;
- constant_classref *cr;
- s4 disp;
- u1 *pv;
- classinfo *c;
-
- /* get stuff from the stack */
-
- ra = (u1 *) *((ptrint *) (sp + 5 * 4));
- o = (java_objectheader *) *((ptrint *) (sp + 4 * 4));
- mcode = *((u4 *) (sp + 3 * 4));
- cr = (constant_classref *) *((ptrint *) (sp + 2 * 4));
- disp = *((s4 *) (sp + 1 * 4));
- pv = (u1 *) *((ptrint *) (sp + 0 * 4));
-
- /* calculate and set the new return address */
-
- ra = ra - 4;
- *((ptrint *) (sp + 5 * 4)) = (ptrint) ra;
-
- PATCHER_MONITORENTER;
-
- /* get the fieldinfo */
-
- if (!(c = helper_resolve_classinfo(cr))) {
- PATCHER_MONITOREXIT;
-
- return false;
- }
-
- /* patch back original code */
-
- *((u4 *) ra) = mcode;
-
- /* synchronize instruction cache */
-
- asm_cacheflush(ra, 4);
-
- /* patch super class' vftbl */
-
- *((ptrint *) (pv + disp)) = (ptrint) c->vftbl;
-
- 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 + 5 * 4));
- o = (java_objectheader *) *((ptrint *) (sp + 4 * 4));
- mcode = *((u4 *) (sp + 3 * 4));
- c = (classinfo *) *((ptrint *) (sp + 2 * 4));
-
- /* calculate and set the new return address */
-
- ra = ra - 4;
- *((ptrint *) (sp + 5 * 4)) = (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_cacheflush(ra, 4);
-
- 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;
- s4 disp;
- u1 *pv;
- functionptr f;
-
- /* get stuff from the stack */
-
- ra = (u1 *) *((ptrint *) (sp + 5 * 4));
- o = (java_objectheader *) *((ptrint *) (sp + 4 * 4));
- mcode = *((u4 *) (sp + 3 * 4));
- m = (methodinfo *) *((ptrint *) (sp + 2 * 4));
- disp = *((s4 *) (sp + 1 * 4));
- pv = (u1 *) *((ptrint *) (sp + 0 * 4));
-
- /* calculate and set the new return address */
-
- ra = ra - 4;
- *((ptrint *) (sp + 5 * 4)) = (ptrint) ra;
-
- PATCHER_MONITORENTER;
-
- /* resolve native function */
-
- if (!(f = native_resolve_function(m))) {
- PATCHER_MONITOREXIT;
-
- return false;
- }
-
- /* patch back original code */
-
- *((u4 *) ra) = mcode;
-
- /* synchronize instruction cache */
- asm_cacheflush(ra, 4);
+ // Patch super class index.
+ int32_t disp = -(c->index);
+ pc[2] |= (disp & 0x0000ffff);
- /* patch native function pointer */
+ disp = OFFSET(vftbl_t, interfacetable[0]) - c->index * sizeof(methodptr*);
+ pc[4] |= (disp & 0x0000ffff);
- *((ptrint *) (pv + disp)) = (ptrint) f;
+ // Synchronize instruction cache.
+ md_icacheflush(pc + 2, 3 * 4);
- PATCHER_MARK_PATCHED_MONITOREXIT;
+ // Patch back the original code.
+ patcher_patch_code(pr);
return true;
}
-#endif /* !defined(ENABLE_STATICVM) */
/*
projects / cacao.git / blobdiff