Christian Ullrich
Edwin Steiner
- $Id: codegen.c 4756 2006-04-12 09:49:18Z twisti $
+ $Id: codegen.c 5323 2006-09-05 16:45:24Z edwin $
*/
#include "mm/memory.h"
#include "native/native.h"
+
+#if defined(ENABLE_THREADS)
+# include "threads/native/lock.h"
+#endif
+
#include "vm/builtin.h"
#include "vm/exceptions.h"
#include "vm/global.h"
#include "vm/options.h"
#include "vm/stringlocal.h"
#include "vm/vm.h"
+#include "vm/jit/abi-asm.h"
#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/methodheader.h"
#include "vm/jit/parse.h"
#include "vm/jit/patcher.h"
#include "vm/jit/reg.h"
#endif
-s4 *codegen_trace_args( methodinfo *m, codegendata *cd, registerdata *rd,
- s4 *mcodeptr, s4 stackframesize, bool nativestub);
-
/* codegen *********************************************************************
Generates machine code.
bool codegen(jitdata *jd)
{
methodinfo *m;
+ codeinfo *code;
codegendata *cd;
registerdata *rd;
s4 len, s1, s2, s3, d, disp;
ptrint a;
- s4 stackframesize;
- s4 *mcodeptr;
stackptr src;
varinfo *var;
basicblock *bptr;
/* get required compiler data */
- m = jd->m;
- cd = jd->cd;
- rd = jd->rd;
+ m = jd->m;
+ code = jd->code;
+ cd = jd->cd;
+ rd = jd->rd;
/* prevent compiler warnings */
/* space to save used callee saved registers */
savedregs_num += (INT_SAV_CNT - rd->savintreguse);
- savedregs_num += 2 * (FLT_SAV_CNT - rd->savfltreguse);
+ savedregs_num += (FLT_SAV_CNT - rd->savfltreguse) * 2;
- stackframesize = rd->memuse + savedregs_num;
+ cd->stackframesize = rd->memuse + savedregs_num;
+
+#if defined(ENABLE_THREADS)
+ /* Space to save argument of monitor_enter and Return Values to
+ survive monitor_exit. The stack position for the argument can
+ not be shared with place to save the return register on PPC,
+ since both values reside in R3. */
-#if defined(USE_THREADS)
- /* space to save argument of monitor_enter and Return Values to survive */
- /* monitor_exit. The stack position for the argument can not be shared */
- /* with place to save the return register on PPC, since both values */
- /* reside in R3 */
if (checksync && (m->flags & ACC_SYNCHRONIZED)) {
/* reserve 2 slots for long/double return values for monitorexit */
if (IS_2_WORD_TYPE(m->parseddesc->returntype.type))
- stackframesize += 3;
+ cd->stackframesize += 3;
else
- stackframesize += 2;
+ cd->stackframesize += 2;
}
#endif
/* create method header */
- stackframesize = (stackframesize + 3) & ~3; /* align stack to 16-bytes */
+ /* align stack to 16-bytes */
+
+ if (!jd->isleafmethod || JITDATA_HAS_FLAG_VERBOSECALL(jd))
+ cd->stackframesize = (cd->stackframesize + 3) & ~3;
- (void) dseg_addaddress(cd, m); /* MethodPointer */
- (void) dseg_adds4(cd, stackframesize * 4); /* FrameSize */
+ else if (jd->isleafmethod && (cd->stackframesize == LA_SIZE_IN_POINTERS))
+ cd->stackframesize = 0;
-#if defined(USE_THREADS)
+ (void) dseg_add_unique_address(cd, code); /* CodeinfoPointer */
+ (void) dseg_add_unique_s4(cd, cd->stackframesize * 4); /* FrameSize */
+
+#if defined(ENABLE_THREADS)
/* IsSync contains the offset relative to the stack pointer for the
argument of monitor_exit used in the exception handler. Since the
offset could be zero and give a wrong meaning of the flag it is
*/
if (checksync && (m->flags & ACC_SYNCHRONIZED))
- (void) dseg_adds4(cd, (rd->memuse + 1) * 4); /* IsSync */
+ (void) dseg_add_unique_s4(cd, (rd->memuse + 1) * 4);/* IsSync */
else
#endif
- (void) dseg_adds4(cd, 0); /* IsSync */
+ (void) dseg_add_unique_s4(cd, 0); /* IsSync */
- (void) dseg_adds4(cd, m->isleafmethod); /* IsLeaf */
- (void) dseg_adds4(cd, INT_SAV_CNT - rd->savintreguse); /* IntSave */
- (void) dseg_adds4(cd, FLT_SAV_CNT - rd->savfltreguse); /* FltSave */
+ (void) dseg_add_unique_s4(cd, jd->isleafmethod); /* IsLeaf */
+ (void) dseg_add_unique_s4(cd, INT_SAV_CNT - rd->savintreguse); /* IntSave */
+ (void) dseg_add_unique_s4(cd, FLT_SAV_CNT - rd->savfltreguse); /* FltSave */
dseg_addlinenumbertablesize(cd);
- (void) dseg_adds4(cd, cd->exceptiontablelength); /* ExTableSize */
+ (void) dseg_add_unique_s4(cd, cd->exceptiontablelength); /* ExTableSize */
/* create exception table */
for (ex = cd->exceptiontable; ex != NULL; ex = ex->down) {
- dseg_addtarget(cd, ex->start);
- dseg_addtarget(cd, ex->end);
- dseg_addtarget(cd, ex->handler);
- (void) dseg_addaddress(cd, ex->catchtype.cls);
+ dseg_add_target(cd, ex->start);
+ dseg_add_target(cd, ex->end);
+ dseg_add_target(cd, ex->handler);
+ (void) dseg_add_unique_address(cd, ex->catchtype.cls);
}
- /* initialize mcode variables */
-
- mcodeptr = (s4 *) cd->mcodeptr;
+ /* generate method profiling code */
+
+ if (JITDATA_HAS_FLAG_INSTRUMENT(jd)) {
+ /* count frequency */
+
+ M_ALD(REG_ITMP1, REG_PV, CodeinfoPointer);
+ M_ALD(REG_ITMP2, REG_ITMP1, OFFSET(codeinfo, frequency));
+ M_IADD_IMM(REG_ITMP2, 1, REG_ITMP2);
+ M_AST(REG_ITMP2, REG_ITMP1, OFFSET(codeinfo, frequency));
+
+/* PROFILE_CYCLE_START; */
+ }
/* create stack frame (if necessary) */
- if (!m->isleafmethod) {
+ if (!jd->isleafmethod) {
M_MFLR(REG_ZERO);
M_AST(REG_ZERO, REG_SP, LA_LR_OFFSET);
}
- if (stackframesize)
- M_STWU(REG_SP, REG_SP, -stackframesize * 4);
+ if (cd->stackframesize)
+ M_STWU(REG_SP, REG_SP, -(cd->stackframesize * 4));
/* save return address and used callee saved registers */
- p = stackframesize;
+ p = cd->stackframesize;
for (i = INT_SAV_CNT - 1; i >= rd->savintreguse; i--) {
p--; M_IST(rd->savintregs[i], REG_SP, p * 4);
}
s2 = rd->argintregs[s1];
if (!md->params[p].inmemory) { /* register arguments */
if (!(var->flags & INMEMORY)) { /* reg arg -> register */
- M_TINTMOVE(t, s2, var->regoff);
+ if (IS_2_WORD_TYPE(t))
+ M_LNGMOVE(s2, var->regoff);
+ else
+ M_INTMOVE(s2, var->regoff);
} else { /* reg arg -> spilled */
- if (IS_2_WORD_TYPE(t)) {
- M_IST(GET_HIGH_REG(s2), REG_SP, var->regoff * 4);
- M_IST(GET_LOW_REG(s2), REG_SP, var->regoff * 4 + 4);
- } else {
+ if (IS_2_WORD_TYPE(t))
+ M_LST(s2, REG_SP, var->regoff * 4);
+ else
M_IST(s2, REG_SP, var->regoff * 4);
- }
}
} else { /* stack arguments */
if (!(var->flags & INMEMORY)) { /* stack arg -> register */
- if (IS_2_WORD_TYPE(t)) {
- M_ILD(GET_HIGH_REG(var->regoff), REG_SP,
- (stackframesize + s1) * 4);
- M_ILD(GET_LOW_REG(var->regoff), REG_SP,
- (stackframesize + s1) * 4 + 4);
- } else {
- M_ILD(var->regoff, REG_SP, (stackframesize + s1) * 4);
- }
+ if (IS_2_WORD_TYPE(t))
+ M_LLD(var->regoff, REG_SP, (cd->stackframesize + s1) * 4);
+ else
+ M_ILD(var->regoff, REG_SP, (cd->stackframesize + s1) * 4);
} else { /* stack arg -> spilled */
#if 1
- M_ILD(REG_ITMP1, REG_SP, (stackframesize + s1) * 4);
+ M_ILD(REG_ITMP1, REG_SP, (cd->stackframesize + s1) * 4);
M_IST(REG_ITMP1, REG_SP, var->regoff * 4);
if (IS_2_WORD_TYPE(t)) {
- M_ILD(REG_ITMP1, REG_SP, (stackframesize + s1) * 4 +4);
+ M_ILD(REG_ITMP1, REG_SP, (cd->stackframesize + s1) * 4 +4);
M_IST(REG_ITMP1, REG_SP, var->regoff * 4 + 4);
}
#else
/* Reuse Memory Position on Caller Stack */
- var->regoff = stackframesize + s1;
+ var->regoff = cd->stackframesize + s1;
#endif
}
}
} else { /* stack arguments */
if (!(var->flags & INMEMORY)) { /* stack-arg -> register */
if (IS_2_WORD_TYPE(t))
- M_DLD(var->regoff, REG_SP, (stackframesize + s1) * 4);
+ M_DLD(var->regoff, REG_SP, (cd->stackframesize + s1) * 4);
else
- M_FLD(var->regoff, REG_SP, (stackframesize + s1) * 4);
+ M_FLD(var->regoff, REG_SP, (cd->stackframesize + s1) * 4);
} else { /* stack-arg -> spilled */
#if 1
if (IS_2_WORD_TYPE(t)) {
- M_DLD(REG_FTMP1, REG_SP, (stackframesize + s1) * 4);
+ M_DLD(REG_FTMP1, REG_SP, (cd->stackframesize + s1) * 4);
M_DST(REG_FTMP1, REG_SP, var->regoff * 4);
- var->regoff = stackframesize + s1;
+ var->regoff = cd->stackframesize + s1;
} else {
- M_FLD(REG_FTMP1, REG_SP, (stackframesize + s1) * 4);
+ M_FLD(REG_FTMP1, REG_SP, (cd->stackframesize + s1) * 4);
M_FST(REG_FTMP1, REG_SP, var->regoff * 4);
}
#else
/* Reuse Memory Position on Caller Stack */
- var->regoff = stackframesize + s1;
+ var->regoff = cd->stackframesize + s1;
#endif
}
}
}
} /* end for */
- /* save monitorenter argument */
+#if defined(ENABLE_THREADS)
+ /* call monitorenter function */
-#if defined(USE_THREADS)
if (checksync && (m->flags & ACC_SYNCHRONIZED)) {
/* stack offset for monitor argument */
s1 = rd->memuse;
-#if 0
- if (opt_verbosecall) {
- M_LDA(REG_SP, REG_SP, -(INT_ARG_CNT * 4 + FLT_ARG_CNT * 8));
+# if !defined(NDEBUG)
+ if (JITDATA_HAS_FLAG_VERBOSECALL(jd)) {
+ M_AADD_IMM(REG_SP, -((LA_SIZE_IN_POINTERS + ARG_CNT) * 8), REG_SP);
for (p = 0; p < INT_ARG_CNT; p++)
- M_IST(rd->argintregs[p], REG_SP, p * 4);
+ M_IST(rd->argintregs[p], REG_SP, LA_SIZE + p * 8);
- for (p = 0; p < FLT_ARG_CNT * 2; p += 2)
- M_DST(rd->argfltregs[p], REG_SP, (INT_ARG_CNT + p) * 4);
+ for (p = 0; p < FLT_ARG_CNT; p++)
+ M_DST(rd->argfltregs[p], REG_SP, LA_SIZE + (INT_ARG_CNT + p) * 8);
+
+ /* ATTENTION: We multiply here with 2, because we use * 8
+ above for simplicity and below * 4! */
- s1 += INT_ARG_CNT + FLT_ARG_CNT;
+ s1 += (LA_SIZE_IN_POINTERS + ARG_CNT) * 2;
}
-#endif
+# endif
+
+ p = dseg_add_functionptr(cd, LOCK_monitor_enter);
+ M_ALD(REG_ITMP3, REG_PV, p);
+ M_MTCTR(REG_ITMP3);
- /* decide which monitor enter function to call */
+ /* get or test the lock object */
if (m->flags & ACC_STATIC) {
- p = dseg_addaddress(cd, m->class);
+ p = dseg_add_address(cd, &m->class->object.header);
M_ALD(rd->argintregs[0], REG_PV, p);
- M_AST(rd->argintregs[0], REG_SP, s1 * 4);
- p = dseg_addaddress(cd, BUILTIN_staticmonitorenter);
- M_ALD(REG_ITMP3, REG_PV, p);
- M_MTCTR(REG_ITMP3);
- M_JSR;
-
- } else {
+ }
+ else {
M_TST(rd->argintregs[0]);
M_BEQ(0);
- codegen_add_nullpointerexception_ref(cd, mcodeptr);
- M_AST(rd->argintregs[0], REG_SP, s1 * 4);
- p = dseg_addaddress(cd, BUILTIN_monitorenter);
- M_ALD(REG_ITMP3, REG_PV, p);
- M_MTCTR(REG_ITMP3);
- M_JSR;
+ codegen_add_nullpointerexception_ref(cd);
}
-#if 0
- if (opt_verbosecall) {
+ M_AST(rd->argintregs[0], REG_SP, s1 * 4);
+ M_JSR;
+
+# if !defined(NDEBUG)
+ if (JITDATA_HAS_FLAG_VERBOSECALL(jd)) {
for (p = 0; p < INT_ARG_CNT; p++)
- M_ILD(rd->argintregs[p], REG_SP, p * 4);
+ M_ILD(rd->argintregs[p], REG_SP, LA_SIZE + p * 8);
for (p = 0; p < FLT_ARG_CNT; p++)
- M_DLD(rd->argfltregs[p], REG_SP, (INT_ARG_CNT + p) * 4);
-
+ M_DLD(rd->argfltregs[p], REG_SP, LA_SIZE + (INT_ARG_CNT + p) * 8);
- M_LDA(REG_SP, REG_SP, (INT_ARG_CNT + FLT_ARG_CNT) * 8);
+ M_AADD_IMM(REG_SP, (LA_SIZE_IN_POINTERS + ARG_CNT) * 8, REG_SP);
}
-#endif
+# endif
}
-#endif
+#endif /* defined(ENABLE_THREADS) */
/* call trace function */
- if (opt_verbosecall) {
- mcodeptr = codegen_trace_args(m, cd, rd, mcodeptr, stackframesize, false);
-
- }
+ if (JITDATA_HAS_FLAG_VERBOSECALL(jd))
+ emit_verbosecall_enter(jd);
}
/* end of header generation */
- replacementpoint = jd->code->rplpoints;
+ replacementpoint = code->rplpoints;
/* walk through all basic blocks */
+
for (bptr = m->basicblocks; bptr != NULL; bptr = bptr->next) {
- bptr->mpc = (s4) ((u1 *) mcodeptr - cd->mcodebase);
+ bptr->mpc = (s4) (cd->mcodeptr - cd->mcodebase);
if (bptr->flags >= BBREACHED) {
replacementpoint++;
}
+ /* generate basicblock profiling code */
+
+ if (JITDATA_HAS_FLAG_INSTRUMENT(jd)) {
+ /* count frequency */
+
+ disp = dseg_add_address(cd, code->bbfrequency);
+ M_ALD(REG_ITMP2, REG_PV, disp);
+ M_ALD(REG_ITMP3, REG_ITMP2, bptr->nr * 4);
+ M_IADD_IMM(REG_ITMP3, 1, REG_ITMP3);
+ M_AST(REG_ITMP3, REG_ITMP2, bptr->nr * 4);
+
+ /* if this is an exception handler, start profiling again */
+
+/* if (bptr->type == BBTYPE_EXH) */
+/* PROFILE_CYCLE_START; */
+ }
+
/* copy interface registers to their destination */
src = bptr->instack;
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);
- } else {
+ emit_store(jd, NULL, src, d);
+ }
+ else {
if (src->type == TYPE_LNG)
- d = codegen_reg_of_var(rd, 0, src, PACK_REGS(REG_ITMP2, REG_ITMP1));
+ d = codegen_reg_of_var(rd, 0, src, REG_ITMP12_PACKED);
else
d = codegen_reg_of_var(rd, 0, src, REG_IFTMP);
if ((src->varkind != STACKVAR)) {
if (!(rd->interfaces[len][s2].flags & INMEMORY)) {
s1 = rd->interfaces[len][s2].regoff;
M_FLTMOVE(s1, d);
- } else {
+ }
+ else {
if (IS_2_WORD_TYPE(s2)) {
M_DLD(d, REG_SP,
rd->interfaces[len][s2].regoff * 4);
- } else {
+ }
+ else {
M_FLD(d, REG_SP,
rd->interfaces[len][s2].regoff * 4);
}
}
-
- if (IS_2_WORD_TYPE(s2)) {
- store_reg_to_var_dbl(src, d);
- } else {
- store_reg_to_var_flt(src, d);
- }
- } else {
+ emit_store(jd, NULL, src, d);
+ }
+ else {
if (!(rd->interfaces[len][s2].flags & INMEMORY)) {
s1 = rd->interfaces[len][s2].regoff;
- M_TINTMOVE(s2, s1, d);
- } else {
- if (IS_2_WORD_TYPE(s2)) {
- M_ILD(GET_HIGH_REG(d), REG_SP,
+ if (IS_2_WORD_TYPE(s2))
+ M_LNGMOVE(s1, d);
+ else
+ M_INTMOVE(s1, d);
+ }
+ else {
+ if (IS_2_WORD_TYPE(s2))
+ M_LLD(d, REG_SP,
rd->interfaces[len][s2].regoff * 4);
- M_ILD(GET_LOW_REG(d), REG_SP,
- rd->interfaces[len][s2].regoff * 4 + 4);
- } else {
+ else
M_ILD(d, REG_SP,
rd->interfaces[len][s2].regoff * 4);
- }
- }
-
- if (IS_2_WORD_TYPE(s2)) {
- store_reg_to_var_lng(src, d);
- } else {
- 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);
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_TST(s1);
M_BEQ(0);
- codegen_add_nullpointerexception_ref(cd, mcodeptr);
+ codegen_add_nullpointerexception_ref(cd);
break;
/* constant operations ************************************************/
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 */
/* op1 = 0, val.l = constant */
- d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, PACK_REGS(REG_ITMP2, REG_ITMP1));
+ d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP12_PACKED);
LCONST(d, iptr->val.l);
- store_reg_to_var_lng(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_FCONST: /* ... ==> ..., constant */
/* op1 = 0, val.f = constant */
d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_FTMP1);
- a = dseg_addfloat(cd, iptr->val.f);
+ a = dseg_add_float(cd, iptr->val.f);
M_FLD(d, REG_PV, a);
- 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 = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_FTMP1);
- a = dseg_adddouble(cd, iptr->val.d);
+ a = dseg_add_double(cd, iptr->val.d);
M_DLD(d, REG_PV, a);
- store_reg_to_var_dbl(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_ACONST: /* ... ==> ..., constant */
/* op1 = 0, val.a = constant */
d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP1);
- disp = dseg_addaddress(cd, iptr->val.a);
- if ((iptr->target != NULL) && (iptr->val.a == NULL)) {
- codegen_addpatchref(cd, mcodeptr,
- PATCHER_aconst,
- (unresolved_class *) iptr->target, disp);
+ if (INSTRUCTION_IS_UNRESOLVED(iptr)) {
+ constant_classref *cr = ICMD_ACONST_UNRESOLVED_CLASSREF(iptr);;
+
+ disp = dseg_add_unique_address(cd, cr);
+
+ codegen_addpatchref(cd, PATCHER_resolve_classref_to_classinfo,
+ cr, disp);
if (opt_showdisassemble)
M_NOP;
}
+ else
+ disp = dseg_add_address(cd, iptr->val.a);
M_ALD(d, REG_PV, disp);
- store_reg_to_var_adr(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
if ((iptr->dst->varkind == LOCALVAR) &&
(iptr->dst->varnum == iptr->op1))
break;
- if (var->flags & INMEMORY) {
+ if (var->flags & INMEMORY)
M_ILD(d, REG_SP, var->regoff * 4);
- } else {
- M_TINTMOVE(var->type, var->regoff, d);
- }
- store_reg_to_var_int(iptr->dst, d);
+ else
+ M_INTMOVE(var->regoff, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_LLOAD: /* ... ==> ..., content of local variable */
/* op1 = local variable */
var = &(rd->locals[iptr->op1][iptr->opc - ICMD_ILOAD]);
- d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, PACK_REGS(REG_ITMP2, REG_ITMP1));
+ d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP12_PACKED);
if ((iptr->dst->varkind == LOCALVAR) &&
(iptr->dst->varnum == iptr->op1))
break;
- if (var->flags & INMEMORY) {
- M_ILD(GET_HIGH_REG(d), REG_SP, var->regoff * 4);
- M_ILD(GET_LOW_REG(d), REG_SP, var->regoff * 4 + 4);
- } else {
- M_TINTMOVE(var->type, var->regoff, d);
- }
- store_reg_to_var_lng(iptr->dst, d);
+ if (var->flags & INMEMORY)
+ M_LLD(d, REG_SP, var->regoff * 4);
+ else
+ M_LNGMOVE(var->regoff, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_FLOAD: /* ... ==> ..., content of local variable */
(iptr->dst->varnum == iptr->op1))
break;
var = &(rd->locals[iptr->op1][iptr->opc - ICMD_ILOAD]);
- if (var->flags & INMEMORY) {
- M_FLD(d, REG_SP, var->regoff * 4);
- } else {
+ if (var->flags & INMEMORY)
+ M_FLD(d, REG_SP, var->regoff * 4);
+ else
M_FLTMOVE(var->regoff, d);
- }
- store_reg_to_var_flt(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_DLOAD: /* ... ==> ..., content of local variable */
(iptr->dst->varnum == iptr->op1))
break;
var = &(rd->locals[iptr->op1][iptr->opc - ICMD_ILOAD]);
- if (var->flags & INMEMORY) {
+ if (var->flags & INMEMORY)
M_DLD(d, REG_SP, var->regoff * 4);
- } else {
+ else
M_FLTMOVE(var->regoff, d);
- }
- store_reg_to_var_dbl(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_IST(s1, REG_SP, var->regoff * 4);
} else {
- var_to_reg_int(s1, src, var->regoff);
- M_TINTMOVE(var->type, s1, var->regoff);
+ s1 = emit_load_s1(jd, iptr, src, var->regoff);
+ M_INTMOVE(s1, var->regoff);
}
break;
break;
var = &(rd->locals[iptr->op1][iptr->opc - ICMD_ISTORE]);
if (var->flags & INMEMORY) {
- var_to_reg_int(s1, src, PACK_REGS(REG_ITMP2, REG_ITMP1));
- M_IST(GET_HIGH_REG(s1), REG_SP, var->regoff * 4);
- M_IST(GET_LOW_REG(s1), REG_SP, var->regoff * 4 + 4);
+ s1 = emit_load_s1(jd, iptr, src, REG_ITMP12_PACKED);
+ M_LST(s1, REG_SP, var->regoff * 4);
} else {
- var_to_reg_int(s1, src, var->regoff);
- M_TINTMOVE(var->type, s1, var->regoff);
+ s1 = emit_load_s1(jd, iptr, src, var->regoff);
+ M_LNGMOVE(s1, var->regoff);
}
break;
case ICMD_FSTORE: /* ..., value ==> ... */
- case ICMD_DSTORE: /* op1 = local variable */
+ /* op1 = local variable */
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_flt(s1, src, REG_FTMP1);
- if (var->type == TYPE_DBL)
- M_DST(s1, REG_SP, var->regoff * 4);
- else
- M_FST(s1, REG_SP, var->regoff * 4);
+ s1 = emit_load_s1(jd, iptr, src, REG_FTMP1);
+ M_FST(s1, REG_SP, var->regoff * 4);
+ } else {
+ s1 = emit_load_s1(jd, iptr, src, var->regoff);
+ M_FLTMOVE(s1, var->regoff);
+ }
+ break;
+
+ case ICMD_DSTORE: /* ..., value ==> ... */
+ /* op1 = local variable */
+
+ 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_FTMP1);
+ M_DST(s1, REG_SP, var->regoff * 4);
} 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 */
- 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_NEG(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, PACK_REGS(REG_ITMP2, REG_ITMP1));
- d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, PACK_REGS(REG_ITMP2, REG_ITMP1));
+ s1 = emit_load_s1(jd, iptr, src, REG_ITMP12_PACKED);
+ d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP12_PACKED);
M_SUBFIC(GET_LOW_REG(s1), 0, GET_LOW_REG(d));
M_SUBFZE(GET_HIGH_REG(s1), GET_HIGH_REG(d));
- store_reg_to_var_lng(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_I2L: /* ..., value ==> ..., value */
- var_to_reg_int(s1, src, REG_ITMP2);
- d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, PACK_REGS(REG_ITMP2, REG_ITMP1));
+ s1 = emit_load_s1(jd, iptr, src, REG_ITMP2);
+ d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP12_PACKED);
M_INTMOVE(s1, GET_LOW_REG(d));
M_SRA_IMM(GET_LOW_REG(d), 31, GET_HIGH_REG(d));
- store_reg_to_var_lng(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_L2I: /* ..., value ==> ..., value */
- var_to_reg_lng_low(s1, src, REG_ITMP2);
+ s1 = emit_load_s1_low(jd, iptr, src, REG_ITMP2);
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_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_BSEXT(s1, 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_SSEXT(s1, 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_lng_low(s1, src->prev, REG_ITMP1);
- var_to_reg_lng_low(s2, src, REG_ITMP2);
- d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, PACK_REGS(REG_ITMP2, REG_ITMP1));
+ s1 = emit_load_s1_low(jd, iptr, src->prev, REG_ITMP1);
+ s2 = emit_load_s2_low(jd, iptr, src, REG_ITMP2);
+ d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP12_PACKED);
M_ADDC(s1, s2, GET_LOW_REG(d));
- var_to_reg_lng_high(s1, src->prev, REG_ITMP1);
- var_to_reg_lng_high(s2, src, REG_ITMP3); /* don't use REG_ITMP2 */
+ s1 = emit_load_s1_high(jd, iptr, src->prev, REG_ITMP1);
+ s2 = emit_load_s2_high(jd, iptr, src, REG_ITMP3); /* don't use REG_ITMP2 */
M_ADDE(s1, s2, GET_HIGH_REG(d));
- store_reg_to_var_lng(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_LADDCONST: /* ..., value ==> ..., value + constant */
/* val.l = constant */
s3 = iptr->val.l & 0xffffffff;
- var_to_reg_lng_low(s1, src, REG_ITMP1);
- d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, PACK_REGS(REG_ITMP2, REG_ITMP1));
+ s1 = emit_load_s1_low(jd, iptr, src, REG_ITMP1);
+ d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP12_PACKED);
if ((s3 >= -32768) && (s3 <= 32767)) {
M_ADDIC(s1, s3, GET_LOW_REG(d));
} else {
ICONST(REG_ITMP2, s3);
M_ADDC(s1, REG_ITMP2, GET_LOW_REG(d));
}
- var_to_reg_lng_high(s1, src, REG_ITMP1);
+ s1 = emit_load_s1_high(jd, iptr, src, REG_ITMP1);
s3 = iptr->val.l >> 32;
if (s3 == -1) {
M_ADDME(s1, GET_HIGH_REG(d));
ICONST(REG_ITMP3, s3); /* don't use REG_ITMP2 */
M_ADDE(s1, REG_ITMP3, GET_HIGH_REG(d));
}
- store_reg_to_var_lng(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_IADD(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_lng_low(s1, src->prev, REG_ITMP1);
- var_to_reg_lng_low(s2, src, REG_ITMP2);
- d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, PACK_REGS(REG_ITMP2, REG_ITMP1));
+ s1 = emit_load_s1_low(jd, iptr, src->prev, REG_ITMP1);
+ s2 = emit_load_s2_low(jd, iptr, src, REG_ITMP2);
+ d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP12_PACKED);
M_SUBC(s1, s2, GET_LOW_REG(d));
- var_to_reg_lng_high(s1, src->prev, REG_ITMP1);
- var_to_reg_lng_high(s2, src, REG_ITMP3); /* don't use REG_ITMP2 */
+ s1 = emit_load_s1_high(jd, iptr, src->prev, REG_ITMP1);
+ s2 = emit_load_s2_high(jd, iptr, src, REG_ITMP3); /* don't use REG_ITMP2 */
M_SUBE(s1, s2, GET_HIGH_REG(d));
- store_reg_to_var_lng(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_LSUBCONST: /* ..., value ==> ..., value - constant */
/* val.l = constant */
s3 = (-iptr->val.l) & 0xffffffff;
- var_to_reg_lng_low(s1, src, REG_ITMP1);
- d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, PACK_REGS(REG_ITMP2, REG_ITMP1));
+ s1 = emit_load_s1_low(jd, iptr, src, REG_ITMP1);
+ d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP12_PACKED);
if ((s3 >= -32768) && (s3 <= 32767)) {
M_ADDIC(s1, s3, GET_LOW_REG(d));
} else {
ICONST(REG_ITMP2, s3);
M_ADDC(s1, REG_ITMP2, GET_LOW_REG(d));
}
- var_to_reg_lng_high(s1, src, REG_ITMP1);
+ s1 = emit_load_s1_high(jd, iptr, src, REG_ITMP1);
s3 = (-iptr->val.l) >> 32;
if (s3 == -1)
M_ADDME(s1, GET_HIGH_REG(d));
ICONST(REG_ITMP3, s3); /* don't use REG_ITMP2 */
M_ADDE(s1, REG_ITMP3, GET_HIGH_REG(d));
}
- store_reg_to_var_lng(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_ITMP1);
M_TST(s2);
M_BEQ(0);
- codegen_add_arithmeticexception_ref(cd, mcodeptr);
+ codegen_add_arithmeticexception_ref(cd);
M_LDAH(REG_ITMP3, REG_ZERO, 0x8000);
M_CMP(REG_ITMP3, s1);
M_BNE(3 + (s1 != d));
M_INTMOVE(s1, d);
M_BR(1);
M_IDIV(s1, s2, d);
- 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);
M_TST(s2);
M_BEQ(0);
- codegen_add_arithmeticexception_ref(cd, mcodeptr);
+ codegen_add_arithmeticexception_ref(cd);
M_LDAH(REG_ITMP3, REG_ZERO, 0x8000);
M_CMP(REG_ITMP3, s1);
M_BNE(4);
M_IDIV(s1, s2, REG_ITMP3);
M_IMUL(REG_ITMP3, s2, REG_ITMP3);
M_ISUB(s1, REG_ITMP3, d);
- store_reg_to_var_int(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_LDIV: /* ..., val1, val2 ==> ..., val1 / val2 */
bte = iptr->val.a;
md = bte->md;
- var_to_reg_int(s2, src, PACK_REGS(REG_ITMP2, REG_ITMP1));
+ s2 = emit_load_s2(jd, iptr, src, REG_ITMP12_PACKED);
M_OR_TST(GET_HIGH_REG(s2), GET_LOW_REG(s2), REG_ITMP3);
M_BEQ(0);
- codegen_add_arithmeticexception_ref(cd, mcodeptr);
+ codegen_add_arithmeticexception_ref(cd);
+
+ disp = dseg_add_functionptr(cd, bte->fp);
+ M_ALD(REG_ITMP3, REG_PV, disp);
+ M_MTCTR(REG_ITMP3);
s3 = PACK_REGS(rd->argintregs[GET_LOW_REG(md->params[1].regoff)],
rd->argintregs[GET_HIGH_REG(md->params[1].regoff)]);
- M_TINTMOVE(TYPE_LNG, s2, s3);
+ M_LNGMOVE(s2, s3);
- var_to_reg_int(s1, src->prev, PACK_REGS(REG_ITMP2, REG_ITMP1));
+ s1 = emit_load_s1(jd, iptr, src->prev, REG_ITMP12_PACKED);
s3 = PACK_REGS(rd->argintregs[GET_LOW_REG(md->params[0].regoff)],
rd->argintregs[GET_HIGH_REG(md->params[0].regoff)]);
- M_TINTMOVE(TYPE_LNG, s1, s3);
+ M_LNGMOVE(s1, s3);
- disp = dseg_addaddress(cd, bte->fp);
- M_ALD(REG_ITMP1, REG_PV, disp);
- M_MTCTR(REG_ITMP1);
M_JSR;
- d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, PACK_REGS(REG_RESULT2, REG_RESULT));
- M_TINTMOVE(TYPE_LNG, PACK_REGS(REG_RESULT2, REG_RESULT), d);
- store_reg_to_var_lng(iptr->dst, d);
+ d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_RESULT_PACKED);
+ M_LNGMOVE(REG_RESULT_PACKED, 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, d);
- 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);
if ((iptr->val.i >= -32768) && (iptr->val.i <= 32767)) {
M_IMUL_IMM(s1, iptr->val.i, d);
ICONST(REG_ITMP3, iptr->val.i);
M_IMUL(s1, REG_ITMP3, d);
}
- store_reg_to_var_int(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_IDIVPOW2: /* ..., value ==> ..., value << 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_ITMP3);
M_SRA_IMM(s1, iptr->val.i, d);
M_ADDZE(d, 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_AND_IMM(s2, 0x1f, REG_ITMP3);
M_SLL(s1, REG_ITMP3, 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_SLL_IMM(s1, iptr->val.i & 0x1f, 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_AND_IMM(s2, 0x1f, REG_ITMP3);
M_SRA(s1, REG_ITMP3, 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_SRA_IMM(s1, iptr->val.i & 0x1f, 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_AND_IMM(s2, 0x1f, REG_ITMP2);
M_SRL(s1, REG_ITMP2, 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);
if (iptr->val.i & 0x1f) {
M_SRL_IMM(s1, iptr->val.i & 0x1f, d);
} else {
M_INTMOVE(s1, d);
}
- store_reg_to_var_int(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_IAND: /* ..., 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_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 <= 65535)) {
M_AND_IMM(s1, iptr->val.i, d);
ICONST(REG_ITMP3, iptr->val.i);
M_AND(s1, REG_ITMP3, d);
}
- store_reg_to_var_int(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_LAND: /* ..., val1, val2 ==> ..., val1 & val2 */
- var_to_reg_lng_low(s1, src->prev, REG_ITMP1);
- var_to_reg_lng_low(s2, src, REG_ITMP2);
- d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, PACK_REGS(REG_ITMP2, REG_ITMP1));
+ s1 = emit_load_s1_low(jd, iptr, src->prev, REG_ITMP1);
+ s2 = emit_load_s2_low(jd, iptr, src, REG_ITMP2);
+ d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP12_PACKED);
M_AND(s1, s2, GET_LOW_REG(d));
- var_to_reg_lng_high(s1, src->prev, REG_ITMP1);
- var_to_reg_lng_high(s2, src, REG_ITMP3); /* don't use REG_ITMP2 */
+ s1 = emit_load_s1_high(jd, iptr, src->prev, REG_ITMP1);
+ s2 = emit_load_s2_high(jd, iptr, src, REG_ITMP3); /* don't use REG_ITMP2 */
M_AND(s1, s2, GET_HIGH_REG(d));
- store_reg_to_var_lng(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_LANDCONST: /* ..., value ==> ..., value & constant */
/* val.l = constant */
s3 = iptr->val.l & 0xffffffff;
- var_to_reg_lng_low(s1, src, REG_ITMP1);
- d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, PACK_REGS(REG_ITMP2, REG_ITMP1));
+ s1 = emit_load_s1_low(jd, iptr, src, REG_ITMP1);
+ d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP12_PACKED);
if ((s3 >= 0) && (s3 <= 65535)) {
M_AND_IMM(s1, s3, GET_LOW_REG(d));
} else {
ICONST(REG_ITMP3, s3);
M_AND(s1, REG_ITMP3, GET_LOW_REG(d));
}
- var_to_reg_lng_high(s1, src, REG_ITMP1);
+ s1 = emit_load_s1_high(jd, iptr, src, REG_ITMP1);
s3 = iptr->val.l >> 32;
if ((s3 >= 0) && (s3 <= 65535)) {
M_AND_IMM(s1, s3, GET_HIGH_REG(d));
ICONST(REG_ITMP3, s3); /* don't use REG_ITMP2 */
M_AND(s1, REG_ITMP3, GET_HIGH_REG(d));
}
- store_reg_to_var_lng(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);
M_MOV(s1, REG_ITMP2);
M_CMPI(s1, 0);
M_RLWINM(REG_ITMP2, 0, 0, 30-b, REG_ITMP2);
}
M_ISUB(s1, REG_ITMP2, d);
- store_reg_to_var_int(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_IOR: /* ..., 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_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 <= 65535)) {
M_OR_IMM(s1, iptr->val.i, d);
ICONST(REG_ITMP3, iptr->val.i);
M_OR(s1, REG_ITMP3, d);
}
- store_reg_to_var_int(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_LOR: /* ..., val1, val2 ==> ..., val1 | val2 */
- var_to_reg_lng_low(s1, src->prev, REG_ITMP1);
- var_to_reg_lng_low(s2, src, REG_ITMP2);
- d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, PACK_REGS(REG_ITMP2, REG_ITMP1));
+ s1 = emit_load_s1_low(jd, iptr, src->prev, REG_ITMP1);
+ s2 = emit_load_s2_low(jd, iptr, src, REG_ITMP2);
+ d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP12_PACKED);
M_OR(s1, s2, GET_LOW_REG(d));
- var_to_reg_lng_high(s1, src->prev, REG_ITMP1);
- var_to_reg_lng_high(s2, src, REG_ITMP3); /* don't use REG_ITMP2 */
+ s1 = emit_load_s1_high(jd, iptr, src->prev, REG_ITMP1);
+ s2 = emit_load_s2_high(jd, iptr, src, REG_ITMP3); /* don't use REG_ITMP2 */
M_OR(s1, s2, GET_HIGH_REG(d));
- store_reg_to_var_lng(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_LORCONST: /* ..., value ==> ..., value | constant */
/* val.l = constant */
s3 = iptr->val.l & 0xffffffff;
- var_to_reg_lng_low(s1, src, REG_ITMP1);
- d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, PACK_REGS(REG_ITMP2, REG_ITMP1));
+ s1 = emit_load_s1_low(jd, iptr, src, REG_ITMP1);
+ d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP12_PACKED);
if ((s3 >= 0) && (s3 <= 65535)) {
M_OR_IMM(s1, s3, GET_LOW_REG(d));
} else {
ICONST(REG_ITMP3, s3);
M_OR(s1, REG_ITMP3, GET_LOW_REG(d));
}
- var_to_reg_lng_high(s1, src, REG_ITMP1);
+ s1 = emit_load_s1_high(jd, iptr, src, REG_ITMP1);
s3 = iptr->val.l >> 32;
if ((s3 >= 0) && (s3 <= 65535)) {
M_OR_IMM(s1, s3, GET_HIGH_REG(d));
ICONST(REG_ITMP3, s3); /* don't use REG_ITMP2 */
M_OR(s1, REG_ITMP3, GET_HIGH_REG(d));
}
- store_reg_to_var_lng(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_IXOR: /* ..., 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_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 <= 65535)) {
M_XOR_IMM(s1, iptr->val.i, d);
ICONST(REG_ITMP3, iptr->val.i);
M_XOR(s1, REG_ITMP3, d);
}
- store_reg_to_var_int(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_LXOR: /* ..., val1, val2 ==> ..., val1 ^ val2 */
- var_to_reg_lng_low(s1, src->prev, REG_ITMP1);
- var_to_reg_lng_low(s2, src, REG_ITMP2);
- d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, PACK_REGS(REG_ITMP2, REG_ITMP1));
+ s1 = emit_load_s1_low(jd, iptr, src->prev, REG_ITMP1);
+ s2 = emit_load_s2_low(jd, iptr, src, REG_ITMP2);
+ d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP12_PACKED);
M_XOR(s1, s2, GET_LOW_REG(d));
- var_to_reg_lng_high(s1, src->prev, REG_ITMP1);
- var_to_reg_lng_high(s2, src, REG_ITMP3); /* don't use REG_ITMP2 */
+ s1 = emit_load_s1_high(jd, iptr, src->prev, REG_ITMP1);
+ s2 = emit_load_s2_high(jd, iptr, src, REG_ITMP3); /* don't use REG_ITMP2 */
M_XOR(s1, s2, GET_HIGH_REG(d));
- store_reg_to_var_lng(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_LXORCONST: /* ..., value ==> ..., value ^ constant */
/* val.l = constant */
s3 = iptr->val.l & 0xffffffff;
- var_to_reg_lng_low(s1, src, REG_ITMP1);
- d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, PACK_REGS(REG_ITMP2, REG_ITMP1));
+ s1 = emit_load_s1_low(jd, iptr, src, REG_ITMP1);
+ d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP12_PACKED);
if ((s3 >= 0) && (s3 <= 65535)) {
M_XOR_IMM(s1, s3, GET_LOW_REG(d));
} else {
ICONST(REG_ITMP3, s3);
M_XOR(s1, REG_ITMP3, GET_LOW_REG(d));
}
- var_to_reg_lng_high(s1, src, REG_ITMP1);
+ s1 = emit_load_s1_high(jd, iptr, src, REG_ITMP1);
s3 = iptr->val.l >> 32;
if ((s3 >= 0) && (s3 <= 65535)) {
M_XOR_IMM(s1, s3, GET_HIGH_REG(d));
ICONST(REG_ITMP3, s3); /* don't use REG_ITMP2 */
M_XOR(s1, REG_ITMP3, GET_HIGH_REG(d));
}
- store_reg_to_var_lng(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_LCMP: /* ..., val1, val2 ==> ..., val1 cmp val2 */
/*******************************************************************
TODO: CHANGE THIS TO A VERSION THAT WORKS !!!
*******************************************************************/
- var_to_reg_lng_high(s1, src->prev, REG_ITMP3);
- var_to_reg_lng_high(s2, src, REG_ITMP2);
+ s1 = emit_load_s1_high(jd, iptr, src->prev, REG_ITMP3);
+ s2 = emit_load_s2_high(jd, iptr, src, REG_ITMP2);
d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP1);
{
int tempreg = false;
int dreg;
- s4 *br1;
+ u1 *br1;
if (src->prev->flags & INMEMORY) {
tempreg = tempreg || (d == REG_ITMP3) || (d == REG_ITMP2);
M_IADD_IMM(REG_ZERO, 1, dreg);
M_CMP(s1, s2);
M_BGT(0);
- br1 = mcodeptr;
+ br1 = cd->mcodeptr;
M_BLT(0);
- var_to_reg_lng_low(s1, src->prev, REG_ITMP3);
- var_to_reg_lng_low(s2, src, REG_ITMP2);
+ s1 = emit_load_s1_low(jd, iptr, src->prev, REG_ITMP3);
+ s2 = emit_load_s2_low(jd, iptr, src, REG_ITMP2);
M_CMPU(s1, s2);
M_BGT(3);
M_BEQ(1);
M_IADD_IMM(dreg, -1, dreg);
M_IADD_IMM(dreg, -1, dreg);
- gen_resolvebranch(br1, (u1*) br1, (u1*) mcodeptr);
- gen_resolvebranch(br1+1, (u1*) (br1+1), (u1*) (mcodeptr-2));
+ gen_resolvebranch(br1, br1, cd->mcodeptr);
+ gen_resolvebranch(br1 + 1 * 4, br1 + 1 * 4, cd->mcodeptr - 2 * 4);
M_INTMOVE(dreg, d);
}
- store_reg_to_var_lng(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_IINC: /* ..., value ==> ..., value + constant */
if (var->flags & INMEMORY) {
s1 = REG_ITMP1;
M_ILD(s1, REG_SP, var->regoff * 4);
- } else {
+ } else
s1 = var->regoff;
- }
{
u4 m = iptr->val.i;
if (m & 0x8000)
if (m & 0xffff)
M_IADD_IMM(s1, m & 0xffff, s1);
}
- if (var->flags & INMEMORY) {
+ if (var->flags & INMEMORY)
M_IST(s1, REG_SP, var->regoff * 4);
- }
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_FTMP3);
M_FMOVN(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_FTMP3);
M_FMOVN(s1, d);
- store_reg_to_var_dbl(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_FTMP3);
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_FTMP3);
M_DADD(s1, s2, d);
- store_reg_to_var_dbl(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_FTMP3);
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_FTMP3);
M_DSUB(s1, s2, d);
- store_reg_to_var_dbl(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_FTMP3);
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_FTMP3);
M_DMUL(s1, s2, d);
- store_reg_to_var_dbl(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_FTMP3);
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_FTMP3);
M_DDIV(s1, s2, d);
- store_reg_to_var_dbl(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_F2I: /* ..., value ==> ..., (int) value */
case ICMD_D2I:
- 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_CLR(d);
- disp = dseg_addfloat(cd, 0.0);
+ disp = dseg_add_float(cd, 0.0);
M_FLD(REG_FTMP2, REG_PV, disp);
M_FCMPU(s1, REG_FTMP2);
M_BNAN(4);
- disp = dseg_adds4(cd, 0);
+ disp = dseg_add_unique_s4(cd, 0);
M_CVTDL_C(s1, REG_FTMP1);
M_LDA(REG_ITMP1, REG_PV, disp);
M_STFIWX(REG_FTMP1, 0, REG_ITMP1);
M_ILD(d, REG_PV, disp);
- 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);
+ s1 = emit_load_s1(jd, iptr, src, REG_FTMP1);
d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_FTMP3);
M_FLTMOVE(s1, d);
- store_reg_to_var_dbl(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_FTMP3);
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 fcmpg val2 */
- case ICMD_DCMPL:
+ case ICMD_DCMPL: /* == => 0, < => 1, > => -1 */
+
- 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_FCMPU(s2, s1);
M_IADD_IMM(REG_ZERO, -1, d);
M_IADD_IMM(REG_ZERO, 0, d);
M_BGE(1);
M_IADD_IMM(REG_ZERO, 1, d);
- store_reg_to_var_int(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_FCMPG: /* ..., val1, val2 ==> ..., val1 fcmpl val2 */
- case ICMD_DCMPG:
+ case ICMD_DCMPG: /* == => 0, < => 1, > => -1 */
- 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_FCMPU(s1, s2);
M_IADD_IMM(REG_ZERO, 1, d);
M_IADD_IMM(REG_ZERO, 0, d);
M_BGE(1);
M_IADD_IMM(REG_ZERO, -1, d);
- store_reg_to_var_int(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
+ case ICMD_IF_FCMPEQ: /* ..., value, value ==> ... */
+ case ICMD_IF_DCMPEQ:
+
+ s1 = emit_load_s1(jd, iptr, src->prev, REG_FTMP1);
+ s2 = emit_load_s2(jd, iptr, src, REG_FTMP2);
+ M_FCMPU(s1, s2);
+ M_BNAN(1);
+ M_BEQ(0);
+ codegen_addreference(cd, (basicblock *) iptr->target);
+ break;
+
+ case ICMD_IF_FCMPNE: /* ..., value, value ==> ... */
+ case ICMD_IF_DCMPNE:
+
+ s1 = emit_load_s1(jd, iptr, src->prev, REG_FTMP1);
+ s2 = emit_load_s2(jd, iptr, src, REG_FTMP2);
+ M_FCMPU(s1, s2);
+ M_BNAN(0);
+ codegen_addreference(cd, (basicblock *) iptr->target);
+ M_BNE(0);
+ codegen_addreference(cd, (basicblock *) iptr->target);
+ break;
+
+
+ case ICMD_IF_FCMPL_LT: /* ..., value, value ==> ... */
+ case ICMD_IF_DCMPL_LT:
+
+ s1 = emit_load_s1(jd, iptr, src->prev, REG_FTMP1);
+ s2 = emit_load_s2(jd, iptr, src, REG_FTMP2);
+ M_FCMPU(s1, s2);
+ M_BNAN(0);
+ codegen_addreference(cd, (basicblock *) iptr->target);
+ M_BLT(0);
+ codegen_addreference(cd, (basicblock *) iptr->target);
+ break;
+
+ case ICMD_IF_FCMPL_GT: /* ..., value, value ==> ... */
+ case ICMD_IF_DCMPL_GT:
+
+ s1 = emit_load_s1(jd, iptr, src->prev, REG_FTMP1);
+ s2 = emit_load_s2(jd, iptr, src, REG_FTMP2);
+ M_FCMPU(s1, s2);
+ M_BNAN(1);
+ M_BGT(0);
+ codegen_addreference(cd, (basicblock *) iptr->target);
+ break;
+
+ case ICMD_IF_FCMPL_LE: /* ..., value, value ==> ... */
+ case ICMD_IF_DCMPL_LE:
+
+ s1 = emit_load_s1(jd, iptr, src->prev, REG_FTMP1);
+ s2 = emit_load_s2(jd, iptr, src, REG_FTMP2);
+ M_FCMPU(s1, s2);
+ M_BNAN(0);
+ codegen_addreference(cd, (basicblock *) iptr->target);
+ M_BLE(0);
+ codegen_addreference(cd, (basicblock *) iptr->target);
+ break;
+
+ case ICMD_IF_FCMPL_GE: /* ..., value, value ==> ... */
+ case ICMD_IF_DCMPL_GE:
+
+ s1 = emit_load_s1(jd, iptr, src->prev, REG_FTMP1);
+ s2 = emit_load_s2(jd, iptr, src, REG_FTMP2);
+ M_FCMPU(s1, s2);
+ M_BNAN(1);
+ M_BGE(0);
+ codegen_addreference(cd, (basicblock *) iptr->target);
+ break;
+
+ case ICMD_IF_FCMPG_LT: /* ..., value, value ==> ... */
+ case ICMD_IF_DCMPG_LT:
+
+ s1 = emit_load_s1(jd, iptr, src->prev, REG_FTMP1);
+ s2 = emit_load_s2(jd, iptr, src, REG_FTMP2);
+ M_FCMPU(s1, s2);
+ M_BNAN(1);
+ M_BLT(0);
+ codegen_addreference(cd, (basicblock *) iptr->target);
+ break;
+
+ case ICMD_IF_FCMPG_GT: /* ..., value, value ==> ... */
+ case ICMD_IF_DCMPG_GT:
+
+ s1 = emit_load_s1(jd, iptr, src->prev, REG_FTMP1);
+ s2 = emit_load_s2(jd, iptr, src, REG_FTMP2);
+ M_FCMPU(s1, s2);
+ M_BNAN(0);
+ codegen_addreference(cd, (basicblock *) iptr->target);
+ M_BGT(0);
+ codegen_addreference(cd, (basicblock *) iptr->target);
+ break;
+
+ case ICMD_IF_FCMPG_LE: /* ..., value, value ==> ... */
+ case ICMD_IF_DCMPG_LE:
+
+ s1 = emit_load_s1(jd, iptr, src->prev, REG_FTMP1);
+ s2 = emit_load_s2(jd, iptr, src, REG_FTMP2);
+ M_FCMPU(s1, s2);
+ M_BNAN(1);
+ M_BLE(0);
+ codegen_addreference(cd, (basicblock *) iptr->target);
+ break;
+
+ case ICMD_IF_FCMPG_GE: /* ..., value, value ==> ... */
+ case ICMD_IF_DCMPG_GE:
+
+ s1 = emit_load_s1(jd, iptr, src->prev, REG_FTMP1);
+ s2 = emit_load_s2(jd, iptr, src, REG_FTMP2);
+ M_FCMPU(s1, s2);
+ M_BNAN(0);
+ codegen_addreference(cd, (basicblock *) iptr->target);
+ M_BGE(0);
+ codegen_addreference(cd, (basicblock *) iptr->target);
+ break;
+
/* memory operations **************************************************/
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_IADD_IMM(s2, OFFSET(java_chararray, data[0]), REG_ITMP2);
M_LBZX(d, s1, REG_ITMP2);
M_BSEXT(d, d);
- 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_SLL_IMM(s2, 1, REG_ITMP2);
M_IADD_IMM(REG_ITMP2, OFFSET(java_chararray, data[0]), REG_ITMP2);
M_LHZX(d, s1, REG_ITMP2);
- 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_SLL_IMM(s2, 1, REG_ITMP2);
M_IADD_IMM(REG_ITMP2, OFFSET(java_shortarray, data[0]), REG_ITMP2);
M_LHAX(d, s1, REG_ITMP2);
- 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_SLL_IMM(s2, 2, REG_ITMP2);
M_IADD_IMM(REG_ITMP2, OFFSET(java_intarray, data[0]), REG_ITMP2);
M_LWZX(d, s1, REG_ITMP2);
- 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);
- d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, PACK_REGS(REG_ITMP2, REG_ITMP1));
+ 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_ITMP12_PACKED);
if (iptr->op1 == 0) {
gen_nullptr_check(s1);
gen_bound_check;
}
M_SLL_IMM(s2, 3, REG_ITMP2);
M_IADD(s1, REG_ITMP2, REG_ITMP2);
- M_ILD(GET_HIGH_REG(d), REG_ITMP2, OFFSET(java_longarray, data[0]));
- M_ILD(GET_LOW_REG(d), REG_ITMP2, OFFSET(java_longarray,
- data[0]) + 4);
- store_reg_to_var_lng(iptr->dst, d);
+ M_LLD_INTERN(d, REG_ITMP2, OFFSET(java_longarray, data[0]));
+ 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_SLL_IMM(s2, 2, REG_ITMP2);
M_IADD_IMM(REG_ITMP2, OFFSET(java_floatarray, data[0]), REG_ITMP2);
M_LFSX(d, s1, REG_ITMP2);
- 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_SLL_IMM(s2, 3, REG_ITMP2);
M_IADD_IMM(REG_ITMP2, OFFSET(java_doublearray, data[0]), REG_ITMP2);
M_LFDX(d, s1, REG_ITMP2);
- store_reg_to_var_dbl(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_SLL_IMM(s2, 2, REG_ITMP2);
M_IADD_IMM(REG_ITMP2, OFFSET(java_objectarray, data[0]), REG_ITMP2);
M_LWZX(d, s1, REG_ITMP2);
- store_reg_to_var_adr(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;
}
- var_to_reg_int(s3, src, REG_ITMP3);
+ s3 = emit_load_s3(jd, iptr, src, REG_ITMP3);
M_IADD_IMM(s2, OFFSET(java_bytearray, data[0]), REG_ITMP2);
M_STBX(s3, s1, REG_ITMP2);
break;
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);
+ s3 = emit_load_s3(jd, iptr, src, REG_ITMP3);
M_SLL_IMM(s2, 1, REG_ITMP2);
M_IADD_IMM(REG_ITMP2, OFFSET(java_chararray, data[0]), REG_ITMP2);
M_STHX(s3, s1, REG_ITMP2);
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_int(s3, src, REG_ITMP3);
+ s3 = emit_load_s3(jd, iptr, src, REG_ITMP3);
M_SLL_IMM(s2, 1, REG_ITMP2);
M_IADD_IMM(REG_ITMP2, OFFSET(java_shortarray, data[0]), REG_ITMP2);
M_STHX(s3, s1, REG_ITMP2);
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_int(s3, src, REG_ITMP3);
+ s3 = emit_load_s3(jd, iptr, src, REG_ITMP3);
M_SLL_IMM(s2, 2, REG_ITMP2);
M_IADD_IMM(REG_ITMP2, OFFSET(java_intarray, data[0]), REG_ITMP2);
M_STWX(s3, s1, REG_ITMP2);
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_lng_high(s3, src, REG_ITMP3);
+ s3 = emit_load_s3_high(jd, iptr, src, REG_ITMP3);
M_SLL_IMM(s2, 3, REG_ITMP2);
M_IADD_IMM(REG_ITMP2, OFFSET(java_longarray, data[0]), REG_ITMP2);
M_STWX(s3, s1, REG_ITMP2);
M_IADD_IMM(REG_ITMP2, 4, REG_ITMP2);
- var_to_reg_lng_low(s3, src, REG_ITMP3);
+ s3 = emit_load_s3_low(jd, iptr, src, REG_ITMP3);
M_STWX(s3, s1, REG_ITMP2);
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;
}
- var_to_reg_flt(s3, src, REG_FTMP3);
+ s3 = emit_load_s3(jd, iptr, src, REG_FTMP3);
M_SLL_IMM(s2, 2, REG_ITMP2);
M_IADD_IMM(REG_ITMP2, OFFSET(java_floatarray, data[0]), REG_ITMP2);
M_STFSX(s3, s1, REG_ITMP2);
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_flt(s3, src, REG_FTMP3);
+ s3 = emit_load_s3(jd, iptr, src, REG_FTMP3);
M_SLL_IMM(s2, 3, REG_ITMP2);
M_IADD_IMM(REG_ITMP2, OFFSET(java_doublearray, data[0]), REG_ITMP2);
M_STFDX(s3, s1, REG_ITMP2);
case ICMD_AASTORE: /* ..., arrayref, index, value ==> ... */
- var_to_reg_int(s1, src->prev->prev, rd->argintregs[0]);
- var_to_reg_int(s2, src->prev, REG_ITMP2);
+ s1 = emit_load_s1(jd, iptr, src->prev->prev, rd->argintregs[0]);
+ 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, rd->argintregs[1]);
+ s3 = emit_load_s3(jd, iptr, src, rd->argintregs[1]);
+
+ disp = dseg_add_functionptr(cd, BUILTIN_canstore);
+ M_ALD(REG_ITMP3, REG_PV, disp);
+ M_MTCTR(REG_ITMP3);
M_INTMOVE(s1, rd->argintregs[0]);
M_INTMOVE(s3, rd->argintregs[1]);
- disp = dseg_addaddress(cd, BUILTIN_canstore);
- M_ALD(REG_ITMP1, REG_PV, disp);
- M_MTCTR(REG_ITMP1);
+
M_JSR;
M_TST(REG_RESULT);
M_BEQ(0);
- codegen_add_arraystoreexception_ref(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);
M_SLL_IMM(s2, 2, REG_ITMP2);
M_IADD_IMM(REG_ITMP2, OFFSET(java_objectarray, data[0]), REG_ITMP2);
M_STWX(s3, s1, REG_ITMP2);
case ICMD_GETSTATIC: /* ... ==> ..., value */
/* op1 = type, val.a = field address */
- if (iptr->val.a == NULL) {
- disp = dseg_addaddress(cd, NULL);
+ if (INSTRUCTION_IS_UNRESOLVED(iptr)) {
+ unresolved_field *uf = INSTRUCTION_UNRESOLVED_FIELD(iptr);
+
+ disp = dseg_add_unique_address(cd, uf);
- codegen_addpatchref(cd, mcodeptr,
- PATCHER_get_putstatic,
- (unresolved_field *) iptr->target, disp);
+ codegen_addpatchref(cd, PATCHER_get_putstatic, uf, disp);
if (opt_showdisassemble)
M_NOP;
+ }
+ else {
+ fieldinfo *fi = INSTRUCTION_RESOLVED_FIELDINFO(iptr);
- } else {
- fieldinfo *fi = iptr->val.a;
-
- disp = dseg_addaddress(cd, &(fi->value));
+ disp = dseg_add_address(cd, &(fi->value));
if (!CLASS_IS_OR_ALMOST_INITIALIZED(fi->class)) {
- codegen_addpatchref(cd, mcodeptr,
- PATCHER_clinit, fi->class, disp);
+ codegen_addpatchref(cd, PATCHER_initialize_class,
+ fi->class, disp);
if (opt_showdisassemble)
M_NOP;
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);
break;
case TYPE_LNG:
- d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, PACK_REGS(REG_ITMP2, REG_ITMP1));
+ d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP12_PACKED);
M_ILD_INTERN(GET_LOW_REG(d), REG_ITMP1, 4);/* keep this order */
M_ILD_INTERN(GET_HIGH_REG(d), REG_ITMP1, 0);/*keep this order */
- store_reg_to_var_lng(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_adr(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);
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_dbl(iptr->dst, d);
break;
}
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_PUTSTATIC: /* ..., value ==> ... */
/* op1 = type, val.a = field address */
+ if (INSTRUCTION_IS_UNRESOLVED(iptr)) {
+ unresolved_field *uf = INSTRUCTION_UNRESOLVED_FIELD(iptr);
- if (iptr->val.a == NULL) {
- disp = dseg_addaddress(cd, NULL);
+ disp = dseg_add_unique_address(cd, uf);
- codegen_addpatchref(cd, mcodeptr,
- PATCHER_get_putstatic,
- (unresolved_field *) iptr->target, disp);
+ codegen_addpatchref(cd, PATCHER_get_putstatic, uf, disp);
if (opt_showdisassemble)
M_NOP;
+ }
+ else {
+ fieldinfo *fi = INSTRUCTION_RESOLVED_FIELDINFO(iptr);
- } else {
- fieldinfo *fi = iptr->val.a;
-
- disp = dseg_addaddress(cd, &(fi->value));
+ disp = dseg_add_address(cd, &(fi->value));
if (!CLASS_IS_OR_ALMOST_INITIALIZED(fi->class)) {
- codegen_addpatchref(cd, mcodeptr,
- PATCHER_clinit, fi->class, disp);
+ codegen_addpatchref(cd, PATCHER_initialize_class,
+ fi->class, disp);
if (opt_showdisassemble)
M_NOP;
M_ALD(REG_ITMP1, REG_PV, disp);
switch (iptr->op1) {
case TYPE_INT:
- var_to_reg_int(s2, src, REG_ITMP2);
- M_IST_INTERN(s2, REG_ITMP1, 0);
+ s1 = emit_load_s1(jd, iptr, src, REG_ITMP2);
+ M_IST_INTERN(s1, REG_ITMP1, 0);
break;
case TYPE_LNG:
- var_to_reg_int(s2, src, PACK_REGS(REG_ITMP2, REG_ITMP3));
- M_IST_INTERN(GET_HIGH_REG(s2), REG_ITMP1, 0);
- M_IST_INTERN(GET_LOW_REG(s2), REG_ITMP1, 4);
+ s1 = emit_load_s1(jd, iptr, src, REG_ITMP23_PACKED);
+ M_LST_INTERN(s1, REG_ITMP1, 0);
break;
case TYPE_ADR:
- var_to_reg_int(s2, src, REG_ITMP2);
- M_AST_INTERN(s2, REG_ITMP1, 0);
+ s1 = emit_load_s1(jd, iptr, src, REG_ITMP2);
+ M_AST_INTERN(s1, REG_ITMP1, 0);
break;
case TYPE_FLT:
- var_to_reg_flt(s2, src, REG_FTMP2);
- M_FST_INTERN(s2, REG_ITMP1, 0);
+ s1 = emit_load_s1(jd, iptr, src, REG_FTMP2);
+ M_FST_INTERN(s1, REG_ITMP1, 0);
break;
case TYPE_DBL:
- var_to_reg_flt(s2, src, REG_FTMP2);
- M_DST_INTERN(s2, REG_ITMP1, 0);
+ s1 = emit_load_s1(jd, iptr, src, REG_FTMP2);
+ M_DST_INTERN(s1, REG_ITMP1, 0);
break;
}
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 == NULL) {
- codegen_addpatchref(cd, mcodeptr,
- PATCHER_get_putfield,
- (unresolved_field *) iptr->target, 0);
+ if (INSTRUCTION_IS_UNRESOLVED(iptr)) {
+ unresolved_field *uf = INSTRUCTION_UNRESOLVED_FIELD(iptr);
+
+ codegen_addpatchref(cd, PATCHER_get_putfield, uf, 0);
if (opt_showdisassemble)
M_NOP;
disp = 0;
-
- } else {
- disp = ((fieldinfo *) (iptr->val.a))->offset;
+ }
+ else {
+ fieldinfo *fi = INSTRUCTION_RESOLVED_FIELDINFO(iptr);
+ disp = fi->offset;
}
switch (iptr->op1) {
case TYPE_INT:
d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP2);
M_ILD(d, s1, disp);
- store_reg_to_var_int(iptr->dst, d);
break;
case TYPE_LNG:
- d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, PACK_REGS(REG_ITMP2, REG_ITMP1));
+ d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP12_PACKED);
if (GET_HIGH_REG(d) == s1) {
M_ILD(GET_LOW_REG(d), s1, disp + 4);
M_ILD(GET_HIGH_REG(d), s1, disp);
- } else {
+ }
+ else {
M_ILD(GET_HIGH_REG(d), s1, disp);
M_ILD(GET_LOW_REG(d), s1, disp + 4);
}
- store_reg_to_var_lng(iptr->dst, d);
break;
case TYPE_ADR:
d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP2);
M_ALD(d, s1, disp);
- store_reg_to_var_adr(iptr->dst, d);
break;
case TYPE_FLT:
d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_FTMP1);
M_FLD(d, s1, disp);
- store_reg_to_var_flt(iptr->dst, d);
break;
case TYPE_DBL:
d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_FTMP1);
M_DLD(d, s1, disp);
- store_reg_to_var_dbl(iptr->dst, d);
break;
}
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_PUTFIELD: /* ..., 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_FLT_DBL_TYPE(iptr->op1)) {
- if (IS_2_WORD_TYPE(iptr->op1)) {
- var_to_reg_int(s2, src, PACK_REGS(REG_ITMP2, REG_ITMP3));
- } else {
- var_to_reg_int(s2, src, REG_ITMP2);
- }
- } else {
- var_to_reg_flt(s2, src, REG_FTMP2);
+ if (IS_2_WORD_TYPE(iptr->op1))
+ s2 = emit_load_s2(jd, iptr, src, REG_ITMP23_PACKED);
+ else
+ s2 = emit_load_s2(jd, iptr, src, REG_ITMP2);
}
+ else
+ s2 = emit_load_s2(jd, iptr, src, REG_FTMP2);
- if (iptr->val.a == NULL) {
- codegen_addpatchref(cd, mcodeptr,
- PATCHER_get_putfield,
- (unresolved_field *) iptr->target, 0);
+ if (INSTRUCTION_IS_UNRESOLVED(iptr)) {
+ unresolved_field *uf = INSTRUCTION_UNRESOLVED_FIELD(iptr);
+
+ codegen_addpatchref(cd, PATCHER_get_putfield, uf, 0);
if (opt_showdisassemble)
M_NOP;
disp = 0;
-
- } else {
- disp = ((fieldinfo *) (iptr->val.a))->offset;
+ }
+ else {
+ fieldinfo *fi = INSTRUCTION_RESOLVED_FIELDINFO(iptr);
+ disp = fi->offset;
}
switch (iptr->op1) {
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,
- PATCHER_athrow_areturn,
- (unresolved_class *) iptr->val.a, 0);
+ unresolved_class *uc = INSTRUCTION_UNRESOLVED_CLASS(iptr);
+
+ codegen_addpatchref(cd, PATCHER_resolve_class, uc, 0);
if (opt_showdisassemble)
M_NOP;
}
#endif /* ENABLE_VERIFIER */
- disp = dseg_addaddress(cd, asm_handle_exception);
+ disp = dseg_add_functionptr(cd, asm_handle_exception);
M_ALD(REG_ITMP2, REG_PV, disp);
M_MTCTR(REG_ITMP2);
- if (m->isleafmethod) M_MFLR(REG_ITMP3); /* save LR */
+ if (jd->isleafmethod)
+ M_MFLR(REG_ITMP3); /* save LR */
+
M_BL(0); /* get current PC */
M_MFLR(REG_ITMP2_XPC);
- if (m->isleafmethod) M_MTLR(REG_ITMP3); /* restore LR */
- M_RTS; /* jump to CTR */
+ if (jd->isleafmethod)
+ M_MTLR(REG_ITMP3); /* restore LR */
+
+ M_RTS; /* jump to CTR */
ALIGNCODENOP;
break;
case ICMD_GOTO: /* ... ==> ... */
/* op1 = target JavaVM pc */
M_BR(0);
- codegen_addreference(cd, (basicblock *) iptr->target, mcodeptr);
+ codegen_addreference(cd, (basicblock *) iptr->target);
ALIGNCODENOP;
break;
case ICMD_JSR: /* ... ==> ... */
/* op1 = target JavaVM pc */
- if (m->isleafmethod) M_MFLR(REG_ITMP2);
+ if (jd->isleafmethod)
+ M_MFLR(REG_ITMP2);
+
M_BL(0);
M_MFLR(REG_ITMP1);
- M_IADD_IMM(REG_ITMP1, m->isleafmethod ? 16 : 12, REG_ITMP1);
- if (m->isleafmethod) M_MTLR(REG_ITMP2);
+ M_IADD_IMM(REG_ITMP1, jd->isleafmethod ? 4*4 : 3*4, REG_ITMP1);
+
+ if (jd->isleafmethod)
+ M_MTLR(REG_ITMP2);
+
M_BR(0);
- codegen_addreference(cd, (basicblock *) iptr->target, mcodeptr);
+ codegen_addreference(cd, (basicblock *) iptr->target);
break;
case ICMD_RET: /* ... ==> ... */
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_TST(s1);
M_BEQ(0);
- codegen_addreference(cd, (basicblock *) iptr->target, mcodeptr);
+ codegen_addreference(cd, (basicblock *) iptr->target);
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_TST(s1);
M_BNE(0);
- codegen_addreference(cd, (basicblock *) iptr->target, mcodeptr);
+ codegen_addreference(cd, (basicblock *) iptr->target);
break;
case ICMD_IFLT:
case ICMD_IFEQ: /* ..., value ==> ... */
/* op1 = target JavaVM pc, val.i = constant */
- var_to_reg_int(s1, src, REG_ITMP1);
- if ((iptr->val.i >= -32768) && (iptr->val.i <= 32767)) {
+ s1 = emit_load_s1(jd, iptr, src, REG_ITMP1);
+ if ((iptr->val.i >= -32768) && (iptr->val.i <= 32767))
M_CMPI(s1, iptr->val.i);
- } else {
+ else {
ICONST(REG_ITMP2, iptr->val.i);
M_CMP(s1, REG_ITMP2);
}
M_BEQ(0);
break;
}
- codegen_addreference(cd, (basicblock *) iptr->target, mcodeptr);
+ codegen_addreference(cd, (basicblock *) iptr->target);
break;
case ICMD_IF_LEQ: /* ..., value ==> ... */
/* op1 = target JavaVM pc, val.l = constant */
- var_to_reg_lng_low(s1, src, REG_ITMP1);
- var_to_reg_lng_high(s2, src, REG_ITMP2);
+ s1 = emit_load_s1_low(jd, iptr, src, REG_ITMP1);
+ s2 = emit_load_s2_high(jd, iptr, src, REG_ITMP2);
if (iptr->val.l == 0) {
M_OR_TST(s1, s2, REG_ITMP3);
} else if ((iptr->val.l >= 0) && (iptr->val.l <= 0xffff)) {
M_OR_TST(REG_ITMP1, REG_ITMP2, REG_ITMP3);
}
M_BEQ(0);
- codegen_addreference(cd, (basicblock *) iptr->target, mcodeptr);
+ codegen_addreference(cd, (basicblock *) iptr->target);
break;
case ICMD_IF_LLT: /* ..., value ==> ... */
/* op1 = target JavaVM pc, val.l = constant */
- var_to_reg_lng_low(s1, src, REG_ITMP1);
- var_to_reg_lng_high(s2, src, REG_ITMP2);
+ s1 = emit_load_s1_low(jd, iptr, src, REG_ITMP1);
+ s2 = emit_load_s2_high(jd, iptr, src, REG_ITMP2);
if (iptr->val.l == 0) {
/* if high word is less than zero, the whole long is too */
M_CMPI(s2, 0);
} else if ((iptr->val.l >= 0) && (iptr->val.l <= 0xffff)) {
M_CMPI(s2, 0);
M_BLT(0);
- codegen_addreference(cd, (basicblock *) iptr->target, mcodeptr);
+ codegen_addreference(cd, (basicblock *) iptr->target);
M_BGT(2);
M_CMPUI(s1, iptr->val.l & 0xffff);
} else {
ICONST(REG_ITMP3, iptr->val.l >> 32);
M_CMP(s2, REG_ITMP3);
M_BLT(0);
- codegen_addreference(cd, (basicblock *) iptr->target, mcodeptr);
+ codegen_addreference(cd, (basicblock *) iptr->target);
M_BGT(3);
ICONST(REG_ITMP3, iptr->val.l & 0xffffffff);
M_CMPU(s1, REG_ITMP3);
}
M_BLT(0);
- codegen_addreference(cd, (basicblock *) iptr->target, mcodeptr);
+ codegen_addreference(cd, (basicblock *) iptr->target);
break;
case ICMD_IF_LLE: /* ..., value ==> ... */
/* op1 = target JavaVM pc, val.l = constant */
- var_to_reg_lng_low(s1, src, REG_ITMP1);
- var_to_reg_lng_high(s2, src, REG_ITMP2);
+ s1 = emit_load_s1_low(jd, iptr, src, REG_ITMP1);
+ s2 = emit_load_s2_high(jd, iptr, src, REG_ITMP2);
/* if (iptr->val.l == 0) { */
/* M_OR(s1, s2, REG_ITMP3); */
/* M_CMPI(REG_ITMP3, 0); */
if ((iptr->val.l >= 0) && (iptr->val.l <= 0xffff)) {
M_CMPI(s2, 0);
M_BLT(0);
- codegen_addreference(cd, (basicblock *) iptr->target, mcodeptr);
+ codegen_addreference(cd, (basicblock *) iptr->target);
M_BGT(2);
M_CMPUI(s1, iptr->val.l & 0xffff);
} else {
ICONST(REG_ITMP3, iptr->val.l >> 32);
M_CMP(s2, REG_ITMP3);
M_BLT(0);
- codegen_addreference(cd, (basicblock *) iptr->target, mcodeptr);
+ codegen_addreference(cd, (basicblock *) iptr->target);
M_BGT(3);
ICONST(REG_ITMP3, iptr->val.l & 0xffffffff);
M_CMPU(s1, REG_ITMP3);
}
M_BLE(0);
- codegen_addreference(cd, (basicblock *) iptr->target, mcodeptr);
+ codegen_addreference(cd, (basicblock *) iptr->target);
break;
case ICMD_IF_LNE: /* ..., value ==> ... */
/* op1 = target JavaVM pc, val.l = constant */
- var_to_reg_lng_low(s1, src, REG_ITMP1);
- var_to_reg_lng_high(s2, src, REG_ITMP2);
+ s1 = emit_load_s1_low(jd, iptr, src, REG_ITMP1);
+ s2 = emit_load_s2_high(jd, iptr, src, REG_ITMP2);
if (iptr->val.l == 0) {
M_OR_TST(s1, s2, REG_ITMP3);
} else if ((iptr->val.l >= 0) && (iptr->val.l <= 0xffff)) {
M_OR_TST(REG_ITMP1, REG_ITMP2, REG_ITMP3);
}
M_BNE(0);
- codegen_addreference(cd, (basicblock *) iptr->target, mcodeptr);
+ codegen_addreference(cd, (basicblock *) iptr->target);
break;
case ICMD_IF_LGT: /* ..., value ==> ... */
/* op1 = target JavaVM pc, val.l = constant */
- var_to_reg_lng_low(s1, src, REG_ITMP1);
- var_to_reg_lng_high(s2, src, REG_ITMP2);
+ s1 = emit_load_s1_low(jd, iptr, src, REG_ITMP1);
+ s2 = emit_load_s2_high(jd, iptr, src, REG_ITMP2);
/* if (iptr->val.l == 0) { */
/* M_OR(s1, s2, REG_ITMP3); */
/* M_CMPI(REG_ITMP3, 0); */
if ((iptr->val.l >= 0) && (iptr->val.l <= 0xffff)) {
M_CMPI(s2, 0);
M_BGT(0);
- codegen_addreference(cd, (basicblock *) iptr->target, mcodeptr);
+ codegen_addreference(cd, (basicblock *) iptr->target);
M_BLT(2);
M_CMPUI(s1, iptr->val.l & 0xffff);
} else {
ICONST(REG_ITMP3, iptr->val.l >> 32);
M_CMP(s2, REG_ITMP3);
M_BGT(0);
- codegen_addreference(cd, (basicblock *) iptr->target, mcodeptr);
+ codegen_addreference(cd, (basicblock *) iptr->target);
M_BLT(3);
ICONST(REG_ITMP3, iptr->val.l & 0xffffffff);
M_CMPU(s1, REG_ITMP3);
}
M_BGT(0);
- codegen_addreference(cd, (basicblock *) iptr->target, mcodeptr);
+ codegen_addreference(cd, (basicblock *) iptr->target);
break;
case ICMD_IF_LGE: /* ..., value ==> ... */
/* op1 = target JavaVM pc, val.l = constant */
- var_to_reg_lng_low(s1, src, REG_ITMP1);
- var_to_reg_lng_high(s2, src, REG_ITMP2);
+
+ s1 = emit_load_s1_low(jd, iptr, src, REG_ITMP1);
+ s2 = emit_load_s2_high(jd, iptr, src, REG_ITMP2);
if (iptr->val.l == 0) {
/* if high word is greater equal zero, the whole long is too */
M_CMPI(s2, 0);
} else if ((iptr->val.l >= 0) && (iptr->val.l <= 0xffff)) {
M_CMPI(s2, 0);
M_BGT(0);
- codegen_addreference(cd, (basicblock *) iptr->target, mcodeptr);
+ codegen_addreference(cd, (basicblock *) iptr->target);
M_BLT(2);
M_CMPUI(s1, iptr->val.l & 0xffff);
} else {
ICONST(REG_ITMP3, iptr->val.l >> 32);
M_CMP(s2, REG_ITMP3);
M_BGT(0);
- codegen_addreference(cd, (basicblock *) iptr->target, mcodeptr);
+ codegen_addreference(cd, (basicblock *) iptr->target);
M_BLT(3);
ICONST(REG_ITMP3, iptr->val.l & 0xffffffff);
M_CMPU(s1, REG_ITMP3);
}
M_BGE(0);
- codegen_addreference(cd, (basicblock *) iptr->target, mcodeptr);
+ codegen_addreference(cd, (basicblock *) iptr->target);
break;
case ICMD_IF_ICMPEQ: /* ..., value, value ==> ... */
case ICMD_IF_ACMPEQ: /* 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_CMP(s1, s2);
M_BEQ(0);
- codegen_addreference(cd, (basicblock *) iptr->target, mcodeptr);
+ codegen_addreference(cd, (basicblock *) iptr->target);
break;
case ICMD_IF_LCMPEQ: /* ..., value, value ==> ... */
/* op1 = target JavaVM pc */
- var_to_reg_lng_high(s1, src->prev, REG_ITMP1);
- var_to_reg_lng_high(s2, src, REG_ITMP2);
+ s1 = emit_load_s1_high(jd, iptr, src->prev, REG_ITMP1);
+ s2 = emit_load_s2_high(jd, iptr, src, REG_ITMP2);
M_CMP(s1, s2);
/* load low-bits before the branch, so we know the distance */
- var_to_reg_lng_low(s1, src->prev, REG_ITMP1);
- var_to_reg_lng_low(s2, src, REG_ITMP2);
+ s1 = emit_load_s1_low(jd, iptr, src->prev, REG_ITMP1);
+ s2 = emit_load_s2_low(jd, iptr, src, REG_ITMP2);
M_BNE(2);
M_CMP(s1, s2);
M_BEQ(0);
- codegen_addreference(cd, (basicblock *) iptr->target, mcodeptr);
+ codegen_addreference(cd, (basicblock *) iptr->target);
break;
case ICMD_IF_ICMPNE: /* ..., value, value ==> ... */
case ICMD_IF_ACMPNE: /* 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_CMP(s1, s2);
M_BNE(0);
- codegen_addreference(cd, (basicblock *) iptr->target, mcodeptr);
+ codegen_addreference(cd, (basicblock *) iptr->target);
break;
case ICMD_IF_LCMPNE: /* ..., value, value ==> ... */
/* op1 = target JavaVM pc */
- var_to_reg_lng_high(s1, src->prev, REG_ITMP1);
- var_to_reg_lng_high(s2, src, REG_ITMP2);
+ s1 = emit_load_s1_high(jd, iptr, src->prev, REG_ITMP1);
+ s2 = emit_load_s2_high(jd, iptr, src, REG_ITMP2);
M_CMP(s1, s2);
M_BNE(0);
- codegen_addreference(cd, (basicblock *) iptr->target, mcodeptr);
- var_to_reg_lng_low(s1, src->prev, REG_ITMP1);
- var_to_reg_lng_low(s2, src, REG_ITMP2);
+ codegen_addreference(cd, (basicblock *) iptr->target);
+ s1 = emit_load_s1_low(jd, iptr, src->prev, REG_ITMP1);
+ s2 = emit_load_s2_low(jd, iptr, src, REG_ITMP2);
M_CMP(s1, s2);
M_BNE(0);
- codegen_addreference(cd, (basicblock *) iptr->target, mcodeptr);
+ codegen_addreference(cd, (basicblock *) iptr->target);
break;
case ICMD_IF_ICMPLT: /* ..., value, value ==> ... */
/* 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_CMP(s1, s2);
M_BLT(0);
- codegen_addreference(cd, (basicblock *) iptr->target, mcodeptr);
+ codegen_addreference(cd, (basicblock *) iptr->target);
break;
case ICMD_IF_LCMPLT: /* ..., value, value ==> ... */
/* op1 = target JavaVM pc */
- var_to_reg_lng_high(s1, src->prev, REG_ITMP1);
- var_to_reg_lng_high(s2, src, REG_ITMP2);
+ s1 = emit_load_s1_high(jd, iptr, src->prev, REG_ITMP1);
+ s2 = emit_load_s2_high(jd, iptr, src, REG_ITMP2);
M_CMP(s1, s2);
M_BLT(0);
- codegen_addreference(cd, (basicblock *) iptr->target, mcodeptr);
+ codegen_addreference(cd, (basicblock *) iptr->target);
/* load low-bits before the branch, so we know the distance */
- var_to_reg_lng_low(s1, src->prev, REG_ITMP1);
- var_to_reg_lng_low(s2, src, REG_ITMP2);
+ s1 = emit_load_s1_low(jd, iptr, src->prev, REG_ITMP1);
+ s2 = emit_load_s2_low(jd, iptr, src, REG_ITMP2);
M_BGT(2);
M_CMPU(s1, s2);
M_BLT(0);
- codegen_addreference(cd, (basicblock *) iptr->target, mcodeptr);
+ codegen_addreference(cd, (basicblock *) iptr->target);
break;
case ICMD_IF_ICMPGT: /* ..., value, value ==> ... */
/* 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_CMP(s1, s2);
M_BGT(0);
- codegen_addreference(cd, (basicblock *) iptr->target, mcodeptr);
+ codegen_addreference(cd, (basicblock *) iptr->target);
break;
case ICMD_IF_LCMPGT: /* ..., value, value ==> ... */
/* op1 = target JavaVM pc */
- var_to_reg_lng_high(s1, src->prev, REG_ITMP1);
- var_to_reg_lng_high(s2, src, REG_ITMP2);
+ s1 = emit_load_s1_high(jd, iptr, src->prev, REG_ITMP1);
+ s2 = emit_load_s2_high(jd, iptr, src, REG_ITMP2);
M_CMP(s1, s2);
M_BGT(0);
- codegen_addreference(cd, (basicblock *) iptr->target, mcodeptr);
+ codegen_addreference(cd, (basicblock *) iptr->target);
/* load low-bits before the branch, so we know the distance */
- var_to_reg_lng_low(s1, src->prev, REG_ITMP1);
- var_to_reg_lng_low(s2, src, REG_ITMP2);
+ s1 = emit_load_s1_low(jd, iptr, src->prev, REG_ITMP1);
+ s2 = emit_load_s2_low(jd, iptr, src, REG_ITMP2);
M_BLT(2);
M_CMPU(s1, s2);
M_BGT(0);
- codegen_addreference(cd, (basicblock *) iptr->target, mcodeptr);
+ codegen_addreference(cd, (basicblock *) iptr->target);
break;
case ICMD_IF_ICMPLE: /* ..., value, value ==> ... */
/* 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_CMP(s1, s2);
M_BLE(0);
- codegen_addreference(cd, (basicblock *) iptr->target, mcodeptr);
+ codegen_addreference(cd, (basicblock *) iptr->target);
break;
case ICMD_IF_LCMPLE: /* ..., value, value ==> ... */
/* op1 = target JavaVM pc */
- var_to_reg_lng_high(s1, src->prev, REG_ITMP1);
- var_to_reg_lng_high(s2, src, REG_ITMP2);
+ s1 = emit_load_s1_high(jd, iptr, src->prev, REG_ITMP1);
+ s2 = emit_load_s2_high(jd, iptr, src, REG_ITMP2);
M_CMP(s1, s2);
M_BLT(0);
- codegen_addreference(cd, (basicblock *) iptr->target, mcodeptr);
+ codegen_addreference(cd, (basicblock *) iptr->target);
/* load low-bits before the branch, so we know the distance */
- var_to_reg_lng_low(s1, src->prev, REG_ITMP1);
- var_to_reg_lng_low(s2, src, REG_ITMP2);
+ s1 = emit_load_s1_low(jd, iptr, src->prev, REG_ITMP1);
+ s2 = emit_load_s2_low(jd, iptr, src, REG_ITMP2);
M_BGT(2);
M_CMPU(s1, s2);
M_BLE(0);
- codegen_addreference(cd, (basicblock *) iptr->target, mcodeptr);
+ codegen_addreference(cd, (basicblock *) iptr->target);
break;
case ICMD_IF_ICMPGE: /* ..., value, value ==> ... */
/* 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_CMP(s1, s2);
M_BGE(0);
- codegen_addreference(cd, (basicblock *) iptr->target, mcodeptr);
+ codegen_addreference(cd, (basicblock *) iptr->target);
break;
case ICMD_IF_LCMPGE: /* ..., value, value ==> ... */
/* op1 = target JavaVM pc */
- var_to_reg_lng_high(s1, src->prev, REG_ITMP1);
- var_to_reg_lng_high(s2, src, REG_ITMP2);
+ s1 = emit_load_s1_high(jd, iptr, src->prev, REG_ITMP1);
+ s2 = emit_load_s2_high(jd, iptr, src, REG_ITMP2);
M_CMP(s1, s2);
M_BGT(0);
- codegen_addreference(cd, (basicblock *) iptr->target, mcodeptr);
+ codegen_addreference(cd, (basicblock *) iptr->target);
/* load low-bits before the branch, so we know the distance */
- var_to_reg_lng_low(s1, src->prev, REG_ITMP1);
- var_to_reg_lng_low(s2, src, REG_ITMP2);
+ s1 = emit_load_s1_low(jd, iptr, src->prev, REG_ITMP1);
+ s2 = emit_load_s2_low(jd, iptr, src, REG_ITMP2);
M_BLT(2);
M_CMPU(s1, s2);
M_BGE(0);
- codegen_addreference(cd, (basicblock *) iptr->target, mcodeptr);
+ codegen_addreference(cd, (basicblock *) iptr->target);
break;
case ICMD_IRETURN: /* ..., retvalue ==> ... */
- var_to_reg_int(s1, src, REG_RESULT);
- M_TINTMOVE(src->type, s1, 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);
- M_TINTMOVE(src->type, s1, 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,
- PATCHER_athrow_areturn,
- (unresolved_class *) iptr->val.a, 0);
+ unresolved_class *uc = INSTRUCTION_UNRESOLVED_CLASS(iptr);
+
+ codegen_addpatchref(cd, PATCHER_resolve_class, uc, 0);
if (opt_showdisassemble)
M_NOP;
case ICMD_LRETURN: /* ..., retvalue ==> ... */
- var_to_reg_int(s1, src, PACK_REGS(REG_RESULT2, REG_RESULT));
- M_TINTMOVE(src->type, s1, PACK_REGS(REG_RESULT2, REG_RESULT));
+ s1 = emit_load_s1(jd, iptr, src, REG_RESULT_PACKED);
+ M_LNGMOVE(s1, REG_RESULT_PACKED);
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;
{
s4 i, p;
- p = stackframesize;
+ p = cd->stackframesize;
/* call trace function */
- if (opt_verbosecall) {
- M_MFLR(REG_ZERO);
- M_LDA(REG_SP, REG_SP, -10 * 8);
- M_DST(REG_FRESULT, REG_SP, 48+0);
- M_IST(REG_RESULT, REG_SP, 48+8);
- M_AST(REG_ZERO, REG_SP, 48+12);
- M_IST(REG_RESULT2, REG_SP, 48+16);
-
- /* keep this order */
- switch (iptr->opc) {
- case ICMD_IRETURN:
- case ICMD_ARETURN:
-#if defined(__DARWIN__)
- M_MOV(REG_RESULT, rd->argintregs[2]);
- M_CLR(rd->argintregs[1]);
-#else
- M_MOV(REG_RESULT, rd->argintregs[3]);
- M_CLR(rd->argintregs[2]);
-#endif
- break;
-
- case ICMD_LRETURN:
-#if defined(__DARWIN__)
- M_MOV(REG_RESULT2, rd->argintregs[2]);
- M_MOV(REG_RESULT, rd->argintregs[1]);
-#else
- M_MOV(REG_RESULT2, rd->argintregs[3]);
- M_MOV(REG_RESULT, rd->argintregs[2]);
-#endif
- break;
- }
-
- disp = dseg_addaddress(cd, m);
- M_ALD(rd->argintregs[0], REG_PV, disp);
-
- M_FLTMOVE(REG_FRESULT, rd->argfltregs[0]);
- M_FLTMOVE(REG_FRESULT, rd->argfltregs[1]);
- disp = dseg_addaddress(cd, builtin_displaymethodstop);
- M_ALD(REG_ITMP2, REG_PV, disp);
- M_MTCTR(REG_ITMP2);
- M_JSR;
+ if (JITDATA_HAS_FLAG_VERBOSECALL(jd))
+ emit_verbosecall_exit(jd);
- M_DLD(REG_FRESULT, REG_SP, 48+0);
- M_ILD(REG_RESULT, REG_SP, 48+8);
- M_ALD(REG_ZERO, REG_SP, 48+12);
- M_ILD(REG_RESULT2, REG_SP, 48+16);
- M_LDA(REG_SP, REG_SP, 10 * 8);
- M_MTLR(REG_ZERO);
- }
-
-#if defined(USE_THREADS)
+#if defined(ENABLE_THREADS)
if (checksync && (m->flags & ACC_SYNCHRONIZED)) {
+ disp = dseg_add_functionptr(cd, LOCK_monitor_exit);
+ M_ALD(REG_ITMP3, REG_PV, disp);
+ M_MTCTR(REG_ITMP3);
+
/* we need to save the proper return value */
+
switch (iptr->opc) {
case ICMD_LRETURN:
M_IST(REG_RESULT2, REG_SP, rd->memuse * 4 + 8);
break;
}
- disp = dseg_addaddress(cd, BUILTIN_monitorexit);
- M_ALD(REG_ITMP3, REG_PV, disp);
- M_MTCTR(REG_ITMP3);
M_ALD(rd->argintregs[0], REG_SP, rd->memuse * 4);
M_JSR;
/* and now restore the proper return value */
+
switch (iptr->opc) {
case ICMD_LRETURN:
M_ILD(REG_RESULT2, REG_SP, rd->memuse * 4 + 8);
/* restore return address */
- if (!m->isleafmethod) {
+ if (!jd->isleafmethod) {
/* ATTENTION: Don't use REG_ZERO (r0) here, as M_ALD
may have a displacement overflow. */
/* deallocate stack */
- if (stackframesize)
- M_LDA(REG_SP, REG_SP, stackframesize * 4);
+ if (cd->stackframesize)
+ M_LDA(REG_SP, REG_SP, cd->stackframesize * 4);
M_RET;
ALIGNCODENOP;
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_CMPUI(REG_ITMP1, i - 1);
M_BGT(0);
- codegen_addreference(cd, (basicblock *) tptr[0], mcodeptr);
+ codegen_addreference(cd, (basicblock *) tptr[0]);
/* build jump table top down and use address of lowest entry */
tptr += i;
while (--i >= 0) {
- dseg_addtarget(cd, (basicblock *) tptr[0]);
+ dseg_add_target(cd, (basicblock *) tptr[0]);
--tptr;
}
}
- /* length of dataseg after last dseg_addtarget is used by load */
+ /* length of dataseg after last dseg_add_target is used by load */
M_SLL_IMM(REG_ITMP1, 2, REG_ITMP1);
M_IADD(REG_ITMP1, REG_PV, REG_ITMP2);
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];
if ((val >= -32768) && (val <= 32767)) {
M_CMPI(s1, val);
- } else {
- a = dseg_adds4(cd, val);
+ }
+ else {
+ a = dseg_add_s4(cd, val);
M_ILD(REG_ITMP2, REG_PV, a);
M_CMP(s1, REG_ITMP2);
}
M_BEQ(0);
- codegen_addreference(cd, (basicblock *) tptr[0], mcodeptr);
+ codegen_addreference(cd, (basicblock *) tptr[0]);
}
M_BR(0);
tptr = (void **) iptr->target;
- codegen_addreference(cd, (basicblock *) tptr[0], mcodeptr);
+ codegen_addreference(cd, (basicblock *) tptr[0]);
ALIGNCODENOP;
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;
}
s1 = PACK_REGS(
rd->argintregs[GET_LOW_REG(md->params[s3].regoff)],
rd->argintregs[GET_HIGH_REG(md->params[s3].regoff)]);
- } else {
+ d = emit_load_s1(jd, iptr, src, s1);
+ M_LNGMOVE(d, s1);
+ }
+ else {
s1 = rd->argintregs[md->params[s3].regoff];
+ d = emit_load_s1(jd, iptr, src, s1);
+ M_INTMOVE(d, s1);
}
- var_to_reg_int(d, src, s1);
- M_TINTMOVE(src->type, d, s1);
- } else {
+ }
+ else {
if (IS_2_WORD_TYPE(src->type)) {
- var_to_reg_int(d, src, PACK_REGS(REG_ITMP2, REG_ITMP1));
- M_IST(GET_HIGH_REG(d), REG_SP,
- md->params[s3].regoff * 4);
- M_IST(GET_LOW_REG(d), REG_SP,
- md->params[s3].regoff * 4 + 4);
- } else {
- var_to_reg_int(d, src, REG_ITMP1);
+ d = emit_load_s1(jd, iptr, src, REG_ITMP12_PACKED);
+ M_LST(d, REG_SP, md->params[s3].regoff * 4);
+ }
+ else {
+ d = emit_load_s1(jd, iptr, src, REG_ITMP1);
M_IST(d, REG_SP, md->params[s3].regoff * 4);
}
}
-
- } else {
+ }
+ 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);
- if (IS_2_WORD_TYPE(src->type)) {
+ }
+ else {
+ d = emit_load_s1(jd, iptr, src, REG_FTMP1);
+ if (IS_2_WORD_TYPE(src->type))
M_DST(d, REG_SP, md->params[s3].regoff * 4);
- } else {
+ else
M_FST(d, REG_SP, md->params[s3].regoff * 4);
- }
}
}
} /* end of for */
switch (iptr->opc) {
case ICMD_BUILTIN:
- disp = dseg_addaddress(cd, bte->fp);
+ disp = dseg_add_functionptr(cd, bte->fp);
d = md->returntype.type;
M_ALD(REG_PV, REG_PV, disp); /* pointer to built-in-function */
M_MTCTR(REG_PV);
M_JSR;
- disp = (s4) ((u1 *) mcodeptr - cd->mcodebase);
+ disp = (s4) (cd->mcodeptr - cd->mcodebase);
M_MFLR(REG_ITMP1);
M_LDA(REG_PV, REG_ITMP1, -disp);
if (iptr->op1 == true) {
M_CMPI(REG_RESULT, 0);
M_BEQ(0);
- codegen_add_fillinstacktrace_ref(cd, mcodeptr);
+ codegen_add_fillinstacktrace_ref(cd);
}
break;
case ICMD_INVOKESTATIC:
if (lm == NULL) {
- unresolved_method *um = iptr->target;
+ unresolved_method *um = INSTRUCTION_UNRESOLVED_METHOD(iptr);
- disp = dseg_addaddress(cd, NULL);
+ disp = dseg_add_unique_address(cd, um);
- codegen_addpatchref(cd, mcodeptr,
- PATCHER_invokestatic_special, um, disp);
+ codegen_addpatchref(cd, PATCHER_invokestatic_special,
+ um, disp);
if (opt_showdisassemble)
M_NOP;
d = md->returntype.type;
-
- } else {
- disp = dseg_addaddress(cd, lm->stubroutine);
+ }
+ else {
+ disp = dseg_add_address(cd, lm->stubroutine);
d = md->returntype.type;
}
M_ALD(REG_PV, REG_PV, disp);
M_MTCTR(REG_PV);
M_JSR;
- disp = (s4) ((u1 *) mcodeptr - cd->mcodebase);
+ disp = (s4) (cd->mcodeptr - cd->mcodebase);
M_MFLR(REG_ITMP1);
M_LDA(REG_PV, REG_ITMP1, -disp);
break;
gen_nullptr_check(rd->argintregs[0]);
if (lm == NULL) {
- unresolved_method *um = iptr->target;
+ unresolved_method *um = INSTRUCTION_UNRESOLVED_METHOD(iptr);
- codegen_addpatchref(cd, mcodeptr,
- PATCHER_invokevirtual, um, 0);
+ codegen_addpatchref(cd, PATCHER_invokevirtual, um, 0);
if (opt_showdisassemble)
M_NOP;
s1 = 0;
d = md->returntype.type;
-
- } else {
+ }
+ else {
s1 = OFFSET(vftbl_t, table[0]) +
sizeof(methodptr) * lm->vftblindex;
d = md->returntype.type;
M_ALD(REG_PV, REG_METHODPTR, s1);
M_MTCTR(REG_PV);
M_JSR;
- disp = (s4) ((u1 *) mcodeptr - cd->mcodebase);
+ disp = (s4) (cd->mcodeptr - cd->mcodebase);
M_MFLR(REG_ITMP1);
M_LDA(REG_PV, REG_ITMP1, -disp);
break;
gen_nullptr_check(rd->argintregs[0]);
if (lm == NULL) {
- unresolved_method *um = iptr->target;
+ unresolved_method *um = INSTRUCTION_UNRESOLVED_METHOD(iptr);
- codegen_addpatchref(cd, mcodeptr,
- PATCHER_invokeinterface, um, 0);
+ codegen_addpatchref(cd, PATCHER_invokeinterface, um, 0);
if (opt_showdisassemble)
M_NOP;
s1 = 0;
s2 = 0;
d = md->returntype.type;
-
- } else {
+ }
+ else {
s1 = OFFSET(vftbl_t, interfacetable[0]) -
sizeof(methodptr*) * lm->class->index;
M_ALD(REG_PV, REG_METHODPTR, s2);
M_MTCTR(REG_PV);
M_JSR;
- disp = (s4) ((u1 *) mcodeptr - cd->mcodebase);
+ disp = (s4) (cd->mcodeptr - cd->mcodebase);
M_MFLR(REG_ITMP1);
M_LDA(REG_PV, REG_ITMP1, -disp);
break;
if (d != TYPE_VOID) {
if (IS_INT_LNG_TYPE(iptr->dst->type)) {
if (IS_2_WORD_TYPE(iptr->dst->type)) {
- s1 = codegen_reg_of_var(rd, iptr->opc, iptr->dst,
- PACK_REGS(REG_RESULT2, REG_RESULT));
- M_TINTMOVE(iptr->dst->type,
- PACK_REGS(REG_RESULT2, REG_RESULT), s1);
- store_reg_to_var_lng(iptr->dst, s1);
- } else {
+ s1 = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_RESULT_PACKED);
+ M_LNGMOVE(REG_RESULT_PACKED, s1);
+ }
+ else {
s1 = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_RESULT);
- M_TINTMOVE(iptr->dst->type, REG_RESULT, s1);
- store_reg_to_var_int(iptr->dst, s1);
+ M_INTMOVE(REG_RESULT, s1);
}
- } else {
+ }
+ else {
s1 = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_FRESULT);
M_FLTMOVE(REG_FRESULT, s1);
- if (IS_2_WORD_TYPE(iptr->dst->type)) {
- store_reg_to_var_dbl(iptr->dst, s1);
- } else {
- store_reg_to_var_flt(iptr->dst, s1);
- }
}
+ emit_store(jd, iptr, iptr->dst, s1);
}
break;
/* object type cast-check */
classinfo *super;
- vftbl_t *supervftbl;
s4 superindex;
super = (classinfo *) iptr->val.a;
- if (!super) {
+ if (super == NULL)
superindex = 0;
- supervftbl = NULL;
-
- } else {
+ else
superindex = super->index;
- supervftbl = super->vftbl;
- }
-#if defined(USE_THREADS) && defined(NATIVE_THREADS)
- codegen_threadcritrestart(cd, (u1 *) mcodeptr - cd->mcodebase);
+#if defined(ENABLE_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 */
/* if class is not resolved, check which code to call */
- if (!super) {
+ if (super == NULL) {
M_TST(s1);
M_BEQ(3 + (opt_showdisassemble ? 1 : 0) + s2 + 1 + s3);
- disp = dseg_adds4(cd, 0); /* super->flags */
+ disp = dseg_add_unique_s4(cd, 0); /* super->flags */
- codegen_addpatchref(cd, mcodeptr,
- PATCHER_checkcast_instanceof_flags,
- (constant_classref *) iptr->target, disp);
+ codegen_addpatchref(cd,
+ PATCHER_resolve_classref_to_flags,
+ (constant_classref *) iptr->target,
+ disp);
if (opt_showdisassemble)
M_NOP;
/* interface checkcast code */
- if (!super || (super->flags & ACC_INTERFACE)) {
- if (super) {
- M_TST(s1);
- M_BEQ(s2);
-
- } else {
- codegen_addpatchref(cd, mcodeptr,
+ if ((super == NULL) || (super->flags & ACC_INTERFACE)) {
+ if (super == NULL) {
+ codegen_addpatchref(cd,
PATCHER_checkcast_instanceof_interface,
- (constant_classref *) iptr->target, 0);
+ (constant_classref *) iptr->target,
+ 0);
if (opt_showdisassemble)
M_NOP;
}
+ else {
+ M_TST(s1);
+ M_BEQ(s2);
+ }
M_ALD(REG_ITMP2, s1, OFFSET(java_objectheader, vftbl));
M_ILD(REG_ITMP3, REG_ITMP2, OFFSET(vftbl_t, interfacetablelength));
M_LDATST(REG_ITMP3, REG_ITMP3, -superindex);
M_BLE(0);
- codegen_add_classcastexception_ref(cd, mcodeptr);
+ codegen_add_classcastexception_ref(cd, s1);
M_ALD(REG_ITMP3, REG_ITMP2,
OFFSET(vftbl_t, interfacetable[0]) -
superindex * sizeof(methodptr*));
M_TST(REG_ITMP3);
M_BEQ(0);
- codegen_add_classcastexception_ref(cd, mcodeptr);
+ codegen_add_classcastexception_ref(cd, s1);
- if (!super)
+ if (super == NULL)
M_BR(s3);
}
/* class checkcast code */
- if (!super || !(super->flags & ACC_INTERFACE)) {
- disp = dseg_addaddress(cd, supervftbl);
-
- if (super) {
- M_TST(s1);
- M_BEQ(s3);
+ if ((super == NULL) || !(super->flags & ACC_INTERFACE)) {
+ if (super == NULL) {
+ disp = dseg_add_unique_address(cd, NULL);
- } else {
- codegen_addpatchref(cd, mcodeptr,
- PATCHER_checkcast_class,
+ codegen_addpatchref(cd, PATCHER_resolve_classref_to_vftbl,
(constant_classref *) iptr->target,
disp);
if (opt_showdisassemble)
M_NOP;
}
+ else {
+ disp = dseg_add_address(cd, super->vftbl);
+
+ M_TST(s1);
+ M_BEQ(s3);
+ }
M_ALD(REG_ITMP2, s1, OFFSET(java_objectheader, vftbl));
-#if defined(USE_THREADS) && defined(NATIVE_THREADS)
- codegen_threadcritstart(cd, (u1 *) mcodeptr - cd->mcodebase);
+#if defined(ENABLE_THREADS)
+ codegen_threadcritstart(cd, cd->mcodeptr - cd->mcodebase);
#endif
M_ILD(REG_ITMP3, REG_ITMP2, OFFSET(vftbl_t, baseval));
M_ALD(REG_ITMP2, REG_PV, disp);
if (s1 != REG_ITMP1) {
M_ILD(REG_ITMP1, 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);
+#if defined(ENABLE_THREADS)
+ codegen_threadcritstop(cd, cd->mcodeptr - cd->mcodebase);
#endif
M_ISUB(REG_ITMP3, REG_ITMP1, REG_ITMP3);
} else {
M_ISUB(REG_ITMP3, REG_ITMP2, REG_ITMP3);
M_ALD(REG_ITMP2, REG_PV, disp);
M_ILD(REG_ITMP2, REG_ITMP2, OFFSET(vftbl_t, diffval));
-#if defined(USE_THREADS) && defined(NATIVE_THREADS)
- codegen_threadcritstop(cd, (u1 *) mcodeptr - cd->mcodebase);
+#if defined(ENABLE_THREADS)
+ codegen_threadcritstop(cd, cd->mcodeptr - cd->mcodebase);
#endif
}
M_CMPU(REG_ITMP3, REG_ITMP2);
M_BGT(0);
- codegen_add_classcastexception_ref(cd, mcodeptr);
+ codegen_add_classcastexception_ref(cd, s1);
}
d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, s1);
-
- } else {
+ }
+ else {
/* array type cast-check */
- 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,
- PATCHER_builtin_arraycheckcast,
+ disp = dseg_add_unique_address(cd, NULL);
+
+ codegen_addpatchref(cd, PATCHER_resolve_classref_to_classinfo,
(constant_classref *) iptr->target,
disp);
if (opt_showdisassemble)
M_NOP;
}
+ else
+ disp = dseg_add_address(cd, iptr->val.a);
M_ALD(rd->argintregs[1], REG_PV, disp);
- disp = dseg_addaddress(cd, BUILTIN_arraycheckcast);
+ disp = dseg_add_functionptr(cd, BUILTIN_arraycheckcast);
M_ALD(REG_ITMP2, REG_PV, disp);
M_MTCTR(REG_ITMP2);
M_JSR;
M_TST(REG_RESULT);
M_BEQ(0);
- codegen_add_classcastexception_ref(cd, mcodeptr);
+ codegen_add_classcastexception_ref(cd, s1);
- 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_adr(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
case ICMD_INSTANCEOF: /* ..., objectref ==> ..., intresult */
{
classinfo *super;
- vftbl_t *supervftbl;
s4 superindex;
super = (classinfo *) iptr->val.a;
- if (!super) {
+ if (super == NULL)
superindex = 0;
- supervftbl = NULL;
-
- } else {
+ else
superindex = super->index;
- supervftbl = super->vftbl;
- }
-#if defined(USE_THREADS) && defined(NATIVE_THREADS)
- codegen_threadcritrestart(cd, (u1*) mcodeptr - cd->mcodebase);
+#if defined(ENABLE_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);
d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP2);
if (s1 == d) {
M_MOV(s1, REG_ITMP1);
/* if class is not resolved, check which code to call */
- if (!super) {
+ if (super == NULL) {
M_TST(s1);
M_BEQ(3 + (opt_showdisassemble ? 1 : 0) + s2 + 1 + s3);
- disp = dseg_adds4(cd, 0); /* super->flags */
+ disp = dseg_add_unique_s4(cd, 0); /* super->flags */
- codegen_addpatchref(cd, mcodeptr,
- PATCHER_checkcast_instanceof_flags,
+ codegen_addpatchref(cd, PATCHER_resolve_classref_to_flags,
(constant_classref *) iptr->target, disp);
if (opt_showdisassemble)
/* interface instanceof code */
- if (!super || (super->flags & ACC_INTERFACE)) {
- if (super) {
- M_TST(s1);
- M_BEQ(s2);
-
- } else {
- codegen_addpatchref(cd, mcodeptr,
+ if ((super == NULL) || (super->flags & ACC_INTERFACE)) {
+ if (super == NULL) {
+ codegen_addpatchref(cd,
PATCHER_checkcast_instanceof_interface,
(constant_classref *) iptr->target, 0);
if (opt_showdisassemble)
M_NOP;
}
+ else {
+ M_TST(s1);
+ M_BEQ(s2);
+ }
M_ALD(REG_ITMP1, s1, OFFSET(java_objectheader, vftbl));
M_ILD(REG_ITMP3, REG_ITMP1, OFFSET(vftbl_t, interfacetablelength));
M_BEQ(1);
M_IADD_IMM(REG_ZERO, 1, d);
- if (!super)
+ if (super == NULL)
M_BR(s3);
}
/* class instanceof code */
- if (!super || !(super->flags & ACC_INTERFACE)) {
- disp = dseg_addaddress(cd, supervftbl);
-
- if (super) {
- M_TST(s1);
- M_BEQ(s3);
+ if ((super == NULL) || !(super->flags & ACC_INTERFACE)) {
+ if (super == NULL) {
+ disp = dseg_add_unique_address(cd, NULL);
- } else {
- codegen_addpatchref(cd, mcodeptr,
- PATCHER_instanceof_class,
+ codegen_addpatchref(cd, PATCHER_resolve_classref_to_vftbl,
(constant_classref *) iptr->target,
disp);
- if (opt_showdisassemble) {
+ if (opt_showdisassemble)
M_NOP;
- }
+ }
+ else {
+ disp = dseg_add_address(cd, super->vftbl);
+
+ M_TST(s1);
+ M_BEQ(s3);
}
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);
+#if defined(ENABLE_THREADS)
+ codegen_threadcritstart(cd, 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);
+#if defined(ENABLE_THREADS)
+ codegen_threadcritstop(cd, cd->mcodeptr - cd->mcodebase);
#endif
M_ISUB(REG_ITMP1, REG_ITMP3, REG_ITMP1);
M_CMPU(REG_ITMP1, REG_ITMP2);
M_BGT(1);
M_IADD_IMM(REG_ZERO, 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);
#if defined(__DARWIN__)
M_IST(s2, REG_SP, LA_SIZE + (s1 + INT_ARG_CNT) * 4);
#else
/* is patcher function set? */
if (iptr->val.a == NULL) {
- disp = dseg_addaddress(cd, NULL);
+ disp = dseg_add_unique_address(cd, NULL);
- codegen_addpatchref(cd, mcodeptr,
- PATCHER_builtin_multianewarray,
- (constant_classref *) iptr->target,
- disp);
+ codegen_addpatchref(cd, PATCHER_resolve_classref_to_classinfo,
+ (constant_classref *) iptr->target, disp);
if (opt_showdisassemble)
M_NOP;
-
- } else {
- disp = dseg_addaddress(cd, iptr->val.a);
}
+ else
+ disp = dseg_add_address(cd, iptr->val.a);
/* a1 = arraydescriptor */
M_LDA(rd->argintregs[2], REG_SP, LA_SIZE + 3 * 4);
#endif
- disp = dseg_addaddress(cd, BUILTIN_multianewarray);
+ disp = dseg_add_functionptr(cd, BUILTIN_multianewarray);
M_ALD(REG_ITMP3, REG_PV, disp);
M_MTCTR(REG_ITMP3);
M_JSR;
M_CMPI(REG_RESULT, 0);
M_BEQ(0);
- codegen_add_fillinstacktrace_ref(cd, mcodeptr);
+ codegen_add_fillinstacktrace_ref(cd);
d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_RESULT);
M_INTMOVE(REG_RESULT, d);
- store_reg_to_var_adr(iptr->dst, d);
+ emit_store(jd, iptr, iptr->dst, d);
break;
default:
*exceptionptr =
- new_internalerror("Unknown ICMD %d", iptr->opc);
+ new_internalerror("Unknown ICMD %d during code generation",
+ iptr->opc);
return false;
} /* switch */
if ((src->varkind != STACKVAR)) {
s2 = src->type;
if (IS_FLT_DBL_TYPE(s2)) {
- var_to_reg_flt(s1, src, REG_FTMP1);
- if (!(rd->interfaces[len][s2].flags & INMEMORY)) {
+ 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 {
+ else
M_DST(s1, REG_SP, rd->interfaces[len][s2].regoff * 4);
- }
} 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_TINTMOVE(s2, s1, rd->interfaces[len][s2].regoff);
+ if (IS_2_WORD_TYPE(s2))
+ M_LNGMOVE(s1, rd->interfaces[len][s2].regoff);
+ else
+ M_INTMOVE(s1, rd->interfaces[len][s2].regoff);
} else {
- if (IS_2_WORD_TYPE(s2)) {
- M_IST(GET_HIGH_REG(s1),
- REG_SP, rd->interfaces[len][s2].regoff * 4);
- M_IST(GET_LOW_REG(s1), REG_SP,
- rd->interfaces[len][s2].regoff * 4 + 4);
- } else {
+ if (IS_2_WORD_TYPE(s2))
+ M_LST(s1, REG_SP, rd->interfaces[len][s2].regoff * 4);
+ else
M_IST(s1, REG_SP, rd->interfaces[len][s2].regoff * 4);
- }
-
}
}
}
dseg_createlinenumbertable(cd);
+ /* generate stubs */
- /* generate exception and patcher stubs */
-
- {
- exceptionref *eref;
- patchref *pref;
- u4 mcode;
- s4 *savedmcodeptr;
- s4 *tmpmcodeptr;
-
- savedmcodeptr = NULL;
-
- /* generate exception stubs */
-
- for (eref = cd->exceptionrefs; eref != NULL; eref = eref->next) {
- gen_resolvebranch((u1 *) cd->mcodebase + eref->branchpos,
- eref->branchpos,
- (u1 *) mcodeptr - cd->mcodebase);
-
- MCODECHECK(100);
-
- /* Check if the exception is an
- ArrayIndexOutOfBoundsException. If so, move index register
- into REG_ITMP1. */
-
- if (eref->reg != -1)
- M_MOV(eref->reg, REG_ITMP1);
-
- /* calcuate exception address */
-
- M_LDA(REG_ITMP2_XPC, REG_PV, eref->branchpos - 4);
-
- /* move function to call into REG_ITMP3 */
-
- disp = dseg_addaddress(cd, eref->function);
- M_ALD(REG_ITMP3, REG_PV, disp);
-
- if (savedmcodeptr != NULL) {
- disp = savedmcodeptr - mcodeptr - 1;
- M_BR(disp);
-
- } else {
- savedmcodeptr = mcodeptr;
-
- if (m->isleafmethod) {
- M_MFLR(REG_ZERO);
- M_AST(REG_ZERO, REG_SP, stackframesize * 4 + LA_LR_OFFSET);
- }
+ emit_exception_stubs(jd);
+ emit_patcher_stubs(jd);
+ emit_replacement_stubs(jd);
- M_MOV(REG_PV, rd->argintregs[0]);
- M_MOV(REG_SP, rd->argintregs[1]);
-
- if (m->isleafmethod)
- M_MOV(REG_ZERO, rd->argintregs[2]);
- else
- M_ALD(rd->argintregs[2],
- REG_SP, stackframesize * 4 + LA_LR_OFFSET);
-
- M_MOV(REG_ITMP2_XPC, rd->argintregs[3]);
- M_MOV(REG_ITMP1, rd->argintregs[4]);
-
- M_STWU(REG_SP, REG_SP, -(LA_SIZE + 6 * 4));
- M_AST(REG_ITMP2_XPC, REG_SP, LA_SIZE + 5 * 4);
-
- M_MTCTR(REG_ITMP3);
- M_JSR;
- M_MOV(REG_RESULT, REG_ITMP1_XPTR);
-
- M_ALD(REG_ITMP2_XPC, REG_SP, LA_SIZE + 5 * 4);
- M_IADD_IMM(REG_SP, LA_SIZE + 6 * 4, REG_SP);
-
- if (m->isleafmethod) {
- /* XXX FIXME: REG_ZERO can cause problems here! */
- assert(stackframesize * 4 <= 32767);
-
- M_ALD(REG_ZERO, REG_SP, stackframesize * 4 + LA_LR_OFFSET);
- M_MTLR(REG_ZERO);
- }
-
- disp = dseg_addaddress(cd, asm_handle_exception);
- M_ALD(REG_ITMP3, REG_PV, disp);
- M_MTCTR(REG_ITMP3);
- M_RTS;
- }
- }
-
-
- /* generate code patching stub call code */
-
- for (pref = cd->patchrefs; pref != NULL; pref = pref->next) {
- /* check code segment size */
-
- MCODECHECK(16);
-
- /* Get machine code which is patched back in later. The
- call is 1 instruction word long. */
-
- savedmcodeptr = (s4 *) (cd->mcodebase + pref->branchpos);
- mcode = *savedmcodeptr;
-
- /* Patch in the call to call the following code (done at
- compile time). */
-
- tmpmcodeptr = mcodeptr; /* save current mcodeptr */
- mcodeptr = savedmcodeptr; /* set mcodeptr to patch position */
-
- M_BR(tmpmcodeptr - (savedmcodeptr + 1));
-
- mcodeptr = tmpmcodeptr; /* restore the current mcodeptr */
-
- /* create stack frame - keep stack 16-byte aligned */
-
- M_AADD_IMM(REG_SP, -8 * 4, REG_SP);
-
- /* calculate return address and move it onto the stack */
-
- M_LDA(REG_ITMP3, REG_PV, pref->branchpos);
- M_AST_INTERN(REG_ITMP3, REG_SP, 5 * 4);
-
- /* move pointer to java_objectheader onto stack */
-
-#if defined(USE_THREADS) && defined(NATIVE_THREADS)
- /* order reversed because of data segment layout */
-
- (void) dseg_addaddress(cd, get_dummyLR()); /* monitorPtr */
- disp = dseg_addaddress(cd, NULL); /* vftbl */
-
- M_LDA(REG_ITMP3, REG_PV, disp);
- M_AST_INTERN(REG_ITMP3, REG_SP, 4 * 4);
-#else
- /* do nothing */
-#endif
-
- /* move machine code onto stack */
-
- disp = dseg_adds4(cd, mcode);
- M_ILD(REG_ITMP3, REG_PV, disp);
- M_IST_INTERN(REG_ITMP3, REG_SP, 3 * 4);
-
- /* move class/method/field reference onto stack */
-
- disp = dseg_addaddress(cd, pref->ref);
- M_ALD(REG_ITMP3, REG_PV, disp);
- M_AST_INTERN(REG_ITMP3, REG_SP, 2 * 4);
-
- /* move data segment displacement onto stack */
-
- disp = dseg_addaddress(cd, pref->disp);
- M_ILD(REG_ITMP3, REG_PV, disp);
- M_IST_INTERN(REG_ITMP3, REG_SP, 1 * 4);
-
- /* move patcher function pointer onto stack */
-
- disp = dseg_addaddress(cd, pref->patcher);
- M_ALD(REG_ITMP3, REG_PV, disp);
- M_AST_INTERN(REG_ITMP3, REG_SP, 0 * 4);
-
- disp = dseg_addaddress(cd, asm_wrapper_patcher);
- M_ALD(REG_ITMP3, REG_PV, disp);
- M_MTCTR(REG_ITMP3);
- M_RTS;
- }
-
- /* generate replacement-out stubs */
-
- {
- int i;
-
- replacementpoint = jd->code->rplpoints;
-
- for (i = 0; i < jd->code->rplpointcount; ++i, ++replacementpoint) {
- /* check code segment size */
-
- MCODECHECK(100);
-
- /* note start of stub code */
-
- replacementpoint->outcode = (u1*) (ptrint)((u1*)mcodeptr - cd->mcodebase);
-
- /* make machine code for patching */
-
- tmpmcodeptr = mcodeptr;
- mcodeptr = (s4*) &(replacementpoint->mcode) + 1 /* big-endian */;
-
- disp = (ptrint)((s4*)replacementpoint->outcode - (s4*)replacementpoint->pc) - 1;
- M_BR(disp);
-
- mcodeptr = tmpmcodeptr;
-
- /* create stack frame - keep 16-byte aligned */
-
- M_AADD_IMM(REG_SP, -4 * 4, REG_SP);
-
- /* push address of `rplpoint` struct */
-
- disp = dseg_addaddress(cd, replacementpoint);
- M_ALD(REG_ITMP3, REG_PV, disp);
- M_AST_INTERN(REG_ITMP3, REG_SP, 0 * 4);
-
- /* jump to replacement function */
-
- disp = dseg_addaddress(cd, asm_replacement_out);
- M_ALD(REG_ITMP3, REG_PV, disp);
- M_MTCTR(REG_ITMP3);
- M_RTS;
- }
- }
- }
-
- codegen_finish(jd, (s4) ((u1 *) mcodeptr - cd->mcodebase));
+ codegen_finish(jd);
/* everything's ok */
*******************************************************************************/
-#define COMPILERSTUB_DATASIZE 2 * SIZEOF_VOID_P
+#define COMPILERSTUB_DATASIZE 3 * SIZEOF_VOID_P
#define COMPILERSTUB_CODESIZE 4 * 4
#define COMPILERSTUB_SIZE COMPILERSTUB_DATASIZE + COMPILERSTUB_CODESIZE
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;
+ codeinfo *code;
+ 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 = s;
+
+ /* Store the codeinfo pointer in the same place as in the
+ methodheader for compiled methods. */
- /* Store the methodinfo* in the same place as in the methodheader
- for compiled methods. */
+ code = code_codeinfo_new(m);
d[0] = (ptrint) asm_call_jit_compiler;
d[1] = (ptrint) m;
+ d[2] = (ptrint) code;
- M_ALD_INTERN(REG_ITMP1, REG_PV, -1 * SIZEOF_VOID_P);
- M_ALD_INTERN(REG_PV, REG_PV, -2 * SIZEOF_VOID_P);
+ M_ALD_INTERN(REG_ITMP1, REG_PV, -2 * SIZEOF_VOID_P);
+ M_ALD_INTERN(REG_PV, REG_PV, -3 * SIZEOF_VOID_P);
M_MTCTR(REG_PV);
M_RTS;
count_cstub_len += COMPILERSTUB_SIZE;
#endif
+ /* release dump area */
+
+ dump_release(dumpsize);
+
return s;
}
u1 *createnativestub(functionptr f, jitdata *jd, methoddesc *nmd)
{
methodinfo *m;
+ codeinfo *code;
codegendata *cd;
registerdata *rd;
- s4 *mcodeptr; /* code generation pointer */
- s4 stackframesize; /* size of stackframe if needed */
methoddesc *md;
s4 nativeparams;
s4 i, j; /* count variables */
/* get required compiler data */
- m = jd->m;
- cd = jd->cd;
- rd = jd->rd;
+ m = jd->m;
+ code = jd->code;
+ cd = jd->cd;
+ rd = jd->rd;
/* set some variables */
/* calculate stackframe size */
- stackframesize =
+ cd->stackframesize =
sizeof(stackframeinfo) / SIZEOF_VOID_P +
sizeof(localref_table) / SIZEOF_VOID_P +
4 + /* 4 stackframeinfo arguments (darwin)*/
nmd->paramcount * 2 + /* assume all arguments are doubles */
nmd->memuse;
- stackframesize = (stackframesize + 3) & ~3; /* keep stack 16-byte aligned */
+ /* keep stack 16-byte aligned */
+ cd->stackframesize = (cd->stackframesize + 3) & ~3;
/* create method header */
- (void) dseg_addaddress(cd, m); /* MethodPointer */
- (void) dseg_adds4(cd, stackframesize * 4); /* FrameSize */
- (void) dseg_adds4(cd, 0); /* IsSync */
- (void) dseg_adds4(cd, 0); /* IsLeaf */
- (void) dseg_adds4(cd, 0); /* IntSave */
- (void) dseg_adds4(cd, 0); /* FltSave */
+ (void) dseg_add_unique_address(cd, code); /* CodeinfoPointer */
+ (void) dseg_add_unique_s4(cd, cd->stackframesize * 4); /* FrameSize */
+ (void) dseg_add_unique_s4(cd, 0); /* IsSync */
+ (void) dseg_add_unique_s4(cd, 0); /* IsLeaf */
+ (void) dseg_add_unique_s4(cd, 0); /* IntSave */
+ (void) dseg_add_unique_s4(cd, 0); /* FltSave */
(void) dseg_addlinenumbertablesize(cd);
- (void) dseg_adds4(cd, 0); /* ExTableSize */
-
-
- /* initialize mcode variables */
-
- mcodeptr = (s4 *) cd->mcodebase;
-
+ (void) dseg_add_unique_s4(cd, 0); /* ExTableSize */
/* generate code */
M_MFLR(REG_ZERO);
M_AST_INTERN(REG_ZERO, REG_SP, LA_LR_OFFSET);
- M_STWU(REG_SP, REG_SP, -(stackframesize * 4));
-
-
- if (opt_verbosecall) {
- /* parent_argbase == stackframesize * 4 */
- mcodeptr = codegen_trace_args(m, cd, rd, mcodeptr, stackframesize * 4 ,
- true);
- }
+ M_STWU(REG_SP, REG_SP, -(cd->stackframesize * 4));
+ if (JITDATA_HAS_FLAG_VERBOSECALL(jd))
+ emit_verbosecall_enter(jd);
/* get function address (this must happen before the stackframeinfo) */
- funcdisp = dseg_addaddress(cd, f);
+ funcdisp = dseg_add_functionptr(cd, f);
#if !defined(WITH_STATIC_CLASSPATH)
if (f == NULL) {
- codegen_addpatchref(cd, mcodeptr, PATCHER_resolve_native, m, funcdisp);
+ codegen_addpatchref(cd, PATCHER_resolve_native_function, m, funcdisp);
if (opt_showdisassemble)
M_NOP;
/* save integer and float argument registers */
- for (i = 0, j = 0; i < md->paramcount && j < INT_ARG_CNT; i++) {
+ j = 0;
+
+ for (i = 0; i < md->paramcount; i++) {
t = md->paramtypes[i].type;
if (IS_INT_LNG_TYPE(t)) {
- s1 = md->params[i].regoff;
- if (IS_2_WORD_TYPE(t)) {
- M_IST(rd->argintregs[GET_HIGH_REG(s1)], REG_SP, LA_SIZE + 4 * 4 + j * 4);
- j++;
- M_IST(rd->argintregs[GET_LOW_REG(s1)], REG_SP, LA_SIZE + 4 * 4 + j * 4);
- j++;
- } else {
- M_IST(rd->argintregs[s1], REG_SP, LA_SIZE + 4 * 4 + j * 4);
+ if (!md->params[i].inmemory) {
+ s1 = md->params[i].regoff;
+ if (IS_2_WORD_TYPE(t)) {
+ M_IST(rd->argintregs[GET_HIGH_REG(s1)], REG_SP, LA_SIZE + 4 * 4 + j * 4);
+ j++;
+ M_IST(rd->argintregs[GET_LOW_REG(s1)], REG_SP, LA_SIZE + 4 * 4 + j * 4);
+ } else {
+ M_IST(rd->argintregs[s1], REG_SP, LA_SIZE + 4 * 4 + j * 4);
+ }
j++;
}
}
}
- for (i = 0; i < md->paramcount && j < FLT_ARG_CNT; i++) {
+ for (i = 0; i < md->paramcount; i++) {
if (IS_FLT_DBL_TYPE(md->paramtypes[i].type)) {
- s1 = md->params[i].regoff;
- M_DST(rd->argfltregs[s1], REG_SP, LA_SIZE + 4 * 4 + j * 8);
- j++;
+ if (!md->params[i].inmemory) {
+ s1 = md->params[i].regoff;
+ M_DST(rd->argfltregs[s1], REG_SP, LA_SIZE + 4 * 4 + j * 8);
+ j++;
+ }
}
}
/* create native stack info */
- M_AADD_IMM(REG_SP, stackframesize * 4, rd->argintregs[0]);
+ M_AADD_IMM(REG_SP, cd->stackframesize * 4, rd->argintregs[0]);
M_MOV(REG_PV, rd->argintregs[1]);
- M_AADD_IMM(REG_SP, stackframesize * 4, rd->argintregs[2]);
- M_ALD(rd->argintregs[3], REG_SP, stackframesize * 4 + LA_LR_OFFSET);
- disp = dseg_addaddress(cd, codegen_start_native_call);
+ M_AADD_IMM(REG_SP, cd->stackframesize * 4, rd->argintregs[2]);
+ M_ALD(rd->argintregs[3], REG_SP, cd->stackframesize * 4 + LA_LR_OFFSET);
+ disp = dseg_add_functionptr(cd, codegen_start_native_call);
M_ALD(REG_ITMP1, REG_PV, disp);
M_MTCTR(REG_ITMP1);
M_JSR;
/* restore integer and float argument registers */
- for (i = 0, j = 0; i < md->paramcount && j < INT_ARG_CNT; i++) {
+ j = 0;
+
+ for (i = 0; i < md->paramcount; i++) {
t = md->paramtypes[i].type;
if (IS_INT_LNG_TYPE(t)) {
- s1 = md->params[i].regoff;
+ if (!md->params[i].inmemory) {
+ s1 = md->params[i].regoff;
- if (IS_2_WORD_TYPE(t)) {
- M_ILD(rd->argintregs[GET_HIGH_REG(s1)], REG_SP, LA_SIZE + 4 * 4 + j * 4);
- j++;
- M_ILD(rd->argintregs[GET_LOW_REG(s1)], REG_SP, LA_SIZE + 4 * 4 + j * 4);
- j++;
- } else {
- M_ILD(rd->argintregs[s1], REG_SP, LA_SIZE + 4 * 4 + j * 4);
+ if (IS_2_WORD_TYPE(t)) {
+ M_ILD(rd->argintregs[GET_HIGH_REG(s1)], REG_SP, LA_SIZE + 4 * 4 + j * 4);
+ j++;
+ M_ILD(rd->argintregs[GET_LOW_REG(s1)], REG_SP, LA_SIZE + 4 * 4 + j * 4);
+ } else {
+ M_ILD(rd->argintregs[s1], REG_SP, LA_SIZE + 4 * 4 + j * 4);
+ }
j++;
}
}
}
- for (i = 0; i < md->paramcount && j < FLT_ARG_CNT; i++) {
+ for (i = 0; i < md->paramcount; i++) {
if (IS_FLT_DBL_TYPE(md->paramtypes[i].type)) {
- s1 = md->params[i].regoff;
- M_DLD(rd->argfltregs[i], REG_SP, LA_SIZE + 4 * 4 + j * 8);
- j++;
+ if (!md->params[i].inmemory) {
+ s1 = md->params[i].regoff;
+ M_DLD(rd->argfltregs[s1], REG_SP, LA_SIZE + 4 * 4 + j * 8);
+ j++;
+ }
}
}
s1 = rd->argintregs[md->params[i].regoff];
if (!nmd->params[j].inmemory) {
- if (IS_2_WORD_TYPE(t))
+ if (IS_2_WORD_TYPE(t)) {
s2 = PACK_REGS(
rd->argintregs[GET_LOW_REG(nmd->params[j].regoff)],
rd->argintregs[GET_HIGH_REG(nmd->params[j].regoff)]);
- else
+ M_LNGMOVE(s1, s2);
+ } else {
s2 = rd->argintregs[nmd->params[j].regoff];
- M_TINTMOVE(t, s1, s2);
+ M_INTMOVE(s1, s2);
+ }
} else {
s2 = nmd->params[j].regoff;
- if (IS_2_WORD_TYPE(t)) {
- M_IST(GET_HIGH_REG(s1), REG_SP, s2 * 4);
- M_IST(GET_LOW_REG(s1), REG_SP, s2 * 4 + 4);
- } else {
+ if (IS_2_WORD_TYPE(t))
+ M_LST(s1, REG_SP, s2 * 4);
+ else
M_IST(s1, REG_SP, s2 * 4);
- }
}
} else {
- s1 = md->params[i].regoff + stackframesize;
+ s1 = md->params[i].regoff + cd->stackframesize;
s2 = nmd->params[j].regoff;
M_ILD(REG_ITMP1, REG_SP, s1 * 4);
- if (IS_2_WORD_TYPE(t)) {
+ if (IS_2_WORD_TYPE(t))
M_ILD(REG_ITMP2, REG_SP, s1 * 4 + 4);
- }
+
M_IST(REG_ITMP1, REG_SP, s2 * 4);
- if (IS_2_WORD_TYPE(t)) {
+ if (IS_2_WORD_TYPE(t))
M_IST(REG_ITMP2, REG_SP, s2 * 4 + 4);
- }
}
} else {
- /* We only copy spilled float arguments, as the float argument */
- /* registers keep unchanged. */
+ /* We only copy spilled float arguments, as the float
+ argument registers keep unchanged. */
if (md->params[i].inmemory) {
- s1 = md->params[i].regoff + stackframesize;
+ s1 = md->params[i].regoff + cd->stackframesize;
s2 = nmd->params[j].regoff;
if (IS_2_WORD_TYPE(t)) {
/* put class into second argument register */
if (m->flags & ACC_STATIC) {
- disp = dseg_addaddress(cd, m->class);
+ disp = dseg_add_address(cd, m->class);
M_ALD(rd->argintregs[1], REG_PV, disp);
}
/* put env into first argument register */
- disp = dseg_addaddress(cd, _Jv_env);
+ disp = dseg_add_address(cd, _Jv_env);
M_ALD(rd->argintregs[0], REG_PV, disp);
/* generate the actual native call */
M_MTCTR(REG_ITMP3);
M_JSR;
+ /* print call trace */
+
+ if (JITDATA_HAS_FLAG_VERBOSECALL(jd))
+ emit_verbosecall_exit(jd);
+
/* save return value */
if (md->returntype.type != TYPE_VOID) {
if (IS_2_WORD_TYPE(md->returntype.type))
M_IST(REG_RESULT2, REG_SP, LA_SIZE + 2 * 4);
M_IST(REG_RESULT, REG_SP, LA_SIZE + 1 * 4);
- } else {
+ }
+ else {
if (IS_2_WORD_TYPE(md->returntype.type))
M_DST(REG_FRESULT, REG_SP, LA_SIZE + 1 * 4);
else
/* remove native stackframe info */
- M_AADD_IMM(REG_SP, stackframesize * 4, rd->argintregs[0]);
- disp = dseg_addaddress(cd, codegen_finish_native_call);
+ M_AADD_IMM(REG_SP, cd->stackframesize * 4, rd->argintregs[0]);
+ disp = dseg_add_functionptr(cd, codegen_finish_native_call);
M_ALD(REG_ITMP1, REG_PV, disp);
M_MTCTR(REG_ITMP1);
M_JSR;
-
- /* print call trace */
-
- if (opt_verbosecall) {
- /* just restore the value we need, don't care about the other */
-
- if (md->returntype.type != TYPE_VOID) {
- if (IS_INT_LNG_TYPE(md->returntype.type)) {
- if (IS_2_WORD_TYPE(md->returntype.type))
- M_ILD(REG_RESULT2, REG_SP, LA_SIZE + 2 * 4);
- M_ILD(REG_RESULT, REG_SP, LA_SIZE + 1 * 4);
- } else {
- if (IS_2_WORD_TYPE(md->returntype.type))
- M_DLD(REG_FRESULT, REG_SP, LA_SIZE + 1 * 4);
- else
- M_FLD(REG_FRESULT, REG_SP, LA_SIZE + 1 * 4);
- }
- }
-
- M_LDA(REG_SP, REG_SP, -(LA_SIZE + (1 + 2 + 2 + 1) * 4));
-
- /* keep this order */
- switch (md->returntype.type) {
- case TYPE_INT:
- case TYPE_ADR:
-#if defined(__DARWIN__)
- M_MOV(REG_RESULT, rd->argintregs[2]);
- M_CLR(rd->argintregs[1]);
-#else
- M_MOV(REG_RESULT, rd->argintregs[3]);
- M_CLR(rd->argintregs[2]);
-#endif
- break;
-
- case TYPE_LNG:
-#if defined(__DARWIN__)
- M_MOV(REG_RESULT2, rd->argintregs[2]);
- M_MOV(REG_RESULT, rd->argintregs[1]);
-#else
- M_MOV(REG_RESULT2, rd->argintregs[3]);
- M_MOV(REG_RESULT, rd->argintregs[2]);
-#endif
- break;
- }
-
- M_FLTMOVE(REG_FRESULT, rd->argfltregs[0]);
- M_FLTMOVE(REG_FRESULT, rd->argfltregs[1]);
- disp = dseg_addaddress(cd, m);
- M_ALD(rd->argintregs[0], REG_PV, disp);
-
- disp = dseg_addaddress(cd, builtin_displaymethodstop);
- M_ALD(REG_ITMP2, REG_PV, disp);
- M_MTCTR(REG_ITMP2);
- M_JSR;
-
- M_LDA(REG_SP, REG_SP, LA_SIZE + (1 + 2 + 2 + 1) * 4);
- }
-
- /* check for exception */
-
-#if defined(USE_THREADS) && defined(NATIVE_THREADS)
- disp = dseg_addaddress(cd, builtin_get_exceptionptrptr);
- M_ALD(REG_ITMP1, REG_PV, disp);
- M_MTCTR(REG_ITMP1);
- M_JSR;
- M_MOV(REG_RESULT, REG_ITMP2);
-#else
- disp = dseg_addaddress(cd, &_no_threads_exceptionptr);
- M_ALD(REG_ITMP2, REG_PV, disp);
-#endif
- M_ALD(REG_ITMP1_XPTR, REG_ITMP2, 0);/* load exception into reg. itmp1 */
+ M_MOV(REG_RESULT, REG_ITMP1_XPTR);
/* restore return value */
if (IS_2_WORD_TYPE(md->returntype.type))
M_ILD(REG_RESULT2, REG_SP, LA_SIZE + 2 * 4);
M_ILD(REG_RESULT, REG_SP, LA_SIZE + 1 * 4);
- } else {
+ }
+ else {
if (IS_2_WORD_TYPE(md->returntype.type))
M_DLD(REG_FRESULT, REG_SP, LA_SIZE + 1 * 4);
else
}
}
+ M_ALD(REG_ITMP2_XPC, REG_SP, cd->stackframesize * 4 + LA_LR_OFFSET);
+ M_MTLR(REG_ITMP2_XPC);
+ M_LDA(REG_SP, REG_SP, cd->stackframesize * 4); /* remove stackframe */
+
+ /* check for exception */
+
M_TST(REG_ITMP1_XPTR);
- M_BNE(4); /* if no exception then return */
+ M_BNE(1); /* if no exception then return */
- M_ALD(REG_ZERO, REG_SP, stackframesize * 4 + LA_LR_OFFSET); /* load ra */
- M_MTLR(REG_ZERO);
- M_LDA(REG_SP, REG_SP, stackframesize * 4); /* remove stackframe */
M_RET;
/* handle exception */
- M_CLR(REG_ITMP3);
- M_AST(REG_ITMP3, REG_ITMP2, 0); /* store NULL into exceptionptr */
+ M_IADD_IMM(REG_ITMP2_XPC, -4, REG_ITMP2_XPC); /* exception address */
- M_ALD(REG_ITMP2, REG_SP, stackframesize * 4 + LA_LR_OFFSET); /* load ra */
- M_MTLR(REG_ITMP2);
-
- M_LDA(REG_SP, REG_SP, stackframesize * 4); /* remove stackframe */
-
- M_IADD_IMM(REG_ITMP2, -4, REG_ITMP2_XPC); /* fault address */
-
- disp = dseg_addaddress(cd, asm_handle_nat_exception);
+ disp = dseg_add_functionptr(cd, asm_handle_nat_exception);
M_ALD(REG_ITMP3, REG_PV, disp);
M_MTCTR(REG_ITMP3);
M_RTS;
- /* generate patcher stub call code */
-
- {
- patchref *pref;
- s4 *savedmcodeptr;
- s4 mcode;
- s4 *tmpmcodeptr;
-
- for (pref = cd->patchrefs; pref != NULL; pref = pref->next) {
- /* Get machine code which is patched back in later. The
- call is 1 instruction word long. */
-
- savedmcodeptr = (s4 *) (cd->mcodebase + pref->branchpos);
- mcode = (u4) *savedmcodeptr;
-
- /* Patch in the call to call the following code (done at
- compile time). */
-
- tmpmcodeptr = mcodeptr; /* save current mcodeptr */
- mcodeptr = savedmcodeptr; /* set mcodeptr to patch position */
-
- M_BL(tmpmcodeptr - (savedmcodeptr + 1));
-
- mcodeptr = tmpmcodeptr; /* restore the current mcodeptr */
+ /* generate patcher stubs */
- /* create stack frame - keep stack 16-byte aligned */
+ emit_patcher_stubs(jd);
- M_AADD_IMM(REG_SP, -8 * 4, REG_SP);
+ codegen_finish(jd);
- /* move return address onto stack */
-
- M_MFLR(REG_ZERO);
- M_AST(REG_ZERO, REG_SP, 5 * 4);
-
- /* move pointer to java_objectheader onto stack */
-
-#if defined(USE_THREADS) && defined(NATIVE_THREADS)
- /* order reversed because of data segment layout */
-
- (void) dseg_addaddress(cd, get_dummyLR()); /* monitorPtr */
- disp = dseg_addaddress(cd, NULL); /* vftbl */
-
- M_LDA(REG_ITMP3, REG_PV, disp);
- M_AST(REG_ITMP3, REG_SP, 4 * 4);
-#else
- /* do nothing */
-#endif
-
- /* move machine code onto stack */
-
- disp = dseg_adds4(cd, mcode);
- M_ILD(REG_ITMP3, REG_PV, disp);
- M_IST(REG_ITMP3, REG_SP, 3 * 4);
-
- /* move class/method/field reference onto stack */
-
- disp = dseg_addaddress(cd, pref->ref);
- M_ALD(REG_ITMP3, REG_PV, disp);
- M_AST(REG_ITMP3, REG_SP, 2 * 4);
-
- /* move data segment displacement onto stack */
-
- disp = dseg_addaddress(cd, pref->disp);
- M_ILD(REG_ITMP3, REG_PV, disp);
- M_IST(REG_ITMP3, REG_SP, 1 * 4);
-
- /* move patcher function pointer onto stack */
-
- disp = dseg_addaddress(cd, pref->patcher);
- M_ALD(REG_ITMP3, REG_PV, disp);
- M_AST(REG_ITMP3, REG_SP, 0 * 4);
-
- disp = dseg_addaddress(cd, asm_wrapper_patcher);
- M_ALD(REG_ITMP3, REG_PV, disp);
- M_MTCTR(REG_ITMP3);
- M_RTS;
- }
- }
-
- codegen_finish(jd, (s4) ((u1 *) mcodeptr - cd->mcodebase));
-
- return jd->code->entrypoint;
+ return code->entrypoint;
}
-s4 *codegen_trace_args(methodinfo *m, codegendata *cd, registerdata *rd,
- s4 *mcodeptr, s4 stackframesize, bool nativestub)
-{
- s4 s1, p, t, d;
- int stack_off;
- int stack_size;
- methoddesc *md;
-
- md = m->parseddesc;
-
- if (!nativestub)
- M_MFLR(REG_ITMP3);
- /* Build up Stackframe for builtin_trace_args call (a multiple of 16) */
- /* For Darwin: */
- /* LA + TRACE_ARGS_NUM u8 args + methodinfo + LR */
- /* LA_SIZE(=6*4) + 8*8 + 4 + 4 + 0(Padding) */
- /* 6 * 4 + 8 * 8 + 2 * 4 = 12 * 8 = 6 * 16 */
- /* For Linux: */
- /* LA + (TRACE_ARGS_NUM - INT_ARG_CNT/2) u8 args + methodinfo */
- /* + INT_ARG_CNT * 4 ( save integer registers) + LR + 8 + 8 (Padding) */
- /* LA_SIZE(=2*4) + 4 * 8 + 4 + 8 * 4 + 4 + 8 */
- /* 2 * 4 + 4 * 8 + 10 * 4 + 1 * 8 + 8= 12 * 8 = 6 * 16 */
-
- /* in nativestubs no Place to save the LR (Link Register) would be needed */
- /* but since the stack frame has to be aligned the 4 Bytes would have to */
- /* be padded again */
-
-#if defined(__DARWIN__)
- stack_size = LA_SIZE + (TRACE_ARGS_NUM + 1) * 8;
-#else
- stack_size = 6 * 16;
-#endif
- M_LDA(REG_SP, REG_SP, -stack_size);
-
- /* Save LR */
- if (!nativestub)
- M_IST(REG_ITMP3, REG_SP, LA_SIZE + TRACE_ARGS_NUM * 8 + 1 * 4);
-
- M_CLR(REG_ITMP1); /* clear help register */
-
- /* save up to TRACE_ARGS_NUM arguments into the reserved stack space */
-#if defined(__DARWIN__)
- /* Copy Params starting from first to Stack */
- /* since TRACE_ARGS == INT_ARG_CNT all used integer argument regs */
- /* are saved */
- p = 0;
-#else
- /* Copy Params starting from fifth to Stack (INT_ARG_CNT/2) are in */
- /* integer argument regs */
- /* all integer argument registers have to be saved */
- for (p = 0; p < 8; p++) {
- d = rd->argintregs[p];
- /* save integer argument registers */
- M_IST(d, REG_SP, LA_SIZE + 4 * 8 + 4 + p * 4);
- }
- p = 4;
-#endif
- stack_off = LA_SIZE;
- for (; p < md->paramcount && p < TRACE_ARGS_NUM; p++, stack_off += 8) {
- t = md->paramtypes[p].type;
- if (IS_INT_LNG_TYPE(t)) {
- if (!md->params[p].inmemory) { /* Param in Arg Reg */
- if (IS_2_WORD_TYPE(t)) {
- M_IST(rd->argintregs[GET_HIGH_REG(md->params[p].regoff)]
- , REG_SP, stack_off);
- M_IST(rd->argintregs[GET_LOW_REG(md->params[p].regoff)]
- , REG_SP, stack_off + 4);
- } else {
- M_IST(REG_ITMP1, REG_SP, stack_off);
- M_IST(rd->argintregs[md->params[p].regoff]
- , REG_SP, stack_off + 4);
- }
- } else { /* Param on Stack */
- s1 = (md->params[p].regoff + stackframesize) * 4
- + stack_size;
- if (IS_2_WORD_TYPE(t)) {
- M_ILD(REG_ITMP2, REG_SP, s1);
- M_IST(REG_ITMP2, REG_SP, stack_off);
- M_ILD(REG_ITMP2, REG_SP, s1 + 4);
- M_IST(REG_ITMP2, REG_SP, stack_off + 4);
- } else {
- M_IST(REG_ITMP1, REG_SP, stack_off);
- M_ILD(REG_ITMP2, REG_SP, s1);
- M_IST(REG_ITMP2, REG_SP, stack_off + 4);
- }
- }
- } else { /* IS_FLT_DBL_TYPE(t) */
- if (!md->params[p].inmemory) { /* in Arg Reg */
- s1 = rd->argfltregs[md->params[p].regoff];
- if (!IS_2_WORD_TYPE(t)) {
- M_IST(REG_ITMP1, REG_SP, stack_off);
- M_FST(s1, REG_SP, stack_off + 4);
- } else {
- M_DST(s1, REG_SP, stack_off);
- }
- } else { /* on Stack */
- /* this should not happen */
- }
- }
- }
-
- /* load first 4 (==INT_ARG_CNT/2) arguments into integer registers */
-#if defined(__DARWIN__)
- for (p = 0; p < 8; p++) {
- d = rd->argintregs[p];
- M_ILD(d, REG_SP, LA_SIZE + p * 4);
- }
-#else
- /* LINUX */
- /* Set integer and float argument registers vor trace_args call */
- /* offset to saved integer argument registers */
- stack_off = LA_SIZE + 4 * 8 + 4;
- for (p = 0; (p < 4) && (p < md->paramcount); p++) {
- t = md->paramtypes[p].type;
- if (IS_INT_LNG_TYPE(t)) {
- /* "stretch" int types */
- if (!IS_2_WORD_TYPE(t)) {
- M_CLR(rd->argintregs[2 * p]);
- M_ILD(rd->argintregs[2 * p + 1], REG_SP,stack_off);
- stack_off += 4;
- } else {
- M_ILD(rd->argintregs[2 * p + 1], REG_SP,stack_off + 4);
- M_ILD(rd->argintregs[2 * p], REG_SP,stack_off);
- stack_off += 8;
- }
- } else { /* Float/Dbl */
- if (!md->params[p].inmemory) { /* Param in Arg Reg */
- /* use reserved Place on Stack (sp + 5 * 16) to copy */
- /* float/double arg reg to int reg */
- s1 = rd->argfltregs[md->params[p].regoff];
- if (!IS_2_WORD_TYPE(t)) {
- M_FST(s1, REG_SP, 5 * 16);
- M_ILD(rd->argintregs[2 * p + 1], REG_SP, 5 * 16);
- M_CLR(rd->argintregs[2 * p]);
- } else {
- M_DST(s1, REG_SP, 5 * 16);
- M_ILD(rd->argintregs[2 * p + 1], REG_SP, 5 * 16 + 4);
- M_ILD(rd->argintregs[2 * p], REG_SP, 5 * 16);
- }
- }
- }
- }
-#endif
-
- /* put methodinfo pointer on Stackframe */
- p = dseg_addaddress(cd, m);
- M_ALD(REG_ITMP1, REG_PV, p);
-#if defined(__DARWIN__)
- M_AST(REG_ITMP1, REG_SP, LA_SIZE + TRACE_ARGS_NUM * 8);
-#else
- M_AST(REG_ITMP1, REG_SP, LA_SIZE + 4 * 8);
-#endif
- p = dseg_addaddress(cd, builtin_trace_args);
- M_ALD(REG_ITMP2, REG_PV, p);
- M_MTCTR(REG_ITMP2);
- M_JSR;
-
-#if defined(__DARWIN__)
- /* restore integer argument registers from the reserved stack space */
-
- stack_off = LA_SIZE;
- for (p = 0; p < md->paramcount && p < TRACE_ARGS_NUM;
- p++, stack_off += 8) {
- t = md->paramtypes[p].type;
-
- if (IS_INT_LNG_TYPE(t)) {
- if (!md->params[p].inmemory) {
- if (IS_2_WORD_TYPE(t)) {
- M_ILD(rd->argintregs[GET_HIGH_REG(md->params[p].regoff)]
- , REG_SP, stack_off);
- M_ILD(rd->argintregs[GET_LOW_REG(md->params[p].regoff)]
- , REG_SP, stack_off + 4);
- } else {
- M_ILD(rd->argintregs[md->params[p].regoff]
- , REG_SP, stack_off + 4);
- }
- }
- }
- }
-#else
- /* LINUX */
- for (p = 0; p < 8; p++) {
- d = rd->argintregs[p];
- /* save integer argument registers */
- M_ILD(d, REG_SP, LA_SIZE + 4 * 8 + 4 + p * 4);
- }
-#endif
-
- if (!nativestub)
- M_ILD(REG_ITMP3, REG_SP, LA_SIZE + TRACE_ARGS_NUM * 8 + 1 * 4);
-
- M_LDA(REG_SP, REG_SP, stack_size);
- if (!nativestub)
- M_MTLR(REG_ITMP3);
- return mcodeptr;
-}
-
/*
* These are local overrides for various environment variables in Emacs.
* Please do not remove this and leave it at the end of the file, where
projects / cacao.git / blobdiff