-/* src/vm/jit/mips/patcher.c - MIPS code patching functions
+/* src/vm/jit/mips/patcher.c - SPARC code patching functions
Copyright (C) 1996-2005, 2006 R. Grafl, A. Krall, C. Kruegel,
C. Oates, R. Obermaisser, M. Platter, M. Probst, S. Ring,
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA.
- Contact: cacao@cacaojvm.org
-
- Authors: Christian Thalinger
-
- Changes:
-
- $Id: patcher.c 5164 2006-07-19 15:54:01Z twisti $
-
*/
#include "config.h"
#include <assert.h>
+#include <stdint.h>
#include "vm/types.h"
#include "mm/memory.h"
+
+#include "vm/jit/sparc64/md-abi.h"
+#include "vm/jit/sparc64/codegen.h"
+
#include "native/native.h"
#include "vm/builtin.h"
-#include "vm/class.h"
#include "vm/exceptions.h"
-#include "vm/field.h"
#include "vm/initialize.h"
-#include "vm/options.h"
-#include "vm/resolve.h"
-#include "vm/references.h"
+
#include "vm/jit/asmpart.h"
#include "vm/jit/patcher.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"
+#include "vm/jit/sparc64/solaris/macro_rename.h"
/* patcher_wrapper *************************************************************
*******************************************************************************/
-java_objectheader *patcher_wrapper(u1 *sp, u1 *pv, u1 *ra)
+java_object_t *patcher_wrapper(u1 *sp, u1 *pv, u1 *ra)
{
stackframeinfo sfi;
u1 *xpc;
- java_objectheader *o;
+ u1 *javasp;
+ java_object_t *o;
+#if SIZEOF_VOID_P == 8
+ u8 mcode;
+#else
+ u4 mcode[2];
+#endif
functionptr f;
bool result;
- java_objectheader *e;
-
+ java_handle_t *e;
+
/* define the patcher function */
bool (*patcher_function)(u1 *);
/* get stuff from the stack */
xpc = (u1 *) *((ptrint *) (sp + 5 * 8));
- o = (java_objectheader *) *((ptrint *) (sp + 4 * 8));
+ o = (java_object_t *) *((ptrint *) (sp + 4 * 8));
f = (functionptr) *((ptrint *) (sp + 0 * 8));
/* store PV into the patcher function position */
/* enter a monitor on the patching position */
PATCHER_MONITORENTER;
+
+ /* the (data) sp points directly to the patcher fields */
+ /* calculate the real sp of the current java function considering the WINSAVE regs */
+
+ javasp = sp - JITSTACK_CNT * 8 - BIAS;
/* create the stackframeinfo */
- stacktrace_create_extern_stackframeinfo(&sfi, pv, sp + 6 * 8, ra, xpc);
+ stacktrace_create_extern_stackframeinfo(&sfi, pv, javasp, ra, xpc);
/* call the proper patcher function */
return e;
}
+ /* patch back original (potentially patched) code */
+
+#if SIZEOF_VOID_P == 8
+ mcode = *((u8 *) (sp + 3 * 8));
+
+ *((u4 *) (xpc + 0 * 4)) = mcode >> 32;
+ *((u4 *) (xpc + 1 * 4)) = mcode;
+#else
+ mcode[0] = *((u4 *) (sp + 3 * 8));
+ mcode[1] = *((u4 *) (sp + 3 * 8 + 4));
+
+ *((u4 *) (xpc + 0 * 4)) = mcode[0];
+ *((u4 *) (xpc + 1 * 4)) = mcode[1];
+#endif
+
+
+ /* synchronize instruction cache */
+
+ md_icacheflush(xpc, PATCHER_CALL_SIZE);
+
PATCHER_MARK_PATCHED_MONITOREXIT;
return NULL;
Machine code:
<patched call position>
- dfc1ffb8 ld at,-72(s8)
- fc250000 sd a1,0(at)
+ xxx ldx at,-72(pv)
+ xxx ld a1,0(at)
*******************************************************************************/
bool patcher_get_putstatic(u1 *sp)
{
- u1 *ra;
-#if SIZEOF_VOID_P == 8
- u8 mcode;
-#else
- u4 mcode[2];
-#endif
unresolved_field *uf;
s4 disp;
u1 *pv;
/* get stuff from the stack */
- ra = (u1 *) *((ptrint *) (sp + 5 * 8));
-#if SIZEOF_VOID_P == 8
- mcode = *((u8 *) (sp + 3 * 8));
-#else
- mcode[0] = *((u4 *) (sp + 3 * 8));
- mcode[1] = *((u4 *) (sp + 3 * 8 + 4));
-#endif
uf = (unresolved_field *) *((ptrint *) (sp + 2 * 8));
disp = *((s4 *) (sp + 1 * 8));
pv = (u1 *) *((ptrint *) (sp + 0 * 8));
if (!initialize_class(fi->class))
return false;
- /* patch back original code */
-
-#if SIZEOF_VOID_P == 8
- *((u4 *) (ra + 0 * 4)) = mcode;
- *((u4 *) (ra + 1 * 4)) = mcode >> 32;
-#else
- *((u4 *) (ra + 0 * 4)) = mcode[0];
- *((u4 *) (ra + 1 * 4)) = mcode[1];
-#endif
-
- /* synchronize instruction cache */
-
- md_icacheflush(ra, 2 * 4);
-
/* patch the field value's address */
- *((ptrint *) (pv + disp)) = (ptrint) &(fi->value);
+ *((intptr_t *) (pv + disp)) = (intptr_t) fi->value;
/* synchronize data cache */
- /*md_dcacheflush(pv + disp, SIZEOF_VOID_P);*/
+ md_dcacheflush(pv + disp, SIZEOF_VOID_P);
return true;
}
bool patcher_get_putfield(u1 *sp)
{
u1 *ra;
-#if SIZEOF_VOID_P == 8
- u8 mcode;
-#else
- u4 mcode[2];
-#endif
unresolved_field *uf;
fieldinfo *fi;
+
ra = (u1 *) *((ptrint *) (sp + 5 * 8));
-#if SIZEOF_VOID_P == 8
- mcode = *((u8 *) (sp + 3 * 8));
-#else
- mcode[0] = *((u4 *) (sp + 3 * 8));
- mcode[1] = *((u4 *) (sp + 3 * 8 + 4));
-#endif
uf = (unresolved_field *) *((ptrint *) (sp + 2 * 8));
/* get the fieldinfo */
if (!(fi = resolve_field_eager(uf)))
return false;
- /* patch back original code */
-
-#if SIZEOF_VOID_P == 8
- *((u4 *) (ra + 0 * 4)) = mcode;
- *((u4 *) (ra + 1 * 4)) = mcode >> 32;
-#else
- *((u4 *) (ra + 0 * 4)) = mcode[0];
- *((u4 *) (ra + 1 * 4)) = mcode[1];
-#endif
-
/* if we show disassembly, we have to skip the nop's */
- if (opt_showdisassemble)
- ra = ra + 2 * 4;
-
- /* patch the field's offset */
-
-#if SIZEOF_VOID_P == 4
- if (fi->type == TYPE_LNG) {
-# 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) |= (s2) (fi->offset & 0x0000ffff);
+ if (opt_shownops) {
+ /* patch the field's offset into the instruction */
- /* synchronize instruction cache */
+ *((u4 *) (ra + 2 * 4)) |= (s2) (fi->offset & 0x00001fff);
- if (opt_showdisassemble) {
-#if SIZEOF_VOID_P == 4
- if (fi->type == TYPE_LNG)
- md_icacheflush(ra - 2 * 4, 4 * 4);
- else
-#endif
- md_icacheflush(ra - 2 * 4, 3 * 4);
+ /* synchronize instruction cache */
+
+ md_icacheflush(ra + 2 * 4, 1 * 4);
}
else {
- md_icacheflush(ra, 2 * 4);
+ /* otherwise store the patched instruction on the stack */
+
+ *((u4 *) (sp + 3 * 8)) |= (s2) (fi->offset & 0x00001fff);
}
return true;
Machine code:
<patched call postition>
- dfc4ff98 ld a0,-104(s8)
+ xxx ld a0,-104(pv)
*******************************************************************************/
bool patcher_aconst(u1 *sp)
{
- u1 *ra;
-#if SIZEOF_VOID_P == 8
- u8 mcode;
-#else
- u4 mcode[2];
-#endif
constant_classref *cr;
s4 disp;
u1 *pv;
/* get stuff from the stack */
- ra = (u1 *) *((ptrint *) (sp + 5 * 8));
-#if SIZEOF_VOID_P == 8
- mcode = *((u8 *) (sp + 3 * 8));
-#else
- mcode[0] = *((u4 *) (sp + 3 * 8));
- mcode[1] = *((u4 *) (sp + 3 * 8 + 4));
-#endif
cr = (constant_classref *) *((ptrint *) (sp + 2 * 8));
disp = *((s4 *) (sp + 1 * 8));
pv = (u1 *) *((ptrint *) (sp + 0 * 8));
if (!(c = resolve_classref_eager(cr)))
return false;
- /* patch back original code */
-
-#if SIZEOF_VOID_P == 8
- *((u4 *) (ra + 0 * 4)) = mcode;
- *((u4 *) (ra + 1 * 4)) = mcode >> 32;
-#else
- *((u4 *) (ra + 0 * 4)) = mcode[0];
- *((u4 *) (ra + 1 * 4)) = mcode[1];
-#endif
-
- /* synchronize instruction cache */
-
- md_icacheflush(ra, 2 * 4);
-
/* patch the classinfo pointer */
*((ptrint *) (pv + disp)) = (ptrint) c;
/* synchronize data cache */
- /*md_dcacheflush(pv + disp, SIZEOF_VOID_P);*/
+ md_dcacheflush(pv + disp, SIZEOF_VOID_P);
return true;
}
bool patcher_builtin_multianewarray(u1 *sp)
{
- u1 *ra;
-#if SIZEOF_VOID_P == 8
- u8 mcode;
-#else
- u4 mcode[2];
-#endif
constant_classref *cr;
s4 disp;
u1 *pv;
/* get stuff from the stack */
- ra = (u1 *) *((ptrint *) (sp + 5 * 8));
-#if SIZEOF_VOID_P == 8
- mcode = *((u8 *) (sp + 3 * 8));
-#else
- mcode[0] = *((u4 *) (sp + 3 * 8));
- mcode[1] = *((u4 *) (sp + 3 * 8 + 4));
-#endif
cr = (constant_classref *) *((ptrint *) (sp + 2 * 8));
disp = *((s4 *) (sp + 1 * 8));
pv = (u1 *) *((ptrint *) (sp + 0 * 8));
if (!(c = resolve_classref_eager(cr)))
return false;
- /* patch back original code */
-
-#if SIZEOF_VOID_P == 8
- *((u4 *) (ra + 0 * 4)) = mcode;
- *((u4 *) (ra + 1 * 4)) = mcode >> 32;
-#else
- *((u4 *) (ra + 0 * 4)) = mcode[0];
- *((u4 *) (ra + 1 * 4)) = mcode[1];
-#endif
-
- /* synchronize instruction cache */
-
- md_icacheflush(ra, 2 * 4);
-
/* patch the classinfo pointer */
*((ptrint *) (pv + disp)) = (ptrint) c;
/* synchronize data cache */
- /* md_dcacheflush(pv + disp, SIZEOF_VOID_P);*/
+ md_dcacheflush(pv + disp, SIZEOF_VOID_P);
return true;
}
bool patcher_builtin_arraycheckcast(u1 *sp)
{
- u1 *ra;
-#if SIZEOF_VOID_P == 8
- u8 mcode;
-#else
- u4 mcode[2];
-#endif
constant_classref *cr;
s4 disp;
u1 *pv;
/* get stuff from the stack */
- ra = (u1 *) *((ptrint *) (sp + 5 * 8));
-#if SIZEOF_VOID_P == 8
- mcode = *((u8 *) (sp + 3 * 8));
-#else
- mcode[0] = *((u4 *) (sp + 3 * 8));
- mcode[1] = *((u4 *) (sp + 3 * 8 + 4));
-#endif
cr = (constant_classref *) *((ptrint *) (sp + 2 * 8));
disp = *((s4 *) (sp + 1 * 8));
pv = (u1 *) *((ptrint *) (sp + 0 * 8));
if (!(c = resolve_classref_eager(cr)))
return false;
- /* patch back original code */
-
-#if SIZEOF_VOID_P == 8
- *((u4 *) (ra + 0 * 4)) = mcode;
- *((u4 *) (ra + 1 * 4)) = mcode >> 32;
-#else
- *((u4 *) (ra + 0 * 4)) = mcode[0];
- *((u4 *) (ra + 1 * 4)) = mcode[1];
-#endif
-
- /* synchronize instruction cache */
-
- md_icacheflush(ra, 2 * 4);
-
/* patch the classinfo pointer */
*((ptrint *) (pv + disp)) = (ptrint) c;
/* synchronize data cache */
- /*md_dcacheflush(pv + disp, SIZEOF_VOID_P); */
+ md_dcacheflush(pv + disp, SIZEOF_VOID_P);
return true;
}
bool patcher_invokestatic_special(u1 *sp)
{
- u1 *ra;
-#if SIZEOF_VOID_P == 8
- u8 mcode;
-#else
- u4 mcode[2];
-#endif
unresolved_method *um;
s4 disp;
u1 *pv;
/* get stuff from the stack */
- ra = (u1 *) *((ptrint *) (sp + 5 * 8));
-#if SIZEOF_VOID_P == 8
- mcode = *((u8 *) (sp + 3 * 8));
-#else
- mcode[0] = *((u4 *) (sp + 3 * 8));
- mcode[1] = *((u4 *) (sp + 3 * 8 + 4));
-#endif
um = (unresolved_method *) *((ptrint *) (sp + 2 * 8));
disp = *((s4 *) (sp + 1 * 8));
pv = (u1 *) *((ptrint *) (sp + 0 * 8));
if (!(m = resolve_method_eager(um)))
return false;
- /* patch back original code */
-
-#if SIZEOF_VOID_P == 8
- *((u4 *) (ra + 0 * 4)) = mcode;
- *((u4 *) (ra + 1 * 4)) = mcode >> 32;
-#else
- *((u4 *) (ra + 0 * 4)) = mcode[0];
- *((u4 *) (ra + 1 * 4)) = mcode[1];
-#endif
-
- /* synchronize instruction cache */
-
- md_icacheflush(ra, 2 * 4);
-
/* patch stubroutine */
*((ptrint *) (pv + disp)) = (ptrint) m->stubroutine;
/* synchronize data cache */
- /* md_dcacheflush(pv + disp, SIZEOF_VOID_P);*/
+ md_dcacheflush(pv + disp, SIZEOF_VOID_P);
return true;
}
Machine code:
<patched call position>
- dc990000 ld t9,0(a0)
- df3e0040 ld s8,64(t9)
- 03c0f809 jalr s8
- 00000000 nop
+ xxx ldx g2,0(o0)
+ xxx ldx o5,64(g2)
+ xxx jmpl o5
+ xxx nop
*******************************************************************************/
bool patcher_invokevirtual(u1 *sp)
{
u1 *ra;
-#if SIZEOF_VOID_P == 8
- u8 mcode;
-#else
- u4 mcode[2];
-#endif
unresolved_method *um;
methodinfo *m;
/* get stuff from the stack */
ra = (u1 *) *((ptrint *) (sp + 5 * 8));
-#if SIZEOF_VOID_P == 8
- mcode = *((u8 *) (sp + 3 * 8));
-#else
- mcode[0] = *((u4 *) (sp + 3 * 8));
- mcode[1] = *((u4 *) (sp + 3 * 8 + 4));
-#endif
um = (unresolved_method *) *((ptrint *) (sp + 2 * 8));
/* get the fieldinfo */
if (!(m = resolve_method_eager(um)))
return false;
- /* patch back original code */
-
-#if SIZEOF_VOID_P == 8
- *((u4 *) (ra + 0 * 4)) = mcode;
- *((u4 *) (ra + 1 * 4)) = mcode >> 32;
-#else
- *((u4 *) (ra + 0 * 4)) = mcode[0];
- *((u4 *) (ra + 1 * 4)) = mcode[1];
-#endif
-
/* if we show disassembly, we have to skip the nop's */
- if (opt_showdisassemble)
- ra = ra + 2 * 4;
+ if (opt_shownops) {
+ ra = ra + PATCHER_CALL_SIZE;
- /* patch vftbl index */
+ /* 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) & 0x00001fff);
- /* synchronize instruction cache */
+ /* synchronize instruction cache */
- if (opt_showdisassemble)
- md_icacheflush(ra - 2 * 4, 4 * 4);
- else
- md_icacheflush(ra, 2 * 4);
+ md_icacheflush(ra + 1 * 4, 1 * 4);
+ }
+ else {
+ /* patch vftbl index */
+
+ *((s4 *) (sp + 3 * 8 + 4)) |=
+ (s4) ((OFFSET(vftbl_t, table[0]) +
+ sizeof(methodptr) * m->vftblindex) & 0x00001fff);
+ }
return true;
}
bool patcher_invokeinterface(u1 *sp)
{
u1 *ra;
-#if SIZEOF_VOID_P == 8
- u8 mcode;
-#else
- u4 mcode[2];
-#endif
unresolved_method *um;
methodinfo *m;
/* get stuff from the stack */
ra = (u1 *) *((ptrint *) (sp + 5 * 8));
-#if SIZEOF_VOID_P == 8
- mcode = *((u8 *) (sp + 3 * 8));
-#else
- mcode[0] = *((u4 *) (sp + 3 * 8));
- mcode[1] = *((u4 *) (sp + 3 * 8 + 4));
-#endif
um = (unresolved_method *) *((ptrint *) (sp + 2 * 8));
/* get the fieldinfo */
if (!(m = resolve_method_eager(um)))
return false;
- /* patch back original code */
+ /* if we show disassembly, we have to skip the nop's */
-#if SIZEOF_VOID_P == 8
- *((u4 *) (ra + 0 * 4)) = mcode;
- *((u4 *) (ra + 1 * 4)) = mcode >> 32;
-#else
- *((u4 *) (ra + 0 * 4)) = mcode[0];
- *((u4 *) (ra + 1 * 4)) = mcode[1];
-#endif
+ if (opt_shownops) {
+ ra = ra + PATCHER_CALL_SIZE;
- /* if we show disassembly, we have to skip the nop's */
+ /* patch interfacetable index */
- if (opt_showdisassemble)
- ra = ra + 2 * 4;
+ *((s4 *) (ra + 1 * 4)) |=
+ (s4) ((OFFSET(vftbl_t, interfacetable[0]) -
+ sizeof(methodptr*) * m->class->index) & 0x00001fff);
- /* patch interfacetable index */
+ /* patch method offset */
- *((s4 *) (ra + 1 * 4)) |= (s4) ((OFFSET(vftbl_t, interfacetable[0]) -
- sizeof(methodptr*) * m->class->index) & 0x0000ffff);
+ *((s4 *) (ra + 2 * 4)) |=
+ (s4) ((sizeof(methodptr) * (m - m->class->methods)) & 0x00001fff);
- /* patch method offset */
+ /* synchronize instruction cache */
- *((s4 *) (ra + 2 * 4)) |=
- (s4) ((sizeof(methodptr) * (m - m->class->methods)) & 0x0000ffff);
+ md_icacheflush(ra + 1 * 4, 2 * 4);
+ }
+else {
+ /* patch interfacetable index */
- /* synchronize instruction cache */
+ *((s4 *) (sp + 3 * 8 + 4)) |=
+ (s4) ((OFFSET(vftbl_t, interfacetable[0]) -
+ sizeof(methodptr*) * m->class->index) & 0x00001fff);
- if (opt_showdisassemble)
- md_icacheflush(ra - 2 * 4, 5 * 4);
- else
- md_icacheflush(ra, 3 * 4);
+ /* patch method offset */
+
+ *((s4 *) (ra + 2 * 4)) |=
+ (s4) ((sizeof(methodptr) * (m - m->class->methods)) & 0x00001fff);
+
+ /* synchronize instruction cache */
+
+ md_icacheflush(ra + 2 * 4, 1 * 4);
+ }
return true;
}
bool patcher_checkcast_instanceof_flags(u1 *sp)
{
- u1 *ra;
-#if SIZEOF_VOID_P == 8
- u8 mcode;
-#else
- u4 mcode[2];
-#endif
constant_classref *cr;
s4 disp;
u1 *pv;
/* get stuff from the stack */
- ra = (u1 *) *((ptrint *) (sp + 5 * 8));
-#if SIZEOF_VOID_P == 8
- mcode = *((u8 *) (sp + 3 * 8));
-#else
- mcode[0] = *((u4 *) (sp + 3 * 8));
- mcode[1] = *((u4 *) (sp + 3 * 8 + 4));
-#endif
cr = (constant_classref *) *((ptrint *) (sp + 2 * 8));
disp = *((s4 *) (sp + 1 * 8));
pv = (u1 *) *((ptrint *) (sp + 0 * 8));
if (!(c = resolve_classref_eager(cr)))
return false;
- /* patch back original code */
-
-#if SIZEOF_VOID_P == 8
- *((u4 *) (ra + 0 * 4)) = mcode;
- *((u4 *) (ra + 1 * 4)) = mcode >> 32;
-#else
- *((u4 *) (ra + 0 * 4)) = mcode[0];
- *((u4 *) (ra + 1 * 4)) = mcode[1];
-#endif
-
- /* synchronize instruction cache */
-
- md_icacheflush(ra, 2 * 4);
-
/* patch class flags */
*((s4 *) (pv + disp)) = (s4) c->flags;
/* synchronize data cache */
- /*md_dcacheflush(pv + disp, sizeof(s4)); */
+ md_dcacheflush(pv + disp, sizeof(s4));
return true;
}
-/* patcher_checkcast_instanceof_interface **************************************
+/* patcher_checkcast_interface **************************************
Machine code:
*******************************************************************************/
-bool patcher_checkcast_instanceof_interface(u1 *sp)
+bool patcher_checkcast_interface(u1 *sp)
{
u1 *ra;
-#if SIZEOF_VOID_P == 8
- u8 mcode;
-#else
- u4 mcode[2];
-#endif
constant_classref *cr;
classinfo *c;
/* get stuff from the stack */
ra = (u1 *) *((ptrint *) (sp + 5 * 8));
-#if SIZEOF_VOID_P == 8
- mcode = *((u8 *) (sp + 3 * 8));
-#else
- mcode[0] = *((u4 *) (sp + 3 * 8));
- mcode[1] = *((u4 *) (sp + 3 * 8 + 4));
-#endif
cr = (constant_classref *) *((ptrint *) (sp + 2 * 8));
/* get the fieldinfo */
if (!(c = resolve_classref_eager(cr)))
return false;
- /* patch back original code */
+ /* if we show disassembly, we have to skip the nop's */
-#if SIZEOF_VOID_P == 8
- *((u4 *) (ra + 0 * 4)) = mcode;
- *((u4 *) (ra + 1 * 4)) = mcode >> 32;
-#else
- *((u4 *) (ra + 0 * 4)) = mcode[0];
- *((u4 *) (ra + 1 * 4)) = mcode[1];
-#endif
+ if (opt_shownops)
+ ra = ra + PATCHER_CALL_SIZE;
+
+ /* patch super class index */
+
+ *((s4 *) (ra + 2 * 4)) |= (s4) (-(c->index) & 0x00001fff);
+
+ *((s4 *) (ra + (3 + EXCEPTION_CHECK_INSTRUCTIONS) * 4)) |=
+ (s4) ((OFFSET(vftbl_t, interfacetable[0])
+ - c->index * sizeof(methodptr*)) & 0x00001fff);
+
+ /* synchronize instruction cache */
+
+ if (opt_shownops)
+ md_icacheflush(ra - 2 * 4, (6 + EXCEPTION_CHECK_INSTRUCTIONS) * 4);
+ else
+ md_icacheflush(ra, (4 + EXCEPTION_CHECK_INSTRUCTIONS) * 4);
+
+ return true;
+}
+
+/* patcher_instanceof_interface ************************************************
+
+ Machine code:
+
+ <patched call position>
+ dd030000 ld v1,0(a4)
+ 8c79001c lw t9,28(v1)
+ 27390000 addiu t9,t9,0
+ 1b200082 blez t9,zero,0x000000001051843c
+ 00000000 nop
+ dc790000 ld t9,0(v1)
+
+*******************************************************************************/
+
+bool patcher_instanceof_interface(u1 *sp)
+{
+ u1 *ra;
+ constant_classref *cr;
+ classinfo *c;
+
+ /* get stuff from the stack */
+
+ ra = (u1 *) *((ptrint *) (sp + 5 * 8));
+ cr = (constant_classref *) *((ptrint *) (sp + 2 * 8));
+
+ /* get the fieldinfo */
+
+ if (!(c = resolve_classref_eager(cr)))
+ return false;
/* if we show disassembly, we have to skip the nop's */
- if (opt_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 + 2 * 4)) |= (s4) ((c->index) & 0x00001fff);
+ *((s4 *) (ra + 5 * 4)) |=
+ (s4) ((OFFSET(vftbl_t, interfacetable[0]) -
+ c->index * sizeof(methodptr*)) & 0x00001fff);
/* synchronize instruction cache */
- if (opt_showdisassemble)
- md_icacheflush(ra - 2 * 4, 8 * 4);
+ if (opt_shownops)
+ md_icacheflush(ra - PATCHER_CALL_SIZE * 4, 8 * 4);
else
md_icacheflush(ra, 6 * 4);
bool patcher_checkcast_instanceof_class(u1 *sp)
{
- u1 *ra;
-#if SIZEOF_VOID_P == 8
- u8 mcode;
-#else
- u4 mcode[2];
-#endif
constant_classref *cr;
s4 disp;
u1 *pv;
/* get stuff from the stack */
- ra = (u1 *) *((ptrint *) (sp + 5 * 8));
-#if SIZEOF_VOID_P == 8
- mcode = *((u8 *) (sp + 3 * 8));
-#else
- mcode[0] = *((u4 *) (sp + 3 * 8));
- mcode[1] = *((u4 *) (sp + 3 * 8 + 4));
-#endif
cr = (constant_classref *) *((ptrint *) (sp + 2 * 8));
disp = *((s4 *) (sp + 1 * 8));
pv = (u1 *) *((ptrint *) (sp + 0 * 8));
if (!(c = resolve_classref_eager(cr)))
return false;
- /* patch back original code */
-
-#if SIZEOF_VOID_P == 8
- *((u4 *) (ra + 0 * 4)) = mcode;
- *((u4 *) (ra + 1 * 4)) = mcode >> 32;
-#else
- *((u4 *) (ra + 0 * 4)) = mcode[0];
- *((u4 *) (ra + 1 * 4)) = mcode[1];
-#endif
-
- /* synchronize instruction cache */
-
- md_icacheflush(ra, 2 * 4);
-
/* patch super class' vftbl */
*((ptrint *) (pv + disp)) = (ptrint) c->vftbl;
/* synchronize data cache */
- /*md_dcacheflush(pv + disp, SIZEOF_VOID_P);*/
+ md_dcacheflush(pv + disp, SIZEOF_VOID_P);
return true;
}
bool patcher_clinit(u1 *sp)
{
- u1 *ra;
-#if SIZEOF_VOID_P == 8
- u8 mcode;
-#else
- u4 mcode[2];
-#endif
classinfo *c;
/* get stuff from the stack */
- ra = (u1 *) *((ptrint *) (sp + 5 * 8));
-#if SIZEOF_VOID_P == 8
- mcode = *((u8 *) (sp + 3 * 8));
-#else
- mcode[0] = *((u4 *) (sp + 3 * 8));
- mcode[1] = *((u4 *) (sp + 3 * 8 + 4));
-#endif
c = (classinfo *) *((ptrint *) (sp + 2 * 8));
/* check if the class is initialized */
if (!initialize_class(c))
return false;
- /* patch back original code */
-
-#if SIZEOF_VOID_P == 8
- *((u4 *) (ra + 0 * 4)) = mcode;
- *((u4 *) (ra + 1 * 4)) = mcode >> 32;
-#else
- *((u4 *) (ra + 0 * 4)) = mcode[0];
- *((u4 *) (ra + 1 * 4)) = mcode[1];
-#endif
-
- /* synchronize instruction cache */
-
- md_icacheflush(ra, 2 * 4);
-
return true;
}
#ifdef ENABLE_VERIFIER
bool patcher_athrow_areturn(u1 *sp)
{
- u1 *ra;
-#if SIZEOF_VOID_P == 8
- u8 mcode;
-#else
- u4 mcode[2];
-#endif
unresolved_class *uc;
- classinfo *c;
/* get stuff from the stack */
- ra = (u1 *) *((ptrint *) (sp + 5 * 8));
-#if SIZEOF_VOID_P == 8
- mcode = *((u8 *) (sp + 3 * 8));
-#else
- mcode[0] = *((u4 *) (sp + 3 * 8));
- mcode[1] = *((u4 *) (sp + 3 * 8 + 4));
-#endif
uc = (unresolved_class *) *((ptrint *) (sp + 2 * 8));
- /* resolve the class */
+ /* resolve the class and check subtype constraints */
- if (!resolve_class(uc, resolveEager, false, &c))
+ if (!resolve_class_eager_no_access_check(uc))
return false;
- /* patch back original code */
-
-#if SIZEOF_VOID_P == 8
- *((u4 *) (ra + 0 * 4)) = mcode;
- *((u4 *) (ra + 1 * 4)) = mcode >> 32;
-#else
- *((u4 *) (ra + 0 * 4)) = mcode[0];
- *((u4 *) (ra + 1 * 4)) = mcode[1];
-#endif
-
- /* synchronize instruction cache */
-
- md_icacheflush(ra, 2 * 4);
-
return true;
}
#endif /* ENABLE_VERIFIER */
#if !defined(WITH_STATIC_CLASSPATH)
bool patcher_resolve_native(u1 *sp)
{
- u1 *ra;
-#if SIZEOF_VOID_P == 8
- u8 mcode;
-#else
- u4 mcode[2];
-#endif
methodinfo *m;
s4 disp;
u1 *pv;
/* get stuff from the stack */
- ra = (u1 *) *((ptrint *) (sp + 5 * 8));
-#if SIZEOF_VOID_P == 8
- mcode = *((u8 *) (sp + 3 * 8));
-#else
- mcode[0] = *((u4 *) (sp + 3 * 8));
- mcode[1] = *((u4 *) (sp + 3 * 8 + 4));
-#endif
m = (methodinfo *) *((ptrint *) (sp + 2 * 8));
disp = *((s4 *) (sp + 1 * 8));
pv = (u1 *) *((ptrint *) (sp + 0 * 8));
- /* calculate and set the new return address */
-
- ra = ra - 2 * 4;
- *((ptrint *) (sp + 5 * 8)) = (ptrint) ra;
+ /* return address on SPARC is address of jump, therefore correct */
/* resolve native function */
if (!(f = native_resolve_function(m)))
return false;
- /* patch back original code */
-
-#if SIZEOF_VOID_P == 8
- *((u4 *) (ra + 0 * 4)) = mcode;
- *((u4 *) (ra + 1 * 4)) = mcode >> 32;
-#else
- *((u4 *) (ra + 0 * 4)) = mcode[0];
- *((u4 *) (ra + 1 * 4)) = mcode[1];
-#endif
-
- /* synchronize instruction cache */
-
- md_icacheflush(ra, 2 * 4);
-
/* patch native function pointer */
*((ptrint *) (pv + disp)) = (ptrint) f;
/* synchronize data cache */
- /*md_dcacheflush(pv + disp, SIZEOF_VOID_P);*/
+ md_dcacheflush(pv + disp, SIZEOF_VOID_P);
return true;
}
projects / cacao.git / blobdiff