X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=src%2Fvm%2Fjit%2Fx86_64%2Fpatcher.c;h=be30afa3759f0711b57cb8b7fbf489d81480707f;hb=7659949229c634784f7d27aa8b679fdd4c8351ab;hp=08bf676f7ab843a5cad7cfed9aaa8711defe3b16;hpb=30f9b7263ac7bec66d1e13546f638dff499e6cce;p=cacao.git diff --git a/src/vm/jit/x86_64/patcher.c b/src/vm/jit/x86_64/patcher.c index 08bf676f7..be30afa37 100644 --- a/src/vm/jit/x86_64/patcher.c +++ b/src/vm/jit/x86_64/patcher.c @@ -1,9 +1,7 @@ /* src/vm/jit/x86_64/patcher.c - x86_64 code patching functions - Copyright (C) 1996-2005 R. Grafl, A. Krall, C. Kruegel, C. Oates, - R. Obermaisser, M. Platter, M. Probst, S. Ring, E. Steiner, - C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich, J. Wenninger, - Institut f. Computersprachen - TU Wien + Copyright (C) 1996-2005, 2006, 2007, 2008 + CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO This file is part of CACAO. @@ -19,588 +17,333 @@ 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: - $Id: patcher.c 3096 2005-07-21 14:01:02Z twisti $ +#include "config.h" -*/ +#include +#include "vm/types.h" -#include "vm/jit/x86_64/types.h" +#include "vm/jit/x86_64/codegen.h" #include "mm/memory.h" + #include "native/native.h" + #include "vm/builtin.h" #include "vm/exceptions.h" -#include "vm/field.h" #include "vm/initialize.h" -#include "vm/options.h" -#include "vm/references.h" -#include "vm/jit/helper.h" -#include "vm/jit/patcher.h" - - -/* patcher_get_putstatic ******************************************************* - - Machine code: - - - 4d 8b 15 86 fe ff ff mov -378(%rip),%r10 - 49 8b 32 mov (%r10),%rsi - -*******************************************************************************/ - -bool patcher_get_putstatic(u1 *sp) -{ - u1 *ra; - java_objectheader *o; - u8 mcode; - unresolved_field *uf; - s4 disp; - fieldinfo *fi; - s4 offset; - - /* get stuff from the stack */ - - ra = (u1 *) *((ptrint *) (sp + 4 * 8)); - o = (java_objectheader *) *((ptrint *) (sp + 3 * 8)); - mcode = *((u8 *) (sp + 2 * 8)); - uf = (unresolved_field *) *((ptrint *) (sp + 1 * 8)); - disp = (unresolved_field *) *((s4 *) (sp + 0 * 8)); - - /* calculate and set the new return address */ - - ra = ra - 5; - *((ptrint *) (sp + 4 * 8)) = (ptrint) ra; - - PATCHER_MONITORENTER; - - /* get the fieldinfo */ - - if (!(fi = helper_resolve_fieldinfo(uf))) { - PATCHER_MONITOREXIT; - return false; - } - - /* check if the field's class is initialized */ - - if (!initialize_class(fi->class)) { - PATCHER_MONITOREXIT; - - return false; - } - - /* patch back original code */ +#include "vm/jit/patcher-common.h" +#include "vm/jit/stacktrace.h" - *((u8 *) ra) = mcode; - - /* if we show disassembly, we have to skip the nop's */ +#include "vmcore/class.h" +#include "vmcore/field.h" +#include "vmcore/options.h" +#include "vmcore/references.h" +#include "vm/resolve.h" - if (opt_showdisassemble) - ra = ra + 5; - /* get RIP offset from machine instruction */ +#define PATCH_BACK_ORIGINAL_MCODE \ + do { \ + *((uint16_t *) pr->mpc) = (uint16_t) pr->mcode; \ + } while (0) - offset = *((u4 *) (ra + 3)); - /* patch the field value's address (+ 7: is the size of the RIP move) */ +/* patcher_patch_code ********************************************************** - *((ptrint *) (ra + 7 + offset)) = (ptrint) &(fi->value); - - PATCHER_MARK_PATCHED_MONITOREXIT; - - return true; -} - - -/* patcher_get_putfield ******************************************************** - - Machine code: - - - 45 8b 8f 00 00 00 00 mov 0x0(%r15),%r9d + Just patches back the original machine code. *******************************************************************************/ -bool patcher_get_putfield(u1 *sp) +void patcher_patch_code(patchref_t *pr) { - u1 *ra; - java_objectheader *o; - u8 mcode; - unresolved_field *uf; - fieldinfo *fi; - u1 byte; - - /* get stuff from the stack */ - - ra = (u1 *) *((ptrint *) (sp + 4 * 8)); - o = (java_objectheader *) *((ptrint *) (sp + 3 * 8)); - mcode = *((u8 *) (sp + 2 * 8)); - uf = (unresolved_field *) *((ptrint *) (sp + 1 * 8)); - - /* calculate and set the new return address */ - - ra = ra - 5; - *((ptrint *) (sp + 4 * 8)) = (ptrint) ra; - - PATCHER_MONITORENTER; - - /* get the fieldinfo */ - - if (!(fi = helper_resolve_fieldinfo(uf))) { - PATCHER_MONITOREXIT; - - return false; - } - - /* patch back original code (instruction code is smaller than 8 bytes) */ - - *((u4 *) (ra + 0)) = (u4) mcode; - *((u1 *) (ra + 4)) = (u1) (mcode >> 32); - - /* if we show disassembly, we have to skip the nop's */ - - if (opt_showdisassemble) - ra = ra + 5; - - /* patch the field's offset: we check for the field type, because the */ - /* instructions have different lengths */ - - if (IS_INT_LNG_TYPE(fi->type)) { - /* check for special case: %rsp or %r12 as base register */ - - byte = *(ra + 3); - - if (byte == 0x24) - *((u4 *) (ra + 4)) = (u4) (fi->offset); - else - *((u4 *) (ra + 3)) = (u4) (fi->offset); - - } else { - /* check for special case: %rsp or %r12 as base register */ + PATCH_BACK_ORIGINAL_MCODE; +} - byte = *(ra + 5); - if (byte == 0x24) - *((u4 *) (ra + 6)) = (u4) (fi->offset); - else - *((u4 *) (ra + 5)) = (u4) (fi->offset); - } +/* patcher_resolve_classref_to_classinfo *************************************** - PATCHER_MARK_PATCHED_MONITOREXIT; + ACONST: - return true; -} + + 48 bf a0 f0 92 00 00 00 00 00 mov $0x92f0a0,%rdi + MULTIANEWARRAY: -/* patcher_putfieldconst ******************************************************* + + 48 be 30 40 b2 00 00 00 00 00 mov $0xb24030,%rsi + 48 89 e2 mov %rsp,%rdx + 48 b8 7c 96 4b 00 00 00 00 00 mov $0x4b967c,%rax + 48 ff d0 callq *%rax - Machine code: + ARRAYCHECKCAST: - 41 c7 85 00 00 00 00 7b 00 00 00 movl $0x7b,0x0(%r13) + 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_putfieldconst(u1 *sp) +bool patcher_resolve_classref_to_classinfo(patchref_t *pr) { - u1 *ra; - java_objectheader *o; - u8 mcode; - unresolved_field *uf; - fieldinfo *fi; - - /* get stuff from the stack */ - - ra = (u1 *) *((ptrint *) (sp + 4 * 8)); - o = (java_objectheader *) *((ptrint *) (sp + 3 * 8)); - mcode = *((u8 *) (sp + 2 * 8)); - uf = (unresolved_field *) *((ptrint *) (sp + 1 * 8)); - - /* calculate and set the new return address */ - - ra = ra - 5; - *((ptrint *) (sp + 4 * 8)) = (ptrint) ra; - - PATCHER_MONITORENTER; + constant_classref *cr; + intptr_t *datap; + classinfo *c; - /* get the fieldinfo */ + cr = (constant_classref *) pr->ref; + datap = (intptr_t *) pr->datap; - if (!(fi = helper_resolve_fieldinfo(uf))) { - PATCHER_MONITOREXIT; + /* get the classinfo */ + if (!(c = resolve_classref_eager(cr))) return false; - } - /* patch back original code */ + PATCH_BACK_ORIGINAL_MCODE; - *((u8 *) ra) = mcode; - - /* if we show disassembly, we have to skip the nop's */ - - if (opt_showdisassemble) - ra = ra + 5; - - /* 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 */ - - if (*(ra + 2) == 0x84) { - *((u4 *) (ra + 4)) = (u4) (fi->offset); - *((u4 *) (ra + 12 + 4)) = (u4) (fi->offset + 4); - - } else { - *((u4 *) (ra + 3)) = (u4) (fi->offset); - *((u4 *) (ra + 11 + 3)) = (u4) (fi->offset + 4); - } - - } else { - /* handle special case when the base register is %r12 */ - - if (*(ra + 2) == 0x84) - *((u4 *) (ra + 4)) = (u4) (fi->offset); - else - *((u4 *) (ra + 3)) = (u4) (fi->offset); - } + /* patch the classinfo pointer */ - PATCHER_MARK_PATCHED_MONITOREXIT; + *datap = (intptr_t) c; return true; } -/* patcher_builtin_new ********************************************************* +/* patcher_resolve_classref_to_vftbl ******************************************* - Machine code: + CHECKCAST (class): + INSTANCEOF (class): - 48 bf a0 f0 92 00 00 00 00 00 mov $0x92f0a0,%rdi - 48 b8 00 00 00 00 00 00 00 00 mov $0x0,%rax - 48 ff d0 callq *%rax *******************************************************************************/ -bool patcher_builtin_new(u1 *sp) +bool patcher_resolve_classref_to_vftbl(patchref_t *pr) { - u1 *ra; - java_objectheader *o; - u8 mcode; constant_classref *cr; + intptr_t *datap; classinfo *c; /* get stuff from the stack */ - ra = (u1 *) *((ptrint *) (sp + 4 * 8)); - o = (java_objectheader *) *((ptrint *) (sp + 3 * 8)); - mcode = *((u8 *) (sp + 2 * 8)); - cr = (constant_classref *) *((ptrint *) (sp + 1 * 8)); - - /* calculate and set the new return address */ - - ra = ra - (10 + 5); - *((ptrint *) (sp + 4 * 8)) = (ptrint) ra; - - PATCHER_MONITORENTER; - - /* get the classinfo */ - - if (!(c = helper_resolve_classinfo(cr))) { - PATCHER_MONITOREXIT; + cr = (constant_classref *) pr->ref; + datap = (intptr_t *) pr->datap; - return false; - } - - if (!initialize_class(c)) { - PATCHER_MONITOREXIT; + /* get the fieldinfo */ + if (!(c = resolve_classref_eager(cr))) return false; - } - - /* patch back original code */ - - *((u8 *) (ra + 10)) = mcode; - - /* patch the classinfo pointer */ - - *((ptrint *) (ra + 2)) = (ptrint) c; - - /* if we show disassembly, we have to skip the nop's */ - - if (opt_showdisassemble) - ra = ra + 5; - /* patch new function address */ + PATCH_BACK_ORIGINAL_MCODE; - *((ptrint *) (ra + 10 + 2)) = (ptrint) BUILTIN_new; + /* patch super class' vftbl */ - PATCHER_MARK_PATCHED_MONITOREXIT; + *datap = (intptr_t) c->vftbl; return true; } -/* patcher_builtin_newarray **************************************************** +/* patcher_resolve_classref_to_flags ******************************************* - Machine code: + CHECKCAST/INSTANCEOF: - 48 be 88 13 9b 00 00 00 00 00 mov $0x9b1388,%rsi - 48 b8 00 00 00 00 00 00 00 00 mov $0x0,%rax - 48 ff d0 callq *%rax *******************************************************************************/ -bool patcher_builtin_newarray(u1 *sp) +bool patcher_resolve_classref_to_flags(patchref_t *pr) { - u1 *ra; - java_objectheader *o; - u8 mcode; constant_classref *cr; + int32_t *datap; classinfo *c; + uint8_t *ra; - /* get stuff from the stack */ - - ra = (u1 *) *((ptrint *) (sp + 4 * 8)); - o = (java_objectheader *) *((ptrint *) (sp + 3 * 8)); - mcode = *((u8 *) (sp + 2 * 8)); - cr = (constant_classref *) *((ptrint *) (sp + 1 * 8)); - - /* calculate and set the new return address */ + cr = (constant_classref *) pr->ref; + datap = (int32_t *) pr->datap; + ra = (uint8_t *) pr->mpc; - ra = ra - (10 + 5); - *((ptrint *) (sp + 4 * 8)) = (ptrint) ra; - - PATCHER_MONITORENTER; - - /* get the classinfo */ - - if (!(c = helper_resolve_classinfo(cr))) { - PATCHER_MONITOREXIT; + /* get the fieldinfo */ + 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; + PATCH_BACK_ORIGINAL_MCODE; /* if we show disassembly, we have to skip the nop's */ - if (opt_showdisassemble) - ra = ra + 5; - - /* patch new function address */ + if (opt_shownops) + ra = ra + PATCHER_CALL_SIZE; - *((ptrint *) (ra + 10 + 2)) = (ptrint) BUILTIN_newarray; + /* patch class flags */ - PATCHER_MARK_PATCHED_MONITOREXIT; +/* *datap = c->flags; */ + *((int32_t *) (ra + 2)) = c->flags; return true; } -/* patcher_builtin_multianewarray ********************************************** +/* patcher_get_putstatic ******************************************************* Machine code: - 48 bf 02 00 00 00 00 00 00 00 mov $0x2,%rdi - 48 be 30 40 b2 00 00 00 00 00 mov $0xb24030,%rsi - 48 89 e2 mov %rsp,%rdx - 48 b8 7c 96 4b 00 00 00 00 00 mov $0x4b967c,%rax - 48 ff d0 callq *%rax + 4d 8b 15 86 fe ff ff mov -378(%rip),%r10 + 49 8b 32 mov (%r10),%rsi *******************************************************************************/ -bool patcher_builtin_multianewarray(u1 *sp) +bool patcher_get_putstatic(patchref_t *pr) { - u1 *ra; - java_objectheader *o; - u8 mcode; - constant_classref *cr; - classinfo *c; + unresolved_field *uf; + intptr_t *datap; + fieldinfo *fi; - /* get stuff from the stack */ - - ra = (u1 *) *((ptrint *) (sp + 4 * 8)); - o = (java_objectheader *) *((ptrint *) (sp + 3 * 8)); - mcode = *((u8 *) (sp + 2 * 8)); - cr = (constant_classref *) *((ptrint *) (sp + 1 * 8)); - - /* calculate and set the new return address */ - - ra = ra - 5; - *((ptrint *) (sp + 4 * 8)) = (ptrint) ra; - - PATCHER_MONITORENTER; - - /* get the classinfo */ + uf = (unresolved_field *) pr->ref; + datap = (intptr_t *) pr->datap; - if (!(c = helper_resolve_classinfo(cr))) { - PATCHER_MONITOREXIT; + /* get the fieldinfo */ + if (!(fi = resolve_field_eager(uf))) return false; - } - - /* patch back original code */ - - *((u8 *) ra) = mcode; - - /* if we show disassembly, we have to skip the nop's */ - if (opt_showdisassemble) - ra = ra + 5; - - /* patch the class' vftbl pointer */ + /* check if the field's class is initialized */ - *((ptrint *) (ra + 10 + 2)) = (ptrint) c->vftbl; + if (!(fi->clazz->state & CLASS_INITIALIZED)) + if (!initialize_class(fi->clazz)) + return false; - /* patch new function address */ + PATCH_BACK_ORIGINAL_MCODE; - *((ptrint *) (ra + 10 + 10 + 3 + 2)) = (ptrint) BUILTIN_multianewarray; + /* patch the field value's address */ - PATCHER_MARK_PATCHED_MONITOREXIT; + *datap = (intptr_t) fi->value; return true; } -/* patcher_builtin_arraycheckcast ********************************************** +/* patcher_get_putfield ******************************************************** Machine code: - 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 + 45 8b 8f 00 00 00 00 mov 0x0(%r15),%r9d *******************************************************************************/ -bool patcher_builtin_arraycheckcast(u1 *sp) +bool patcher_get_putfield(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 * 8)); - o = (java_objectheader *) *((ptrint *) (sp + 3 * 8)); - mcode = *((u8 *) (sp + 2 * 8)); - cr = (constant_classref *) *((ptrint *) (sp + 1 * 8)); - - /* calculate and set the new return address */ + uint8_t *ra; + unresolved_field *uf; + fieldinfo *fi; + uint8_t byte; - ra = ra - 5; - *((ptrint *) (sp + 4 * 8)) = (ptrint) ra; + ra = (uint8_t *) pr->mpc; + uf = (unresolved_field *) pr->ref; - PATCHER_MONITORENTER; - - /* get the classinfo */ - - if (!(c = helper_resolve_classinfo(cr))) { - PATCHER_MONITOREXIT; + /* get the fieldinfo */ + 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 (opt_showdisassemble) - ra = ra + 5; + if (opt_shownops) + ra = ra + PATCHER_CALL_SIZE; - /* patch the class' vftbl pointer */ + /* Patch the field's offset: we check for the field type, because + the instructions have different lengths. */ - *((ptrint *) (ra + 2)) = (ptrint) c->vftbl; + if (IS_INT_LNG_TYPE(fi->type)) { + /* Check for special case: %rsp or %r12 as base register. */ - /* patch new function address */ + byte = *(ra + 3); + + 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. */ - *((ptrint *) (ra + 10 + 2)) = (ptrint) BUILTIN_arraycheckcast; + byte = *(ra + 5); - PATCHER_MARK_PATCHED_MONITOREXIT; + if (byte == 0x24) + *((int32_t *) (ra + 6)) = fi->offset; + else + *((int32_t *) (ra + 5)) = fi->offset; + } return true; } -/* patcher_builtin_arrayinstanceof ********************************************* +/* patcher_putfieldconst ******************************************************* Machine code: - 48 be 30 3c b2 00 00 00 00 00 mov $0xb23c30,%rsi - 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_arrayinstanceof(u1 *sp) +bool patcher_putfieldconst(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 * 8)); - o = (java_objectheader *) *((ptrint *) (sp + 3 * 8)); - mcode = *((u8 *) (sp + 2 * 8)); - cr = (constant_classref *) *((ptrint *) (sp + 1 * 8)); - - /* calculate and set the new return address */ - - ra = ra - (10 + 5); - *((ptrint *) (sp + 4 * 8)) = (ptrint) ra; + uint8_t *ra; + unresolved_field *uf; + fieldinfo *fi; + uint8_t byte; - PATCHER_MONITORENTER; + ra = (uint8_t *) pr->mpc; + uf = (unresolved_field *) pr->ref; - /* get the classinfo */ - - if (!(c = helper_resolve_classinfo(cr))) { - PATCHER_MONITOREXIT; + /* get the fieldinfo */ + if (!(fi = resolve_field_eager(uf))) return false; - } - /* patch back original code */ + PATCH_BACK_ORIGINAL_MCODE; - *((u8 *) (ra + 10)) = mcode; + /* if we show disassembly, we have to skip the nop's */ - /* patch the class' vftbl pointer */ + if (opt_shownops) + ra = ra + PATCHER_CALL_SIZE; - *((ptrint *) (ra + 2)) = (ptrint) c->vftbl; + /* patch the field's offset */ - /* if we show disassembly, we have to skip the nop's */ + if (IS_2_WORD_TYPE(fi->type) || IS_ADR_TYPE(fi->type)) { + /* handle special case when the base register is %r12 */ - if (opt_showdisassemble) - ra = ra + 5; + byte = *(ra + 12); - /* patch new function address */ + if (byte == 0x94) { + *((uint32_t *) (ra + 14)) = fi->offset; + } + else { + *((uint32_t *) (ra + 13)) = fi->offset; + } + } + else { + /* handle special case when the base register is %r12 */ - *((ptrint *) (ra + 10 + 2)) = (ptrint) BUILTIN_arrayinstanceof; + byte = *(ra + 2); - PATCHER_MARK_PATCHED_MONITOREXIT; + if (byte == 0x84) + *((uint32_t *) (ra + 4)) = fi->offset; + else + *((uint32_t *) (ra + 3)) = fi->offset; + } return true; } @@ -616,49 +359,27 @@ bool patcher_builtin_arrayinstanceof(u1 *sp) *******************************************************************************/ -bool patcher_invokestatic_special(u1 *sp) +bool patcher_invokestatic_special(patchref_t *pr) { - u1 *ra; - java_objectheader *o; - u8 mcode; unresolved_method *um; + intptr_t *datap; methodinfo *m; /* get stuff from the stack */ - ra = (u1 *) *((ptrint *) (sp + 4 * 8)); - o = (java_objectheader *) *((ptrint *) (sp + 3 * 8)); - mcode = *((u8 *) (sp + 2 * 8)); - um = (unresolved_method *) *((ptrint *) (sp + 1 * 8)); - - /* calculate and set the new return address */ - - ra = ra - 5; - *((ptrint *) (sp + 4 * 8)) = (ptrint) ra; - - PATCHER_MONITORENTER; + um = (unresolved_method *) pr->ref; + datap = (intptr_t *) pr->datap; /* get the fieldinfo */ - if (!(m = helper_resolve_methodinfo(um))) { - PATCHER_MONITOREXIT; - + 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 (opt_showdisassemble) - ra = ra + 5; + PATCH_BACK_ORIGINAL_MCODE; /* patch stubroutine */ - *((ptrint *) (ra + 2)) = (ptrint) m->stubroutine; - - PATCHER_MARK_PATCHED_MONITOREXIT; + *datap = (intptr_t) m->stubroutine; return true; } @@ -675,51 +396,32 @@ bool patcher_invokestatic_special(u1 *sp) *******************************************************************************/ -bool patcher_invokevirtual(u1 *sp) +bool patcher_invokevirtual(patchref_t *pr) { - u1 *ra; - java_objectheader *o; - u8 mcode; + uint8_t *ra; unresolved_method *um; methodinfo *m; - /* get stuff from the stack */ - - ra = (u1 *) *((ptrint *) (sp + 4 * 8)); - o = (java_objectheader *) *((ptrint *) (sp + 3 * 8)); - mcode = *((u8 *) (sp + 2 * 8)); - um = (unresolved_method *) *((ptrint *) (sp + 1 * 8)); - - /* calculate and set the new return address */ + ra = (uint8_t *) pr->mpc; + um = (unresolved_method *) pr->ref; - ra = ra - 5; - *((ptrint *) (sp + 4 * 8)) = (ptrint) ra; - - PATCHER_MONITORENTER; - - /* get the fieldinfo */ - - if (!(m = helper_resolve_methodinfo(um))) { - PATCHER_MONITOREXIT; + /* get the methodinfo */ + 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 (opt_showdisassemble) - ra = ra + 5; + if (opt_shownops) + ra = ra + PATCHER_CALL_SIZE; /* patch vftbl index */ - *((s4 *) (ra + 3 + 3)) = (s4) (OFFSET(vftbl_t, table[0]) + - sizeof(methodptr) * m->vftblindex); - - PATCHER_MARK_PATCHED_MONITOREXIT; + *((int32_t *) (ra + 3 + 3)) = + (int32_t) (OFFSET(vftbl_t, table[0]) + + sizeof(methodptr) * m->vftblindex); return true; } @@ -737,418 +439,133 @@ bool patcher_invokevirtual(u1 *sp) *******************************************************************************/ -bool patcher_invokeinterface(u1 *sp) +bool patcher_invokeinterface(patchref_t *pr) { - u1 *ra; - java_objectheader *o; - u8 mcode; + uint8_t *ra; unresolved_method *um; methodinfo *m; /* get stuff from the stack */ - ra = (u1 *) *((ptrint *) (sp + 4 * 8)); - o = (java_objectheader *) *((ptrint *) (sp + 3 * 8)); - mcode = *((u8 *) (sp + 2 * 8)); - um = (unresolved_method *) *((ptrint *) (sp + 1 * 8)); - - /* calculate and set the new return address */ - - ra = ra - 5; - *((ptrint *) (sp + 4 * 8)) = (ptrint) ra; - - PATCHER_MONITORENTER; + ra = (uint8_t *) pr->mpc; + um = (unresolved_method *) pr->ref; /* get the fieldinfo */ - if (!(m = helper_resolve_methodinfo(um))) { - PATCHER_MONITOREXIT; - + 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 (opt_showdisassemble) - ra = ra + 5; + if (opt_shownops) + ra = ra + PATCHER_CALL_SIZE; /* patch interfacetable index */ - *((s4 *) (ra + 3 + 3)) = (s4) (OFFSET(vftbl_t, interfacetable[0]) - - sizeof(methodptr) * m->class->index); + *((int32_t *) (ra + 3 + 3)) = + (int32_t) (OFFSET(vftbl_t, interfacetable[0]) - + sizeof(methodptr) * m->clazz->index); /* patch method offset */ - *((s4 *) (ra + 3 + 7 + 3)) = - (s4) (sizeof(methodptr) * (m - m->class->methods)); - - PATCHER_MARK_PATCHED_MONITOREXIT; + *((int32_t *) (ra + 3 + 7 + 3)) = + (int32_t) (sizeof(methodptr) * (m - m->clazz->methods)); return true; } -/* patcher_checkcast_instanceof_flags ****************************************** +/* patcher_checkcast_interface ************************************************* Machine code: - 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 + 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_flags(u1 *sp) +bool patcher_checkcast_interface(patchref_t *pr) { - u1 *ra; - java_objectheader *o; - u8 mcode; + uint8_t *ra; constant_classref *cr; classinfo *c; - /* get stuff from the stack */ - - ra = (u1 *) *((ptrint *) (sp + 4 * 8)); - o = (java_objectheader *) *((ptrint *) (sp + 3 * 8)); - mcode = *((u8 *) (sp + 2 * 8)); - cr = (constant_classref *) *((ptrint *) (sp + 1 * 8)); - - /* calculate and set the new return address */ - - ra = ra - 5; - *((ptrint *) (sp + 4 * 8)) = (ptrint) ra; - - PATCHER_MONITORENTER; + ra = (uint8_t *) pr->mpc; + cr = (constant_classref *) pr->ref; /* get the fieldinfo */ - if (!(c = helper_resolve_classinfo(cr))) { - PATCHER_MONITOREXIT; - + 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 (opt_showdisassemble) - ra = ra + 5; + if (opt_shownops) + ra = ra + PATCHER_CALL_SIZE; - /* patch class flags */ + /* patch super class index */ - *((s4 *) (ra + 2)) = (s4) c->flags; + *((int32_t *) (ra + 7 + 3)) = c->index; - PATCHER_MARK_PATCHED_MONITOREXIT; + *((int32_t *) (ra + 7 + 7 + 6 + 8 + 3)) = + (int32_t) (OFFSET(vftbl_t, interfacetable[0]) - + c->index * sizeof(methodptr*)); return true; } -/* patcher_checkcast_instanceof_interface ************************************** +/* patcher_instanceof_interface ************************************************ Machine code: 45 8b 9a 1c 00 00 00 mov 0x1c(%r10),%r11d - 49 81 eb 00 00 00 00 sub $0x0,%r11 - 4d 85 db test %r11,%r11 + 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_checkcast_instanceof_interface(u1 *sp) +bool patcher_instanceof_interface(patchref_t *pr) { - u1 *ra; - java_objectheader *o; - u8 mcode; + uint8_t *ra; constant_classref *cr; classinfo *c; - /* get stuff from the stack */ - - ra = (u1 *) *((ptrint *) (sp + 4 * 8)); - o = (java_objectheader *) *((ptrint *) (sp + 3 * 8)); - mcode = *((u8 *) (sp + 2 * 8)); - cr = (constant_classref *) *((ptrint *) (sp + 1 * 8)); - - /* calculate and set the new return address */ - - ra = ra - 5; - *((ptrint *) (sp + 4 * 8)) = (ptrint) ra; - - PATCHER_MONITORENTER; + ra = (uint8_t *) pr->mpc; + cr = (constant_classref *) pr->ref; /* get the fieldinfo */ - if (!(c = helper_resolve_classinfo(cr))) { - PATCHER_MONITOREXIT; - + 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 (opt_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) (OFFSET(vftbl_t, interfacetable[0]) - - c->index * sizeof(methodptr*)); - - PATCHER_MARK_PATCHED_MONITOREXIT; - - return true; -} - - -/* patcher_checkcast_class ***************************************************** - - Machine code: - - - 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 - -*******************************************************************************/ - -bool patcher_checkcast_class(u1 *sp) -{ - u1 *ra; - java_objectheader *o; - u8 mcode; - constant_classref *cr; - classinfo *c; - - /* get stuff from the stack */ - - ra = (u1 *) *((ptrint *) (sp + 4 * 8)); - o = (java_objectheader *) *((ptrint *) (sp + 3 * 8)); - mcode = *((u8 *) (sp + 2 * 8)); - cr = (constant_classref *) *((ptrint *) (sp + 1 * 8)); - - /* calculate and set the new return address */ - - ra = ra - 5; - *((ptrint *) (sp + 4 * 8)) = (ptrint) ra; - - PATCHER_MONITORENTER; - - /* get the fieldinfo */ - - if (!(c = helper_resolve_classinfo(cr))) { - PATCHER_MONITOREXIT; - - return false; - } - - /* patch back original code */ - - *((u8 *) ra) = mcode; - - /* if we show disassembly, we have to skip the nop's */ - - if (opt_showdisassemble) - ra = ra + 5; - - /* patch super class' vftbl */ - - *((ptrint *) (ra + 2)) = (ptrint) c->vftbl; - *((ptrint *) (ra + 10 + 7 + 7 + 3 + 2)) = (ptrint) c->vftbl; - - PATCHER_MARK_PATCHED_MONITOREXIT; - - return true; -} - - -/* patcher_instanceof_class **************************************************** - - Machine code: - - - 49 ba 00 00 00 00 00 00 00 00 mov $0x0,%r10 - -*******************************************************************************/ - -bool patcher_instanceof_class(u1 *sp) -{ - u1 *ra; - java_objectheader *o; - u8 mcode; - constant_classref *cr; - classinfo *c; - - /* get stuff from the stack */ - - ra = (u1 *) *((ptrint *) (sp + 4 * 8)); - o = (java_objectheader *) *((ptrint *) (sp + 3 * 8)); - mcode = *((u8 *) (sp + 2 * 8)); - cr = (constant_classref *) *((ptrint *) (sp + 1 * 8)); - - /* calculate and set the new return address */ - - ra = ra - 5; - *((ptrint *) (sp + 4 * 8)) = (ptrint) ra; - - PATCHER_MONITORENTER; - - /* get the fieldinfo */ - - if (!(c = helper_resolve_classinfo(cr))) { - PATCHER_MONITOREXIT; - - return false; - } - - /* patch back original code */ - - *((u8 *) ra) = mcode; - - /* if we show disassembly, we have to skip the nop's */ - - if (opt_showdisassemble) - ra = ra + 5; - - /* patch super class' vftbl */ - - *((ptrint *) (ra + 2)) = (ptrint) c->vftbl; - - PATCHER_MARK_PATCHED_MONITOREXIT; - - return true; -} - - -/* patcher_clinit ************************************************************** - - May be used for GET/PUTSTATIC and in native stub. - - Machine code: - - - 4d 8b 15 92 ff ff ff mov -110(%rip),%r10 - 49 89 1a mov %rbx,(%r10) - -*******************************************************************************/ - -bool patcher_clinit(u1 *sp) -{ - u1 *ra; - java_objectheader *o; - u8 mcode; - classinfo *c; - - /* get stuff from the stack */ - - ra = (u1 *) *((ptrint *) (sp + 4 * 8)); - o = (java_objectheader *) *((ptrint *) (sp + 3 * 8)); - mcode = *((u8 *) (sp + 2 * 8)); - c = (classinfo *) *((ptrint *) (sp + 1 * 8)); - - /* calculate and set the new return address */ - - ra = ra - 5; - *((ptrint *) (sp + 4 * 8)) = (ptrint) ra; - - PATCHER_MONITORENTER; - - /* check if the class is initialized */ - - if (!initialize_class(c)) { - PATCHER_MONITOREXIT; - - return false; - } - - /* patch back original code */ - - *((u8 *) ra) = mcode; - - PATCHER_MARK_PATCHED_MONITOREXIT; - - return true; -} - - -/* patcher_resolve_native ****************************************************** - - Machine code: - - - 48 b8 00 00 00 00 00 00 00 00 mov $0x0,%rax - 48 ff d0 callq *%rax - -*******************************************************************************/ - -#if !defined(ENABLE_STATICVM) -bool patcher_resolve_native(u1 *sp) -{ - u1 *ra; - java_objectheader *o; - u8 mcode; - methodinfo *m; - functionptr f; - - /* get stuff from the stack */ - - ra = (u1 *) *((ptrint *) (sp + 4 * 8)); - o = (java_objectheader *) *((ptrint *) (sp + 3 * 8)); - mcode = *((u8 *) (sp + 2 * 8)); - m = (methodinfo *) *((ptrint *) (sp + 1 * 8)); - - /* calculate and set the new return address */ - - ra = ra - 5; - *((ptrint *) (sp + 4 * 8)) = (ptrint) ra; - - PATCHER_MONITORENTER; - - /* resolve native function */ - - if (!(f = native_resolve_function(m))) { - PATCHER_MONITOREXIT; - - return false; - } - - /* patch back original code */ - - *((u8 *) ra) = mcode; - - /* if we show disassembly, we have to skip the nop's */ - - if (opt_showdisassemble) - ra = ra + 5; - - /* patch native function pointer */ - - *((ptrint *) (ra + 2)) = (ptrint) f; + *((int32_t *) (ra + 7 + 3)) = c->index; - PATCHER_MARK_PATCHED_MONITOREXIT; + *((int32_t *) (ra + 7 + 7 + 6 + 3)) = + (int32_t) (OFFSET(vftbl_t, interfacetable[0]) - + c->index * sizeof(methodptr*)); return true; } -#endif /* !defined(ENABLE_STATICVM) */ /*