/* src/vm/jit/x86_64/patcher.c - x86_64 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.
-
- Contact: cacao@complang.tuwien.ac.at
-
- Authors: Christian Thalinger
-
- Changes:
-
- $Id: patcher.c 2315 2005-04-21 11:22:45Z twisti $
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ 02110-1301, USA.
*/
-#include "vm/jit/x86_64/types.h"
-#include "vm/field.h"
-#include "vm/references.h"
-#include "vm/jit/asmhelper.c"
-
-
-/* patcher_get_putstatic *******************************************************
-
- XXX
-
- Machine code:
-
- 4d 8b 15 86 fe ff ff mov -378(%rip),%r10
-
-*******************************************************************************/
+#include "config.h"
-bool patcher_get_putstatic(u1 *sp)
-{
- u1 *ra;
- u8 mcode;
- unresolved_field *uf;
- fieldinfo *fi;
- ptrint *dataaddress;
- s4 ripoffset;
+#include <stdint.h>
- /* get stuff from the stack */
+#include "vm/types.h"
- ra = (u1 *) *((ptrint *) (sp + 2 * 8));
- mcode = *((u8 *) (sp + 1 * 8));
- uf = (unresolved_field *) *((ptrint *) (sp + 0 * 8));
+#include "vm/jit/x86_64/codegen.h"
- /* calculate and set the new return address */
+#include "mm/memory.h"
- ra = ra - 5;
- *((ptrint *) (sp + 2 * 8)) = (ptrint) ra;
+#include "native/native.h"
- /* get the fieldinfo */
+#include "vm/builtin.h"
+#include "vm/exceptions.h"
+#include "vm/initialize.h"
- if (!(fi = helper_resolve_fieldinfo(uf)))
- return false;
+#include "vm/jit/patcher-common.h"
+#include "vm/jit/stacktrace.h"
- /* check if the field's class is initialized */
+#include "vmcore/class.h"
+#include "vmcore/field.h"
+#include "vmcore/options.h"
+#include "vmcore/references.h"
+#include "vm/resolve.h"
- if (!fi->class->initialized)
- if (!initialize_class(fi->class))
- return false;
- /* patch back original code */
+#define PATCH_BACK_ORIGINAL_MCODE \
+ do { \
+ *((uint16_t *) pr->mpc) = (uint16_t) pr->mcode; \
+ } while (0)
- *((u8 *) ra) = mcode;
- /* get RIP offset from machine instruction */
+/* patcher_patch_code **********************************************************
- ripoffset = *((u4 *) (ra + 3));
+ Just patches back the original machine code.
- /* calculate address in data segment (+ 7: is the size of the RIP move) */
+*******************************************************************************/
- dataaddress = (ptrint *) (ra + ripoffset + 7);
+void patcher_patch_code(patchref_t *pr)
+{
+ PATCH_BACK_ORIGINAL_MCODE;
+}
- /* patch the field value's address */
- *dataaddress = (ptrint) &(fi->value);
+/* patcher_resolve_classref_to_classinfo ***************************************
- return true;
-}
+ ACONST:
+ <patched call position>
+ 48 bf a0 f0 92 00 00 00 00 00 mov $0x92f0a0,%rdi
-/* patcher_get_putfield ********************************************************
+ MULTIANEWARRAY:
- XXX
+ <patched call position>
+ 48 be 30 40 b2 00 00 00 00 00 mov $0xb24030,%rsi
+ 48 89 e2 mov %rsp,%rdx
+ 48 b8 7c 96 4b 00 00 00 00 00 mov $0x4b967c,%rax
+ 48 ff d0 callq *%rax
- Machine code:
+ ARRAYCHECKCAST:
- 45 8b 8f 00 00 00 00 mov 0x0(%r15),%r9d
+ <patched call position>
+ 48 be b8 3f b2 00 00 00 00 00 mov $0xb23fb8,%rsi
+ 48 b8 00 00 00 00 00 00 00 00 mov $0x0,%rax
+ 48 ff d0 callq *%rax
*******************************************************************************/
-bool patcher_get_putfield(u1 *sp)
+bool patcher_resolve_classref_to_classinfo(patchref_t *pr)
{
- u1 *ra;
- u8 mcode;
- unresolved_field *uf;
- fieldinfo *fi;
-
- /* get stuff from the stack */
-
- ra = (u1 *) *((ptrint *) (sp + 2 * 8));
- mcode = *((u8 *) (sp + 1 * 8));
- uf = (unresolved_field *) *((ptrint *) (sp + 0 * 8));
-
- /* calculate and set the new return address */
+ constant_classref *cr;
+ intptr_t *datap;
+ classinfo *c;
- ra = ra - 5;
- *((ptrint *) (sp + 2 * 8)) = (ptrint) ra;
+ cr = (constant_classref *) pr->ref;
+ datap = (intptr_t *) pr->datap;
- /* get the fieldinfo */
+ /* get the classinfo */
- if (!(fi = helper_resolve_fieldinfo(uf)))
+ if (!(c = resolve_classref_eager(cr)))
return false;
- /* patch back original code */
-
- *((u8 *) ra) = mcode;
+ PATCH_BACK_ORIGINAL_MCODE;
- /* patch the field's offset: we check for the field type, because the */
- /* instructions have different lengths */
-
- if (IS_FLT_DBL_TYPE(fi->type)) {
- *((u4 *) (ra + 5)) = (u4) (fi->offset);
-
- } else {
- u1 byte;
-
- /* check for special case: %rsp or %r12 as base register */
-
- byte = *(ra + 3);
+ /* patch the classinfo pointer */
- if (byte == 0x24)
- *((u4 *) (ra + 4)) = (u4) (fi->offset);
- else
- *((u4 *) (ra + 3)) = (u4) (fi->offset);
- }
+ *datap = (intptr_t) c;
return true;
}
-/* patcher_builtin_new *********************************************************
+/* patcher_resolve_classref_to_vftbl *******************************************
- XXX
+ CHECKCAST (class):
+ INSTANCEOF (class):
- Machine code:
+ <patched call position>
*******************************************************************************/
-bool patcher_builtin_new(constant_classref *cr, u1 *sp)
+bool patcher_resolve_classref_to_vftbl(patchref_t *pr)
{
- u1 *ra;
+ constant_classref *cr;
+ intptr_t *datap;
classinfo *c;
/* get stuff from the stack */
- ra = (u1 *) *((ptrint *) (sp + 0 * 8));
+ cr = (constant_classref *) pr->ref;
+ datap = (intptr_t *) pr->datap;
- /* calculate and set the new return address */
-
- ra = ra - (10 + 10 + 3);
- *((ptrint *) (sp + 0 * 8)) = (ptrint) ra;
-
- /* get the classinfo */
+ /* get the fieldinfo */
- if (!(c = helper_resolve_classinfo(cr)))
+ if (!(c = resolve_classref_eager(cr)))
return false;
- /* patch the classinfo pointer */
-
- *((ptrint *) (ra + 2)) = (ptrint) c;
+ PATCH_BACK_ORIGINAL_MCODE;
- /* patch new function address */
+ /* patch super class' vftbl */
- *((ptrint *) (ra + 10 + 2)) = (ptrint) BUILTIN_new;
+ *datap = (intptr_t) c->vftbl;
return true;
}
-/* patcher_builtin_anewarray ***************************************************
+/* patcher_resolve_classref_to_flags *******************************************
- XXX
+ CHECKCAST/INSTANCEOF:
- Machine code:
+ <patched call position>
*******************************************************************************/
-bool patcher_builtin_anewarray(u1 *sp, constant_classref *cr)
+bool patcher_resolve_classref_to_flags(patchref_t *pr)
{
- u1 *ra;
+ constant_classref *cr;
+ int32_t *datap;
classinfo *c;
+ uint8_t *ra;
- /* get stuff from the stack */
-
- ra = (u1 *) *((ptrint *) (sp + 0 * 8));
-
- /* calculate and set the new return address */
+ cr = (constant_classref *) pr->ref;
+ datap = (int32_t *) pr->datap;
+ ra = (uint8_t *) pr->mpc;
- ra = ra - (10 + 10 + 3);
- *((ptrint *) (sp + 0 * 8)) = (ptrint) ra;
-
- /* get the classinfo */
+ /* get the fieldinfo */
- if (!(c = helper_resolve_classinfo(cr)))
+ if (!(c = resolve_classref_eager(cr)))
return false;
- /* patch the class' vftbl pointer */
+ PATCH_BACK_ORIGINAL_MCODE;
+
+ /* if we show disassembly, we have to skip the nop's */
- *((ptrint *) (ra + 2)) = (ptrint) c->vftbl;
+ if (opt_shownops)
+ ra = ra + PATCHER_CALL_SIZE;
- /* patch new function address */
+ /* patch class flags */
- *((ptrint *) (ra + 10 + 2)) = (ptrint) BUILTIN_anewarray;
+/* *datap = c->flags; */
+ *((int32_t *) (ra + 2)) = c->flags;
return true;
}
-/* patcher_builtin_multianewarray **********************************************
-
- XXX
+/* patcher_get_putstatic *******************************************************
Machine code:
+ <patched call position>
+ 4d 8b 15 86 fe ff ff mov -378(%rip),%r10
+ 49 8b 32 mov (%r10),%rsi
+
*******************************************************************************/
-bool patcher_builtin_multianewarray(u1 *sp, constant_classref *cr)
+bool patcher_get_putstatic(patchref_t *pr)
{
- u1 *ra;
- classinfo *c;
-
- /* get stuff from the stack */
-
- ra = (u1 *) *((ptrint *) (sp + 0 * 8));
-
- /* calculate and set the new return address */
+ unresolved_field *uf;
+ intptr_t *datap;
+ fieldinfo *fi;
- ra = ra - (10 + 10 + 3 + 10 + 3);
- *((ptrint *) (sp + 0 * 8)) = (ptrint) ra;
+ uf = (unresolved_field *) pr->ref;
+ datap = (intptr_t *) pr->datap;
- /* get the classinfo */
+ /* get the fieldinfo */
- if (!(c = helper_resolve_classinfo(cr)))
+ if (!(fi = resolve_field_eager(uf)))
return false;
- /* patch the class' vftbl pointer */
+ /* check if the field's class is initialized */
- *((ptrint *) (ra + 10 + 2)) = (ptrint) c->vftbl;
+ if (!(fi->clazz->state & CLASS_INITIALIZED))
+ if (!initialize_class(fi->clazz))
+ return false;
+
+ PATCH_BACK_ORIGINAL_MCODE;
- /* patch new function address */
+ /* patch the field value's address */
- *((ptrint *) (ra + 10 + 10 + 3 + 2)) = (ptrint) BUILTIN_multianewarray;
+ *datap = (intptr_t) fi->value;
return true;
}
-/* patcher_builtin_checkarraycast **********************************************
-
- XXX
+/* patcher_get_putfield ********************************************************
Machine code:
+ <patched call position>
+ 45 8b 8f 00 00 00 00 mov 0x0(%r15),%r9d
+
*******************************************************************************/
-bool patcher_builtin_checkarraycast(u1 *sp, constant_classref *cr)
+bool patcher_get_putfield(patchref_t *pr)
{
- u1 *ra;
- classinfo *c;
+ uint8_t *ra;
+ unresolved_field *uf;
+ fieldinfo *fi;
+ uint8_t byte;
- /* get stuff from the stack */
+ ra = (uint8_t *) pr->mpc;
+ uf = (unresolved_field *) pr->ref;
- ra = (u1 *) *((ptrint *) (sp + 0 * 8));
+ /* get the fieldinfo */
- /* calculate and set the new return address */
+ if (!(fi = resolve_field_eager(uf)))
+ return false;
- ra = ra - (10 + 10 + 3);
- *((ptrint *) (sp + 0 * 8)) = (ptrint) ra;
+ PATCH_BACK_ORIGINAL_MCODE;
- /* get the classinfo */
+ /* if we show disassembly, we have to skip the nop's */
- if (!(c = helper_resolve_classinfo(cr)))
- return false;
+ if (opt_shownops)
+ ra = ra + PATCHER_CALL_SIZE;
- /* patch the class' vftbl pointer */
+ /* Patch the field's offset: we check for the field type, because
+ the instructions have different lengths. */
- *((ptrint *) (ra + 2)) = (ptrint) c->vftbl;
+ if (IS_INT_LNG_TYPE(fi->type)) {
+ /* Check for special case: %rsp or %r12 as base register. */
- /* patch new function address */
+ byte = *(ra + 3);
- *((ptrint *) (ra + 10 + 2)) = (ptrint) BUILTIN_checkarraycast;
+ if (byte == 0x24)
+ *((int32_t *) (ra + 4)) = fi->offset;
+ else
+ *((int32_t *) (ra + 3)) = fi->offset;
+ }
+ else {
+ /* Check for special case: %rsp or %r12 as base register. */
+
+ byte = *(ra + 5);
+
+ if (byte == 0x24)
+ *((int32_t *) (ra + 6)) = fi->offset;
+ else
+ *((int32_t *) (ra + 5)) = fi->offset;
+ }
return true;
}
-/* patcher_builtin_arrayinstanceof *********************************************
-
- XXX
+/* patcher_putfieldconst *******************************************************
Machine code:
+ <patched call position>
+ 41 c7 85 00 00 00 00 7b 00 00 00 movl $0x7b,0x0(%r13)
+
*******************************************************************************/
-bool patcher_builtin_arrayinstanceof(u1 *sp, constant_classref *cr)
+bool patcher_putfieldconst(patchref_t *pr)
{
- u1 *ra;
- classinfo *c;
+ uint8_t *ra;
+ unresolved_field *uf;
+ fieldinfo *fi;
+ uint8_t byte;
- /* get stuff from the stack */
+ ra = (uint8_t *) pr->mpc;
+ uf = (unresolved_field *) pr->ref;
- ra = (u1 *) *((ptrint *) (sp + 0 * 8));
+ /* get the fieldinfo */
- /* calculate and set the new return address */
+ if (!(fi = resolve_field_eager(uf)))
+ return false;
- ra = ra - (10 + 10 + 3);
- *((ptrint *) (sp + 0 * 8)) = (ptrint) ra;
+ PATCH_BACK_ORIGINAL_MCODE;
- /* get the classinfo */
+ /* if we show disassembly, we have to skip the nop's */
- if (!(c = helper_resolve_classinfo(cr)))
- return false;
+ if (opt_shownops)
+ ra = ra + PATCHER_CALL_SIZE;
- /* patch the class' vftbl pointer */
+ /* patch the field's offset */
- *((ptrint *) (ra + 2)) = (ptrint) c->vftbl;
+ if (IS_2_WORD_TYPE(fi->type) || IS_ADR_TYPE(fi->type)) {
+ /* handle special case when the base register is %r12 */
- /* patch new function address */
+ byte = *(ra + 2);
- *((ptrint *) (ra + 10 + 2)) = (ptrint) BUILTIN_arrayinstanceof;
+ if (byte == 0x84) {
+ *((uint32_t *) (ra + 4)) = fi->offset;
+ *((uint32_t *) (ra + 12 + 4)) = fi->offset + 4;
+ }
+ else {
+ *((uint32_t *) (ra + 3)) = fi->offset;
+ *((uint32_t *) (ra + 11 + 3)) = fi->offset + 4;
+ }
+ }
+ else {
+ /* handle special case when the base register is %r12 */
+
+ byte = *(ra + 2);
+
+ if (byte == 0x84)
+ *((uint32_t *) (ra + 4)) = fi->offset;
+ else
+ *((uint32_t *) (ra + 3)) = fi->offset;
+ }
return true;
}
/* patcher_invokestatic_special ************************************************
- XXX
+ Machine code:
+
+ <patched call position>
+ 49 ba 00 00 00 00 00 00 00 00 mov $0x0,%r10
+ 49 ff d2 callq *%r10
*******************************************************************************/
-bool patcher_invokestatic_special(u1 *sp)
+bool patcher_invokestatic_special(patchref_t *pr)
{
- u1 *ra;
- u8 mcode;
unresolved_method *um;
+ intptr_t *datap;
methodinfo *m;
/* get stuff from the stack */
- ra = (u1 *) *((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 - 5;
- *((ptrint *) (sp + 2 * 8)) = (ptrint) ra;
+ um = (unresolved_method *) pr->ref;
+ datap = (intptr_t *) pr->datap;
/* get the fieldinfo */
- if (!(m = helper_resolve_methodinfo(um)))
+ if (!(m = resolve_method_eager(um)))
return false;
- /* patch back original code */
-
- *((u8 *) ra) = mcode;
+ PATCH_BACK_ORIGINAL_MCODE;
/* patch stubroutine */
- *((ptrint *) (ra + 2)) = (ptrint) m->stubroutine;
+ *datap = (intptr_t) m->stubroutine;
return true;
}
/* patcher_invokevirtual *******************************************************
- XXX
+ Machine code:
+
+ <patched call position>
+ 4c 8b 17 mov (%rdi),%r10
+ 49 8b 82 00 00 00 00 mov 0x0(%r10),%rax
+ 48 ff d0 callq *%rax
*******************************************************************************/
-bool patcher_invokevirtual(u1 *sp)
+bool patcher_invokevirtual(patchref_t *pr)
{
- u1 *ra;
- u8 mcode;
+ uint8_t *ra;
unresolved_method *um;
methodinfo *m;
- /* get stuff from the stack */
-
- ra = (u1 *) *((ptrint *) (sp + 2 * 8));
- mcode = *((u8 *) (sp + 1 * 8));
- um = (unresolved_method *) *((ptrint *) (sp + 0 * 8));
+ ra = (uint8_t *) pr->mpc;
+ um = (unresolved_method *) pr->ref;
- /* calculate and set the new return address */
+ /* get the methodinfo */
- ra = ra - 5;
- *((ptrint *) (sp + 2 * 8)) = (ptrint) ra;
-
- /* get the fieldinfo */
-
- if (!(m = helper_resolve_methodinfo(um)))
+ if (!(m = resolve_method_eager(um)))
return false;
- /* patch back original code */
+ PATCH_BACK_ORIGINAL_MCODE;
+
+ /* if we show disassembly, we have to skip the nop's */
- *((u8 *) ra) = mcode;
+ if (opt_shownops)
+ ra = ra + PATCHER_CALL_SIZE;
/* patch vftbl index */
- *((s4 *) (ra + 3 + 3)) = (s4) (OFFSET(vftbl_t, table[0]) +
- sizeof(methodptr) * m->vftblindex);
+ *((int32_t *) (ra + 3 + 3)) =
+ (int32_t) (OFFSET(vftbl_t, table[0]) +
+ sizeof(methodptr) * m->vftblindex);
return true;
}
/* patcher_invokeinterface *****************************************************
- XXX
+ Machine code:
+
+ <patched call position>
+ 4c 8b 17 mov (%rdi),%r10
+ 4d 8b 92 00 00 00 00 mov 0x0(%r10),%r10
+ 49 8b 82 00 00 00 00 mov 0x0(%r10),%rax
+ 48 ff d0 callq *%rax
*******************************************************************************/
-bool patcher_invokeinterface(u1 *sp)
+bool patcher_invokeinterface(patchref_t *pr)
{
- u1 *ra;
- u8 mcode;
+ uint8_t *ra;
unresolved_method *um;
methodinfo *m;
/* get stuff from the stack */
- ra = (u1 *) *((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 - 5;
- *((ptrint *) (sp + 2 * 8)) = (ptrint) ra;
+ ra = (uint8_t *) pr->mpc;
+ um = (unresolved_method *) pr->ref;
/* get the fieldinfo */
- if (!(m = helper_resolve_methodinfo(um)))
+ if (!(m = resolve_method_eager(um)))
return false;
- /* patch back original code */
+ PATCH_BACK_ORIGINAL_MCODE;
+
+ /* if we show disassembly, we have to skip the nop's */
- *((u8 *) ra) = mcode;
+ if (opt_shownops)
+ ra = ra + PATCHER_CALL_SIZE;
/* patch interfacetable index */
- *((s4 *) (ra + 3 + 3)) = (s4) (OFFSET(vftbl_t, interfacetable[0]) -
- sizeof(methodptr) * m->class->index);
+ *((int32_t *) (ra + 3 + 3)) =
+ (int32_t) (OFFSET(vftbl_t, interfacetable[0]) -
+ sizeof(methodptr) * m->clazz->index);
/* patch method offset */
- *((s4 *) (ra + 3 + 7 + 3)) =
- (s4) (sizeof(methodptr) * (m - m->class->methods));
+ *((int32_t *) (ra + 3 + 7 + 3)) =
+ (int32_t) (sizeof(methodptr) * (m - m->clazz->methods));
return true;
}
-/* patcher_checkcast_instanceof_flags ******************************************
-
- XXX
-
-*******************************************************************************/
-
-bool patcher_checkcast_instanceof_flags(u1 *sp)
-{
- u1 *ra;
- u8 mcode;
- constant_classref *cr;
- classinfo *c;
-
- /* get stuff from the stack */
-
- ra = (u1 *) *((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 - 5;
- *((ptrint *) (sp + 2 * 8)) = (ptrint) ra;
+/* patcher_checkcast_interface *************************************************
- /* get the fieldinfo */
-
- if (!(c = helper_resolve_classinfo(cr)))
- return false;
-
- /* patch back original code */
-
- *((u8 *) ra) = mcode;
-
- /* patch class flags */
-
- *((s4 *) (ra + 2)) = (s4) c->flags;
-
- return true;
-}
-
-
-/* patcher_checkcast_instanceof_interface **************************************
+ Machine code:
- XXX
+ <patched call position>
+ 45 8b 9a 1c 00 00 00 mov 0x1c(%r10),%r11d
+ 41 81 fb 00 00 00 00 cmp $0x0,%r11d
+ 0f 8f 08 00 00 00 jg 0x00002aaaaae511d5
+ 48 8b 0c 25 03 00 00 00 mov 0x3,%rcx
+ 4d 8b 9a 00 00 00 00 mov 0x0(%r10),%r11
*******************************************************************************/
-bool patcher_checkcast_instanceof_interface(u1 *sp)
+bool patcher_checkcast_interface(patchref_t *pr)
{
- u1 *ra;
- u8 mcode;
+ uint8_t *ra;
constant_classref *cr;
classinfo *c;
- /* get stuff from the stack */
-
- ra = (u1 *) *((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 - 5;
- *((ptrint *) (sp + 2 * 8)) = (ptrint) ra;
+ ra = (uint8_t *) pr->mpc;
+ cr = (constant_classref *) pr->ref;
/* get the fieldinfo */
- if (!(c = helper_resolve_classinfo(cr)))
+ if (!(c = resolve_classref_eager(cr)))
return false;
- /* patch back original code */
+ PATCH_BACK_ORIGINAL_MCODE;
- *((u8 *) ra) = mcode;
+ /* if we show disassembly, we have to skip the nop's */
+
+ if (opt_shownops)
+ ra = ra + PATCHER_CALL_SIZE;
/* patch super class index */
- *((s4 *) (ra + 7 + 3)) = (s4) c->index;
+ *((int32_t *) (ra + 7 + 3)) = c->index;
- *((s4 *) (ra + 7 + 7 + 3 + 6 + 3)) =
- (s4) (OFFSET(vftbl_t, interfacetable[0]) -
- c->index * sizeof(methodptr*));
+ *((int32_t *) (ra + 7 + 7 + 6 + 8 + 3)) =
+ (int32_t) (OFFSET(vftbl_t, interfacetable[0]) -
+ c->index * sizeof(methodptr*));
return true;
}
-/* patcher_checkcast_class *****************************************************
-
- XXX
-
-*******************************************************************************/
-
-bool patcher_checkcast_class(u1 *sp)
-{
- u1 *ra;
- u8 mcode;
- constant_classref *cr;
- classinfo *c;
-
- /* get stuff from the stack */
-
- ra = (u1 *) *((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 - 5;
- *((ptrint *) (sp + 2 * 8)) = (ptrint) ra;
-
- /* get the fieldinfo */
-
- if (!(c = helper_resolve_classinfo(cr)))
- return false;
-
- /* patch back original code */
-
- *((u8 *) ra) = mcode;
-
- /* patch super class' vftbl */
+/* patcher_instanceof_interface ************************************************
- *((ptrint *) (ra + 2)) = (ptrint) c->vftbl;
- *((ptrint *) (ra + 10 + 7 + 7 + 3 + 2)) = (ptrint) c->vftbl;
-
- return true;
-}
-
-
-/* patcher_instanceof_class ****************************************************
+ Machine code:
- XXX
+ <patched call position>
+ 45 8b 9a 1c 00 00 00 mov 0x1c(%r10),%r11d
+ 41 81 fb 00 00 00 00 cmp $0x0,%r11d
+ 0f 8e 94 04 00 00 jle 0x00002aaaaab018f8
+ 4d 8b 9a 00 00 00 00 mov 0x0(%r10),%r11
*******************************************************************************/
-bool patcher_instanceof_class(u1 *sp)
+bool patcher_instanceof_interface(patchref_t *pr)
{
- u1 *ra;
- u8 mcode;
+ uint8_t *ra;
constant_classref *cr;
classinfo *c;
- /* get stuff from the stack */
-
- ra = (u1 *) *((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 - 5;
- *((ptrint *) (sp + 2 * 8)) = (ptrint) ra;
+ ra = (uint8_t *) pr->mpc;
+ cr = (constant_classref *) pr->ref;
/* get the fieldinfo */
- if (!(c = helper_resolve_classinfo(cr)))
+ if (!(c = resolve_classref_eager(cr)))
return false;
- /* patch back original code */
-
- *((u8 *) ra) = mcode;
-
- /* patch super class' vftbl */
-
- *((ptrint *) (ra + 2)) = (ptrint) c->vftbl;
-
- return true;
-}
+ PATCH_BACK_ORIGINAL_MCODE;
+ /* if we show disassembly, we have to skip the nop's */
-/* patcher_clinit **************************************************************
+ if (opt_shownops)
+ ra = ra + PATCHER_CALL_SIZE;
- XXX
-
-*******************************************************************************/
-
-bool patcher_clinit(u1 *sp)
-{
- u1 *ra;
- u8 mcode;
- classinfo *c;
-
- /* get stuff from the stack */
-
- ra = (u1 *) *((ptrint *) (sp + 2 * 8));
- mcode = *((u8 *) (sp + 1 * 8));
- c = (classinfo *) *((ptrint *) (sp + 0 * 8));
-
- /* calculate and set the new return address */
-
- ra = ra - 5;
- *((ptrint *) (sp + 2 * 8)) = (ptrint) ra;
-
- /* check if the class is initialized */
-
- if (!c->initialized)
- if (!initialize_class(c))
- return false;
+ /* patch super class index */
- /* patch back original code */
+ *((int32_t *) (ra + 7 + 3)) = c->index;
- *((u8 *) ra) = mcode;
+ *((int32_t *) (ra + 7 + 7 + 6 + 3)) =
+ (int32_t) (OFFSET(vftbl_t, interfacetable[0]) -
+ c->index * sizeof(methodptr*));
return true;
}