This module generates MIPS machine code for a sequence of
intermediate code commands (ICMDs).
- $Id: codegen.c 4760 2006-04-12 20:06:23Z edwin $
+ $Id: codegen.c 4776 2006-04-14 12:40:49Z twisti $
*/
#include "vm/jit/asmpart.h"
#include "vm/jit/codegen-common.h"
#include "vm/jit/dseg.h"
+#include "vm/jit/emit.h"
#include "vm/jit/jit.h"
#include "vm/jit/patcher.h"
#include "vm/jit/reg.h"
s4 len, s1, s2, s3, d, disp;
ptrint a;
s4 parentargs_base;
- s4 *mcodeptr;
stackptr src;
varinfo *var;
basicblock *bptr;
(void) dseg_addaddress(cd, ex->catchtype.cls);
}
- /* initialize mcode variables */
-
- mcodeptr = (s4 *) cd->mcodeptr;
-
- /* initialize the last patcher pointer */
-
- cd->lastmcodeptr = (u1 *) mcodeptr;
-
/* create stack frame (if necessary) */
if (parentargs_base)
} else {
M_BEQZ(rd->argintregs[0], 0);
- codegen_add_nullpointerexception_ref(cd, mcodeptr);
+ codegen_add_nullpointerexception_ref(cd, cd->mcodeptr);
p = dseg_addaddress(cd, BUILTIN_monitorenter);
M_ALD(REG_ITMP3, REG_PV, p);
M_JSR(REG_RA, REG_ITMP3);
if (bptr->bitflags & BBFLAG_REPLACEMENT && bptr->flags >= BBREACHED) {
/* 8-byte align pc */
- if ((ptrint)mcodeptr & 4) {
+ if ((ptrint)cd->mcodeptr & 4) {
M_NOP;
}
- replacementpoint->pc = (u1*)(ptrint)((u1*)mcodeptr - cd->mcodebase);
+ replacementpoint->pc = (u1*)(ptrint)((u1*)cd->mcodeptr - cd->mcodebase);
replacementpoint++;
- assert(cd->lastmcodeptr <= (u1*)mcodeptr);
+ assert(cd->lastmcodeptr <= (u1*)cd->mcodeptr);
cd->lastmcodeptr = (u1*)cd->mcodeptr + 2*4; /* br + delay slot */
}
/* store relative start of block */
- bptr->mpc = (s4) ((u1 *) mcodeptr - cd->mcodebase);
+ bptr->mpc = (s4) ((u1 *) cd->mcodeptr - cd->mcodebase);
if (bptr->flags >= BBREACHED) {
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;
}
if ((len == 0) && (bptr->type != BBTYPE_STD)) {
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 = codegen_reg_of_var(rd, 0, src, REG_IFTMP);
} else {
M_DLD(d, REG_SP, rd->interfaces[len][s2].regoff * 8);
}
- store_reg_to_var_flt(src, d);
+ emit_store(jd, NULL, src, d);
} else {
if (!(rd->interfaces[len][s2].flags & INMEMORY)) {
} else {
M_LLD(d, REG_SP, rd->interfaces[len][s2].regoff * 8);
}
- store_reg_to_var_int(src, d);
+ emit_store(jd, NULL, src, d);
}
}
}
for (iptr = bptr->iinstr; len > 0; src = iptr->dst, len--, iptr++) {
if (iptr->line != currentline) {
- dseg_addlinenumber(cd, iptr->line, (u1 *) mcodeptr);
+ dseg_addlinenumber(cd, iptr->line, (u1 *) cd->mcodeptr);
currentline = iptr->line;
}
case ICMD_CHECKNULL: /* ..., objectref ==> ..., objectref */
- var_to_reg_int(s1, src, REG_ITMP1);
+ s1 = emit_load_s1(jd, iptr, src, REG_ITMP1);
M_BEQZ(s1, 0);
- codegen_add_nullpointerexception_ref(cd, mcodeptr);
+ codegen_add_nullpointerexception_ref(cd, cd->mcodeptr);
M_NOP;
break;
d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP1);
ICONST(d, iptr->val.i);
- store_reg_to_var_int(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_LCONST: /* ... ==> ..., constant */
d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP1);
LCONST(d, iptr->val.l);
- store_reg_to_var_int(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_FCONST: /* ... ==> ..., constant */
d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_FTMP1);
disp = dseg_addfloat(cd, iptr->val.f);
M_FLD(d, REG_PV, disp);
- store_reg_to_var_flt(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_DCONST: /* ... ==> ..., constant */
d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_FTMP1);
disp = dseg_adddouble(cd, iptr->val.d);
M_DLD(d, REG_PV, disp);
- store_reg_to_var_flt (iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_ACONST: /* ... ==> ..., constant */
if ((iptr->target != NULL) && (iptr->val.a == NULL)) {
disp = dseg_addaddress(cd, iptr->val.a);
- codegen_addpatchref(cd, mcodeptr,
+ codegen_addpatchref(cd, cd->mcodeptr,
PATCHER_aconst,
(unresolved_class *) iptr->target, disp);
M_ALD(d, REG_PV, disp);
}
}
- store_reg_to_var_int(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
} else {
M_INTMOVE(var->regoff,d);
}
- store_reg_to_var_int(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_FLOAD: /* ... ==> ..., content of local variable */
M_CCFLTMOVE(var->type, t2, var->regoff, d);
}
}
- store_reg_to_var_flt(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
break;
var = &(rd->locals[iptr->op1][iptr->opc - ICMD_ISTORE]);
if (var->flags & INMEMORY) {
- var_to_reg_int(s1, src, REG_ITMP1);
+ s1 = emit_load_s1(jd, iptr, src, REG_ITMP1);
M_LST(s1, REG_SP, 8 * var->regoff);
} else {
- var_to_reg_int(s1, src, var->regoff);
+ s1 = emit_load_s1(jd, iptr, src, var->regoff);
M_INTMOVE(s1, var->regoff);
}
break;
{
int t1 = ((iptr->opc == ICMD_FSTORE) ? TYPE_FLT : TYPE_DBL);
if (var->flags & INMEMORY) {
- var_to_reg_flt(s1, src, REG_FTMP1);
+ s1 = emit_load_s1(jd, iptr, src, REG_FTMP1);
M_CCFST(t1, var->type, s1, REG_SP, 8 * var->regoff);
} else {
- var_to_reg_flt(s1, src, var->regoff);
+ s1 = emit_load_s1(jd, iptr, src, var->regoff);
M_CCFLTMOVE(t1, var->type, s1, var->regoff);
}
}
case ICMD_INEG: /* ..., value ==> ..., - value */
- var_to_reg_int(s1, src, REG_ITMP1);
+ s1 = emit_load_s1(jd, iptr, src, REG_ITMP1);
d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP2);
M_ISUB(REG_ZERO, s1, d);
- store_reg_to_var_int(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_LNEG: /* ..., value ==> ..., - value */
- var_to_reg_int(s1, src, REG_ITMP1);
+ s1 = emit_load_s1(jd, iptr, src, REG_ITMP1);
d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP2);
M_LSUB(REG_ZERO, s1, d);
- store_reg_to_var_int(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_I2L: /* ..., value ==> ..., value */
- var_to_reg_int(s1, src, REG_ITMP1);
+ s1 = emit_load_s1(jd, iptr, src, REG_ITMP1);
d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP2);
M_INTMOVE(s1, 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);
+ s1 = emit_load_s1(jd, iptr, src, REG_ITMP1);
d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP2);
M_ISLL_IMM(s1, 0, d );
- store_reg_to_var_int(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_INT2BYTE: /* ..., value ==> ..., value */
- var_to_reg_int(s1, src, REG_ITMP1);
+ s1 = emit_load_s1(jd, iptr, src, REG_ITMP1);
d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP2);
M_LSLL_IMM(s1, 56, d);
M_LSRA_IMM( d, 56, d);
- store_reg_to_var_int(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_INT2CHAR: /* ..., value ==> ..., value */
- var_to_reg_int(s1, src, REG_ITMP1);
+ s1 = emit_load_s1(jd, iptr, src, REG_ITMP1);
d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP2);
M_CZEXT(s1, d);
- store_reg_to_var_int(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_INT2SHORT: /* ..., value ==> ..., value */
- var_to_reg_int(s1, src, REG_ITMP1);
+ s1 = emit_load_s1(jd, iptr, src, REG_ITMP1);
d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP2);
M_LSLL_IMM(s1, 48, d);
M_LSRA_IMM( d, 48, d);
- store_reg_to_var_int(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_IADD: /* ..., val1, val2 ==> ..., val1 + val2 */
- 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);
d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP2);
M_IADD(s1, s2, d);
- store_reg_to_var_int(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_IADDCONST: /* ..., value ==> ..., value + constant */
/* val.i = constant */
- var_to_reg_int(s1, src, REG_ITMP1);
+ s1 = emit_load_s1(jd, iptr, src, REG_ITMP1);
d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP2);
if ((iptr->val.i >= -32768) && (iptr->val.i <= 32767)) {
M_IADD_IMM(s1, iptr->val.i, d);
ICONST(REG_ITMP2, iptr->val.i);
M_IADD(s1, REG_ITMP2, d);
}
- store_reg_to_var_int(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_LADD: /* ..., val1, val2 ==> ..., val1 + val2 */
- 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);
d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP2);
M_LADD(s1, s2, d);
- store_reg_to_var_int(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_LADDCONST: /* ..., value ==> ..., value + constant */
/* val.l = constant */
- var_to_reg_int(s1, src, REG_ITMP1);
+ s1 = emit_load_s1(jd, iptr, src, REG_ITMP1);
d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP2);
if ((iptr->val.l >= -32768) && (iptr->val.l <= 32767)) {
M_LADD_IMM(s1, iptr->val.l, d);
LCONST(REG_ITMP2, iptr->val.l);
M_LADD(s1, REG_ITMP2, d);
}
- store_reg_to_var_int(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_ISUB: /* ..., val1, val2 ==> ..., val1 - val2 */
- 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);
d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP2);
M_ISUB(s1, s2, d);
- store_reg_to_var_int(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_ISUBCONST: /* ..., value ==> ..., value + constant */
/* val.i = constant */
- var_to_reg_int(s1, src, REG_ITMP1);
+ s1 = emit_load_s1(jd, iptr, src, REG_ITMP1);
d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP2);
if ((iptr->val.i >= -32767) && (iptr->val.i <= 32768)) {
M_IADD_IMM(s1, -iptr->val.i, d);
ICONST(REG_ITMP2, iptr->val.i);
M_ISUB(s1, REG_ITMP2, d);
}
- store_reg_to_var_int(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_LSUB: /* ..., val1, val2 ==> ..., val1 - val2 */
- 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);
d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP2);
M_LSUB(s1, s2, d);
- store_reg_to_var_int(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_LSUBCONST: /* ..., value ==> ..., value - constant */
/* val.l = constant */
- var_to_reg_int(s1, src, REG_ITMP1);
+ s1 = emit_load_s1(jd, iptr, src, REG_ITMP1);
d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP2);
if ((iptr->val.l >= -32767) && (iptr->val.l <= 32768)) {
M_LADD_IMM(s1, -iptr->val.l, d);
LCONST(REG_ITMP2, iptr->val.l);
M_LSUB(s1, REG_ITMP2, d);
}
- store_reg_to_var_int(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_IMUL: /* ..., val1, val2 ==> ..., val1 * val2 */
- 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);
d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP2);
M_IMUL(s1, s2);
M_MFLO(d);
M_NOP;
M_NOP;
- store_reg_to_var_int(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_IMULCONST: /* ..., value ==> ..., value * constant */
/* val.i = constant */
- var_to_reg_int(s1, src, REG_ITMP1);
+ s1 = emit_load_s1(jd, iptr, src, REG_ITMP1);
d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP2);
ICONST(REG_ITMP2, iptr->val.i);
M_IMUL(s1, REG_ITMP2);
M_MFLO(d);
M_NOP;
M_NOP;
- store_reg_to_var_int(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_LMUL: /* ..., val1, val2 ==> ..., val1 * val2 */
- 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);
d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP2);
M_LMUL(s1, s2);
M_MFLO(d);
M_NOP;
M_NOP;
- store_reg_to_var_int(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_LMULCONST: /* ..., value ==> ..., value * constant */
/* val.l = constant */
- var_to_reg_int(s1, src, REG_ITMP1);
+ s1 = emit_load_s1(jd, iptr, src, REG_ITMP1);
d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP2);
LCONST(REG_ITMP2, iptr->val.l);
M_LMUL(s1, REG_ITMP2);
M_MFLO(d);
M_NOP;
M_NOP;
- store_reg_to_var_int(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_IDIV: /* ..., val1, val2 ==> ..., val1 / val2 */
- 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);
d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP2);
gen_div_check(s2);
M_IDIV(s1, s2);
M_MFLO(d);
M_NOP;
M_NOP;
- store_reg_to_var_int(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_LDIV: /* ..., val1, val2 ==> ..., val1 / val2 */
- 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);
d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP2);
gen_div_check(s2);
M_LDIV(s1, s2);
M_MFLO(d);
M_NOP;
M_NOP;
- store_reg_to_var_int(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_IREM: /* ..., val1, val2 ==> ..., val1 % val2 */
- 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);
d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP2);
gen_div_check(s2);
M_IDIV(s1, s2);
M_MFHI(d);
M_NOP;
M_NOP;
- store_reg_to_var_int(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_LREM: /* ..., val1, val2 ==> ..., val1 % val2 */
- 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);
d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP2);
gen_div_check(s2);
M_LDIV(s1, s2);
M_MFHI(d);
M_NOP;
M_NOP;
- store_reg_to_var_int(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_IDIVPOW2: /* ..., value ==> ..., value << constant */
case ICMD_LDIVPOW2: /* val.i = constant */
- var_to_reg_int(s1, src, REG_ITMP1);
+ s1 = emit_load_s1(jd, iptr, src, REG_ITMP1);
d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP2);
M_LSRA_IMM(s1, 63, REG_ITMP2);
M_LSRL_IMM(REG_ITMP2, 64 - iptr->val.i, REG_ITMP2);
M_LADD(s1, REG_ITMP2, REG_ITMP2);
M_LSRA_IMM(REG_ITMP2, iptr->val.i, d);
- store_reg_to_var_int(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_ISHL: /* ..., val1, val2 ==> ..., val1 << val2 */
- 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);
d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP2);
M_ISLL(s1, s2, d);
- store_reg_to_var_int(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_ISHLCONST: /* ..., value ==> ..., value << constant */
/* val.i = constant */
- var_to_reg_int(s1, src, REG_ITMP1);
+ s1 = emit_load_s1(jd, iptr, src, REG_ITMP1);
d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP2);
M_ISLL_IMM(s1, iptr->val.i, d);
- store_reg_to_var_int(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_ISHR: /* ..., val1, val2 ==> ..., val1 >> val2 */
- 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);
d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP2);
M_ISRA(s1, s2, d);
- store_reg_to_var_int(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_ISHRCONST: /* ..., value ==> ..., value >> constant */
/* val.i = constant */
- var_to_reg_int(s1, src, REG_ITMP1);
+ s1 = emit_load_s1(jd, iptr, src, REG_ITMP1);
d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP2);
M_ISRA_IMM(s1, iptr->val.i, d);
- store_reg_to_var_int(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_IUSHR: /* ..., val1, val2 ==> ..., val1 >>> val2 */
- 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);
d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP2);
M_ISRL(s1, s2, d);
- store_reg_to_var_int(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_IUSHRCONST: /* ..., value ==> ..., value >>> constant */
/* val.i = constant */
- var_to_reg_int(s1, src, REG_ITMP1);
+ s1 = emit_load_s1(jd, iptr, src, REG_ITMP1);
d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP2);
M_ISRL_IMM(s1, iptr->val.i, d);
- store_reg_to_var_int(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_LSHL: /* ..., val1, val2 ==> ..., val1 << val2 */
- 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);
d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP2);
M_LSLL(s1, s2, d);
- store_reg_to_var_int(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_LSHLCONST: /* ..., value ==> ..., value << constant */
/* val.i = constant */
- var_to_reg_int(s1, src, REG_ITMP1);
+ s1 = emit_load_s1(jd, iptr, src, REG_ITMP1);
d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP2);
M_LSLL_IMM(s1, iptr->val.i, d);
- store_reg_to_var_int(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_LSHR: /* ..., val1, val2 ==> ..., val1 >> val2 */
- 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);
d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP2);
M_LSRA(s1, s2, d);
- store_reg_to_var_int(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_LSHRCONST: /* ..., value ==> ..., value >> constant */
/* val.i = constant */
- var_to_reg_int(s1, src, REG_ITMP1);
+ s1 = emit_load_s1(jd, iptr, src, REG_ITMP1);
d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP2);
M_LSRA_IMM(s1, iptr->val.i, d);
- store_reg_to_var_int(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_LUSHR: /* ..., val1, val2 ==> ..., val1 >>> val2 */
- 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);
d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP2);
M_LSRL(s1, s2, d);
- store_reg_to_var_int(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_LUSHRCONST: /* ..., value ==> ..., value >>> constant */
/* val.i = constant */
- var_to_reg_int(s1, src, REG_ITMP1);
+ s1 = emit_load_s1(jd, iptr, src, REG_ITMP1);
d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP2);
M_LSRL_IMM(s1, iptr->val.i, d);
- store_reg_to_var_int(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_IAND: /* ..., val1, val2 ==> ..., val1 & val2 */
case ICMD_LAND:
- 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);
d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP2);
M_AND(s1, s2, d);
- store_reg_to_var_int(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_IANDCONST: /* ..., value ==> ..., value & constant */
/* val.i = constant */
- var_to_reg_int(s1, src, REG_ITMP1);
+ s1 = emit_load_s1(jd, iptr, src, REG_ITMP1);
d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP2);
if ((iptr->val.i >= 0) && (iptr->val.i <= 0xffff)) {
M_AND_IMM(s1, iptr->val.i, d);
ICONST(REG_ITMP2, iptr->val.i);
M_AND(s1, REG_ITMP2, 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);
+ 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_MOV(s1, REG_ITMP1);
M_AND(d, REG_ITMP2, d);
}
M_ISUB(REG_ZERO, d, d);
- store_reg_to_var_int(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_LANDCONST: /* ..., value ==> ..., value & constant */
/* val.l = constant */
- var_to_reg_int(s1, src, REG_ITMP1);
+ s1 = emit_load_s1(jd, iptr, src, REG_ITMP1);
d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP2);
if ((iptr->val.l >= 0) && (iptr->val.l <= 0xffff)) {
M_AND_IMM(s1, iptr->val.l, d);
LCONST(REG_ITMP2, iptr->val.l);
M_AND(s1, REG_ITMP2, 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);
+ 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_MOV(s1, REG_ITMP1);
M_AND(d, REG_ITMP2, d);
}
M_LSUB(REG_ZERO, d, d);
- store_reg_to_var_int(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_IOR: /* ..., val1, val2 ==> ..., val1 | val2 */
case ICMD_LOR:
- 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);
d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP2);
M_OR(s1,s2, d);
- store_reg_to_var_int(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_IORCONST: /* ..., value ==> ..., value | constant */
/* val.i = constant */
- var_to_reg_int(s1, src, REG_ITMP1);
+ s1 = emit_load_s1(jd, iptr, src, REG_ITMP1);
d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP2);
if ((iptr->val.i >= 0) && (iptr->val.i <= 0xffff)) {
M_OR_IMM(s1, iptr->val.i, d);
ICONST(REG_ITMP2, iptr->val.i);
M_OR(s1, REG_ITMP2, d);
}
- store_reg_to_var_int(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_LORCONST: /* ..., value ==> ..., value | constant */
/* val.l = constant */
- var_to_reg_int(s1, src, REG_ITMP1);
+ s1 = emit_load_s1(jd, iptr, src, REG_ITMP1);
d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP2);
if ((iptr->val.l >= 0) && (iptr->val.l <= 0xffff)) {
M_OR_IMM(s1, iptr->val.l, d);
LCONST(REG_ITMP2, iptr->val.l);
M_OR(s1, REG_ITMP2, d);
}
- store_reg_to_var_int(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_IXOR: /* ..., val1, val2 ==> ..., val1 ^ val2 */
case ICMD_LXOR:
- 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);
d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP2);
M_XOR(s1, s2, d);
- store_reg_to_var_int(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_IXORCONST: /* ..., value ==> ..., value ^ constant */
/* val.i = constant */
- var_to_reg_int(s1, src, REG_ITMP1);
+ s1 = emit_load_s1(jd, iptr, src, REG_ITMP1);
d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP2);
if ((iptr->val.i >= 0) && (iptr->val.i <= 0xffff)) {
M_XOR_IMM(s1, iptr->val.i, d);
ICONST(REG_ITMP2, iptr->val.i);
M_XOR(s1, REG_ITMP2, d);
}
- store_reg_to_var_int(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_LXORCONST: /* ..., value ==> ..., value ^ constant */
/* val.l = constant */
- var_to_reg_int(s1, src, REG_ITMP1);
+ s1 = emit_load_s1(jd, iptr, src, REG_ITMP1);
d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP2);
if ((iptr->val.l >= 0) && (iptr->val.l <= 0xffff)) {
M_XOR_IMM(s1, iptr->val.l, d);
LCONST(REG_ITMP2, iptr->val.l);
M_XOR(s1, REG_ITMP2, d);
}
- store_reg_to_var_int(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_LCMP: /* ..., val1, val2 ==> ..., val1 cmp val2 */
- 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);
d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP2);
M_CMPLT(s1, s2, REG_ITMP3);
M_CMPLT(s2, s1, REG_ITMP1);
M_LSUB(REG_ITMP1, REG_ITMP3, d);
- store_reg_to_var_int(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_FNEG: /* ..., value ==> ..., - value */
- var_to_reg_flt(s1, src, REG_FTMP1);
+ s1 = emit_load_s1(jd, iptr, src, REG_FTMP1);
d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_FTMP2);
M_FNEG(s1, 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);
+ s1 = emit_load_s1(jd, iptr, src, REG_FTMP1);
d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_FTMP2);
M_DNEG(s1, 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);
+ 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_FTMP2);
M_FADD(s1, 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);
+ 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_FTMP2);
M_DADD(s1, 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);
+ 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_FTMP2);
M_FSUB(s1, 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);
+ 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_FTMP2);
M_DSUB(s1, 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);
+ 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_FTMP2);
M_FMUL(s1, 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);
+ 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_FTMP2);
M_DMUL(s1, 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);
+ 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_FTMP2);
M_FDIV(s1, 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);
+ 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_FTMP2);
M_DDIV(s1, s2, d);
- store_reg_to_var_flt(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
#if 0
case ICMD_FREM: /* ..., val1, val2 ==> ..., val1 % val2 */
- var_to_reg_flt(s1, src->prev, REG_FTMP1);
- var_to_reg_flt(s2, src, REG_FTMP2);
+ 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);
M_FDIV(s1,s2, REG_FTMP3);
M_FLOORFL(REG_FTMP3, REG_FTMP3);
M_CVTLF(REG_FTMP3, REG_FTMP3);
M_FMUL(REG_FTMP3, s2, REG_FTMP3);
M_FSUB(s1, REG_FTMP3, d);
- store_reg_to_var_flt(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_DREM: /* ..., val1, val2 ==> ..., val1 % val2 */
- var_to_reg_flt(s1, src->prev, REG_FTMP1);
- var_to_reg_flt(s2, src, REG_FTMP2);
+ 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);
M_DDIV(s1,s2, REG_FTMP3);
M_FLOORDL(REG_FTMP3, REG_FTMP3);
M_CVTLD(REG_FTMP3, REG_FTMP3);
M_DMUL(REG_FTMP3, s2, REG_FTMP3);
M_DSUB(s1, REG_FTMP3, d);
- store_reg_to_var_flt(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
#endif
case ICMD_I2F: /* ..., value ==> ..., (float) value */
case ICMD_L2F:
- var_to_reg_int(s1, src, REG_ITMP1);
+ s1 = emit_load_s1(jd, iptr, src, REG_ITMP1);
d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_FTMP2);
M_MOVLD(s1, d);
M_CVTLF(d, d);
- store_reg_to_var_flt(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_I2D: /* ..., value ==> ..., (double) value */
case ICMD_L2D:
- var_to_reg_int(s1, src, REG_ITMP1);
+ s1 = emit_load_s1(jd, iptr, src, REG_ITMP1);
d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_FTMP2);
M_MOVLD(s1, d);
M_CVTLD(d, d);
- store_reg_to_var_flt(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
#if 0
case ICMD_F2I: /* ..., (float) value ==> ..., (int) value */
- var_to_reg_flt(s1, src, REG_FTMP1);
+ s1 = emit_load_s1(jd, iptr, src, REG_FTMP1);
d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP2);
M_TRUNCFI(s1, REG_FTMP1);
M_MOVDI(REG_FTMP1, d);
M_NOP;
- store_reg_to_var_int(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_D2I: /* ..., (double) value ==> ..., (int) value */
- var_to_reg_flt(s1, src, REG_FTMP1);
+ s1 = emit_load_s1(jd, iptr, src, REG_FTMP1);
d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP1);
M_TRUNCDI(s1, REG_FTMP1);
M_MOVDI(REG_FTMP1, d);
M_NOP;
- store_reg_to_var_int(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_F2L: /* ..., (float) value ==> ..., (long) value */
- var_to_reg_flt(s1, src, REG_FTMP1);
+ s1 = emit_load_s1(jd, iptr, src, REG_FTMP1);
d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP1);
M_TRUNCFL(s1, REG_FTMP1);
M_MOVDL(REG_FTMP1, d);
M_NOP;
- store_reg_to_var_int(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_D2L: /* ..., (double) value ==> ..., (long) value */
- var_to_reg_flt(s1, src, REG_FTMP1);
+ s1 = emit_load_s1(jd, iptr, src, REG_FTMP1);
d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP1);
M_TRUNCDL(s1, REG_FTMP1);
M_MOVDL(REG_FTMP1, d);
M_NOP;
- store_reg_to_var_int(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
#endif
case ICMD_F2D: /* ..., value ==> ..., (double) value */
- var_to_reg_flt(s1, src, REG_FTMP1);
+ s1 = emit_load_s1(jd, iptr, src, REG_FTMP1);
d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_FTMP2);
M_CVTFD(s1, d);
- store_reg_to_var_flt(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_D2F: /* ..., value ==> ..., (double) value */
- var_to_reg_flt(s1, src, REG_FTMP1);
+ s1 = emit_load_s1(jd, iptr, src, REG_FTMP1);
d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_FTMP2);
M_CVTDF(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 */
- var_to_reg_flt(s1, src->prev, REG_FTMP1);
- var_to_reg_flt(s2, src, REG_FTMP2);
+ 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_ITMP1);
M_FCMPULEF(s1, s2);
M_FBT(3);
M_FCMPEQF(s1, s2);
M_LSUB_IMM(REG_ZERO, 1, d);
M_CMOVT(REG_ZERO, d);
- store_reg_to_var_int(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_DCMPL: /* ..., val1, val2 ==> ..., val1 fcmpl val2 */
- var_to_reg_flt(s1, src->prev, REG_FTMP1);
- var_to_reg_flt(s2, src, REG_FTMP2);
+ 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_ITMP1);
M_FCMPULED(s1, s2);
M_FBT(3);
M_FCMPEQD(s1, s2);
M_LSUB_IMM(REG_ZERO, 1, d);
M_CMOVT(REG_ZERO, d);
- store_reg_to_var_int(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_FCMPG: /* ..., val1, val2 ==> ..., val1 fcmpg val2 */
- var_to_reg_flt(s1, src->prev, REG_FTMP1);
- var_to_reg_flt(s2, src, REG_FTMP2);
+ 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_ITMP1);
M_FCMPOLTF(s1, s2);
M_FBF(3);
M_FCMPEQF(s1, s2);
M_LADD_IMM(REG_ZERO, 1, d);
M_CMOVT(REG_ZERO, d);
- store_reg_to_var_int(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_DCMPG: /* ..., val1, val2 ==> ..., val1 fcmpg val2 */
- var_to_reg_flt(s1, src->prev, REG_FTMP1);
- var_to_reg_flt(s2, src, REG_FTMP2);
+ 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_ITMP1);
M_FCMPOLTD(s1, s2);
M_FBF(3);
M_FCMPEQD(s1, s2);
M_LADD_IMM(REG_ZERO, 1, d);
M_CMOVT(REG_ZERO, d);
- store_reg_to_var_int(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_ARRAYLENGTH: /* ..., arrayref ==> ..., length */
- var_to_reg_int(s1, src, REG_ITMP1);
+ s1 = emit_load_s1(jd, iptr, src, REG_ITMP1);
d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP2);
gen_nullptr_check(s1);
M_ILD(d, s1, OFFSET(java_arrayheader, size));
- store_reg_to_var_int(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_BALOAD: /* ..., arrayref, index ==> ..., value */
- 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);
d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP2);
if (iptr->op1 == 0) {
gen_nullptr_check(s1);
}
M_AADD(s2, s1, REG_ITMP3);
M_BLDS(d, REG_ITMP3, OFFSET(java_chararray, data[0]));
- store_reg_to_var_int(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_CALOAD: /* ..., arrayref, index ==> ..., value */
- 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);
d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP2);
if (iptr->op1 == 0) {
gen_nullptr_check(s1);
M_AADD(s2, s1, REG_ITMP3);
M_AADD(s2, REG_ITMP3, REG_ITMP3);
M_SLDU(d, REG_ITMP3, OFFSET(java_chararray, data[0]));
- store_reg_to_var_int(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_SALOAD: /* ..., arrayref, index ==> ..., value */
- 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);
d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP2);
if (iptr->op1 == 0) {
gen_nullptr_check(s1);
M_AADD(s2, s1, REG_ITMP3);
M_AADD(s2, REG_ITMP3, REG_ITMP3);
M_SLDS(d, REG_ITMP3, OFFSET(java_chararray, data[0]));
- store_reg_to_var_int(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_IALOAD: /* ..., arrayref, index ==> ..., value */
- 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);
d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP2);
if (iptr->op1 == 0) {
gen_nullptr_check(s1);
M_ASLL_IMM(s2, 2, REG_ITMP3);
M_AADD(REG_ITMP3, s1, REG_ITMP3);
M_ILD(d, REG_ITMP3, OFFSET(java_intarray, data[0]));
- store_reg_to_var_int(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_LALOAD: /* ..., arrayref, index ==> ..., value */
- 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);
d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP2);
if (iptr->op1 == 0) {
gen_nullptr_check(s1);
M_ASLL_IMM(s2, 3, REG_ITMP3);
M_AADD(REG_ITMP3, s1, REG_ITMP3);
M_LLD(d, REG_ITMP3, OFFSET(java_longarray, data[0]));
- store_reg_to_var_int(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_FALOAD: /* ..., arrayref, index ==> ..., value */
- 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);
d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_FTMP1);
if (iptr->op1 == 0) {
gen_nullptr_check(s1);
M_ASLL_IMM(s2, 2, REG_ITMP3);
M_AADD(REG_ITMP3, s1, REG_ITMP3);
M_FLD(d, REG_ITMP3, OFFSET(java_floatarray, data[0]));
- store_reg_to_var_flt(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_DALOAD: /* ..., arrayref, index ==> ..., value */
- 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);
d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_FTMP1);
if (iptr->op1 == 0) {
gen_nullptr_check(s1);
M_ASLL_IMM(s2, 3, REG_ITMP3);
M_AADD(REG_ITMP3, s1, REG_ITMP3);
M_DLD(d, REG_ITMP3, OFFSET(java_doublearray, data[0]));
- store_reg_to_var_flt(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_AALOAD: /* ..., arrayref, index ==> ..., value */
- 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);
d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP2);
if (iptr->op1 == 0) {
gen_nullptr_check(s1);
M_ASLL_IMM(s2, POINTERSHIFT, REG_ITMP3);
M_AADD(REG_ITMP3, s1, REG_ITMP3);
M_ALD(d, REG_ITMP3, OFFSET(java_objectarray, data[0]));
- store_reg_to_var_int(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
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;
}
M_AADD(s2, s1, REG_ITMP1);
- var_to_reg_int(s3, src, REG_ITMP3);
+ s3 = emit_load_s3(jd, iptr, src, REG_ITMP3);
M_BST(s3, REG_ITMP1, OFFSET(java_bytearray, data[0]));
break;
case ICMD_CASTORE: /* ..., 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;
}
M_AADD(s2, s1, REG_ITMP1);
M_AADD(s2, REG_ITMP1, REG_ITMP1);
- var_to_reg_int(s3, src, REG_ITMP3);
+ s3 = emit_load_s3(jd, iptr, src, REG_ITMP3);
M_SST(s3, REG_ITMP1, OFFSET(java_chararray, data[0]));
break;
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;
}
M_ASLL_IMM(s2, 2, REG_ITMP2);
M_AADD(REG_ITMP2, s1, REG_ITMP1);
- var_to_reg_int(s3, src, REG_ITMP3);
+ s3 = emit_load_s3(jd, iptr, src, REG_ITMP3);
M_IST_INTERN(s3, REG_ITMP1, OFFSET(java_intarray, data[0]));
break;
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;
}
M_ASLL_IMM(s2, 3, REG_ITMP2);
M_AADD(REG_ITMP2, s1, REG_ITMP1);
- var_to_reg_int(s3, src, REG_ITMP3);
+ s3 = emit_load_s3(jd, iptr, src, REG_ITMP3);
M_LST_INTERN(s3, REG_ITMP1, OFFSET(java_longarray, data[0]));
break;
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;
}
M_ASLL_IMM(s2, 2, REG_ITMP2);
M_AADD(REG_ITMP2, s1, REG_ITMP1);
- var_to_reg_flt(s3, src, REG_FTMP1);
+ s3 = emit_load_s3(jd, iptr, src, REG_FTMP1);
M_FST_INTERN(s3, REG_ITMP1, OFFSET(java_floatarray, data[0]));
break;
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;
}
M_ASLL_IMM(s2, 3, REG_ITMP2);
M_AADD(REG_ITMP2, s1, REG_ITMP1);
- var_to_reg_flt(s3, src, REG_FTMP1);
+ s3 = emit_load_s3(jd, iptr, src, REG_FTMP1);
M_DST_INTERN(s3, REG_ITMP1, OFFSET(java_doublearray, data[0]));
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_NOP;
M_BEQZ(REG_RESULT, 0);
- codegen_add_arraystoreexception_ref(cd, mcodeptr);
+ codegen_add_arraystoreexception_ref(cd, cd->mcodeptr);
M_NOP;
- 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);
M_ASLL_IMM(s2, POINTERSHIFT, REG_ITMP2);
M_AADD(REG_ITMP2, s1, REG_ITMP1);
- var_to_reg_int(s3, src, REG_ITMP3);
+ s3 = emit_load_s3(jd, iptr, src, REG_ITMP3);
M_AST_INTERN(s3, REG_ITMP1, OFFSET(java_objectarray, data[0]));
break;
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;
case ICMD_CASTORECONST: /* ..., 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;
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;
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;
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;
if (INSTRUCTION_IS_UNRESOLVED(iptr)) {
disp = dseg_addaddress(cd, NULL);
- codegen_addpatchref(cd, mcodeptr,
+ codegen_addpatchref(cd, cd->mcodeptr,
PATCHER_get_putstatic,
INSTRUCTION_UNRESOLVED_FIELD(iptr), disp);
disp = dseg_addaddress(cd, &(fi->value));
if (!CLASS_IS_OR_ALMOST_INITIALIZED(fi->class)) {
- codegen_addpatchref(cd, mcodeptr,
+ codegen_addpatchref(cd, cd->mcodeptr,
PATCHER_clinit, fi->class, 0);
if (opt_showdisassemble) {
case TYPE_INT:
d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP2);
M_ILD_INTERN(d, REG_ITMP1, 0);
- store_reg_to_var_int(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case TYPE_LNG:
d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP2);
M_LLD_INTERN(d, REG_ITMP1, 0);
- store_reg_to_var_int(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case TYPE_ADR:
d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP2);
M_ALD_INTERN(d, REG_ITMP1, 0);
- store_reg_to_var_int(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case TYPE_FLT:
d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_FTMP1);
M_FLD_INTERN(d, REG_ITMP1, 0);
- store_reg_to_var_flt(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case TYPE_DBL:
d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_FTMP1);
M_DLD_INTERN(d, REG_ITMP1, 0);
- store_reg_to_var_flt(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
}
break;
if (INSTRUCTION_IS_UNRESOLVED(iptr)) {
disp = dseg_addaddress(cd, NULL);
- codegen_addpatchref(cd, mcodeptr,
+ codegen_addpatchref(cd, cd->mcodeptr,
PATCHER_get_putstatic,
INSTRUCTION_UNRESOLVED_FIELD(iptr), disp);
disp = dseg_addaddress(cd, &(fi->value));
if (!CLASS_IS_OR_ALMOST_INITIALIZED(fi->class)) {
- codegen_addpatchref(cd, mcodeptr,
+ codegen_addpatchref(cd, cd->mcodeptr,
PATCHER_clinit, fi->class, 0);
if (opt_showdisassemble) {
M_ALD(REG_ITMP1, REG_PV, disp);
switch (iptr->op1) {
case TYPE_INT:
- var_to_reg_int(s2, src, REG_ITMP2);
+ s2 = emit_load_s2(jd, iptr, src, REG_ITMP2);
M_IST_INTERN(s2, REG_ITMP1, 0);
break;
case TYPE_LNG:
- var_to_reg_int(s2, src, REG_ITMP2);
+ s2 = emit_load_s2(jd, iptr, src, REG_ITMP2);
M_LST_INTERN(s2, REG_ITMP1, 0);
break;
case TYPE_ADR:
- var_to_reg_int(s2, src, REG_ITMP2);
+ s2 = emit_load_s2(jd, iptr, src, REG_ITMP2);
M_AST_INTERN(s2, REG_ITMP1, 0);
break;
case TYPE_FLT:
- var_to_reg_flt(s2, src, REG_FTMP2);
+ s2 = emit_load_s2(jd, iptr, src, REG_FTMP2);
M_FST_INTERN(s2, REG_ITMP1, 0);
break;
case TYPE_DBL:
- var_to_reg_flt(s2, src, REG_FTMP2);
+ s2 = emit_load_s2(jd, iptr, src, REG_FTMP2);
M_DST_INTERN(s2, REG_ITMP1, 0);
break;
}
if (INSTRUCTION_IS_UNRESOLVED(iptr + 1)) {
disp = dseg_addaddress(cd, NULL);
- codegen_addpatchref(cd, mcodeptr,
+ codegen_addpatchref(cd, cd->mcodeptr,
PATCHER_get_putstatic,
INSTRUCTION_UNRESOLVED_FIELD(iptr + 1), disp);
disp = dseg_addaddress(cd, &(fi->value));
if (!CLASS_IS_OR_ALMOST_INITIALIZED(fi->class)) {
- codegen_addpatchref(cd, mcodeptr,
+ codegen_addpatchref(cd, cd->mcodeptr,
PATCHER_clinit, fi->class, 0);
if (opt_showdisassemble) {
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 (INSTRUCTION_IS_UNRESOLVED(iptr)) {
- codegen_addpatchref(cd, mcodeptr,
+ codegen_addpatchref(cd, cd->mcodeptr,
PATCHER_get_putfield,
INSTRUCTION_UNRESOLVED_FIELD(iptr), 0);
case TYPE_INT:
d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP2);
M_ILD(d, s1, a);
- store_reg_to_var_int(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case TYPE_LNG:
d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP2);
M_LLD(d, s1, a);
- store_reg_to_var_int(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case TYPE_ADR:
d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP2);
M_ALD(d, s1, a);
- store_reg_to_var_int(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case TYPE_FLT:
d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_FTMP1);
M_FLD(d, s1, a);
- store_reg_to_var_flt(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case TYPE_DBL:
d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_FTMP1);
M_DLD(d, s1, a);
- store_reg_to_var_flt(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
}
break;
case ICMD_PUTFIELD: /* ..., objectref, value ==> ... */
/* op1 = type, val.a = field address */
- 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_FLT_DBL_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 (INSTRUCTION_IS_UNRESOLVED(iptr)) {
- codegen_addpatchref(cd, mcodeptr,
+ codegen_addpatchref(cd, cd->mcodeptr,
PATCHER_get_putfield,
INSTRUCTION_UNRESOLVED_FIELD(iptr), 0);
/* 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 (INSTRUCTION_IS_UNRESOLVED(iptr + 1)) {
- codegen_addpatchref(cd, mcodeptr,
+ codegen_addpatchref(cd, cd->mcodeptr,
PATCHER_get_putfield,
INSTRUCTION_UNRESOLVED_FIELD(iptr + 1), 0);
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);
#ifdef ENABLE_VERIFIER
if (iptr->val.a) {
- codegen_addpatchref(cd, mcodeptr,
+ codegen_addpatchref(cd, cd->mcodeptr,
PATCHER_athrow_areturn,
(unresolved_class *) iptr->val.a, 0);
case ICMD_GOTO: /* ... ==> ... */
/* op1 = target JavaVM pc */
M_BR(0);
- codegen_addreference(cd, (basicblock *) iptr->target, mcodeptr);
+ codegen_addreference(cd, (basicblock *) iptr->target, cd->mcodeptr);
M_NOP;
ALIGNCODENOP;
break;
case ICMD_IFNULL: /* ..., value ==> ... */
/* op1 = target JavaVM pc */
- var_to_reg_int(s1, src, REG_ITMP1);
+ s1 = emit_load_s1(jd, iptr, src, REG_ITMP1);
M_BEQZ(s1, 0);
- codegen_addreference(cd, (basicblock *) iptr->target, mcodeptr);
+ codegen_addreference(cd, (basicblock *) iptr->target, cd->mcodeptr);
M_NOP;
break;
case ICMD_IFNONNULL: /* ..., value ==> ... */
/* op1 = target JavaVM pc */
- var_to_reg_int(s1, src, REG_ITMP1);
+ s1 = emit_load_s1(jd, iptr, src, REG_ITMP1);
M_BNEZ(s1, 0);
- codegen_addreference(cd, (basicblock *) iptr->target, mcodeptr);
+ codegen_addreference(cd, (basicblock *) iptr->target, cd->mcodeptr);
M_NOP;
break;
case ICMD_IFEQ: /* ..., value ==> ... */
/* op1 = target JavaVM pc, val.i = constant */
- var_to_reg_int(s1, src, REG_ITMP1);
+ s1 = emit_load_s1(jd, iptr, src, REG_ITMP1);
if (iptr->val.i == 0) {
M_BEQZ(s1, 0);
} else {
ICONST(REG_ITMP2, iptr->val.i);
M_BEQ(s1, REG_ITMP2, 0);
}
- codegen_addreference(cd, (basicblock *) iptr->target, mcodeptr);
+ codegen_addreference(cd, (basicblock *) iptr->target, cd->mcodeptr);
M_NOP;
break;
case ICMD_IFLT: /* ..., value ==> ... */
/* op1 = target JavaVM pc, val.i = constant */
- var_to_reg_int(s1, src, REG_ITMP1);
+ s1 = emit_load_s1(jd, iptr, src, REG_ITMP1);
if (iptr->val.i == 0) {
M_BLTZ(s1, 0);
} else {
}
M_BNEZ(REG_ITMP1, 0);
}
- codegen_addreference(cd, (basicblock *) iptr->target, mcodeptr);
+ codegen_addreference(cd, (basicblock *) iptr->target, cd->mcodeptr);
M_NOP;
break;
case ICMD_IFLE: /* ..., value ==> ... */
/* op1 = target JavaVM pc, val.i = constant */
- var_to_reg_int(s1, src, REG_ITMP1);
+ s1 = emit_load_s1(jd, iptr, src, REG_ITMP1);
if (iptr->val.i == 0) {
M_BLEZ(s1, 0);
}
M_BEQZ(REG_ITMP1, 0);
}
}
- codegen_addreference(cd, (basicblock *) iptr->target, mcodeptr);
+ codegen_addreference(cd, (basicblock *) iptr->target, cd->mcodeptr);
M_NOP;
break;
case ICMD_IFNE: /* ..., value ==> ... */
/* op1 = target JavaVM pc, val.i = constant */
- var_to_reg_int(s1, src, REG_ITMP1);
+ s1 = emit_load_s1(jd, iptr, src, REG_ITMP1);
if (iptr->val.i == 0) {
M_BNEZ(s1, 0);
}
ICONST(REG_ITMP2, iptr->val.i);
M_BNE(s1, REG_ITMP2, 0);
}
- codegen_addreference(cd, (basicblock *) iptr->target, mcodeptr);
+ codegen_addreference(cd, (basicblock *) iptr->target, cd->mcodeptr);
M_NOP;
break;
case ICMD_IFGT: /* ..., value ==> ... */
/* op1 = target JavaVM pc, val.i = constant */
- var_to_reg_int(s1, src, REG_ITMP1);
+ s1 = emit_load_s1(jd, iptr, src, REG_ITMP1);
if (iptr->val.i == 0) {
M_BGTZ(s1, 0);
}
M_BNEZ(REG_ITMP1, 0);
}
}
- codegen_addreference(cd, (basicblock *) iptr->target, mcodeptr);
+ codegen_addreference(cd, (basicblock *) iptr->target, cd->mcodeptr);
M_NOP;
break;
case ICMD_IFGE: /* ..., value ==> ... */
/* op1 = target JavaVM pc, val.i = constant */
- var_to_reg_int(s1, src, REG_ITMP1);
+ s1 = emit_load_s1(jd, iptr, src, REG_ITMP1);
if (iptr->val.i == 0) {
M_BGEZ(s1, 0);
}
}
M_BEQZ(REG_ITMP1, 0);
}
- codegen_addreference(cd, (basicblock *) iptr->target, mcodeptr);
+ codegen_addreference(cd, (basicblock *) iptr->target, cd->mcodeptr);
M_NOP;
break;
case ICMD_IF_LEQ: /* ..., value ==> ... */
/* op1 = target JavaVM pc, val.l = constant */
- var_to_reg_int(s1, src, REG_ITMP1);
+ s1 = emit_load_s1(jd, iptr, src, REG_ITMP1);
if (iptr->val.l == 0) {
M_BEQZ(s1, 0);
}
LCONST(REG_ITMP2, iptr->val.l);
M_BEQ(s1, REG_ITMP2, 0);
}
- codegen_addreference(cd, (basicblock *) iptr->target, mcodeptr);
+ codegen_addreference(cd, (basicblock *) iptr->target, cd->mcodeptr);
M_NOP;
break;
case ICMD_IF_LLT: /* ..., value ==> ... */
/* op1 = target JavaVM pc, val.l = constant */
- var_to_reg_int(s1, src, REG_ITMP1);
+ s1 = emit_load_s1(jd, iptr, src, REG_ITMP1);
if (iptr->val.l == 0) {
M_BLTZ(s1, 0);
}
}
M_BNEZ(REG_ITMP1, 0);
}
- codegen_addreference(cd, (basicblock *) iptr->target, mcodeptr);
+ codegen_addreference(cd, (basicblock *) iptr->target, cd->mcodeptr);
M_NOP;
break;
case ICMD_IF_LLE: /* ..., value ==> ... */
/* op1 = target JavaVM pc, val.l = constant */
- var_to_reg_int(s1, src, REG_ITMP1);
+ s1 = emit_load_s1(jd, iptr, src, REG_ITMP1);
if (iptr->val.l == 0) {
M_BLEZ(s1, 0);
}
M_BEQZ(REG_ITMP1, 0);
}
}
- codegen_addreference(cd, (basicblock *) iptr->target, mcodeptr);
+ codegen_addreference(cd, (basicblock *) iptr->target, cd->mcodeptr);
M_NOP;
break;
case ICMD_IF_LNE: /* ..., value ==> ... */
/* op1 = target JavaVM pc, val.l = constant */
- var_to_reg_int(s1, src, REG_ITMP1);
+ s1 = emit_load_s1(jd, iptr, src, REG_ITMP1);
if (iptr->val.l == 0) {
M_BNEZ(s1, 0);
}
LCONST(REG_ITMP2, iptr->val.l);
M_BNE(s1, REG_ITMP2, 0);
}
- codegen_addreference(cd, (basicblock *) iptr->target, mcodeptr);
+ codegen_addreference(cd, (basicblock *) iptr->target, cd->mcodeptr);
M_NOP;
break;
case ICMD_IF_LGT: /* ..., value ==> ... */
/* op1 = target JavaVM pc, val.l = constant */
- var_to_reg_int(s1, src, REG_ITMP1);
+ s1 = emit_load_s1(jd, iptr, src, REG_ITMP1);
if (iptr->val.l == 0) {
M_BGTZ(s1, 0);
}
M_BNEZ(REG_ITMP1, 0);
}
}
- codegen_addreference(cd, (basicblock *) iptr->target, mcodeptr);
+ codegen_addreference(cd, (basicblock *) iptr->target, cd->mcodeptr);
M_NOP;
break;
case ICMD_IF_LGE: /* ..., value ==> ... */
/* op1 = target JavaVM pc, val.l = constant */
- var_to_reg_int(s1, src, REG_ITMP1);
+ s1 = emit_load_s1(jd, iptr, src, REG_ITMP1);
if (iptr->val.l == 0) {
M_BGEZ(s1, 0);
}
}
M_BEQZ(REG_ITMP1, 0);
}
- codegen_addreference(cd, (basicblock *) iptr->target, mcodeptr);
+ codegen_addreference(cd, (basicblock *) iptr->target, cd->mcodeptr);
M_NOP;
break;
case ICMD_IF_LCMPEQ: /* op1 = target JavaVM pc */
case ICMD_IF_ACMPEQ:
- 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);
M_BEQ(s1, s2, 0);
- codegen_addreference(cd, (basicblock *) iptr->target, mcodeptr);
+ codegen_addreference(cd, (basicblock *) iptr->target, cd->mcodeptr);
M_NOP;
break;
case ICMD_IF_LCMPNE: /* op1 = target JavaVM pc */
case ICMD_IF_ACMPNE:
- 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);
M_BNE(s1, s2, 0);
- codegen_addreference(cd, (basicblock *) iptr->target, mcodeptr);
+ codegen_addreference(cd, (basicblock *) iptr->target, cd->mcodeptr);
M_NOP;
break;
case ICMD_IF_ICMPLT: /* ..., value, value ==> ... */
case ICMD_IF_LCMPLT: /* op1 = target JavaVM pc */
- 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);
M_CMPLT(s1, s2, REG_ITMP1);
M_BNEZ(REG_ITMP1, 0);
- codegen_addreference(cd, (basicblock *) iptr->target, mcodeptr);
+ codegen_addreference(cd, (basicblock *) iptr->target, cd->mcodeptr);
M_NOP;
break;
case ICMD_IF_ICMPGT: /* ..., value, value ==> ... */
case ICMD_IF_LCMPGT: /* op1 = target JavaVM pc */
- 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);
M_CMPGT(s1, s2, REG_ITMP1);
M_BNEZ(REG_ITMP1, 0);
- codegen_addreference(cd, (basicblock *) iptr->target, mcodeptr);
+ codegen_addreference(cd, (basicblock *) iptr->target, cd->mcodeptr);
M_NOP;
break;
case ICMD_IF_ICMPLE: /* ..., value, value ==> ... */
case ICMD_IF_LCMPLE: /* op1 = target JavaVM pc */
- 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);
M_CMPGT(s1, s2, REG_ITMP1);
M_BEQZ(REG_ITMP1, 0);
- codegen_addreference(cd, (basicblock *) iptr->target, mcodeptr);
+ codegen_addreference(cd, (basicblock *) iptr->target, cd->mcodeptr);
M_NOP;
break;
case ICMD_IF_ICMPGE: /* ..., value, value ==> ... */
case ICMD_IF_LCMPGE: /* op1 = target JavaVM pc */
- 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);
M_CMPLT(s1, s2, REG_ITMP1);
M_BEQZ(REG_ITMP1, 0);
- codegen_addreference(cd, (basicblock *) iptr->target, mcodeptr);
+ codegen_addreference(cd, (basicblock *) iptr->target, cd->mcodeptr);
M_NOP;
break;
case ICMD_IFEQ_ICONST: /* ..., value ==> ..., constant */
/* val.i = constant */
- var_to_reg_int(s1, src, REG_ITMP1);
+ s1 = emit_load_s1(jd, iptr, src, REG_ITMP1);
d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP2);
s3 = iptr->val.i;
if (iptr[1].opc == ICMD_ELSE_ICONST) {
if ((s3 == 1) && (iptr[1].val.i == 0)) {
M_CMPEQ(s1, REG_ZERO, d);
- store_reg_to_var_int(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
}
if ((s3 == 0) && (iptr[1].val.i == 1)) {
M_CMPEQ(s1, REG_ZERO, d);
M_XOR_IMM(d, 1, d);
- store_reg_to_var_int(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
}
if (s1 == d) {
ICONST(REG_ITMP3, s3);
M_CMOVEQ(s1, REG_ITMP3, d);
}
- store_reg_to_var_int(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_IFNE_ICONST: /* ..., value ==> ..., constant */
/* val.i = constant */
- var_to_reg_int(s1, src, REG_ITMP1);
+ s1 = emit_load_s1(jd, iptr, src, REG_ITMP1);
d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP2);
s3 = iptr->val.i;
if (iptr[1].opc == ICMD_ELSE_ICONST) {
if ((s3 == 0) && (iptr[1].val.i == 1)) {
M_CMPEQ(s1, REG_ZERO, d);
- store_reg_to_var_int(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
}
if ((s3 == 1) && (iptr[1].val.i == 0)) {
M_CMPEQ(s1, REG_ZERO, d);
M_XOR_IMM(d, 1, d);
- store_reg_to_var_int(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
}
if (s1 == d) {
ICONST(REG_ITMP3, s3);
M_CMOVNE(s1, REG_ITMP3, d);
}
- store_reg_to_var_int(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_IFLT_ICONST: /* ..., value ==> ..., constant */
/* val.i = constant */
- var_to_reg_int(s1, src, REG_ITMP1);
+ s1 = emit_load_s1(jd, iptr, src, REG_ITMP1);
d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP2);
s3 = iptr->val.i;
if ((iptr[1].opc == ICMD_ELSE_ICONST)) {
if ((s3 == 1) && (iptr[1].val.i == 0)) {
M_CMPLT(s1, REG_ZERO, d);
- store_reg_to_var_int(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
}
if ((s3 == 0) && (iptr[1].val.i == 1)) {
M_CMPLE(REG_ZERO, s1, d);
- store_reg_to_var_int(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
}
if (s1 == d) {
ICONST(REG_ITMP3, s3);
M_CMOVLT(s1, REG_ITMP3, d);
}
- store_reg_to_var_int(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_IFGE_ICONST: /* ..., value ==> ..., constant */
/* val.i = constant */
- var_to_reg_int(s1, src, REG_ITMP1);
+ s1 = emit_load_s1(jd, iptr, src, REG_ITMP1);
d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP2);
s3 = iptr->val.i;
if ((iptr[1].opc == ICMD_ELSE_ICONST)) {
if ((s3 == 1) && (iptr[1].val.i == 0)) {
M_CMPLE(REG_ZERO, s1, d);
- store_reg_to_var_int(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
}
if ((s3 == 0) && (iptr[1].val.i == 1)) {
M_CMPLT(s1, REG_ZERO, d);
- store_reg_to_var_int(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
}
if (s1 == d) {
ICONST(REG_ITMP3, s3);
M_CMOVGE(s1, REG_ITMP3, d);
}
- store_reg_to_var_int(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_IFGT_ICONST: /* ..., value ==> ..., constant */
/* val.i = constant */
- var_to_reg_int(s1, src, REG_ITMP1);
+ s1 = emit_load_s1(jd, iptr, src, REG_ITMP1);
d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP2);
s3 = iptr->val.i;
if ((iptr[1].opc == ICMD_ELSE_ICONST)) {
if ((s3 == 1) && (iptr[1].val.i == 0)) {
M_CMPLT(REG_ZERO, s1, d);
- store_reg_to_var_int(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
}
if ((s3 == 0) && (iptr[1].val.i == 1)) {
M_CMPLE(s1, REG_ZERO, d);
- store_reg_to_var_int(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
}
if (s1 == d) {
ICONST(REG_ITMP3, s3);
M_CMOVGT(s1, REG_ITMP3, d);
}
- store_reg_to_var_int(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_IFLE_ICONST: /* ..., value ==> ..., constant */
/* val.i = constant */
- var_to_reg_int(s1, src, REG_ITMP1);
+ s1 = emit_load_s1(jd, iptr, src, REG_ITMP1);
d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP2);
s3 = iptr->val.i;
if ((iptr[1].opc == ICMD_ELSE_ICONST)) {
if ((s3 == 1) && (iptr[1].val.i == 0)) {
M_CMPLE(s1, REG_ZERO, d);
- store_reg_to_var_int(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
}
if ((s3 == 0) && (iptr[1].val.i == 1)) {
M_CMPLT(REG_ZERO, s1, d);
- store_reg_to_var_int(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
}
if (s1 == d) {
ICONST(REG_ITMP3, s3);
M_CMOVLE(s1, REG_ITMP3, d);
}
- store_reg_to_var_int(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
#endif
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, mcodeptr,
+ codegen_addpatchref(cd, cd->mcodeptr,
PATCHER_athrow_areturn,
(unresolved_class *) iptr->val.a, 0);
case ICMD_FRETURN: /* ..., retvalue ==> ... */
case ICMD_DRETURN:
- var_to_reg_flt(s1, src, REG_FRESULT);
+ s1 = emit_load_s1(jd, iptr, src, REG_FRESULT);
{
int t = ((iptr->opc == ICMD_FRETURN) ? TYPE_FLT : TYPE_DBL);
M_TFLTMOVE(t, s1, REG_FRESULT);
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);
if (l == 0)
{M_INTMOVE(s1, REG_ITMP1);}
else if (l <= 32768) {
M_CMPULT_IMM(REG_ITMP1, i, REG_ITMP2);
M_BEQZ(REG_ITMP2, 0);
- codegen_addreference(cd, (basicblock *) tptr[0], mcodeptr);
+ codegen_addreference(cd, (basicblock *) tptr[0], cd->mcodeptr);
M_ASLL_IMM(REG_ITMP1, POINTERSHIFT, REG_ITMP1); /* delay slot*/
/* build jump table top down and use address of lowest entry */
i = s4ptr[1]; /* count */
MCODECHECK((i<<2)+8);
- var_to_reg_int(s1, src, REG_ITMP1);
+ s1 = emit_load_s1(jd, iptr, src, REG_ITMP1);
while (--i >= 0) {
s4ptr += 2;
++tptr;
val = s4ptr[0];
ICONST(REG_ITMP2, val);
M_BEQ(s1, REG_ITMP2, 0);
- codegen_addreference(cd, (basicblock *) tptr[0], mcodeptr);
+ codegen_addreference(cd, (basicblock *) tptr[0], cd->mcodeptr);
M_NOP;
}
M_BR(0);
tptr = (void **) iptr->target;
- codegen_addreference(cd, (basicblock *) tptr[0], mcodeptr);
+ codegen_addreference(cd, (basicblock *) tptr[0], cd->mcodeptr);
M_NOP;
ALIGNCODENOP;
break;
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_TFLTMOVE(src->type, 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);
}
}
M_ALD(REG_ITMP3, REG_PV, disp); /* built-in-function pointer */
M_JSR(REG_RA, REG_ITMP3);
M_NOP;
- disp = (s4) ((u1 *) mcodeptr - cd->mcodebase);
+ disp = (s4) ((u1 *) cd->mcodeptr - cd->mcodebase);
M_LDA(REG_PV, REG_RA, -disp);
/* if op1 == true, we need to check for an exception */
if (iptr->op1 == true) {
M_BEQZ(REG_RESULT, 0);
- codegen_add_fillinstacktrace_ref(cd, mcodeptr);
+ codegen_add_fillinstacktrace_ref(cd, cd->mcodeptr);
M_NOP;
}
break;
case ICMD_INVOKESPECIAL:
M_BEQZ(rd->argintregs[0], 0);
- codegen_add_nullpointerexception_ref(cd, mcodeptr);
+ codegen_add_nullpointerexception_ref(cd, cd->mcodeptr);
M_NOP;
/* fall through */
disp = dseg_addaddress(cd, NULL);
- codegen_addpatchref(cd, mcodeptr,
+ codegen_addpatchref(cd, cd->mcodeptr,
PATCHER_invokestatic_special, um, disp);
if (opt_showdisassemble) {
M_ALD(REG_PV, REG_PV, disp); /* method pointer in pv */
M_JSR(REG_RA, REG_PV);
M_NOP;
- disp = (s4) ((u1 *) mcodeptr - cd->mcodebase);
+ disp = (s4) ((u1 *) cd->mcodeptr - cd->mcodebase);
M_LDA(REG_PV, REG_RA, -disp);
break;
if (lm == NULL) {
unresolved_method *um = INSTRUCTION_UNRESOLVED_METHOD(iptr);
- codegen_addpatchref(cd, mcodeptr,
+ codegen_addpatchref(cd, cd->mcodeptr,
PATCHER_invokevirtual, um, 0);
if (opt_showdisassemble) {
M_ALD(REG_PV, REG_METHODPTR, s1);
M_JSR(REG_RA, REG_PV);
M_NOP;
- disp = (s4) ((u1 *) mcodeptr - cd->mcodebase);
+ disp = (s4) ((u1 *) cd->mcodeptr - cd->mcodebase);
M_LDA(REG_PV, REG_RA, -disp);
break;
if (lm == NULL) {
unresolved_method *um = INSTRUCTION_UNRESOLVED_METHOD(iptr);
- codegen_addpatchref(cd, mcodeptr,
+ codegen_addpatchref(cd, cd->mcodeptr,
PATCHER_invokeinterface, um, 0);
if (opt_showdisassemble) {
M_ALD(REG_PV, REG_METHODPTR, s2);
M_JSR(REG_RA, REG_PV);
M_NOP;
- disp = (s4) ((u1 *) mcodeptr - cd->mcodebase);
+ disp = (s4) ((u1 *) cd->mcodeptr - cd->mcodebase);
M_LDA(REG_PV, REG_RA, -disp);
break;
}
if (IS_INT_LNG_TYPE(iptr->dst->type)) {
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);
} else {
s1 = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_FRESULT);
M_TFLTMOVE(iptr->dst->type, 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, (u1 *) mcodeptr - cd->mcodebase);
+ codegen_threadcritrestart(cd, (u1 *) 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 */
disp = dseg_adds4(cd, 0); /* super->flags */
- codegen_addpatchref(cd, mcodeptr,
+ codegen_addpatchref(cd, cd->mcodeptr,
PATCHER_checkcast_instanceof_flags,
(constant_classref *) iptr->target,
disp);
M_NOP;
} else {
- codegen_addpatchref(cd, mcodeptr,
+ codegen_addpatchref(cd, cd->mcodeptr,
PATCHER_checkcast_instanceof_interface,
(constant_classref *) iptr->target,
0);
M_ILD(REG_ITMP3, REG_ITMP2, OFFSET(vftbl_t, interfacetablelength));
M_IADD_IMM(REG_ITMP3, -superindex, REG_ITMP3);
M_BLEZ(REG_ITMP3, 0);
- codegen_add_classcastexception_ref(cd, mcodeptr);
+ codegen_add_classcastexception_ref(cd, cd->mcodeptr);
M_NOP;
M_ALD(REG_ITMP3, REG_ITMP2,
OFFSET(vftbl_t, interfacetable[0]) -
superindex * sizeof(methodptr*));
M_BEQZ(REG_ITMP3, 0);
- codegen_add_classcastexception_ref(cd, mcodeptr);
+ codegen_add_classcastexception_ref(cd, cd->mcodeptr);
M_NOP;
if (!super) {
M_NOP;
} else {
- codegen_addpatchref(cd, mcodeptr,
+ codegen_addpatchref(cd, cd->mcodeptr,
PATCHER_checkcast_instanceof_class,
(constant_classref *) iptr->target,
disp);
M_ALD(REG_ITMP2, s1, OFFSET(java_objectheader, vftbl));
M_ALD(REG_ITMP3, REG_PV, disp);
#if defined(USE_THREADS) && defined(NATIVE_THREADS)
- codegen_threadcritstart(cd, (u1 *) mcodeptr - cd->mcodebase);
+ codegen_threadcritstart(cd, (u1 *) cd->mcodeptr - cd->mcodebase);
#endif
M_ILD(REG_ITMP2, REG_ITMP2, OFFSET(vftbl_t, baseval));
/* if (s1 != REG_ITMP1) { */
/* M_ILD(REG_ITMP1, REG_ITMP3, OFFSET(vftbl_t, baseval)); */
/* M_ILD(REG_ITMP3, REG_ITMP3, OFFSET(vftbl_t, diffval)); */
/* #if defined(USE_THREADS) && defined(NATIVE_THREADS) */
- /* codegen_threadcritstop(cd, (u1 *) mcodeptr - cd->mcodebase); */
+ /* codegen_threadcritstop(cd, (u1 *) cd->mcodeptr - cd->mcodebase); */
/* #endif */
/* M_ISUB(REG_ITMP2, REG_ITMP1, REG_ITMP2); */
/* } else { */
M_ALD(REG_ITMP3, REG_PV, disp);
M_ILD(REG_ITMP3, REG_ITMP3, OFFSET(vftbl_t, diffval));
#if defined(USE_THREADS) && defined(NATIVE_THREADS)
- codegen_threadcritstop(cd, (u1 *) mcodeptr - cd->mcodebase);
+ codegen_threadcritstop(cd, (u1 *) cd->mcodeptr - cd->mcodebase);
#endif
/* } */
M_CMPULT(REG_ITMP3, REG_ITMP2, REG_ITMP3);
M_BNEZ(REG_ITMP3, 0);
- codegen_add_classcastexception_ref(cd, mcodeptr);
+ codegen_add_classcastexception_ref(cd, cd->mcodeptr);
M_NOP;
}
d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, s1);
} else {
- var_to_reg_int(s1, src, rd->argintregs[0]);
+ s1 = emit_load_s1(jd, iptr, src, rd->argintregs[0]);
M_INTMOVE(s1, rd->argintregs[0]);
disp = dseg_addaddress(cd, iptr->val.a);
if (iptr->val.a == NULL) {
- codegen_addpatchref(cd, mcodeptr,
+ codegen_addpatchref(cd, cd->mcodeptr,
PATCHER_builtin_arraycheckcast,
(constant_classref *) iptr->target,
disp);
M_NOP;
M_BEQZ(REG_RESULT, 0);
- codegen_add_classcastexception_ref(cd, mcodeptr);
+ codegen_add_classcastexception_ref(cd, cd->mcodeptr);
M_NOP;
- var_to_reg_int(s1, src, REG_ITMP1);
+ s1 = emit_load_s1(jd, iptr, src, REG_ITMP1);
d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, s1);
}
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 */
}
#if defined(USE_THREADS) && defined(NATIVE_THREADS)
- codegen_threadcritrestart(cd, (u1 *) mcodeptr - cd->mcodebase);
+ codegen_threadcritrestart(cd, (u1 *) cd->mcodeptr - cd->mcodebase);
#endif
- var_to_reg_int(s1, src, REG_ITMP1);
+ 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_MOV(s1, REG_ITMP1);
disp = dseg_adds4(cd, 0); /* super->flags */
- codegen_addpatchref(cd, mcodeptr,
+ codegen_addpatchref(cd, cd->mcodeptr,
PATCHER_checkcast_instanceof_flags,
(constant_classref *) iptr->target, disp);
M_NOP;
} else {
- codegen_addpatchref(cd, mcodeptr,
+ codegen_addpatchref(cd, cd->mcodeptr,
PATCHER_checkcast_instanceof_interface,
(constant_classref *) iptr->target, 0);
M_NOP;
} else {
- codegen_addpatchref(cd, mcodeptr,
+ codegen_addpatchref(cd, cd->mcodeptr,
PATCHER_checkcast_instanceof_class,
(constant_classref *) iptr->target,
disp);
M_ALD(REG_ITMP1, s1, OFFSET(java_objectheader, vftbl));
M_ALD(REG_ITMP2, REG_PV, disp);
#if defined(USE_THREADS) && defined(NATIVE_THREADS)
- codegen_threadcritstart(cd, (u1 *) mcodeptr - cd->mcodebase);
+ codegen_threadcritstart(cd, (u1 *) cd->mcodeptr - cd->mcodebase);
#endif
M_ILD(REG_ITMP1, REG_ITMP1, OFFSET(vftbl_t, baseval));
M_ILD(REG_ITMP3, REG_ITMP2, OFFSET(vftbl_t, baseval));
M_ILD(REG_ITMP2, REG_ITMP2, OFFSET(vftbl_t, diffval));
#if defined(USE_THREADS) && defined(NATIVE_THREADS)
- codegen_threadcritstop(cd, (u1 *) mcodeptr - cd->mcodebase);
+ codegen_threadcritstop(cd, (u1 *) cd->mcodeptr - cd->mcodebase);
#endif
M_ISUB(REG_ITMP1, REG_ITMP3, REG_ITMP1);
M_CMPULT(REG_ITMP2, REG_ITMP1, d);
M_XOR_IMM(d, 1, d);
}
- store_reg_to_var_int(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
}
break;
/* 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);
}
}
if (iptr->val.a == NULL) {
disp = dseg_addaddress(cd, NULL);
- codegen_addpatchref(cd, mcodeptr,
+ codegen_addpatchref(cd, cd->mcodeptr,
PATCHER_builtin_multianewarray,
(constant_classref *) iptr->target,
disp);
/* check for exception before result assignment */
M_BEQZ(REG_RESULT, 0);
- codegen_add_fillinstacktrace_ref(cd, mcodeptr);
+ codegen_add_fillinstacktrace_ref(cd, cd->mcodeptr);
M_NOP;
d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_RESULT);
M_INTMOVE(REG_RESULT, d);
- store_reg_to_var_int(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
default:
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_TFLTMOVE(s2, 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);
actual instruction. So codepatching does not change the
following block unintentionally. */
- if ((u1 *) mcodeptr < cd->lastmcodeptr) {
- while ((u1 *) mcodeptr < cd->lastmcodeptr) {
+ if ((u1 *) cd->mcodeptr < cd->lastmcodeptr) {
+ while ((u1 *) cd->mcodeptr < cd->lastmcodeptr) {
M_NOP;
}
}
exceptionref *eref;
patchref *pref;
u8 mcode;
- s4 *savedmcodeptr;
- s4 *tmpmcodeptr;
+ u4 *savedmcodeptr;
+ u4 *tmpmcodeptr;
savedmcodeptr = NULL;
for (eref = cd->exceptionrefs; eref != NULL; eref = eref->next) {
gen_resolvebranch((u1 *) cd->mcodebase + eref->branchpos,
eref->branchpos,
- (u1 *) mcodeptr - cd->mcodebase);
+ (u1 *) cd->mcodeptr - cd->mcodebase);
MCODECHECK(100);
M_ALD(REG_ITMP3, REG_PV, disp);
if (savedmcodeptr != NULL) {
- M_BR(savedmcodeptr - mcodeptr);
+ M_BR(savedmcodeptr - cd->mcodeptr);
M_NOP;
} else {
- savedmcodeptr = mcodeptr;
+ savedmcodeptr = cd->mcodeptr;
M_MOV(REG_PV, rd->argintregs[0]);
M_MOV(REG_SP, rd->argintregs[1]);
/* Get machine code which is patched back in later. The
call is 2 instruction words long. */
- tmpmcodeptr = (s4 *) (cd->mcodebase + pref->branchpos);
+ tmpmcodeptr = (u4 *) (cd->mcodebase + pref->branchpos);
/* We need to split this, because an unaligned 8 byte read
causes a SIGSEGV. */
/* Patch in the call to call the following code (done at
compile time). */
- savedmcodeptr = mcodeptr; /* save current mcodeptr */
- mcodeptr = tmpmcodeptr; /* set mcodeptr to patch position */
+ savedmcodeptr = cd->mcodeptr; /* save current mcodeptr */
+ cd->mcodeptr = tmpmcodeptr; /* set mcodeptr to patch position */
disp = (s4) (savedmcodeptr - (tmpmcodeptr + 1));
M_BR(disp);
M_NOP;
- mcodeptr = savedmcodeptr; /* restore the current mcodeptr */
+ cd->mcodeptr = savedmcodeptr; /* restore the current mcodeptr */
/* create stack frame */
/* note start of stub code */
- replacementpoint->outcode = (u1*) (ptrint)((u1*)mcodeptr - cd->mcodebase);
+ replacementpoint->outcode = (u1*) (ptrint)((u1*)cd->mcodeptr - cd->mcodebase);
/* make machine code for patching */
- tmpmcodeptr = mcodeptr;
- mcodeptr = (s4*) &(replacementpoint->mcode);
+ tmpmcodeptr = cd->mcodeptr;
+ cd->mcodeptr = (u4 *) &(replacementpoint->mcode);
disp = (ptrint)((s4*)replacementpoint->outcode - (s4*)replacementpoint->pc) - 1;
if ((disp < (s4) 0xffff8000) || (disp > (s4) 0x00007fff)) {
M_BR(disp);
M_NOP; /* delay slot */
- mcodeptr = tmpmcodeptr;
+ cd->mcodeptr = tmpmcodeptr;
/* create stack frame - 16-byte aligned */
}
}
- codegen_finish(jd, (s4) ((u1 *) mcodeptr - cd->mcodebase));
+ codegen_finish(jd, (s4) ((u1 *) cd->mcodeptr - cd->mcodebase));
/* everything's ok */
u1 *createcompilerstub(methodinfo *m)
{
- u1 *s; /* memory to hold the stub */
- ptrint *d;
- s4 *mcodeptr; /* code generation pointer */
+ u1 *s; /* memory to hold the stub */
+ ptrint *d;
+ codegendata *cd;
+ s4 dumpsize;
s = CNEW(u1, COMPILERSTUB_SIZE);
d = (ptrint *) s;
s = s + COMPILERSTUB_DATASIZE;
- mcodeptr = (s4 *) s;
-
+ /* mark start of dump memory area */
+
+ dumpsize = dump_size();
+
+ cd = DNEW(codegendata);
+ cd->mcodeptr = (u4 *) s;
+
/* Store the methodinfo* in the same place as in the methodheader
for compiled methods. */
M_JMP(REG_PV);
M_NOP;
- md_cacheflush(s, (s4) ((u1 *) mcodeptr - s));
+ md_cacheflush(s, (s4) ((u1 *) cd->mcodeptr - s));
#if defined(ENABLE_STATISTICS)
if (opt_stat)
count_cstub_len += COMPILERSTUB_SIZE;
#endif
+ /* release dump area */
+
+ dump_release(dumpsize);
+
return s;
}
methodinfo *m;
codegendata *cd;
registerdata *rd;
- s4 *mcodeptr; /* code generation pointer */
s4 stackframesize; /* size of stackframe if needed */
methoddesc *md;
s4 nativeparams;
(void) dseg_addlinenumbertablesize(cd);
(void) dseg_adds4(cd, 0); /* ExTableSize */
-
- /* initialize mcode variables */
-
- mcodeptr = (s4 *) cd->mcodeptr;
-
/* generate stub code */
M_LDA(REG_SP, REG_SP, -stackframesize * 8); /* build up stackframe */
#if !defined(WITH_STATIC_CLASSPATH)
if (f == NULL) {
- codegen_addpatchref(cd, mcodeptr, PATCHER_resolve_native, m, funcdisp);
+ codegen_addpatchref(cd, cd->mcodeptr, PATCHER_resolve_native, m, funcdisp);
if (opt_showdisassemble) {
M_NOP; M_NOP;
{
patchref *pref;
u8 mcode;
- s4 *savedmcodeptr;
- s4 *tmpmcodeptr;
+ u4 *savedmcodeptr;
+ u4 *tmpmcodeptr;
for (pref = cd->patchrefs; pref != NULL; pref = pref->next) {
/* Get machine code which is patched back in later. The
call is 2 instruction words long. */
- tmpmcodeptr = (s4 *) (cd->mcodebase + pref->branchpos);
+ tmpmcodeptr = (u4 *) (cd->mcodebase + pref->branchpos);
/* We need to split this, because an unaligned 8 byte read
causes a SIGSEGV. */
/* Patch in the call to call the following code (done at
compile time). */
- savedmcodeptr = mcodeptr; /* save current mcodeptr */
- mcodeptr = tmpmcodeptr; /* set mcodeptr to patch position */
+ savedmcodeptr = cd->mcodeptr; /* save current mcodeptr */
+ cd->mcodeptr = tmpmcodeptr; /* set mcodeptr to patch position */
M_BRS(savedmcodeptr - (tmpmcodeptr + 1));
M_NOP; /* branch delay slot */
- mcodeptr = savedmcodeptr; /* restore the current mcodeptr */
+ cd->mcodeptr = savedmcodeptr; /* restore the current mcodeptr */
/* create stack frame */
}
}
- codegen_finish(jd, (s4) ((u1 *) mcodeptr - cd->mcodebase));
+ codegen_finish(jd, (s4) ((u1 *) cd->mcodeptr - cd->mcodebase));
return jd->code->entrypoint;
}
projects / cacao.git / commitdiff