/* 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 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
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:
+#include "config.h"
- $Id: patcher.c 2402 2005-04-27 13:17:07Z jowenn $
+#include <stdint.h>
-*/
+#include "vm/types.h"
+
+#include "vm/jit/x86_64/codegen.h"
+#include "mm/memory.h"
+
+#include "native/native.h"
-#include "vm/jit/x86_64/types.h"
#include "vm/builtin.h"
-#include "vm/field.h"
-#include "vm/initialize.h"
-#include "vm/options.h"
-#include "vm/references.h"
-#include "vm/jit/helper.h"
#include "vm/exceptions.h"
+#include "vm/initialize.h"
+#include "vm/jit/patcher.h"
+#include "vm/jit/stacktrace.h"
-/* patcher_get_putstatic *******************************************************
+#include "vmcore/class.h"
+#include "vmcore/field.h"
+#include "vmcore/options.h"
+#include "vmcore/references.h"
+#include "vm/resolve.h"
+
+
+/* patcher_wrapper *************************************************************
+
+ Wrapper for all patchers. It also creates the stackframe info
+ structure.
+
+ If the return value of the patcher function is false, it gets the
+ exception object, clears the exception pointer and returns the
+ exception.
+
+*******************************************************************************/
+
+java_object_t *patcher_wrapper(u1 *sp, u1 *pv, u1 *ra)
+{
+ stackframeinfo sfi;
+ u1 *xpc;
+ java_object_t *o;
+ functionptr f;
+ bool result;
+ 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_object_t *) *((ptrint *) (sp + 4 * 8));
+ f = (functionptr) *((ptrint *) (sp + 0 * 8));
+
+ /* calculate and set the new return address */
+
+ xpc = xpc - PATCHER_CALL_SIZE;
+
+ *((ptrint *) (sp + 5 * 8)) = (ptrint) xpc;
+
+ /* cast the passed function to a patcher function */
+
+ patcher_function = (bool (*)(u1 *)) (ptrint) f;
+
+ /* enter a monitor on the patching position */
+
+ PATCHER_MONITORENTER;
+
+ /* create the stackframeinfo */
+
+ /* RA is passed as NULL, but the XPC is correct and can be used in
+ stacktrace_create_extern_stackframeinfo for
+ md_codegen_get_pv_from_pc. */
+
+ stacktrace_create_extern_stackframeinfo(&sfi, pv, sp + 6 * 8, xpc, xpc);
+
+ /* call the proper patcher function */
+
+ result = (patcher_function)(sp);
+
+ /* remove the stackframeinfo */
+
+ stacktrace_remove_stackframeinfo(&sfi);
+
+ /* check for return value and exit accordingly */
+
+ if (result == false) {
+ e = exceptions_get_and_clear_exception();
+
+ PATCHER_MONITOREXIT;
+
+ return e;
+ }
+
+ PATCHER_MARK_PATCHED_MONITOREXIT;
+
+ return NULL;
+}
- 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
*******************************************************************************/
u1 *ra;
u8 mcode;
unresolved_field *uf;
+ s4 disp;
fieldinfo *fi;
- ptrint *dataaddress;
- s4 ripoffset;
- void *beginJavaStack;
- /* get stuff from the stack */
- ra = (u1 *) *((ptrint *) (sp + 2 * 8));
- mcode = *((u8 *) (sp + 1 * 8));
- uf = (unresolved_field *) *((ptrint *) (sp + 0 * 8));
- beginJavaStack= (void*)(sp+2*8);
- /* calculate and set the new return address */
+ /* get stuff from the stack */
- ra = ra - 5;
- *((ptrint *) (sp + 2 * 8)) = (ptrint) ra;
+ ra = (u1 *) *((ptrint *) (sp + 5 * 8));
+ mcode = *((u8 *) (sp + 3 * 8));
+ uf = (unresolved_field *) *((ptrint *) (sp + 2 * 8));
+ disp = *((s4 *) (sp + 1 * 8));
- *dontfillinexceptionstacktrace=true;
/* get the fieldinfo */
- if (!(fi = helper_resolve_fieldinfo(uf)))
- {
- *dontfillinexceptionstacktrace=false;
+
+ if (!(fi = resolve_field_eager(uf)))
return false;
- }
/* check if the field's class is initialized */
- *dontfillinexceptionstacktrace=false;
- if (!fi->class->initialized) {
- bool init;
- {
- /*struct native_stackframeinfo {
- void *oldThreadspecificHeadValue;
- void **addressOfThreadspecificHead;
- methodinfo *method;
- void *beginOfJavaStackframe; only used if != 0
- void *returnToFromNative;
- }*/
- /* more or less the same as the above sfi setup is done in the assembler code by the prepare/remove functions*/
- native_stackframeinfo sfi;
- sfi.returnToFromNative=(void*)ra;
- sfi.beginOfJavaStackframe=beginJavaStack;
- sfi.method=0; /*internal*/
- sfi.addressOfThreadspecificHead=builtin_asm_get_stackframeinfo();
- sfi.oldThreadspecificHeadValue=*(sfi.addressOfThreadspecificHead);
- *(sfi.addressOfThreadspecificHead)=&sfi;
-
- init=initialize_class(fi->class);
-
- *(sfi.addressOfThreadspecificHead)=sfi.oldThreadspecificHeadValue;
- }
- if (!init)
- {
- return false;
- }
- }
- *dontfillinexceptionstacktrace=false;
+ if (!(fi->class->state & CLASS_INITIALIZED))
+ if (!initialize_class(fi->class))
+ return false;
/* patch back original code */
/* if we show disassembly, we have to skip the nop's */
- if (showdisassemble)
+ if (opt_shownops)
ra = ra + 5;
- /* get RIP offset from machine instruction */
-
- ripoffset = *((u4 *) (ra + 3));
-
- /* calculate address in data segment (+ 7: is the size of the RIP move) */
-
- dataaddress = (ptrint *) (ra + ripoffset + 7);
-
/* patch the field value's address */
- *dataaddress = (ptrint) &(fi->value);
+ *((intptr_t *) (ra + 7 + disp)) = (intptr_t) fi->value;
return true;
}
Machine code:
+ <patched call position>
45 8b 8f 00 00 00 00 mov 0x0(%r15),%r9d
*******************************************************************************/
u8 mcode;
unresolved_field *uf;
fieldinfo *fi;
+ u1 byte;
/* 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 */
-
- ra = ra - 5;
- *((ptrint *) (sp + 2 * 8)) = (ptrint) ra;
-
- *dontfillinexceptionstacktrace=true;
-
+ ra = (u1 *) *((ptrint *) (sp + 5 * 8));
+ mcode = *((u8 *) (sp + 3 * 8));
+ uf = (unresolved_field *) *((ptrint *) (sp + 2 * 8));
/* get the fieldinfo */
- if (!(fi = helper_resolve_fieldinfo(uf)))
- {
- *dontfillinexceptionstacktrace=false;
+ if (!(fi = resolve_field_eager(uf)))
return false;
- }
- /* patch back original code */
+ /* patch back original code (instruction code is smaller than 8 bytes) */
- *((u8 *) ra) = mcode;
+ *((u4 *) (ra + 0)) = (u4) mcode;
+ *((u1 *) (ra + 4)) = (u1) (mcode >> 32);
/* if we show disassembly, we have to skip the nop's */
- if (showdisassemble)
+ if (opt_shownops)
ra = ra + 5;
/* 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);
+ if (IS_INT_LNG_TYPE(fi->type)) {
+ /* check for special case: %rsp or %r12 as base register */
- } else {
- u1 byte;
+ byte = *(ra + 3);
+ 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 + 3);
+ byte = *(ra + 5);
if (byte == 0x24)
- *((u4 *) (ra + 4)) = (u4) (fi->offset);
+ *((int32_t *) (ra + 6)) = fi->offset;
else
- *((u4 *) (ra + 3)) = (u4) (fi->offset);
+ *((int32_t *) (ra + 5)) = fi->offset;
}
- *dontfillinexceptionstacktrace=false;
return true;
}
-/* patcher_builtin_new *********************************************************
+/* patcher_putfieldconst *******************************************************
Machine code:
- 48 bf a0 f0 92 00 00 00 00 00 mov $0x92f0a0,%rdi
<patched call position>
- 48 b8 00 00 00 00 00 00 00 00 mov $0x0,%rax
- 48 ff d0 callq *%rax
+ 41 c7 85 00 00 00 00 7b 00 00 00 movl $0x7b,0x0(%r13)
*******************************************************************************/
-bool patcher_builtin_new(u1 *sp)
+bool patcher_putfieldconst(u1 *sp)
{
- u1 *ra;
- u8 mcode;
- constant_classref *cr;
- classinfo *c;
+ 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));
- cr = (constant_classref *) *((ptrint *) (sp + 0 * 8));
+ ra = (u1 *) *((ptrint *) (sp + 5 * 8));
+ mcode = *((u8 *) (sp + 3 * 8));
+ uf = (unresolved_field *) *((ptrint *) (sp + 2 * 8));
- /* calculate and set the new return address */
-
- ra = ra - (10 + 5);
- *((ptrint *) (sp + 2 * 8)) = (ptrint) ra;
-
- *dontfillinexceptionstacktrace=true;
-
- /* get the classinfo */
+ /* get the fieldinfo */
- if (!(c = helper_resolve_classinfo(cr)))
- {
- *dontfillinexceptionstacktrace=false;
+ if (!(fi = resolve_field_eager(uf)))
return false;
- }
/* patch back original code */
- *((u8 *) (ra + 10)) = mcode;
-
- /* patch the classinfo pointer */
-
- *((ptrint *) (ra + 2)) = (ptrint) c;
+ *((u8 *) ra) = mcode;
/* if we show disassembly, we have to skip the nop's */
- if (showdisassemble)
+ if (opt_shownops)
ra = ra + 5;
- /* patch new function address */
+ /* patch the field's offset */
+
+ if (IS_2_WORD_TYPE(fi->type) || IS_ADR_TYPE(fi->type)) {
+ /* handle special case when the base register is %r12 */
- *((ptrint *) (ra + 10 + 2)) = (ptrint) BUILTIN_new;
+ if (*(ra + 2) == 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 */
+
+ if (*(ra + 2) == 0x84)
+ *((uint32_t *) (ra + 4)) = fi->offset;
+ else
+ *((uint32_t *) (ra + 3)) = fi->offset;
+ }
- *dontfillinexceptionstacktrace=false;
return true;
}
-/* patcher_builtin_newarray ****************************************************
+/* patcher_aconst **************************************************************
Machine code:
- 48 be 88 13 9b 00 00 00 00 00 mov $0x9b1388,%rsi
<patched call position>
- 48 b8 00 00 00 00 00 00 00 00 mov $0x0,%rax
- 48 ff d0 callq *%rax
+ 48 bf a0 f0 92 00 00 00 00 00 mov $0x92f0a0,%rdi
*******************************************************************************/
-bool patcher_builtin_newarray(u1 *sp)
+bool patcher_aconst(u1 *sp)
{
u1 *ra;
u8 mcode;
/* 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 - (10 + 5);
- *((ptrint *) (sp + 2 * 8)) = (ptrint) ra;
-
- *dontfillinexceptionstacktrace=true;
+ ra = (u1 *) *((ptrint *) (sp + 5 * 8));
+ mcode = *((u8 *) (sp + 3 * 8));
+ cr = (constant_classref *) *((ptrint *) (sp + 2 * 8));
/* get the classinfo */
- if (!(c = helper_resolve_classinfo(cr))) {
- *dontfillinexceptionstacktrace=false;
+ if (!(c = resolve_classref_eager(cr)))
return false;
- }
/* patch back original code */
- *((u8 *) (ra + 10)) = mcode;
-
- /* patch the class' vftbl pointer */
-
- *((ptrint *) (ra + 2)) = (ptrint) c->vftbl;
+ *((u8 *) ra) = mcode;
/* if we show disassembly, we have to skip the nop's */
- if (showdisassemble)
+ if (opt_shownops)
ra = ra + 5;
- /* patch new function address */
+ /* patch the classinfo pointer */
- *((ptrint *) (ra + 10 + 2)) = (ptrint) BUILTIN_newarray;
+ *((ptrint *) (ra + 2)) = (ptrint) c;
- *dontfillinexceptionstacktrace=false;
return true;
}
/* 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;
-
- *dontfillinexceptionstacktrace=true;
+ ra = (u1 *) *((ptrint *) (sp + 5 * 8));
+ mcode = *((u8 *) (sp + 3 * 8));
+ cr = (constant_classref *) *((ptrint *) (sp + 2 * 8));
/* get the classinfo */
- if (!(c = helper_resolve_classinfo(cr))) {
- *dontfillinexceptionstacktrace=false;
+ if (!(c = resolve_classref_eager(cr)))
return false;
- }
/* patch back original code */
/* if we show disassembly, we have to skip the nop's */
- if (showdisassemble)
+ if (opt_shownops)
ra = ra + 5;
- /* patch the class' vftbl pointer */
-
- *((ptrint *) (ra + 10 + 2)) = (ptrint) c->vftbl;
-
- /* patch new function address */
+ /* patch the classinfo pointer */
- *((ptrint *) (ra + 10 + 10 + 3 + 2)) = (ptrint) BUILTIN_multianewarray;
+ *((ptrint *) (ra + 10 + 2)) = (ptrint) c;
- *dontfillinexceptionstacktrace=false;
return true;
}
-/* patcher_builtin_checkarraycast **********************************************
+/* patcher_builtin_arraycheckcast **********************************************
Machine code:
- 48 be b8 3f b2 00 00 00 00 00 mov $0xb23fb8,%rsi
<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_builtin_checkarraycast(u1 *sp)
+bool patcher_builtin_arraycheckcast(u1 *sp)
{
u1 *ra;
u8 mcode;
/* 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 - (10 + 5);
- *((ptrint *) (sp + 2 * 8)) = (ptrint) ra;
-
- *dontfillinexceptionstacktrace=true;
+ ra = (u1 *) *((ptrint *) (sp + 5 * 8));
+ mcode = *((u8 *) (sp + 3 * 8));
+ cr = (constant_classref *) *((ptrint *) (sp + 2 * 8));
/* get the classinfo */
- if (!(c = helper_resolve_classinfo(cr))) {
- *dontfillinexceptionstacktrace=false;
+ if (!(c = resolve_classref_eager(cr)))
return false;
- }
/* patch back original code */
- *((u8 *) (ra + 10)) = mcode;
+ *((u8 *) ra) = mcode;
/* if we show disassembly, we have to skip the nop's */
- if (showdisassemble)
+ if (opt_shownops)
ra = ra + 5;
- /* patch the class' vftbl pointer */
-
- *((ptrint *) (ra + 2)) = (ptrint) c->vftbl;
-
- /* patch new function address */
+ /* patch the classinfo pointer */
- *((ptrint *) (ra + 10 + 2)) = (ptrint) BUILTIN_checkarraycast;
+ *((ptrint *) (ra + 2)) = (ptrint) c;
- *dontfillinexceptionstacktrace=false;
return true;
}
-/* patcher_builtin_arrayinstanceof *********************************************
+/* patcher_invokestatic_special ************************************************
Machine code:
- 48 be 30 3c b2 00 00 00 00 00 mov $0xb23c30,%rsi
<patched call position>
- 48 b8 00 00 00 00 00 00 00 00 mov $0x0,%rax
- 48 ff d0 callq *%rax
-
-*******************************************************************************/
-
-bool patcher_builtin_arrayinstanceof(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 - (10 + 5);
- *((ptrint *) (sp + 2 * 8)) = (ptrint) ra;
-
- *dontfillinexceptionstacktrace=true;
-
- /* get the classinfo */
-
- if (!(c = helper_resolve_classinfo(cr))) {
- *dontfillinexceptionstacktrace=false;
- return false;
- }
-
- /* patch back original code */
-
- *((u8 *) (ra + 10)) = mcode;
-
- /* if we show disassembly, we have to skip the nop's */
-
- if (showdisassemble)
- ra = ra + 5;
-
- /* patch the class' vftbl pointer */
-
- *((ptrint *) (ra + 2)) = (ptrint) c->vftbl;
-
- /* patch new function address */
-
- *((ptrint *) (ra + 10 + 2)) = (ptrint) BUILTIN_arrayinstanceof;
-
- *dontfillinexceptionstacktrace=false;
- return true;
-}
-
-
-/* patcher_invokestatic_special ************************************************
-
- XXX
+ 49 ba 00 00 00 00 00 00 00 00 mov $0x0,%r10
+ 49 ff d2 callq *%r10
*******************************************************************************/
u1 *ra;
u8 mcode;
unresolved_method *um;
+ s4 disp;
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;
-
- *dontfillinexceptionstacktrace=true;
-
+ ra = (u1 *) *((ptrint *) (sp + 5 * 8));
+ mcode = *((u8 *) (sp + 3 * 8));
+ um = (unresolved_method *) *((ptrint *) (sp + 2 * 8));
+ disp = *((s4 *) (sp + 1 * 8));
/* get the fieldinfo */
- if (!(m = helper_resolve_methodinfo(um)))
- {
- *dontfillinexceptionstacktrace=false;
+ if (!(m = resolve_method_eager(um)))
return false;
- }
+
/* patch back original code */
*((u8 *) ra) = mcode;
/* if we show disassembly, we have to skip the nop's */
- if (showdisassemble)
- ra = ra + 5;
+ if (opt_shownops)
+ ra = ra + PATCHER_CALL_SIZE;
/* patch stubroutine */
- *((ptrint *) (ra + 2)) = (ptrint) m->stubroutine;
+/* *((ptrint *) (ra + 2)) = (ptrint) m->stubroutine; */
+ *((ptrint *) (ra + 7 + disp)) = (ptrint) m->stubroutine;
- *dontfillinexceptionstacktrace=false;
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
*******************************************************************************/
/* 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;
-
- *dontfillinexceptionstacktrace=true;
+ ra = (u1 *) *((ptrint *) (sp + 5 * 8));
+ mcode = *((u8 *) (sp + 3 * 8));
+ um = (unresolved_method *) *((ptrint *) (sp + 2 * 8));
/* get the fieldinfo */
- if (!(m = helper_resolve_methodinfo(um)))
- {
- *dontfillinexceptionstacktrace=false;
+ if (!(m = resolve_method_eager(um)))
return false;
- }
/* patch back original code */
/* if we show disassembly, we have to skip the nop's */
- if (showdisassemble)
+ if (opt_shownops)
ra = ra + 5;
/* patch vftbl index */
*((s4 *) (ra + 3 + 3)) = (s4) (OFFSET(vftbl_t, table[0]) +
sizeof(methodptr) * m->vftblindex);
- *dontfillinexceptionstacktrace=false;
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
*******************************************************************************/
/* 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;
-
- *dontfillinexceptionstacktrace=true;
+ ra = (u1 *) *((ptrint *) (sp + 5 * 8));
+ mcode = *((u8 *) (sp + 3 * 8));
+ um = (unresolved_method *) *((ptrint *) (sp + 2 * 8));
/* get the fieldinfo */
- if (!(m = helper_resolve_methodinfo(um)))
- {
- *dontfillinexceptionstacktrace=false;
+ if (!(m = resolve_method_eager(um)))
return false;
- }
/* patch back original code */
/* if we show disassembly, we have to skip the nop's */
- if (showdisassemble)
+ if (opt_shownops)
ra = ra + 5;
/* patch interfacetable index */
*((s4 *) (ra + 3 + 7 + 3)) =
(s4) (sizeof(methodptr) * (m - m->class->methods));
- *dontfillinexceptionstacktrace=false;
return true;
}
/* patcher_checkcast_instanceof_flags ******************************************
- XXX
+ Machine code:
+
+ <patched call position>
+ 41 ba 00 00 00 00 mov $0x0,%r10d
+ 41 81 e2 00 02 00 00 and $0x200,%r10d
+ 0f 84 35 00 00 00 je 0x00002aaaaab01479
*******************************************************************************/
/* 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;
-
- *dontfillinexceptionstacktrace=true;
+ ra = (u1 *) *((ptrint *) (sp + 5 * 8));
+ mcode = *((u8 *) (sp + 3 * 8));
+ cr = (constant_classref *) *((ptrint *) (sp + 2 * 8));
/* get the fieldinfo */
- if (!(c = helper_resolve_classinfo(cr))) {
- *dontfillinexceptionstacktrace=false;
+ if (!(c = resolve_classref_eager(cr)))
return false;
- }
/* patch back original code */
/* if we show disassembly, we have to skip the nop's */
- if (showdisassemble)
+ if (opt_shownops)
ra = ra + 5;
/* patch class flags */
*((s4 *) (ra + 2)) = (s4) c->flags;
- *dontfillinexceptionstacktrace=false;
return true;
}
-/* patcher_checkcast_instanceof_interface **************************************
+/* patcher_checkcast_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(u1 *sp)
{
u1 *ra;
u8 mcode;
/* 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;
-
- *dontfillinexceptionstacktrace=true;
+ ra = (u1 *) *((ptrint *) (sp + 5 * 8));
+ mcode = *((u8 *) (sp + 3 * 8));
+ cr = (constant_classref *) *((ptrint *) (sp + 2 * 8));
/* get the fieldinfo */
- if (!(c = helper_resolve_classinfo(cr))) {
- *dontfillinexceptionstacktrace=false;
+ if (!(c = resolve_classref_eager(cr)))
return false;
- }
/* patch back original code */
/* if we show disassembly, we have to skip the nop's */
- if (showdisassemble)
- ra = ra + 5;
+ if (opt_shownops)
+ ra = ra + PATCHER_CALL_SIZE;
/* patch super class index */
*((s4 *) (ra + 7 + 3)) = (s4) c->index;
- *((s4 *) (ra + 7 + 7 + 3 + 6 + 3)) =
+ *((s4 *) (ra + 7 + 7 + 6 + 8 + 3)) =
(s4) (OFFSET(vftbl_t, interfacetable[0]) -
c->index * sizeof(methodptr*));
- *dontfillinexceptionstacktrace=false;
return true;
}
/* patcher_checkcast_class *****************************************************
- XXX
+ Machine code:
+
+ <patched call position>
+ 49 bb 00 00 00 00 00 00 00 00 mov $0x0,%r11
+ 45 8b 92 20 00 00 00 mov 0x20(%r10),%r10d
+ 45 8b 9b 20 00 00 00 mov 0x20(%r11),%r11d
+ 4d 29 da sub %r11,%r10
+ 49 bb 00 00 00 00 00 00 00 00 mov $0x0,%r11
*******************************************************************************/
/* 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;
-
- *dontfillinexceptionstacktrace=true;
+ ra = (u1 *) *((ptrint *) (sp + 5 * 8));
+ mcode = *((u8 *) (sp + 3 * 8));
+ cr = (constant_classref *) *((ptrint *) (sp + 2 * 8));
/* get the fieldinfo */
- if (!(c = helper_resolve_classinfo(cr))) {
- *dontfillinexceptionstacktrace=false;
+ if (!(c = resolve_classref_eager(cr)))
return false;
- }
/* patch back original code */
/* if we show disassembly, we have to skip the nop's */
- if (showdisassemble)
+ if (opt_shownops)
ra = ra + 5;
/* patch super class' vftbl */
*((ptrint *) (ra + 2)) = (ptrint) c->vftbl;
*((ptrint *) (ra + 10 + 7 + 7 + 3 + 2)) = (ptrint) c->vftbl;
- *dontfillinexceptionstacktrace=false;
return true;
}
-/* patcher_instanceof_class ****************************************************
+/* patcher_instanceof_interface ************************************************
- XXX
+ Machine code:
+
+ <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(u1 *sp)
{
u1 *ra;
u8 mcode;
/* get stuff from the stack */
- ra = (u1 *) *((ptrint *) (sp + 2 * 8));
- mcode = *((u8 *) (sp + 1 * 8));
- cr = (constant_classref *) *((ptrint *) (sp + 0 * 8));
+ ra = (u1 *) *((ptrint *) (sp + 5 * 8));
+ mcode = *((u8 *) (sp + 3 * 8));
+ cr = (constant_classref *) *((ptrint *) (sp + 2 * 8));
- /* calculate and set the new return address */
+ /* get the fieldinfo */
+
+ if (!(c = resolve_classref_eager(cr)))
+ return false;
+
+ /* patch back original code */
+
+ *((u8 *) ra) = mcode;
+
+ /* if we show disassembly, we have to skip the nop's */
- ra = ra - 5;
- *((ptrint *) (sp + 2 * 8)) = (ptrint) ra;
+ if (opt_shownops)
+ ra = ra + PATCHER_CALL_SIZE;
+
+ /* patch super class index */
+
+ *((s4 *) (ra + 7 + 3)) = (s4) c->index;
+
+ *((s4 *) (ra + 7 + 7 + 6 + 3)) =
+ (s4) (OFFSET(vftbl_t, interfacetable[0]) -
+ c->index * sizeof(methodptr*));
+
+ return true;
+}
- *dontfillinexceptionstacktrace=true;
+
+/* patcher_instanceof_class ****************************************************
+
+ Machine code:
+
+ <patched call position>
+ 49 ba 00 00 00 00 00 00 00 00 mov $0x0,%r10
+
+*******************************************************************************/
+
+bool patcher_instanceof_class(u1 *sp)
+{
+ u1 *ra;
+ u8 mcode;
+ constant_classref *cr;
+ classinfo *c;
+
+ /* get stuff from the stack */
+
+ ra = (u1 *) *((ptrint *) (sp + 5 * 8));
+ mcode = *((u8 *) (sp + 3 * 8));
+ cr = (constant_classref *) *((ptrint *) (sp + 2 * 8));
/* get the fieldinfo */
- if (!(c = helper_resolve_classinfo(cr))) {
- *dontfillinexceptionstacktrace=false;
+ if (!(c = resolve_classref_eager(cr)))
return false;
- }
/* patch back original code */
/* if we show disassembly, we have to skip the nop's */
- if (showdisassemble)
+ if (opt_shownops)
ra = ra + 5;
/* patch super class' vftbl */
*((ptrint *) (ra + 2)) = (ptrint) c->vftbl;
- *dontfillinexceptionstacktrace=false;
return true;
}
/* patcher_clinit **************************************************************
- XXX
+ May be used for GET/PUTSTATIC and in native stub.
+
+ Machine code:
+
+ <patched call position>
+ 4d 8b 15 92 ff ff ff mov -110(%rip),%r10
+ 49 89 1a mov %rbx,(%r10)
*******************************************************************************/
u1 *ra;
u8 mcode;
classinfo *c;
- void *beginJavaStack;
/* get stuff from the stack */
- ra = (u1 *) *((ptrint *) (sp + 2 * 8));
- mcode = *((u8 *) (sp + 1 * 8));
- c = (classinfo *) *((ptrint *) (sp + 0 * 8));
- beginJavaStack = (void*) (sp+2*8);
-
- /*printf("beginJavaStack: %p, ra %p\n",beginJavaStack,ra);*/
- /* calculate and set the new return address */
-
- ra = ra - 5;
- *((ptrint *) (sp + 2 * 8)) = (ptrint) ra;
+ ra = (u1 *) *((ptrint *) (sp + 5 * 8));
+ mcode = *((u8 *) (sp + 3 * 8));
+ c = (classinfo *) *((ptrint *) (sp + 2 * 8));
/* check if the class is initialized */
- if (!c->initialized) {
- bool init;
- {
- /*struct native_stackframeinfo {
- void *oldThreadspecificHeadValue;
- void **addressOfThreadspecificHead;
- methodinfo *method;
- void *beginOfJavaStackframe; only used if != 0
- void *returnToFromNative;
- }*/
- /* more or less the same as the above sfi setup is done in the assembler code by the prepare/remove functions*/
- native_stackframeinfo sfi;
- sfi.returnToFromNative=(void*)ra;
- sfi.beginOfJavaStackframe=beginJavaStack;
- sfi.method=0; /*internal*/
- sfi.addressOfThreadspecificHead=builtin_asm_get_stackframeinfo();
- sfi.oldThreadspecificHeadValue=*(sfi.addressOfThreadspecificHead);
- *(sfi.addressOfThreadspecificHead)=&sfi;
-
- init=initialize_class(c);
-
- *(sfi.addressOfThreadspecificHead)=sfi.oldThreadspecificHeadValue;
- }
- if (!init)
- {
+ if (!(c->state & CLASS_INITIALIZED))
+ if (!initialize_class(c))
return false;
- }
- }
/* patch back original code */
}
+/* patcher_athrow_areturn ******************************************************
+
+ Machine code:
+
+ <patched call position>
+
+*******************************************************************************/
+
+#ifdef ENABLE_VERIFIER
+bool patcher_athrow_areturn(u1 *sp)
+{
+ u1 *ra;
+ u8 mcode;
+ unresolved_class *uc;
+
+ /* get stuff from the stack */
+
+ ra = (u1 *) *((ptrint *) (sp + 5 * 8));
+ mcode = *((u8 *) (sp + 3 * 8));
+ uc = (unresolved_class *) *((ptrint *) (sp + 2 * 8));
+
+ /* resolve the class and check subtype constraints */
+
+ if (!resolve_class_eager_no_access_check(uc))
+ return false;
+
+ /* patch back original code */
+
+ *((u8 *) ra) = mcode;
+
+ return true;
+}
+#endif /* ENABLE_VERIFIER */
+
+
+/* patcher_resolve_native ******************************************************
+
+ Machine code:
+
+ <patched call position>
+ 48 b8 00 00 00 00 00 00 00 00 mov $0x0,%rax
+ 48 ff d0 callq *%rax
+
+*******************************************************************************/
+
+#if !defined(WITH_STATIC_CLASSPATH)
+bool patcher_resolve_native(u1 *sp)
+{
+ u1 *ra;
+ u8 mcode;
+ methodinfo *m;
+ functionptr f;
+
+ /* get stuff from the stack */
+
+ ra = (u1 *) *((ptrint *) (sp + 5 * 8));
+ mcode = *((u8 *) (sp + 3 * 8));
+ m = (methodinfo *) *((ptrint *) (sp + 2 * 8));
+
+ /* resolve native function */
+
+ if (!(f = native_resolve_function(m)))
+ return false;
+
+ /* patch back original code */
+
+ *((u8 *) ra) = mcode;
+
+ /* if we show disassembly, we have to skip the nop's */
+
+ if (opt_shownops)
+ ra = ra + 5;
+
+ /* patch native function pointer */
+
+ *((ptrint *) (ra + 2)) = (ptrint) f;
+
+ return true;
+}
+#endif /* !defined(WITH_STATIC_CLASSPATH) */
+
+
/*
* These are local overrides for various environment variables in Emacs.
* Please do not remove this and leave it at the end of the file, where
projects / cacao.git / blobdiff