/* 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,
- E. Steiner, C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich,
- J. Wenninger, Institut f. Computersprachen - TU Wien
+ Copyright (C) 1996-2005, 2006, 2008
+ CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO
This file is part of CACAO.
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA.
- Contact: cacao@cacaojvm.org
-
- Authors: Christian Thalinger
- Alexander Jordan
- $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/codegen.h"
+#include "vm/jit/sparc64/md.h"
+#include "vm/jit/sparc64/md-abi.h"
-#include "mm/memory.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/methodheader.h"
+#include "vm/jit/stacktrace.h"
-#include "vm/jit/sparc64/md-abi.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;
+ stackframeinfo_t sfi;
u1 *xpc;
u1 *javasp;
- java_objectheader *o;
+ java_object_t *o;
#if SIZEOF_VOID_P == 8
u8 mcode;
#else
#endif
functionptr f;
bool result;
- java_objectheader *e;
+ java_handle_t *e;
/* define the patcher function */
/* 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 */
/* create the stackframeinfo */
- stacktrace_create_extern_stackframeinfo(&sfi, pv, javasp, ra, xpc);
+ printf("patcher opening sfi for xpc=%p\n", xpc);
+
+ stacktrace_stackframeinfo_add(&sfi, pv, javasp, ra, xpc);
/* call the proper patcher function */
/* remove the stackframeinfo */
- stacktrace_remove_stackframeinfo(&sfi);
+ stacktrace_stackframeinfo_remove(&sfi);
+ printf("patcher closing sfi for xpc=%p\n", xpc);
/* check for return value and exit accordingly */
/* check if the field's class is initialized */
- if (!(fi->class->state & CLASS_INITIALIZED))
- if (!initialize_class(fi->class))
+ if (!(fi->clazz->state & CLASS_INITIALIZED))
+ if (!initialize_class(fi->clazz))
return false;
/* patch the field value's address */
- *((ptrint *) (pv + disp)) = (ptrint) &(fi->value);
+ *((intptr_t *) (pv + disp)) = (intptr_t) fi->value;
/* synchronize data cache */
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;
- assert(0);
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_shownops) {
- ra = ra + PATCHER_CALL_SIZE;
+ /* patch the field's offset into the instruction */
-#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);
+ *((u4 *) (ra + 2 * 4)) |= (s2) (fi->offset & 0x00001fff);
- /* synchronize instruction cache */
+ /* synchronize instruction cache */
- 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);
+ 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;
}
*((s4 *) (ra + 1 * 4)) |=
(s4) ((OFFSET(vftbl_t, interfacetable[0]) -
- sizeof(methodptr*) * m->class->index) & 0x00001fff);
+ sizeof(methodptr*) * m->clazz->index) & 0x00001fff);
/* patch method offset */
*((s4 *) (ra + 2 * 4)) |=
- (s4) ((sizeof(methodptr) * (m - m->class->methods)) & 0x00001fff);
+ (s4) ((sizeof(methodptr) * (m - m->clazz->methods)) & 0x00001fff);
/* synchronize instruction cache */
md_icacheflush(ra + 1 * 4, 2 * 4);
}
-else {
+ else {
/* patch interfacetable index */
*((s4 *) (sp + 3 * 8 + 4)) |=
(s4) ((OFFSET(vftbl_t, interfacetable[0]) -
- sizeof(methodptr*) * m->class->index) & 0x00001fff);
+ sizeof(methodptr*) * m->clazz->index) & 0x00001fff);
/* patch method offset */
*((s4 *) (ra + 2 * 4)) |=
- (s4) ((sizeof(methodptr) * (m - m->class->methods)) & 0x00001fff);
+ (s4) ((sizeof(methodptr) * (m - m->clazz->methods)) & 0x00001fff);
/* synchronize instruction cache */
/* if we show disassembly, we have to skip the nop's */
- if (opt_shownops)
- ra = ra + PATCHER_CALL_SIZE;
-
-
- /* if we show disassembly, we have to skip the nop's */
-
if (opt_shownops)
ra = ra + PATCHER_CALL_SIZE;
*((s4 *) (ra + 2 * 4)) |= (s4) (-(c->index) & 0x00001fff);
- *((s4 *) (ra + 5 * 4)) |= (s4) ((OFFSET(vftbl_t, interfacetable[0]) -
- c->index * sizeof(methodptr*)) & 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, 8 * 4);
+ md_icacheflush(ra - 2 * 4, (6 + EXCEPTION_CHECK_INSTRUCTIONS) * 4);
else
- md_icacheflush(ra, 6 * 4);
+ md_icacheflush(ra, (4 + EXCEPTION_CHECK_INSTRUCTIONS) * 4);
return true;
}
constant_classref *cr;
classinfo *c;
- assert(0); /* test this one !!! */
-
/* get stuff from the stack */
ra = (u1 *) *((ptrint *) (sp + 5 * 8));
bool patcher_athrow_areturn(u1 *sp)
{
unresolved_class *uc;
- classinfo *c;
/* get stuff from the stack */
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;
return true;
*******************************************************************************/
-#if !defined(WITH_STATIC_CLASSPATH)
bool patcher_resolve_native(u1 *sp)
{
methodinfo *m;
return true;
}
-#endif /* !defined(WITH_STATIC_CLASSPATH) */
/*
projects / cacao.git / blobdiff