/* src/vm/jit/x86_64/codegen.c - machine code generator for x86_64
- 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 R. Grafl, A. Krall, C. Kruegel,
+ C. Oates, R. Obermaisser, M. Platter, M. Probst, S. Ring,
+ E. Steiner, C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich,
+ J. Wenninger, Institut f. Computersprachen - TU Wien
This file is part of CACAO.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- 02111-1307, USA.
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ 02110-1301, USA.
- Contact: cacao@complang.tuwien.ac.at
+ Contact: cacao@cacaojvm.org
Authors: Andreas Krall
Christian Thalinger
Changes: Christian Ullrich
+ Edwin Steiner
- $Id: codegen.c 3661 2005-11-11 14:02:45Z twisti $
+ $Id: codegen.c 4826 2006-04-24 16:06:16Z twisti $
*/
+#include "config.h"
+
+#include <assert.h>
#include <stdio.h>
-#include "config.h"
#include "vm/types.h"
#include "md.h"
#include "md-abi.h"
-#include "md-abi.inc"
#include "vm/jit/x86_64/arch.h"
#include "vm/jit/x86_64/codegen.h"
-#include "vm/jit/x86_64/emitfuncs.h"
+#include "vm/jit/x86_64/md-emit.h"
-#include "cacao/cacao.h"
+#include "mm/memory.h"
+#include "native/jni.h"
#include "native/native.h"
-#include "vm/global.h"
#include "vm/builtin.h"
+#include "vm/exceptions.h"
+#include "vm/global.h"
#include "vm/loader.h"
+#include "vm/options.h"
#include "vm/statistics.h"
#include "vm/stringlocal.h"
-#include "vm/tables.h"
+#include "vm/vm.h"
#include "vm/jit/asmpart.h"
-#include "vm/jit/codegen.inc"
+#include "vm/jit/codegen-common.h"
+#include "vm/jit/dseg.h"
+#include "vm/jit/emit.h"
#include "vm/jit/jit.h"
-
-#if defined(LSRA)
-# include "vm/jit/lsra.inc"
-#endif
-
#include "vm/jit/methodheader.h"
#include "vm/jit/parse.h"
#include "vm/jit/patcher.h"
#include "vm/jit/reg.h"
-#include "vm/jit/reg.inc"
+#include "vm/jit/replace.h"
+
+#if defined(ENABLE_LSRA)
+# include "vm/jit/allocator/lsra.h"
+#endif
/* codegen *********************************************************************
*******************************************************************************/
-bool codegen(methodinfo *m, codegendata *cd, registerdata *rd)
+bool codegen(jitdata *jd)
{
+ methodinfo *m;
+ codegendata *cd;
+ registerdata *rd;
s4 len, s1, s2, s3, d, disp;
u2 currentline;
ptrint a;
- s4 parentargs_base;
+ s4 stackframesize;
stackptr src;
varinfo *var;
basicblock *bptr;
methodinfo *lm; /* local methodinfo for ICMD_INVOKE* */
builtintable_entry *bte;
methoddesc *md;
+ rplpoint *replacementpoint;
+
+ /* get required compiler data */
+
+ m = jd->m;
+ cd = jd->cd;
+ rd = jd->rd;
/* prevent compiler warnings */
savedregs_num += (INT_SAV_CNT - rd->savintreguse);
savedregs_num += (FLT_SAV_CNT - rd->savfltreguse);
- parentargs_base = rd->memuse + savedregs_num;
+ stackframesize = rd->memuse + savedregs_num;
#if defined(USE_THREADS)
/* space to save argument of monitor_enter */
if (checksync && (m->flags & ACC_SYNCHRONIZED))
- parentargs_base++;
+ 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 (!m->isleafmethod || runverbose)
- parentargs_base |= 0x1;
+ if (!m->isleafmethod || opt_verbosecall)
+ stackframesize |= 0x1;
/* create method header */
(void) dseg_addaddress(cd, m); /* MethodPointer */
- (void) dseg_adds4(cd, parentargs_base * 8); /* FrameSize */
+ (void) dseg_adds4(cd, stackframesize * 8); /* FrameSize */
#if defined(USE_THREADS)
/* IsSync contains the offset relative to the stack pointer for the
(void) dseg_addaddress(cd, ex->catchtype.cls);
}
- /* initialize mcode variables */
-
- cd->mcodeptr = (u1 *) cd->mcodebase;
- cd->mcodeend = (s4 *) (cd->mcodebase + cd->mcodesize);
- MCODECHECK(512);
+ /* generate method profiling code */
+
+ if (opt_prof) {
+ /* count frequency */
- /* initialize the last patcher pointer */
+ M_MOV_IMM(m, REG_ITMP3);
+ M_IINC_MEMBASE(REG_ITMP3, OFFSET(methodinfo, frequency));
- cd->lastmcodeptr = cd->mcodeptr;
+ PROFILE_CYCLE_START;
+ }
/* create stack frame (if necessary) */
- if (parentargs_base)
- M_ASUB_IMM(parentargs_base * 8, REG_SP);
+ if (stackframesize)
+ M_ASUB_IMM(stackframesize * 8, REG_SP);
/* save used callee saved registers */
- p = parentargs_base;
+ p = stackframesize;
for (i = INT_SAV_CNT - 1; i >= rd->savintreguse; i--) {
p--; M_LST(rd->savintregs[i], REG_SP, p * 8);
}
} else { /* stack arguments */
if (!(var->flags & INMEMORY)) { /* stack arg -> register */
/* + 8 for return address */
- M_LLD(var->regoff, REG_SP, (parentargs_base + s1) * 8 + 8);
+ M_LLD(var->regoff, REG_SP, (stackframesize + s1) * 8 + 8);
} else { /* stack arg -> spilled */
- var->regoff = parentargs_base + s1 + 1;
+ var->regoff = stackframesize + s1 + 1;
}
}
} else { /* stack arguments */
if (!(var->flags & INMEMORY)) { /* stack-arg -> register */
- M_DLD(var->regoff, REG_SP, (parentargs_base + s1) * 8 + 8);
+ M_DLD(var->regoff, REG_SP, (stackframesize + s1) * 8 + 8);
} else {
- var->regoff = parentargs_base + s1 + 1;
+ var->regoff = stackframesize + s1 + 1;
}
}
}
s1 = rd->memuse;
- if (runverbose) {
+ if (opt_verbosecall) {
M_LSUB_IMM((INT_ARG_CNT + FLT_ARG_CNT) * 8, REG_SP);
for (p = 0; p < INT_ARG_CNT; p++)
/* decide which monitor enter function to call */
if (m->flags & ACC_STATIC) {
- x86_64_mov_imm_reg(cd, (ptrint) m->class, REG_ITMP1);
- x86_64_mov_reg_membase(cd, REG_ITMP1, REG_SP, s1 * 8);
+ M_MOV_IMM(m->class, REG_ITMP1);
+ M_AST(REG_ITMP1, REG_SP, s1 * 8);
M_INTMOVE(REG_ITMP1, rd->argintregs[0]);
- x86_64_mov_imm_reg(cd, (ptrint) BUILTIN_staticmonitorenter, REG_ITMP1);
- x86_64_call_reg(cd, REG_ITMP1);
+ M_MOV_IMM(BUILTIN_staticmonitorenter, REG_ITMP1);
+ M_CALL(REG_ITMP1);
} else {
- x86_64_test_reg_reg(cd, rd->argintregs[0], rd->argintregs[0]);
- x86_64_jcc(cd, X86_64_CC_Z, 0);
- codegen_addxnullrefs(cd, cd->mcodeptr);
- x86_64_mov_reg_membase(cd, rd->argintregs[0], REG_SP, s1 * 8);
- x86_64_mov_imm_reg(cd, (ptrint) BUILTIN_monitorenter, REG_ITMP1);
- x86_64_call_reg(cd, REG_ITMP1);
+ M_TEST(rd->argintregs[0]);
+ M_BEQ(0);
+ codegen_add_nullpointerexception_ref(cd);
+ M_AST(rd->argintregs[0], REG_SP, s1 * 8);
+ M_MOV_IMM(BUILTIN_monitorenter, REG_ITMP1);
+ M_CALL(REG_ITMP1);
}
- if (runverbose) {
+ if (opt_verbosecall) {
for (p = 0; p < INT_ARG_CNT; p++)
M_LLD(rd->argintregs[p], REG_SP, p * 8);
}
#endif
- /* Copy argument registers to stack and call trace function with pointer */
- /* to arguments on stack. */
+#if !defined(NDEBUG)
+ /* Copy argument registers to stack and call trace function with
+ pointer to arguments on stack. */
- if (runverbose || opt_stat) {
+ if (opt_verbosecall) {
M_LSUB_IMM((INT_ARG_CNT + FLT_ARG_CNT + INT_TMP_CNT + FLT_TMP_CNT + 1 + 1) * 8, REG_SP);
/* save integer argument registers */
M_DST(rd->tmpfltregs[p], REG_SP, (1 + INT_ARG_CNT + FLT_ARG_CNT + INT_TMP_CNT + p) * 8);
}
- if (runverbose) {
- /* show integer hex code for float arguments */
+ /* show integer hex code for float arguments */
- for (p = 0, l = 0; p < md->paramcount && p < INT_ARG_CNT; p++) {
- /* if the paramtype is a float, we have to right shift all */
- /* following integer registers */
+ for (p = 0, l = 0; p < md->paramcount && p < INT_ARG_CNT; p++) {
+ /* If the paramtype is a float, we have to right shift all
+ following integer registers. */
- if (IS_FLT_DBL_TYPE(md->paramtypes[p].type)) {
- for (s1 = INT_ARG_CNT - 2; s1 >= p; s1--) {
- M_MOV(rd->argintregs[s1], rd->argintregs[s1 + 1]);
- }
-
- x86_64_movd_freg_reg(cd, rd->argfltregs[l], rd->argintregs[p]);
- l++;
+ if (IS_FLT_DBL_TYPE(md->paramtypes[p].type)) {
+ for (s1 = INT_ARG_CNT - 2; s1 >= p; s1--) {
+ M_MOV(rd->argintregs[s1], rd->argintregs[s1 + 1]);
}
- }
- x86_64_mov_imm_reg(cd, (ptrint) m, REG_ITMP2);
- x86_64_mov_reg_membase(cd, REG_ITMP2, REG_SP, 0 * 8);
- x86_64_mov_imm_reg(cd, (ptrint) builtin_trace_args, REG_ITMP1);
- x86_64_call_reg(cd, REG_ITMP1);
+ x86_64_movd_freg_reg(cd, rd->argfltregs[l], rd->argintregs[p]);
+ l++;
+ }
}
- STATS({
- x86_64_mov_imm_reg(cd, (ptrint) compiledinvokation, REG_ITMP1);
- x86_64_call_reg(cd, REG_ITMP1);
- })
-
+
+ M_MOV_IMM(m, REG_ITMP2);
+ M_AST(REG_ITMP2, REG_SP, 0 * 8);
+ M_MOV_IMM(builtin_trace_args, REG_ITMP1);
+ M_CALL(REG_ITMP1);
+
/* restore integer argument registers */
for (p = 0; p < INT_ARG_CNT; p++)
M_LADD_IMM((INT_ARG_CNT + FLT_ARG_CNT + INT_TMP_CNT + FLT_TMP_CNT + 1 + 1) * 8, REG_SP);
}
+#endif /* !defined(NDEBUG) */
}
/* end of header generation */
+ replacementpoint = jd->code->rplpoints;
+
/* walk through all basic blocks */
+
for (bptr = m->basicblocks; bptr != NULL; bptr = bptr->next) {
bptr->mpc = (u4) ((u1 *) cd->mcodeptr - cd->mcodebase);
bptr->mpc);
}
+ /* handle replacement points */
+
+ if (bptr->bitflags & BBFLAG_REPLACEMENT) {
+ replacementpoint->pc = (u1*)(ptrint)bptr->mpc; /* will be resolved later */
+
+ replacementpoint++;
+
+ assert(cd->lastmcodeptr <= cd->mcodeptr);
+ cd->lastmcodeptr = cd->mcodeptr + 5; /* 5 byte jmp patch */
+ }
+
/* copy interface registers to their destination */
src = bptr->instack;
len = bptr->indepth;
MCODECHECK(512);
-#ifdef LSRA
+ /* generate basicblock profiling code */
+
+ if (opt_prof_bb) {
+ /* count frequency */
+
+ M_MOV_IMM(m->bbfrequency, REG_ITMP2);
+ M_IINC_MEMBASE(REG_ITMP2, bptr->debug_nr * 4);
+
+ /* if this is an exception handler, start profiling again */
+
+ if (bptr->type == BBTYPE_EXH)
+ PROFILE_CYCLE_START;
+ }
+
+#if defined(ENABLE_LSRA)
if (opt_lsra) {
while (src != NULL) {
len--;
if ((len == 0) && (bptr->type != BBTYPE_STD)) {
if (bptr->type == BBTYPE_SBR) {
- /* d = reg_of_var(rd, src, REG_ITMP1); */
+/* d = reg_of_var(rd, src, REG_ITMP1); */
if (!(src->flags & INMEMORY))
d= src->regoff;
else
d=REG_ITMP1;
x86_64_pop_reg(cd, d);
- store_reg_to_var_int(src, d);
+ emit_store(jd, NULL, src, d);
} else if (bptr->type == BBTYPE_EXH) {
- /* d = reg_of_var(rd, src, REG_ITMP1); */
+/* d = reg_of_var(rd, src, REG_ITMP1); */
if (!(src->flags & INMEMORY))
d= src->regoff;
else
d=REG_ITMP1;
M_INTMOVE(REG_ITMP1, d);
- store_reg_to_var_int(src, d);
+ emit_store(jd, NULL, src, d);
}
}
src = src->prev;
} else {
#endif
- while (src != NULL) {
+ while (src != NULL) {
len--;
if ((len == 0) && (bptr->type != BBTYPE_STD)) {
if (bptr->type == BBTYPE_SBR) {
- d = reg_of_var(rd, src, REG_ITMP1);
- x86_64_pop_reg(cd, d);
- store_reg_to_var_int(src, d);
+ d = codegen_reg_of_var(rd, 0, src, REG_ITMP1);
+ M_POP(d);
+ emit_store(jd, NULL, src, d);
} else if (bptr->type == BBTYPE_EXH) {
- d = reg_of_var(rd, src, REG_ITMP1);
+ d = codegen_reg_of_var(rd, 0, src, REG_ITMP1);
M_INTMOVE(REG_ITMP1, d);
- store_reg_to_var_int(src, d);
+ emit_store(jd, NULL, src, d);
}
} else {
- d = reg_of_var(rd, src, REG_ITMP1);
+ d = codegen_reg_of_var(rd, 0, src, REG_ITMP1);
if ((src->varkind != STACKVAR)) {
s2 = src->type;
if (IS_FLT_DBL_TYPE(s2)) {
s1 = rd->interfaces[len][s2].regoff;
- if (!(rd->interfaces[len][s2].flags & INMEMORY)) {
+
+ if (!(rd->interfaces[len][s2].flags & INMEMORY))
M_FLTMOVE(s1, d);
+ else
+ M_DLD(d, REG_SP, s1 * 8);
- } else {
- x86_64_movq_membase_reg(cd, REG_SP, s1 * 8, d);
- }
- store_reg_to_var_flt(src, d);
+ emit_store(jd, NULL, src, d);
} else {
s1 = rd->interfaces[len][s2].regoff;
- if (!(rd->interfaces[len][s2].flags & INMEMORY)) {
+
+ if (!(rd->interfaces[len][s2].flags & INMEMORY))
M_INTMOVE(s1, d);
+ else
+ M_LLD(d, REG_SP, s1 * 8);
- } else {
- x86_64_mov_membase_reg(cd, REG_SP, s1 * 8, d);
- }
- store_reg_to_var_int(src, d);
+ emit_store(jd, NULL, src, d);
}
}
}
src = src->prev;
}
-#ifdef LSRA
+#if defined(ENABLE_LSRA)
}
#endif
/* walk through all instructions */
src = bptr->instack;
len = bptr->icount;
- currentline=0;
+ currentline = 0;
for (iptr = bptr->iinstr; len > 0; src = iptr->dst, len--, iptr++) {
if (iptr->line != currentline) {
- dseg_addlinenumber(cd, iptr->line, cd->mcodeptr);
+ dseg_addlinenumber(cd, iptr->line);
currentline = iptr->line;
}
break;
case ICMD_CHECKNULL: /* ..., objectref ==> ..., objectref */
- if (src->flags & INMEMORY) {
- x86_64_alu_imm_membase(cd, X86_64_CMP, 0, REG_SP, src->regoff * 8);
- } else {
- x86_64_test_reg_reg(cd, src->regoff, src->regoff);
- }
- x86_64_jcc(cd, X86_64_CC_Z, 0);
- codegen_addxnullrefs(cd, cd->mcodeptr);
+ if (src->flags & INMEMORY)
+ M_CMP_IMM_MEMBASE(0, REG_SP, src->regoff * 8);
+ else
+ M_TEST(src->regoff);
+ M_BEQ(0);
+ codegen_add_nullpointerexception_ref(cd);
break;
/* constant operations ************************************************/
case ICMD_ICONST: /* ... ==> ..., constant */
/* op1 = 0, val.i = constant */
- d = reg_of_var(rd, iptr->dst, REG_ITMP1);
- if (iptr->val.i == 0) {
- M_XOR(d, d);
- } else {
- M_IMOV_IMM(iptr->val.i, d);
- }
- store_reg_to_var_int(iptr->dst, d);
+ d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP1);
+ ICONST(d, iptr->val.i);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_LCONST: /* ... ==> ..., constant */
/* op1 = 0, val.l = constant */
- d = reg_of_var(rd, iptr->dst, REG_ITMP1);
- if (iptr->val.l == 0) {
- M_XOR(d, d);
- } else {
- M_MOV_IMM(iptr->val.l, d);
- }
- store_reg_to_var_int(iptr->dst, d);
+ d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP1);
+ LCONST(d, iptr->val.l);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_FCONST: /* ... ==> ..., constant */
/* op1 = 0, val.f = constant */
- d = reg_of_var(rd, iptr->dst, REG_FTMP1);
+ d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_FTMP1);
disp = dseg_addfloat(cd, iptr->val.f);
x86_64_movdl_membase_reg(cd, RIP, -(((s8) cd->mcodeptr + ((d > 7) ? 9 : 8)) - (s8) cd->mcodebase) + disp, d);
- store_reg_to_var_flt(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_DCONST: /* ... ==> ..., constant */
/* op1 = 0, val.d = constant */
- d = reg_of_var(rd, iptr->dst, REG_FTMP1);
+ d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_FTMP1);
disp = dseg_adddouble(cd, iptr->val.d);
x86_64_movd_membase_reg(cd, RIP, -(((s8) cd->mcodeptr + 9) - (s8) cd->mcodebase) + disp, d);
- store_reg_to_var_flt(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_ACONST: /* ... ==> ..., constant */
/* op1 = 0, val.a = constant */
- d = reg_of_var(rd, iptr->dst, REG_ITMP1);
+ d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP1);
if ((iptr->target != NULL) && (iptr->val.a == NULL)) {
- codegen_addpatchref(cd, cd->mcodeptr,
- PATCHER_aconst,
+/* PROFILE_CYCLE_STOP; */
+
+ codegen_addpatchref(cd, PATCHER_aconst,
(unresolved_class *) iptr->target, 0);
if (opt_showdisassemble) {
M_NOP; M_NOP; M_NOP; M_NOP; M_NOP;
}
- M_MOV_IMM((ptrint) iptr->val.a, d);
+/* PROFILE_CYCLE_START; */
+
+ M_MOV_IMM(iptr->val.a, d);
} else {
- if (iptr->val.a == 0) {
- M_XOR(d, d);
- } else {
- M_MOV_IMM((ptrint) iptr->val.a, d);
- }
+ if (iptr->val.a == 0)
+ M_CLR(d);
+ else
+ M_MOV_IMM(iptr->val.a, d);
}
- store_reg_to_var_int(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_ILOAD: /* ... ==> ..., content of local variable */
/* op1 = local variable */
- d = reg_of_var(rd, iptr->dst, REG_ITMP1);
+ d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP1);
if ((iptr->dst->varkind == LOCALVAR) &&
- (iptr->dst->varnum == iptr->op1)) {
+ (iptr->dst->varnum == iptr->op1))
break;
- }
var = &(rd->locals[iptr->op1][iptr->opc - ICMD_ILOAD]);
- if (var->flags & INMEMORY) {
- x86_64_movl_membase_reg(cd, REG_SP, var->regoff * 8, d);
- store_reg_to_var_int(iptr->dst, d);
-
- } else {
- if (iptr->dst->flags & INMEMORY) {
- x86_64_mov_reg_membase(cd, var->regoff, REG_SP, iptr->dst->regoff * 8);
-
- } else {
- M_INTMOVE(var->regoff, d);
- }
- }
+ if (var->flags & INMEMORY)
+ M_ILD(d, REG_SP, var->regoff * 8);
+ else
+ M_INTMOVE(var->regoff, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_LLOAD: /* ... ==> ..., content of local variable */
case ICMD_ALOAD: /* op1 = local variable */
- d = reg_of_var(rd, iptr->dst, REG_ITMP1);
+ d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP1);
if ((iptr->dst->varkind == LOCALVAR) &&
- (iptr->dst->varnum == iptr->op1)) {
+ (iptr->dst->varnum == iptr->op1))
break;
- }
var = &(rd->locals[iptr->op1][iptr->opc - ICMD_ILOAD]);
- if (var->flags & INMEMORY) {
- x86_64_mov_membase_reg(cd, REG_SP, var->regoff * 8, d);
- store_reg_to_var_int(iptr->dst, d);
-
- } else {
- if (iptr->dst->flags & INMEMORY) {
- x86_64_mov_reg_membase(cd, var->regoff, REG_SP, iptr->dst->regoff * 8);
-
- } else {
- M_INTMOVE(var->regoff, d);
- }
- }
+ if (var->flags & INMEMORY)
+ M_LLD(d, REG_SP, var->regoff * 8);
+ else
+ M_INTMOVE(var->regoff, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_FLOAD: /* ... ==> ..., content of local variable */
case ICMD_DLOAD: /* op1 = local variable */
- d = reg_of_var(rd, iptr->dst, REG_FTMP1);
+ d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_FTMP1);
if ((iptr->dst->varkind == LOCALVAR) &&
- (iptr->dst->varnum == iptr->op1)) {
+ (iptr->dst->varnum == iptr->op1))
break;
- }
var = &(rd->locals[iptr->op1][iptr->opc - ICMD_ILOAD]);
- if (var->flags & INMEMORY) {
- x86_64_movq_membase_reg(cd, REG_SP, var->regoff * 8, d);
- store_reg_to_var_flt(iptr->dst, d);
+ if (var->flags & INMEMORY)
+ M_DLD(d, REG_SP, var->regoff * 8);
+ else
+ M_FLTMOVE(var->regoff, d);
+ emit_store(jd, iptr, iptr->dst, d);
+ break;
- } else {
- if (iptr->dst->flags & INMEMORY) {
- x86_64_movq_reg_membase(cd, var->regoff, REG_SP, iptr->dst->regoff * 8);
+ case ICMD_ISTORE: /* ..., value ==> ... */
+ /* op1 = local variable */
- } else {
- M_FLTMOVE(var->regoff, d);
- }
+ if ((src->varkind == LOCALVAR) && (src->varnum == iptr->op1))
+ break;
+ var = &(rd->locals[iptr->op1][iptr->opc - ICMD_ISTORE]);
+ if (var->flags & INMEMORY) {
+ s1 = emit_load_s1(jd, iptr, src, REG_ITMP1);
+ M_IST(s1, REG_SP, var->regoff * 8);
+ } else {
+ s1 = emit_load_s1(jd, iptr, src, var->regoff);
+ M_INTMOVE(s1, var->regoff);
}
break;
- case ICMD_ISTORE: /* ..., value ==> ... */
- case ICMD_LSTORE: /* op1 = local variable */
- case ICMD_ASTORE:
+ case ICMD_LSTORE: /* ..., value ==> ... */
+ case ICMD_ASTORE: /* op1 = local variable */
- if ((src->varkind == LOCALVAR) &&
- (src->varnum == iptr->op1)) {
+ if ((src->varkind == LOCALVAR) && (src->varnum == iptr->op1))
break;
- }
var = &(rd->locals[iptr->op1][iptr->opc - ICMD_ISTORE]);
if (var->flags & INMEMORY) {
- var_to_reg_int(s1, src, REG_ITMP1);
- x86_64_mov_reg_membase(cd, s1, REG_SP, var->regoff * 8);
-
+ s1 = emit_load_s1(jd, iptr, src, REG_ITMP1);
+ M_LST(s1, REG_SP, var->regoff * 8);
} else {
- var_to_reg_int(s1, src, var->regoff);
+ s1 = emit_load_s1(jd, iptr, src, var->regoff);
M_INTMOVE(s1, var->regoff);
}
break;
}
var = &(rd->locals[iptr->op1][iptr->opc - ICMD_ISTORE]);
if (var->flags & INMEMORY) {
- var_to_reg_flt(s1, src, REG_FTMP1);
- x86_64_movq_reg_membase(cd, s1, REG_SP, var->regoff * 8);
-
+ s1 = emit_load_s1(jd, iptr, src, REG_FTMP1);
+ M_DST(s1, REG_SP, var->regoff * 8);
} else {
- var_to_reg_flt(s1, src, var->regoff);
+ s1 = emit_load_s1(jd, iptr, src, var->regoff);
M_FLTMOVE(s1, var->regoff);
}
break;
case ICMD_INEG: /* ..., value ==> ..., - value */
- d = reg_of_var(rd, iptr->dst, REG_NULL);
+ d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_NULL);
if (iptr->dst->flags & INMEMORY) {
if (src->flags & INMEMORY) {
- if (src->regoff == iptr->dst->regoff) {
- x86_64_negl_membase(cd, REG_SP, iptr->dst->regoff * 8);
-
- } else {
- x86_64_movl_membase_reg(cd, REG_SP, src->regoff * 8, REG_ITMP1);
- x86_64_negl_reg(cd, REG_ITMP1);
- x86_64_movl_reg_membase(cd, REG_ITMP1, REG_SP, iptr->dst->regoff * 8);
+ if (src->regoff == iptr->dst->regoff)
+ M_INEG_MEMBASE(REG_SP, iptr->dst->regoff * 8);
+ else {
+ M_ILD(REG_ITMP1, REG_SP, src->regoff * 8);
+ M_INEG(REG_ITMP1);
+ M_IST(REG_ITMP1, REG_SP, iptr->dst->regoff * 8);
}
} else {
- x86_64_movl_reg_membase(cd, src->regoff, REG_SP, iptr->dst->regoff * 8);
- x86_64_negl_membase(cd, REG_SP, iptr->dst->regoff * 8);
+ M_IST(src->regoff, REG_SP, iptr->dst->regoff * 8);
+ M_INEG_MEMBASE(REG_SP, iptr->dst->regoff * 8);
}
} else {
if (src->flags & INMEMORY) {
- x86_64_movl_membase_reg(cd, REG_SP, src->regoff * 8, iptr->dst->regoff);
- x86_64_negl_reg(cd, d);
+ M_ILD(iptr->dst->regoff, REG_SP, src->regoff * 8);
+ M_INEG(iptr->dst->regoff);
} else {
M_INTMOVE(src->regoff, iptr->dst->regoff);
- x86_64_negl_reg(cd, iptr->dst->regoff);
+ M_INEG(iptr->dst->regoff);
}
}
break;
case ICMD_LNEG: /* ..., value ==> ..., - value */
- d = reg_of_var(rd, iptr->dst, REG_NULL);
+ d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_NULL);
if (iptr->dst->flags & INMEMORY) {
if (src->flags & INMEMORY) {
- if (src->regoff == iptr->dst->regoff) {
- x86_64_neg_membase(cd, REG_SP, iptr->dst->regoff * 8);
-
- } else {
- x86_64_mov_membase_reg(cd, REG_SP, src->regoff * 8, REG_ITMP1);
- x86_64_neg_reg(cd, REG_ITMP1);
- x86_64_mov_reg_membase(cd, REG_ITMP1, REG_SP, iptr->dst->regoff * 8);
+ if (src->regoff == iptr->dst->regoff)
+ M_LNEG_MEMBASE(REG_SP, iptr->dst->regoff * 8);
+ else {
+ M_LLD(REG_ITMP1, REG_SP, src->regoff * 8);
+ M_LNEG(REG_ITMP1);
+ M_LST(REG_ITMP1, REG_SP, iptr->dst->regoff * 8);
}
} else {
- x86_64_mov_reg_membase(cd, src->regoff, REG_SP, iptr->dst->regoff * 8);
- x86_64_neg_membase(cd, REG_SP, iptr->dst->regoff * 8);
+ M_LST(src->regoff, REG_SP, iptr->dst->regoff * 8);
+ M_LNEG_MEMBASE(REG_SP, iptr->dst->regoff * 8);
}
} else {
if (src->flags & INMEMORY) {
- x86_64_mov_membase_reg(cd, REG_SP, src->regoff * 8, iptr->dst->regoff);
- x86_64_neg_reg(cd, iptr->dst->regoff);
+ M_LLD(iptr->dst->regoff, REG_SP, src->regoff * 8);
+ M_LNEG(iptr->dst->regoff);
} else {
M_INTMOVE(src->regoff, iptr->dst->regoff);
- x86_64_neg_reg(cd, iptr->dst->regoff);
+ M_LNEG(iptr->dst->regoff);
}
}
break;
case ICMD_I2L: /* ..., value ==> ..., value */
- d = reg_of_var(rd, iptr->dst, REG_ITMP3);
+ d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP3);
if (src->flags & INMEMORY) {
x86_64_movslq_membase_reg(cd, REG_SP, src->regoff * 8, d);
} else {
x86_64_movslq_reg_reg(cd, src->regoff, d);
}
- store_reg_to_var_int(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_L2I: /* ..., value ==> ..., value */
- var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(rd, iptr->dst, REG_ITMP3);
+ s1 = emit_load_s1(jd, iptr, src, REG_ITMP1);
+ d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP3);
M_INTMOVE(s1, d);
- store_reg_to_var_int(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_INT2BYTE: /* ..., value ==> ..., value */
- d = reg_of_var(rd, iptr->dst, REG_ITMP3);
+ d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP3);
if (src->flags & INMEMORY) {
x86_64_movsbq_membase_reg(cd, REG_SP, src->regoff * 8, d);
} else {
x86_64_movsbq_reg_reg(cd, src->regoff, d);
}
- store_reg_to_var_int(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_INT2CHAR: /* ..., value ==> ..., value */
- d = reg_of_var(rd, iptr->dst, REG_ITMP3);
+ d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP3);
if (src->flags & INMEMORY) {
x86_64_movzwq_membase_reg(cd, REG_SP, src->regoff * 8, d);
} else {
x86_64_movzwq_reg_reg(cd, src->regoff, d);
}
- store_reg_to_var_int(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_INT2SHORT: /* ..., value ==> ..., value */
- d = reg_of_var(rd, iptr->dst, REG_ITMP3);
+ d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP3);
if (src->flags & INMEMORY) {
x86_64_movswq_membase_reg(cd, REG_SP, src->regoff * 8, d);
} else {
x86_64_movswq_reg_reg(cd, src->regoff, d);
}
- store_reg_to_var_int(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_IADD: /* ..., val1, val2 ==> ..., val1 + val2 */
- d = reg_of_var(rd, iptr->dst, REG_NULL);
+ d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_NULL);
x86_64_emit_ialu(cd, X86_64_ADD, src, iptr);
break;
case ICMD_IADDCONST: /* ..., value ==> ..., value + constant */
/* val.i = constant */
- d = reg_of_var(rd, iptr->dst, REG_NULL);
+ d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_NULL);
x86_64_emit_ialuconst(cd, X86_64_ADD, src, iptr);
break;
case ICMD_LADD: /* ..., val1, val2 ==> ..., val1 + val2 */
- d = reg_of_var(rd, iptr->dst, REG_NULL);
+ d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_NULL);
x86_64_emit_lalu(cd, X86_64_ADD, src, iptr);
break;
case ICMD_LADDCONST: /* ..., value ==> ..., value + constant */
/* val.l = constant */
- d = reg_of_var(rd, iptr->dst, REG_NULL);
+ d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_NULL);
x86_64_emit_laluconst(cd, X86_64_ADD, src, iptr);
break;
case ICMD_ISUB: /* ..., val1, val2 ==> ..., val1 - val2 */
- d = reg_of_var(rd, iptr->dst, REG_NULL);
+ d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_NULL);
if (iptr->dst->flags & INMEMORY) {
if ((src->flags & INMEMORY) && (src->prev->flags & INMEMORY)) {
if (src->prev->regoff == iptr->dst->regoff) {
case ICMD_ISUBCONST: /* ..., value ==> ..., value + constant */
/* val.i = constant */
- d = reg_of_var(rd, iptr->dst, REG_NULL);
+ d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_NULL);
x86_64_emit_ialuconst(cd, X86_64_SUB, src, iptr);
break;
case ICMD_LSUB: /* ..., val1, val2 ==> ..., val1 - val2 */
- d = reg_of_var(rd, iptr->dst, REG_NULL);
+ d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_NULL);
if (iptr->dst->flags & INMEMORY) {
if ((src->flags & INMEMORY) && (src->prev->flags & INMEMORY)) {
if (src->prev->regoff == iptr->dst->regoff) {
case ICMD_LSUBCONST: /* ..., value ==> ..., value - constant */
/* val.l = constant */
- d = reg_of_var(rd, iptr->dst, REG_NULL);
+ d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_NULL);
x86_64_emit_laluconst(cd, X86_64_SUB, src, iptr);
break;
case ICMD_IMUL: /* ..., val1, val2 ==> ..., val1 * val2 */
- d = reg_of_var(rd, iptr->dst, REG_NULL);
+ d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_NULL);
if (iptr->dst->flags & INMEMORY) {
if ((src->flags & INMEMORY) && (src->prev->flags & INMEMORY)) {
x86_64_movl_membase_reg(cd, REG_SP, src->prev->regoff * 8, REG_ITMP1);
case ICMD_IMULCONST: /* ..., value ==> ..., value * constant */
/* val.i = constant */
- d = reg_of_var(rd, iptr->dst, REG_NULL);
+ d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_NULL);
if (iptr->dst->flags & INMEMORY) {
if (src->flags & INMEMORY) {
x86_64_imull_imm_membase_reg(cd, iptr->val.i, REG_SP, src->regoff * 8, REG_ITMP1);
case ICMD_LMUL: /* ..., val1, val2 ==> ..., val1 * val2 */
- d = reg_of_var(rd, iptr->dst, REG_NULL);
+ d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_NULL);
if (iptr->dst->flags & INMEMORY) {
if ((src->flags & INMEMORY) && (src->prev->flags & INMEMORY)) {
x86_64_mov_membase_reg(cd, REG_SP, src->prev->regoff * 8, REG_ITMP1);
case ICMD_LMULCONST: /* ..., value ==> ..., value * constant */
/* val.l = constant */
- d = reg_of_var(rd, iptr->dst, REG_NULL);
+ d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_NULL);
if (iptr->dst->flags & INMEMORY) {
if (src->flags & INMEMORY) {
if (IS_IMM32(iptr->val.l)) {
case ICMD_IDIV: /* ..., val1, val2 ==> ..., val1 / val2 */
- d = reg_of_var(rd, iptr->dst, REG_NULL);
+ d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_NULL);
if (src->prev->flags & INMEMORY) {
x86_64_movl_membase_reg(cd, REG_SP, src->prev->regoff * 8, RAX);
break;
case ICMD_IREM: /* ..., val1, val2 ==> ..., val1 % val2 */
- d = reg_of_var(rd, iptr->dst, REG_NULL);
+ d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_NULL);
if (src->prev->flags & INMEMORY) {
x86_64_movl_membase_reg(cd, REG_SP, src->prev->regoff * 8, RAX);
case ICMD_IDIVPOW2: /* ..., value ==> ..., value >> constant */
/* val.i = constant */
- var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(rd, iptr->dst, REG_ITMP3);
+ s1 = emit_load_s1(jd, iptr, src, REG_ITMP1);
+ d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP3);
M_INTMOVE(s1, REG_ITMP1);
x86_64_alul_imm_reg(cd, X86_64_CMP, -1, REG_ITMP1);
x86_64_leal_membase_reg(cd, REG_ITMP1, (1 << iptr->val.i) - 1, REG_ITMP2);
x86_64_cmovccl_reg_reg(cd, X86_64_CC_LE, REG_ITMP2, REG_ITMP1);
x86_64_shiftl_imm_reg(cd, X86_64_SAR, iptr->val.i, REG_ITMP1);
x86_64_mov_reg_reg(cd, REG_ITMP1, d);
- store_reg_to_var_int(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_IREMPOW2: /* ..., value ==> ..., value % constant */
/* val.i = constant */
- var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(rd, iptr->dst, REG_ITMP3);
+ s1 = emit_load_s1(jd, iptr, src, REG_ITMP1);
+ d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP3);
M_INTMOVE(s1, REG_ITMP1);
x86_64_alul_imm_reg(cd, X86_64_CMP, -1, REG_ITMP1);
x86_64_leal_membase_reg(cd, REG_ITMP1, iptr->val.i, REG_ITMP2);
x86_64_alul_imm_reg(cd, X86_64_AND, -1 - (iptr->val.i), REG_ITMP2);
x86_64_alul_reg_reg(cd, X86_64_SUB, REG_ITMP2, REG_ITMP1);
x86_64_mov_reg_reg(cd, REG_ITMP1, d);
- store_reg_to_var_int(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_LDIV: /* ..., val1, val2 ==> ..., val1 / val2 */
- d = reg_of_var(rd, iptr->dst, REG_NULL);
+ d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_NULL);
if (src->prev->flags & INMEMORY) {
M_LLD(RAX, REG_SP, src->prev->regoff * 8);
case ICMD_LREM: /* ..., val1, val2 ==> ..., val1 % val2 */
- d = reg_of_var(rd, iptr->dst, REG_NULL);
+ d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_NULL);
if (src->prev->flags & INMEMORY) {
M_LLD(REG_ITMP1, REG_SP, src->prev->regoff * 8);
case ICMD_LDIVPOW2: /* ..., value ==> ..., value >> constant */
/* val.i = constant */
- var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(rd, iptr->dst, REG_ITMP3);
+ s1 = emit_load_s1(jd, iptr, src, REG_ITMP1);
+ d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP3);
M_INTMOVE(s1, REG_ITMP1);
x86_64_alu_imm_reg(cd, X86_64_CMP, -1, REG_ITMP1);
x86_64_lea_membase_reg(cd, REG_ITMP1, (1 << iptr->val.i) - 1, REG_ITMP2);
x86_64_cmovcc_reg_reg(cd, X86_64_CC_LE, REG_ITMP2, REG_ITMP1);
x86_64_shift_imm_reg(cd, X86_64_SAR, iptr->val.i, REG_ITMP1);
x86_64_mov_reg_reg(cd, REG_ITMP1, d);
- store_reg_to_var_int(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_LREMPOW2: /* ..., value ==> ..., value % constant */
/* val.l = constant */
- var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(rd, iptr->dst, REG_ITMP3);
+ s1 = emit_load_s1(jd, iptr, src, REG_ITMP1);
+ d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP3);
M_INTMOVE(s1, REG_ITMP1);
x86_64_alu_imm_reg(cd, X86_64_CMP, -1, REG_ITMP1);
x86_64_lea_membase_reg(cd, REG_ITMP1, iptr->val.i, REG_ITMP2);
x86_64_alu_imm_reg(cd, X86_64_AND, -1 - (iptr->val.i), REG_ITMP2);
x86_64_alu_reg_reg(cd, X86_64_SUB, REG_ITMP2, REG_ITMP1);
x86_64_mov_reg_reg(cd, REG_ITMP1, d);
- store_reg_to_var_int(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_ISHL: /* ..., val1, val2 ==> ..., val1 << val2 */
- d = reg_of_var(rd, iptr->dst, REG_NULL);
+ d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_NULL);
x86_64_emit_ishift(cd, X86_64_SHL, src, iptr);
break;
case ICMD_ISHLCONST: /* ..., value ==> ..., value << constant */
/* val.i = constant */
- d = reg_of_var(rd, iptr->dst, REG_NULL);
+ d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_NULL);
x86_64_emit_ishiftconst(cd, X86_64_SHL, src, iptr);
break;
case ICMD_ISHR: /* ..., val1, val2 ==> ..., val1 >> val2 */
- d = reg_of_var(rd, iptr->dst, REG_NULL);
+ d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_NULL);
x86_64_emit_ishift(cd, X86_64_SAR, src, iptr);
break;
case ICMD_ISHRCONST: /* ..., value ==> ..., value >> constant */
/* val.i = constant */
- d = reg_of_var(rd, iptr->dst, REG_NULL);
+ d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_NULL);
x86_64_emit_ishiftconst(cd, X86_64_SAR, src, iptr);
break;
case ICMD_IUSHR: /* ..., val1, val2 ==> ..., val1 >>> val2 */
- d = reg_of_var(rd, iptr->dst, REG_NULL);
+ d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_NULL);
x86_64_emit_ishift(cd, X86_64_SHR, src, iptr);
break;
case ICMD_IUSHRCONST: /* ..., value ==> ..., value >>> constant */
/* val.i = constant */
- d = reg_of_var(rd, iptr->dst, REG_NULL);
+ d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_NULL);
x86_64_emit_ishiftconst(cd, X86_64_SHR, src, iptr);
break;
case ICMD_LSHL: /* ..., val1, val2 ==> ..., val1 << val2 */
- d = reg_of_var(rd, iptr->dst, REG_NULL);
+ d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_NULL);
x86_64_emit_lshift(cd, X86_64_SHL, src, iptr);
break;
case ICMD_LSHLCONST: /* ..., value ==> ..., value << constant */
/* val.i = constant */
- d = reg_of_var(rd, iptr->dst, REG_NULL);
+ d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_NULL);
x86_64_emit_lshiftconst(cd, X86_64_SHL, src, iptr);
break;
case ICMD_LSHR: /* ..., val1, val2 ==> ..., val1 >> val2 */
- d = reg_of_var(rd, iptr->dst, REG_NULL);
+ d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_NULL);
x86_64_emit_lshift(cd, X86_64_SAR, src, iptr);
break;
case ICMD_LSHRCONST: /* ..., value ==> ..., value >> constant */
/* val.i = constant */
- d = reg_of_var(rd, iptr->dst, REG_NULL);
+ d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_NULL);
x86_64_emit_lshiftconst(cd, X86_64_SAR, src, iptr);
break;
case ICMD_LUSHR: /* ..., val1, val2 ==> ..., val1 >>> val2 */
- d = reg_of_var(rd, iptr->dst, REG_NULL);
+ d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_NULL);
x86_64_emit_lshift(cd, X86_64_SHR, src, iptr);
break;
case ICMD_LUSHRCONST: /* ..., value ==> ..., value >>> constant */
/* val.l = constant */
- d = reg_of_var(rd, iptr->dst, REG_NULL);
+ d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_NULL);
x86_64_emit_lshiftconst(cd, X86_64_SHR, src, iptr);
break;
case ICMD_IAND: /* ..., val1, val2 ==> ..., val1 & val2 */
- d = reg_of_var(rd, iptr->dst, REG_NULL);
+ d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_NULL);
x86_64_emit_ialu(cd, X86_64_AND, src, iptr);
break;
case ICMD_IANDCONST: /* ..., value ==> ..., value & constant */
/* val.i = constant */
- d = reg_of_var(rd, iptr->dst, REG_NULL);
+ d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_NULL);
x86_64_emit_ialuconst(cd, X86_64_AND, src, iptr);
break;
case ICMD_LAND: /* ..., val1, val2 ==> ..., val1 & val2 */
- d = reg_of_var(rd, iptr->dst, REG_NULL);
+ d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_NULL);
x86_64_emit_lalu(cd, X86_64_AND, src, iptr);
break;
case ICMD_LANDCONST: /* ..., value ==> ..., value & constant */
/* val.l = constant */
- d = reg_of_var(rd, iptr->dst, REG_NULL);
+ d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_NULL);
x86_64_emit_laluconst(cd, X86_64_AND, src, iptr);
break;
case ICMD_IOR: /* ..., val1, val2 ==> ..., val1 | val2 */
- d = reg_of_var(rd, iptr->dst, REG_NULL);
+ d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_NULL);
x86_64_emit_ialu(cd, X86_64_OR, src, iptr);
break;
case ICMD_IORCONST: /* ..., value ==> ..., value | constant */
/* val.i = constant */
- d = reg_of_var(rd, iptr->dst, REG_NULL);
+ d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_NULL);
x86_64_emit_ialuconst(cd, X86_64_OR, src, iptr);
break;
case ICMD_LOR: /* ..., val1, val2 ==> ..., val1 | val2 */
- d = reg_of_var(rd, iptr->dst, REG_NULL);
+ d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_NULL);
x86_64_emit_lalu(cd, X86_64_OR, src, iptr);
break;
case ICMD_LORCONST: /* ..., value ==> ..., value | constant */
/* val.l = constant */
- d = reg_of_var(rd, iptr->dst, REG_NULL);
+ d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_NULL);
x86_64_emit_laluconst(cd, X86_64_OR, src, iptr);
break;
case ICMD_IXOR: /* ..., val1, val2 ==> ..., val1 ^ val2 */
- d = reg_of_var(rd, iptr->dst, REG_NULL);
+ d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_NULL);
x86_64_emit_ialu(cd, X86_64_XOR, src, iptr);
break;
case ICMD_IXORCONST: /* ..., value ==> ..., value ^ constant */
/* val.i = constant */
- d = reg_of_var(rd, iptr->dst, REG_NULL);
+ d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_NULL);
x86_64_emit_ialuconst(cd, X86_64_XOR, src, iptr);
break;
case ICMD_LXOR: /* ..., val1, val2 ==> ..., val1 ^ val2 */
- d = reg_of_var(rd, iptr->dst, REG_NULL);
+ d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_NULL);
x86_64_emit_lalu(cd, X86_64_XOR, src, iptr);
break;
case ICMD_LXORCONST: /* ..., value ==> ..., value ^ constant */
/* val.l = constant */
- d = reg_of_var(rd, iptr->dst, REG_NULL);
+ d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_NULL);
x86_64_emit_laluconst(cd, X86_64_XOR, src, iptr);
break;
case ICMD_FNEG: /* ..., value ==> ..., - value */
- var_to_reg_flt(s1, src, REG_FTMP1);
- d = reg_of_var(rd, iptr->dst, REG_FTMP3);
+ s1 = emit_load_s1(jd, iptr, src, REG_FTMP1);
+ d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_FTMP3);
disp = dseg_adds4(cd, 0x80000000);
M_FLTMOVE(s1, d);
x86_64_movss_membase_reg(cd, RIP, -(((s8) cd->mcodeptr + 9) - (s8) cd->mcodebase) + disp, REG_FTMP2);
x86_64_xorps_reg_reg(cd, REG_FTMP2, d);
- store_reg_to_var_flt(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_DNEG: /* ..., value ==> ..., - value */
- var_to_reg_flt(s1, src, REG_FTMP1);
- d = reg_of_var(rd, iptr->dst, REG_FTMP3);
+ s1 = emit_load_s1(jd, iptr, src, REG_FTMP1);
+ d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_FTMP3);
disp = dseg_adds8(cd, 0x8000000000000000);
M_FLTMOVE(s1, d);
x86_64_movd_membase_reg(cd, RIP, -(((s8) cd->mcodeptr + 9) - (s8) cd->mcodebase) + disp, REG_FTMP2);
x86_64_xorpd_reg_reg(cd, REG_FTMP2, d);
- store_reg_to_var_flt(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_FADD: /* ..., val1, val2 ==> ..., val1 + val2 */
- var_to_reg_flt(s1, src->prev, REG_FTMP1);
- var_to_reg_flt(s2, src, REG_FTMP2);
- d = reg_of_var(rd, iptr->dst, REG_FTMP3);
+ s1 = emit_load_s1(jd, iptr, src->prev, REG_FTMP1);
+ s2 = emit_load_s2(jd, iptr, src, REG_FTMP2);
+ d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_FTMP3);
if (s1 == d) {
x86_64_addss_reg_reg(cd, s2, d);
} else if (s2 == d) {
M_FLTMOVE(s1, d);
x86_64_addss_reg_reg(cd, s2, d);
}
- store_reg_to_var_flt(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_DADD: /* ..., val1, val2 ==> ..., val1 + val2 */
- var_to_reg_flt(s1, src->prev, REG_FTMP1);
- var_to_reg_flt(s2, src, REG_FTMP2);
- d = reg_of_var(rd, iptr->dst, REG_FTMP3);
+ s1 = emit_load_s1(jd, iptr, src->prev, REG_FTMP1);
+ s2 = emit_load_s2(jd, iptr, src, REG_FTMP2);
+ d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_FTMP3);
if (s1 == d) {
x86_64_addsd_reg_reg(cd, s2, d);
} else if (s2 == d) {
M_FLTMOVE(s1, d);
x86_64_addsd_reg_reg(cd, s2, d);
}
- store_reg_to_var_flt(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_FSUB: /* ..., val1, val2 ==> ..., val1 - val2 */
- var_to_reg_flt(s1, src->prev, REG_FTMP1);
- var_to_reg_flt(s2, src, REG_FTMP2);
- d = reg_of_var(rd, iptr->dst, REG_FTMP3);
+ s1 = emit_load_s1(jd, iptr, src->prev, REG_FTMP1);
+ s2 = emit_load_s2(jd, iptr, src, REG_FTMP2);
+ d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_FTMP3);
if (s2 == d) {
M_FLTMOVE(s2, REG_FTMP2);
s2 = REG_FTMP2;
}
M_FLTMOVE(s1, d);
x86_64_subss_reg_reg(cd, s2, d);
- store_reg_to_var_flt(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_DSUB: /* ..., val1, val2 ==> ..., val1 - val2 */
- var_to_reg_flt(s1, src->prev, REG_FTMP1);
- var_to_reg_flt(s2, src, REG_FTMP2);
- d = reg_of_var(rd, iptr->dst, REG_FTMP3);
+ s1 = emit_load_s1(jd, iptr, src->prev, REG_FTMP1);
+ s2 = emit_load_s2(jd, iptr, src, REG_FTMP2);
+ d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_FTMP3);
if (s2 == d) {
M_FLTMOVE(s2, REG_FTMP2);
s2 = REG_FTMP2;
}
M_FLTMOVE(s1, d);
x86_64_subsd_reg_reg(cd, s2, d);
- store_reg_to_var_flt(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_FMUL: /* ..., val1, val2 ==> ..., val1 * val2 */
- var_to_reg_flt(s1, src->prev, REG_FTMP1);
- var_to_reg_flt(s2, src, REG_FTMP2);
- d = reg_of_var(rd, iptr->dst, REG_FTMP3);
+ s1 = emit_load_s1(jd, iptr, src->prev, REG_FTMP1);
+ s2 = emit_load_s2(jd, iptr, src, REG_FTMP2);
+ d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_FTMP3);
if (s1 == d) {
x86_64_mulss_reg_reg(cd, s2, d);
} else if (s2 == d) {
M_FLTMOVE(s1, d);
x86_64_mulss_reg_reg(cd, s2, d);
}
- store_reg_to_var_flt(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_DMUL: /* ..., val1, val2 ==> ..., val1 * val2 */
- var_to_reg_flt(s1, src->prev, REG_FTMP1);
- var_to_reg_flt(s2, src, REG_FTMP2);
- d = reg_of_var(rd, iptr->dst, REG_FTMP3);
+ s1 = emit_load_s1(jd, iptr, src->prev, REG_FTMP1);
+ s2 = emit_load_s2(jd, iptr, src, REG_FTMP2);
+ d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_FTMP3);
if (s1 == d) {
x86_64_mulsd_reg_reg(cd, s2, d);
} else if (s2 == d) {
M_FLTMOVE(s1, d);
x86_64_mulsd_reg_reg(cd, s2, d);
}
- store_reg_to_var_flt(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_FDIV: /* ..., val1, val2 ==> ..., val1 / val2 */
- var_to_reg_flt(s1, src->prev, REG_FTMP1);
- var_to_reg_flt(s2, src, REG_FTMP2);
- d = reg_of_var(rd, iptr->dst, REG_FTMP3);
+ s1 = emit_load_s1(jd, iptr, src->prev, REG_FTMP1);
+ s2 = emit_load_s2(jd, iptr, src, REG_FTMP2);
+ d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_FTMP3);
if (s2 == d) {
M_FLTMOVE(s2, REG_FTMP2);
s2 = REG_FTMP2;
}
M_FLTMOVE(s1, d);
x86_64_divss_reg_reg(cd, s2, d);
- store_reg_to_var_flt(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_DDIV: /* ..., val1, val2 ==> ..., val1 / val2 */
- var_to_reg_flt(s1, src->prev, REG_FTMP1);
- var_to_reg_flt(s2, src, REG_FTMP2);
- d = reg_of_var(rd, iptr->dst, REG_FTMP3);
+ s1 = emit_load_s1(jd, iptr, src->prev, REG_FTMP1);
+ s2 = emit_load_s2(jd, iptr, src, REG_FTMP2);
+ d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_FTMP3);
if (s2 == d) {
M_FLTMOVE(s2, REG_FTMP2);
s2 = REG_FTMP2;
}
M_FLTMOVE(s1, d);
x86_64_divsd_reg_reg(cd, s2, d);
- store_reg_to_var_flt(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_I2F: /* ..., value ==> ..., (float) value */
- var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(rd, iptr->dst, REG_FTMP1);
+ s1 = emit_load_s1(jd, iptr, src, REG_ITMP1);
+ d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_FTMP1);
x86_64_cvtsi2ss_reg_reg(cd, s1, d);
- store_reg_to_var_flt(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_I2D: /* ..., value ==> ..., (double) value */
- var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(rd, iptr->dst, REG_FTMP1);
+ s1 = emit_load_s1(jd, iptr, src, REG_ITMP1);
+ d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_FTMP1);
x86_64_cvtsi2sd_reg_reg(cd, s1, d);
- store_reg_to_var_flt(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_L2F: /* ..., value ==> ..., (float) value */
- var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(rd, iptr->dst, REG_FTMP1);
+ s1 = emit_load_s1(jd, iptr, src, REG_ITMP1);
+ d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_FTMP1);
x86_64_cvtsi2ssq_reg_reg(cd, s1, d);
- store_reg_to_var_flt(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_L2D: /* ..., value ==> ..., (double) value */
- var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(rd, iptr->dst, REG_FTMP1);
+ s1 = emit_load_s1(jd, iptr, src, REG_ITMP1);
+ d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_FTMP1);
x86_64_cvtsi2sdq_reg_reg(cd, s1, d);
- store_reg_to_var_flt(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_F2I: /* ..., value ==> ..., (int) value */
- var_to_reg_flt(s1, src, REG_FTMP1);
- d = reg_of_var(rd, iptr->dst, REG_ITMP1);
+ s1 = emit_load_s1(jd, iptr, src, REG_FTMP1);
+ d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP1);
x86_64_cvttss2si_reg_reg(cd, s1, d);
x86_64_alul_imm_reg(cd, X86_64_CMP, 0x80000000, d); /* corner cases */
a = ((s1 == REG_FTMP1) ? 0 : 5) + 10 + 3 + ((REG_RESULT == d) ? 0 : 3);
x86_64_jcc(cd, X86_64_CC_NE, a);
M_FLTMOVE(s1, REG_FTMP1);
- x86_64_mov_imm_reg(cd, (s8) asm_builtin_f2i, REG_ITMP2);
+ x86_64_mov_imm_reg(cd, (ptrint) asm_builtin_f2i, REG_ITMP2);
x86_64_call_reg(cd, REG_ITMP2);
M_INTMOVE(REG_RESULT, d);
- store_reg_to_var_int(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_D2I: /* ..., value ==> ..., (int) value */
- var_to_reg_flt(s1, src, REG_FTMP1);
- d = reg_of_var(rd, iptr->dst, REG_ITMP1);
+ s1 = emit_load_s1(jd, iptr, src, REG_FTMP1);
+ d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP1);
x86_64_cvttsd2si_reg_reg(cd, s1, d);
x86_64_alul_imm_reg(cd, X86_64_CMP, 0x80000000, d); /* corner cases */
a = ((s1 == REG_FTMP1) ? 0 : 5) + 10 + 3 + ((REG_RESULT == d) ? 0 : 3);
x86_64_jcc(cd, X86_64_CC_NE, a);
M_FLTMOVE(s1, REG_FTMP1);
- x86_64_mov_imm_reg(cd, (s8) asm_builtin_d2i, REG_ITMP2);
+ x86_64_mov_imm_reg(cd, (ptrint) asm_builtin_d2i, REG_ITMP2);
x86_64_call_reg(cd, REG_ITMP2);
M_INTMOVE(REG_RESULT, d);
- store_reg_to_var_int(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_F2L: /* ..., value ==> ..., (long) value */
- var_to_reg_flt(s1, src, REG_FTMP1);
- d = reg_of_var(rd, iptr->dst, REG_ITMP1);
+ s1 = emit_load_s1(jd, iptr, src, REG_FTMP1);
+ d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP1);
x86_64_cvttss2siq_reg_reg(cd, s1, d);
x86_64_mov_imm_reg(cd, 0x8000000000000000, REG_ITMP2);
x86_64_alu_reg_reg(cd, X86_64_CMP, REG_ITMP2, d); /* corner cases */
a = ((s1 == REG_FTMP1) ? 0 : 5) + 10 + 3 + ((REG_RESULT == d) ? 0 : 3);
x86_64_jcc(cd, X86_64_CC_NE, a);
M_FLTMOVE(s1, REG_FTMP1);
- x86_64_mov_imm_reg(cd, (s8) asm_builtin_f2l, REG_ITMP2);
+ x86_64_mov_imm_reg(cd, (ptrint) asm_builtin_f2l, REG_ITMP2);
x86_64_call_reg(cd, REG_ITMP2);
M_INTMOVE(REG_RESULT, d);
- store_reg_to_var_int(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_D2L: /* ..., value ==> ..., (long) value */
- var_to_reg_flt(s1, src, REG_FTMP1);
- d = reg_of_var(rd, iptr->dst, REG_ITMP1);
+ s1 = emit_load_s1(jd, iptr, src, REG_FTMP1);
+ d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP1);
x86_64_cvttsd2siq_reg_reg(cd, s1, d);
x86_64_mov_imm_reg(cd, 0x8000000000000000, REG_ITMP2);
x86_64_alu_reg_reg(cd, X86_64_CMP, REG_ITMP2, d); /* corner cases */
a = ((s1 == REG_FTMP1) ? 0 : 5) + 10 + 3 + ((REG_RESULT == d) ? 0 : 3);
x86_64_jcc(cd, X86_64_CC_NE, a);
M_FLTMOVE(s1, REG_FTMP1);
- x86_64_mov_imm_reg(cd, (s8) asm_builtin_d2l, REG_ITMP2);
+ x86_64_mov_imm_reg(cd, (ptrint) asm_builtin_d2l, REG_ITMP2);
x86_64_call_reg(cd, REG_ITMP2);
M_INTMOVE(REG_RESULT, d);
- store_reg_to_var_int(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_F2D: /* ..., value ==> ..., (double) value */
- var_to_reg_flt(s1, src, REG_FTMP1);
- d = reg_of_var(rd, iptr->dst, REG_FTMP3);
+ s1 = emit_load_s1(jd, iptr, src, REG_FTMP1);
+ d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_FTMP3);
x86_64_cvtss2sd_reg_reg(cd, s1, d);
- store_reg_to_var_flt(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_D2F: /* ..., value ==> ..., (float) value */
- var_to_reg_flt(s1, src, REG_FTMP1);
- d = reg_of_var(rd, iptr->dst, REG_FTMP3);
+ s1 = emit_load_s1(jd, iptr, src, REG_FTMP1);
+ d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_FTMP3);
x86_64_cvtsd2ss_reg_reg(cd, s1, d);
- store_reg_to_var_flt(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_FCMPL: /* ..., val1, val2 ==> ..., val1 fcmpl val2 */
/* == => 0, < => 1, > => -1 */
- var_to_reg_flt(s1, src->prev, REG_FTMP1);
- var_to_reg_flt(s2, src, REG_FTMP2);
- d = reg_of_var(rd, iptr->dst, REG_ITMP3);
- x86_64_alu_reg_reg(cd, X86_64_XOR, d, d);
- x86_64_mov_imm_reg(cd, 1, REG_ITMP1);
- x86_64_mov_imm_reg(cd, -1, REG_ITMP2);
+ s1 = emit_load_s1(jd, iptr, src->prev, REG_FTMP1);
+ s2 = emit_load_s2(jd, iptr, src, REG_FTMP2);
+ d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP3);
+ M_CLR(d);
+ M_MOV_IMM(1, REG_ITMP1);
+ M_MOV_IMM(-1, REG_ITMP2);
x86_64_ucomiss_reg_reg(cd, s1, s2);
- x86_64_cmovcc_reg_reg(cd, X86_64_CC_B, REG_ITMP1, d);
- x86_64_cmovcc_reg_reg(cd, X86_64_CC_A, REG_ITMP2, d);
- x86_64_cmovcc_reg_reg(cd, X86_64_CC_P, REG_ITMP2, d); /* treat unordered as GT */
- store_reg_to_var_int(iptr->dst, d);
+ M_CMOVB(REG_ITMP1, d);
+ M_CMOVA(REG_ITMP2, d);
+ M_CMOVP(REG_ITMP2, d); /* treat unordered as GT */
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_FCMPG: /* ..., val1, val2 ==> ..., val1 fcmpg val2 */
/* == => 0, < => 1, > => -1 */
- var_to_reg_flt(s1, src->prev, REG_FTMP1);
- var_to_reg_flt(s2, src, REG_FTMP2);
- d = reg_of_var(rd, iptr->dst, REG_ITMP3);
- x86_64_alu_reg_reg(cd, X86_64_XOR, d, d);
- x86_64_mov_imm_reg(cd, 1, REG_ITMP1);
- x86_64_mov_imm_reg(cd, -1, REG_ITMP2);
+ s1 = emit_load_s1(jd, iptr, src->prev, REG_FTMP1);
+ s2 = emit_load_s2(jd, iptr, src, REG_FTMP2);
+ d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP3);
+ M_CLR(d);
+ M_MOV_IMM(1, REG_ITMP1);
+ M_MOV_IMM(-1, REG_ITMP2);
x86_64_ucomiss_reg_reg(cd, s1, s2);
- x86_64_cmovcc_reg_reg(cd, X86_64_CC_B, REG_ITMP1, d);
- x86_64_cmovcc_reg_reg(cd, X86_64_CC_A, REG_ITMP2, d);
- x86_64_cmovcc_reg_reg(cd, X86_64_CC_P, REG_ITMP1, d); /* treat unordered as LT */
- store_reg_to_var_int(iptr->dst, d);
+ M_CMOVB(REG_ITMP1, d);
+ M_CMOVA(REG_ITMP2, d);
+ M_CMOVP(REG_ITMP1, d); /* treat unordered as LT */
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_DCMPL: /* ..., val1, val2 ==> ..., val1 fcmpl val2 */
/* == => 0, < => 1, > => -1 */
- var_to_reg_flt(s1, src->prev, REG_FTMP1);
- var_to_reg_flt(s2, src, REG_FTMP2);
- d = reg_of_var(rd, iptr->dst, REG_ITMP3);
- x86_64_alu_reg_reg(cd, X86_64_XOR, d, d);
- x86_64_mov_imm_reg(cd, 1, REG_ITMP1);
- x86_64_mov_imm_reg(cd, -1, REG_ITMP2);
+ s1 = emit_load_s1(jd, iptr, src->prev, REG_FTMP1);
+ s2 = emit_load_s2(jd, iptr, src, REG_FTMP2);
+ d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP3);
+ M_CLR(d);
+ M_MOV_IMM(1, REG_ITMP1);
+ M_MOV_IMM(-1, REG_ITMP2);
x86_64_ucomisd_reg_reg(cd, s1, s2);
- x86_64_cmovcc_reg_reg(cd, X86_64_CC_B, REG_ITMP1, d);
- x86_64_cmovcc_reg_reg(cd, X86_64_CC_A, REG_ITMP2, d);
- x86_64_cmovcc_reg_reg(cd, X86_64_CC_P, REG_ITMP2, d); /* treat unordered as GT */
- store_reg_to_var_int(iptr->dst, d);
+ M_CMOVB(REG_ITMP1, d);
+ M_CMOVA(REG_ITMP2, d);
+ M_CMOVP(REG_ITMP2, d); /* treat unordered as GT */
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_DCMPG: /* ..., val1, val2 ==> ..., val1 fcmpg val2 */
/* == => 0, < => 1, > => -1 */
- var_to_reg_flt(s1, src->prev, REG_FTMP1);
- var_to_reg_flt(s2, src, REG_FTMP2);
- d = reg_of_var(rd, iptr->dst, REG_ITMP3);
- x86_64_alu_reg_reg(cd, X86_64_XOR, d, d);
- x86_64_mov_imm_reg(cd, 1, REG_ITMP1);
- x86_64_mov_imm_reg(cd, -1, REG_ITMP2);
+ s1 = emit_load_s1(jd, iptr, src->prev, REG_FTMP1);
+ s2 = emit_load_s2(jd, iptr, src, REG_FTMP2);
+ d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP3);
+ M_CLR(d);
+ M_MOV_IMM(1, REG_ITMP1);
+ M_MOV_IMM(-1, REG_ITMP2);
x86_64_ucomisd_reg_reg(cd, s1, s2);
- x86_64_cmovcc_reg_reg(cd, X86_64_CC_B, REG_ITMP1, d);
- x86_64_cmovcc_reg_reg(cd, X86_64_CC_A, REG_ITMP2, d);
- x86_64_cmovcc_reg_reg(cd, X86_64_CC_P, REG_ITMP1, d); /* treat unordered as LT */
- store_reg_to_var_int(iptr->dst, d);
+ M_CMOVB(REG_ITMP1, d);
+ M_CMOVA(REG_ITMP2, d);
+ M_CMOVP(REG_ITMP1, d); /* treat unordered as LT */
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_ARRAYLENGTH: /* ..., arrayref ==> ..., (int) length */
- var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(rd, iptr->dst, REG_ITMP3);
+ s1 = emit_load_s1(jd, iptr, src, REG_ITMP1);
+ d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP3);
gen_nullptr_check(s1);
- x86_64_movl_membase_reg(cd, s1, OFFSET(java_arrayheader, size), d);
- store_reg_to_var_int(iptr->dst, d);
+ M_ILD(d, s1, OFFSET(java_arrayheader, size));
+ emit_store(jd, iptr, iptr->dst, d);
break;
- case ICMD_AALOAD: /* ..., arrayref, index ==> ..., value */
+ case ICMD_BALOAD: /* ..., arrayref, index ==> ..., value */
- var_to_reg_int(s1, src->prev, REG_ITMP1);
- var_to_reg_int(s2, src, REG_ITMP2);
- d = reg_of_var(rd, iptr->dst, REG_ITMP3);
+ s1 = emit_load_s1(jd, iptr, src->prev, REG_ITMP1);
+ s2 = emit_load_s2(jd, iptr, src, REG_ITMP2);
+ d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP3);
if (iptr->op1 == 0) {
gen_nullptr_check(s1);
gen_bound_check;
}
- x86_64_mov_memindex_reg(cd, OFFSET(java_objectarray, data[0]), s1, s2, 3, d);
- store_reg_to_var_int(iptr->dst, d);
+ x86_64_movsbq_memindex_reg(cd, OFFSET(java_bytearray, data[0]), s1, s2, 0, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
- case ICMD_LALOAD: /* ..., arrayref, index ==> ..., value */
+ case ICMD_CALOAD: /* ..., arrayref, index ==> ..., value */
- var_to_reg_int(s1, src->prev, REG_ITMP1);
- var_to_reg_int(s2, src, REG_ITMP2);
- d = reg_of_var(rd, iptr->dst, REG_ITMP3);
+ s1 = emit_load_s1(jd, iptr, src->prev, REG_ITMP1);
+ s2 = emit_load_s2(jd, iptr, src, REG_ITMP2);
+ d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP3);
if (iptr->op1 == 0) {
gen_nullptr_check(s1);
gen_bound_check;
}
- x86_64_mov_memindex_reg(cd, OFFSET(java_longarray, data[0]), s1, s2, 3, d);
- store_reg_to_var_int(iptr->dst, d);
- break;
+ x86_64_movzwq_memindex_reg(cd, OFFSET(java_chararray, data[0]), s1, s2, 1, d);
+ emit_store(jd, iptr, iptr->dst, d);
+ break;
- case ICMD_IALOAD: /* ..., arrayref, index ==> ..., value */
+ case ICMD_SALOAD: /* ..., arrayref, index ==> ..., value */
- var_to_reg_int(s1, src->prev, REG_ITMP1);
- var_to_reg_int(s2, src, REG_ITMP2);
- d = reg_of_var(rd, iptr->dst, REG_ITMP3);
+ s1 = emit_load_s1(jd, iptr, src->prev, REG_ITMP1);
+ s2 = emit_load_s2(jd, iptr, src, REG_ITMP2);
+ d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP3);
if (iptr->op1 == 0) {
gen_nullptr_check(s1);
gen_bound_check;
}
- x86_64_movl_memindex_reg(cd, OFFSET(java_intarray, data[0]), s1, s2, 2, d);
- store_reg_to_var_int(iptr->dst, d);
+ x86_64_movswq_memindex_reg(cd, OFFSET(java_shortarray, data[0]), s1, s2, 1, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
- case ICMD_FALOAD: /* ..., arrayref, index ==> ..., value */
+ case ICMD_IALOAD: /* ..., arrayref, index ==> ..., value */
- var_to_reg_int(s1, src->prev, REG_ITMP1);
- var_to_reg_int(s2, src, REG_ITMP2);
- d = reg_of_var(rd, iptr->dst, REG_FTMP3);
+ s1 = emit_load_s1(jd, iptr, src->prev, REG_ITMP1);
+ s2 = emit_load_s2(jd, iptr, src, REG_ITMP2);
+ d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP3);
if (iptr->op1 == 0) {
gen_nullptr_check(s1);
gen_bound_check;
}
- x86_64_movss_memindex_reg(cd, OFFSET(java_floatarray, data[0]), s1, s2, 2, d);
- store_reg_to_var_flt(iptr->dst, d);
+ x86_64_movl_memindex_reg(cd, OFFSET(java_intarray, data[0]), s1, s2, 2, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
- case ICMD_DALOAD: /* ..., arrayref, index ==> ..., value */
+ case ICMD_LALOAD: /* ..., arrayref, index ==> ..., value */
- var_to_reg_int(s1, src->prev, REG_ITMP1);
- var_to_reg_int(s2, src, REG_ITMP2);
- d = reg_of_var(rd, iptr->dst, REG_FTMP3);
+ s1 = emit_load_s1(jd, iptr, src->prev, REG_ITMP1);
+ s2 = emit_load_s2(jd, iptr, src, REG_ITMP2);
+ d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP3);
if (iptr->op1 == 0) {
gen_nullptr_check(s1);
gen_bound_check;
}
- x86_64_movsd_memindex_reg(cd, OFFSET(java_doublearray, data[0]), s1, s2, 3, d);
- store_reg_to_var_flt(iptr->dst, d);
+ x86_64_mov_memindex_reg(cd, OFFSET(java_longarray, data[0]), s1, s2, 3, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
- case ICMD_CALOAD: /* ..., arrayref, index ==> ..., value */
+ case ICMD_FALOAD: /* ..., arrayref, index ==> ..., value */
- var_to_reg_int(s1, src->prev, REG_ITMP1);
- var_to_reg_int(s2, src, REG_ITMP2);
- d = reg_of_var(rd, iptr->dst, REG_ITMP3);
+ s1 = emit_load_s1(jd, iptr, src->prev, REG_ITMP1);
+ s2 = emit_load_s2(jd, iptr, src, REG_ITMP2);
+ d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_FTMP3);
if (iptr->op1 == 0) {
gen_nullptr_check(s1);
gen_bound_check;
}
- x86_64_movzwq_memindex_reg(cd, OFFSET(java_chararray, data[0]), s1, s2, 1, d);
- store_reg_to_var_int(iptr->dst, d);
- break;
+ x86_64_movss_memindex_reg(cd, OFFSET(java_floatarray, data[0]), s1, s2, 2, d);
+ emit_store(jd, iptr, iptr->dst, d);
+ break;
- case ICMD_SALOAD: /* ..., arrayref, index ==> ..., value */
+ case ICMD_DALOAD: /* ..., arrayref, index ==> ..., value */
- var_to_reg_int(s1, src->prev, REG_ITMP1);
- var_to_reg_int(s2, src, REG_ITMP2);
- d = reg_of_var(rd, iptr->dst, REG_ITMP3);
+ s1 = emit_load_s1(jd, iptr, src->prev, REG_ITMP1);
+ s2 = emit_load_s2(jd, iptr, src, REG_ITMP2);
+ d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_FTMP3);
if (iptr->op1 == 0) {
gen_nullptr_check(s1);
gen_bound_check;
}
- x86_64_movswq_memindex_reg(cd, OFFSET(java_shortarray, data[0]), s1, s2, 1, d);
- store_reg_to_var_int(iptr->dst, d);
+ x86_64_movsd_memindex_reg(cd, OFFSET(java_doublearray, data[0]), s1, s2, 3, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
- case ICMD_BALOAD: /* ..., arrayref, index ==> ..., value */
+ case ICMD_AALOAD: /* ..., arrayref, index ==> ..., value */
- var_to_reg_int(s1, src->prev, REG_ITMP1);
- var_to_reg_int(s2, src, REG_ITMP2);
- d = reg_of_var(rd, iptr->dst, REG_ITMP3);
+ s1 = emit_load_s1(jd, iptr, src->prev, REG_ITMP1);
+ s2 = emit_load_s2(jd, iptr, src, REG_ITMP2);
+ d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP3);
if (iptr->op1 == 0) {
gen_nullptr_check(s1);
gen_bound_check;
}
- x86_64_movsbq_memindex_reg(cd, OFFSET(java_bytearray, data[0]), s1, s2, 0, d);
- store_reg_to_var_int(iptr->dst, d);
+ x86_64_mov_memindex_reg(cd, OFFSET(java_objectarray, data[0]), s1, s2, 3, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
- case ICMD_LASTORE: /* ..., arrayref, index, value ==> ... */
+ case ICMD_BASTORE: /* ..., arrayref, index, value ==> ... */
- var_to_reg_int(s1, src->prev->prev, REG_ITMP1);
- var_to_reg_int(s2, src->prev, REG_ITMP2);
+ s1 = emit_load_s1(jd, iptr, src->prev->prev, REG_ITMP1);
+ s2 = emit_load_s2(jd, iptr, src->prev, REG_ITMP2);
if (iptr->op1 == 0) {
gen_nullptr_check(s1);
gen_bound_check;
}
- var_to_reg_int(s3, src, REG_ITMP3);
- x86_64_mov_reg_memindex(cd, s3, OFFSET(java_longarray, data[0]), s1, s2, 3);
+ s3 = emit_load_s3(jd, iptr, src, REG_ITMP3);
+ x86_64_movb_reg_memindex(cd, s3, OFFSET(java_bytearray, data[0]), s1, s2, 0);
break;
- case ICMD_IASTORE: /* ..., arrayref, index, value ==> ... */
+ case ICMD_CASTORE: /* ..., arrayref, index, value ==> ... */
- var_to_reg_int(s1, src->prev->prev, REG_ITMP1);
- var_to_reg_int(s2, src->prev, REG_ITMP2);
+ s1 = emit_load_s1(jd, iptr, src->prev->prev, REG_ITMP1);
+ s2 = emit_load_s2(jd, iptr, src->prev, REG_ITMP2);
if (iptr->op1 == 0) {
gen_nullptr_check(s1);
gen_bound_check;
}
- var_to_reg_int(s3, src, REG_ITMP3);
- x86_64_movl_reg_memindex(cd, s3, OFFSET(java_intarray, data[0]), s1, s2, 2);
+ s3 = emit_load_s3(jd, iptr, src, REG_ITMP3);
+ x86_64_movw_reg_memindex(cd, s3, OFFSET(java_chararray, data[0]), s1, s2, 1);
break;
- case ICMD_FASTORE: /* ..., arrayref, index, value ==> ... */
+ case ICMD_SASTORE: /* ..., arrayref, index, value ==> ... */
- var_to_reg_int(s1, src->prev->prev, REG_ITMP1);
- var_to_reg_int(s2, src->prev, REG_ITMP2);
+ s1 = emit_load_s1(jd, iptr, src->prev->prev, REG_ITMP1);
+ s2 = emit_load_s2(jd, iptr, src->prev, REG_ITMP2);
if (iptr->op1 == 0) {
gen_nullptr_check(s1);
gen_bound_check;
}
- var_to_reg_flt(s3, src, REG_FTMP3);
- x86_64_movss_reg_memindex(cd, s3, OFFSET(java_floatarray, data[0]), s1, s2, 2);
+ s3 = emit_load_s3(jd, iptr, src, REG_ITMP3);
+ x86_64_movw_reg_memindex(cd, s3, OFFSET(java_shortarray, data[0]), s1, s2, 1);
break;
- case ICMD_DASTORE: /* ..., arrayref, index, value ==> ... */
+ case ICMD_IASTORE: /* ..., arrayref, index, value ==> ... */
- var_to_reg_int(s1, src->prev->prev, REG_ITMP1);
- var_to_reg_int(s2, src->prev, REG_ITMP2);
+ s1 = emit_load_s1(jd, iptr, src->prev->prev, REG_ITMP1);
+ s2 = emit_load_s2(jd, iptr, src->prev, REG_ITMP2);
if (iptr->op1 == 0) {
gen_nullptr_check(s1);
gen_bound_check;
}
- var_to_reg_flt(s3, src, REG_FTMP3);
- x86_64_movsd_reg_memindex(cd, s3, OFFSET(java_doublearray, data[0]), s1, s2, 3);
+ s3 = emit_load_s3(jd, iptr, src, REG_ITMP3);
+ x86_64_movl_reg_memindex(cd, s3, OFFSET(java_intarray, data[0]), s1, s2, 2);
break;
- case ICMD_CASTORE: /* ..., arrayref, index, value ==> ... */
+ case ICMD_LASTORE: /* ..., arrayref, index, value ==> ... */
- var_to_reg_int(s1, src->prev->prev, REG_ITMP1);
- var_to_reg_int(s2, src->prev, REG_ITMP2);
+ s1 = emit_load_s1(jd, iptr, src->prev->prev, REG_ITMP1);
+ s2 = emit_load_s2(jd, iptr, src->prev, REG_ITMP2);
if (iptr->op1 == 0) {
gen_nullptr_check(s1);
gen_bound_check;
}
- var_to_reg_int(s3, src, REG_ITMP3);
- x86_64_movw_reg_memindex(cd, s3, OFFSET(java_chararray, data[0]), s1, s2, 1);
+ s3 = emit_load_s3(jd, iptr, src, REG_ITMP3);
+ x86_64_mov_reg_memindex(cd, s3, OFFSET(java_longarray, data[0]), s1, s2, 3);
break;
- case ICMD_SASTORE: /* ..., arrayref, index, value ==> ... */
+ case ICMD_FASTORE: /* ..., arrayref, index, value ==> ... */
- var_to_reg_int(s1, src->prev->prev, REG_ITMP1);
- var_to_reg_int(s2, src->prev, REG_ITMP2);
+ s1 = emit_load_s1(jd, iptr, src->prev->prev, REG_ITMP1);
+ s2 = emit_load_s2(jd, iptr, src->prev, REG_ITMP2);
if (iptr->op1 == 0) {
gen_nullptr_check(s1);
gen_bound_check;
}
- var_to_reg_int(s3, src, REG_ITMP3);
- x86_64_movw_reg_memindex(cd, s3, OFFSET(java_shortarray, data[0]), s1, s2, 1);
+ s3 = emit_load_s3(jd, iptr, src, REG_FTMP3);
+ x86_64_movss_reg_memindex(cd, s3, OFFSET(java_floatarray, data[0]), s1, s2, 2);
break;
- case ICMD_BASTORE: /* ..., arrayref, index, value ==> ... */
+ case ICMD_DASTORE: /* ..., arrayref, index, value ==> ... */
- var_to_reg_int(s1, src->prev->prev, REG_ITMP1);
- var_to_reg_int(s2, src->prev, REG_ITMP2);
+ s1 = emit_load_s1(jd, iptr, src->prev->prev, REG_ITMP1);
+ s2 = emit_load_s2(jd, iptr, src->prev, REG_ITMP2);
if (iptr->op1 == 0) {
gen_nullptr_check(s1);
gen_bound_check;
}
- var_to_reg_int(s3, src, REG_ITMP3);
- x86_64_movb_reg_memindex(cd, s3, OFFSET(java_bytearray, data[0]), s1, s2, 0);
+ s3 = emit_load_s3(jd, iptr, src, REG_FTMP3);
+ x86_64_movsd_reg_memindex(cd, s3, OFFSET(java_doublearray, data[0]), s1, s2, 3);
break;
case ICMD_AASTORE: /* ..., arrayref, index, value ==> ... */
- var_to_reg_int(s1, src->prev->prev, REG_ITMP1);
- var_to_reg_int(s2, src->prev, REG_ITMP2);
+ s1 = emit_load_s1(jd, iptr, src->prev->prev, REG_ITMP1);
+ s2 = emit_load_s2(jd, iptr, src->prev, REG_ITMP2);
if (iptr->op1 == 0) {
gen_nullptr_check(s1);
gen_bound_check;
}
- var_to_reg_int(s3, src, REG_ITMP3);
+ s3 = emit_load_s3(jd, iptr, src, REG_ITMP3);
M_MOV(s1, rd->argintregs[0]);
M_MOV(s3, rd->argintregs[1]);
- M_MOV_IMM((ptrint) BUILTIN_canstore, REG_ITMP1);
+ M_MOV_IMM(BUILTIN_canstore, REG_ITMP1);
M_CALL(REG_ITMP1);
M_TEST(REG_RESULT);
M_BEQ(0);
- codegen_addxstorerefs(cd, cd->mcodeptr);
+ codegen_add_arraystoreexception_ref(cd);
- var_to_reg_int(s1, src->prev->prev, REG_ITMP1);
- var_to_reg_int(s2, src->prev, REG_ITMP2);
- var_to_reg_int(s3, src, REG_ITMP3);
+ s1 = emit_load_s1(jd, iptr, src->prev->prev, REG_ITMP1);
+ s2 = emit_load_s2(jd, iptr, src->prev, REG_ITMP2);
+ s3 = emit_load_s3(jd, iptr, src, REG_ITMP3);
x86_64_mov_reg_memindex(cd, s3, OFFSET(java_objectarray, data[0]), s1, s2, 3);
break;
- case ICMD_IASTORECONST: /* ..., arrayref, index ==> ... */
+ case ICMD_BASTORECONST: /* ..., arrayref, index ==> ... */
- var_to_reg_int(s1, src->prev, REG_ITMP1);
- var_to_reg_int(s2, src, REG_ITMP2);
+ s1 = emit_load_s1(jd, iptr, src->prev, REG_ITMP1);
+ s2 = emit_load_s2(jd, iptr, src, REG_ITMP2);
if (iptr->op1 == 0) {
gen_nullptr_check(s1);
gen_bound_check;
}
- x86_64_movl_imm_memindex(cd, iptr->val.i, OFFSET(java_intarray, data[0]), s1, s2, 2);
+ x86_64_movb_imm_memindex(cd, iptr->val.i, OFFSET(java_bytearray, data[0]), s1, s2, 0);
break;
- case ICMD_LASTORECONST: /* ..., arrayref, index ==> ... */
+ case ICMD_CASTORECONST: /* ..., arrayref, index ==> ... */
- var_to_reg_int(s1, src->prev, REG_ITMP1);
- var_to_reg_int(s2, src, REG_ITMP2);
+ s1 = emit_load_s1(jd, iptr, src->prev, REG_ITMP1);
+ s2 = emit_load_s2(jd, iptr, src, REG_ITMP2);
if (iptr->op1 == 0) {
gen_nullptr_check(s1);
gen_bound_check;
}
-
- if (IS_IMM32(iptr->val.l)) {
- x86_64_mov_imm_memindex(cd, (u4) (iptr->val.l & 0x00000000ffffffff), OFFSET(java_longarray, data[0]), s1, s2, 3);
-
- } else {
- x86_64_movl_imm_memindex(cd, (u4) (iptr->val.l & 0x00000000ffffffff), OFFSET(java_longarray, data[0]), s1, s2, 3);
- x86_64_movl_imm_memindex(cd, (u4) (iptr->val.l >> 32), OFFSET(java_longarray, data[0]) + 4, s1, s2, 3);
- }
+ x86_64_movw_imm_memindex(cd, iptr->val.i, OFFSET(java_chararray, data[0]), s1, s2, 1);
break;
- case ICMD_AASTORECONST: /* ..., arrayref, index ==> ... */
+ case ICMD_SASTORECONST: /* ..., arrayref, index ==> ... */
- var_to_reg_int(s1, src->prev, REG_ITMP1);
- var_to_reg_int(s2, src, REG_ITMP2);
+ s1 = emit_load_s1(jd, iptr, src->prev, REG_ITMP1);
+ s2 = emit_load_s2(jd, iptr, src, REG_ITMP2);
if (iptr->op1 == 0) {
gen_nullptr_check(s1);
gen_bound_check;
}
- x86_64_mov_imm_memindex(cd, 0, OFFSET(java_objectarray, data[0]), s1, s2, 3);
+ x86_64_movw_imm_memindex(cd, iptr->val.i, OFFSET(java_shortarray, data[0]), s1, s2, 1);
break;
- case ICMD_BASTORECONST: /* ..., arrayref, index ==> ... */
+ case ICMD_IASTORECONST: /* ..., arrayref, index ==> ... */
- var_to_reg_int(s1, src->prev, REG_ITMP1);
- var_to_reg_int(s2, src, REG_ITMP2);
+ s1 = emit_load_s1(jd, iptr, src->prev, REG_ITMP1);
+ s2 = emit_load_s2(jd, iptr, src, REG_ITMP2);
if (iptr->op1 == 0) {
gen_nullptr_check(s1);
gen_bound_check;
}
- x86_64_movb_imm_memindex(cd, iptr->val.i, OFFSET(java_bytearray, data[0]), s1, s2, 0);
+ x86_64_movl_imm_memindex(cd, iptr->val.i, OFFSET(java_intarray, data[0]), s1, s2, 2);
break;
- case ICMD_CASTORECONST: /* ..., arrayref, index ==> ... */
+ case ICMD_LASTORECONST: /* ..., arrayref, index ==> ... */
- var_to_reg_int(s1, src->prev, REG_ITMP1);
- var_to_reg_int(s2, src, REG_ITMP2);
+ s1 = emit_load_s1(jd, iptr, src->prev, REG_ITMP1);
+ s2 = emit_load_s2(jd, iptr, src, REG_ITMP2);
if (iptr->op1 == 0) {
gen_nullptr_check(s1);
gen_bound_check;
}
- x86_64_movw_imm_memindex(cd, iptr->val.i, OFFSET(java_chararray, data[0]), s1, s2, 1);
+
+ if (IS_IMM32(iptr->val.l)) {
+ x86_64_mov_imm_memindex(cd, (u4) (iptr->val.l & 0x00000000ffffffff), OFFSET(java_longarray, data[0]), s1, s2, 3);
+ } else {
+ x86_64_movl_imm_memindex(cd, (u4) (iptr->val.l & 0x00000000ffffffff), OFFSET(java_longarray, data[0]), s1, s2, 3);
+ x86_64_movl_imm_memindex(cd, (u4) (iptr->val.l >> 32), OFFSET(java_longarray, data[0]) + 4, s1, s2, 3);
+ }
break;
- case ICMD_SASTORECONST: /* ..., arrayref, index ==> ... */
+ case ICMD_AASTORECONST: /* ..., arrayref, index ==> ... */
- var_to_reg_int(s1, src->prev, REG_ITMP1);
- var_to_reg_int(s2, src, REG_ITMP2);
+ s1 = emit_load_s1(jd, iptr, src->prev, REG_ITMP1);
+ s2 = emit_load_s2(jd, iptr, src, REG_ITMP2);
if (iptr->op1 == 0) {
gen_nullptr_check(s1);
gen_bound_check;
}
- x86_64_movw_imm_memindex(cd, iptr->val.i, OFFSET(java_shortarray, data[0]), s1, s2, 1);
+ x86_64_mov_imm_memindex(cd, 0, OFFSET(java_objectarray, data[0]), s1, s2, 3);
break;
case ICMD_GETSTATIC: /* ... ==> ..., value */
/* op1 = type, val.a = field address */
- if (!iptr->val.a) {
+ if (INSTRUCTION_IS_UNRESOLVED(iptr)) {
disp = dseg_addaddress(cd, NULL);
- codegen_addpatchref(cd, cd->mcodeptr,
- PATCHER_get_putstatic,
- (unresolved_field *) iptr->target, disp);
+/* PROFILE_CYCLE_STOP; */
+
+ codegen_addpatchref(cd, PATCHER_get_putstatic,
+ INSTRUCTION_UNRESOLVED_FIELD(iptr), disp);
if (opt_showdisassemble) {
M_NOP; M_NOP; M_NOP; M_NOP; M_NOP;
}
+/* PROFILE_CYCLE_START; */
+
} else {
- fieldinfo *fi = iptr->val.a;
+ fieldinfo *fi = INSTRUCTION_RESOLVED_FIELDINFO(iptr);
disp = dseg_addaddress(cd, &(fi->value));
- if (!fi->class->initialized) {
- codegen_addpatchref(cd, cd->mcodeptr,
- PATCHER_clinit, fi->class, 0);
+ if (!CLASS_IS_OR_ALMOST_INITIALIZED(fi->class)) {
+ PROFILE_CYCLE_STOP;
+
+ codegen_addpatchref(cd, PATCHER_clinit, fi->class, 0);
if (opt_showdisassemble) {
M_NOP; M_NOP; M_NOP; M_NOP; M_NOP;
}
+
+ PROFILE_CYCLE_START;
}
}
- /* This approach is much faster than moving the field address */
- /* inline into a register. */
- x86_64_mov_membase_reg(cd, RIP, -(((ptrint) cd->mcodeptr + 7) - (ptrint) cd->mcodebase) + disp, REG_ITMP2);
+ /* This approach is much faster than moving the field
+ address inline into a register. */
+
+ M_ALD(REG_ITMP2, RIP, -(((ptrint) cd->mcodeptr + 7) -
+ (ptrint) cd->mcodebase) + disp);
+
switch (iptr->op1) {
case TYPE_INT:
- d = reg_of_var(rd, iptr->dst, REG_ITMP1);
- x86_64_movl_membase_reg(cd, REG_ITMP2, 0, d);
- store_reg_to_var_int(iptr->dst, d);
+ d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP1);
+ M_ILD(d, REG_ITMP2, 0);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case TYPE_LNG:
case TYPE_ADR:
- d = reg_of_var(rd, iptr->dst, REG_ITMP1);
- x86_64_mov_membase_reg(cd, REG_ITMP2, 0, d);
- store_reg_to_var_int(iptr->dst, d);
+ d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP1);
+ M_LLD(d, REG_ITMP2, 0);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case TYPE_FLT:
- d = reg_of_var(rd, iptr->dst, REG_ITMP1);
+ d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP1);
x86_64_movss_membase_reg(cd, REG_ITMP2, 0, d);
- store_reg_to_var_flt(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case TYPE_DBL:
- d = reg_of_var(rd, iptr->dst, REG_ITMP1);
+ d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP1);
x86_64_movsd_membase_reg(cd, REG_ITMP2, 0, d);
- store_reg_to_var_flt(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
}
break;
case ICMD_PUTSTATIC: /* ..., value ==> ... */
/* op1 = type, val.a = field address */
- if (!iptr->val.a) {
+ if (INSTRUCTION_IS_UNRESOLVED(iptr)) {
disp = dseg_addaddress(cd, NULL);
- codegen_addpatchref(cd, cd->mcodeptr,
- PATCHER_get_putstatic,
- (unresolved_field *) iptr->target, disp);
+/* PROFILE_CYCLE_STOP; */
+
+ codegen_addpatchref(cd, PATCHER_get_putstatic,
+ INSTRUCTION_UNRESOLVED_FIELD(iptr), disp);
if (opt_showdisassemble) {
M_NOP; M_NOP; M_NOP; M_NOP; M_NOP;
}
+/* PROFILE_CYCLE_START; */
+
} else {
- fieldinfo *fi = iptr->val.a;
+ fieldinfo *fi = INSTRUCTION_RESOLVED_FIELDINFO(iptr);
disp = dseg_addaddress(cd, &(fi->value));
- if (!fi->class->initialized) {
- codegen_addpatchref(cd, cd->mcodeptr,
- PATCHER_clinit, fi->class, 0);
+ if (!CLASS_IS_OR_ALMOST_INITIALIZED(fi->class)) {
+ PROFILE_CYCLE_STOP;
+
+ codegen_addpatchref(cd, PATCHER_clinit, fi->class, 0);
if (opt_showdisassemble) {
M_NOP; M_NOP; M_NOP; M_NOP; M_NOP;
}
+
+ PROFILE_CYCLE_START;
}
}
- /* This approach is much faster than moving the field address */
- /* inline into a register. */
- x86_64_mov_membase_reg(cd, RIP, -(((ptrint) cd->mcodeptr + 7) - (ptrint) cd->mcodebase) + disp, REG_ITMP2);
+ /* This approach is much faster than moving the field
+ address inline into a register. */
+
+ M_ALD(REG_ITMP2, RIP, -(((ptrint) cd->mcodeptr + 7) -
+ (ptrint) cd->mcodebase) + disp);
+
switch (iptr->op1) {
case TYPE_INT:
- var_to_reg_int(s2, src, REG_ITMP1);
- x86_64_movl_reg_membase(cd, s2, REG_ITMP2, 0);
+ s2 = emit_load_s2(jd, iptr, src, REG_ITMP1);
+ M_IST(s2, REG_ITMP2, 0);
break;
case TYPE_LNG:
case TYPE_ADR:
- var_to_reg_int(s2, src, REG_ITMP1);
- x86_64_mov_reg_membase(cd, s2, REG_ITMP2, 0);
+ s2 = emit_load_s2(jd, iptr, src, REG_ITMP1);
+ M_LST(s2, REG_ITMP2, 0);
break;
case TYPE_FLT:
- var_to_reg_flt(s2, src, REG_FTMP1);
+ s2 = emit_load_s2(jd, iptr, src, REG_FTMP1);
x86_64_movss_reg_membase(cd, s2, REG_ITMP2, 0);
break;
case TYPE_DBL:
- var_to_reg_flt(s2, src, REG_FTMP1);
+ s2 = emit_load_s2(jd, iptr, src, REG_FTMP1);
x86_64_movsd_reg_membase(cd, s2, REG_ITMP2, 0);
break;
}
/* op1 = type, val.a = field address (in */
/* following NOP) */
- if (!iptr[1].val.a) {
+ if (INSTRUCTION_IS_UNRESOLVED(iptr + 1)) {
disp = dseg_addaddress(cd, NULL);
- codegen_addpatchref(cd, cd->mcodeptr,
- PATCHER_get_putstatic,
- (unresolved_field *) iptr[1].target, disp);
+/* PROFILE_CYCLE_STOP; */
+
+ codegen_addpatchref(cd, PATCHER_get_putstatic,
+ INSTRUCTION_UNRESOLVED_FIELD(iptr + 1), disp);
if (opt_showdisassemble) {
M_NOP; M_NOP; M_NOP; M_NOP; M_NOP;
}
+/* PROFILE_CYCLE_START; */
+
} else {
- fieldinfo *fi = iptr[1].val.a;
+ fieldinfo *fi = INSTRUCTION_RESOLVED_FIELDINFO(iptr + 1);
disp = dseg_addaddress(cd, &(fi->value));
- if (!fi->class->initialized) {
- codegen_addpatchref(cd, cd->mcodeptr,
- PATCHER_clinit, fi->class, 0);
+ if (!CLASS_IS_OR_ALMOST_INITIALIZED(fi->class)) {
+ PROFILE_CYCLE_STOP;
+
+ codegen_addpatchref(cd, PATCHER_clinit, fi->class, 0);
if (opt_showdisassemble) {
M_NOP; M_NOP; M_NOP; M_NOP; M_NOP;
}
+
+ PROFILE_CYCLE_START;
}
}
- /* This approach is much faster than moving the field address */
- /* inline into a register. */
- x86_64_mov_membase_reg(cd, RIP, -(((ptrint) cd->mcodeptr + 7) - (ptrint) cd->mcodebase) + disp, REG_ITMP1);
+ /* This approach is much faster than moving the field
+ address inline into a register. */
+
+ M_ALD(REG_ITMP1, RIP, -(((ptrint) cd->mcodeptr + 7) -
+ (ptrint) cd->mcodebase) + disp);
+
switch (iptr->op1) {
case TYPE_INT:
case TYPE_FLT:
- x86_64_movl_imm_membase(cd, iptr->val.i, REG_ITMP1, 0);
+ M_IST_IMM(iptr->val.i, REG_ITMP1, 0);
break;
case TYPE_LNG:
case TYPE_ADR:
case TYPE_DBL:
if (IS_IMM32(iptr->val.l)) {
- x86_64_mov_imm_membase(cd, iptr->val.l, REG_ITMP1, 0);
+ M_LST_IMM32(iptr->val.l, REG_ITMP1, 0);
} else {
- x86_64_movl_imm_membase(cd, iptr->val.l, REG_ITMP1, 0);
- x86_64_movl_imm_membase(cd, iptr->val.l >> 32, REG_ITMP1, 4);
+ M_IST_IMM(iptr->val.l, REG_ITMP1, 0);
+ M_IST_IMM(iptr->val.l >> 32, REG_ITMP1, 4);
}
break;
}
case ICMD_GETFIELD: /* ... ==> ..., value */
/* op1 = type, val.i = field offset */
- var_to_reg_int(s1, src, REG_ITMP1);
+ s1 = emit_load_s1(jd, iptr, src, REG_ITMP1);
gen_nullptr_check(s1);
- if (!iptr->val.a) {
- codegen_addpatchref(cd, cd->mcodeptr,
- PATCHER_get_putfield,
- (unresolved_field *) iptr->target, 0);
+ if (INSTRUCTION_IS_UNRESOLVED(iptr)) {
+/* PROFILE_CYCLE_STOP; */
+
+ codegen_addpatchref(cd, PATCHER_get_putfield,
+ INSTRUCTION_UNRESOLVED_FIELD(iptr), 0);
if (opt_showdisassemble) {
M_NOP; M_NOP; M_NOP; M_NOP; M_NOP;
}
- a = 0;
+/* PROFILE_CYCLE_START; */
+
+ disp = 0;
} else {
- a = ((fieldinfo *) (iptr->val.a))->offset;
+ disp = INSTRUCTION_RESOLVED_FIELDINFO(iptr)->offset;
}
switch (iptr->op1) {
case TYPE_INT:
- d = reg_of_var(rd, iptr->dst, REG_ITMP1);
- x86_64_movl_membase32_reg(cd, s1, a, d);
- store_reg_to_var_int(iptr->dst, d);
+ d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP1);
+ M_ILD32(d, s1, disp);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case TYPE_LNG:
case TYPE_ADR:
- d = reg_of_var(rd, iptr->dst, REG_ITMP1);
- x86_64_mov_membase32_reg(cd, s1, a, d);
- store_reg_to_var_int(iptr->dst, d);
+ d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP1);
+ M_LLD32(d, s1, disp);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case TYPE_FLT:
- d = reg_of_var(rd, iptr->dst, REG_FTMP1);
- x86_64_movss_membase32_reg(cd, s1, a, d);
- store_reg_to_var_flt(iptr->dst, d);
+ d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_FTMP1);
+ x86_64_movss_membase32_reg(cd, s1, disp, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case TYPE_DBL:
- d = reg_of_var(rd, iptr->dst, REG_FTMP1);
- x86_64_movsd_membase32_reg(cd, s1, a, d);
- store_reg_to_var_flt(iptr->dst, d);
+ d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_FTMP1);
+ x86_64_movsd_membase32_reg(cd, s1, disp, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
}
break;
case ICMD_PUTFIELD: /* ..., objectref, value ==> ... */
/* op1 = type, val.i = field offset */
- var_to_reg_int(s1, src->prev, REG_ITMP1);
+ s1 = emit_load_s1(jd, iptr, src->prev, REG_ITMP1);
gen_nullptr_check(s1);
+
if (IS_INT_LNG_TYPE(iptr->op1)) {
- var_to_reg_int(s2, src, REG_ITMP2);
+ s2 = emit_load_s2(jd, iptr, src, REG_ITMP2);
} else {
- var_to_reg_flt(s2, src, REG_FTMP2);
+ s2 = emit_load_s2(jd, iptr, src, REG_FTMP2);
}
- if (!iptr->val.a) {
- codegen_addpatchref(cd, cd->mcodeptr,
- PATCHER_get_putfield,
- (unresolved_field *) iptr->target, 0);
+ if (INSTRUCTION_IS_UNRESOLVED(iptr)) {
+/* PROFILE_CYCLE_STOP; */
+
+ codegen_addpatchref(cd, PATCHER_get_putfield,
+ INSTRUCTION_UNRESOLVED_FIELD(iptr), 0);
if (opt_showdisassemble) {
M_NOP; M_NOP; M_NOP; M_NOP; M_NOP;
}
- a = 0;
+/* PROFILE_CYCLE_START; */
+
+ disp = 0;
} else {
- a = ((fieldinfo *) (iptr->val.a))->offset;
+ disp = INSTRUCTION_RESOLVED_FIELDINFO(iptr)->offset;
}
switch (iptr->op1) {
case TYPE_INT:
- x86_64_movl_reg_membase32(cd, s2, s1, a);
+ M_IST32(s2, s1, disp);
break;
case TYPE_LNG:
case TYPE_ADR:
- x86_64_mov_reg_membase32(cd, s2, s1, a);
+ M_LST32(s2, s1, disp);
break;
case TYPE_FLT:
- x86_64_movss_reg_membase32(cd, s2, s1, a);
+ x86_64_movss_reg_membase32(cd, s2, s1, disp);
break;
case TYPE_DBL:
- x86_64_movsd_reg_membase32(cd, s2, s1, a);
+ x86_64_movsd_reg_membase32(cd, s2, s1, disp);
break;
}
break;
/* op1 = type, val.a = field address (in */
/* following NOP) */
- var_to_reg_int(s1, src, REG_ITMP1);
+ s1 = emit_load_s1(jd, iptr, src, REG_ITMP1);
gen_nullptr_check(s1);
- if (!iptr[1].val.a) {
- codegen_addpatchref(cd, cd->mcodeptr,
- PATCHER_putfieldconst,
- (unresolved_field *) iptr[1].target, 0);
+ if (INSTRUCTION_IS_UNRESOLVED(iptr + 1)) {
+/* PROFILE_CYCLE_STOP; */
+
+ codegen_addpatchref(cd, PATCHER_putfieldconst,
+ INSTRUCTION_UNRESOLVED_FIELD(iptr + 1), 0);
if (opt_showdisassemble) {
M_NOP; M_NOP; M_NOP; M_NOP; M_NOP;
}
- a = 0;
+/* PROFILE_CYCLE_START; */
+
+ disp = 0;
} else {
- a = ((fieldinfo *) (iptr[1].val.a))->offset;
+ disp = INSTRUCTION_RESOLVED_FIELDINFO(iptr + 1)->offset;
}
switch (iptr->op1) {
case TYPE_INT:
case TYPE_FLT:
- x86_64_movl_imm_membase32(cd, iptr->val.i, s1, a);
+ M_IST32_IMM(iptr->val.i, s1, disp);
break;
case TYPE_LNG:
case TYPE_ADR:
case TYPE_DBL:
- /* We can only optimize the move, if the class is resolved. */
- /* Otherwise we don't know what to patch. */
- if (iptr[1].val.a && IS_IMM32(iptr->val.l)) {
- x86_64_mov_imm_membase32(cd, iptr->val.l, s1, a);
- } else {
- x86_64_movl_imm_membase32(cd, iptr->val.l, s1, a);
- x86_64_movl_imm_membase32(cd, iptr->val.l >> 32, s1, a + 4);
- }
+ M_IST32_IMM(iptr->val.l, s1, disp);
+ M_IST32_IMM(iptr->val.l >> 32, s1, disp + 4);
break;
}
break;
case ICMD_ATHROW: /* ..., objectref ==> ... (, objectref) */
- var_to_reg_int(s1, src, REG_ITMP1);
+ s1 = emit_load_s1(jd, iptr, src, REG_ITMP1);
M_INTMOVE(s1, REG_ITMP1_XPTR);
+ PROFILE_CYCLE_STOP;
+
+#ifdef ENABLE_VERIFIER
if (iptr->val.a) {
- codegen_addpatchref(cd, cd->mcodeptr,
- PATCHER_athrow_areturn,
+ codegen_addpatchref(cd, PATCHER_athrow_areturn,
(unresolved_class *) iptr->val.a, 0);
if (opt_showdisassemble) {
M_NOP; M_NOP; M_NOP; M_NOP; M_NOP;
}
}
+#endif /* ENABLE_VERIFIER */
M_CALL_IMM(0); /* passing exception pc */
M_POP(REG_ITMP2_XPC);
- M_MOV_IMM((ptrint) asm_handle_exception, REG_ITMP3);
+ M_MOV_IMM(asm_handle_exception, REG_ITMP3);
M_JMP(REG_ITMP3);
break;
/* op1 = target JavaVM pc */
M_JMP_IMM(0);
- codegen_addreference(cd, (basicblock *) iptr->target, cd->mcodeptr);
+ codegen_addreference(cd, (basicblock *) iptr->target);
break;
case ICMD_JSR: /* ... ==> ... */
/* op1 = target JavaVM pc */
M_CALL_IMM(0);
- codegen_addreference(cd, (basicblock *) iptr->target, cd->mcodeptr);
+ codegen_addreference(cd, (basicblock *) iptr->target);
break;
case ICMD_RET: /* ... ==> ... */
/* op1 = local variable */
var = &(rd->locals[iptr->op1][TYPE_ADR]);
- var_to_reg_int(s1, var, REG_ITMP1);
- M_JMP(s1);
+ if (var->flags & INMEMORY) {
+ M_ALD(REG_ITMP1, REG_SP, var->regoff * 8);
+ M_JMP(REG_ITMP1);
+ } else
+ M_JMP(var->regoff);
break;
case ICMD_IFNULL: /* ..., value ==> ... */
/* op1 = target JavaVM pc */
- if (src->flags & INMEMORY) {
- x86_64_alu_imm_membase(cd, X86_64_CMP, 0, REG_SP, src->regoff * 8);
+ if (src->flags & INMEMORY)
+ M_CMP_IMM_MEMBASE(0, REG_SP, src->regoff * 8);
+ else
+ M_TEST(src->regoff);
- } else {
- x86_64_test_reg_reg(cd, src->regoff, src->regoff);
+ /* If the conditional branch is part of an if-converted
+ block, don't generate the actual branch. */
+
+ if ((iptr->opc & ICMD_CONDITION_MASK) == 0) {
+ M_BEQ(0);
+ codegen_addreference(cd, (basicblock *) iptr->target);
}
- x86_64_jcc(cd, X86_64_CC_E, 0);
- codegen_addreference(cd, (basicblock *) iptr->target, cd->mcodeptr);
break;
case ICMD_IFNONNULL: /* ..., value ==> ... */
/* op1 = target JavaVM pc */
- if (src->flags & INMEMORY) {
- x86_64_alu_imm_membase(cd, X86_64_CMP, 0, REG_SP, src->regoff * 8);
+ if (src->flags & INMEMORY)
+ M_CMP_IMM_MEMBASE(0, REG_SP, src->regoff * 8);
+ else
+ M_TEST(src->regoff);
- } else {
- x86_64_test_reg_reg(cd, src->regoff, src->regoff);
+ /* If the conditional branch is part of an if-converted
+ block, don't generate the actual branch. */
+
+ if ((iptr->opc & ICMD_CONDITION_MASK) == 0) {
+ M_BNE(0);
+ codegen_addreference(cd, (basicblock *) iptr->target);
}
- x86_64_jcc(cd, X86_64_CC_NE, 0);
- codegen_addreference(cd, (basicblock *) iptr->target, cd->mcodeptr);
break;
case ICMD_IFEQ: /* ..., value ==> ... */
break;
case ICMD_IFEQ_ICONST: /* ..., value ==> ..., constant */
- /* val.i = constant */
-
- var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(rd, iptr->dst, REG_ITMP3);
- if (iptr[1].opc == ICMD_ELSE_ICONST) {
- if (s1 == d) {
- M_INTMOVE(s1, REG_ITMP1);
- s1 = REG_ITMP1;
- }
- x86_64_movl_imm_reg(cd, iptr[1].val.i, d);
- }
- x86_64_movl_imm_reg(cd, iptr->val.i, REG_ITMP2);
- x86_64_testl_reg_reg(cd, s1, s1);
- x86_64_cmovccl_reg_reg(cd, X86_64_CC_E, REG_ITMP2, d);
- store_reg_to_var_int(iptr->dst, d);
- break;
-
- case ICMD_IFNE_ICONST: /* ..., value ==> ..., constant */
- /* val.i = constant */
-
- var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(rd, iptr->dst, REG_ITMP3);
- if (iptr[1].opc == ICMD_ELSE_ICONST) {
- if (s1 == d) {
- M_INTMOVE(s1, REG_ITMP1);
- s1 = REG_ITMP1;
- }
- x86_64_movl_imm_reg(cd, iptr[1].val.i, d);
- }
- x86_64_movl_imm_reg(cd, iptr->val.i, REG_ITMP2);
- x86_64_testl_reg_reg(cd, s1, s1);
- x86_64_cmovccl_reg_reg(cd, X86_64_CC_NE, REG_ITMP2, d);
- store_reg_to_var_int(iptr->dst, d);
- break;
-
- case ICMD_IFLT_ICONST: /* ..., value ==> ..., constant */
- /* val.i = constant */
-
- var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(rd, iptr->dst, REG_ITMP3);
+ case ICMD_IFNE_ICONST: /* val.i = constant */
+ case ICMD_IFLT_ICONST:
+ case ICMD_IFGE_ICONST:
+ case ICMD_IFGT_ICONST:
+ case ICMD_IFLE_ICONST:
+
+ s1 = emit_load_s1(jd, iptr, src, REG_ITMP1);
+ d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP3);
if (iptr[1].opc == ICMD_ELSE_ICONST) {
if (s1 == d) {
M_INTMOVE(s1, REG_ITMP1);
s1 = REG_ITMP1;
}
- x86_64_movl_imm_reg(cd, iptr[1].val.i, d);
+ if (iptr[1].val.i == 0)
+ M_CLR(d);
+ else
+ M_IMOV_IMM(iptr[1].val.i, d);
}
- x86_64_movl_imm_reg(cd, iptr->val.i, REG_ITMP2);
- x86_64_testl_reg_reg(cd, s1, s1);
- x86_64_cmovccl_reg_reg(cd, X86_64_CC_L, REG_ITMP2, d);
- store_reg_to_var_int(iptr->dst, d);
- break;
-
- case ICMD_IFGE_ICONST: /* ..., value ==> ..., constant */
- /* val.i = constant */
+ if (iptr->val.i == 0)
+ M_CLR(REG_ITMP2);
+ else
+ M_IMOV_IMM(iptr->val.i, REG_ITMP2);
+ M_ITEST(s1);
- var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(rd, iptr->dst, REG_ITMP3);
- if (iptr[1].opc == ICMD_ELSE_ICONST) {
- if (s1 == d) {
- M_INTMOVE(s1, REG_ITMP1);
- s1 = REG_ITMP1;
- }
- x86_64_movl_imm_reg(cd, iptr[1].val.i, d);
+ switch (iptr->opc) {
+ case ICMD_IFEQ_ICONST:
+ M_CMOVEQ(REG_ITMP2, d);
+ break;
+ case ICMD_IFNE_ICONST:
+ M_CMOVNE(REG_ITMP2, d);
+ break;
+ case ICMD_IFLT_ICONST:
+ M_CMOVLT(REG_ITMP2, d);
+ break;
+ case ICMD_IFGE_ICONST:
+ M_CMOVGE(REG_ITMP2, d);
+ break;
+ case ICMD_IFGT_ICONST:
+ M_CMOVGT(REG_ITMP2, d);
+ break;
+ case ICMD_IFLE_ICONST:
+ M_CMOVLE(REG_ITMP2, d);
+ break;
}
- x86_64_movl_imm_reg(cd, iptr->val.i, REG_ITMP2);
- x86_64_testl_reg_reg(cd, s1, s1);
- x86_64_cmovccl_reg_reg(cd, X86_64_CC_GE, REG_ITMP2, d);
- store_reg_to_var_int(iptr->dst, d);
- break;
- case ICMD_IFGT_ICONST: /* ..., value ==> ..., constant */
- /* val.i = constant */
-
- var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(rd, iptr->dst, REG_ITMP3);
- if (iptr[1].opc == ICMD_ELSE_ICONST) {
- if (s1 == d) {
- M_INTMOVE(s1, REG_ITMP1);
- s1 = REG_ITMP1;
- }
- x86_64_movl_imm_reg(cd, iptr[1].val.i, d);
- }
- x86_64_movl_imm_reg(cd, iptr->val.i, REG_ITMP2);
- x86_64_testl_reg_reg(cd, s1, s1);
- x86_64_cmovccl_reg_reg(cd, X86_64_CC_G, REG_ITMP2, d);
- store_reg_to_var_int(iptr->dst, d);
- break;
-
- case ICMD_IFLE_ICONST: /* ..., value ==> ..., constant */
- /* val.i = constant */
-
- var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(rd, iptr->dst, REG_ITMP3);
- if (iptr[1].opc == ICMD_ELSE_ICONST) {
- if (s1 == d) {
- M_INTMOVE(s1, REG_ITMP1);
- s1 = REG_ITMP1;
- }
- x86_64_movl_imm_reg(cd, iptr[1].val.i, d);
- }
- x86_64_movl_imm_reg(cd, iptr->val.i, REG_ITMP2);
- x86_64_testl_reg_reg(cd, s1, s1);
- x86_64_cmovccl_reg_reg(cd, X86_64_CC_LE, REG_ITMP2, d);
- store_reg_to_var_int(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_IRETURN: /* ..., retvalue ==> ... */
case ICMD_LRETURN:
- var_to_reg_int(s1, src, REG_RESULT);
+ s1 = emit_load_s1(jd, iptr, src, REG_RESULT);
M_INTMOVE(s1, REG_RESULT);
goto nowperformreturn;
case ICMD_ARETURN: /* ..., retvalue ==> ... */
- var_to_reg_int(s1, src, REG_RESULT);
+ s1 = emit_load_s1(jd, iptr, src, REG_RESULT);
M_INTMOVE(s1, REG_RESULT);
+#ifdef ENABLE_VERIFIER
if (iptr->val.a) {
- codegen_addpatchref(cd, cd->mcodeptr,
- PATCHER_athrow_areturn,
+ PROFILE_CYCLE_STOP;
+
+ codegen_addpatchref(cd, PATCHER_athrow_areturn,
(unresolved_class *) iptr->val.a, 0);
if (opt_showdisassemble) {
M_NOP; M_NOP; M_NOP; M_NOP; M_NOP;
}
+
+ PROFILE_CYCLE_START;
}
+#endif /* ENABLE_VERIFIER */
goto nowperformreturn;
case ICMD_FRETURN: /* ..., retvalue ==> ... */
case ICMD_DRETURN:
- var_to_reg_flt(s1, src, REG_FRESULT);
+ s1 = emit_load_s1(jd, iptr, src, REG_FRESULT);
M_FLTMOVE(s1, REG_FRESULT);
goto nowperformreturn;
nowperformreturn:
{
s4 i, p;
-
- p = parentargs_base;
-
- /* call trace function */
- if (runverbose) {
+
+ p = stackframesize;
+
+#if !defined(NDEBUG)
+ /* generate call trace */
+
+ if (opt_verbosecall) {
x86_64_alu_imm_reg(cd, X86_64_SUB, 2 * 8, REG_SP);
x86_64_mov_reg_membase(cd, REG_RESULT, REG_SP, 0 * 8);
M_FLTMOVE(REG_FRESULT, rd->argfltregs[0]);
M_FLTMOVE(REG_FRESULT, rd->argfltregs[1]);
- x86_64_mov_imm_reg(cd, (u8) builtin_displaymethodstop, REG_ITMP1);
- x86_64_call_reg(cd, REG_ITMP1);
+ M_MOV_IMM(builtin_displaymethodstop, REG_ITMP1);
+ M_CALL(REG_ITMP1);
x86_64_mov_membase_reg(cd, REG_SP, 0 * 8, REG_RESULT);
x86_64_movq_membase_reg(cd, REG_SP, 1 * 8, REG_FRESULT);
x86_64_alu_imm_reg(cd, X86_64_ADD, 2 * 8, REG_SP);
}
+#endif /* !defined(NDEBUG) */
#if defined(USE_THREADS)
if (checksync && (m->flags & ACC_SYNCHRONIZED)) {
break;
}
- M_MOV_IMM((ptrint) builtin_monitorexit, REG_ITMP1);
+ M_MOV_IMM(builtin_monitorexit, REG_ITMP1);
M_CALL(REG_ITMP1);
/* and now restore the proper return value */
/* deallocate stack */
- if (parentargs_base)
- M_AADD_IMM(parentargs_base * 8, REG_SP);
+ if (stackframesize)
+ M_AADD_IMM(stackframesize * 8, REG_SP);
+
+ /* generate method profiling code */
+
+ PROFILE_CYCLE_STOP;
M_RET;
}
l = s4ptr[1]; /* low */
i = s4ptr[2]; /* high */
- var_to_reg_int(s1, src, REG_ITMP1);
+ s1 = emit_load_s1(jd, iptr, src, REG_ITMP1);
M_INTMOVE(s1, REG_ITMP1);
if (l != 0) {
x86_64_alul_imm_reg(cd, X86_64_SUB, l, REG_ITMP1);
x86_64_alul_imm_reg(cd, X86_64_CMP, i - 1, REG_ITMP1);
x86_64_jcc(cd, X86_64_CC_A, 0);
- /* codegen_addreference(cd, BlockPtrOfPC(s4ptr[0]), cd->mcodeptr); */
- codegen_addreference(cd, (basicblock *) tptr[0], cd->mcodeptr);
+ codegen_addreference(cd, (basicblock *) tptr[0]);
/* build jump table top down and use address of lowest entry */
--tptr;
}
- /* length of dataseg after last dseg_addtarget is used by load */
+ /* length of dataseg after last dseg_addtarget is used
+ by load */
- x86_64_mov_imm_reg(cd, 0, REG_ITMP2);
- dseg_adddata(cd, cd->mcodeptr);
+ M_MOV_IMM(0, REG_ITMP2);
+ dseg_adddata(cd);
x86_64_mov_memindex_reg(cd, -(cd->dseglen), REG_ITMP2, REG_ITMP1, 3, REG_ITMP1);
x86_64_jmp_reg(cd, REG_ITMP1);
}
i = s4ptr[1]; /* count */
MCODECHECK(8 + ((7 + 6) * i) + 5);
- var_to_reg_int(s1, src, REG_ITMP1); /* reg compare should always be faster */
+ s1 = emit_load_s1(jd, iptr, src, REG_ITMP1); /* reg compare should always be faster */
while (--i >= 0) {
s4ptr += 2;
++tptr;
val = s4ptr[0];
x86_64_alul_imm_reg(cd, X86_64_CMP, val, s1);
x86_64_jcc(cd, X86_64_CC_E, 0);
- codegen_addreference(cd, (basicblock *) tptr[0], cd->mcodeptr);
+ codegen_addreference(cd, (basicblock *) tptr[0]);
}
x86_64_jmp_imm(cd, 0);
tptr = (void **) iptr->target;
- codegen_addreference(cd, (basicblock *) tptr[0], cd->mcodeptr);
+ codegen_addreference(cd, (basicblock *) tptr[0]);
}
break;
case ICMD_INVOKEVIRTUAL:/* op1 = arg count, val.a = method pointer */
case ICMD_INVOKEINTERFACE:
- lm = iptr->val.a;
-
- if (lm == NULL) {
- unresolved_method *um = iptr->target;
- md = um->methodref->parseddesc.md;
- } else {
+ if (INSTRUCTION_IS_UNRESOLVED(iptr)) {
+ md = INSTRUCTION_UNRESOLVED_METHOD(iptr)->methodref->parseddesc.md;
+ lm = NULL;
+ }
+ else {
+ lm = INSTRUCTION_RESOLVED_METHODINFO(iptr);
md = lm->parseddesc;
}
if (IS_INT_LNG_TYPE(src->type)) {
if (!md->params[s3].inmemory) {
s1 = rd->argintregs[md->params[s3].regoff];
- var_to_reg_int(d, src, s1);
+ d = emit_load_s1(jd, iptr, src, s1);
M_INTMOVE(d, s1);
} else {
- var_to_reg_int(d, src, REG_ITMP1);
+ d = emit_load_s1(jd, iptr, src, REG_ITMP1);
M_LST(d, REG_SP, md->params[s3].regoff * 8);
}
} else {
if (!md->params[s3].inmemory) {
s1 = rd->argfltregs[md->params[s3].regoff];
- var_to_reg_flt(d, src, s1);
+ d = emit_load_s1(jd, iptr, src, s1);
M_FLTMOVE(d, s1);
} else {
- var_to_reg_flt(d, src, REG_FTMP1);
+ d = emit_load_s1(jd, iptr, src, REG_FTMP1);
M_DST(d, REG_SP, md->params[s3].regoff * 8);
}
}
}
+ /* generate method profiling code */
+
+ PROFILE_CYCLE_STOP;
+
switch (iptr->opc) {
case ICMD_BUILTIN:
a = (ptrint) bte->fp;
if (iptr->op1 == true) {
M_TEST(REG_RESULT);
M_BEQ(0);
- codegen_addxexceptionrefs(cd, cd->mcodeptr);
+ codegen_add_fillinstacktrace_ref(cd);
}
break;
case ICMD_INVOKESPECIAL:
M_TEST(rd->argintregs[0]);
M_BEQ(0);
- codegen_addxnullrefs(cd, cd->mcodeptr);
+ codegen_add_nullpointerexception_ref(cd);
/* first argument contains pointer */
/* gen_nullptr_check(rd->argintregs[0]); */
case ICMD_INVOKESTATIC:
if (lm == NULL) {
- unresolved_method *um = iptr->target;
+ unresolved_method *um = INSTRUCTION_UNRESOLVED_METHOD(iptr);
- codegen_addpatchref(cd, cd->mcodeptr,
- PATCHER_invokestatic_special, um, 0);
+ codegen_addpatchref(cd, PATCHER_invokestatic_special,
+ um, 0);
if (opt_showdisassemble) {
M_NOP; M_NOP; M_NOP; M_NOP; M_NOP;
gen_nullptr_check(rd->argintregs[0]);
if (lm == NULL) {
- unresolved_method *um = iptr->target;
+ unresolved_method *um = INSTRUCTION_UNRESOLVED_METHOD(iptr);
- codegen_addpatchref(cd, cd->mcodeptr,
- PATCHER_invokevirtual, um, 0);
+ codegen_addpatchref(cd, PATCHER_invokevirtual, um, 0);
if (opt_showdisassemble) {
M_NOP; M_NOP; M_NOP; M_NOP; M_NOP;
d = lm->parseddesc->returntype.type;
}
- x86_64_mov_membase_reg(cd, rd->argintregs[0],
- OFFSET(java_objectheader, vftbl),
- REG_ITMP2);
- x86_64_mov_membase32_reg(cd, REG_ITMP2, s1, REG_ITMP1);
- M_CALL(REG_ITMP1);
+ M_ALD(REG_METHODPTR, rd->argintregs[0],
+ OFFSET(java_objectheader, vftbl));
+ M_ALD32(REG_ITMP3, REG_METHODPTR, s1);
+ M_CALL(REG_ITMP3);
break;
case ICMD_INVOKEINTERFACE:
gen_nullptr_check(rd->argintregs[0]);
if (lm == NULL) {
- unresolved_method *um = iptr->target;
+ unresolved_method *um = INSTRUCTION_UNRESOLVED_METHOD(iptr);
- codegen_addpatchref(cd, cd->mcodeptr,
- PATCHER_invokeinterface, um, 0);
+ codegen_addpatchref(cd, PATCHER_invokeinterface, um, 0);
if (opt_showdisassemble) {
M_NOP; M_NOP; M_NOP; M_NOP; M_NOP;
d = lm->parseddesc->returntype.type;
}
- M_ALD(REG_ITMP2, rd->argintregs[0],
+ M_ALD(REG_METHODPTR, rd->argintregs[0],
OFFSET(java_objectheader, vftbl));
- x86_64_mov_membase32_reg(cd, REG_ITMP2, s1, REG_ITMP2);
- x86_64_mov_membase32_reg(cd, REG_ITMP2, s2, REG_ITMP1);
- M_CALL(REG_ITMP1);
+ M_ALD32(REG_METHODPTR, REG_METHODPTR, s1);
+ M_ALD32(REG_ITMP3, REG_METHODPTR, s2);
+ M_CALL(REG_ITMP3);
break;
}
+ /* generate method profiling code */
+
+ PROFILE_CYCLE_START;
+
/* d contains return type */
if (d != TYPE_VOID) {
if (IS_INT_LNG_TYPE(iptr->dst->type)) {
- s1 = reg_of_var(rd, iptr->dst, REG_RESULT);
+ s1 = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_RESULT);
M_INTMOVE(REG_RESULT, s1);
- store_reg_to_var_int(iptr->dst, s1);
+ emit_store(jd, iptr, iptr->dst, s1);
} else {
- s1 = reg_of_var(rd, iptr->dst, REG_FRESULT);
+ s1 = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_FRESULT);
M_FLTMOVE(REG_FRESULT, s1);
- store_reg_to_var_flt(iptr->dst, s1);
+ emit_store(jd, iptr, iptr->dst, s1);
}
}
break;
#if defined(USE_THREADS) && defined(NATIVE_THREADS)
codegen_threadcritrestart(cd, cd->mcodeptr - cd->mcodebase);
#endif
- var_to_reg_int(s1, src, REG_ITMP1);
+ s1 = emit_load_s1(jd, iptr, src, REG_ITMP1);
/* calculate interface checkcast code size */
M_TEST(s1);
M_BEQ(6 + (opt_showdisassemble ? 5 : 0) + 7 + 6 + s2 + 5 + s3);
- codegen_addpatchref(cd, cd->mcodeptr,
- PATCHER_checkcast_instanceof_flags,
+ codegen_addpatchref(cd, PATCHER_checkcast_instanceof_flags,
(constant_classref *) iptr->target, 0);
if (opt_showdisassemble) {
M_ALD(REG_ITMP2, s1, OFFSET(java_objectheader, vftbl));
if (!super) {
- codegen_addpatchref(cd, cd->mcodeptr,
+ codegen_addpatchref(cd,
PATCHER_checkcast_instanceof_interface,
- (constant_classref *) iptr->target, 0);
+ (constant_classref *) iptr->target,
+ 0);
if (opt_showdisassemble) {
M_NOP; M_NOP; M_NOP; M_NOP; M_NOP;
M_LSUB_IMM32(superindex, REG_ITMP3);
M_TEST(REG_ITMP3);
M_BLE(0);
- codegen_addxcastrefs(cd, cd->mcodeptr);
+ codegen_add_classcastexception_ref(cd);
x86_64_mov_membase32_reg(cd, REG_ITMP2,
OFFSET(vftbl_t, interfacetable[0]) -
superindex * sizeof(methodptr*),
REG_ITMP3);
M_TEST(REG_ITMP3);
M_BEQ(0);
- codegen_addxcastrefs(cd, cd->mcodeptr);
+ codegen_add_classcastexception_ref(cd);
if (!super)
M_JMP_IMM(s3);
M_ALD(REG_ITMP2, s1, OFFSET(java_objectheader, vftbl));
if (!super) {
- codegen_addpatchref(cd, cd->mcodeptr,
- PATCHER_checkcast_class,
+ codegen_addpatchref(cd, PATCHER_checkcast_class,
(constant_classref *) iptr->target,
0);
}
}
- M_MOV_IMM((ptrint) supervftbl, REG_ITMP3);
+ M_MOV_IMM(supervftbl, REG_ITMP3);
#if defined(USE_THREADS) && defined(NATIVE_THREADS)
codegen_threadcritstart(cd, cd->mcodeptr - cd->mcodebase);
#endif
OFFSET(vftbl_t, baseval),
REG_ITMP3);
M_LSUB(REG_ITMP3, REG_ITMP2);
- M_MOV_IMM((ptrint) supervftbl, REG_ITMP3);
+ M_MOV_IMM(supervftbl, REG_ITMP3);
M_ILD(REG_ITMP3, REG_ITMP3, OFFSET(vftbl_t, diffval));
/* } */
#if defined(USE_THREADS) && defined(NATIVE_THREADS)
#endif
M_CMP(REG_ITMP3, REG_ITMP2);
M_BA(0); /* (u) REG_ITMP1 > (u) REG_ITMP2 -> jump */
- codegen_addxcastrefs(cd, cd->mcodeptr);
+ codegen_add_classcastexception_ref(cd);
}
- d = reg_of_var(rd, iptr->dst, REG_ITMP3);
+ d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP3);
} else {
/* array type cast-check */
- var_to_reg_int(s1, src, REG_ITMP1);
+ s1 = emit_load_s1(jd, iptr, src, REG_ITMP1);
M_INTMOVE(s1, rd->argintregs[0]);
if (iptr->val.a == NULL) {
- codegen_addpatchref(cd, cd->mcodeptr,
- PATCHER_builtin_arraycheckcast,
+ codegen_addpatchref(cd, PATCHER_builtin_arraycheckcast,
(constant_classref *) iptr->target, 0);
if (opt_showdisassemble) {
}
}
- M_MOV_IMM((ptrint) iptr->val.a, rd->argintregs[1]);
- M_MOV_IMM((ptrint) BUILTIN_arraycheckcast, REG_ITMP1);
+ M_MOV_IMM(iptr->val.a, rd->argintregs[1]);
+ M_MOV_IMM(BUILTIN_arraycheckcast, REG_ITMP1);
M_CALL(REG_ITMP1);
M_TEST(REG_RESULT);
M_BEQ(0);
- codegen_addxcastrefs(cd, cd->mcodeptr);
+ codegen_add_classcastexception_ref(cd);
- var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(rd, iptr->dst, REG_ITMP1);
+ s1 = emit_load_s1(jd, iptr, src, REG_ITMP1);
+ d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP1);
}
M_INTMOVE(s1, d);
- store_reg_to_var_int(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_INSTANCEOF: /* ..., objectref ==> ..., intresult */
codegen_threadcritrestart(cd, cd->mcodeptr - cd->mcodebase);
#endif
- var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(rd, iptr->dst, REG_ITMP2);
+ s1 = emit_load_s1(jd, iptr, src, REG_ITMP1);
+ d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP2);
if (s1 == d) {
M_INTMOVE(s1, REG_ITMP1);
s1 = REG_ITMP1;
x86_64_jcc(cd, X86_64_CC_Z, (6 + (opt_showdisassemble ? 5 : 0) +
7 + 6 + s2 + 5 + s3));
- codegen_addpatchref(cd, cd->mcodeptr,
- PATCHER_checkcast_instanceof_flags,
+ codegen_addpatchref(cd, PATCHER_checkcast_instanceof_flags,
(constant_classref *) iptr->target, 0);
if (opt_showdisassemble) {
OFFSET(java_objectheader, vftbl),
REG_ITMP1);
if (!super) {
- codegen_addpatchref(cd, cd->mcodeptr,
+ codegen_addpatchref(cd,
PATCHER_checkcast_instanceof_interface,
(constant_classref *) iptr->target, 0);
REG_ITMP1);
if (!super) {
- codegen_addpatchref(cd, cd->mcodeptr,
- PATCHER_instanceof_class,
+ codegen_addpatchref(cd, PATCHER_instanceof_class,
(constant_classref *) iptr->target, 0);
if (opt_showdisassemble) {
x86_64_alu_reg_reg(cd, X86_64_CMP, REG_ITMP3, REG_ITMP1);
x86_64_setcc_reg(cd, X86_64_CC_BE, d);
}
- store_reg_to_var_int(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
}
break;
case ICMD_MULTIANEWARRAY:/* ..., cnt1, [cnt2, ...] ==> ..., arrayref */
- /* op1 = dimension, val.a = array descriptor */
+ /* op1 = dimension, val.a = class */
/* check for negative sizes and copy sizes to stack if necessary */
/* copy SAVEDVAR sizes to stack */
if (src->varkind != ARGVAR) {
- var_to_reg_int(s2, src, REG_ITMP1);
+ s2 = emit_load_s2(jd, iptr, src, REG_ITMP1);
M_LST(s2, REG_SP, s1 * 8);
}
}
/* is a patcher function set? */
- if (iptr->target) {
- codegen_addpatchref(cd, cd->mcodeptr,
- (functionptr) (ptrint) iptr->target,
- iptr->val.a, 0);
+ if (iptr->val.a == NULL) {
+ codegen_addpatchref(cd, PATCHER_builtin_multianewarray,
+ (constant_classref *) iptr->target, 0);
if (opt_showdisassemble) {
M_NOP; M_NOP; M_NOP; M_NOP; M_NOP;
/* a1 = arrayvftbl */
- M_MOV_IMM((ptrint) iptr->val.a, rd->argintregs[1]);
+ M_MOV_IMM(iptr->val.a, rd->argintregs[1]);
/* a2 = pointer to dimensions = stack pointer */
M_MOV(REG_SP, rd->argintregs[2]);
- M_MOV_IMM((ptrint) BUILTIN_multianewarray, REG_ITMP1);
+ M_MOV_IMM(BUILTIN_multianewarray, REG_ITMP1);
M_CALL(REG_ITMP1);
/* check for exception before result assignment */
M_TEST(REG_RESULT);
M_BEQ(0);
- codegen_addxexceptionrefs(cd, cd->mcodeptr);
+ codegen_add_fillinstacktrace_ref(cd);
- s1 = reg_of_var(rd, iptr->dst, REG_RESULT);
+ s1 = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_RESULT);
M_INTMOVE(REG_RESULT, s1);
- store_reg_to_var_int(iptr->dst, s1);
+ emit_store(jd, iptr, iptr->dst, s1);
break;
default:
src = bptr->outstack;
len = bptr->outdepth;
MCODECHECK(512);
-#ifdef LSRA
+#if defined(ENABLE_LSRA)
if (!opt_lsra)
#endif
while (src) {
if ((src->varkind != STACKVAR)) {
s2 = src->type;
if (IS_FLT_DBL_TYPE(s2)) {
- var_to_reg_flt(s1, src, REG_FTMP1);
+ s1 = emit_load_s1(jd, iptr, src, REG_FTMP1);
if (!(rd->interfaces[len][s2].flags & INMEMORY)) {
M_FLTMOVE(s1, rd->interfaces[len][s2].regoff);
}
} else {
- var_to_reg_int(s1, src, REG_ITMP1);
+ s1 = emit_load_s1(jd, iptr, src, REG_ITMP1);
if (!(rd->interfaces[len][s2].flags & INMEMORY)) {
M_INTMOVE(s1, rd->interfaces[len][s2].regoff);
} /* if (bptr -> flags >= BBREACHED) */
} /* for basic block */
- codegen_createlinenumbertable(cd);
+ dseg_createlinenumbertable(cd);
- {
-
- u1 *xcodeptr;
- branchref *bref;
-
- /* generate ArithmeticException stubs */
-
- xcodeptr = NULL;
-
- for (bref = cd->xdivrefs; bref != NULL; bref = bref->next) {
- gen_resolvebranch(cd->mcodebase + bref->branchpos,
- bref->branchpos,
- cd->mcodeptr - cd->mcodebase);
-
- MCODECHECK(512);
-
- M_MOV_IMM(0, REG_ITMP2_XPC); /* 10 bytes */
- dseg_adddata(cd, cd->mcodeptr);
- M_AADD_IMM32(bref->branchpos - 6, REG_ITMP2_XPC); /* 7 bytes */
-
- if (xcodeptr != NULL) {
- M_JMP_IMM(xcodeptr - cd->mcodeptr - 5);
-
- } else {
- xcodeptr = cd->mcodeptr;
-
- x86_64_lea_membase_reg(cd, RIP, -(((ptrint) cd->mcodeptr + 7) - (ptrint) cd->mcodebase), rd->argintregs[0]);
- M_MOV(REG_SP, rd->argintregs[1]);
- M_ALD(rd->argintregs[2], REG_SP, parentargs_base * 8);
- M_MOV(REG_ITMP2_XPC, rd->argintregs[3]);
-
- M_ASUB_IMM(2 * 8, REG_SP);
- M_AST(REG_ITMP2_XPC, REG_SP, 0 * 8);
-
- M_MOV_IMM((ptrint) stacktrace_inline_arithmeticexception,
- REG_ITMP3);
- M_CALL(REG_ITMP3);
-
- M_ALD(REG_ITMP2_XPC, REG_SP, 0 * 8);
- M_AADD_IMM(2 * 8, REG_SP);
-
- M_MOV_IMM((ptrint) asm_handle_exception, REG_ITMP3);
- M_JMP(REG_ITMP3);
- }
- }
-
- /* generate ArrayIndexOutOfBoundsException stubs */
-
- xcodeptr = NULL;
-
- for (bref = cd->xboundrefs; bref != NULL; bref = bref->next) {
- gen_resolvebranch(cd->mcodebase + bref->branchpos,
- bref->branchpos,
- cd->mcodeptr - cd->mcodebase);
-
- MCODECHECK(512);
-
- /* move index register into REG_ITMP1 */
-
- M_MOV(bref->reg, REG_ITMP1); /* 3 bytes */
-
- M_MOV_IMM(0, REG_ITMP2_XPC); /* 10 bytes */
- dseg_adddata(cd, cd->mcodeptr);
- M_AADD_IMM32(bref->branchpos - 6, REG_ITMP2_XPC); /* 7 bytes */
-
- if (xcodeptr != NULL) {
- M_JMP_IMM(xcodeptr - cd->mcodeptr - 5);
-
- } else {
- xcodeptr = cd->mcodeptr;
- x86_64_lea_membase_reg(cd, RIP, -(((ptrint) cd->mcodeptr + 7) - (ptrint) cd->mcodebase), rd->argintregs[0]);
- M_MOV(REG_SP, rd->argintregs[1]);
- M_ALD(rd->argintregs[2], REG_SP, parentargs_base * 8);
- M_MOV(REG_ITMP2_XPC, rd->argintregs[3]);
- M_MOV(REG_ITMP1, rd->argintregs[4]);
+ /* generate exception and patcher stubs */
- M_ASUB_IMM(2 * 8, REG_SP);
- M_AST(REG_ITMP2_XPC, REG_SP, 0 * 8);
-
- M_MOV_IMM((ptrint) stacktrace_inline_arrayindexoutofboundsexception,
- REG_ITMP3);
- M_CALL(REG_ITMP3);
-
- M_ALD(REG_ITMP2_XPC, REG_SP, 0 * 8);
- M_AADD_IMM(2 * 8, REG_SP);
-
- M_MOV_IMM((ptrint) asm_handle_exception, REG_ITMP3);
- M_JMP(REG_ITMP3);
- }
- }
+ {
+ exceptionref *eref;
+ patchref *pref;
+ ptrint mcode;
+ u1 *savedmcodeptr;
+ u1 *tmpmcodeptr;
- /* generate ArrayStoreException stubs */
+ savedmcodeptr = NULL;
- xcodeptr = NULL;
+ /* generate exception stubs */
- for (bref = cd->xstorerefs; bref != NULL; bref = bref->next) {
- gen_resolvebranch(cd->mcodebase + bref->branchpos,
- bref->branchpos,
- cd->mcodeptr - cd->mcodebase);
-
- MCODECHECK(512);
-
- M_MOV_IMM(0, REG_ITMP2_XPC); /* 10 bytes */
- dseg_adddata(cd, cd->mcodeptr);
- M_AADD_IMM32(bref->branchpos - 6, REG_ITMP2_XPC); /* 7 bytes */
-
- if (xcodeptr != NULL) {
- M_JMP_IMM(xcodeptr - cd->mcodeptr - 5);
-
- } else {
- xcodeptr = cd->mcodeptr;
-
- x86_64_lea_membase_reg(cd, RIP, -(((ptrint) cd->mcodeptr + 7) - (ptrint) cd->mcodebase), rd->argintregs[0]);
- M_MOV(REG_SP, rd->argintregs[1]);
- M_ALD(rd->argintregs[2], REG_SP, parentargs_base * 8);
- M_MOV(REG_ITMP2_XPC, rd->argintregs[3]);
-
- M_ASUB_IMM(2 * 8, REG_SP);
- M_AST(REG_ITMP2_XPC, REG_SP, 0 * 8);
+ for (eref = cd->exceptionrefs; eref != NULL; eref = eref->next) {
+ gen_resolvebranch(cd->mcodebase + eref->branchpos,
+ eref->branchpos,
+ cd->mcodeptr - cd->mcodebase);
- M_MOV_IMM((ptrint) stacktrace_inline_arraystoreexception,
- REG_ITMP3);
- M_CALL(REG_ITMP3);
+ MCODECHECK(512);
- M_ALD(REG_ITMP2_XPC, REG_SP, 0 * 8);
- M_AADD_IMM(2 * 8, REG_SP);
+ /* Check if the exception is an
+ ArrayIndexOutOfBoundsException. If so, move index register
+ into a4. */
- M_MOV_IMM((ptrint) asm_handle_exception, REG_ITMP3);
- M_JMP(REG_ITMP3);
- }
- }
+ if (eref->reg != -1)
+ M_MOV(eref->reg, rd->argintregs[4]);
- /* generate ClassCastException stubs */
+ /* calcuate exception address */
- xcodeptr = NULL;
-
- for (bref = cd->xcastrefs; bref != NULL; bref = bref->next) {
- gen_resolvebranch(cd->mcodebase + bref->branchpos,
- bref->branchpos,
- cd->mcodeptr - cd->mcodebase);
+ M_MOV_IMM(0, rd->argintregs[3]);
+ dseg_adddata(cd);
+ M_AADD_IMM32(eref->branchpos - 6, rd->argintregs[3]);
- MCODECHECK(512);
+ /* move function to call into REG_ITMP3 */
- M_MOV_IMM(0, REG_ITMP2_XPC); /* 10 bytes */
- dseg_adddata(cd, cd->mcodeptr);
- M_AADD_IMM32(bref->branchpos - 6, REG_ITMP2_XPC); /* 7 bytes */
+ M_MOV_IMM(eref->function, REG_ITMP3);
- if (xcodeptr != NULL) {
- M_JMP_IMM(xcodeptr - cd->mcodeptr - 5);
+ if (savedmcodeptr != NULL) {
+ M_JMP_IMM(savedmcodeptr - cd->mcodeptr - 5);
- } else {
- xcodeptr = cd->mcodeptr;
+ } else {
+ savedmcodeptr = cd->mcodeptr;
- x86_64_lea_membase_reg(cd, RIP, -(((ptrint) cd->mcodeptr + 7) - (ptrint) cd->mcodebase), rd->argintregs[0]);
- M_MOV(REG_SP, rd->argintregs[1]);
- M_ALD(rd->argintregs[2], REG_SP, parentargs_base * 8);
- M_MOV(REG_ITMP2_XPC, rd->argintregs[3]);
+ x86_64_lea_membase_reg(cd, RIP, -(((ptrint) cd->mcodeptr + 7) - (ptrint) cd->mcodebase), rd->argintregs[0]);
+ M_MOV(REG_SP, rd->argintregs[1]);
+ M_ALD(rd->argintregs[2], REG_SP, stackframesize * 8);
- M_ASUB_IMM(2 * 8, REG_SP);
- M_AST(REG_ITMP2_XPC, REG_SP, 0 * 8);
+ M_ASUB_IMM(2 * 8, REG_SP);
+ M_AST(rd->argintregs[3], REG_SP, 0 * 8); /* store XPC */
- M_MOV_IMM((ptrint) stacktrace_inline_classcastexception, REG_ITMP3);
- M_CALL(REG_ITMP3);
+ M_CALL(REG_ITMP3);
- M_ALD(REG_ITMP2_XPC, REG_SP, 0 * 8);
- M_AADD_IMM(2 * 8, REG_SP);
+ M_ALD(REG_ITMP2_XPC, REG_SP, 0 * 8);
+ M_AADD_IMM(2 * 8, REG_SP);
- M_MOV_IMM((ptrint) asm_handle_exception, REG_ITMP3);
- M_JMP(REG_ITMP3);
+ M_MOV_IMM(asm_handle_exception, REG_ITMP3);
+ M_JMP(REG_ITMP3);
+ }
}
- }
-
- /* generate NullpointerException stubs */
- xcodeptr = NULL;
-
- for (bref = cd->xnullrefs; bref != NULL; bref = bref->next) {
- gen_resolvebranch(cd->mcodebase + bref->branchpos,
- bref->branchpos,
- cd->mcodeptr - cd->mcodebase);
-
- MCODECHECK(512);
- M_MOV_IMM(0, REG_ITMP2_XPC); /* 10 bytes */
- dseg_adddata(cd, cd->mcodeptr);
- M_AADD_IMM32(bref->branchpos - 6, REG_ITMP2_XPC); /* 7 bytes */
+ /* generate code patching stub call code */
- if (xcodeptr != NULL) {
- M_JMP_IMM(xcodeptr - cd->mcodeptr - 5);
-
- } else {
- xcodeptr = cd->mcodeptr;
+ for (pref = cd->patchrefs; pref != NULL; pref = pref->next) {
+ /* check size of code segment */
- x86_64_lea_membase_reg(cd, RIP, -(((ptrint) cd->mcodeptr + 7) - (ptrint) cd->mcodebase), rd->argintregs[0]);
- M_MOV(REG_SP, rd->argintregs[1]);
- M_ALD(rd->argintregs[2], REG_SP, parentargs_base * 8);
- M_MOV(REG_ITMP2_XPC, rd->argintregs[3]);
+ MCODECHECK(512);
- M_ASUB_IMM(2 * 8, REG_SP);
- M_AST(REG_ITMP2_XPC, REG_SP, 0 * 8);
+ /* Get machine code which is patched back in later. A
+ `call rel32' is 5 bytes long (but read 8 bytes). */
- M_MOV_IMM((ptrint) stacktrace_inline_nullpointerexception,
- REG_ITMP3);
- M_CALL(REG_ITMP3);
+ savedmcodeptr = cd->mcodebase + pref->branchpos;
+ mcode = *((ptrint *) savedmcodeptr);
- M_ALD(REG_ITMP2_XPC, REG_SP, 0 * 8);
- M_AADD_IMM(2 * 8, REG_SP);
+ /* patch in `call rel32' to call the following code */
- M_MOV_IMM((ptrint) asm_handle_exception, REG_ITMP3);
- M_JMP(REG_ITMP3);
- }
- }
+ tmpmcodeptr = cd->mcodeptr; /* save current mcodeptr */
+ cd->mcodeptr = savedmcodeptr; /* set mcodeptr to patch position */
- /* generate exception check stubs */
+ M_CALL_IMM(tmpmcodeptr - (savedmcodeptr + PATCHER_CALL_SIZE));
- xcodeptr = NULL;
-
- for (bref = cd->xexceptionrefs; bref != NULL; bref = bref->next) {
- gen_resolvebranch(cd->mcodebase + bref->branchpos,
- bref->branchpos,
- cd->mcodeptr - cd->mcodebase);
+ cd->mcodeptr = tmpmcodeptr; /* restore the current mcodeptr */
- MCODECHECK(512);
+ /* move pointer to java_objectheader onto stack */
- M_MOV_IMM(0, REG_ITMP2_XPC); /* 10 bytes */
- dseg_adddata(cd, cd->mcodeptr);
- M_AADD_IMM32(bref->branchpos - 6, REG_ITMP2_XPC); /* 7 bytes */
+#if defined(USE_THREADS) && defined(NATIVE_THREADS)
+ /* create a virtual java_objectheader */
- if (xcodeptr != NULL) {
- M_JMP_IMM(xcodeptr - cd->mcodeptr - 5);
-
- } else {
- xcodeptr = cd->mcodeptr;
+ (void) dseg_addaddress(cd, get_dummyLR()); /* monitorPtr */
+ a = dseg_addaddress(cd, NULL); /* vftbl */
- x86_64_lea_membase_reg(cd, RIP, -(((ptrint) cd->mcodeptr + 7) - (ptrint) cd->mcodebase), rd->argintregs[0]);
- M_MOV(REG_SP, rd->argintregs[1]);
- M_ALD(rd->argintregs[2], REG_SP, parentargs_base * 8);
- M_MOV(REG_ITMP2_XPC, rd->argintregs[3]);
+ x86_64_lea_membase_reg(cd, RIP, -(((ptrint) cd->mcodeptr + 7) - (ptrint) cd->mcodebase) + a, REG_ITMP3);
+ M_PUSH(REG_ITMP3);
+#else
+ M_PUSH_IMM(0);
+#endif
- M_ASUB_IMM(2 * 8, REG_SP);
- M_AST(REG_ITMP2_XPC, REG_SP, 0 * 8);
+ /* move machine code bytes and classinfo pointer into registers */
- M_MOV_IMM((ptrint) stacktrace_inline_fillInStackTrace, REG_ITMP3);
- M_CALL(REG_ITMP3);
+ M_MOV_IMM(mcode, REG_ITMP3);
+ M_PUSH(REG_ITMP3);
+ M_MOV_IMM(pref->ref, REG_ITMP3);
+ M_PUSH(REG_ITMP3);
+ M_MOV_IMM(pref->disp, REG_ITMP3);
+ M_PUSH(REG_ITMP3);
- M_ALD(REG_ITMP2_XPC, REG_SP, 0 * 8);
- M_AADD_IMM(2 * 8, REG_SP);
+ M_MOV_IMM(pref->patcher, REG_ITMP3);
+ M_PUSH(REG_ITMP3);
- M_MOV_IMM((ptrint) asm_handle_exception, REG_ITMP3);
+ M_MOV_IMM(asm_wrapper_patcher, REG_ITMP3);
M_JMP(REG_ITMP3);
}
}
- /* generate code patching stub call code */
+ /* generate replacement-out stubs */
{
- patchref *pref;
- codegendata *tmpcd;
- ptrint mcode;
+ int i;
- tmpcd = DNEW(codegendata);
+ replacementpoint = jd->code->rplpoints;
- for (pref = cd->patchrefs; pref != NULL; pref = pref->next) {
- /* check size of code segment */
+ for (i = 0; i < jd->code->rplpointcount; ++i, ++replacementpoint) {
+ /* check code segment size */
MCODECHECK(512);
- /* Get machine code which is patched back in later. A */
- /* `call rel32' is 5 bytes long (but read 8 bytes). */
+ /* note start of stub code */
- xcodeptr = cd->mcodebase + pref->branchpos;
- mcode = *((ptrint *) xcodeptr);
+ replacementpoint->outcode = (u1*) (ptrint)(cd->mcodeptr - cd->mcodebase);
- /* patch in `call rel32' to call the following code */
-
- tmpcd->mcodeptr = xcodeptr; /* set dummy mcode pointer */
- x86_64_call_imm(tmpcd, cd->mcodeptr - (xcodeptr + 5));
-
- /* move pointer to java_objectheader onto stack */
-
-#if defined(USE_THREADS) && defined(NATIVE_THREADS)
- /* create a virtual java_objectheader */
-
- (void) dseg_addaddress(cd, get_dummyLR()); /* monitorPtr */
- a = dseg_addaddress(cd, NULL); /* vftbl */
-
- x86_64_lea_membase_reg(cd, RIP, -(((ptrint) cd->mcodeptr + 7) - (ptrint) cd->mcodebase) + a, REG_ITMP3);
- M_PUSH(REG_ITMP3);
-#else
- M_PUSH_IMM(0);
-#endif
+ /* make machine code for patching */
- /* move machine code bytes and classinfo pointer into registers */
+ disp = (ptrint)(replacementpoint->outcode - replacementpoint->pc) - 5;
+ replacementpoint->mcode = 0xe9 | ((u8)disp << 8);
- M_MOV_IMM((ptrint) mcode, REG_ITMP3);
- M_PUSH(REG_ITMP3);
- M_MOV_IMM((ptrint) pref->ref, REG_ITMP3);
- M_PUSH(REG_ITMP3);
- M_MOV_IMM((ptrint) pref->disp, REG_ITMP3);
+ /* push address of `rplpoint` struct */
+
+ M_MOV_IMM(replacementpoint, REG_ITMP3);
M_PUSH(REG_ITMP3);
- M_MOV_IMM((ptrint) pref->patcher, REG_ITMP3);
- M_PUSH(REG_ITMP3);
+ /* jump to replacement function */
- M_MOV_IMM((ptrint) asm_wrapper_patcher, REG_ITMP3);
+ M_MOV_IMM(asm_replacement_out, REG_ITMP3);
M_JMP(REG_ITMP3);
}
}
- }
-
- codegen_finish(m, cd, (s4) ((u1 *) cd->mcodeptr - cd->mcodebase));
+
+ codegen_finish(jd);
/* everything's ok */
*******************************************************************************/
-#define COMPILERSTUB_SIZE 23
+#define COMPILERSTUB_DATASIZE 2 * SIZEOF_VOID_P
+#define COMPILERSTUB_CODESIZE 7 + 7 + 3
+
+#define COMPILERSTUB_SIZE COMPILERSTUB_DATASIZE + COMPILERSTUB_CODESIZE
-functionptr createcompilerstub(methodinfo *m)
+
+u1 *createcompilerstub(methodinfo *m)
{
u1 *s; /* memory to hold the stub */
+ ptrint *d;
codegendata *cd;
s4 dumpsize;
s = CNEW(u1, COMPILERSTUB_SIZE);
+ /* set data pointer and code pointer */
+
+ d = (ptrint *) s;
+ s = s + COMPILERSTUB_DATASIZE;
+
/* mark start of dump memory area */
dumpsize = dump_size();
cd = DNEW(codegendata);
cd->mcodeptr = s;
+ /* Store the methodinfo* in the same place as in the methodheader
+ for compiled methods. */
+
+ d[0] = (ptrint) asm_call_jit_compiler;
+ d[1] = (ptrint) m;
+
/* code for the stub */
- x86_64_mov_imm_reg(cd, (ptrint) m, REG_ITMP1); /* pass method to compiler */
- x86_64_mov_imm_reg(cd, (ptrint) asm_call_jit_compiler, REG_ITMP3);
- x86_64_jmp_reg(cd, REG_ITMP3);
+ M_ALD(REG_ITMP1, RIP, -(7 * 1 + 1 * SIZEOF_VOID_P)); /* methodinfo */
+ M_ALD(REG_ITMP3, RIP, -(7 * 2 + 2 * SIZEOF_VOID_P)); /* compiler pointer */
+ M_JMP(REG_ITMP3);
-#if defined(STATISTICS)
+#if defined(ENABLE_STATISTICS)
if (opt_stat)
count_cstub_len += COMPILERSTUB_SIZE;
#endif
dump_release(dumpsize);
- return (functionptr) (ptrint) s;
+ return s;
}
*******************************************************************************/
-functionptr createnativestub(functionptr f, methodinfo *m, codegendata *cd,
- registerdata *rd, methoddesc *nmd)
+u1 *createnativestub(functionptr f, jitdata *jd, methoddesc *nmd)
{
- methoddesc *md;
- s4 stackframesize; /* size of stackframe if needed */
- s4 nativeparams;
- s4 i, j; /* count variables */
- s4 t;
- s4 s1, s2;
+ methodinfo *m;
+ codegendata *cd;
+ registerdata *rd;
+ methoddesc *md;
+ s4 stackframesize; /* size of stackframe if needed */
+ s4 nativeparams;
+ s4 i, j; /* count variables */
+ s4 t;
+ s4 s1, s2;
+
+ /* get required compiler data */
+
+ m = jd->m;
+ cd = jd->cd;
+ rd = jd->rd;
/* initialize variables */
md = m->parseddesc;
nativeparams = (m->flags & ACC_STATIC) ? 2 : 1;
-
/* calculate stack frame size */
stackframesize =
if (!(stackframesize & 0x1)) /* keep stack 16-byte aligned */
stackframesize++;
-
/* create method header */
(void) dseg_addaddress(cd, m); /* MethodPointer */
(void) dseg_addlinenumbertablesize(cd);
(void) dseg_adds4(cd, 0); /* ExTableSize */
+ /* generate native method profiling code */
- /* initialize mcode variables */
-
- cd->mcodeptr = (u1 *) cd->mcodebase;
- cd->mcodeend = (s4 *) (cd->mcodebase + cd->mcodesize);
+ if (opt_prof) {
+ /* count frequency */
+ M_MOV_IMM(m, REG_ITMP2);
+ M_IINC_MEMBASE(REG_ITMP2, OFFSET(methodinfo, frequency));
+ }
/* generate stub code */
M_ASUB_IMM(stackframesize * 8, REG_SP);
- if (runverbose) {
+#if !defined(NDEBUG)
+ /* generate call trace */
+
+ if (opt_verbosecall) {
/* save integer and float argument registers */
- for (i = 0, j = 0; i < md->paramcount && i < INT_ARG_CNT; i++)
+ for (i = 0, j = 0; i < md->paramcount && j < INT_ARG_CNT; i++)
if (IS_INT_LNG_TYPE(md->paramtypes[i].type))
M_LST(rd->argintregs[j++], REG_SP, (1 + i) * 8);
- for (i = 0, j = 0; i < md->paramcount && i < FLT_ARG_CNT; i++)
+ for (i = 0, j = 0; i < md->paramcount && j < FLT_ARG_CNT; i++)
if (IS_FLT_DBL_TYPE(md->paramtypes[i].type))
M_DST(rd->argfltregs[j++], REG_SP, (1 + INT_ARG_CNT + i) * 8);
/* show integer hex code for float arguments */
- for (i = 0, j = 0; i < md->paramcount && i < INT_ARG_CNT; i++) {
- /* if the paramtype is a float, we have to right shift all */
- /* following integer registers */
+ for (i = 0, j = 0; i < md->paramcount && j < INT_ARG_CNT; i++) {
+ /* if the paramtype is a float, we have to right shift all
+ following integer registers */
if (IS_FLT_DBL_TYPE(md->paramtypes[i].type)) {
for (s1 = INT_ARG_CNT - 2; s1 >= i; s1--)
}
}
- x86_64_mov_imm_reg(cd, (ptrint) m, REG_ITMP1);
- x86_64_mov_reg_membase(cd, REG_ITMP1, REG_SP, 0 * 8);
- x86_64_mov_imm_reg(cd, (ptrint) builtin_trace_args, REG_ITMP1);
- x86_64_call_reg(cd, REG_ITMP1);
+ M_MOV_IMM(m, REG_ITMP1);
+ M_AST(REG_ITMP1, REG_SP, 0 * 8);
+ M_MOV_IMM(builtin_trace_args, REG_ITMP1);
+ M_CALL(REG_ITMP1);
/* restore integer and float argument registers */
- for (i = 0, j = 0; i < md->paramcount && i < INT_ARG_CNT; i++)
+ for (i = 0, j = 0; i < md->paramcount && j < INT_ARG_CNT; i++)
if (IS_INT_LNG_TYPE(md->paramtypes[i].type))
M_LLD(rd->argintregs[j++], REG_SP, (1 + i) * 8);
- for (i = 0, j = 0; i < md->paramcount && i < FLT_ARG_CNT; i++)
+ for (i = 0, j = 0; i < md->paramcount && j < FLT_ARG_CNT; i++)
if (IS_FLT_DBL_TYPE(md->paramtypes[i].type))
M_DLD(rd->argfltregs[j++], REG_SP, (1 + INT_ARG_CNT + i) * 8);
}
-
+#endif /* !defined(NDEBUG) */
/* get function address (this must happen before the stackframeinfo) */
-#if !defined(ENABLE_STATICVM)
+#if !defined(WITH_STATIC_CLASSPATH)
if (f == NULL) {
- codegen_addpatchref(cd, cd->mcodeptr, PATCHER_resolve_native, m, 0);
+ codegen_addpatchref(cd, PATCHER_resolve_native, m, 0);
if (opt_showdisassemble) {
M_NOP; M_NOP; M_NOP; M_NOP; M_NOP;
}
#endif
- M_MOV_IMM((ptrint) f, REG_ITMP3);
+ M_MOV_IMM(f, REG_ITMP3);
/* save integer and float argument registers */
- for (i = 0, j = 0; i < md->paramcount && i < INT_ARG_CNT; i++)
+ for (i = 0, j = 0; i < md->paramcount && j < INT_ARG_CNT; i++)
if (IS_INT_LNG_TYPE(md->paramtypes[i].type))
M_LST(rd->argintregs[j++], REG_SP, i * 8);
- for (i = 0, j = 0; i < md->paramcount && i < FLT_ARG_CNT; i++)
+ for (i = 0, j = 0; i < md->paramcount && j < FLT_ARG_CNT; i++)
if (IS_FLT_DBL_TYPE(md->paramtypes[i].type))
M_DST(rd->argfltregs[j++], REG_SP, (INT_ARG_CNT + i) * 8);
x86_64_lea_membase_reg(cd, RIP, -(((ptrint) cd->mcodeptr + 7) - (ptrint) cd->mcodebase), rd->argintregs[1]);
M_ALEA(REG_SP, stackframesize * 8 + SIZEOF_VOID_P, rd->argintregs[2]);
M_ALD(rd->argintregs[3], REG_SP, stackframesize * 8);
- M_MOV_IMM((ptrint) codegen_start_native_call, REG_ITMP1);
+ M_MOV_IMM(codegen_start_native_call, REG_ITMP1);
M_CALL(REG_ITMP1);
-
- STATS({
- x86_64_mov_imm_reg(cd, (ptrint) nativeinvokation, REG_ITMP1);
- x86_64_call_reg(cd, REG_ITMP1);
- })
/* restore integer and float argument registers */
- for (i = 0, j = 0; i < md->paramcount && i < INT_ARG_CNT; i++)
+ for (i = 0, j = 0; i < md->paramcount && j < INT_ARG_CNT; i++)
if (IS_INT_LNG_TYPE(md->paramtypes[i].type))
M_LLD(rd->argintregs[j++], REG_SP, i * 8);
- for (i = 0, j = 0; i < md->paramcount && i < FLT_ARG_CNT; i++)
+ for (i = 0, j = 0; i < md->paramcount && j < FLT_ARG_CNT; i++)
if (IS_FLT_DBL_TYPE(md->paramtypes[i].type))
M_DLD(rd->argfltregs[j++], REG_SP, (INT_ARG_CNT + i) * 8);
/* put class into second argument register */
if (m->flags & ACC_STATIC)
- M_MOV_IMM((ptrint) m->class, rd->argintregs[1]);
+ M_MOV_IMM(m->class, rd->argintregs[1]);
/* put env into first argument register */
- M_MOV_IMM((ptrint) &env, rd->argintregs[0]);
+ M_MOV_IMM(_Jv_env, rd->argintregs[0]);
/* do the native function call */
/* save return value */
- if (IS_INT_LNG_TYPE(md->returntype.type))
- M_LST(REG_RESULT, REG_SP, 0 * 8);
- else
- M_DST(REG_FRESULT, REG_SP, 0 * 8);
+ if (md->returntype.type != TYPE_VOID) {
+ if (IS_INT_LNG_TYPE(md->returntype.type))
+ M_LST(REG_RESULT, REG_SP, 0 * 8);
+ else
+ M_DST(REG_FRESULT, REG_SP, 0 * 8);
+ }
/* remove native stackframe info */
M_ALEA(REG_SP, stackframesize * 8, rd->argintregs[0]);
- M_MOV_IMM((ptrint) codegen_finish_native_call, REG_ITMP1);
+ M_MOV_IMM(codegen_finish_native_call, REG_ITMP1);
M_CALL(REG_ITMP1);
+#if !defined(NDEBUG)
/* generate call trace */
- if (runverbose) {
+ if (opt_verbosecall) {
/* just restore the value we need, don't care about the other */
- if (IS_INT_LNG_TYPE(md->returntype.type))
- M_LLD(REG_RESULT, REG_SP, 0 * 8);
- else
- M_DLD(REG_FRESULT, REG_SP, 0 * 8);
+ if (md->returntype.type != TYPE_VOID) {
+ if (IS_INT_LNG_TYPE(md->returntype.type))
+ M_LLD(REG_RESULT, REG_SP, 0 * 8);
+ else
+ M_DLD(REG_FRESULT, REG_SP, 0 * 8);
+ }
- M_MOV_IMM((ptrint) m, rd->argintregs[0]);
+ M_MOV_IMM(m, rd->argintregs[0]);
M_MOV(REG_RESULT, rd->argintregs[1]);
M_FLTMOVE(REG_FRESULT, rd->argfltregs[0]);
M_FLTMOVE(REG_FRESULT, rd->argfltregs[1]);
- M_MOV_IMM((ptrint) builtin_displaymethodstop, REG_ITMP1);
+ M_MOV_IMM(builtin_displaymethodstop, REG_ITMP1);
M_CALL(REG_ITMP1);
}
+#endif /* !defined(NDEBUG) */
/* check for exception */
#if defined(USE_THREADS) && defined(NATIVE_THREADS)
- M_MOV_IMM((ptrint) builtin_get_exceptionptrptr, REG_ITMP3);
+ M_MOV_IMM(builtin_get_exceptionptrptr, REG_ITMP3);
M_CALL(REG_ITMP3);
#else
- M_MOV_IMM((ptrint) &_no_threads_exceptionptr, REG_RESULT);
+ M_MOV_IMM(&_no_threads_exceptionptr, REG_RESULT);
#endif
- M_ALD(REG_ITMP3, REG_RESULT, 0);
-
+ M_ALD(REG_ITMP2, REG_RESULT, 0);
/* restore return value */
- if (IS_INT_LNG_TYPE(md->returntype.type))
- M_LLD(REG_RESULT, REG_SP, 0 * 8);
- else
- M_DLD(REG_FRESULT, REG_SP, 0 * 8);
+ if (md->returntype.type != TYPE_VOID) {
+ if (IS_INT_LNG_TYPE(md->returntype.type))
+ M_LLD(REG_RESULT, REG_SP, 0 * 8);
+ else
+ M_DLD(REG_FRESULT, REG_SP, 0 * 8);
+ }
/* test for exception */
- M_TEST(REG_ITMP3);
+ M_TEST(REG_ITMP2);
M_BNE(7 + 1);
/* remove stackframe */
/* handle exception */
#if defined(USE_THREADS) && defined(NATIVE_THREADS)
- M_LST(REG_ITMP3, REG_SP, 0 * 8);
- M_MOV_IMM((ptrint) builtin_get_exceptionptrptr, REG_ITMP3);
+ M_LST(REG_ITMP2, REG_SP, 0 * 8);
+ M_MOV_IMM(builtin_get_exceptionptrptr, REG_ITMP3);
M_CALL(REG_ITMP3);
- x86_64_mov_imm_membase(cd, 0, REG_RESULT, 0);
+ M_AST_IMM32(0, REG_RESULT, 0); /* clear exception pointer */
M_LLD(REG_ITMP1_XPTR, REG_SP, 0 * 8);
#else
M_MOV(REG_ITMP3, REG_ITMP1_XPTR);
- M_MOV_IMM((ptrint) &_no_threads_exceptionptr, REG_ITMP3);
- M_XOR(REG_ITMP2, REG_ITMP2);
- M_AST(REG_ITMP2, REG_ITMP3, 0); /* clear exception pointer */
+ M_MOV_IMM(&_no_threads_exceptionptr, REG_ITMP3);
+ M_AST_IMM32(0, REG_ITMP3, 0); /* clear exception pointer */
#endif
/* remove stackframe */
M_LLD(REG_ITMP2_XPC, REG_SP, 0 * 8); /* get return address from stack */
M_ASUB_IMM(3, REG_ITMP2_XPC); /* callq */
- M_MOV_IMM((ptrint) asm_handle_nat_exception, REG_ITMP3);
+ M_MOV_IMM(asm_handle_nat_exception, REG_ITMP3);
M_JMP(REG_ITMP3);
/* process patcher calls **************************************************/
{
- u1 *xcodeptr;
- patchref *pref;
- codegendata *tmpcd;
- ptrint mcode;
+ patchref *pref;
+ ptrint mcode;
+ u1 *savedmcodeptr;
+ u1 *tmpmcodeptr;
#if defined(USE_THREADS) && defined(NATIVE_THREADS)
- s4 disp;
+ s4 disp;
#endif
- tmpcd = DNEW(codegendata);
-
for (pref = cd->patchrefs; pref != NULL; pref = pref->next) {
- /* Get machine code which is patched back in later. A */
- /* `call rel32' is 5 bytes long (but read 8 bytes). */
+ /* Get machine code which is patched back in later. A
+ `call rel32' is 5 bytes long (but read 8 bytes). */
- xcodeptr = cd->mcodebase + pref->branchpos;
- mcode = *((ptrint *) xcodeptr);
+ savedmcodeptr = cd->mcodebase + pref->branchpos;
+ mcode = *((ptrint *) savedmcodeptr);
/* patch in `call rel32' to call the following code */
- tmpcd->mcodeptr = xcodeptr; /* set dummy mcode pointer */
- x86_64_call_imm(tmpcd, cd->mcodeptr - (xcodeptr + 5));
+ tmpmcodeptr = cd->mcodeptr; /* save current mcodeptr */
+ cd->mcodeptr = savedmcodeptr; /* set mcodeptr to patch position */
+
+ M_CALL_IMM(tmpmcodeptr - (savedmcodeptr + PATCHER_CALL_SIZE));
+
+ cd->mcodeptr = tmpmcodeptr; /* restore the current mcodeptr */
/* move pointer to java_objectheader onto stack */
/* move machine code bytes and classinfo pointer into registers */
- M_MOV_IMM((ptrint) mcode, REG_ITMP3);
+ M_MOV_IMM(mcode, REG_ITMP3);
M_PUSH(REG_ITMP3);
- M_MOV_IMM((ptrint) pref->ref, REG_ITMP3);
+ M_MOV_IMM(pref->ref, REG_ITMP3);
M_PUSH(REG_ITMP3);
- M_MOV_IMM((ptrint) pref->disp, REG_ITMP3);
+ M_MOV_IMM(pref->disp, REG_ITMP3);
M_PUSH(REG_ITMP3);
- M_MOV_IMM((ptrint) pref->patcher, REG_ITMP3);
+ M_MOV_IMM(pref->patcher, REG_ITMP3);
M_PUSH(REG_ITMP3);
- M_MOV_IMM((ptrint) asm_wrapper_patcher, REG_ITMP3);
+ M_MOV_IMM(asm_wrapper_patcher, REG_ITMP3);
M_JMP(REG_ITMP3);
}
}
- codegen_finish(m, cd, (s4) ((u1 *) cd->mcodeptr - cd->mcodebase));
+ codegen_finish(jd);
- return m->entrypoint;
+ return jd->code->entrypoint;
}
* c-basic-offset: 4
* tab-width: 4
* End:
+ * vim:noexpandtab:sw=4:ts=4:
*/
projects / cacao.git / blobdiff