/* src/vm/jit/x86_64/codegen.c - machine code generator for x86_64
- Copyright (C) 1996-2005, 2006, 2007 R. Grafl, A. Krall, C. Kruegel,
- C. Oates, R. Obermaisser, M. Platter, M. Probst, S. Ring,
- E. Steiner, C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich,
- J. Wenninger, Institut f. Computersprachen - TU Wien
+ Copyright (C) 1996-2011
+ CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO
This file is part of CACAO.
#include <stdint.h>
#include "vm/types.h"
+#include "vm/os.hpp"
#include "md-abi.h"
#include "vm/jit/x86_64/codegen.h"
#include "vm/jit/x86_64/emit.h"
-#include "mm/memory.h"
+#include "mm/memory.hpp"
-#include "native/jni.h"
-#include "native/localref.h"
-#include "native/native.h"
+#include "native/localref.hpp"
+#include "native/native.hpp"
-#include "threads/lock-common.h"
+#include "threads/lock.hpp"
-#include "vm/builtin.h"
-#include "vm/exceptions.h"
+#include "vm/jit/builtin.hpp"
+#include "vm/exceptions.hpp"
#include "vm/global.h"
-#include "vm/primitive.h"
-#include "vm/stringlocal.h"
-#include "vm/vm.h"
+#include "vm/loader.hpp"
+#include "vm/options.h"
+#include "vm/primitive.hpp"
+#include "vm/statistics.h"
+#include "vm/string.hpp"
+#include "vm/vm.hpp"
#include "vm/jit/abi.h"
#include "vm/jit/asmpart.h"
-#include "vm/jit/code.h"
-#include "vm/jit/codegen-common.h"
+#include "vm/jit/code.hpp"
+#include "vm/jit/codegen-common.hpp"
#include "vm/jit/dseg.h"
-#include "vm/jit/emit-common.h"
-#include "vm/jit/jit.h"
-#include "vm/jit/linenumbertable.h"
+#include "vm/jit/emit-common.hpp"
+#include "vm/jit/jit.hpp"
+#include "vm/jit/linenumbertable.hpp"
#include "vm/jit/methodheader.h"
-#include "vm/jit/parse.h"
-#include "vm/jit/patcher-common.h"
+#include "vm/jit/parse.hpp"
+#include "vm/jit/patcher-common.hpp"
#include "vm/jit/reg.h"
-#include "vm/jit/replace.h"
-#include "vm/jit/stacktrace.h"
-#include "vm/jit/trap.h"
+#include "vm/jit/stacktrace.hpp"
+#include "vm/jit/trap.hpp"
-#if defined(ENABLE_LSRA)
-# include "vm/jit/allocator/lsra.h"
-#endif
-
-#include "vmcore/loader.h"
-#include "vmcore/options.h"
-#include "vmcore/statistics.h"
-
-
-/* codegen_emit ****************************************************************
-
- Generates machine code.
-
-*******************************************************************************/
-bool codegen_emit(jitdata *jd)
+/**
+ * Generates machine code for the method prolog.
+ */
+void codegen_emit_prolog(jitdata* jd)
{
- methodinfo *m;
- codeinfo *code;
- codegendata *cd;
- registerdata *rd;
- s4 len, s1, s2, s3, d, disp;
- u2 currentline;
- ptrint a;
- varinfo *var, *dst;
- basicblock *bptr;
- instruction *iptr;
- constant_classref *cr;
- unresolved_class *uc;
- methodinfo *lm; /* local methodinfo for ICMD_INVOKE* */
- unresolved_method *um;
- builtintable_entry *bte;
- methoddesc *md;
- fieldinfo *fi;
- unresolved_field *uf;
- s4 fieldtype;
- s4 varindex;
-
- /* get required compiler data */
-
- m = jd->m;
- code = jd->code;
- cd = jd->cd;
- rd = jd->rd;
-
- /* prevent compiler warnings */
-
- d = 0;
- lm = NULL;
- um = NULL;
- bte = NULL;
-
- {
- s4 i, p, t, l;
- s4 savedregs_num;
-
- savedregs_num = 0;
-
- /* space to save used callee saved registers */
-
- savedregs_num += (INT_SAV_CNT - rd->savintreguse);
- savedregs_num += (FLT_SAV_CNT - rd->savfltreguse);
-
- cd->stackframesize = rd->memuse + savedregs_num;
-
-#if defined(ENABLE_THREADS)
- /* space to save argument of monitor_enter */
-
- if (checksync && code_is_synchronized(code))
- cd->stackframesize++;
-#endif
-
- /* Keep stack of non-leaf functions 16-byte aligned for calls into
- native code e.g. libc or jni (alignment problems with
- movaps). */
-
- if (!code_is_leafmethod(code) || opt_verbosecall)
- cd->stackframesize |= 0x1;
-
- /* create method header */
-
- (void) dseg_add_unique_address(cd, code); /* CodeinfoPointer */
- (void) dseg_add_unique_s4(cd, cd->stackframesize * 8); /* FrameSize */
-
- code->synchronizedoffset = rd->memuse * 8;
-
- if (code_is_leafmethod(code))
- (void) dseg_add_unique_s4(cd, 1); /* IsLeaf */
- else
- (void) dseg_add_unique_s4(cd, 0); /* IsLeaf */
-
- (void) dseg_add_unique_s4(cd, INT_SAV_CNT - rd->savintreguse); /* IntSave */
- (void) dseg_add_unique_s4(cd, FLT_SAV_CNT - rd->savfltreguse); /* FltSave */
-
-#if defined(ENABLE_PROFILING)
- /* generate method profiling code */
-
- if (JITDATA_HAS_FLAG_INSTRUMENT(jd)) {
- /* count frequency */
-
- M_MOV_IMM(code, REG_ITMP3);
- M_IINC_MEMBASE(REG_ITMP3, OFFSET(codeinfo, frequency));
-
- PROFILE_CYCLE_START;
- }
-#endif
+ varinfo* var;
+ methoddesc* md;
+ int32_t s1;
+ int32_t p, t, l;
+ int32_t varindex;
+ int i;
+
+ // Get required compiler data.
+ methodinfo* m = jd->m;
+ codegendata* cd = jd->cd;
+ registerdata* rd = jd->rd;
/* create stack frame (if necessary) */
else { /* floating args */
if (!md->params[p].inmemory) { /* register arguments */
if (!IS_INMEMORY(var->flags))
- M_FLTMOVE(s1, var->vv.regoff);
+ emit_fmove(cd, s1, var->vv.regoff);
else
M_DST(s1, REG_SP, var->vv.regoff);
}
}
}
}
+}
- /* save monitorenter argument */
-
-#if defined(ENABLE_THREADS)
- if (checksync && code_is_synchronized(code)) {
- /* stack offset for monitor argument */
-
- s1 = rd->memuse;
-
- if (opt_verbosecall) {
- M_LSUB_IMM((INT_ARG_CNT + FLT_ARG_CNT) * 8, REG_SP);
-
- for (p = 0; p < INT_ARG_CNT; p++)
- M_LST(abi_registers_integer_argument[p], REG_SP, p * 8);
-
- for (p = 0; p < FLT_ARG_CNT; p++)
- M_DST(abi_registers_float_argument[p], REG_SP, (INT_ARG_CNT + p) * 8);
-
- s1 += INT_ARG_CNT + FLT_ARG_CNT;
- }
-
- /* decide which monitor enter function to call */
- if (m->flags & ACC_STATIC) {
- M_MOV_IMM(&m->clazz->object.header, REG_A0);
- }
- else {
- M_TEST(REG_A0);
- M_BNE(8);
- M_ALD_MEM(REG_A0, TRAP_NullPointerException);
- }
+/**
+ * Generates machine code for the method epilog.
+ */
+void codegen_emit_epilog(jitdata* jd)
+{
+ int32_t p;
+ int i;
- M_AST(REG_A0, REG_SP, s1 * 8);
- M_MOV_IMM(LOCK_monitor_enter, REG_ITMP1);
- M_CALL(REG_ITMP1);
+ // Get required compiler data.
+ codegendata* cd = jd->cd;
+ registerdata* rd = jd->rd;
- if (opt_verbosecall) {
- for (p = 0; p < INT_ARG_CNT; p++)
- M_LLD(abi_registers_integer_argument[p], REG_SP, p * 8);
+ p = cd->stackframesize;
- for (p = 0; p < FLT_ARG_CNT; p++)
- M_DLD(abi_registers_float_argument[p], REG_SP, (INT_ARG_CNT + p) * 8);
+ /* restore saved registers */
- M_LADD_IMM((INT_ARG_CNT + FLT_ARG_CNT) * 8, REG_SP);
- }
+ for (i = INT_SAV_CNT - 1; i >= rd->savintreguse; i--) {
+ p--; M_LLD(rd->savintregs[i], REG_SP, p * 8);
}
-#endif
-
-#if !defined(NDEBUG)
- if (JITDATA_HAS_FLAG_VERBOSECALL(jd))
- emit_verbosecall_enter(jd);
-#endif /* !defined(NDEBUG) */
-
+ for (i = FLT_SAV_CNT - 1; i >= rd->savfltreguse; i--) {
+ p--; M_DLD(rd->savfltregs[i], REG_SP, p * 8);
}
- /* end of header generation */
-
- /* create replacement points */
-
- REPLACEMENT_POINTS_INIT(cd, jd);
-
- /* walk through all basic blocks */
-
- for (bptr = jd->basicblocks; bptr != NULL; bptr = bptr->next) {
-
- bptr->mpc = (u4) ((u1 *) cd->mcodeptr - cd->mcodebase);
-
- if (bptr->flags >= BBREACHED) {
-
- /* branch resolving */
-
- codegen_resolve_branchrefs(cd, bptr);
-
- /* handle replacement points */
-
- REPLACEMENT_POINT_BLOCK_START(cd, bptr);
-
- /* copy interface registers to their destination */
-
- len = bptr->indepth;
- MCODECHECK(512);
-
-#if defined(ENABLE_PROFILING)
- /* generate basicblock profiling code */
-
- if (JITDATA_HAS_FLAG_INSTRUMENT(jd)) {
- /* count frequency */
-
- M_MOV_IMM(code->bbfrequency, REG_ITMP3);
- M_IINC_MEMBASE(REG_ITMP3, bptr->nr * 4);
-
- /* if this is an exception handler, start profiling again */
-
- if (bptr->type == BBTYPE_EXH)
- PROFILE_CYCLE_START;
- }
-#endif
-
-#if defined(ENABLE_LSRA)
- if (opt_lsra) {
- while (len) {
- len--;
- src = bptr->invars[len];
- if ((len == bptr->indepth-1) && (bptr->type != BBTYPE_STD)) {
- if (bptr->type == BBTYPE_EXH) {
-/* d = reg_of_var(rd, src, REG_ITMP1); */
- if (!IS_INMEMORY(src->flags))
- d= src->vv.regoff;
- else
- d=REG_ITMP1;
- M_INTMOVE(REG_ITMP1, d);
- emit_store(jd, NULL, src, d);
- }
- }
- }
-
- } else {
-#endif
+ /* deallocate stack */
- while (len) {
- len--;
- var = VAR(bptr->invars[len]);
- if ((len == bptr->indepth-1) && (bptr->type != BBTYPE_STD)) {
- if (bptr->type == BBTYPE_EXH) {
- d = codegen_reg_of_var(0, var, REG_ITMP1);
- M_INTMOVE(REG_ITMP1, d);
- emit_store(jd, NULL, var, d);
- }
- }
- else {
- assert((var->flags & INOUT));
- }
- }
-#if defined(ENABLE_LSRA)
- }
-#endif
- /* walk through all instructions */
-
- len = bptr->icount;
- currentline = 0;
-
- for (iptr = bptr->iinstr; len > 0; len--, iptr++) {
- if (iptr->line != currentline) {
- linenumbertable_list_entry_add(cd, iptr->line);
- currentline = iptr->line;
- }
-
- MCODECHECK(1024); /* 1KB should be enough */
-
- switch (iptr->opc) {
- case ICMD_NOP: /* ... ==> ... */
- case ICMD_POP: /* ..., value ==> ... */
- case ICMD_POP2: /* ..., value, value ==> ... */
- break;
-
- case ICMD_INLINE_START:
-
- REPLACEMENT_POINT_INLINE_START(cd, iptr);
- break;
-
- case ICMD_INLINE_BODY:
-
- REPLACEMENT_POINT_INLINE_BODY(cd, iptr);
- linenumbertable_list_entry_add_inline_start(cd, iptr);
- linenumbertable_list_entry_add(cd, iptr->line);
- break;
+ if (cd->stackframesize)
+ M_AADD_IMM(cd->stackframesize * 8, REG_SP);
- case ICMD_INLINE_END:
+ M_RET;
+}
- linenumbertable_list_entry_add_inline_end(cd, iptr);
- linenumbertable_list_entry_add(cd, iptr->line);
- break;
+/**
+ * Generates a memory barrier to be used after volatile writes. It can be
+ * patched out later if the field turns out not to be volatile.
+ */
+void codegen_emit_patchable_barrier(instruction *iptr, codegendata *cd, patchref_t *pr, fieldinfo *fi)
+{
+ if (INSTRUCTION_IS_UNRESOLVED(iptr)) {
+ /* Align on word boundary */
+ if ((((intptr_t) cd->mcodeptr) & 3) >= 2)
+ emit_nop(cd, 4 - (((intptr_t) cd->mcodeptr) & 3));
+ /* Displacement for patching out MFENCE */
+ pr->disp_mb = (cd->mcodeptr - cd->mcodebase - pr->mpc);
+ }
+ if (INSTRUCTION_IS_UNRESOLVED(iptr) || fi->flags & ACC_VOLATILE)
+ M_MFENCE;
+}
- case ICMD_CHECKNULL: /* ..., objectref ==> ..., objectref */
+/**
+ * Ensures that the patched location (an int32_t) is aligned.
+ */
+static void codegen_fixup_alignment(codegendata *cd, patchref_t *pr, u1 *mcodeptr_save)
+{
+ u1 *codeptr = cd->mcodeptr;
+ int disp = PATCH_ALIGNMENT((uintptr_t) cd->mcodeptr, 0, sizeof(int32_t));
+ memmove(mcodeptr_save + disp, mcodeptr_save, cd->mcodeptr - mcodeptr_save);
+ pr->patch_align += cd->mcodeptr - mcodeptr_save + disp;
+
+ cd->mcodeptr = mcodeptr_save;
+ emit_arbitrary_nop(cd, disp);
+ cd->mcodeptr = codeptr + disp;
+}
- s1 = emit_load_s1(jd, iptr, REG_ITMP1);
- emit_nullpointer_check(cd, iptr, s1);
- break;
+/**
+ * Generates machine code for one ICMD.
+ */
+void codegen_emit_instruction(jitdata* jd, instruction* iptr)
+{
+ varinfo* var;
+ varinfo* dst;
+ builtintable_entry* bte;
+ methodinfo* lm; // Local methodinfo for ICMD_INVOKE*.
+ unresolved_method* um;
+ fieldinfo* fi;
+ unresolved_field* uf;
+ patchref_t* pr;
+ int32_t fieldtype;
+ int32_t s1, s2, s3, d;
+ int32_t disp;
+ u1* mcodeptr_save;
+
+ // Get required compiler data.
+ codegendata* cd = jd->cd;
+
+ switch (iptr->opc) {
/* constant operations ************************************************/
- case ICMD_ICONST: /* ... ==> ..., constant */
-
- d = codegen_reg_of_dst(jd, iptr, REG_ITMP1);
- ICONST(d, iptr->sx.val.i);
- emit_store_dst(jd, iptr, d);
- break;
-
- case ICMD_LCONST: /* ... ==> ..., constant */
-
- d = codegen_reg_of_dst(jd, iptr, REG_ITMP1);
- LCONST(d, iptr->sx.val.l);
- emit_store_dst(jd, iptr, d);
- break;
-
case ICMD_FCONST: /* ... ==> ..., constant */
d = codegen_reg_of_dst(jd, iptr, REG_FTMP1);
d = codegen_reg_of_dst(jd, iptr, REG_ITMP1);
if (INSTRUCTION_IS_UNRESOLVED(iptr)) {
- cr = iptr->sx.val.c.ref;
+ constant_classref *cr = iptr->sx.val.c.ref;
disp = dseg_add_unique_address(cd, cr);
/* PROFILE_CYCLE_STOP; */
break;
- /* load/store/copy/move operations ************************************/
-
- case ICMD_ILOAD: /* ... ==> ..., content of local variable */
- case ICMD_ALOAD: /* s1 = local variable */
- case ICMD_LLOAD:
- case ICMD_FLOAD:
- case ICMD_DLOAD:
- case ICMD_ISTORE: /* ..., value ==> ... */
- case ICMD_LSTORE:
- case ICMD_FSTORE:
- case ICMD_DSTORE:
- case ICMD_COPY:
- case ICMD_MOVE:
-
- emit_copy(jd, iptr);
- break;
-
- case ICMD_ASTORE:
- if (!(iptr->flags.bits & INS_FLAG_RETADDR))
- emit_copy(jd, iptr);
- break;
-
/* integer operations *************************************************/
case ICMD_INEG: /* ..., value ==> ..., - value */
s1 = emit_load_s1(jd, iptr, REG_FTMP1);
d = codegen_reg_of_dst(jd, iptr, REG_FTMP3);
disp = dseg_add_s4(cd, 0x80000000);
- M_FLTMOVE(s1, d);
+ emit_fmove(cd, s1, d);
emit_movss_membase_reg(cd, RIP, -((cd->mcodeptr + 9) - cd->mcodebase) + disp, REG_FTMP2);
emit_xorps_reg_reg(cd, REG_FTMP2, d);
emit_store_dst(jd, iptr, d);
s1 = emit_load_s1(jd, iptr, REG_FTMP1);
d = codegen_reg_of_dst(jd, iptr, REG_FTMP3);
disp = dseg_add_s8(cd, 0x8000000000000000);
- M_FLTMOVE(s1, d);
+ emit_fmove(cd, s1, d);
emit_movd_membase_reg(cd, RIP, -((cd->mcodeptr + 9) - cd->mcodebase) + disp, REG_FTMP2);
emit_xorpd_reg_reg(cd, REG_FTMP2, d);
emit_store_dst(jd, iptr, d);
if (s2 == d)
M_FADD(s1, d);
else {
- M_FLTMOVE(s1, d);
+ emit_fmove(cd, s1, d);
M_FADD(s2, d);
}
emit_store_dst(jd, iptr, d);
if (s2 == d)
M_DADD(s1, d);
else {
- M_FLTMOVE(s1, d);
+ emit_fmove(cd, s1, d);
M_DADD(s2, d);
}
emit_store_dst(jd, iptr, d);
s2 = emit_load_s2(jd, iptr, REG_FTMP2);
d = codegen_reg_of_dst(jd, iptr, REG_FTMP3);
if (s2 == d) {
- M_FLTMOVE(s2, REG_FTMP2);
+ emit_fmove(cd, s2, REG_FTMP2);
s2 = REG_FTMP2;
}
- M_FLTMOVE(s1, d);
+ emit_fmove(cd, s1, d);
M_FSUB(s2, d);
emit_store_dst(jd, iptr, d);
break;
s2 = emit_load_s2(jd, iptr, REG_FTMP2);
d = codegen_reg_of_dst(jd, iptr, REG_FTMP3);
if (s2 == d) {
- M_FLTMOVE(s2, REG_FTMP2);
+ emit_fmove(cd, s2, REG_FTMP2);
s2 = REG_FTMP2;
}
- M_FLTMOVE(s1, d);
+ emit_fmove(cd, s1, d);
M_DSUB(s2, d);
emit_store_dst(jd, iptr, d);
break;
if (s2 == d)
M_FMUL(s1, d);
else {
- M_FLTMOVE(s1, d);
+ emit_fmove(cd, s1, d);
M_FMUL(s2, d);
}
emit_store_dst(jd, iptr, d);
if (s2 == d)
M_DMUL(s1, d);
else {
- M_FLTMOVE(s1, d);
+ emit_fmove(cd, s1, d);
M_DMUL(s2, d);
}
emit_store_dst(jd, iptr, d);
s2 = emit_load_s2(jd, iptr, REG_FTMP2);
d = codegen_reg_of_dst(jd, iptr, REG_FTMP3);
if (s2 == d) {
- M_FLTMOVE(s2, REG_FTMP2);
+ emit_fmove(cd, s2, REG_FTMP2);
s2 = REG_FTMP2;
}
- M_FLTMOVE(s1, d);
+ emit_fmove(cd, s1, d);
M_FDIV(s2, d);
emit_store_dst(jd, iptr, d);
break;
s2 = emit_load_s2(jd, iptr, REG_FTMP2);
d = codegen_reg_of_dst(jd, iptr, REG_FTMP3);
if (s2 == d) {
- M_FLTMOVE(s2, REG_FTMP2);
+ emit_fmove(cd, s2, REG_FTMP2);
s2 = REG_FTMP2;
}
- M_FLTMOVE(s1, d);
+ emit_fmove(cd, s1, d);
M_DDIV(s2, d);
emit_store_dst(jd, iptr, d);
break;
disp = ((s1 == REG_FTMP1) ? 0 : 5) + 10 + 3 +
((REG_RESULT == d) ? 0 : 3);
M_BNE(disp);
- M_FLTMOVE(s1, REG_FTMP1);
+ emit_fmove(cd, s1, REG_FTMP1);
M_MOV_IMM(asm_builtin_f2i, REG_ITMP2);
M_CALL(REG_ITMP2);
M_INTMOVE(REG_RESULT, d);
disp = ((s1 == REG_FTMP1) ? 0 : 5) + 10 + 3 +
((REG_RESULT == d) ? 0 : 3);
M_BNE(disp);
- M_FLTMOVE(s1, REG_FTMP1);
+ emit_fmove(cd, s1, REG_FTMP1);
M_MOV_IMM(asm_builtin_d2i, REG_ITMP2);
M_CALL(REG_ITMP2);
M_INTMOVE(REG_RESULT, d);
disp = ((s1 == REG_FTMP1) ? 0 : 5) + 10 + 3 +
((REG_RESULT == d) ? 0 : 3);
M_BNE(disp);
- M_FLTMOVE(s1, REG_FTMP1);
+ emit_fmove(cd, s1, REG_FTMP1);
M_MOV_IMM(asm_builtin_f2l, REG_ITMP2);
M_CALL(REG_ITMP2);
M_INTMOVE(REG_RESULT, d);
disp = ((s1 == REG_FTMP1) ? 0 : 5) + 10 + 3 +
((REG_RESULT == d) ? 0 : 3);
M_BNE(disp);
- M_FLTMOVE(s1, REG_FTMP1);
+ emit_fmove(cd, s1, REG_FTMP1);
M_MOV_IMM(asm_builtin_d2l, REG_ITMP2);
M_CALL(REG_ITMP2);
M_INTMOVE(REG_RESULT, d);
/* memory operations **************************************************/
- case ICMD_ARRAYLENGTH: /* ..., arrayref ==> ..., (int) length */
-
- s1 = emit_load_s1(jd, iptr, REG_ITMP1);
- d = codegen_reg_of_dst(jd, iptr, REG_ITMP3);
- /* implicit null-pointer check */
- M_ILD(d, s1, OFFSET(java_array_t, size));
- emit_store_dst(jd, iptr, d);
- break;
-
case ICMD_BALOAD: /* ..., arrayref, index ==> ..., value */
s1 = emit_load_s1(jd, iptr, REG_ITMP1);
emit_mov_imm_memindex(cd, 0, OFFSET(java_objectarray_t, data[0]), s1, s2, 3);
break;
-
- case ICMD_GETSTATIC: /* ... ==> ..., value */
-
- if (INSTRUCTION_IS_UNRESOLVED(iptr)) {
- uf = iptr->sx.s23.s3.uf;
- fieldtype = uf->fieldref->parseddesc.fd->type;
- disp = dseg_add_unique_address(cd, uf);
-
-/* PROFILE_CYCLE_STOP; */
-
- patcher_add_patch_ref(jd, PATCHER_get_putstatic, uf, disp);
-
-/* PROFILE_CYCLE_START; */
- }
- else {
- fi = iptr->sx.s23.s3.fmiref->p.field;
- fieldtype = fi->type;
- disp = dseg_add_address(cd, fi->value);
-
- if (!CLASS_IS_OR_ALMOST_INITIALIZED(fi->clazz)) {
- PROFILE_CYCLE_STOP;
-
- patcher_add_patch_ref(jd, PATCHER_initialize_class,
- fi->clazz, 0);
-
- PROFILE_CYCLE_START;
- }
- }
-
- /* This approach is much faster than moving the field
- address inline into a register. */
-
- M_ALD(REG_ITMP1, RIP, disp);
-
- switch (fieldtype) {
- case TYPE_INT:
- d = codegen_reg_of_dst(jd, iptr, REG_ITMP2);
- M_ILD(d, REG_ITMP1, 0);
- break;
- case TYPE_LNG:
- case TYPE_ADR:
- d = codegen_reg_of_dst(jd, iptr, REG_ITMP2);
- M_LLD(d, REG_ITMP1, 0);
- break;
- case TYPE_FLT:
- d = codegen_reg_of_dst(jd, iptr, REG_FTMP1);
- M_FLD(d, REG_ITMP1, 0);
- break;
- case TYPE_DBL:
- d = codegen_reg_of_dst(jd, iptr, REG_FTMP1);
- M_DLD(d, REG_ITMP1, 0);
- break;
- }
- emit_store_dst(jd, iptr, d);
- break;
-
- case ICMD_PUTSTATIC: /* ..., value ==> ... */
-
- if (INSTRUCTION_IS_UNRESOLVED(iptr)) {
- uf = iptr->sx.s23.s3.uf;
- fieldtype = uf->fieldref->parseddesc.fd->type;
- disp = dseg_add_unique_address(cd, uf);
-
-/* PROFILE_CYCLE_STOP; */
-
- patcher_add_patch_ref(jd, PATCHER_get_putstatic, uf, disp);
-
-/* PROFILE_CYCLE_START; */
- }
- else {
- fi = iptr->sx.s23.s3.fmiref->p.field;
- fieldtype = fi->type;
- disp = dseg_add_address(cd, fi->value);
-
- if (!CLASS_IS_OR_ALMOST_INITIALIZED(fi->clazz)) {
- PROFILE_CYCLE_STOP;
-
- patcher_add_patch_ref(jd, PATCHER_initialize_class,
- fi->clazz, 0);
-
- PROFILE_CYCLE_START;
- }
- }
-
- /* This approach is much faster than moving the field
- address inline into a register. */
-
- M_ALD(REG_ITMP1, RIP, disp);
-
- switch (fieldtype) {
- case TYPE_INT:
- s1 = emit_load_s1(jd, iptr, REG_ITMP2);
- M_IST(s1, REG_ITMP1, 0);
- break;
- case TYPE_LNG:
- case TYPE_ADR:
- s1 = emit_load_s1(jd, iptr, REG_ITMP2);
- M_LST(s1, REG_ITMP1, 0);
- break;
- case TYPE_FLT:
- s1 = emit_load_s1(jd, iptr, REG_FTMP1);
- M_FST(s1, REG_ITMP1, 0);
- break;
- case TYPE_DBL:
- s1 = emit_load_s1(jd, iptr, REG_FTMP1);
- M_DST(s1, REG_ITMP1, 0);
- break;
- }
- break;
-
case ICMD_PUTSTATICCONST: /* ... ==> ... */
/* val = value (in current instruction) */
/* following NOP) */
/* PROFILE_CYCLE_STOP; */
- patcher_add_patch_ref(jd, PATCHER_get_putstatic, uf, disp);
+ pr = patcher_add_patch_ref(jd, PATCHER_get_putstatic, uf, disp);
/* PROFILE_CYCLE_START; */
+
+ fi = NULL; /* Silence compiler warning */
}
else {
fi = iptr->sx.s23.s3.fmiref->p.field;
disp = dseg_add_address(cd, fi->value);
if (!CLASS_IS_OR_ALMOST_INITIALIZED(fi->clazz)) {
- PROFILE_CYCLE_STOP;
+ //PROFILE_CYCLE_STOP;
patcher_add_patch_ref(jd, PATCHER_initialize_class,
fi->clazz, 0);
- PROFILE_CYCLE_START;
+ //PROFILE_CYCLE_START;
}
+
+ pr = NULL; /* Silence compiler warning */
}
/* This approach is much faster than moving the field
if (IS_IMM32(iptr->sx.s23.s2.constval))
M_LST_IMM32(iptr->sx.s23.s2.constval, REG_ITMP1, 0);
else {
- M_IST_IMM(iptr->sx.s23.s2.constval, REG_ITMP1, 0);
- M_IST_IMM(iptr->sx.s23.s2.constval >> 32, REG_ITMP1, 4);
+ M_MOV_IMM(iptr->sx.s23.s2.constval, REG_ITMP2);
+ M_LST(REG_ITMP2, REG_ITMP1, 0);
}
break;
}
+ codegen_emit_patchable_barrier(iptr, cd, pr, fi);
break;
case ICMD_GETFIELD: /* ... ==> ..., value */
/* PROFILE_CYCLE_STOP; */
- patcher_add_patch_ref(jd, PATCHER_get_putfield, uf, 0);
+ pr = patcher_add_patch_ref(jd, PATCHER_get_putfield, uf, 0);
+ mcodeptr_save = cd->mcodeptr;
/* PROFILE_CYCLE_START; */
+
+ fi = NULL; /* Silence compiler warning */
}
else {
fi = iptr->sx.s23.s3.fmiref->p.field;
fieldtype = fi->type;
disp = fi->offset;
+
+ pr = 0;
}
/* implicit null-pointer check */
d = codegen_reg_of_dst(jd, iptr, REG_FTMP1);
M_DLD32(d, s1, disp);
break;
+ default:
+ // Silence compiler warning.
+ d = 0;
}
+ if (pr)
+ codegen_fixup_alignment(cd, pr, mcodeptr_save);
emit_store_dst(jd, iptr, d);
break;
/* PROFILE_CYCLE_STOP; */
- patcher_add_patch_ref(jd, PATCHER_get_putfield, uf, 0);
+ pr = patcher_add_patch_ref(jd, PATCHER_get_putfield, uf, 0);
+ mcodeptr_save = cd->mcodeptr;
/* PROFILE_CYCLE_START; */
+
+ fi = NULL; /* Silence compiler warning */
}
else {
fi = iptr->sx.s23.s3.fmiref->p.field;
fieldtype = fi->type;
disp = fi->offset;
+
+ pr = NULL; /* Silence compiler warning */
}
/* implicit null-pointer check */
M_DST32(s2, s1, disp);
break;
}
+ if (pr)
+ codegen_fixup_alignment(cd, pr, mcodeptr_save);
+ codegen_emit_patchable_barrier(iptr, cd, pr, fi);
break;
case ICMD_PUTFIELDCONST: /* ..., objectref, value ==> ... */
/* PROFILE_CYCLE_STOP; */
- patcher_add_patch_ref(jd, PATCHER_putfieldconst, uf, 0);
+ pr = patcher_add_patch_ref(jd, PATCHER_putfieldconst, uf, 0);
+ mcodeptr_save = cd->mcodeptr;
/* PROFILE_CYCLE_START; */
+
+ fi = NULL; /* Silence compiler warning */
}
else {
fi = iptr->sx.s23.s3.fmiref->p.field;
fieldtype = fi->type;
disp = fi->offset;
+
+ pr = NULL; /* Silence compiler warning */
}
/* implicit null-pointer check */
case TYPE_LNG:
case TYPE_ADR:
case TYPE_DBL:
- /* XXX why no check for IS_IMM32? */
- M_IST32_IMM(iptr->sx.s23.s2.constval, s1, disp);
- M_IST32_IMM(iptr->sx.s23.s2.constval >> 32, s1, disp + 4);
+ /* XXX why no check for IS_IMM32? -- probably because of the patcher */
+ M_MOV_IMM(iptr->sx.s23.s2.constval, REG_ITMP2);
+ if (disp) /* resolved, disp can never be 0 */
+ M_LST(REG_ITMP2, s1, disp);
+ else { /* unresolved */
+ M_LST32(REG_ITMP2, s1, disp);
+ pr->patch_align = 4;
+ }
break;
}
+ if (pr)
+ codegen_fixup_alignment(cd, pr, mcodeptr_save);
+ codegen_emit_patchable_barrier(iptr, cd, pr, fi);
break;
case ICMD_ATHROW: /* ..., objectref ==> ... (, objectref) */
- s1 = emit_load_s1(jd, iptr, REG_ITMP1);
- M_INTMOVE(s1, REG_ITMP1_XPTR);
-
- PROFILE_CYCLE_STOP;
-
-#ifdef ENABLE_VERIFIER
- if (INSTRUCTION_IS_UNRESOLVED(iptr)) {
- uc = iptr->sx.s23.s2.uc;
-
- patcher_add_patch_ref(jd, PATCHER_resolve_class, uc, 0);
- }
-#endif /* ENABLE_VERIFIER */
-
M_CALL_IMM(0); /* passing exception pc */
M_POP(REG_ITMP2_XPC);
M_JMP(REG_ITMP3);
break;
- case ICMD_GOTO: /* ... ==> ... */
- case ICMD_RET:
-
- emit_br(cd, iptr->dst.block);
- ALIGNCODENOP;
- break;
-
- case ICMD_JSR: /* ... ==> ... */
-
- emit_br(cd, iptr->sx.s23.s3.jsrtarget.block);
- ALIGNCODENOP;
- break;
-
- case ICMD_IFNULL: /* ..., value ==> ... */
- case ICMD_IFNONNULL:
-
- s1 = emit_load_s1(jd, iptr, REG_ITMP1);
- M_TEST(s1);
- emit_bcc(cd, iptr->dst.block, iptr->opc - ICMD_IFNULL, BRANCH_OPT_NONE);
- break;
-
- case ICMD_IFEQ: /* ..., value ==> ... */
- case ICMD_IFLT:
- case ICMD_IFLE:
- case ICMD_IFNE:
- case ICMD_IFGT:
- case ICMD_IFGE:
-
- s1 = emit_load_s1(jd, iptr, REG_ITMP1);
- M_ICMP_IMM(iptr->sx.val.i, s1);
- emit_bcc(cd, iptr->dst.block, iptr->opc - ICMD_IFEQ, BRANCH_OPT_NONE);
- break;
-
case ICMD_IF_LEQ: /* ..., value ==> ... */
case ICMD_IF_LNE:
case ICMD_IF_LLT:
emit_bcc(cd, iptr->dst.block, iptr->opc - ICMD_IF_LEQ, BRANCH_OPT_NONE);
break;
- case ICMD_IF_ICMPEQ: /* ..., value, value ==> ... */
- case ICMD_IF_ICMPNE:
- case ICMD_IF_ICMPLT:
- case ICMD_IF_ICMPGE:
- case ICMD_IF_ICMPGT:
- case ICMD_IF_ICMPLE:
-
- s1 = emit_load_s1(jd, iptr, REG_ITMP1);
- s2 = emit_load_s2(jd, iptr, REG_ITMP2);
- M_ICMP(s2, s1);
- emit_bcc(cd, iptr->dst.block, iptr->opc - ICMD_IF_ICMPEQ, BRANCH_OPT_NONE);
- break;
-
- case ICMD_IF_ACMPEQ: /* ..., value, value ==> ... */
- case ICMD_IF_ACMPNE:
-
- s1 = emit_load_s1(jd, iptr, REG_ITMP1);
- s2 = emit_load_s2(jd, iptr, REG_ITMP2);
- M_LCMP(s2, s1);
- emit_bcc(cd, iptr->dst.block, iptr->opc - ICMD_IF_ACMPEQ, BRANCH_OPT_NONE);
- break;
-
case ICMD_IF_LCMPEQ: /* ..., value, value ==> ... */
case ICMD_IF_LCMPNE:
case ICMD_IF_LCMPLT:
emit_bcc(cd, iptr->dst.block, iptr->opc - ICMD_IF_LCMPEQ, BRANCH_OPT_NONE);
break;
- case ICMD_IRETURN: /* ..., retvalue ==> ... */
- case ICMD_LRETURN:
-
- REPLACEMENT_POINT_RETURN(cd, iptr);
- s1 = emit_load_s1(jd, iptr, REG_RESULT);
- M_INTMOVE(s1, REG_RESULT);
- goto nowperformreturn;
-
- case ICMD_ARETURN: /* ..., retvalue ==> ... */
-
- REPLACEMENT_POINT_RETURN(cd, iptr);
- s1 = emit_load_s1(jd, iptr, REG_RESULT);
- M_INTMOVE(s1, REG_RESULT);
-
-#ifdef ENABLE_VERIFIER
- if (INSTRUCTION_IS_UNRESOLVED(iptr)) {
- uc = iptr->sx.s23.s2.uc;
-
- PROFILE_CYCLE_STOP;
-
- patcher_add_patch_ref(jd, PATCHER_resolve_class, uc, 0);
-
- PROFILE_CYCLE_START;
- }
-#endif /* ENABLE_VERIFIER */
- goto nowperformreturn;
-
- case ICMD_FRETURN: /* ..., retvalue ==> ... */
- case ICMD_DRETURN:
-
- REPLACEMENT_POINT_RETURN(cd, iptr);
- s1 = emit_load_s1(jd, iptr, REG_FRESULT);
- M_FLTMOVE(s1, REG_FRESULT);
- goto nowperformreturn;
-
- case ICMD_RETURN: /* ... ==> ... */
-
- REPLACEMENT_POINT_RETURN(cd, iptr);
-
-nowperformreturn:
- {
- s4 i, p;
-
- p = cd->stackframesize;
-
-#if !defined(NDEBUG)
- if (JITDATA_HAS_FLAG_VERBOSECALL(jd))
- emit_verbosecall_exit(jd);
-#endif /* !defined(NDEBUG) */
-
-#if defined(ENABLE_THREADS)
- if (checksync && code_is_synchronized(code)) {
- M_ALD(REG_A0, REG_SP, rd->memuse * 8);
-
- /* we need to save the proper return value */
- switch (iptr->opc) {
- case ICMD_IRETURN:
- case ICMD_ARETURN:
- case ICMD_LRETURN:
- M_LST(REG_RESULT, REG_SP, rd->memuse * 8);
- break;
- case ICMD_FRETURN:
- case ICMD_DRETURN:
- M_DST(REG_FRESULT, REG_SP, rd->memuse * 8);
- break;
- }
-
- M_MOV_IMM(LOCK_monitor_exit, REG_ITMP1);
- M_CALL(REG_ITMP1);
-
- /* and now restore the proper return value */
- switch (iptr->opc) {
- case ICMD_IRETURN:
- case ICMD_ARETURN:
- case ICMD_LRETURN:
- M_LLD(REG_RESULT, REG_SP, rd->memuse * 8);
- break;
- case ICMD_FRETURN:
- case ICMD_DRETURN:
- M_DLD(REG_FRESULT, REG_SP, rd->memuse * 8);
- break;
- }
- }
-#endif
-
- /* restore saved registers */
-
- for (i = INT_SAV_CNT - 1; i >= rd->savintreguse; i--) {
- p--; M_LLD(rd->savintregs[i], REG_SP, p * 8);
- }
- for (i = FLT_SAV_CNT - 1; i >= rd->savfltreguse; i--) {
- p--; M_DLD(rd->savfltregs[i], REG_SP, p * 8);
- }
-
- /* deallocate stack */
-
- if (cd->stackframesize)
- M_AADD_IMM(cd->stackframesize * 8, REG_SP);
-
- /* generate method profiling code */
-
- PROFILE_CYCLE_STOP;
-
- M_RET;
- }
- break;
-
-
case ICMD_TABLESWITCH: /* ..., index ==> ... */
{
s4 i, l;
}
break;
-
- case ICMD_LOOKUPSWITCH: /* ..., key ==> ... */
- {
- s4 i;
- lookup_target_t *lookup;
-
- lookup = iptr->dst.lookup;
-
- i = iptr->sx.s23.s2.lookupcount;
-
- MCODECHECK(8 + ((7 + 6) * i) + 5);
- s1 = emit_load_s1(jd, iptr, REG_ITMP1);
-
- while (--i >= 0) {
- M_ICMP_IMM(lookup->value, s1);
- emit_beq(cd, lookup->target.block);
- lookup++;
- }
-
- emit_br(cd, iptr->sx.s23.s3.lookupdefault.block);
- ALIGNCODENOP;
+ case ICMD_BUILTIN:
+ bte = iptr->sx.s23.s3.bte;
+ if (bte->stub == NULL) {
+ M_MOV_IMM(bte->fp, REG_ITMP1);
+ }
+ else {
+ M_MOV_IMM(bte->stub, REG_ITMP1);
}
+ M_CALL(REG_ITMP1);
break;
+ case ICMD_INVOKESPECIAL:
+ emit_nullpointer_check(cd, iptr, REG_A0);
+ /* fall through */
- case ICMD_BUILTIN: /* ..., [arg1, [arg2 ...]] ==> ... */
-
- REPLACEMENT_POINT_FORGC_BUILTIN(cd, iptr);
-
- bte = iptr->sx.s23.s3.bte;
- md = bte->md;
- goto gen_method;
-
- case ICMD_INVOKESTATIC: /* ..., [arg1, [arg2 ...]] ==> ... */
-
- case ICMD_INVOKESPECIAL:/* ..., objectref, [arg1, [arg2 ...]] ==> ... */
- case ICMD_INVOKEVIRTUAL:/* op1 = arg count, val.a = method pointer */
- case ICMD_INVOKEINTERFACE:
-
- REPLACEMENT_POINT_INVOKE(cd, iptr);
-
+ case ICMD_INVOKESTATIC:
if (INSTRUCTION_IS_UNRESOLVED(iptr)) {
- lm = NULL;
um = iptr->sx.s23.s3.um;
- md = um->methodref->parseddesc.md;
+ disp = dseg_add_unique_address(cd, um);
+
+ patcher_add_patch_ref(jd, PATCHER_invokestatic_special,
+ um, disp);
}
else {
lm = iptr->sx.s23.s3.fmiref->p.method;
- um = NULL;
- md = lm->parseddesc;
+ disp = dseg_add_functionptr(cd, lm->stubroutine);
}
-gen_method:
- s3 = md->paramcount;
-
- MCODECHECK((20 * s3) + 128);
-
- /* copy arguments to registers or stack location */
-
- for (s3 = s3 - 1; s3 >= 0; s3--) {
- var = VAR(iptr->sx.s23.s2.args[s3]);
- d = md->params[s3].regoff;
-
- /* already preallocated (ARGVAR)? */
-
- if (var->flags & PREALLOC)
- continue;
+ M_ALD(REG_ITMP2, RIP, disp);
+ M_CALL(REG_ITMP2);
+ break;
- if (IS_INT_LNG_TYPE(var->type)) {
- if (!md->params[s3].inmemory) {
- s1 = emit_load(jd, iptr, var, d);
- M_INTMOVE(s1, d);
- }
- else {
- s1 = emit_load(jd, iptr, var, REG_ITMP1);
- M_LST(s1, REG_SP, d);
- }
- }
- else {
- if (!md->params[s3].inmemory) {
- s1 = emit_load(jd, iptr, var, d);
- M_FLTMOVE(s1, d);
- }
- else {
- s1 = emit_load(jd, iptr, var, REG_FTMP1);
+ case ICMD_INVOKEVIRTUAL:
+ if (INSTRUCTION_IS_UNRESOLVED(iptr)) {
+ um = iptr->sx.s23.s3.um;
+ patcher_add_patch_ref(jd, PATCHER_invokevirtual, um, 0);
+ emit_arbitrary_nop(cd, PATCH_ALIGNMENT((uintptr_t) cd->mcodeptr, 6, sizeof(int32_t)));
- if (IS_2_WORD_TYPE(var->type))
- M_DST(s1, REG_SP, d);
- else
- M_FST(s1, REG_SP, d);
- }
- }
+ s1 = 0;
}
-
- /* generate method profiling code */
-
- PROFILE_CYCLE_STOP;
-
- switch (iptr->opc) {
- case ICMD_BUILTIN:
- if (bte->stub == NULL) {
- M_MOV_IMM(bte->fp, REG_ITMP1);
- }
- else {
- M_MOV_IMM(bte->stub, REG_ITMP1);
- }
- M_CALL(REG_ITMP1);
- break;
-
- case ICMD_INVOKESPECIAL:
- emit_nullpointer_check(cd, iptr, REG_A0);
- /* fall through */
-
- case ICMD_INVOKESTATIC:
- if (lm == NULL) {
- disp = dseg_add_unique_address(cd, um);
-
- patcher_add_patch_ref(jd, PATCHER_invokestatic_special,
- um, disp);
- }
- else {
- disp = dseg_add_functionptr(cd, lm->stubroutine);
- }
-
- M_ALD(REG_ITMP2, RIP, disp);
- M_CALL(REG_ITMP2);
- break;
-
- case ICMD_INVOKEVIRTUAL:
- if (lm == NULL) {
- patcher_add_patch_ref(jd, PATCHER_invokevirtual, um, 0);
-
- s1 = 0;
- }
- else {
- s1 = OFFSET(vftbl_t, table[0]) +
- sizeof(methodptr) * lm->vftblindex;
- }
-
- /* implicit null-pointer check */
- M_ALD(REG_METHODPTR, REG_A0, OFFSET(java_object_t, vftbl));
- M_ALD32(REG_ITMP3, REG_METHODPTR, s1);
- M_CALL(REG_ITMP3);
- break;
-
- case ICMD_INVOKEINTERFACE:
- if (lm == NULL) {
- patcher_add_patch_ref(jd, PATCHER_invokeinterface, um, 0);
-
- s1 = 0;
- s2 = 0;
- }
- else {
- s1 = OFFSET(vftbl_t, interfacetable[0]) -
- sizeof(methodptr) * lm->clazz->index;
-
- s2 = sizeof(methodptr) * (lm - lm->clazz->methods);
- }
-
- /* implicit null-pointer check */
- M_ALD(REG_METHODPTR, REG_A0, OFFSET(java_object_t, vftbl));
- M_ALD32(REG_METHODPTR, REG_METHODPTR, s1);
- M_ALD32(REG_ITMP3, REG_METHODPTR, s2);
- M_CALL(REG_ITMP3);
- break;
+ else {
+ lm = iptr->sx.s23.s3.fmiref->p.method;
+ s1 = OFFSET(vftbl_t, table[0]) +
+ sizeof(methodptr) * lm->vftblindex;
}
- /* generate method profiling code */
-
- PROFILE_CYCLE_START;
-
- /* store size of call code in replacement point */
+ /* implicit null-pointer check */
+ M_ALD(REG_METHODPTR, REG_A0, OFFSET(java_object_t, vftbl));
+ M_ALD32(REG_ITMP3, REG_METHODPTR, s1);
+ M_CALL(REG_ITMP3);
+ break;
- REPLACEMENT_POINT_INVOKE_RETURN(cd, iptr);
- REPLACEMENT_POINT_FORGC_BUILTIN_RETURN(cd, iptr);
+ case ICMD_INVOKEINTERFACE:
+ if (INSTRUCTION_IS_UNRESOLVED(iptr)) {
+ um = iptr->sx.s23.s3.um;
+ patcher_add_patch_ref(jd, PATCHER_invokeinterface, um, 0);
+ emit_arbitrary_nop(cd, PATCH_ALIGNMENT((uintptr_t) cd->mcodeptr, 6, sizeof(int32_t)));
- /* store return value */
+ s1 = 0;
+ s2 = 0;
+ }
+ else {
+ lm = iptr->sx.s23.s3.fmiref->p.method;
+ s1 = OFFSET(vftbl_t, interfacetable[0]) -
+ sizeof(methodptr) * lm->clazz->index;
- switch (md->returntype.type) {
- case TYPE_INT:
- case TYPE_LNG:
- case TYPE_ADR:
- s1 = codegen_reg_of_dst(jd, iptr, REG_RESULT);
- M_INTMOVE(REG_RESULT, s1);
- emit_store_dst(jd, iptr, s1);
- break;
- case TYPE_FLT:
- case TYPE_DBL:
- s1 = codegen_reg_of_dst(jd, iptr, REG_FRESULT);
- M_FLTMOVE(REG_FRESULT, s1);
- emit_store_dst(jd, iptr, s1);
- break;
- default:
- /* TYPE_VOID */
- break;
+ s2 = sizeof(methodptr) * (lm - lm->clazz->methods);
}
- break;
+ /* implicit null-pointer check */
+ M_ALD(REG_METHODPTR, REG_A0, OFFSET(java_object_t, vftbl));
+ M_ALD32(REG_METHODPTR, REG_METHODPTR, s1);
+ if (INSTRUCTION_IS_UNRESOLVED(iptr))
+ emit_arbitrary_nop(cd, PATCH_ALIGNMENT((uintptr_t) cd->mcodeptr, 3, sizeof(int32_t)));
+ M_ALD32(REG_ITMP3, REG_METHODPTR, s2);
+ M_CALL(REG_ITMP3);
+ break;
case ICMD_CHECKCAST: /* ..., objectref ==> ..., objectref */
patcher_add_patch_ref(jd, PATCHER_resolve_classref_to_flags,
iptr->sx.s23.s3.c.ref, 0);
+ emit_arbitrary_nop(cd, PATCH_ALIGNMENT((uintptr_t) cd->mcodeptr, 2, sizeof(int32_t)));
+
M_IMOV_IMM(0, REG_ITMP2); /* super->flags */
M_IAND_IMM(ACC_INTERFACE, REG_ITMP2);
emit_label_beq(cd, BRANCH_LABEL_2);
patcher_add_patch_ref(jd, PATCHER_checkcast_interface,
iptr->sx.s23.s3.c.ref,
0);
+ emit_arbitrary_nop(cd, PATCH_ALIGNMENT((uintptr_t) cd->mcodeptr, 10, sizeof(int32_t)));
}
M_ILD32(REG_ITMP3,
M_ICMP_IMM32(superindex, REG_ITMP3);
emit_classcast_check(cd, iptr, BRANCH_LE, REG_ITMP3, s1);
+ if (super == NULL)
+ emit_arbitrary_nop(cd, PATCH_ALIGNMENT((uintptr_t) cd->mcodeptr, 3, sizeof(int32_t)));
M_ALD32(REG_ITMP3, REG_ITMP2,
OFFSET(vftbl_t, interfacetable[0]) -
superindex * sizeof(methodptr*));
if (super == NULL) {
emit_label(cd, BRANCH_LABEL_2);
- cr = iptr->sx.s23.s3.c.ref;
+ constant_classref *cr = iptr->sx.s23.s3.c.ref;
disp = dseg_add_unique_address(cd, cr);
patcher_add_patch_ref(jd,
if (super == NULL || super->vftbl->subtype_depth >= DISPLAY_SIZE) {
M_ILD(REG_ITMP1, REG_ITMP3, OFFSET(vftbl_t, subtype_offset));
-
- *(cd->mcodeptr++) = 0x4d;
- *(cd->mcodeptr++) = 0x3b;
- *(cd->mcodeptr++) = 0x1c;
- *(cd->mcodeptr++) = 0x02;
- /* cmp (ITMP2, ITMP1, 1), ITMP3 */
-
+ M_LCMP_MEMINDEX(REG_ITMP2, 0, REG_ITMP1, 0, REG_ITMP3);
emit_label_beq(cd, BRANCH_LABEL_6); /* good */
if (super == NULL) {
}
M_ILD(REG_ITMP1, REG_ITMP3, OFFSET(vftbl_t, subtype_depth));
- *(cd->mcodeptr++) = 0x41;
- *(cd->mcodeptr++) = 0x39;
- *(cd->mcodeptr++) = 0x42;
- *(cd->mcodeptr++) = OFFSET(vftbl_t, subtype_depth);
- /* cmpl ITMP1, subtype_depth(ITMP2) */
- emit_label_blt(cd, BRANCH_LABEL_9); /* throw */
+ M_ICMP_MEMBASE(REG_ITMP2, OFFSET(vftbl_t, subtype_depth), REG_ITMP1);
+ emit_label_bgt(cd, BRANCH_LABEL_9); /* throw */
M_ALD(REG_ITMP2, REG_ITMP2, OFFSET(vftbl_t, subtype_overflow));
-
- *(cd->mcodeptr++) = 0x4d;
- *(cd->mcodeptr++) = 0x3b;
- *(cd->mcodeptr++) = 0x5c;
- *(cd->mcodeptr++) = 0xc2;
- *(cd->mcodeptr++) = -8*DISPLAY_SIZE;
- /* cmp -8*DISPL(ITMP2, ITMP1, 8), ITMP3 */
-
+ M_LCMP_MEMINDEX(REG_ITMP2, -8*DISPLAY_SIZE, REG_ITMP1, 3, REG_ITMP3);
emit_label_beq(cd, BRANCH_LABEL_7); /* good */
emit_label(cd, BRANCH_LABEL_9);
emit_load_s1(jd, iptr, REG_ITMP1);
}
else {
- assert(super->vftbl->subtype_offset < 0x80);
- *(cd->mcodeptr++) = 0x4d;
- *(cd->mcodeptr++) = 0x3b;
- *(cd->mcodeptr++) = 0x5a;
- *(cd->mcodeptr++) = super->vftbl->subtype_offset;
- /* cmp off(ITMP2), ITMP3 */
-
+ M_LCMP_MEMBASE(REG_ITMP2, super->vftbl->subtype_offset, REG_ITMP3);
emit_classcast_check(cd, iptr, BRANCH_NE, REG_ITMP3, s1);
}
M_INTMOVE(s1, REG_A0);
if (INSTRUCTION_IS_UNRESOLVED(iptr)) {
- cr = iptr->sx.s23.s3.c.ref;
+ constant_classref *cr = iptr->sx.s23.s3.c.ref;
disp = dseg_add_unique_address(cd, cr);
patcher_add_patch_ref(jd,
patcher_add_patch_ref(jd, PATCHER_resolve_classref_to_flags,
iptr->sx.s23.s3.c.ref, 0);
+ emit_arbitrary_nop(cd, PATCH_ALIGNMENT((uintptr_t) cd->mcodeptr, 2, sizeof(int32_t)));
+
M_IMOV_IMM(0, REG_ITMP3); /* super->flags */
M_IAND_IMM(ACC_INTERFACE, REG_ITMP3);
emit_label_beq(cd, BRANCH_LABEL_2);
/* interface instanceof code */
if ((super == NULL) || (super->flags & ACC_INTERFACE)) {
+ int nops;
if (super != NULL) {
M_TEST(s1);
emit_label_beq(cd, BRANCH_LABEL_3);
if (super == NULL) {
patcher_add_patch_ref(jd, PATCHER_instanceof_interface,
iptr->sx.s23.s3.c.ref, 0);
+ emit_arbitrary_nop(cd, PATCH_ALIGNMENT((uintptr_t) cd->mcodeptr, 10, sizeof(int32_t)));
}
M_ILD32(REG_ITMP3,
REG_ITMP1, OFFSET(vftbl_t, interfacetablelength));
M_ICMP_IMM32(superindex, REG_ITMP3);
- a = 3 + 4 /* mov_membase32_reg */ + 3 /* test */ + 4 /* setcc */;
+ nops = super == NULL ? PATCH_ALIGNMENT((uintptr_t) (cd->mcodeptr + 6), 3, sizeof(int32_t)) : 0;
+
+ int a = 3 + 4 /* mov_membase32_reg */ + 3 /* test */ + 4 /* setcc */ + nops;
M_BLE(a);
+ emit_arbitrary_nop(cd, nops);
M_ALD32(REG_ITMP1, REG_ITMP1,
OFFSET(vftbl_t, interfacetable[0]) -
superindex * sizeof(methodptr*));
if (super == NULL) {
emit_label(cd, BRANCH_LABEL_2);
- cr = iptr->sx.s23.s3.c.ref;
+ constant_classref *cr = iptr->sx.s23.s3.c.ref;
disp = dseg_add_unique_address(cd, cr);
patcher_add_patch_ref(jd,
if (super == NULL || super->vftbl->subtype_depth >= DISPLAY_SIZE) {
M_ILD(REG_ITMP1, REG_ITMP3, OFFSET(vftbl_t, subtype_offset));
-
- *(cd->mcodeptr++) = 0x4d;
- *(cd->mcodeptr++) = 0x3b;
- *(cd->mcodeptr++) = 0x1c;
- *(cd->mcodeptr++) = 0x02;
- /* cmp (ITMP2, ITMP1, 1), ITMP3 */
-
+ M_LCMP_MEMINDEX(REG_ITMP2, 0, REG_ITMP1, 0, REG_ITMP3);
emit_label_bne(cd, BRANCH_LABEL_8); /* jump over INC/SETE */
if (d == REG_ITMP2) {
M_SETE(d);
}
M_ILD(REG_ITMP1, REG_ITMP3, OFFSET(vftbl_t, subtype_depth));
- *(cd->mcodeptr++) = 0x41;
- *(cd->mcodeptr++) = 0x39;
- *(cd->mcodeptr++) = 0x42;
- *(cd->mcodeptr++) = OFFSET(vftbl_t, subtype_depth);
- /* cmpl ITMP1, subtype_depth(ITMP2) */
- emit_label_blt(cd, BRANCH_LABEL_9); /* false */
+ M_ICMP_MEMBASE(REG_ITMP2, OFFSET(vftbl_t, subtype_depth), REG_ITMP1);
+ emit_label_bgt(cd, BRANCH_LABEL_9); /* false */
M_ALD(REG_ITMP2, REG_ITMP2, OFFSET(vftbl_t, subtype_overflow));
-
- *(cd->mcodeptr++) = 0x4d;
- *(cd->mcodeptr++) = 0x3b;
- *(cd->mcodeptr++) = 0x5c;
- *(cd->mcodeptr++) = 0xc2;
- *(cd->mcodeptr++) = -8*DISPLAY_SIZE;
- /* cmp -8*DISPL(ITMP2, ITMP1, 8), ITMP3 */
-
+ M_LCMP_MEMINDEX(REG_ITMP2, -8*DISPLAY_SIZE, REG_ITMP1, 3, REG_ITMP3);
M_SETE(d);
if (d == REG_ITMP2) {
M_BSEXT(d, d);
emit_label(cd, BRANCH_LABEL_6);
}
else {
- assert(super->vftbl->subtype_offset < 0x80);
- *(cd->mcodeptr++) = 0x4d;
- *(cd->mcodeptr++) = 0x3b;
- *(cd->mcodeptr++) = 0x5a;
- *(cd->mcodeptr++) = super->vftbl->subtype_offset;
- /* cmp off(ITMP2), ITMP3 */
-
+ M_LCMP_MEMBASE(REG_ITMP2, super->vftbl->subtype_offset, REG_ITMP3);
M_SETE(d);
if (d == REG_ITMP2)
M_BSEXT(d, d);
/* is a patcher function set? */
if (INSTRUCTION_IS_UNRESOLVED(iptr)) {
- cr = iptr->sx.s23.s3.c.ref;
+ constant_classref *cr = iptr->sx.s23.s3.c.ref;
disp = dseg_add_unique_address(cd, cr);
patcher_add_patch_ref(jd, PATCHER_resolve_classref_to_classinfo,
break;
default:
- exceptions_throw_internalerror("Unknown ICMD %d during code generation",
- iptr->opc);
- return false;
+ vm_abort("Unknown ICMD %d during code generation", iptr->opc);
} /* switch */
-
- } /* for instruction */
-
- MCODECHECK(512); /* XXX require a lower number? */
-
- /* At the end of a basic block we may have to append some nops,
- because the patcher stub calling code might be longer than the
- actual instruction. So codepatching does not change the
- following block unintentionally. */
-
- if (cd->mcodeptr < cd->lastmcodeptr) {
- while (cd->mcodeptr < cd->lastmcodeptr) {
- M_NOP;
- }
- }
-
- } /* if (bptr -> flags >= BBREACHED) */
- } /* for basic block */
-
- /* Generate patcher traps. */
-
- emit_patcher_traps(jd);
-
- /* everything's ok */
-
- return true;
}
/* put env into first argument register */
- M_MOV_IMM(_Jv_env, REG_A0);
+ M_MOV_IMM(VM_get_jnienv(), REG_A0);
}
/* Call the native function. */
case TYPE_INT:
case TYPE_LNG:
case TYPE_ADR:
- switch (md->returntype.decltype) {
+ switch (md->returntype.primitivetype) {
case PRIMITIVETYPE_BOOLEAN:
M_BZEXT(REG_RESULT, REG_RESULT);
break;