/* src/vm/jit/i386/patcher.c - i386 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.
+ 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 2475 2005-05-13 14:02:57Z twisti $
+#include <stdint.h>
-*/
+#include "vm/types.h"
+
+#include "vm/jit/i386/codegen.h"
+#include "mm/memory.h"
+
+#include "native/native.h"
-#include "vm/jit/i386/types.h"
#include "vm/builtin.h"
-#include "vm/field.h"
+#include "vm/exceptions.h"
#include "vm/initialize.h"
-#include "vm/options.h"
-#include "vm/references.h"
-#include "vm/jit/helper.h"
+#include "vm/jit/patcher-common.h"
+#include "vm/jit/stacktrace.h"
-/* patcher_get_putstatic *******************************************************
+#include "vmcore/class.h"
+#include "vmcore/field.h"
+#include "vmcore/options.h"
+#include "vm/resolve.h"
+#include "vmcore/references.h"
- Machine code:
- <patched call position>
- b8 00 00 00 00 mov $0x00000000,%eax
+#define PATCH_BACK_ORIGINAL_MCODE *((u2 *) pr->mpc) = (u2) pr->mcode
+
+
+/* patcher_patch_code **********************************************************
+
+ 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;
- u8 mcode;
- unresolved_field *uf;
- fieldinfo *fi;
-
- /* get stuff from the stack */
+ PATCH_BACK_ORIGINAL_MCODE;
+}
- ra = (u1 *) *((ptrint *) (sp + 4 * 4));
- o = (java_objectheader *) *((ptrint *) (sp + 3 * 4));
- mcode = *((u8 *) (sp + 1 * 4));
- uf = (unresolved_field *) *((ptrint *) (sp + 0 * 4));
- /* calculate and set the new return address */
+/* patcher_get_putstatic *******************************************************
- ra = ra - 5;
- *((ptrint *) (sp + 4 * 4)) = (ptrint) ra;
+ Machine code:
-#if defined(USE_THREADS)
- /* enter a monitor on the patching position */
+ <patched call position>
+ b8 00 00 00 00 mov $0x00000000,%eax
- builtin_monitorenter(o);
+*******************************************************************************/
- /* check if the position has already been patched */
+bool patcher_get_putstatic(patchref_t *pr)
+{
+ u1 *ra;
+ unresolved_field *uf;
+ fieldinfo *fi;
- if (o->vftbl) {
- builtin_monitorexit(o);
+ /* get stuff from the stack */
- return true;
- }
-#endif
+ ra = (u1 *) pr->mpc;
+ uf = (unresolved_field *) pr->ref;
/* get the fieldinfo */
- if (!(fi = helper_resolve_fieldinfo(uf)))
+ if (!(fi = resolve_field_eager(uf)))
return false;
/* check if the field's class is initialized */
- if (!fi->class->initialized)
- if (!initialize_class(fi->class))
+ if (!(fi->clazz->state & CLASS_INITIALIZED))
+ if (!initialize_class(fi->clazz))
return false;
- /* patch back original code */
-
- *((u8 *) ra) = mcode;
+ PATCH_BACK_ORIGINAL_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 the field value's address */
- *((ptrint *) (ra + 1)) = (ptrint) &(fi->value);
-
-#if defined(USE_THREADS)
- /* this position has been patched */
-
- o->vftbl = (vftbl_t *) 1;
-
- /* leave the monitor on the patching position */
-
- builtin_monitorexit(o);
-#endif
+ *((intptr_t *) (ra + 1)) = (intptr_t) fi->value;
return true;
}
*******************************************************************************/
-bool patcher_getfield(u1 *sp)
+bool patcher_getfield(patchref_t *pr)
{
- u1 *ra;
- java_objectheader *o;
- u8 mcode;
- unresolved_field *uf;
- fieldinfo *fi;
+ u1 *ra;
+ unresolved_field *uf;
+ fieldinfo *fi;
/* get stuff from the stack */
- ra = (u1 *) *((ptrint *) (sp + 4 * 4));
- o = (java_objectheader *) *((ptrint *) (sp + 3 * 4));
- mcode = *((u8 *) (sp + 1 * 4));
- uf = (unresolved_field *) *((ptrint *) (sp + 0 * 4));
-
- /* calculate and set the new return address */
-
- ra = ra - 5;
- *((ptrint *) (sp + 4 * 4)) = (ptrint) ra;
-
-#if defined(USE_THREADS)
- /* enter a monitor on the patching position */
-
- builtin_monitorenter(o);
-
- /* check if the position has already been patched */
-
- if (o->vftbl) {
- builtin_monitorexit(o);
-
- return true;
- }
-#endif
+ ra = (u1 *) pr->mpc;
+ uf = (unresolved_field *) pr->ref;
/* get the fieldinfo */
- if (!(fi = helper_resolve_fieldinfo(uf)))
+ if (!(fi = resolve_field_eager(uf)))
return false;
- /* patch back original code */
-
- *((u8 *) ra) = mcode;
+ PATCH_BACK_ORIGINAL_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 the field's offset */
if (fi->type == TYPE_LNG)
*((u4 *) (ra + 6 + 2)) = (u4) (fi->offset + 4);
-#if defined(USE_THREADS)
- /* this position has been patched */
-
- o->vftbl = (vftbl_t *) 1;
-
- /* leave the monitor on the patching position */
-
- builtin_monitorexit(o);
-#endif
-
return true;
}
*******************************************************************************/
-bool patcher_putfield(u1 *sp)
+bool patcher_putfield(patchref_t *pr)
{
- u1 *ra;
- java_objectheader *o;
- u8 mcode;
- unresolved_field *uf;
- fieldinfo *fi;
+ u1 *ra;
+ unresolved_field *uf;
+ fieldinfo *fi;
/* get stuff from the stack */
- ra = (u1 *) *((ptrint *) (sp + 4 * 4));
- o = (java_objectheader *) *((ptrint *) (sp + 3 * 4));
- mcode = *((u8 *) (sp + 1 * 4));
- uf = (unresolved_field *) *((ptrint *) (sp + 0 * 4));
-
- /* calculate and set the new return address */
-
- ra = ra - 5;
- *((ptrint *) (sp + 4 * 4)) = (ptrint) ra;
-
-#if defined(USE_THREADS)
- /* enter a monitor on the patching position */
-
- builtin_monitorenter(o);
-
- /* check if the position has already been patched */
-
- if (o->vftbl) {
- builtin_monitorexit(o);
-
- return true;
- }
-#endif
+ ra = (u1 *) pr->mpc;
+ uf = (unresolved_field *) pr->ref;
/* get the fieldinfo */
- if (!(fi = helper_resolve_fieldinfo(uf)))
+ if (!(fi = resolve_field_eager(uf)))
return false;
- /* patch back original code */
-
- *((u8 *) ra) = mcode;
+ PATCH_BACK_ORIGINAL_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 the field's offset */
if (fi->type != TYPE_LNG) {
*((u4 *) (ra + 2)) = (u4) (fi->offset);
-
- } else {
- /* long code is very special:
+ }
+ else {
+ /* The long code is special:
*
- * 8b 8c 24 00 00 00 00 mov 0x00000000(%esp),%ecx
- * 8b 94 24 00 00 00 00 mov 0x00000000(%esp),%edx
* 89 8d 00 00 00 00 mov %ecx,0x00000000(%ebp)
* 89 95 00 00 00 00 mov %edx,0x00000000(%ebp)
*/
- *((u4 *) (ra + 7 + 7 + 2)) = (u4) (fi->offset);
- *((u4 *) (ra + 7 + 7 + 6 + 2)) = (u4) (fi->offset + 4);
+ *((u4 *) (ra + 2)) = (u4) (fi->offset);
+ *((u4 *) (ra + 6 + 2)) = (u4) (fi->offset + 4);
}
-#if defined(USE_THREADS)
- /* this position has been patched */
-
- o->vftbl = (vftbl_t *) 1;
-
- /* leave the monitor on the patching position */
-
- builtin_monitorexit(o);
-#endif
-
return true;
}
*******************************************************************************/
-bool patcher_putfieldconst(u1 *sp)
+bool patcher_putfieldconst(patchref_t *pr)
{
- u1 *ra;
- java_objectheader *o;
- u8 mcode;
- unresolved_field *uf;
- fieldinfo *fi;
+ u1 *ra;
+ unresolved_field *uf;
+ fieldinfo *fi;
/* get stuff from the stack */
- ra = (u1 *) *((ptrint *) (sp + 4 * 4));
- o = (java_objectheader *) *((ptrint *) (sp + 3 * 4));
- mcode = *((u8 *) (sp + 1 * 4));
- uf = (unresolved_field *) *((ptrint *) (sp + 0 * 4));
-
- /* calculate and set the new return address */
-
- ra = ra - 5;
- *((ptrint *) (sp + 4 * 4)) = (ptrint) ra;
-
-#if defined(USE_THREADS)
- /* enter a monitor on the patching position */
-
- builtin_monitorenter(o);
-
- /* check if the position has already been patched */
-
- if (o->vftbl) {
- builtin_monitorexit(o);
-
- return true;
- }
-#endif
+ ra = (u1 *) pr->mpc;
+ uf = (unresolved_field *) pr->ref;
/* get the fieldinfo */
- if (!(fi = helper_resolve_fieldinfo(uf)))
+ if (!(fi = resolve_field_eager(uf)))
return false;
- /* patch back original code */
-
- *((u8 *) ra) = mcode;
+ PATCH_BACK_ORIGINAL_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 the field's offset */
if (!IS_2_WORD_TYPE(fi->type)) {
*((u4 *) (ra + 2)) = (u4) (fi->offset);
-
- } else {
+ }
+ else {
/* long/double code is different:
*
* c7 80 00 00 00 00 c8 01 00 00 movl $0x1c8,0x0(%eax)
* c7 80 04 00 00 00 00 00 00 00 movl $0x0,0x4(%eax)
*/
- *((u4 *) (ra + 2)) = (u4) (fi->offset);
+ *((u4 *) (ra + 2)) = (u4) (fi->offset);
*((u4 *) (ra + 10 + 2)) = (u4) (fi->offset + 4);
}
-#if defined(USE_THREADS)
- /* this position has been patched */
-
- o->vftbl = (vftbl_t *) 1;
-
- /* leave the monitor on the patching position */
-
- builtin_monitorexit(o);
-#endif
-
return true;
}
-/* patcher_builtin_new *********************************************************
+/* patcher_aconst **************************************************************
Machine code:
+ <patched call position>
c7 04 24 00 00 00 00 movl $0x0000000,(%esp)
- <patched call postition>
b8 00 00 00 00 mov $0x0000000,%eax
- ff d0 call *%eax
-
-*******************************************************************************/
-
-bool patcher_builtin_new(u1 *sp)
-{
- u1 *ra;
- java_objectheader *o;
- u8 mcode;
- constant_classref *cr;
- classinfo *c;
-
- /* get stuff from the stack */
-
- ra = (u1 *) *((ptrint *) (sp + 4 * 4));
- o = (java_objectheader *) *((ptrint *) (sp + 3 * 4));
- mcode = *((u8 *) (sp + 1 * 4));
- cr = (constant_classref *) *((ptrint *) (sp + 0 * 4));
-
- /* calculate and set the new return address */
-
- ra = ra - (7 + 5);
- *((ptrint *) (sp + 4 * 4)) = (ptrint) ra;
-
-#if defined(USE_THREADS)
- /* enter a monitor on the patching position */
-
- builtin_monitorenter(o);
-
- /* check if the position has already been patched */
-
- if (o->vftbl) {
- builtin_monitorexit(o);
-
- return true;
- }
-#endif
-
- /* get the classinfo */
-
- if (!(c = helper_resolve_classinfo(cr)))
- return false;
-
- /* patch back original code */
-
- *((u8 *) (ra + 7)) = mcode;
-
- /* patch the classinfo pointer */
-
- *((ptrint *) (ra + 3)) = (ptrint) c;
-
- /* if we show disassembly, we have to skip the nop's */
-
- if (showdisassemble)
- ra = ra + 5;
-
- /* patch new function address */
-
- *((ptrint *) (ra + 7 + 1)) = (ptrint) BUILTIN_new;
-
-#if defined(USE_THREADS)
- /* this position has been patched */
-
- o->vftbl = (vftbl_t *) 1;
-
- /* leave the monitor on the patching position */
-
- builtin_monitorexit(o);
-#endif
-
- return true;
-}
-
-
-/* patcher_builtin_newarray ****************************************************
-
- Machine code:
-
- c7 44 24 08 00 00 00 00 movl $0x00000000,0x8(%esp)
- <patched call position>
- b8 00 00 00 00 mov $0x00000000,%eax
- ff d0 call *%eax
*******************************************************************************/
-bool patcher_builtin_newarray(u1 *sp)
+bool patcher_aconst(patchref_t *pr)
{
u1 *ra;
- java_objectheader *o;
- u8 mcode;
constant_classref *cr;
classinfo *c;
/* get stuff from the stack */
- ra = (u1 *) *((ptrint *) (sp + 4 * 4));
- o = (java_objectheader *) *((ptrint *) (sp + 3 * 4));
- mcode = *((u8 *) (sp + 1 * 4));
- cr = (constant_classref *) *((ptrint *) (sp + 0 * 4));
-
- /* calculate and set the new return address */
-
- ra = ra - (8 + 5);
- *((ptrint *) (sp + 4 * 4)) = (ptrint) ra;
-
-#if defined(USE_THREADS)
- /* enter a monitor on the patching position */
-
- builtin_monitorenter(o);
-
- /* check if the position has already been patched */
-
- if (o->vftbl) {
- builtin_monitorexit(o);
-
- return true;
- }
-#endif
+ ra = (u1 *) pr->mpc;
+ cr = (constant_classref *) pr->ref;
/* get the classinfo */
- if (!(c = helper_resolve_classinfo(cr)))
+ if (!(c = resolve_classref_eager(cr)))
return false;
- /* patch back original code */
-
- *((u8 *) (ra + 8)) = mcode;
-
- /* patch the class' vftbl pointer */
-
- *((ptrint *) (ra + 4)) = (ptrint) c->vftbl;
+ PATCH_BACK_ORIGINAL_MCODE;
/* if we show disassembly, we have to skip the nop's */
- if (showdisassemble)
- ra = ra + 5;
-
- /* patch new function address */
-
- *((ptrint *) (ra + 8 + 1)) = (ptrint) BUILTIN_newarray;
-
-#if defined(USE_THREADS)
- /* this position has been patched */
+ if (opt_shownops)
+ ra = ra + PATCHER_CALL_SIZE;
- o->vftbl = (vftbl_t *) 1;
-
- /* leave the monitor on the patching position */
+ /* patch the classinfo pointer */
- builtin_monitorexit(o);
-#endif
+ *((ptrint *) (ra + 1)) = (ptrint) c;
return true;
}
*******************************************************************************/
-bool patcher_builtin_multianewarray(u1 *sp)
+bool patcher_builtin_multianewarray(patchref_t *pr)
{
u1 *ra;
- java_objectheader *o;
- u8 mcode;
constant_classref *cr;
classinfo *c;
/* get stuff from the stack */
- ra = (u1 *) *((ptrint *) (sp + 4 * 4));
- o = (java_objectheader *) *((ptrint *) (sp + 3 * 4));
- mcode = *((u8 *) (sp + 1 * 4));
- cr = (constant_classref *) *((ptrint *) (sp + 0 * 4));
-
- /* calculate and set the new return address */
-
- ra = ra - 5;
- *((ptrint *) (sp + 4 * 4)) = (ptrint) ra;
-
-#if defined(USE_THREADS)
- /* enter a monitor on the patching position */
-
- builtin_monitorenter(o);
-
- /* check if the position has already been patched */
-
- if (o->vftbl) {
- builtin_monitorexit(o);
-
- return true;
- }
-#endif
+ ra = (u1 *) pr->mpc;
+ cr = (constant_classref *) pr->ref;
/* get the classinfo */
- if (!(c = helper_resolve_classinfo(cr)))
+ if (!(c = resolve_classref_eager(cr)))
return false;
- /* patch back original code */
-
- *((u8 *) ra) = mcode;
+ PATCH_BACK_ORIGINAL_MCODE;
/* if we show disassembly, we have to skip the nop's */
- if (showdisassemble)
- ra = ra + 5;
-
- /* patch the class' vftbl pointer */
-
- *((ptrint *) (ra + 7 + 4)) = (ptrint) c->vftbl;
-
- /* patch new function address */
+ if (opt_shownops)
+ ra = ra + PATCHER_CALL_SIZE;
- *((ptrint *) (ra + 7 + 8 + 2 + 3 + 4 + 1)) = (ptrint) BUILTIN_multianewarray;
-
-#if defined(USE_THREADS)
- /* this position has been patched */
-
- o->vftbl = (vftbl_t *) 1;
-
- /* leave the monitor on the patching position */
+ /* patch the classinfo pointer */
- builtin_monitorexit(o);
-#endif
+ *((ptrint *) (ra + 7 + 4)) = (ptrint) c;
return true;
}
Machine code:
- c7 44 24 08 00 00 00 00 movl $0x00000000,0x8(%esp)
<patched call position>
- b8 00 00 00 00 mov $0x00000000,%eax
- ff d0 call *%eax
+ c7 44 24 04 00 00 00 00 movl $0x00000000,0x4(%esp)
+ ba 00 00 00 00 mov $0x00000000,%edx
+ ff d2 call *%edx
*******************************************************************************/
-bool patcher_builtin_arraycheckcast(u1 *sp)
+bool patcher_builtin_arraycheckcast(patchref_t *pr)
{
u1 *ra;
- java_objectheader *o;
- u8 mcode;
constant_classref *cr;
classinfo *c;
/* get stuff from the stack */
- ra = (u1 *) *((ptrint *) (sp + 4 * 4));
- o = (java_objectheader *) *((ptrint *) (sp + 3 * 4));
- mcode = *((u8 *) (sp + 1 * 4));
- cr = (constant_classref *) *((ptrint *) (sp + 0 * 4));
-
- /* calculate and set the new return address */
-
- ra = ra - (8 + 5);
- *((ptrint *) (sp + 4 * 4)) = (ptrint) ra;
-
-#if defined(USE_THREADS)
- /* enter a monitor on the patching position */
-
- builtin_monitorenter(o);
-
- /* check if the position has already been patched */
-
- if (o->vftbl) {
- builtin_monitorexit(o);
-
- return true;
- }
-#endif
+ ra = (u1 *) pr->mpc;
+ cr = (constant_classref *) pr->ref;
/* get the classinfo */
- if (!(c = helper_resolve_classinfo(cr)))
+ if (!(c = resolve_classref_eager(cr)))
return false;
- /* patch back original code */
-
- *((u8 *) (ra + 8)) = mcode;
-
- /* patch the class' vftbl pointer */
-
- *((ptrint *) (ra + 4)) = (ptrint) c->vftbl;
+ PATCH_BACK_ORIGINAL_MCODE;
/* if we show disassembly, we have to skip the nop's */
- if (showdisassemble)
- ra = ra + 5;
-
- /* patch new function address */
-
- *((ptrint *) (ra + 8 + 1)) = (ptrint) BUILTIN_arraycheckcast;
+ if (opt_shownops)
+ ra = ra + PATCHER_CALL_SIZE;
-#if defined(USE_THREADS)
- /* this position has been patched */
-
- o->vftbl = (vftbl_t *) 1;
-
- /* leave the monitor on the patching position */
-
- builtin_monitorexit(o);
-#endif
-
- return true;
-}
-
-
-/* patcher_builtin_arrayinstanceof *********************************************
-
- Machine code:
-
- c7 44 24 08 00 00 00 00 movl $0x00000000,0x8(%esp)
- <patched call position>
- b8 00 00 00 00 mov $0x00000000,%eax
- ff d0 call *%eax
-
-*******************************************************************************/
-
-bool patcher_builtin_arrayinstanceof(u1 *sp)
-{
- u1 *ra;
- java_objectheader *o;
- u8 mcode;
- constant_classref *cr;
- classinfo *c;
-
- /* get stuff from the stack */
-
- ra = (u1 *) *((ptrint *) (sp + 4 * 4));
- o = (java_objectheader *) *((ptrint *) (sp + 3 * 4));
- mcode = *((u8 *) (sp + 1 * 4));
- cr = (constant_classref *) *((ptrint *) (sp + 0 * 4));
-
- /* calculate and set the new return address */
-
- ra = ra - (8 + 5);
- *((ptrint *) (sp + 4 * 4)) = (ptrint) ra;
-
-#if defined(USE_THREADS)
- /* enter a monitor on the patching position */
-
- builtin_monitorenter(o);
-
- /* check if the position has already been patched */
-
- if (o->vftbl) {
- builtin_monitorexit(o);
-
- return true;
- }
-#endif
-
- /* get the classinfo */
-
- if (!(c = helper_resolve_classinfo(cr)))
- return false;
-
- /* patch back original code */
-
- *((u8 *) (ra + 8)) = mcode;
-
- /* patch the class' vftbl pointer */
-
- *((ptrint *) (ra + 4)) = (ptrint) c->vftbl;
-
- /* if we show disassembly, we have to skip the nop's */
+ /* patch the classinfo pointer */
- if (showdisassemble)
- ra = ra + 5;
+ *((ptrint *) (ra + 4)) = (ptrint) c;
/* patch new function address */
- *((ptrint *) (ra + 8 + 1)) = (ptrint) BUILTIN_arrayinstanceof;
-
-#if defined(USE_THREADS)
- /* this position has been patched */
-
- o->vftbl = (vftbl_t *) 1;
-
- /* leave the monitor on the patching position */
-
- builtin_monitorexit(o);
-#endif
+ *((ptrint *) (ra + 8 + 1)) = (ptrint) BUILTIN_arraycheckcast;
return true;
}
*******************************************************************************/
-bool patcher_invokestatic_special(u1 *sp)
+bool patcher_invokestatic_special(patchref_t *pr)
{
u1 *ra;
- java_objectheader *o;
- u8 mcode;
unresolved_method *um;
methodinfo *m;
/* get stuff from the stack */
- ra = (u1 *) *((ptrint *) (sp + 4 * 4));
- o = (java_objectheader *) *((ptrint *) (sp + 3 * 4));
- mcode = *((u8 *) (sp + 1 * 4));
- um = (unresolved_method *) *((ptrint *) (sp + 0 * 4));
-
- /* calculate and set the new return address */
-
- ra = ra - 5;
- *((ptrint *) (sp + 4 * 4)) = (ptrint) ra;
-
-#if defined(USE_THREADS)
- /* enter a monitor on the patching position */
+ ra = (u1 *) pr->mpc;
+ um = (unresolved_method *) pr->ref;
- builtin_monitorenter(o);
+ /* get the methodinfo */
- /* check if the position has already been patched */
-
- if (o->vftbl) {
- builtin_monitorexit(o);
-
- return true;
- }
-#endif
-
- /* 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;
/* 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 + 1)) = (ptrint) m->stubroutine;
-#if defined(USE_THREADS)
- /* this position has been patched */
-
- o->vftbl = (vftbl_t *) 1;
-
- /* leave the monitor on the patching position */
-
- builtin_monitorexit(o);
-#endif
-
return true;
}
*******************************************************************************/
-bool patcher_invokevirtual(u1 *sp)
+bool patcher_invokevirtual(patchref_t *pr)
{
u1 *ra;
- java_objectheader *o;
- u8 mcode;
unresolved_method *um;
methodinfo *m;
/* get stuff from the stack */
- ra = (u1 *) *((ptrint *) (sp + 4 * 4));
- o = (java_objectheader *) *((ptrint *) (sp + 3 * 4));
- mcode = *((u8 *) (sp + 1 * 4));
- um = (unresolved_method *) *((ptrint *) (sp + 0 * 4));
-
- /* calculate and set the new return address */
-
- ra = ra - 5;
- *((ptrint *) (sp + 4 * 4)) = (ptrint) ra;
-
-#if defined(USE_THREADS)
- /* enter a monitor on the patching position */
-
- builtin_monitorenter(o);
-
- /* check if the position has already been patched */
-
- if (o->vftbl) {
- builtin_monitorexit(o);
-
- return true;
- }
-#endif
+ ra = (u1 *) 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 */
-
- *((u8 *) ra) = mcode;
+ PATCH_BACK_ORIGINAL_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 vftbl index */
*((s4 *) (ra + 2 + 2)) = (s4) (OFFSET(vftbl_t, table[0]) +
sizeof(methodptr) * m->vftblindex);
-#if defined(USE_THREADS)
- /* this position has been patched */
-
- o->vftbl = (vftbl_t *) 1;
-
- /* leave the monitor on the patching position */
-
- builtin_monitorexit(o);
-#endif
-
return true;
}
*******************************************************************************/
-bool patcher_invokeinterface(u1 *sp)
+bool patcher_invokeinterface(patchref_t *pr)
{
u1 *ra;
- java_objectheader *o;
- u8 mcode;
unresolved_method *um;
methodinfo *m;
/* get stuff from the stack */
- ra = (u1 *) *((ptrint *) (sp + 4 * 4));
- o = (java_objectheader *) *((ptrint *) (sp + 3 * 4));
- mcode = *((u8 *) (sp + 1 * 4));
- um = (unresolved_method *) *((ptrint *) (sp + 0 * 4));
-
- /* calculate and set the new return address */
-
- ra = ra - 5;
- *((ptrint *) (sp + 4 * 4)) = (ptrint) ra;
-
-#if defined(USE_THREADS)
- /* enter a monitor on the patching position */
-
- builtin_monitorenter(o);
-
- /* check if the position has already been patched */
-
- if (o->vftbl) {
- builtin_monitorexit(o);
-
- return true;
- }
-#endif
+ ra = (u1 *) 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 */
-
- *((u8 *) ra) = mcode;
+ PATCH_BACK_ORIGINAL_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 interfacetable index */
*((s4 *) (ra + 2 + 2)) = (s4) (OFFSET(vftbl_t, interfacetable[0]) -
- sizeof(methodptr) * m->class->index);
+ sizeof(methodptr) * m->clazz->index);
/* patch method offset */
*((s4 *) (ra + 2 + 6 + 2)) =
- (s4) (sizeof(methodptr) * (m - m->class->methods));
-
-#if defined(USE_THREADS)
- /* this position has been patched */
-
- o->vftbl = (vftbl_t *) 1;
-
- /* leave the monitor on the patching position */
-
- builtin_monitorexit(o);
-#endif
+ (s4) (sizeof(methodptr) * (m - m->clazz->methods));
return true;
}
*******************************************************************************/
-bool patcher_checkcast_instanceof_flags(u1 *sp)
+bool patcher_checkcast_instanceof_flags(patchref_t *pr)
{
u1 *ra;
- java_objectheader *o;
- u8 mcode;
constant_classref *cr;
classinfo *c;
/* get stuff from the stack */
- ra = (u1 *) *((ptrint *) (sp + 4 * 4));
- o = (java_objectheader *) *((ptrint *) (sp + 3 * 4));
- mcode = *((u8 *) (sp + 1 * 4));
- cr = (constant_classref *) *((ptrint *) (sp + 0 * 4));
-
- /* calculate and set the new return address */
-
- ra = ra - 5;
- *((ptrint *) (sp + 4 * 4)) = (ptrint) ra;
-
-#if defined(USE_THREADS)
- /* enter a monitor on the patching position */
-
- builtin_monitorenter(o);
-
- /* check if the position has already been patched */
-
- if (o->vftbl) {
- builtin_monitorexit(o);
-
- return true;
- }
-#endif
+ ra = (u1 *) 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_BACK_ORIGINAL_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 class flags */
*((s4 *) (ra + 1)) = (s4) c->flags;
-#if defined(USE_THREADS)
- /* this position has been patched */
-
- o->vftbl = (vftbl_t *) 1;
-
- /* leave the monitor on the patching position */
-
- builtin_monitorexit(o);
-#endif
-
return true;
}
-/* patcher_checkcast_instanceof_interface **************************************
+/* patcher_checkcast_interface *************************************************
Machine code:
8b 91 00 00 00 00 mov 0x00000000(%ecx),%edx
81 ea 00 00 00 00 sub $0x00000000,%edx
85 d2 test %edx,%edx
- 0f 8e 00 00 00 00 jle 0x00000000
+ 0f 8f 06 00 00 00 jg 0x00000000
+ 8b 35 03 00 00 00 mov 0x3,%esi
8b 91 00 00 00 00 mov 0x00000000(%ecx),%edx
*******************************************************************************/
-bool patcher_checkcast_instanceof_interface(u1 *sp)
+bool patcher_checkcast_interface(patchref_t *pr)
{
u1 *ra;
- java_objectheader *o;
- u8 mcode;
constant_classref *cr;
classinfo *c;
/* get stuff from the stack */
- ra = (u1 *) *((ptrint *) (sp + 4 * 4));
- o = (java_objectheader *) *((ptrint *) (sp + 3 * 4));
- mcode = *((u8 *) (sp + 1 * 4));
- cr = (constant_classref *) *((ptrint *) (sp + 0 * 4));
-
- /* calculate and set the new return address */
-
- ra = ra - 5;
- *((ptrint *) (sp + 4 * 4)) = (ptrint) ra;
-
-#if defined(USE_THREADS)
- /* enter a monitor on the patching position */
-
- builtin_monitorenter(o);
-
- /* check if the position has already been patched */
-
- if (o->vftbl) {
- builtin_monitorexit(o);
-
- return true;
- }
-#endif
+ ra = (u1 *) 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_BACK_ORIGINAL_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 super class index */
*((s4 *) (ra + 6 + 2)) = (s4) c->index;
- *((s4 *) (ra + 6 + 6 + 2 + 6 + 2)) =
+ *((s4 *) (ra + 6 + 6 + 2 + 6 + 6 + 2)) =
(s4) (OFFSET(vftbl_t, interfacetable[0]) -
c->index * sizeof(methodptr*));
-#if defined(USE_THREADS)
- /* this position has been patched */
-
- o->vftbl = (vftbl_t *) 1;
-
- /* leave the monitor on the patching position */
-
- builtin_monitorexit(o);
-#endif
-
return true;
}
-/* patcher_checkcast_class *****************************************************
+/* patcher_instanceof_interface ************************************************
Machine code:
<patched call position>
- ba 00 00 00 00 mov $0x00000000,%edx
- 8b 89 00 00 00 00 mov 0x00000000(%ecx),%ecx
- 8b 92 00 00 00 00 mov 0x00000000(%edx),%edx
- 29 d1 sub %edx,%ecx
- ba 00 00 00 00 mov $0x00000000,%edx
+ 8b 91 00 00 00 00 mov 0x00000000(%ecx),%edx
+ 81 ea 00 00 00 00 sub $0x00000000,%edx
+ 85 d2 test %edx,%edx
+ 0f 8e 13 00 00 00 jle 0x00000000
+ 8b 91 00 00 00 00 mov 0x00000000(%ecx),%edx
*******************************************************************************/
-bool patcher_checkcast_class(u1 *sp)
+bool patcher_instanceof_interface(patchref_t *pr)
{
u1 *ra;
- java_objectheader *o;
- u8 mcode;
constant_classref *cr;
classinfo *c;
/* get stuff from the stack */
- ra = (u1 *) *((ptrint *) (sp + 4 * 4));
- o = (java_objectheader *) *((ptrint *) (sp + 3 * 4));
- mcode = *((u8 *) (sp + 1 * 4));
- cr = (constant_classref *) *((ptrint *) (sp + 0 * 4));
-
- /* calculate and set the new return address */
-
- ra = ra - 5;
- *((ptrint *) (sp + 4 * 4)) = (ptrint) ra;
-
-#if defined(USE_THREADS)
- /* enter a monitor on the patching position */
-
- builtin_monitorenter(o);
-
- /* check if the position has already been patched */
-
- if (o->vftbl) {
- builtin_monitorexit(o);
-
- return true;
- }
-#endif
+ ra = (u1 *) 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_BACK_ORIGINAL_MCODE;
/* if we show disassembly, we have to skip the nop's */
- if (showdisassemble)
- ra = ra + 5;
-
- /* patch super class' vftbl */
+ if (opt_shownops)
+ ra = ra + PATCHER_CALL_SIZE;
- *((ptrint *) (ra + 1)) = (ptrint) c->vftbl;
- *((ptrint *) (ra + 5 + 6 + 6 + 2 + 1)) = (ptrint) c->vftbl;
-
-#if defined(USE_THREADS)
- /* this position has been patched */
-
- o->vftbl = (vftbl_t *) 1;
+ /* patch super class index */
- /* leave the monitor on the patching position */
+ *((s4 *) (ra + 6 + 2)) = (s4) c->index;
- builtin_monitorexit(o);
-#endif
+ *((s4 *) (ra + 6 + 6 + 2 + 6 + 2)) =
+ (s4) (OFFSET(vftbl_t, interfacetable[0]) -
+ c->index * sizeof(methodptr*));
return true;
}
-/* patcher_instanceof_class ****************************************************
+/* patcher_checkcast_class *****************************************************
Machine code:
+ <patched call position>
+ ba 00 00 00 00 mov $0x00000000,%edx
+ 8b 89 00 00 00 00 mov 0x00000000(%ecx),%ecx
+ 8b 92 00 00 00 00 mov 0x00000000(%edx),%edx
+ 29 d1 sub %edx,%ecx
+ ba 00 00 00 00 mov $0x00000000,%edx
+
*******************************************************************************/
-bool patcher_instanceof_class(u1 *sp)
+bool patcher_checkcast_class(patchref_t *pr)
{
u1 *ra;
- java_objectheader *o;
- u8 mcode;
constant_classref *cr;
classinfo *c;
/* get stuff from the stack */
- ra = (u1 *) *((ptrint *) (sp + 4 * 4));
- o = (java_objectheader *) *((ptrint *) (sp + 3 * 4));
- mcode = *((u8 *) (sp + 1 * 4));
- cr = (constant_classref *) *((ptrint *) (sp + 0 * 4));
-
- /* calculate and set the new return address */
-
- ra = ra - 5;
- *((ptrint *) (sp + 4 * 4)) = (ptrint) ra;
-
-#if defined(USE_THREADS)
- /* enter a monitor on the patching position */
-
- builtin_monitorenter(o);
-
- /* check if the position has already been patched */
-
- if (o->vftbl) {
- builtin_monitorexit(o);
-
- return true;
- }
-#endif
+ ra = (u1 *) 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_BACK_ORIGINAL_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 super class' vftbl */
*((ptrint *) (ra + 1)) = (ptrint) c->vftbl;
-
-#if defined(USE_THREADS)
- /* this position has been patched */
-
- o->vftbl = (vftbl_t *) 1;
-
- /* leave the monitor on the patching position */
-
- builtin_monitorexit(o);
-#endif
+ *((ptrint *) (ra + 5 + 6 + 6 + 2 + 1)) = (ptrint) c->vftbl;
return true;
}
-/* patcher_clinit **************************************************************
+/* patcher_instanceof_class ****************************************************
+
+ Machine code:
- XXX
+ <patched call position>
+ b9 00 00 00 00 mov $0x0,%ecx
+ 8b 40 14 mov 0x14(%eax),%eax
+ 8b 51 18 mov 0x18(%ecx),%edx
+ 8b 49 14 mov 0x14(%ecx),%ecx
*******************************************************************************/
-bool patcher_clinit(u1 *sp)
+bool patcher_instanceof_class(patchref_t *pr)
{
u1 *ra;
- java_objectheader *o;
- u8 mcode;
+ constant_classref *cr;
classinfo *c;
/* get stuff from the stack */
- ra = (u1 *) *((ptrint *) (sp + 4 * 4));
- o = (java_objectheader *) *((ptrint *) (sp + 3 * 4));
- mcode = *((u8 *) (sp + 1 * 4));
- c = (classinfo *) *((ptrint *) (sp + 0 * 4));
-
- /* calculate and set the new return address */
-
- ra = ra - 5;
- *((ptrint *) (sp + 4 * 4)) = (ptrint) ra;
-
-#if defined(USE_THREADS)
- /* enter a monitor on the patching position */
-
- builtin_monitorenter(o);
+ ra = (u1 *) pr->mpc;
+ cr = (constant_classref *) pr->ref;
- /* check if the position has already been patched */
-
- if (o->vftbl) {
- builtin_monitorexit(o);
-
- return true;
- }
-#endif
-
- /* check if the class is initialized */
-
- if (!c->initialized)
- if (!initialize_class(c))
- return false;
+ /* get the fieldinfo */
- /* patch back original code */
+ if (!(c = resolve_classref_eager(cr)))
+ return false;
- *((u8 *) ra) = mcode;
+ PATCH_BACK_ORIGINAL_MCODE;
-#if defined(USE_THREADS)
- /* this position has been patched */
+ /* if we show disassembly, we have to skip the nop's */
- o->vftbl = (vftbl_t *) 1;
+ if (opt_shownops)
+ ra = ra + PATCHER_CALL_SIZE;
- /* leave the monitor on the patching position */
+ /* patch super class' vftbl */
- builtin_monitorexit(o);
-#endif
+ *((ptrint *) (ra + 1)) = (ptrint) c->vftbl;
return true;
}
projects / cacao.git / blobdiff