X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=src%2Fvm%2Fjit%2Fx86_64%2Fpatcher.c;h=b7fcccb633ab59b995b90525b61df249ce37ee48;hb=c414f560a7e0b7636a780e6b933e91e441f80503;hp=f835ac982347c11789848b689bdbfa806b08dd46;hpb=375cb7ad045b10d33e50fa96bbf91f906a553cf7;p=cacao.git diff --git a/src/vm/jit/x86_64/patcher.c b/src/vm/jit/x86_64/patcher.c index f835ac982..b7fcccb63 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-2011 + CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO This file is part of CACAO. @@ -19,616 +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. - - Contact: cacao@complang.tuwien.ac.at - - Authors: Christian Thalinger - - Changes: - - $Id: patcher.c 2765 2005-06-21 10:40:28Z twisti $ + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301, USA. */ -#include "vm/jit/x86_64/types.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" - - -bool helper_initialize_class(void* beginOfJavaStack,classinfo *c,u1 *ra) -{ - if (!c->initialized) { - native_stackframeinfo sfi; - bool init; - - /* more or less the same as the above sfi setup is done in the assembler code by the prepare/remove functions*/ - sfi.returnToFromNative = (functionptr) (ptrint) ra; - sfi.beginOfJavaStackframe = beginOfJavaStack; - sfi.method = NULL; /*internal*/ - sfi.addressOfThreadspecificHead = builtin_asm_get_stackframeinfo(); - sfi.oldThreadspecificHeadValue = *(sfi.addressOfThreadspecificHead); - *(sfi.addressOfThreadspecificHead) = &sfi; +#include "config.h" - /*printf("calling static initializer (helper_initialize_class), returnaddress=%p for class %s\n",ra,c->name->text);*/ +#include - init=initialize_class(c); +#include "vm/types.h" - *(sfi.addressOfThreadspecificHead) = sfi.oldThreadspecificHeadValue; +#include "vm/jit/x86_64/codegen.h" +#include "vm/jit/x86_64/md.h" - return init; - } +#include "mm/memory.hpp" - return true; -} +#include "native/native.hpp" +#include "vm/jit/builtin.hpp" +#include "vm/class.hpp" +#include "vm/field.hpp" +#include "vm/initialize.hpp" +#include "vm/options.h" +#include "vm/references.h" +#include "vm/resolve.hpp" +#include "vm/jit/patcher-common.hpp" -/* patcher_get_putstatic ******************************************************* - Machine code: +/* patcher_patch_code ********************************************************** - - 4d 8b 15 86 fe ff ff mov -378(%rip),%r10 + 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; - s4 offset; - void *beginJavaStack; - - /* get stuff from the stack */ - - ra = (u1 *) *((ptrint *) (sp + 3 * 8)); - o = (java_objectheader *) *((ptrint *) (sp + 2 * 8)); - mcode = *((u8 *) (sp + 1 * 8)); - uf = (unresolved_field *) *((ptrint *) (sp + 0 * 8)); - - beginJavaStack= (void*)(sp + 3 * 8); - - /* calculate and set the new return address */ - - ra = ra - 5; - *((ptrint *) (sp + 3 * 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 (!helper_initialize_class(beginJavaStack, fi->class, ra + 5)) { - PATCHER_MONITOREXIT; - - 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; - - /* get RIP offset from machine instruction */ - - offset = *((u4 *) (ra + 3)); - - /* patch the field value's address (+ 7: is the size of the RIP move) */ - - *((ptrint *) (ra + 7 + offset)) = (ptrint) &(fi->value); - - PATCHER_MARK_PATCHED_MONITOREXIT; - - return true; + *((uint16_t*) pr->mpc) = (uint16_t) pr->mcode; + md_icacheflush((void*) pr->mpc, PATCHER_CALL_SIZE); } - -/* patcher_get_putfield ******************************************************** - - Machine code: - - - 45 8b 8f 00 00 00 00 mov 0x0(%r15),%r9d - -*******************************************************************************/ - -bool patcher_get_putfield(u1 *sp) +static int32_t *patch_checked_location(int32_t *p, int32_t val) { - u1 *ra; - java_objectheader *o; - u8 mcode; - unresolved_field *uf; - fieldinfo *fi; - u1 byte; - - /* get stuff from the stack */ - - ra = (u1 *) *((ptrint *) (sp + 3 * 8)); - o = (java_objectheader *) *((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 + 3 * 8)) = (ptrint) ra; - - PATCHER_MONITORENTER; - - /* get the fieldinfo */ - - if (!(fi = helper_resolve_fieldinfo(uf))) { - PATCHER_MONITOREXIT; - - 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; + assert(*p == 0); + // verify that it's aligned + assert((((uintptr_t) p) & (4-1)) == 0); + *p = val; + return p; +} - /* patch the field's offset: we check for the field type, because the */ - /* instructions have different lengths */ +static void checked_icache_flush(int32_t *addr, int nbytes, int32_t *check_loc) +{ + assert((int8_t*) addr + nbytes - sizeof(int32_t) >= (int8_t*) check_loc); + md_icacheflush(addr, nbytes); +} - if (IS_INT_LNG_TYPE(fi->type)) { - /* check for special case: %rsp or %r12 as base register */ +/** + * Check if the trap instruction at the given PC is valid. + * + * @param pc Program counter. + * + * @return true if valid, false otherwise. + */ +bool patcher_is_valid_trap_instruction_at(void* pc) +{ + uint16_t mcode = *((uint16_t*) pc); - byte = *(ra + 3); + // Check for the undefined instruction we use. + return (mcode == 0x0b0f); +} - if (byte == 0x24) - *((u4 *) (ra + 4)) = (u4) (fi->offset); - else - *((u4 *) (ra + 3)) = (u4) (fi->offset); +/** + * Overwrites the MFENCE instruction at the indicated address with a 3-byte + * NOP. The MFENCE instruction is not allowed to cross a (4-byte) word + * boundary. + * + * @param pc Program counter. + */ +static void patch_out_mfence(void *pc) +{ + uint32_t *p = (uint32_t*) (((uintptr_t) pc) & ~3); - } else { - /* check for special case: %rsp or %r12 as base register */ + assert((((uintptr_t) pc) & 3) < 2); + if (((uintptr_t) pc) & 1) + *p = (*p & 0x000000ff) | 0x001f0f00; + else + *p = (*p & 0xff000000) | 0x00001f0f; - byte = *(ra + 5); + md_icacheflush(p, 4); +} - 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: - 49 c7 87 10 00 00 00 00 00 00 00 movq $0x0,0x10(%r15) + 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 + 3 * 8)); - o = (java_objectheader *) *((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 + 3 * 8)) = (ptrint) ra; - - PATCHER_MONITORENTER; - - /* get the fieldinfo */ + constant_classref* cr = (constant_classref*) pr->ref; + uintptr_t* datap = (uintptr_t*) pr->datap; - if (!(fi = helper_resolve_fieldinfo(uf))) { - PATCHER_MONITOREXIT; + // Resolve the class. + classinfo* c = resolve_classref_eager(cr); + if (c == NULL) return false; - } - /* patch back original code */ + // Patch the class. + *datap = (uintptr_t) c; - *((u8 *) ra) = mcode; + // Synchronize data cache. + md_dcacheflush((void*) pr->datap, SIZEOF_VOID_P); - /* if we show disassembly, we have to skip the nop's */ - - if (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); - } - - PATCHER_MARK_PATCHED_MONITOREXIT; + // Patch back the original code. + patcher_patch_code(pr); 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; - classinfo *c; - void *beginJavaStack; - /* get stuff from the stack */ - - ra = (u1 *) *((ptrint *) (sp + 3 * 8)); - o = (java_objectheader *) *((ptrint *) (sp + 2 * 8)); - mcode = *((u8 *) (sp + 1 * 8)); - cr = (constant_classref *) *((ptrint *) (sp + 0 * 8)); - beginJavaStack = (void*) (sp+3*8); - - /* calculate and set the new return address */ - - ra = ra - (10 + 5); - *((ptrint *) (sp + 3 * 8)) = (ptrint) ra; - - PATCHER_MONITORENTER; + constant_classref* cr = (constant_classref*) pr->ref; + uintptr_t* datap = (uintptr_t*) pr->datap; - /* get the classinfo */ - - if (!(c = helper_resolve_classinfo(cr))) { - PATCHER_MONITOREXIT; + // Resolve the field. + classinfo* c = resolve_classref_eager(cr); + if (c == NULL) return false; - } - - if (!helper_initialize_class(beginJavaStack, c, ra + 5)) { - PATCHER_MONITOREXIT; - - return false; - } - - /* patch back original code */ - *((u8 *) (ra + 10)) = mcode; + // Patch super class' vftbl. + *datap = (uintptr_t) c->vftbl; - /* patch the classinfo pointer */ + // Synchronize data cache. + md_dcacheflush((void*) pr->datap, SIZEOF_VOID_P); - *((ptrint *) (ra + 2)) = (ptrint) c; - - /* if we show disassembly, we have to skip the nop's */ - - if (showdisassemble) - ra = ra + 5; - - /* patch new function address */ - - *((ptrint *) (ra + 10 + 2)) = (ptrint) BUILTIN_new; - - PATCHER_MARK_PATCHED_MONITOREXIT; + // Patch back the original code. + patcher_patch_code(pr); 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; - classinfo *c; - - /* get stuff from the stack */ - - ra = (u1 *) *((ptrint *) (sp + 3 * 8)); - o = (java_objectheader *) *((ptrint *) (sp + 2 * 8)); - mcode = *((u8 *) (sp + 1 * 8)); - cr = (constant_classref *) *((ptrint *) (sp + 0 * 8)); + constant_classref* cr = (constant_classref*) pr->ref; +/* int32_t* datap = (int32_t*) pr->datap; */ + uint8_t* ra = (uint8_t*) pr->mpc; - /* calculate and set the new return address */ - - ra = ra - (10 + 5); - *((ptrint *) (sp + 3 * 8)) = (ptrint) ra; - - PATCHER_MONITORENTER; - - /* get the classinfo */ - - if (!(c = helper_resolve_classinfo(cr))) { - PATCHER_MONITOREXIT; + // Resolve the field. + classinfo* c = resolve_classref_eager(cr); + if (c == NULL) return false; - } - - /* patch back original code */ - - *((u8 *) (ra + 10)) = mcode; - /* patch the class' vftbl pointer */ + ra += PATCHER_CALL_SIZE; + ra += PATCH_ALIGNMENT((uintptr_t) ra, 2, sizeof(int32_t)); - *((ptrint *) (ra + 2)) = (ptrint) c->vftbl; + // Patch class flags. +/* *datap = c->flags; */ + patch_checked_location((int32_t*) (ra + 2), c->flags); - /* if we show disassembly, we have to skip the nop's */ + // Synchronize data cache. +/* md_dcacheflush(datap, sizeof(int32_t)); */ + md_icacheflush(ra + 2, sizeof(int32_t)); - if (showdisassemble) - ra = ra + 5; - - /* patch new function address */ - - *((ptrint *) (ra + 10 + 2)) = (ptrint) BUILTIN_newarray; - - PATCHER_MARK_PATCHED_MONITOREXIT; + // Patch back the original code. + patcher_patch_code(pr); 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; - - /* get stuff from the stack */ - - ra = (u1 *) *((ptrint *) (sp + 3 * 8)); - o = (java_objectheader *) *((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 + 3 * 8)) = (ptrint) ra; - - PATCHER_MONITORENTER; - - /* get the classinfo */ + unresolved_field* uf = (unresolved_field*) pr->ref; + uintptr_t* datap = (uintptr_t*) pr->datap; + uint8_t* ra = (uint8_t*) pr->mpc; - if (!(c = helper_resolve_classinfo(cr))) { - PATCHER_MONITOREXIT; + // Resolve the field. + fieldinfo* fi = resolve_field_eager(uf); + if (fi == NULL) return false; - } - /* patch back original code */ + ra += PATCHER_CALL_SIZE; - *((u8 *) ra) = mcode; + // Check if the field's class is initialized/ + if (!(fi->clazz->state & CLASS_INITIALIZED)) + if (!initialize_class(fi->clazz)) + return false; - /* if we show disassembly, we have to skip the nop's */ + // Patch the field value's address. + *datap = (uintptr_t) fi->value; - if (showdisassemble) - ra = ra + 5; + if (pr->disp_mb && !(fi->flags & ACC_VOLATILE)) + patch_out_mfence(ra + pr->disp_mb - 2); - /* patch the class' vftbl pointer */ + // Synchronize data cache. + md_dcacheflush((void*) pr->datap, SIZEOF_VOID_P); - *((ptrint *) (ra + 10 + 2)) = (ptrint) c->vftbl; - - /* patch new function address */ - - *((ptrint *) (ra + 10 + 10 + 3 + 2)) = (ptrint) BUILTIN_multianewarray; - - PATCHER_MARK_PATCHED_MONITOREXIT; + // Patch back the original code. + patcher_patch_code(pr); 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 + 3 * 8)); - o = (java_objectheader *) *((ptrint *) (sp + 2 * 8)); - mcode = *((u8 *) (sp + 1 * 8)); - cr = (constant_classref *) *((ptrint *) (sp + 0 * 8)); - - /* calculate and set the new return address */ + uint8_t* pc = (uint8_t*) pr->mpc; + unresolved_field* uf = (unresolved_field*) pr->ref; - ra = ra - (10 + 5); - *((ptrint *) (sp + 3 * 8)) = (ptrint) ra; - - PATCHER_MONITORENTER; - - /* get the classinfo */ - - if (!(c = helper_resolve_classinfo(cr))) { - PATCHER_MONITOREXIT; + // Resolve the field. + fieldinfo* fi = resolve_field_eager(uf); + if (fi == NULL) return false; - } - - /* patch back original code */ - - *((u8 *) (ra + 10)) = mcode; - /* patch the class' vftbl pointer */ + pc += PATCHER_CALL_SIZE; - *((ptrint *) (ra + 2)) = (ptrint) c->vftbl; + int disp = -sizeof(int32_t) + pr->patch_align; + patch_checked_location((int32_t*) (pc + disp), fi->offset); - /* if we show disassembly, we have to skip the nop's */ + if (pr->disp_mb && !(fi->flags & ACC_VOLATILE)) + patch_out_mfence(pc + pr->disp_mb - 2); - if (showdisassemble) - ra = ra + 5; + // Synchronize instruction cache. + md_icacheflush(pc, disp + sizeof(int32_t)); - /* patch new function address */ - - *((ptrint *) (ra + 10 + 2)) = (ptrint) BUILTIN_arraycheckcast; - - PATCHER_MARK_PATCHED_MONITOREXIT; + // Patch back the original code. + patcher_patch_code(pr); 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; + uint8_t* pc = (uint8_t*) pr->mpc; + unresolved_field* uf = (unresolved_field*) pr->ref; - /* get stuff from the stack */ - - ra = (u1 *) *((ptrint *) (sp + 3 * 8)); - o = (java_objectheader *) *((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 + 3 * 8)) = (ptrint) ra; - - PATCHER_MONITORENTER; - - /* get the classinfo */ - - if (!(c = helper_resolve_classinfo(cr))) { - PATCHER_MONITOREXIT; + // Resolve the field. + fieldinfo* fi = resolve_field_eager(uf); + if (fi == NULL) return false; - } - /* patch back original code */ + pc += PATCHER_CALL_SIZE; - *((u8 *) (ra + 10)) = mcode; + int disp = -2*sizeof(int32_t) + pr->patch_align; + patch_checked_location((int32_t*) (pc + disp), fi->offset); - /* patch the class' vftbl pointer */ + if (pr->disp_mb && !(fi->flags & ACC_VOLATILE)) + patch_out_mfence(pc + pr->disp_mb - 2); - *((ptrint *) (ra + 2)) = (ptrint) c->vftbl; + // Synchronize instruction cache. + md_icacheflush(pc, disp + sizeof(int32_t)); - /* if we show disassembly, we have to skip the nop's */ - - if (showdisassemble) - ra = ra + 5; - - /* patch new function address */ - - *((ptrint *) (ra + 10 + 2)) = (ptrint) BUILTIN_arrayinstanceof; - - PATCHER_MARK_PATCHED_MONITOREXIT; + // Patch back the original code. + patcher_patch_code(pr); return true; } @@ -636,53 +351,33 @@ bool patcher_builtin_arrayinstanceof(u1 *sp) /* patcher_invokestatic_special ************************************************ - XXX + Machine code: + + + 49 ba 00 00 00 00 00 00 00 00 mov $0x0,%r10 + 49 ff d2 callq *%r10 *******************************************************************************/ -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 + 3 * 8)); - o = (java_objectheader *) *((ptrint *) (sp + 2 * 8)); - mcode = *((u8 *) (sp + 1 * 8)); - um = (unresolved_method *) *((ptrint *) (sp + 0 * 8)); - - /* calculate and set the new return address */ + unresolved_method* um = (unresolved_method*) pr->ref; + uintptr_t* datap = (uintptr_t*) pr->datap; - ra = ra - 5; - *((ptrint *) (sp + 3 * 8)) = (ptrint) ra; - - PATCHER_MONITORENTER; - - /* get the fieldinfo */ - - if (!(m = helper_resolve_methodinfo(um))) { - PATCHER_MONITOREXIT; + // Resolve the method. + methodinfo* m = resolve_method_eager(um); + if (m == NULL) 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; + // Patch stubroutine. + *datap = (uintptr_t) m->stubroutine; - /* patch stubroutine */ + // Synchronize data cache. + md_dcacheflush((void*) pr->datap, SIZEOF_VOID_P); - *((ptrint *) (ra + 2)) = (ptrint) m->stubroutine; - - PATCHER_MARK_PATCHED_MONITOREXIT; + // Patch back the original code. + patcher_patch_code(pr); return true; } @@ -690,447 +385,168 @@ bool patcher_invokestatic_special(u1 *sp) /* patcher_invokevirtual ******************************************************* - XXX - -*******************************************************************************/ - -bool patcher_invokevirtual(u1 *sp) -{ - u1 *ra; - java_objectheader *o; - u8 mcode; - unresolved_method *um; - methodinfo *m; - - /* get stuff from the stack */ - - ra = (u1 *) *((ptrint *) (sp + 3 * 8)); - o = (java_objectheader *) *((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 + 3 * 8)) = (ptrint) ra; - - PATCHER_MONITORENTER; - - /* get the fieldinfo */ - - if (!(m = helper_resolve_methodinfo(um))) { - PATCHER_MONITOREXIT; - - 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; - - /* patch vftbl index */ - - *((s4 *) (ra + 3 + 3)) = (s4) (OFFSET(vftbl_t, table[0]) + - sizeof(methodptr) * m->vftblindex); - - PATCHER_MARK_PATCHED_MONITOREXIT; - - return true; -} - - -/* patcher_invokeinterface ***************************************************** + Machine code: - XXX + + 4c 8b 17 mov (%rdi),%r10 + 49 8b 82 00 00 00 00 mov 0x0(%r10),%rax + 48 ff d0 callq *%rax *******************************************************************************/ -bool patcher_invokeinterface(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 + 3 * 8)); - o = (java_objectheader *) *((ptrint *) (sp + 2 * 8)); - mcode = *((u8 *) (sp + 1 * 8)); - um = (unresolved_method *) *((ptrint *) (sp + 0 * 8)); + uint8_t* pc = (uint8_t*) pr->mpc; + unresolved_method* um = (unresolved_method*) pr->ref; - /* calculate and set the new return address */ - - ra = ra - 5; - *((ptrint *) (sp + 3 * 8)) = (ptrint) ra; - - PATCHER_MONITORENTER; - - /* get the fieldinfo */ - - if (!(m = helper_resolve_methodinfo(um))) { - PATCHER_MONITOREXIT; + // Resovlve the method. + methodinfo* m = resolve_method_eager(um); + if (m == NULL) return false; - } - - /* patch back original code */ - *((u8 *) ra) = mcode; + pc += PATCHER_CALL_SIZE; + pc += PATCH_ALIGNMENT((uintptr_t) pc, 6, sizeof(int32_t)); - /* if we show disassembly, we have to skip the nop's */ + // Patch vftbl index. + patch_checked_location((int32_t*) (pc + 6), (int32_t) (OFFSET(vftbl_t, table[0]) + sizeof(methodptr) * m->vftblindex)); - if (showdisassemble) - ra = ra + 5; + // Synchronize instruction cache. + md_icacheflush(pc + 3 + 3, SIZEOF_VOID_P); - /* patch interfacetable index */ - - *((s4 *) (ra + 3 + 3)) = (s4) (OFFSET(vftbl_t, interfacetable[0]) - - sizeof(methodptr) * m->class->index); - - /* patch method offset */ - - *((s4 *) (ra + 3 + 7 + 3)) = - (s4) (sizeof(methodptr) * (m - m->class->methods)); - - PATCHER_MARK_PATCHED_MONITOREXIT; + // Patch back the original code. + patcher_patch_code(pr); return true; } -/* patcher_checkcast_instanceof_flags ****************************************** - - XXX - -*******************************************************************************/ - -bool patcher_checkcast_instanceof_flags(u1 *sp) -{ - u1 *ra; - java_objectheader *o; - u8 mcode; - constant_classref *cr; - classinfo *c; - - /* get stuff from the stack */ - - ra = (u1 *) *((ptrint *) (sp + 3 * 8)); - o = (java_objectheader *) *((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 + 3 * 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 (showdisassemble) - ra = ra + 5; - - /* patch class flags */ - - *((s4 *) (ra + 2)) = (s4) c->flags; - - PATCHER_MARK_PATCHED_MONITOREXIT; - - return true; -} - +/* patcher_invokeinterface ***************************************************** -/* patcher_checkcast_instanceof_interface ************************************** + Machine code: - XXX + + 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 *******************************************************************************/ -bool patcher_checkcast_instanceof_interface(u1 *sp) +bool patcher_invokeinterface(patchref_t *pr) { - u1 *ra; - java_objectheader *o; - u8 mcode; - constant_classref *cr; - classinfo *c; - - /* get stuff from the stack */ - - ra = (u1 *) *((ptrint *) (sp + 3 * 8)); - o = (java_objectheader *) *((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 + 3 * 8)) = (ptrint) ra; + uint8_t* pc = (uint8_t*) pr->mpc; + unresolved_method* um = (unresolved_method*) pr->ref; - PATCHER_MONITORENTER; - - /* get the fieldinfo */ - - if (!(c = helper_resolve_classinfo(cr))) { - PATCHER_MONITOREXIT; + // Resolve the method. + methodinfo* m = resolve_method_eager(um); + if (m == NULL) 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; + pc += PATCHER_CALL_SIZE; + pc += PATCH_ALIGNMENT((uintptr_t) pc, 6, sizeof(int32_t)); - /* patch super class index */ + // Patch interfacetable index. + patch_checked_location((int32_t*) (pc + 6), (int32_t) (OFFSET(vftbl_t, interfacetable[0]) - sizeof(methodptr) * m->clazz->index)); - *((s4 *) (ra + 7 + 3)) = (s4) c->index; + int disp = PATCH_ALIGNMENT((uintptr_t) (pc + 3 + 7), 3, sizeof(int32_t)); + pc += disp; + // Patch method offset. + int32_t *loc = patch_checked_location((int32_t*) (pc + 3 + 7 + 3), (int32_t) (sizeof(methodptr) * (m - m->clazz->methods))); - *((s4 *) (ra + 7 + 7 + 3 + 6 + 3)) = - (s4) (OFFSET(vftbl_t, interfacetable[0]) - - c->index * sizeof(methodptr*)); + // Synchronize instruction cache. + checked_icache_flush(pc + 6, SIZEOF_VOID_P + 3 + SIZEOF_VOID_P + disp, loc); - PATCHER_MARK_PATCHED_MONITOREXIT; + // Patch back the original code. + patcher_patch_code(pr); return true; } -/* patcher_checkcast_class ***************************************************** - - XXX - -*******************************************************************************/ - -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 + 3 * 8)); - o = (java_objectheader *) *((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 + 3 * 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; +/* patcher_checkcast_interface ************************************************* - /* if we show disassembly, we have to skip the nop's */ - - if (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: - XXX + + 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_instanceof_class(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 + 3 * 8)); - o = (java_objectheader *) *((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 + 3 * 8)) = (ptrint) ra; - - PATCHER_MONITORENTER; + uint8_t* pc = (uint8_t*) pr->mpc; + constant_classref* cr = (constant_classref*) pr->ref; - /* get the fieldinfo */ - - if (!(c = helper_resolve_classinfo(cr))) { - PATCHER_MONITOREXIT; + // Resolve the class. + classinfo* c = resolve_classref_eager(cr); + if (c == NULL) return false; - } - - /* patch back original code */ - - *((u8 *) ra) = mcode; - /* if we show disassembly, we have to skip the nop's */ + pc += PATCHER_CALL_SIZE; + pc += PATCH_ALIGNMENT((uintptr_t) pc, 10, sizeof(int32_t)); - if (showdisassemble) - ra = ra + 5; + // Patch super class index. + patch_checked_location((int32_t*) (pc + 10), c->index); - /* patch super class' vftbl */ + int disp = PATCH_ALIGNMENT((uintptr_t) (pc + 7 + 7 + 6 + 8), 3, sizeof(int32_t)); + pc += disp; + int32_t *loc = patch_checked_location((int32_t*) (pc + 7 + 7 + 6 + 8 + 3), (int32_t) (OFFSET(vftbl_t, interfacetable[0]) - c->index * sizeof(methodptr*))); - *((ptrint *) (ra + 2)) = (ptrint) c->vftbl; + // Synchronize instruction cache. + checked_icache_flush(pc + 10, sizeof(int32_t) + 6 + 8 + 3 + sizeof(int32_t) + disp, loc); - PATCHER_MARK_PATCHED_MONITOREXIT; + // Patch back the original code. + patcher_patch_code(pr); return true; } -/* patcher_clinit ************************************************************** - - XXX - -*******************************************************************************/ - -bool patcher_clinit(u1 *sp) -{ - u1 *ra; - java_objectheader *o; - u8 mcode; - classinfo *c; - void *beginJavaStack; - - /* get stuff from the stack */ - - ra = (u1 *) *((ptrint *) (sp + 3 * 8)); - o = (java_objectheader *) *((ptrint *) (sp + 2 * 8)); - mcode = *((u8 *) (sp + 1 * 8)); - c = (classinfo *) *((ptrint *) (sp + 0 * 8)); - - beginJavaStack = (void*) (sp + 3 * 8); - - /* calculate and set the new return address */ - - ra = ra - 5; - *((ptrint *) (sp + 3 * 8)) = (ptrint) ra; - - PATCHER_MONITORENTER; - - /* check if the class is initialized */ +/* patcher_instanceof_interface ************************************************ - if (!helper_initialize_class(beginJavaStack, c, ra + 5)) { - PATCHER_MONITOREXIT; - - return false; - } - - /* patch back original code */ - - *((u8 *) ra) = mcode; - - PATCHER_MARK_PATCHED_MONITOREXIT; - - return true; -} - - -/* patcher_resolve_native ****************************************************** + Machine code: - XXX + + 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_resolve_native(u1 *sp) +bool patcher_instanceof_interface(patchref_t *pr) { - u1 *ra; - java_objectheader *o; - u8 mcode; - methodinfo *m; - functionptr f; - void *beginJavaStack; - - /* get stuff from the stack */ - - ra = (u1 *) *((ptrint *) (sp + 3 * 8)); - o = (java_objectheader *) *((ptrint *) (sp + 2 * 8)); - mcode = *((u8 *) (sp + 1 * 8)); - m = (methodinfo *) *((ptrint *) (sp + 0 * 8)); - - beginJavaStack = (void*) (sp + 3 * 8); - - /* calculate and set the new return address */ + uint8_t* pc = (uint8_t*) pr->mpc; + constant_classref* cr = (constant_classref*) pr->ref; - ra = ra - 5; - *((ptrint *) (sp + 3 * 8)) = (ptrint) ra; - - PATCHER_MONITORENTER; - - /* resolve native function */ - - if (!(f = native_resolve_function(m))) { - PATCHER_MONITOREXIT; + // Resolve the class. + classinfo* c = resolve_classref_eager(cr); + if (c == NULL) return false; - } - - /* patch back original code */ - - *((u8 *) ra) = mcode; - /* if we show disassembly, we have to skip the nop's */ + pc += PATCHER_CALL_SIZE; + pc += PATCH_ALIGNMENT((uintptr_t) pc, 10, sizeof(int32_t)); - if (showdisassemble) - ra = ra + 5; + // Patch super class index. + patch_checked_location((int32_t*) (pc + 10), c->index); - /* patch native function pointer */ + int disp = PATCH_ALIGNMENT((uintptr_t) (pc + 7 + 7 + 6), 3, sizeof(int32_t)); + pc += disp; + int32_t *loc = patch_checked_location((int32_t*) (pc + 7 + 7 + 6 + 3), (int32_t) (OFFSET(vftbl_t, interfacetable[0]) - c->index * sizeof(methodptr*))); - *((ptrint *) (ra + 2)) = (ptrint) f; + // Synchronize instruction cache. + checked_icache_flush(pc + 10, sizeof(int32_t) + 6 + 3 + sizeof(int32_t) + disp, loc); - PATCHER_MARK_PATCHED_MONITOREXIT; + // Patch back the original code. + patcher_patch_code(pr); return true; }