Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA.
- $Id: codegen.c 7244 2007-01-29 10:19:35Z twisti $
-
*/
#include "mm/memory.h"
+#include "native/localref.h"
#include "native/native.h"
-#if defined(ENABLE_THREADS)
-# include "threads/native/lock.h"
-#endif
+#include "threads/lock-common.h"
#include "vm/builtin.h"
#include "vm/exceptions.h"
#include "vm/global.h"
-#include "vm/loader.h"
-#include "vm/options.h"
-#include "vm/stringlocal.h"
#include "vm/vm.h"
#include "vm/jit/asmpart.h"
#include "vm/jit/md.h"
#include "vm/jit/methodheader.h"
#include "vm/jit/parse.h"
-#include "vm/jit/patcher.h"
+#include "vm/jit/patcher-common.h"
#include "vm/jit/reg.h"
#if defined(ENABLE_LSRA)
#include "vm/jit/allocator/lsra.h"
#endif
+#include "vmcore/loader.h"
+#include "vmcore/options.h"
+
-/* codegen *********************************************************************
+/* codegen_emit ****************************************************************
Generates machine code.
*******************************************************************************/
-bool codegen(jitdata *jd)
+bool codegen_emit(jitdata *jd)
{
methodinfo *m;
codeinfo *code;
basicblock *bptr;
instruction *iptr;
exception_entry *ex;
- s4 fieldtype;
- s4 varindex;
s4 spilledregs_num;
s4 savedregs_num;
unresolved_method *um;
builtintable_entry *bte;
methoddesc *md;
+ fieldinfo *fi;
+ unresolved_field *uf;
+ int fieldtype;
+ int varindex;
/* get required compiler data */
fieldtype = -1;
/* space to save used callee saved registers */
+
savedregs_num = (jd->isleafmethod) ? 0 : 1; /* space to save the LR */
savedregs_num += (INT_SAV_CNT - rd->savintreguse);
- savedregs_num += (FLT_SAV_CNT - rd->savfltreguse);
+ /*savedregs_num += (FLT_SAV_CNT - rd->savfltreguse);*/
+ assert((FLT_SAV_CNT - rd->savfltreguse) == 0);
+
spilledregs_num = rd->memuse;
#if defined(ENABLE_THREADS) /* space to save argument of monitor_enter */
spilledregs_num++;
#endif
- cd->stackframesize = spilledregs_num + savedregs_num;
+ cd->stackframesize = spilledregs_num * 8 + savedregs_num * 4;
+
+ /* XXX QUICK FIX: We shouldn't align the stack in Java code, but
+ only in native stubs. */
+ /* align stack to 8-byte */
+
+ cd->stackframesize = (cd->stackframesize + 4) & ~4;
/* SECTION: Method Header */
/* create method header */
(void) dseg_add_unique_address(cd, code); /* CodeinfoPointer */
- (void) dseg_add_unique_s4(cd, cd->stackframesize * 4); /* FrameSize */
+ (void) dseg_add_unique_s4(cd, cd->stackframesize); /* FrameSize */
#if defined(ENABLE_THREADS)
/* IsSync contains the offset relative to the stack pointer for the
*/
if (checksync && (m->flags & ACC_SYNCHRONIZED))
- (void) dseg_add_unique_s4(cd, (rd->memuse + 1) * 4);/* IsSync */
+ (void) dseg_add_unique_s4(cd, rd->memuse * 8 + 4);/* IsSync */
else
#endif
(void) dseg_add_unique_s4(cd, 0); /* IsSync */
}
/* save return address and used callee saved registers */
+
savedregs_bitmask = 0;
+
if (!jd->isleafmethod)
savedregs_bitmask = (1<<REG_LR);
+
for (i = INT_SAV_CNT - 1; i >= rd->savintreguse; i--)
savedregs_bitmask |= (1<<(rd->savintregs[i]));
+
#if !defined(NDEBUG)
for (i = FLT_SAV_CNT - 1; i >= rd->savfltreguse; i--) {
log_text("!!! CODEGEN: floating-point callee saved registers are not saved to stack (SEVERE! STACK IS MESSED UP!)");
/* TODO: floating-point */
}
#endif
- if (savedregs_bitmask) {
+
+ if (savedregs_bitmask)
M_STMFD(savedregs_bitmask, REG_SP);
- }
/* create additional stack frame for spilled variables (if necessary) */
- if (spilledregs_num) {
- M_SUB_IMM_EXT_MUL4(REG_SP, REG_SP, spilledregs_num);
- }
+
+ if ((cd->stackframesize / 4 - savedregs_num) > 0)
+ M_SUB_IMM_EXT_MUL4(REG_SP, REG_SP, cd->stackframesize / 4 - savedregs_num);
/* take arguments out of register or stack frame */
+
md = m->parseddesc;
for (i = 0, len = 0; i < md->paramcount; i++) {
s1 = md->params[i].regoff;
/* ATTENTION: we use interger registers for all arguments (even float) */
#if !defined(ENABLE_SOFTFLOAT)
- if (IS_INT_LNG_TYPE(t)) { /* integer args */
+ if (IS_INT_LNG_TYPE(t)) {
#endif
- if (!md->params[i].inmemory) { /* register arguments */
- s2 = ARGUMENT_REGS(t, s1); /* get argument register */
- if (!(var->flags & INMEMORY)) { /* reg arg -> register */
- if (GET_LOW_REG(var->vv.regoff) == REG_SPLIT || GET_HIGH_REG(var->vv.regoff) == REG_SPLIT) {
- /* TODO: remove this!!! */
- dolog("SPLIT in local var: %x>%x (%s.%s)", s2, var->vv.regoff, m->class->name->text, m->name->text);
- assert(s2 == var->vv.regoff);
- }
- s3 = var->vv.regoff;
- SPLIT_OPEN(t, s2, REG_ITMP1);
- SPLIT_LOAD(t, s2, cd->stackframesize);
- SPLIT_OPEN(t, s3, REG_ITMP1);
-
+ if (!md->params[i].inmemory) {
+ if (!(var->flags & INMEMORY)) {
if (IS_2_WORD_TYPE(t))
- M_LNGMOVE(s2, s3);
+ M_LNGMOVE(s1, var->vv.regoff);
else
- M_INTMOVE(s2, s3);
-
- SPLIT_STORE_AND_CLOSE(t, s3, cd->stackframesize);
+ M_INTMOVE(s1, var->vv.regoff);
}
- else { /* reg arg -> spilled */
- SPLIT_OPEN(t, s2, REG_ITMP1);
- SPLIT_LOAD(t, s2, cd->stackframesize);
-
+ else {
if (IS_2_WORD_TYPE(t))
- M_LST(s2, REG_SP, var->vv.regoff * 4);
+ M_LST(s1, REG_SP, var->vv.regoff);
else
- M_IST(s2, REG_SP, var->vv.regoff * 4);
- /* no SPLIT_CLOSE here because arg is fully spilled now */
+ M_IST(s1, REG_SP, var->vv.regoff);
}
}
else { /* stack arguments */
if (!(var->flags & INMEMORY)) { /* stack arg -> register */
if (IS_2_WORD_TYPE(t))
- M_LLD(var->vv.regoff, REG_SP, (cd->stackframesize + s1) * 4);
+ M_LLD(var->vv.regoff, REG_SP, cd->stackframesize + s1);
else
- M_ILD(var->vv.regoff, REG_SP, (cd->stackframesize + s1) * 4);
+ M_ILD(var->vv.regoff, REG_SP, cd->stackframesize + s1);
}
else { /* stack arg -> spilled */
/* Reuse Memory Position on Caller Stack */
}
}
#if !defined(ENABLE_SOFTFLOAT)
- } else { /* floating args */
- if (!md->params[i].inmemory) { /* register arguments */
- s2 = ARGUMENT_REGS(t, s1); /* get argument register */
- if (!(var->flags & INMEMORY)) { /* reg arg -> register */
- SPLIT_OPEN(t, s2, REG_ITMP1);
- SPLIT_LOAD(t, s2, cd->stackframesize);
- M_CAST_INT_TO_FLT_TYPED(t, s2, var->vv.regoff);
+ }
+ else {
+ if (!md->params[i].inmemory) {
+ if (!(var->flags & INMEMORY)) {
+ M_CAST_INT_TO_FLT_TYPED(t, s1, var->vv.regoff);
}
- else { /* reg arg -> spilled */
- SPLIT_OPEN(t, s2, REG_ITMP1);
- SPLIT_LOAD(t, s2, cd->stackframesize);
-
+ else {
if (IS_2_WORD_TYPE(t))
- M_LST(s2, REG_SP, var->vv.regoff * 4);
+ M_LST(s1, REG_SP, var->vv.regoff);
else
- M_IST(s2, REG_SP, var->vv.regoff * 4);
- /* no SPLIT_CLOSE here because arg is fully spilled now */
+ M_IST(s1, REG_SP, var->vv.regoff);
}
}
- else { /* stack arguments */
- if (!(var->flags & INMEMORY)) { /* stack arg -> register */
+ else {
+ if (!(var->flags & INMEMORY)) {
if (IS_2_WORD_TYPE(t))
- M_DLD(var->vv.regoff, REG_SP, (cd->stackframesize + s1) * 4);
+ M_DLD(var->vv.regoff, REG_SP, cd->stackframesize + s1);
else
- M_FLD(var->vv.regoff, REG_SP, (cd->stackframesize + s1) * 4);
+ M_FLD(var->vv.regoff, REG_SP, cd->stackframesize + s1);
}
- else { /* stack arg -> spilled */
+ else {
/* Reuse Memory Position on Caller Stack */
var->vv.regoff = cd->stackframesize + s1;
}
if (checksync && (m->flags & ACC_SYNCHRONIZED)) {
/* stack offset for monitor argument */
- s1 = rd->memuse;
+ s1 = rd->memuse * 8;
# if !defined(NDEBUG)
if (JITDATA_HAS_FLAG_VERBOSECALL(jd)) {
M_STMFD(BITMASK_ARGS, REG_SP);
- s1 += 4;
+ s1 += 4 * 4;
}
# endif
M_DSEG_LOAD(REG_A0, disp);
}
else {
- M_TST(REG_A0, REG_A0);
- M_BEQ(0);
- codegen_add_nullpointerexception_ref(cd);
+ emit_nullpointer_check_force(cd, iptr, REG_A0);
}
- M_STR(REG_A0, REG_SP, s1 * 4);
+ M_STR(REG_A0, REG_SP, s1);
disp = dseg_add_functionptr(cd, LOCK_monitor_enter);
M_DSEG_BRANCH(disp);
s1 = (s4) (cd->mcodeptr - cd->mcodebase);
- M_RECOMPUTE_IP(s1);
+ M_RECOMPUTE_PV(s1);
# if !defined(NDEBUG)
if (JITDATA_HAS_FLAG_VERBOSECALL(jd))
/* end of header generation */
+ /* create replacement points */
+ REPLACEMENT_POINTS_INIT(cd, jd);
+
/* SECTION: ICMD Code Generation */
/* for all basic blocks */
codegen_resolve_branchrefs(cd, bptr);
+ /* handle replacement points */
+ REPLACEMENT_POINT_BLOCK_START(cd, bptr);
+
/* copy interface registers to their destination */
len = bptr->indepth;
if (INSTRUCTION_IS_UNRESOLVED(iptr)) {
disp = dseg_add_unique_address(cd, NULL);
- codegen_addpatchref(cd, PATCHER_aconst,
- iptr->sx.val.c.ref,
- disp);
+ patcher_add_patch_ref(jd, PATCHER_resolve_classref_to_classinfo,
+ iptr->sx.val.c.ref, disp);
if (opt_showdisassemble)
M_NOP;
case ICMD_COPY:
case ICMD_MOVE:
- emit_copy(jd, iptr, VAROP(iptr->s1), VAROP(iptr->dst));
+ emit_copy(jd, iptr);
break;
case ICMD_ASTORE:
if (!(iptr->flags.bits & INS_FLAG_RETADDR))
- emit_copy(jd, iptr, VAROP(iptr->s1), VAROP(iptr->dst));
+ emit_copy(jd, iptr);
break;
/* pop operations *****************************************************/
s1 = emit_load_s1(jd, iptr, REG_A0);
s2 = emit_load_s2(jd, iptr, REG_A1);
- gen_div_check(VAROP(iptr->sx.s23.s2)->type, s2);
+ emit_arithmetic_check(cd, iptr, s2);
/* move arguments into argument registers */
M_INTMOVE(s1, REG_A0);
disp = dseg_add_functionptr(cd, bte->fp);
M_DSEG_BRANCH(disp);
- /* recompute ip */
+ /* recompute pv */
s1 = (s4) (cd->mcodeptr - cd->mcodebase);
- M_RECOMPUTE_IP(s1);
+ M_RECOMPUTE_PV(s1);
/* move result into destination register */
d = codegen_reg_of_dst(jd, iptr, REG_RESULT);
/* move arguments into argument registers */
s1 = emit_load_s1(jd, iptr, REG_A0_A1_PACKED);
- M_LNGMOVE(s1, REG_A0_A1_PACKED);
-
s2 = emit_load_s2(jd, iptr, REG_A2_A3_PACKED);
- M_LNGMOVE(s2, REG_A2_A3_PACKED);
+ /* XXX TODO: only do this if arithmetic check is really done! */
+ M_ORR(GET_HIGH_REG(s2), GET_LOW_REG(s2), REG_ITMP3);
+ emit_arithmetic_check(cd, iptr, REG_ITMP3);
- gen_div_check(VAROP(iptr->sx.s23.s2)->type, s2);
+ M_LNGMOVE(s1, REG_A0_A1_PACKED);
+ M_LNGMOVE(s2, REG_A2_A3_PACKED);
/* call builtin function */
bte = iptr->sx.s23.s3.bte;
disp = dseg_add_functionptr(cd, bte->fp);
M_DSEG_BRANCH(disp);
- /* recompute ip */
+ /* recompute pv */
s1 = (s4) (cd->mcodeptr - cd->mcodebase);
- M_RECOMPUTE_IP(s1);
+ M_RECOMPUTE_PV(s1);
/* move result into destination register */
d = codegen_reg_of_dst(jd, iptr, REG_RESULT_PACKED);
M_MOV_S(REG_ITMP1, s1);
M_RSBMI_IMM(REG_ITMP1, REG_ITMP1, 0);
if (IS_IMM(iptr->sx.val.i))
- M_AND_IMM(d, REG_ITMP1, iptr->sx.val.i);
+ M_AND_IMM(REG_ITMP1, iptr->sx.val.i, d);
else {
ICONST(REG_ITMP3, iptr->sx.val.i);
- M_AND(d, REG_ITMP1, REG_ITMP3);
+ M_AND(REG_ITMP1, REG_ITMP3, d);
}
M_RSBMI_IMM(d, d, 0);
emit_store_dst(jd, iptr, d);
s1 = emit_load_s1(jd, iptr, REG_ITMP1);
s2 = emit_load_s2(jd, iptr, REG_ITMP2);
d = codegen_reg_of_dst(jd, iptr, REG_ITMP1);
- M_AND_IMM(REG_ITMP2, s2, 0x1f);
+ M_AND_IMM(s2, 0x1f, REG_ITMP2);
M_MOV(d, REG_LSL_REG(s1, REG_ITMP2));
emit_store_dst(jd, iptr, d);
break;
s1 = emit_load_s1(jd, iptr, REG_ITMP1);
s2 = emit_load_s2(jd, iptr, REG_ITMP2);
d = codegen_reg_of_dst(jd, iptr, REG_ITMP1);
- M_AND_IMM(REG_ITMP2, s2, 0x1f);
+ M_AND_IMM(s2, 0x1f, REG_ITMP2);
M_MOV(d, REG_ASR_REG(s1, REG_ITMP2));
emit_store_dst(jd, iptr, d);
break;
s1 = emit_load_s1(jd, iptr, REG_ITMP1);
s2 = emit_load_s2(jd, iptr, REG_ITMP2);
d = codegen_reg_of_dst(jd, iptr, REG_ITMP1);
- M_AND_IMM(REG_ITMP2, s2, 0x1f);
+ M_AND_IMM(s2, 0x1f, REG_ITMP2);
M_MOV(d, REG_LSR_REG(s1, REG_ITMP2));
emit_store_dst(jd, iptr, d);
break;
s1 = emit_load_s1(jd, iptr, REG_ITMP1);
s2 = emit_load_s2(jd, iptr, REG_ITMP2);
d = codegen_reg_of_dst(jd, iptr, REG_ITMP1);
- M_AND(d, s1, s2);
+ M_AND(s1, s2, d);
emit_store_dst(jd, iptr, d);
break;
s1 = emit_load_s1_low(jd, iptr, REG_ITMP3);
s2 = emit_load_s2_low(jd, iptr, REG_ITMP1);
d = codegen_reg_of_dst(jd, iptr, REG_ITMP12_PACKED);
- M_AND(GET_LOW_REG(d), s1, s2);
+ M_AND(s1, s2, GET_LOW_REG(d));
s1 = emit_load_s1_high(jd, iptr, REG_ITMP3);
s2 = emit_load_s2_high(jd, iptr, REG_ITMP2);
- M_AND(GET_HIGH_REG(d), s1, s2);
+ M_AND(s1, s2, GET_HIGH_REG(d));
emit_store_dst(jd, iptr, d);
break;
s1 = emit_load_s1(jd, iptr, REG_ITMP1);
s2 = emit_load_s2(jd, iptr, REG_ITMP2);
d = codegen_reg_of_dst(jd, iptr, REG_ITMP1);
- M_ORR(d, s1, s2);
+ M_ORR(s1, s2, d);
emit_store_dst(jd, iptr, d);
break;
s1 = emit_load_s1_low(jd, iptr, REG_ITMP3);
s2 = emit_load_s2_low(jd, iptr, REG_ITMP1);
d = codegen_reg_of_dst(jd, iptr, REG_ITMP12_PACKED);
- M_ORR(GET_LOW_REG(d), s1, s2);
+ M_ORR(s1, s2, GET_LOW_REG(d));
s1 = emit_load_s1_high(jd, iptr, REG_ITMP3);
s2 = emit_load_s2_high(jd, iptr, REG_ITMP2);
- M_ORR(GET_HIGH_REG(d), s1, s2);
+ M_ORR(s1, s2, GET_HIGH_REG(d));
emit_store_dst(jd, iptr, d);
break;
s1 = emit_load_s1(jd, iptr, REG_ITMP1);
s2 = emit_load_s2(jd, iptr, REG_ITMP2);
d = codegen_reg_of_dst(jd, iptr, REG_ITMP1);
- M_EOR(d, s1, s2);
+ M_EOR(s1, s2, d);
emit_store_dst(jd, iptr, d);
break;
s1 = emit_load_s1_low(jd, iptr, REG_ITMP3);
s2 = emit_load_s2_low(jd, iptr, REG_ITMP1);
d = codegen_reg_of_dst(jd, iptr, REG_ITMP12_PACKED);
- M_EOR(GET_LOW_REG(d), s1, s2);
+ M_EOR(s1, s2, GET_LOW_REG(d));
s1 = emit_load_s1_high(jd, iptr, REG_ITMP3);
s2 = emit_load_s2_high(jd, iptr, REG_ITMP2);
- M_EOR(GET_HIGH_REG(d), s1, s2);
+ M_EOR(s1, s2, GET_HIGH_REG(d));
emit_store_dst(jd, iptr, d);
break;
M_FIX(d, s1);
/* this checks for NaN; to return zero as Java likes it */
M_CMF(s1, 0x8);
- M_MOVVS_IMM(d, 0);
+ M_MOVVS_IMM(0, d);
emit_store_dst(jd, iptr, d);
break;
M_FIX(d, s1);
/* this checks for NaN; to return zero as Java likes it */
M_CMF(s1, 0x8);
- M_MOVVS_IMM(d, 0);
+ M_MOVVS_IMM(0, d);
emit_store_dst(jd, iptr, d);
break;
s1 = emit_load_s1(jd, iptr, REG_ITMP1);
d = codegen_reg_of_dst(jd, iptr, REG_ITMP2);
- gen_nullptr_check(s1);
- M_ILD_INTERN(d, s1, OFFSET(java_arrayheader, size));
- emit_store_dst(jd, iptr, d);
- break;
-
- case ICMD_AALOAD: /* ..., arrayref, index ==> ..., value */
-
- s1 = emit_load_s1(jd, iptr, REG_ITMP1);
- s2 = emit_load_s2(jd, iptr, REG_ITMP2);
- d = codegen_reg_of_dst(jd, iptr, REG_ITMP1);
- if (INSTRUCTION_MUST_CHECK(iptr)) {
- gen_nullptr_check(s1);
- gen_bound_check(s1, s2);
- }
- M_ADD(REG_ITMP1, s1, REG_LSL(s2, 2)); /* REG_ITMP1 = s1 + 4 * s2 */
- M_LDR_INTERN(d, REG_ITMP1, OFFSET(java_objectarray, data[0]));
+ /* implicit null-pointer check */
+ M_ILD_INTERN(d, s1, OFFSET(java_array_t, size));
emit_store_dst(jd, iptr, d);
break;
- case ICMD_IALOAD: /* ..., arrayref, index ==> ..., value */
+ case ICMD_BALOAD: /* ..., arrayref, index ==> ..., value */
s1 = emit_load_s1(jd, iptr, REG_ITMP1);
s2 = emit_load_s2(jd, iptr, REG_ITMP2);
d = codegen_reg_of_dst(jd, iptr, REG_ITMP1);
- if (INSTRUCTION_MUST_CHECK(iptr)) {
- gen_nullptr_check(s1);
- gen_bound_check(s1, s2);
- }
- M_ADD(REG_ITMP1, s1, REG_LSL(s2, 2)); /* REG_ITMP1 = s1 + 4 * s2 */
- M_ILD_INTERN(d, REG_ITMP1, OFFSET(java_intarray, data[0]));
+ /* implicit null-pointer check */
+ emit_arrayindexoutofbounds_check(cd, iptr, s1, s2);
+ M_ADD(REG_ITMP1, s1, s2); /* REG_ITMP1 = s1 + 1 * s2 */
+ M_LDRSB(d, REG_ITMP1, OFFSET(java_bytearray_t, data[0]));
emit_store_dst(jd, iptr, d);
break;
- case ICMD_BALOAD: /* ..., arrayref, index ==> ..., value */
+ case ICMD_CALOAD: /* ..., arrayref, index ==> ..., value */
s1 = emit_load_s1(jd, iptr, REG_ITMP1);
s2 = emit_load_s2(jd, iptr, REG_ITMP2);
d = codegen_reg_of_dst(jd, iptr, REG_ITMP1);
- if (INSTRUCTION_MUST_CHECK(iptr)) {
- gen_nullptr_check(s1);
- gen_bound_check(s1, s2);
- }
- M_ADD(REG_ITMP1, s1, s2); /* REG_ITMP1 = s1 + 1 * s2 */
- M_LDRSB(d, REG_ITMP1, OFFSET(java_bytearray, data[0]));
+ /* implicit null-pointer check */
+ emit_arrayindexoutofbounds_check(cd, iptr, s1, s2);
+ M_ADD(REG_ITMP1, s1, REG_LSL(s2, 1)); /* REG_ITMP1 = s1 + 2 * s2 */
+ M_LDRH(d, REG_ITMP1, OFFSET(java_chararray_t, data[0]));
emit_store_dst(jd, iptr, d);
break;
- case ICMD_CALOAD: /* ..., arrayref, index ==> ..., value */
+ case ICMD_SALOAD: /* ..., arrayref, index ==> ..., value */
s1 = emit_load_s1(jd, iptr, REG_ITMP1);
s2 = emit_load_s2(jd, iptr, REG_ITMP2);
d = codegen_reg_of_dst(jd, iptr, REG_ITMP1);
- if (INSTRUCTION_MUST_CHECK(iptr)) {
- gen_nullptr_check(s1);
- gen_bound_check(s1, s2);
- }
+ /* implicit null-pointer check */
+ emit_arrayindexoutofbounds_check(cd, iptr, s1, s2);
M_ADD(REG_ITMP1, s1, REG_LSL(s2, 1)); /* REG_ITMP1 = s1 + 2 * s2 */
- M_LDRH(d, REG_ITMP1, OFFSET(java_chararray, data[0]));
+ M_LDRSH(d, REG_ITMP1, OFFSET(java_shortarray_t, data[0]));
emit_store_dst(jd, iptr, d);
break;
- case ICMD_SALOAD: /* ..., arrayref, index ==> ..., value */
+ case ICMD_IALOAD: /* ..., arrayref, index ==> ..., value */
s1 = emit_load_s1(jd, iptr, REG_ITMP1);
s2 = emit_load_s2(jd, iptr, REG_ITMP2);
d = codegen_reg_of_dst(jd, iptr, REG_ITMP1);
- if (INSTRUCTION_MUST_CHECK(iptr)) {
- gen_nullptr_check(s1);
- gen_bound_check(s1, s2);
- }
- M_ADD(REG_ITMP1, s1, REG_LSL(s2, 1)); /* REG_ITMP1 = s1 + 2 * s2 */
- M_LDRSH(d, REG_ITMP1, OFFSET(java_shortarray, data[0]));
+ /* implicit null-pointer check */
+ emit_arrayindexoutofbounds_check(cd, iptr, s1, s2);
+ M_ADD(REG_ITMP1, s1, REG_LSL(s2, 2)); /* REG_ITMP1 = s1 + 4 * s2 */
+ M_ILD_INTERN(d, REG_ITMP1, OFFSET(java_intarray_t, data[0]));
emit_store_dst(jd, iptr, d);
break;
s1 = emit_load_s1(jd, iptr, REG_ITMP1);
s2 = emit_load_s2(jd, iptr, REG_ITMP2);
d = codegen_reg_of_dst(jd, iptr, REG_ITMP12_PACKED);
- if (INSTRUCTION_MUST_CHECK(iptr)) {
- gen_nullptr_check(s1);
- gen_bound_check(s1, s2);
- }
+ /* implicit null-pointer check */
+ emit_arrayindexoutofbounds_check(cd, iptr, s1, s2);
M_ADD(REG_ITMP3, s1, REG_LSL(s2, 3)); /* REG_ITMP3 = s1 + 8 * s2 */
- M_LLD_INTERN(d, REG_ITMP3, OFFSET(java_longarray, data[0]));
+ M_LLD_INTERN(d, REG_ITMP3, OFFSET(java_longarray_t, data[0]));
emit_store_dst(jd, iptr, d);
break;
s1 = emit_load_s1(jd, iptr, REG_ITMP1);
s2 = emit_load_s2(jd, iptr, REG_ITMP2);
- if (INSTRUCTION_MUST_CHECK(iptr)) {
- gen_nullptr_check(s1);
- gen_bound_check(s1, s2);
- }
+ /* implicit null-pointer check */
+ emit_arrayindexoutofbounds_check(cd, iptr, s1, s2);
M_ADD(REG_ITMP1, s1, REG_LSL(s2, 2)); /* REG_ITMP1 = s1 + 4 * s2 */
#if !defined(ENABLE_SOFTFLOAT)
d = codegen_reg_of_dst(jd, iptr, REG_FTMP1);
- M_FLD_INTERN(d, REG_ITMP1, OFFSET(java_floatarray, data[0]));
+ M_FLD_INTERN(d, REG_ITMP1, OFFSET(java_floatarray_t, data[0]));
#else
d = codegen_reg_of_dst(jd, iptr, REG_ITMP1);
- M_ILD_INTERN(d, REG_ITMP1, OFFSET(java_floatarray, data[0]));
+ M_ILD_INTERN(d, REG_ITMP1, OFFSET(java_floatarray_t, data[0]));
#endif
emit_store_dst(jd, iptr, d);
break;
s1 = emit_load_s1(jd, iptr, REG_ITMP1);
s2 = emit_load_s2(jd, iptr, REG_ITMP2);
- if (INSTRUCTION_MUST_CHECK(iptr)) {
- gen_nullptr_check(s1);
- gen_bound_check(s1, s2);
- }
+ /* implicit null-pointer check */
+ emit_arrayindexoutofbounds_check(cd, iptr, s1, s2);
M_ADD(REG_ITMP3, s1, REG_LSL(s2, 3)); /* REG_ITMP3 = s1 + 8 * s2 */
#if !defined(ENABLE_SOFTFLOAT)
d = codegen_reg_of_dst(jd, iptr, REG_FTMP1);
- M_DLD_INTERN(d, REG_ITMP3, OFFSET(java_doublearray, data[0]));
+ M_DLD_INTERN(d, REG_ITMP3, OFFSET(java_doublearray_t, data[0]));
#else
d = codegen_reg_of_dst(jd, iptr, REG_ITMP12_PACKED);
- M_LLD_INTERN(d, REG_ITMP3, OFFSET(java_doublearray, data[0]));
+ M_LLD_INTERN(d, REG_ITMP3, OFFSET(java_doublearray_t, data[0]));
#endif
emit_store_dst(jd, iptr, d);
break;
- case ICMD_AASTORE: /* ..., arrayref, index, value ==> ... */
-
- s1 = emit_load_s1(jd, iptr, REG_A0);
- s2 = emit_load_s2(jd, iptr, REG_ITMP1);
- if (INSTRUCTION_MUST_CHECK(iptr)) {
- gen_nullptr_check(s1);
- gen_bound_check(s1, s2);
- }
- s3 = emit_load_s3(jd, iptr, REG_A1);
-
- /* move arguments to argument registers */
- M_INTMOVE(s1, REG_A0);
- M_INTMOVE(s3, REG_A1);
-
- /* call builtin function */
- disp = dseg_add_functionptr(cd, BUILTIN_canstore);
- M_DSEG_BRANCH(disp);
-
- /* recompute ip */
- s1 = (s4) (cd->mcodeptr - cd->mcodebase);
- M_RECOMPUTE_IP(s1);
-
- /* check resturn value of builtin */
- M_TST(REG_RESULT, REG_RESULT);
- M_BEQ(0);
- codegen_add_arraystoreexception_ref(cd);
+ case ICMD_AALOAD: /* ..., arrayref, index ==> ..., value */
- /* finally store address into array */
s1 = emit_load_s1(jd, iptr, REG_ITMP1);
s2 = emit_load_s2(jd, iptr, REG_ITMP2);
- s3 = emit_load_s3(jd, iptr, REG_ITMP3);
+ d = codegen_reg_of_dst(jd, iptr, REG_ITMP1);
+ /* implicit null-pointer check */
+ emit_arrayindexoutofbounds_check(cd, iptr, s1, s2);
M_ADD(REG_ITMP1, s1, REG_LSL(s2, 2)); /* REG_ITMP1 = s1 + 4 * s2 */
- M_STR_INTERN(s3, REG_ITMP1, OFFSET(java_objectarray, data[0]));
+ M_LDR_INTERN(d, REG_ITMP1, OFFSET(java_objectarray_t, data[0]));
+ emit_store_dst(jd, iptr, d);
break;
- case ICMD_IASTORE: /* ..., arrayref, index, value ==> ... */
+ case ICMD_BASTORE: /* ..., arrayref, index, value ==> ... */
s1 = emit_load_s1(jd, iptr, REG_ITMP1);
s2 = emit_load_s2(jd, iptr, REG_ITMP2);
- if (INSTRUCTION_MUST_CHECK(iptr)) {
- gen_nullptr_check(s1);
- gen_bound_check(s1, s2);
- }
+ /* implicit null-pointer check */
+ emit_arrayindexoutofbounds_check(cd, iptr, s1, s2);
s3 = emit_load_s3(jd, iptr, REG_ITMP3);
- M_ADD(REG_ITMP1, s1, REG_LSL(s2, 2)); /* REG_ITMP1 = s1 + 4 * s2 */
- M_IST_INTERN(s3, REG_ITMP1, OFFSET(java_intarray, data[0]));
+ M_ADD(REG_ITMP1, s1, s2); /* REG_ITMP1 = s1 + 1 * s2 */
+ M_STRB(s3, REG_ITMP1, OFFSET(java_bytearray_t, data[0]));
break;
- case ICMD_BASTORE: /* ..., arrayref, index, value ==> ... */
+ case ICMD_CASTORE: /* ..., arrayref, index, value ==> ... */
s1 = emit_load_s1(jd, iptr, REG_ITMP1);
s2 = emit_load_s2(jd, iptr, REG_ITMP2);
- if (INSTRUCTION_MUST_CHECK(iptr)) {
- gen_nullptr_check(s1);
- gen_bound_check(s1, s2);
- }
+ /* implicit null-pointer check */
+ emit_arrayindexoutofbounds_check(cd, iptr, s1, s2);
s3 = emit_load_s3(jd, iptr, REG_ITMP3);
- M_ADD(REG_ITMP1, s1, s2); /* REG_ITMP1 = s1 + 1 * s2 */
- M_STRB(s3, REG_ITMP1, OFFSET(java_bytearray, data[0]));
+ M_ADD(REG_ITMP1, s1, REG_LSL(s2, 1)); /* REG_ITMP1 = s1 + 2 * s2 */
+ M_STRH(s3, REG_ITMP1, OFFSET(java_chararray_t, data[0]));
break;
- case ICMD_CASTORE: /* ..., arrayref, index, value ==> ... */
+ case ICMD_SASTORE: /* ..., arrayref, index, value ==> ... */
s1 = emit_load_s1(jd, iptr, REG_ITMP1);
s2 = emit_load_s2(jd, iptr, REG_ITMP2);
- if (INSTRUCTION_MUST_CHECK(iptr)) {
- gen_nullptr_check(s1);
- gen_bound_check(s1, s2);
- }
+ /* implicit null-pointer check */
+ emit_arrayindexoutofbounds_check(cd, iptr, s1, s2);
s3 = emit_load_s3(jd, iptr, REG_ITMP3);
M_ADD(REG_ITMP1, s1, REG_LSL(s2, 1)); /* REG_ITMP1 = s1 + 2 * s2 */
- M_STRH(s3, REG_ITMP1, OFFSET(java_chararray, data[0]));
+ M_STRH(s3, REG_ITMP1, OFFSET(java_shortarray_t, data[0]));
break;
- case ICMD_SASTORE: /* ..., arrayref, index, value ==> ... */
+ case ICMD_IASTORE: /* ..., arrayref, index, value ==> ... */
s1 = emit_load_s1(jd, iptr, REG_ITMP1);
s2 = emit_load_s2(jd, iptr, REG_ITMP2);
- if (INSTRUCTION_MUST_CHECK(iptr)) {
- gen_nullptr_check(s1);
- gen_bound_check(s1, s2);
- }
+ /* implicit null-pointer check */
+ emit_arrayindexoutofbounds_check(cd, iptr, s1, s2);
s3 = emit_load_s3(jd, iptr, REG_ITMP3);
- M_ADD(REG_ITMP1, s1, REG_LSL(s2, 1)); /* REG_ITMP1 = s1 + 2 * s2 */
- M_STRH(s3, REG_ITMP1, OFFSET(java_shortarray, data[0]));
+ M_ADD(REG_ITMP1, s1, REG_LSL(s2, 2)); /* REG_ITMP1 = s1 + 4 * s2 */
+ M_IST_INTERN(s3, REG_ITMP1, OFFSET(java_intarray_t, data[0]));
break;
case ICMD_LASTORE: /* ..., arrayref, index, value ==> ... */
s1 = emit_load_s1(jd, iptr, REG_ITMP1);
s2 = emit_load_s2(jd, iptr, REG_ITMP2);
- if (INSTRUCTION_MUST_CHECK(iptr)) {
- gen_nullptr_check(s1);
- gen_bound_check(s1, s2);
- }
+ /* implicit null-pointer check */
+ emit_arrayindexoutofbounds_check(cd, iptr, s1, s2);
M_ADD(REG_ITMP3, s1, REG_LSL(s2, 3)); /* REG_ITMP3 = s1 + 8 * s2 */
s3 = emit_load_s3(jd, iptr, REG_ITMP12_PACKED);
- M_LST_INTERN(s3, REG_ITMP3, OFFSET(java_longarray, data[0]));
+ M_LST_INTERN(s3, REG_ITMP3, OFFSET(java_longarray_t, data[0]));
break;
case ICMD_FASTORE: /* ..., arrayref, index, value ==> ... */
s1 = emit_load_s1(jd, iptr, REG_ITMP1);
s2 = emit_load_s2(jd, iptr, REG_ITMP2);
- if (INSTRUCTION_MUST_CHECK(iptr)) {
- gen_nullptr_check(s1);
- gen_bound_check(s1, s2);
- }
+ /* implicit null-pointer check */
+ emit_arrayindexoutofbounds_check(cd, iptr, s1, s2);
M_ADD(REG_ITMP1, s1, REG_LSL(s2, 2)); /* REG_ITMP1 = s1 + 4 * s2 */
#if !defined(ENABLE_SOFTFLOAT)
s3 = emit_load_s3(jd, iptr, REG_FTMP1);
- M_FST_INTERN(s3, REG_ITMP1, OFFSET(java_floatarray, data[0]));
+ M_FST_INTERN(s3, REG_ITMP1, OFFSET(java_floatarray_t, data[0]));
#else
s3 = emit_load_s3(jd, iptr, REG_ITMP3);
- M_IST_INTERN(s3, REG_ITMP1, OFFSET(java_floatarray, data[0]));
+ M_IST_INTERN(s3, REG_ITMP1, OFFSET(java_floatarray_t, data[0]));
#endif
break;
s1 = emit_load_s1(jd, iptr, REG_ITMP1);
s2 = emit_load_s2(jd, iptr, REG_ITMP2);
- if (INSTRUCTION_MUST_CHECK(iptr)) {
- gen_nullptr_check(s1);
- gen_bound_check(s1, s2);
- }
+ /* implicit null-pointer check */
+ emit_arrayindexoutofbounds_check(cd, iptr, s1, s2);
M_ADD(REG_ITMP1, s1, REG_LSL(s2, 3)); /* REG_ITMP1 = s1 + 8 * s2 */
#if !defined(ENABLE_SOFTFLOAT)
s3 = emit_load_s3(jd, iptr, REG_FTMP1);
- M_DST_INTERN(s3, REG_ITMP1, OFFSET(java_doublearray, data[0]));
+ M_DST_INTERN(s3, REG_ITMP1, OFFSET(java_doublearray_t, data[0]));
#else
s3 = emit_load_s3(jd, iptr, REG_ITMP23_PACKED);
- M_LST_INTERN(s3, REG_ITMP1, OFFSET(java_doublearray, data[0]));
+ M_LST_INTERN(s3, REG_ITMP1, OFFSET(java_doublearray_t, data[0]));
#endif
break;
+ case ICMD_AASTORE: /* ..., arrayref, index, value ==> ... */
+
+ s1 = emit_load_s1(jd, iptr, REG_A0);
+ s2 = emit_load_s2(jd, iptr, REG_ITMP1);
+ s3 = emit_load_s3(jd, iptr, REG_A1);
+
+ /* implicit null-pointer check */
+ emit_arrayindexoutofbounds_check(cd, iptr, s1, s2);
+
+ /* move arguments to argument registers */
+ M_INTMOVE(s1, REG_A0);
+ M_INTMOVE(s3, REG_A1);
+
+ /* call builtin function */
+ disp = dseg_add_functionptr(cd, BUILTIN_canstore);
+ M_DSEG_BRANCH(disp);
+
+ /* recompute pv */
+ s1 = (s4) (cd->mcodeptr - cd->mcodebase);
+ M_RECOMPUTE_PV(s1);
+
+ /* check resturn value of builtin */
+ emit_exception_check(cd, iptr);
+
+ /* finally store address into array */
+ s1 = emit_load_s1(jd, iptr, REG_ITMP1);
+ s2 = emit_load_s2(jd, iptr, REG_ITMP2);
+ s3 = emit_load_s3(jd, iptr, REG_ITMP3);
+ M_ADD(REG_ITMP1, s1, REG_LSL(s2, 2)); /* REG_ITMP1 = s1 + 4 * s2 */
+ M_STR_INTERN(s3, REG_ITMP1, OFFSET(java_objectarray_t, data[0]));
+ break;
+
case ICMD_GETSTATIC: /* ... ==> ..., value */
if (INSTRUCTION_IS_UNRESOLVED(iptr)) {
- unresolved_field *uf = iptr->sx.s23.s3.uf;
-
+ uf = iptr->sx.s23.s3.uf;
fieldtype = uf->fieldref->parseddesc.fd->type;
+ disp = dseg_add_unique_address(cd, NULL);
- disp = dseg_add_unique_address(cd, NULL);
-
- codegen_addpatchref(cd, PATCHER_get_putstatic, uf, disp);
+ patcher_add_patch_ref(jd, PATCHER_get_putstatic, uf, disp);
if (opt_showdisassemble)
M_NOP;
}
else {
- fieldinfo *fi = iptr->sx.s23.s3.fmiref->p.field;
-
+ fi = iptr->sx.s23.s3.fmiref->p.field;
fieldtype = fi->type;
+ disp = dseg_add_address(cd, fi->value);
if (!CLASS_IS_OR_ALMOST_INITIALIZED(fi->class)) {
- codegen_addpatchref(cd, PATCHER_clinit, fi->class, 0);
+ patcher_add_patch_ref(jd, PATCHER_initialize_class,
+ fi->class, 0);
if (opt_showdisassemble)
M_NOP;
}
-
- disp = dseg_add_address(cd, &(fi->value));
}
M_DSEG_LOAD(REG_ITMP3, disp);
case ICMD_PUTSTATIC: /* ..., value ==> ... */
if (INSTRUCTION_IS_UNRESOLVED(iptr)) {
- unresolved_field *uf = iptr->sx.s23.s3.uf;
-
+ uf = iptr->sx.s23.s3.uf;
fieldtype = uf->fieldref->parseddesc.fd->type;
+ disp = dseg_add_unique_address(cd, NULL);
- disp = dseg_add_unique_address(cd, NULL);
-
- codegen_addpatchref(cd, PATCHER_get_putstatic, uf, disp);
+ patcher_add_patch_ref(jd, PATCHER_get_putstatic, uf, disp);
if (opt_showdisassemble)
M_NOP;
}
else {
- fieldinfo *fi = iptr->sx.s23.s3.fmiref->p.field;
-
+ fi = iptr->sx.s23.s3.fmiref->p.field;
fieldtype = fi->type;
+ disp = dseg_add_address(cd, fi->value);
if (!CLASS_IS_OR_ALMOST_INITIALIZED(fi->class)) {
- codegen_addpatchref(cd, PATCHER_clinit, fi->class, 0);
+ patcher_add_patch_ref(jd, PATCHER_initialize_class,
+ fi->class, 0);
if (opt_showdisassemble)
M_NOP;
}
-
- disp = dseg_add_address(cd, &(fi->value));
}
M_DSEG_LOAD(REG_ITMP3, disp);
case ICMD_GETFIELD: /* ..., objectref, value ==> ... */
s1 = emit_load_s1(jd, iptr, REG_ITMP3);
- gen_nullptr_check(s1);
+ emit_nullpointer_check(cd, iptr, s1);
+
+
+ if (INSTRUCTION_IS_UNRESOLVED(iptr)) {
+ uf = iptr->sx.s23.s3.uf;
+ fieldtype = uf->fieldref->parseddesc.fd->type;
+ disp = 0;
+ }
+ else {
+ fi = iptr->sx.s23.s3.fmiref->p.field;
+ fieldtype = fi->type;
+ disp = fi->offset;
+ }
+
#if !defined(ENABLE_SOFTFLOAT)
/* HACK: softnull checks on floats */
- if (!checknull && IS_FLT_DBL_TYPE(fieldtype))
- gen_nullptr_check_intern(s1);
+ if (!INSTRUCTION_MUST_CHECK(iptr) && IS_FLT_DBL_TYPE(fieldtype))
+ emit_nullpointer_check_force(cd, iptr, s1);
#endif
if (INSTRUCTION_IS_UNRESOLVED(iptr)) {
- unresolved_field *uf = iptr->sx.s23.s3.uf;
-
- fieldtype = uf->fieldref->parseddesc.fd->type;
+ /* XXX REMOVE ME */
+ uf = iptr->sx.s23.s3.uf;
- codegen_addpatchref(cd, PATCHER_get_putfield,
- iptr->sx.s23.s3.uf, 0);
+ patcher_add_patch_ref(jd, PATCHER_get_putfield, uf, 0);
if (opt_showdisassemble)
M_NOP;
-
- disp = 0;
- }
- else {
- fieldinfo *fi = iptr->sx.s23.s3.fmiref->p.field;
-
- fieldtype = fi->type;
- disp = fi->offset;
}
switch (fieldtype) {
case ICMD_PUTFIELD: /* ..., objectref, value ==> ... */
s1 = emit_load_s1(jd, iptr, REG_ITMP3);
- gen_nullptr_check(s1);
-
-#if !defined(ENABLE_SOFTFLOAT)
- /* HACK: softnull checks on floats */
- if (!checknull && IS_FLT_DBL_TYPE(fieldtype))
- gen_nullptr_check_intern(s1);
-#endif
+ emit_nullpointer_check(cd, iptr, s1);
if (INSTRUCTION_IS_UNRESOLVED(iptr)) {
- unresolved_field *uf = iptr->sx.s23.s3.uf;
-
+ uf = iptr->sx.s23.s3.uf;
fieldtype = uf->fieldref->parseddesc.fd->type;
+ disp = 0;
}
else {
- fieldinfo *fi = iptr->sx.s23.s3.fmiref->p.field;
-
+ fi = iptr->sx.s23.s3.fmiref->p.field;
fieldtype = fi->type;
disp = fi->offset;
}
+#if !defined(ENABLE_SOFTFLOAT)
+ /* HACK: softnull checks on floats */
+ if (!INSTRUCTION_MUST_CHECK(iptr) && IS_FLT_DBL_TYPE(fieldtype))
+ emit_nullpointer_check_force(cd, iptr, s1);
+#endif
+
switch (fieldtype) {
case TYPE_INT:
#if defined(ENABLE_SOFTFLOAT)
}
if (INSTRUCTION_IS_UNRESOLVED(iptr)) {
- unresolved_field *uf = iptr->sx.s23.s3.uf;
+ /* XXX REMOVE ME */
+ uf = iptr->sx.s23.s3.uf;
- codegen_addpatchref(cd, PATCHER_get_putfield, uf, 0);
+ patcher_add_patch_ref(jd, PATCHER_get_putfield, uf, 0);
if (opt_showdisassemble)
M_NOP;
-
- disp = 0;
}
switch (fieldtype) {
s1 = emit_load_s1(jd, iptr, REG_ITMP1);
M_INTMOVE(s1, REG_ITMP1_XPTR);
if (INSTRUCTION_IS_UNRESOLVED(iptr)) {
- codegen_addpatchref(cd, PATCHER_athrow_areturn,
+ patcher_add_patch_ref(jd, PATCHER_resolve_class,
iptr->sx.s23.s2.uc, 0);
if (opt_showdisassemble)
case ICMD_GOTO: /* ... ==> ... */
case ICMD_RET:
- M_B(0);
- codegen_addreference(cd, iptr->dst.block);
+ emit_br(cd, iptr->dst.block);
break;
case ICMD_JSR: /* ... ==> ... */
- M_B(0);
- codegen_addreference(cd, iptr->sx.s23.s3.jsrtarget.block);
+ emit_br(cd, iptr->sx.s23.s3.jsrtarget.block);
break;
case ICMD_IFNULL: /* ..., value ==> ... */
+ case ICMD_IFNONNULL:
s1 = emit_load_s1(jd, iptr, REG_ITMP1);
M_TEQ_IMM(s1, 0);
- M_BEQ(0);
- codegen_addreference(cd, iptr->dst.block);
- break;
-
- case ICMD_IFNONNULL: /* ..., value ==> ... */
-
- s1 = emit_load_s1(jd, iptr, REG_ITMP1);
- M_TEQ_IMM(s1, 0);
- M_BNE(0);
- codegen_addreference(cd, iptr->dst.block);
+ emit_bcc(cd, iptr->dst.block, iptr->opc - ICMD_IFNULL, BRANCH_OPT_NONE);
break;
case ICMD_IFLT: /* ..., value ==> ... */
case ICMD_IFNE:
s1 = emit_load_s1(jd, iptr, REG_ITMP1);
- M_COMPARE(s1, iptr->sx.val.i, UNCOND, 0);
+ M_COMPARE(s1, iptr->sx.val.i);
+ emit_bcc(cd, iptr->dst.block, iptr->opc - ICMD_IFEQ, BRANCH_OPT_NONE);
+ break;
- switch(iptr->opc) {
- case ICMD_IFLT:
- M_BLT(0);
- break;
- case ICMD_IFLE:
- M_BLE(0);
- break;
- case ICMD_IFGT:
- M_BGT(0);
- break;
- case ICMD_IFGE:
- M_BGE(0);
- break;
- case ICMD_IFEQ:
- M_BEQ(0);
- break;
- case ICMD_IFNE:
- M_BNE(0);
- break;
- default:
- assert(0);
+ case ICMD_IF_LEQ: /* ..., value ==> ... */
+
+ s1 = emit_load_s1_high(jd, iptr, REG_ITMP1);
+ s2 = emit_load_s1_low(jd, iptr, REG_ITMP2);
+ if (iptr->sx.val.l == 0) {
+ M_ORR_S(s1, s2, REG_ITMP3);
+ }
+ else {
+ M_COMPARE(s1, (iptr->sx.val.l >> 32));
+ /*ICONST(REG_ITMP3, iptr->sx.val.l >> 32);
+ M_CMP(s1, REG_ITMP3);*/
+ ICONST(REG_ITMP3, iptr->sx.val.l & 0xffffffff);
+ M_CMPEQ(s2, REG_ITMP3);
}
- codegen_addreference(cd, iptr->dst.block);
+ emit_beq(cd, iptr->dst.block);
break;
case ICMD_IF_LLT: /* ..., value ==> ... */
- case ICMD_IF_LLE: /* op1 = target JavaVM pc, val.l = constant */
- case ICMD_IF_LGT:
- case ICMD_IF_LGE:
- case ICMD_IF_LEQ:
- case ICMD_IF_LNE:
- /* ATTENTION: compare high words signed and low words unsigned */
+ s1 = emit_load_s1_high(jd, iptr, REG_ITMP1);
+ s2 = emit_load_s1_low(jd, iptr, REG_ITMP2);
+ if (iptr->sx.val.l == 0) {
+ /* if high word is less than zero, the whole long is too */
+ M_CMP_IMM(s1, 0);
+ emit_blt(cd, iptr->dst.block);
+ }
+ else {
+ /* high compare: x=0(ifLT) ; x=1(ifEQ) ; x=2(ifGT) */
+ M_COMPARE(s1, (iptr->sx.val.l >> 32));
+ /*ICONST(REG_ITMP3, iptr->sx.val.l >> 32);
+ M_CMP(s1, REG_ITMP3);*/
+ M_EOR(REG_ITMP1, REG_ITMP1, REG_ITMP1);
+ M_MOVGT_IMM(2, REG_ITMP1);
+ M_MOVEQ_IMM(1, REG_ITMP1);
+
+ /* low compare: x=x-1(ifLO) */
+ M_COMPARE(s2, (iptr->sx.val.l & 0xffffffff));
+ /*ICONST(REG_ITMP3, iptr->sx.val.l & 0xffffffff);
+ M_CMP(s2, REG_ITMP3);*/
+ M_SUBLO_IMM(REG_ITMP1, REG_ITMP1, 1);
+
+ /* branch if (x LT 1) */
+ M_CMP_IMM(REG_ITMP1, 1);
+ emit_blt(cd, iptr->dst.block);
+ }
+ break;
+
+ case ICMD_IF_LLE: /* ..., value ==> ... */
s1 = emit_load_s1_high(jd, iptr, REG_ITMP1);
- M_COMPARE(s1, (iptr->sx.val.l >> 32), UNCOND, 0);
+ s2 = emit_load_s1_low(jd, iptr, REG_ITMP2);
+ if (iptr->sx.val.l == 0) {
+ /* if high word is less than zero, the whole long is too */
+ M_CMP_IMM(s1, 0);
+ emit_blt(cd, iptr->dst.block);
- switch(iptr->opc) {
- case ICMD_IF_LLT:
- case ICMD_IF_LLE:
- M_BLT(0);
- codegen_addreference(cd, iptr->dst.block);
- break;
- case ICMD_IF_LGT:
- case ICMD_IF_LGE:
- M_BGT(0);
- codegen_addreference(cd, iptr->dst.block);
- break;
- case ICMD_IF_LEQ: /* EQ and NE are the same for unsigned */
- case ICMD_IF_LNE:
- break;
- default:
- assert(0);
+ /* ... otherwise the low word has to be zero (tricky!) */
+ M_CMPEQ_IMM(s2, 0);
+ emit_beq(cd, iptr->dst.block);
}
+ else {
+ /* high compare: x=0(ifLT) ; x=1(ifEQ) ; x=2(ifGT) */
+ M_COMPARE(s1, (iptr->sx.val.l >> 32));
+ /*ICONST(REG_ITMP3, iptr->sx.val.l >> 32);
+ M_CMP(s1, REG_ITMP3);*/
+ M_EOR(REG_ITMP1, REG_ITMP1, REG_ITMP1);
+ M_MOVGT_IMM(2, REG_ITMP1);
+ M_MOVEQ_IMM(1, REG_ITMP1);
- s1 = emit_load_s1_low(jd, iptr, REG_ITMP1);
+ /* low compare: x=x+1(ifHI) */
+ M_COMPARE(s2, (iptr->sx.val.l & 0xffffffff));
+ /*ICONST(REG_ITMP3, iptr->sx.val.l & 0xffffffff);
+ M_CMP(s2, REG_ITMP3);*/
+ M_ADDHI_IMM(REG_ITMP1, REG_ITMP1, 1);
- switch(iptr->opc) {
- case ICMD_IF_LLT:
- M_COMPARE(s1, (iptr->sx.val.l & 0xffffffff), COND_EQ, 1);
- M_BLO(0);
- break;
- case ICMD_IF_LLE:
- M_COMPARE(s1, (iptr->sx.val.l & 0xffffffff), COND_EQ, 1);
- M_BLS(0);
- break;
- case ICMD_IF_LGT:
- M_COMPARE(s1, (iptr->sx.val.l & 0xffffffff), COND_EQ, 1);
- M_BHI(0);
- break;
- case ICMD_IF_LGE:
- M_COMPARE(s1, (iptr->sx.val.l & 0xffffffff), COND_EQ, 1);
- M_BHS(0);
- break;
- case ICMD_IF_LEQ:
- M_COMPARE(s1, (iptr->sx.val.l & 0xffffffff), COND_EQ, 0);
- M_BEQ(0);
- break;
- case ICMD_IF_LNE:
- M_COMPARE(s1, (iptr->sx.val.l & 0xffffffff), COND_EQ, 0);
+ /* branch if (x LE 1) */
+ M_CMP_IMM(REG_ITMP1, 1);
+ emit_ble(cd, iptr->dst.block);
+ }
+ break;
+
+ case ICMD_IF_LGE: /* ..., value ==> ... */
+
+ s1 = emit_load_s1_high(jd, iptr, REG_ITMP1);
+ s2 = emit_load_s1_low(jd, iptr, REG_ITMP2);
+ if (iptr->sx.val.l == 0) {
+ /* if high word is greater or equal zero, the whole long is too */
+ M_CMP_IMM(s1, 0);
+ emit_bge(cd, iptr->dst.block);
+ }
+ else {
+ /* high compare: x=0(ifLT) ; x=1(ifEQ) ; x=2(ifGT) */
+ M_COMPARE(s1, (iptr->sx.val.l >> 32));
+ /*ICONST(REG_ITMP3, iptr->sx.val.l >> 32);
+ M_CMP(s1, REG_ITMP3);*/
+ M_EOR(REG_ITMP1, REG_ITMP1, REG_ITMP1);
+ M_MOVGT_IMM(2, REG_ITMP1);
+ M_MOVEQ_IMM(1, REG_ITMP1);
+
+ /* low compare: x=x-1(ifLO) */
+ M_COMPARE(s2, (iptr->sx.val.l & 0xffffffff));
+ /*ICONST(REG_ITMP3, iptr->sx.val.l & 0xffffffff);
+ M_CMP(s2, REG_ITMP3);*/
+ M_SUBLO_IMM(REG_ITMP1, REG_ITMP1, 1);
+
+ /* branch if (x GE 1) */
+ M_CMP_IMM(REG_ITMP1, 1);
+ emit_bge(cd, iptr->dst.block);
+ }
+ break;
+
+ case ICMD_IF_LGT: /* ..., value ==> ... */
+
+ s1 = emit_load_s1_high(jd, iptr, REG_ITMP1);
+ s2 = emit_load_s1_low(jd, iptr, REG_ITMP2);
+#if 0
+ if (iptr->sx.val.l == 0) {
+ /* if high word is greater than zero, the whole long is too */
+ M_CMP_IMM(s1, 0);
+ M_BGT(0);
+ codegen_add_branch_ref(cd, iptr->dst.block);
+
+ /* ... or high was zero and low is non zero (tricky!) */
+ M_EOR(REG_ITMP3, REG_ITMP3, REG_ITMP3);
+ M_MOVLT_IMM(1, REG_ITMP3);
+ M_ORR_S(REG_ITMP3, s2, REG_ITMP3);
M_BNE(0);
- break;
- default:
- assert(0);
+ codegen_add_branch_ref(cd, iptr->dst.block);
+ }
+ else {
+#endif
+ /* high compare: x=0(ifLT) ; x=1(ifEQ) ; x=2(ifGT) */
+ M_COMPARE(s1, (iptr->sx.val.l >> 32));
+ /*ICONST(REG_ITMP3, iptr->sx.val.l >> 32);
+ M_CMP(s1, REG_ITMP3);*/
+ M_EOR(REG_ITMP1, REG_ITMP1, REG_ITMP1);
+ M_MOVGT_IMM(2, REG_ITMP1);
+ M_MOVEQ_IMM(1, REG_ITMP1);
+
+ /* low compare: x=x+1(ifHI) */
+ M_COMPARE(s2, (iptr->sx.val.l & 0xffffffff));
+ /*ICONST(REG_ITMP3, iptr->sx.val.l & 0xffffffff);
+ M_CMP(s2, REG_ITMP3);*/
+ M_ADDHI_IMM(REG_ITMP1, REG_ITMP1, 1);
+
+ /* branch if (x GT 1) */
+ M_CMP_IMM(REG_ITMP1, 1);
+ emit_bgt(cd, iptr->dst.block);
+#if 0
}
- codegen_addreference(cd, iptr->dst.block);
+#endif
break;
+ case ICMD_IF_LNE: /* ..., value ==> ... */
+
+ s1 = emit_load_s1_high(jd, iptr, REG_ITMP1);
+ s2 = emit_load_s1_low(jd, iptr, REG_ITMP2);
+ if (iptr->sx.val.l == 0) {
+ M_ORR_S(s1, s2, REG_ITMP3);
+ }
+ else {
+ M_COMPARE(s1, (iptr->sx.val.l >> 32));
+ /*ICONST(REG_ITMP3, iptr->sx.val.l >> 32);
+ M_CMP(s1, REG_ITMP3);*/
+ ICONST(REG_ITMP3, iptr->sx.val.l & 0xffffffff);
+ M_CMPEQ(s2, REG_ITMP3);
+ }
+ emit_bne(cd, iptr->dst.block);
+ break;
+
case ICMD_IF_ICMPEQ: /* ..., value, value ==> ... */
- case ICMD_IF_ACMPEQ: /* op1 = target JavaVM pc */
case ICMD_IF_ICMPNE:
- case ICMD_IF_ACMPNE:
case ICMD_IF_ICMPLT:
case ICMD_IF_ICMPLE:
case ICMD_IF_ICMPGT:
s1 = emit_load_s1(jd, iptr, REG_ITMP1);
s2 = emit_load_s2(jd, iptr, REG_ITMP2);
M_CMP(s1, s2);
- switch(iptr->opc) {
- case ICMD_IF_ICMPLT:
- M_BLT(0);
- break;
- case ICMD_IF_ICMPLE:
- M_BLE(0);
- break;
- case ICMD_IF_ICMPGT:
- M_BGT(0);
- break;
- case ICMD_IF_ICMPGE:
- M_BGE(0);
- break;
- case ICMD_IF_ICMPEQ:
- case ICMD_IF_ACMPEQ:
- M_BEQ(0);
- break;
- case ICMD_IF_ICMPNE:
- case ICMD_IF_ACMPNE:
- M_BNE(0);
- break;
- default:
- assert(0);
- }
- codegen_addreference(cd, iptr->dst.block);
+ emit_bcc(cd, iptr->dst.block, iptr->opc - ICMD_IF_ICMPEQ, BRANCH_OPT_NONE);
+ break;
+
+ case ICMD_IF_ACMPEQ: /* ..., value, value ==> ... */
+ case ICMD_IF_ACMPNE:
+
+ s1 = emit_load_s1(jd, iptr, REG_ITMP1);
+ s2 = emit_load_s2(jd, iptr, REG_ITMP2);
+ M_CMP(s1, s2);
+ emit_bcc(cd, iptr->dst.block, iptr->opc - ICMD_IF_ACMPEQ, BRANCH_OPT_NONE);
break;
case ICMD_IF_LCMPEQ: /* ..., value, value ==> ... */
- case ICMD_IF_LCMPNE: /* op1 = target JavaVM pc */
- case ICMD_IF_LCMPLT:
- case ICMD_IF_LCMPLE:
- case ICMD_IF_LCMPGT:
- case ICMD_IF_LCMPGE:
+ /* op1 = target JavaVM pc */
- /* ATTENTION: compare high words signed and low words unsigned */
s1 = emit_load_s1_high(jd, iptr, REG_ITMP1);
s2 = emit_load_s2_high(jd, iptr, REG_ITMP2);
M_CMP(s1, s2);
- switch(iptr->opc) {
- case ICMD_IF_LCMPEQ: /* EQ and NE are the same for unsigned */
- case ICMD_IF_LCMPNE:
- break;
- case ICMD_IF_LCMPLT:
- case ICMD_IF_LCMPLE:
- M_BLT(0);
- codegen_addreference(cd, iptr->dst.block);
- break;
- case ICMD_IF_LCMPGT:
- case ICMD_IF_LCMPGE:
- M_BGT(0);
- codegen_addreference(cd, iptr->dst.block);
- break;
- default:
- assert(0);
- }
+ s1 = emit_load_s1_low(jd, iptr, REG_ITMP1);
+ s2 = emit_load_s2_low(jd, iptr, REG_ITMP2);
+ M_CMPEQ(s1, s2);
+
+ emit_beq(cd, iptr->dst.block);
+ break;
+
+ case ICMD_IF_LCMPNE: /* ..., value, value ==> ... */
+ /* op1 = target JavaVM pc */
+
+ s1 = emit_load_s1_high(jd, iptr, REG_ITMP1);
+ s2 = emit_load_s2_high(jd, iptr, REG_ITMP2);
+ M_CMP(s1, s2);
s1 = emit_load_s1_low(jd, iptr, REG_ITMP1);
s2 = emit_load_s2_low(jd, iptr, REG_ITMP2);
+ M_CMPEQ(s1, s2);
- switch(iptr->opc) {
- case ICMD_IF_LCMPEQ:
- M_DAT(COND_EQ,0x0a,0,s1,1,0,s2);
- M_BEQ(0);
- break;
- case ICMD_IF_LCMPNE:
- M_DAT(COND_EQ,0x0a,0,s1,1,0,s2);
- M_BNE(0);
- break;
- case ICMD_IF_LCMPLT:
- M_BNE(1);
- M_CMP(s1, s2);
- M_BLO(0);
- break;
- case ICMD_IF_LCMPLE:
- M_BNE(1);
- M_CMP(s1, s2);
- M_BLS(0);
- break;
- case ICMD_IF_LCMPGT:
- M_BNE(1);
- M_CMP(s1, s2);
- M_BHI(0);
- break;
- case ICMD_IF_LCMPGE:
- M_BNE(1);
- M_CMP(s1, s2);
- M_BHS(0);
- break;
- default:
- assert(0);
- }
- codegen_addreference(cd, iptr->dst.block);
+ emit_bne(cd, iptr->dst.block);
+ break;
+
+ case ICMD_IF_LCMPLT: /* ..., value, value ==> ... */
+ /* op1 = target JavaVM pc */
+
+ /* high compare: x=0(ifLT) ; x=1(ifEQ) ; x=2(ifGT) */
+ s1 = emit_load_s1_high(jd, iptr, REG_ITMP1);
+ s2 = emit_load_s2_high(jd, iptr, REG_ITMP2);
+ M_CMP(s1, s2);
+ M_EOR(REG_ITMP3, REG_ITMP3, REG_ITMP3);
+ M_MOVGT_IMM(2, REG_ITMP3);
+ M_MOVEQ_IMM(1, REG_ITMP3);
+
+ /* low compare: x=x-1(ifLO) */
+ s1 = emit_load_s1_low(jd, iptr, REG_ITMP1);
+ s2 = emit_load_s2_low(jd, iptr, REG_ITMP2);
+ M_CMP(s1, s2);
+ M_SUBLO_IMM(REG_ITMP3, REG_ITMP3, 1);
+
+ /* branch if (x LT 1) */
+ M_CMP_IMM(REG_ITMP3, 1);
+ emit_blt(cd, iptr->dst.block);
+ break;
+
+ case ICMD_IF_LCMPLE: /* ..., value, value ==> ... */
+ /* op1 = target JavaVM pc */
+
+ /* high compare: x=0(ifLT) ; x=1(ifEQ) ; x=2(ifGT) */
+ s1 = emit_load_s1_high(jd, iptr, REG_ITMP1);
+ s2 = emit_load_s2_high(jd, iptr, REG_ITMP2);
+ M_CMP(s1, s2);
+ M_EOR(REG_ITMP3, REG_ITMP3, REG_ITMP3);
+ M_MOVGT_IMM(2, REG_ITMP3);
+ M_MOVEQ_IMM(1, REG_ITMP3);
+
+ /* low compare: x=x-1(ifLO) */
+ s1 = emit_load_s1_low(jd, iptr, REG_ITMP1);
+ s2 = emit_load_s2_low(jd, iptr, REG_ITMP2);
+ M_CMP(s1, s2);
+ M_ADDHI_IMM(REG_ITMP3, REG_ITMP3, 1);
+
+ /* branch if (x LE 1) */
+ M_CMP_IMM(REG_ITMP3, 1);
+ emit_ble(cd, iptr->dst.block);
+ break;
+
+ case ICMD_IF_LCMPGT: /* ..., value, value ==> ... */
+ /* op1 = target JavaVM pc */
+
+ /* high compare: x=0(ifLT) ; x=1(ifEQ) ; x=2(ifGT) */
+ s1 = emit_load_s1_high(jd, iptr, REG_ITMP1);
+ s2 = emit_load_s2_high(jd, iptr, REG_ITMP2);
+ M_CMP(s1, s2);
+ M_EOR(REG_ITMP3, REG_ITMP3, REG_ITMP3);
+ M_MOVGT_IMM(2, REG_ITMP3);
+ M_MOVEQ_IMM(1, REG_ITMP3);
+
+ /* low compare: x=x-1(ifLO) */
+ s1 = emit_load_s1_low(jd, iptr, REG_ITMP1);
+ s2 = emit_load_s2_low(jd, iptr, REG_ITMP2);
+ M_CMP(s1, s2);
+ M_ADDHI_IMM(REG_ITMP3, REG_ITMP3, 1);
+
+ /* branch if (x GT 1) */
+ M_CMP_IMM(REG_ITMP3, 1);
+ emit_bgt(cd, iptr->dst.block);
+ break;
+
+ case ICMD_IF_LCMPGE: /* ..., value, value ==> ... */
+ /* op1 = target JavaVM pc */
+
+ /* high compare: x=0(ifLT) ; x=1(ifEQ) ; x=2(ifGT) */
+ s1 = emit_load_s1_high(jd, iptr, REG_ITMP1);
+ s2 = emit_load_s2_high(jd, iptr, REG_ITMP2);
+ M_CMP(s1, s2);
+ M_EOR(REG_ITMP3, REG_ITMP3, REG_ITMP3);
+ M_MOVGT_IMM(2, REG_ITMP3);
+ M_MOVEQ_IMM(1, REG_ITMP3);
+
+ /* low compare: x=x-1(ifLO) */
+ s1 = emit_load_s1_low(jd, iptr, REG_ITMP1);
+ s2 = emit_load_s2_low(jd, iptr, REG_ITMP2);
+ M_CMP(s1, s2);
+ M_SUBLO_IMM(REG_ITMP3, REG_ITMP3, 1);
+
+ /* branch if (x GE 1) */
+ M_CMP_IMM(REG_ITMP3, 1);
+ emit_bge(cd, iptr->dst.block);
break;
case ICMD_TABLESWITCH: /* ..., index ==> ... */
/* range check (index <= high-low) */
i = i - l + 1;
- M_COMPARE(REG_ITMP1, i-1, UNCOND, 0);
- M_BHI(0); /* unsigned greater than */
- codegen_addreference(cd, table[0].block);
+ M_COMPARE(REG_ITMP1, i-1);
+ emit_bugt(cd, table[0].block);
/* build jump table top down and use address of lowest entry */
/* length of dataseg after last dseg_add_target is used by load */
/* TODO: this loads from data-segment */
- M_ADD(REG_ITMP2, REG_IP, REG_LSL(REG_ITMP1, 2));
+ M_ADD(REG_ITMP2, REG_PV, REG_LSL(REG_ITMP1, 2));
M_LDR(REG_PC, REG_ITMP2, -(cd->dseglen));
break;
s1 = emit_load_s1(jd, iptr, REG_ITMP1);
while (--i >= 0) {
- M_COMPARE(s1, lookup->value, UNCOND, 0);
- M_BEQ(0);
- codegen_addreference(cd, lookup->target.block);
+ M_COMPARE(s1, lookup->value);
+ emit_beq(cd, lookup->target.block);
lookup++;
}
/* default branch */
- M_B(0);
- codegen_addreference(cd, iptr->sx.s23.s3.lookupdefault.block);
+ emit_br(cd, iptr->sx.s23.s3.lookupdefault.block);
}
break;
case ICMD_FRETURN: /* ..., retvalue ==> ... */
#if !defined(ENABLE_SOFTFLOAT)
+ REPLACEMENT_POINT_RETURN(cd, iptr);
s1 = emit_load_s1(jd, iptr, REG_FTMP1);
M_CAST_FLT_TO_INT_TYPED(VAROP(iptr->s1)->type, s1, REG_RESULT);
goto ICMD_RETURN_do;
case ICMD_IRETURN: /* ..., retvalue ==> ... */
+ REPLACEMENT_POINT_RETURN(cd, iptr);
s1 = emit_load_s1(jd, iptr, REG_RESULT);
M_INTMOVE(s1, REG_RESULT);
goto ICMD_RETURN_do;
case ICMD_DRETURN: /* ..., retvalue ==> ... */
#if !defined(ENABLE_SOFTFLOAT)
+ REPLACEMENT_POINT_RETURN(cd, iptr);
s1 = emit_load_s1(jd, iptr, REG_FTMP1);
M_CAST_FLT_TO_INT_TYPED(VAROP(iptr->s1)->type, s1, REG_RESULT_PACKED);
goto ICMD_RETURN_do;
case ICMD_LRETURN: /* ..., retvalue ==> ... */
+ REPLACEMENT_POINT_RETURN(cd, iptr);
s1 = emit_load_s1(jd, iptr, REG_RESULT_PACKED);
M_LNGMOVE(s1, REG_RESULT_PACKED);
goto ICMD_RETURN_do;
case ICMD_ARETURN: /* ..., retvalue ==> ... */
+ REPLACEMENT_POINT_RETURN(cd, iptr);
s1 = emit_load_s1(jd, iptr, REG_RESULT);
M_INTMOVE(s1, REG_RESULT);
if (INSTRUCTION_IS_UNRESOLVED(iptr)) {
- codegen_addpatchref(cd, PATCHER_athrow_areturn,
+ patcher_add_patch_ref(jd, PATCHER_resolve_class,
iptr->sx.s23.s2.uc, 0);
if (opt_showdisassemble)
goto ICMD_RETURN_do;
case ICMD_RETURN: /* ... ==> ... */
+
+ REPLACEMENT_POINT_RETURN(cd, iptr);
ICMD_RETURN_do:
#if !defined(NDEBUG)
if (checksync && (m->flags & ACC_SYNCHRONIZED)) {
/* stack offset for monitor argument */
- s1 = rd->memuse;
+ s1 = rd->memuse * 8;
/* we need to save the proper return value */
case ICMD_FRETURN: /* XXX TWISTI: is that correct? */
case ICMD_DRETURN:
M_STMFD(BITMASK_RESULT, REG_SP);
- s1 += 2;
+ s1 += 2 * 4;
break;
}
- M_LDR(REG_A0, REG_SP, s1 * 4);
+ M_LDR(REG_A0, REG_SP, s1);
disp = dseg_add_functionptr(cd, LOCK_monitor_exit);
M_DSEG_BRANCH(disp);
- /* we no longer need IP here, no more loading */
+ /* we no longer need PV here, no more loading */
/*s1 = (s4) (cd->mcodeptr - cd->mcodebase);
- M_RECOMPUTE_IP(s1);*/
+ M_RECOMPUTE_PV(s1);*/
switch (iptr->opc) {
case ICMD_IRETURN:
#endif
/* deallocate stackframe for spilled variables */
- if (spilledregs_num) {
- M_ADD_IMM_EXT_MUL4(REG_SP, REG_SP, spilledregs_num);
- }
+
+ if ((cd->stackframesize / 4 - savedregs_num) > 0)
+ M_ADD_IMM_EXT_MUL4(REG_SP, REG_SP, cd->stackframesize / 4 - savedregs_num);
/* restore callee saved registers + do return */
+
if (savedregs_bitmask) {
if (!jd->isleafmethod) {
savedregs_bitmask &= ~(1<<REG_LR);
}
/* if LR was not on stack, we need to return manually */
+
if (jd->isleafmethod)
M_MOV(REG_PC, REG_LR);
break;
case ICMD_INVOKEVIRTUAL:/* op1 = arg count, val.a = method pointer */
case ICMD_INVOKEINTERFACE:
+ REPLACEMENT_POINT_INVOKE(cd, iptr);
+
if (INSTRUCTION_IS_UNRESOLVED(iptr)) {
lm = NULL;
um = iptr->sx.s23.s3.um;
for (s3 = s3 - 1; s3 >= 0; s3--) {
var = VAR(iptr->sx.s23.s2.args[s3]);
+ d = md->params[s3].regoff;
if (var->flags & PREALLOC) /* argument was precolored? */
continue;
if (IS_INT_LNG_TYPE(var->type)) {
#endif /* !defined(ENABLE_SOFTFLOAT) */
if (!md->params[s3].inmemory) {
- s1 = ARGUMENT_REGS(var->type, md->params[s3].regoff);
- SPLIT_OPEN(var->type, s1, REG_ITMP2);
- d = emit_load(jd, iptr, var, s1);
+ s1 = emit_load(jd, iptr, var, d);
if (IS_2_WORD_TYPE(var->type))
- M_LNGMOVE(d, s1);
+ M_LNGMOVE(s1, d);
else
- M_INTMOVE(d, s1);
-
- SPLIT_STORE_AND_CLOSE(var->type, s1, 0);
+ M_INTMOVE(s1, d);
}
else {
if (IS_2_WORD_TYPE(var->type)) {
- d = emit_load(jd, iptr, var, REG_ITMP12_PACKED);
- M_LST(d, REG_SP, md->params[s3].regoff * 4);
+ s1 = emit_load(jd, iptr, var, REG_ITMP12_PACKED);
+ M_LST(s1, REG_SP, d);
}
else {
- d = emit_load(jd, iptr, var, REG_ITMP1);
- M_IST(d, REG_SP, md->params[s3].regoff * 4);
+ s1 = emit_load(jd, iptr, var, REG_ITMP1);
+ M_IST(s1, REG_SP, d);
}
}
#if !defined(ENABLE_SOFTFLOAT)
}
else {
if (!md->params[s3].inmemory) {
- s1 = ARGUMENT_REGS(var->type, md->params[s3].regoff);
- d = emit_load(jd, iptr, var, REG_FTMP1);
- SPLIT_OPEN(var->type, s1, REG_ITMP1);
- M_CAST_FLT_TO_INT_TYPED(var->type, d, s1);
- SPLIT_STORE_AND_CLOSE(var->type, s1, 0);
+ s1 = emit_load(jd, iptr, var, REG_FTMP1);
+ M_CAST_FLT_TO_INT_TYPED(var->type, s1, d);
}
else {
- d = emit_load(jd, iptr, var, REG_FTMP1);
+ s1 = emit_load(jd, iptr, var, REG_FTMP1);
if (IS_2_WORD_TYPE(var->type))
- M_DST(d, REG_SP, md->params[s3].regoff * 4);
+ M_DST(s1, REG_SP, d);
else
- M_FST(d, REG_SP, md->params[s3].regoff * 4);
+ M_FST(s1, REG_SP, d);
}
}
#endif /* !defined(ENABLE_SOFTFLOAT) */
case ICMD_BUILTIN:
disp = dseg_add_functionptr(cd, bte->fp);
- M_DSEG_LOAD(REG_IP, disp); /* Pointer to built-in-function */
+ M_DSEG_LOAD(REG_PV, disp); /* pointer to built-in-function */
+
+ /* generate the actual call */
+
+ M_MOV(REG_LR, REG_PC);
+ M_MOV(REG_PC, REG_PV);
+ s1 = (s4) (cd->mcodeptr - cd->mcodebase);
+ M_RECOMPUTE_PV(s1);
+
+ emit_exception_check(cd, iptr);
break;
case ICMD_INVOKESPECIAL:
- M_TST(REG_A0, REG_A0);
- M_BEQ(0);
- codegen_add_nullpointerexception_ref(cd);
+ emit_nullpointer_check(cd, iptr, REG_A0);
/* fall through */
case ICMD_INVOKESTATIC:
if (lm == NULL) {
disp = dseg_add_unique_address(cd, NULL);
- codegen_addpatchref(cd, PATCHER_invokestatic_special,
+ patcher_add_patch_ref(jd, PATCHER_invokestatic_special,
um, disp);
if (opt_showdisassemble)
else
disp = dseg_add_address(cd, lm->stubroutine);
- M_DSEG_LOAD(REG_IP, disp); /* Pointer to method */
+ M_DSEG_LOAD(REG_PV, disp); /* Pointer to method */
+
+ /* generate the actual call */
+
+ M_MOV(REG_LR, REG_PC);
+ M_MOV(REG_PC, REG_PV);
+ s1 = (s4) (cd->mcodeptr - cd->mcodebase);
+ M_RECOMPUTE_PV(s1);
break;
case ICMD_INVOKEVIRTUAL:
- gen_nullptr_check(REG_A0);
-
if (lm == NULL) {
- codegen_addpatchref(cd, PATCHER_invokevirtual, um, 0);
+ patcher_add_patch_ref(jd, PATCHER_invokevirtual, um, 0);
if (opt_showdisassemble)
M_NOP;
s1 = OFFSET(vftbl_t, table[0]) +
sizeof(methodptr) * lm->vftblindex;
+ /* implicit null-pointer check */
M_LDR_INTERN(REG_METHODPTR, REG_A0,
- OFFSET(java_objectheader, vftbl));
- M_LDR_INTERN(REG_IP, REG_METHODPTR, s1);
+ OFFSET(java_object_t, vftbl));
+ M_LDR_INTERN(REG_PV, REG_METHODPTR, s1);
+
+ /* generate the actual call */
+
+ M_MOV(REG_LR, REG_PC);
+ M_MOV(REG_PC, REG_PV);
+ s1 = (s4) (cd->mcodeptr - cd->mcodebase);
+ M_RECOMPUTE_PV(s1);
break;
case ICMD_INVOKEINTERFACE:
- gen_nullptr_check(REG_A0);
-
if (lm == NULL) {
- codegen_addpatchref(cd, PATCHER_invokeinterface, um, 0);
+ patcher_add_patch_ref(jd, PATCHER_invokeinterface, um, 0);
if (opt_showdisassemble)
M_NOP;
s2 = sizeof(methodptr) * (lm - lm->class->methods);
}
+ /* implicit null-pointer check */
M_LDR_INTERN(REG_METHODPTR, REG_A0,
- OFFSET(java_objectheader, vftbl));
+ OFFSET(java_object_t, vftbl));
M_LDR_INTERN(REG_METHODPTR, REG_METHODPTR, s1);
- M_LDR_INTERN(REG_IP, REG_METHODPTR, s2);
- break;
- }
+ M_LDR_INTERN(REG_PV, REG_METHODPTR, s2);
- /* generate the actual call */
+ /* generate the actual call */
- M_MOV(REG_LR, REG_PC); /* save return address in LR */
- M_MOV(REG_PC, REG_IP); /* branch to method */
- s1 = (s4) (cd->mcodeptr - cd->mcodebase);
- M_RECOMPUTE_IP(s1);
-
- /* actually only used for ICMD_BUILTIN */
-
- if (INSTRUCTION_MUST_CHECK(iptr)) {
- M_TST(REG_RESULT, REG_RESULT);
- M_BEQ(0);
- codegen_add_fillinstacktrace_ref(cd);
+ M_MOV(REG_LR, REG_PC);
+ M_MOV(REG_PC, REG_PV);
+ s1 = (s4) (cd->mcodeptr - cd->mcodebase);
+ M_RECOMPUTE_PV(s1);
+ break;
}
+ /* store size of call code in replacement point */
+ REPLACEMENT_POINT_INVOKE_RETURN(cd, iptr);
+
/* store return value */
d = md->returntype.type;
break;
case ICMD_CHECKCAST: /* ..., objectref ==> ..., objectref */
- /* val.a: (classinfo*) superclass */
if (!(iptr->flags.bits & INS_FLAG_ARRAY)) {
/* object type cast-check */
classinfo *super;
s4 superindex;
- u1 *branch1 = NULL;
- u1 *branch2 = NULL;
- u1 *branch3 = NULL;
if (INSTRUCTION_IS_UNRESOLVED(iptr)) {
super = NULL;
superindex = super->index;
}
-#if defined(ENABLE_THREADS)
- codegen_threadcritrestart(cd, cd->mcodeptr - cd->mcodebase);
-#endif
+ if ((super == NULL) || !(super->flags & ACC_INTERFACE))
+ CODEGEN_CRITICAL_SECTION_NEW;
+
s1 = emit_load_s1(jd, iptr, REG_ITMP1);
/* if class is not resolved, check which code to call */
if (super == NULL) {
M_TST(s1, s1);
- M_BEQ(0);
- branch1 = cd->mcodeptr;
+ emit_label_beq(cd, BRANCH_LABEL_1);
disp = dseg_add_unique_s4(cd, 0); /* super->flags */
- codegen_addpatchref(cd, PATCHER_checkcast_instanceof_flags,
+ patcher_add_patch_ref(jd, PATCHER_resolve_classref_to_flags,
iptr->sx.s23.s3.c.ref, disp);
if (opt_showdisassemble)
disp = dseg_add_s4(cd, ACC_INTERFACE);
M_DSEG_LOAD(REG_ITMP3, disp);
M_TST(REG_ITMP2, REG_ITMP3);
- M_BEQ(0);
- branch2 = cd->mcodeptr;
+ emit_label_beq(cd, BRANCH_LABEL_2);
}
/* interface checkcast code */
if ((super == NULL) || (super->flags & ACC_INTERFACE)) {
+ if ((super == NULL) || !IS_IMM(superindex)) {
+ disp = dseg_add_unique_s4(cd, superindex);
+ }
if (super == NULL) {
- codegen_addpatchref(cd,
- PATCHER_checkcast_instanceof_interface,
- iptr->sx.s23.s3.c.ref, 0);
+ patcher_add_patch_ref(jd, PATCHER_resolve_classref_to_index,
+ iptr->sx.s23.s3.c.ref, disp);
if (opt_showdisassemble)
M_NOP;
}
else {
M_TST(s1, s1);
- M_BEQ(0);
- branch1 = cd->mcodeptr;
+ emit_label_beq(cd, BRANCH_LABEL_3);
}
- M_LDR_INTERN(REG_ITMP2, s1, OFFSET(java_objectheader, vftbl));
+ M_LDR_INTERN(REG_ITMP2, s1, OFFSET(java_object_t, vftbl));
M_LDR_INTERN(REG_ITMP3, REG_ITMP2, OFFSET(vftbl_t, interfacetablelength));
- assert(IS_IMM(superindex));
- M_CMP_IMM(REG_ITMP3, superindex);
- M_BLE(0);
- codegen_add_classcastexception_ref(cd, s1);
- s2 = OFFSET(vftbl_t, interfacetable[0]) -
- superindex * sizeof(methodptr*);
+ /* we put unresolved or non-immediate superindices onto dseg */
+ if ((super == NULL) || !IS_IMM(superindex)) {
+ /* disp was computed before we added the patcher */
+ M_DSEG_LOAD(REG_ITMP2, disp);
+ M_CMP(REG_ITMP3, REG_ITMP2);
+ } else {
+ assert(IS_IMM(superindex));
+ M_CMP_IMM(REG_ITMP3, superindex);
+ }
- M_LDR_INTERN(REG_ITMP3, REG_ITMP2, s2);
- M_TST(REG_ITMP3, REG_ITMP3);
- M_BEQ(0);
- codegen_add_classcastexception_ref(cd, s1);
+ emit_classcast_check(cd, iptr, BRANCH_LE, REG_ITMP3, s1);
+
+ /* if we loaded the superindex out of the dseg above, we do
+ things differently here! */
+ if ((super == NULL) || !IS_IMM(superindex)) {
+
+ M_LDR_INTERN(REG_ITMP3, s1, OFFSET(java_object_t, vftbl));
+
+ /* this assumes something */
+ assert(OFFSET(vftbl_t, interfacetable[0]) == 0);
+
+ /* this does: REG_ITMP3 - superindex * sizeof(methodptr*) */
+ assert(sizeof(methodptr*) == 4);
+ M_SUB(REG_ITMP2, REG_ITMP3, REG_LSL(REG_ITMP2, 2));
+
+ s2 = 0;
+
+ } else {
+
+ s2 = OFFSET(vftbl_t, interfacetable[0]) -
+ superindex * sizeof(methodptr*);
- if (super == NULL) {
- M_B(0);
- branch3 = cd->mcodeptr;
}
- }
- if (branch2) {
- gen_resolvebranch(branch2, branch2 - cd->mcodebase,
- cd->mcodeptr - cd->mcodebase);
+ M_LDR_INTERN(REG_ITMP3, REG_ITMP2, s2);
+ M_TST(REG_ITMP3, REG_ITMP3);
+ emit_classcast_check(cd, iptr, BRANCH_EQ, REG_ITMP3, s1);
+
+ if (super == NULL)
+ emit_label_br(cd, BRANCH_LABEL_4);
+ else
+ emit_label(cd, BRANCH_LABEL_3);
}
/* class checkcast code */
if ((super == NULL) || !(super->flags & ACC_INTERFACE)) {
if (super == NULL) {
+ emit_label(cd, BRANCH_LABEL_2);
+
disp = dseg_add_unique_address(cd, NULL);
- codegen_addpatchref(cd, PATCHER_checkcast_instanceof_class,
+ patcher_add_patch_ref(jd, PATCHER_resolve_classref_to_vftbl,
iptr->sx.s23.s3.c.ref,
disp);
disp = dseg_add_address(cd, super->vftbl);
M_TST(s1, s1);
- M_BEQ(0);
- branch1 = cd->mcodeptr;
+ emit_label_beq(cd, BRANCH_LABEL_5);
}
- M_LDR_INTERN(REG_ITMP2, s1, OFFSET(java_objectheader, vftbl));
+ M_LDR_INTERN(REG_ITMP2, s1, OFFSET(java_object_t, vftbl));
M_DSEG_LOAD(REG_ITMP3, disp);
-#if defined(ENABLE_THREADS)
- codegen_threadcritstart(cd, cd->mcodeptr - cd->mcodebase);
-#endif
+
+ CODEGEN_CRITICAL_SECTION_START;
+
M_LDR_INTERN(REG_ITMP2, REG_ITMP2, OFFSET(vftbl_t, baseval));
M_LDR_INTERN(REG_ITMP3, REG_ITMP3, OFFSET(vftbl_t, baseval));
M_SUB(REG_ITMP2, REG_ITMP2, REG_ITMP3);
M_DSEG_LOAD(REG_ITMP3, disp);
M_LDR_INTERN(REG_ITMP3, REG_ITMP3, OFFSET(vftbl_t, diffval));
-#if defined(ENABLE_THREADS)
- codegen_threadcritstop(cd, cd->mcodeptr - cd->mcodebase);
-#endif
+
+ CODEGEN_CRITICAL_SECTION_END;
+
M_CMP(REG_ITMP2, REG_ITMP3);
- M_BHI(0);
- codegen_add_classcastexception_ref(cd, s1);
- }
+ emit_classcast_check(cd, iptr, BRANCH_UGT, 0, s1);
- if (branch1) {
- gen_resolvebranch(branch1, branch1 - cd->mcodebase,
- cd->mcodeptr - cd->mcodebase);
+ if (super != NULL)
+ emit_label(cd, BRANCH_LABEL_5);
}
- if (branch3) {
- gen_resolvebranch(branch3, branch3 - cd->mcodebase,
- cd->mcodeptr - cd->mcodebase);
+ if (super == NULL) {
+ emit_label(cd, BRANCH_LABEL_1);
+ emit_label(cd, BRANCH_LABEL_4);
}
d = codegen_reg_of_dst(jd, iptr, REG_ITMP1);
if (INSTRUCTION_IS_UNRESOLVED(iptr)) {
disp = dseg_add_unique_address(cd, NULL);
- codegen_addpatchref(cd, PATCHER_builtin_arraycheckcast,
+ patcher_add_patch_ref(jd, PATCHER_resolve_classref_to_classinfo,
iptr->sx.s23.s3.c.ref,
disp);
disp = dseg_add_functionptr(cd, BUILTIN_arraycheckcast);
M_DSEG_BRANCH(disp);
- /* recompute ip */
+ /* recompute pv */
disp = (s4) (cd->mcodeptr - cd->mcodebase);
- M_RECOMPUTE_IP(disp);
+ M_RECOMPUTE_PV(disp);
s1 = emit_load_s1(jd, iptr, REG_ITMP1);
M_TST(REG_RESULT, REG_RESULT);
- M_BEQ(0);
- codegen_add_classcastexception_ref(cd, s1);
+ emit_classcast_check(cd, iptr, BRANCH_EQ, REG_RESULT, s1);
d = codegen_reg_of_dst(jd, iptr, s1);
}
break;
case ICMD_INSTANCEOF: /* ..., objectref ==> ..., intresult */
- /* val.a: (classinfo*) superclass */
+
{
classinfo *super;
s4 superindex;
- u1 *branch1 = NULL;
- u1 *branch2 = NULL;
- u1 *branch3 = NULL;
if (INSTRUCTION_IS_UNRESOLVED(iptr)) {
super = NULL;
superindex = super->index;
}
-#if defined(ENABLE_THREADS)
- codegen_threadcritrestart(cd, cd->mcodeptr - cd->mcodebase);
-#endif
+ if ((super == NULL) || !(super->flags & ACC_INTERFACE))
+ CODEGEN_CRITICAL_SECTION_NEW;
+
s1 = emit_load_s1(jd, iptr, REG_ITMP1);
d = codegen_reg_of_dst(jd, iptr, REG_ITMP2);
+
if (s1 == d) {
M_MOV(REG_ITMP1, s1);
s1 = REG_ITMP1;
if (super == NULL) {
M_EOR(d, d, d);
+
M_TST(s1, s1);
- M_BEQ(0);
- branch1 = cd->mcodeptr;
+ emit_label_beq(cd, BRANCH_LABEL_1);
disp = dseg_add_unique_s4(cd, 0); /* super->flags */
- codegen_addpatchref(cd, PATCHER_checkcast_instanceof_flags,
+ patcher_add_patch_ref(jd, PATCHER_resolve_classref_to_flags,
iptr->sx.s23.s3.c.ref, disp);
if (opt_showdisassemble)
disp = dseg_add_s4(cd, ACC_INTERFACE);
M_DSEG_LOAD(REG_ITMP3, disp);
M_TST(REG_ITMP2, REG_ITMP3);
- M_BEQ(0);
- branch2 = cd->mcodeptr;
+ emit_label_beq(cd, BRANCH_LABEL_2);
}
/* interface checkcast code */
if ((super == NULL) || (super->flags & ACC_INTERFACE)) {
+ if ((super == NULL) || !IS_IMM(superindex)) {
+ disp = dseg_add_unique_s4(cd, superindex);
+ }
if (super == NULL) {
/* If d == REG_ITMP2, then it's destroyed in check
code above. */
if (d == REG_ITMP2)
M_EOR(d, d, d);
- codegen_addpatchref(cd,
- PATCHER_checkcast_instanceof_interface,
- iptr->sx.s23.s3.c.ref, 0);
+ patcher_add_patch_ref(jd, PATCHER_resolve_classref_to_index,
+ iptr->sx.s23.s3.c.ref, disp);
if (opt_showdisassemble)
M_NOP;
else {
M_EOR(d, d, d);
M_TST(s1, s1);
- M_BEQ(0);
- branch1 = cd->mcodeptr;
+ emit_label_beq(cd, BRANCH_LABEL_3);
}
- M_LDR_INTERN(REG_ITMP1, s1, OFFSET(java_objectheader, vftbl));
+ M_LDR_INTERN(REG_ITMP1, s1, OFFSET(java_object_t, vftbl));
M_LDR_INTERN(REG_ITMP3,
REG_ITMP1, OFFSET(vftbl_t, interfacetablelength));
- assert(IS_IMM(superindex));
- M_CMP_IMM(REG_ITMP3, superindex);
- M_BLE(2);
- s2 = OFFSET(vftbl_t, interfacetable[0]) -
- superindex * sizeof(methodptr*);
+ /* we put unresolved or non-immediate superindices onto dseg
+ and do things slightly different */
+ if ((super == NULL) || !IS_IMM(superindex)) {
+ /* disp was computed before we added the patcher */
+ M_DSEG_LOAD(REG_ITMP2, disp);
+ M_CMP(REG_ITMP3, REG_ITMP2);
+
+ if (d == REG_ITMP2) {
+ M_EORLE(d, d, d);
+ M_BLE(4);
+ } else {
+ M_BLE(3);
+ }
- M_LDR_INTERN(REG_ITMP3, REG_ITMP1, s2);
- M_TST(REG_ITMP3, REG_ITMP3);
- M_MOVNE_IMM(d, 1);
+ /* this assumes something */
+ assert(OFFSET(vftbl_t, interfacetable[0]) == 0);
+
+ /* this does: REG_ITMP3 - superindex * sizeof(methodptr*) */
+ assert(sizeof(methodptr*) == 4);
+ M_SUB(REG_ITMP1, REG_ITMP1, REG_LSL(REG_ITMP2, 2));
+
+ if (d == REG_ITMP2) {
+ M_EOR(d, d, d);
+ }
+
+ s2 = 0;
+
+ } else {
+ assert(IS_IMM(superindex));
+ M_CMP_IMM(REG_ITMP3, superindex);
+
+ M_BLE(2);
+
+ s2 = OFFSET(vftbl_t, interfacetable[0]) -
+ superindex * sizeof(methodptr*);
- if (super == NULL) {
- M_B(0);
- branch3 = cd->mcodeptr;
}
- }
- if (branch2) {
- gen_resolvebranch(branch2, branch2 - cd->mcodebase,
- cd->mcodeptr - cd->mcodebase);
+ M_LDR_INTERN(REG_ITMP3, REG_ITMP1, s2);
+ M_TST(REG_ITMP3, REG_ITMP3);
+ M_MOVNE_IMM(1, d);
+
+ if (super == NULL)
+ emit_label_br(cd, BRANCH_LABEL_4);
+ else
+ emit_label(cd, BRANCH_LABEL_3);
}
/* class checkcast code */
if ((super == NULL) || !(super->flags & ACC_INTERFACE)) {
if (super == NULL) {
+ emit_label(cd, BRANCH_LABEL_2);
+
disp = dseg_add_unique_address(cd, NULL);
- codegen_addpatchref(cd, PATCHER_checkcast_instanceof_class,
- iptr->sx.s23.s3.c.ref,
- disp);
+ patcher_add_patch_ref(jd, PATCHER_resolve_classref_to_vftbl,
+ iptr->sx.s23.s3.c.ref, disp);
if (opt_showdisassemble)
M_NOP;
M_EOR(d, d, d);
M_TST(s1, s1);
- M_BEQ(0);
- branch1 = cd->mcodeptr;
+ emit_label_beq(cd, BRANCH_LABEL_5);
}
- M_LDR_INTERN(REG_ITMP1, s1, OFFSET(java_objectheader, vftbl));
+ M_LDR_INTERN(REG_ITMP1, s1, OFFSET(java_object_t, vftbl));
M_DSEG_LOAD(REG_ITMP2, disp);
-#if defined(ENABLE_THREADS)
- codegen_threadcritstart(cd, cd->mcodeptr - cd->mcodebase);
-#endif
+
+ CODEGEN_CRITICAL_SECTION_START;
+
M_LDR_INTERN(REG_ITMP1, REG_ITMP1, OFFSET(vftbl_t, baseval));
M_LDR_INTERN(REG_ITMP3, REG_ITMP2, OFFSET(vftbl_t, baseval));
M_LDR_INTERN(REG_ITMP2, REG_ITMP2, OFFSET(vftbl_t, diffval));
-#if defined(ENABLE_THREADS)
- codegen_threadcritstop(cd, cd->mcodeptr - cd->mcodebase);
-#endif
+
+ CODEGEN_CRITICAL_SECTION_END;
+
M_SUB(REG_ITMP1, REG_ITMP1, REG_ITMP3);
M_CMP(REG_ITMP1, REG_ITMP2);
/* If d == REG_ITMP2, then it's destroyed */
if (d == REG_ITMP2)
M_EOR(d, d, d);
- M_MOVLS_IMM(d, 1);
- }
+ M_MOVLS_IMM(1, d);
- if (branch1) {
- gen_resolvebranch(branch1, branch1 - cd->mcodebase,
- cd->mcodeptr - cd->mcodebase);
+ if (super != NULL)
+ emit_label(cd, BRANCH_LABEL_5);
}
- if (branch3) {
- gen_resolvebranch(branch3, branch3 - cd->mcodebase,
- cd->mcodeptr - cd->mcodebase);
+ if (super == NULL) {
+ emit_label(cd, BRANCH_LABEL_1);
+ emit_label(cd, BRANCH_LABEL_4);
}
}
if (INSTRUCTION_IS_UNRESOLVED(iptr)) {
disp = dseg_add_unique_address(cd, NULL);
- codegen_addpatchref(cd, PATCHER_builtin_multianewarray,
+ patcher_add_patch_ref(jd, PATCHER_resolve_classref_to_classinfo,
iptr->sx.s23.s3.c.ref, disp);
if (opt_showdisassemble)
disp = dseg_add_functionptr(cd, BUILTIN_multianewarray);
M_DSEG_BRANCH(disp);
- /* recompute ip (pv) */
+ /* recompute pv */
s1 = (s4) (cd->mcodeptr - cd->mcodebase);
- M_RECOMPUTE_IP(s1);
+ M_RECOMPUTE_PV(s1);
/* check for exception before result assignment */
- M_TST(REG_RESULT, REG_RESULT);
- M_BEQ(0);
- codegen_add_fillinstacktrace_ref(cd);
+ emit_exception_check(cd, iptr);
/* get arrayref */
case ICMD_CHECKNULL: /* ..., objectref ==> ..., objectref */
s1 = emit_load_s1(jd, iptr, REG_ITMP1);
- M_TST(s1, s1);
- M_BEQ(0);
- codegen_add_nullpointerexception_ref(cd);
+ emit_nullpointer_check(cd, iptr, s1);
break;
default:
dseg_createlinenumbertable(cd);
- /* generate exception and patcher stubs */
+ /* generate traps */
- emit_exception_stubs(jd);
- emit_patcher_stubs(jd);
-
- codegen_finish(jd);
+ emit_patcher_traps(jd);
/* everything's ok */
}
-/* createcompilerstub **********************************************************
-
- creates a stub routine which calls the compiler
+/* codegen_emit_stub_compiler **************************************************
+ Emits a stub routine which calls the compiler.
+
*******************************************************************************/
-#define COMPILERSTUB_DATASIZE 3 * SIZEOF_VOID_P
-#define COMPILERSTUB_CODESIZE 2 * 4
-
-#define COMPILERSTUB_SIZE COMPILERSTUB_DATASIZE + COMPILERSTUB_CODESIZE
-
-
-u1 *createcompilerstub(methodinfo *m)
+void codegen_emit_stub_compiler(jitdata *jd)
{
- u1 *s; /* memory to hold the stub */
- ptrint *d;
+ methodinfo *m;
codegendata *cd;
- s4 dumpsize; /* code generation pointer */
-
- s = CNEW(u1, COMPILERSTUB_SIZE);
-
- /* set data pointer and code pointer */
- d = (ptrint *) s;
- s = s + COMPILERSTUB_DATASIZE;
-
- /* mark start of dump memory area */
-
- dumpsize = dump_size();
+ /* get required compiler data */
- cd = DNEW(codegendata);
- cd->mcodeptr = s;
-
- /* The codeinfo pointer is actually a pointer to the
- methodinfo. This fakes a codeinfo structure. */
-
- d[0] = (ptrint) asm_call_jit_compiler;
- d[1] = (ptrint) m;
- d[2] = (ptrint) &d[1]; /* fake code->m */
+ m = jd->m;
+ cd = jd->cd;
/* code for the stub */
M_LDR_INTERN(REG_ITMP1, REG_PC, -(2 * 4 + 2 * SIZEOF_VOID_P));
M_LDR_INTERN(REG_PC, REG_PC, -(3 * 4 + 3 * SIZEOF_VOID_P));
-
-#if defined(ENABLE_STATISTICS)
- if (opt_stat)
- count_cstub_len += COMPILERSTUB_SIZE * 4;
-#endif
-
- /* release dump area */
-
- dump_release(dumpsize);
-
- /* synchronize instruction and data cache */
-
- md_cacheflush(s, cd->mcodeptr - (u1 *) d);
-
- return s;
}
-/* createnativestub ************************************************************
+/* codegen_emit_stub_native ****************************************************
- Creates a stub routine which calls a native method.
+ Emits a stub routine which calls a native method.
*******************************************************************************/
-u1 *createnativestub(functionptr f, jitdata *jd, methoddesc *nmd)
+void codegen_emit_stub_native(jitdata *jd, methoddesc *nmd, functionptr f)
{
- methodinfo *m;
- codeinfo *code;
- codegendata *cd;
- registerdata *rd;
- s4 nativeparams;
- methoddesc *md;
- s4 i, j;
- s4 t;
- s4 disp, funcdisp, s1, s2;
+ methodinfo *m;
+ codeinfo *code;
+ codegendata *cd;
+ s4 nativeparams;
+ methoddesc *md;
+ s4 i, j;
+ s4 t;
+ s4 disp, funcdisp, s1, s2;
/* get required compiler data */
m = jd->m;
code = jd->code;
cd = jd->cd;
- rd = jd->rd;
/* initialize variables */
/* calculate stackframe size */
- cd->stackframesize =
- 1 + /* return address */
- sizeof(stackframeinfo) / SIZEOF_VOID_P + /* stackframeinfo */
- sizeof(localref_table) / SIZEOF_VOID_P + /* localref_table */
- nmd->memuse; /* stack arguments */
+ cd->stackframesize =
+ 4 + /* return address */
+ sizeof(stackframeinfo) + /* stackframeinfo */
+ sizeof(localref_table) + /* localref_table */
+ nmd->memuse * 4; /* stack arguments */
+
+ /* align stack to 8-byte */
+
+ cd->stackframesize = (cd->stackframesize + 4) & ~4;
/* create method header */
(void) dseg_add_unique_address(cd, code); /* CodeinfoPointer */
- (void) dseg_add_unique_s4(cd, cd->stackframesize * 4); /* FrameSize */
+ (void) dseg_add_unique_s4(cd, cd->stackframesize); /* 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); /* ExTableSize */
/* generate stub code */
- /* TODO: don't forget ... there is a M_ADD_IMM at the end of this stub!!! */
+
M_STMFD(1<<REG_LR, REG_SP);
- if (cd->stackframesize - 1) {
- M_SUB_IMM_EXT_MUL4(REG_SP, REG_SP, cd->stackframesize - 1);
- }
+ M_SUB_IMM_EXT_MUL4(REG_SP, REG_SP, cd->stackframesize / 4 - 1);
#if !defined(NDEBUG)
if (JITDATA_HAS_FLAG_VERBOSECALL(jd))
#if !defined(WITH_STATIC_CLASSPATH)
if (f == NULL) {
- codegen_addpatchref(cd, PATCHER_resolve_native, m, funcdisp);
+ patcher_add_patch_ref(jd, PATCHER_resolve_native_function, m, funcdisp);
if (opt_showdisassemble)
M_NOP;
}
#endif
- /* save integer and float argument registers */
- M_STMFD(BITMASK_ARGS | (1<<REG_IP), REG_SP);
+ /* Save integer and float argument registers (these are 4
+ registers, stack is 8-byte aligned). */
+
+ M_STMFD(BITMASK_ARGS, REG_SP);
/* TODO: floating point */
/* create native stackframe info */
- assert(IS_IMM(20 + cd->stackframesize * 4));
- M_ADD_IMM(REG_A0, REG_SP, 20 + cd->stackframesize * 4 - SIZEOF_VOID_P);
- M_MOV(REG_A1, REG_IP);
- M_ADD_IMM(REG_A2, REG_SP, 20 + cd->stackframesize * 4);
- M_LDR_INTERN(REG_A3, REG_SP, 20 + cd->stackframesize * 4 - SIZEOF_VOID_P);
+
+ assert(IS_IMM(4*4 + cd->stackframesize));
+ M_ADD_IMM(REG_A0, REG_SP, 4*4 + cd->stackframesize - SIZEOF_VOID_P);
+ M_MOV(REG_A1, REG_PV);
+ M_ADD_IMM(REG_A2, REG_SP, 4*4 + cd->stackframesize);
+ M_LDR_INTERN(REG_A3, REG_SP, 4*4 + cd->stackframesize - SIZEOF_VOID_P);
disp = dseg_add_functionptr(cd, codegen_start_native_call);
M_DSEG_BRANCH(disp);
- /* recompute ip */
- /*s1 = (s4) (cd->mcodeptr - cd->mcodebase);
- M_RECOMPUTE_IP(s1);*/
+ /* recompute pv */
+
+ s1 = (s4) (cd->mcodeptr - cd->mcodebase);
+ M_RECOMPUTE_PV(s1);
+
+ /* Restore integer and float argument registers (these are 4
+ registers, stack is 8-byte aligned). */
- /* restore integer and float argument registers */
- M_LDMFD(BITMASK_ARGS | (1<<REG_IP), REG_SP);
+ M_LDMFD(BITMASK_ARGS, REG_SP);
/* TODO: floating point */
/* copy or spill arguments to new locations */
t = md->paramtypes[i].type;
if (!md->params[i].inmemory) {
- s1 = ARGUMENT_REGS(t, md->params[i].regoff);
+ s1 = md->params[i].regoff;
+ s2 = nmd->params[j].regoff;
if (!nmd->params[j].inmemory) {
- s2 = ARGUMENT_REGS(t, nmd->params[j].regoff);
- SPLIT_OPEN(t, s1, REG_ITMP1);
- SPLIT_LOAD(t, s1, cd->stackframesize);
+#if !defined(__ARM_EABI__)
SPLIT_OPEN(t, s2, REG_ITMP1);
+#endif
if (IS_2_WORD_TYPE(t))
M_LNGMOVE(s1, s2);
else
M_INTMOVE(s1, s2);
+#if !defined(__ARM_EABI__)
SPLIT_STORE_AND_CLOSE(t, s2, 0);
+#endif
}
else {
- s2 = nmd->params[j].regoff;
- SPLIT_OPEN(t, s1, REG_ITMP1);
- SPLIT_LOAD(t, s1, cd->stackframesize);
-
if (IS_2_WORD_TYPE(t))
- M_LST(s1, REG_SP, s2 * 4);
+ M_LST(s1, REG_SP, s2);
else
- M_IST(s1, REG_SP, s2 * 4);
- /* no SPLIT_CLOSE here because argument is fully on stack now */
+ M_IST(s1, REG_SP, s2);
}
}
else {
s2 = nmd->params[j].regoff;
if (IS_2_WORD_TYPE(t)) {
- M_LLD(REG_ITMP12_PACKED, REG_SP, s1 * 4);
- M_LST(REG_ITMP12_PACKED, REG_SP, s2 * 4);
+ M_LLD(REG_ITMP12_PACKED, REG_SP, s1);
+ M_LST(REG_ITMP12_PACKED, REG_SP, s2);
}
else {
- M_ILD(REG_ITMP1, REG_SP, s1 * 4);
- M_IST(REG_ITMP1, REG_SP, s2 * 4);
+ M_ILD(REG_ITMP1, REG_SP, s1);
+ M_IST(REG_ITMP1, REG_SP, s2);
}
}
}
/* put class into second argument register */
+
if (m->flags & ACC_STATIC) {
disp = dseg_add_address(cd, m->class);
M_DSEG_LOAD(REG_A1, disp);
}
/* put env into first argument register */
+
disp = dseg_add_address(cd, _Jv_env);
M_DSEG_LOAD(REG_A0, disp);
/* do the native function call */
- M_DSEG_BRANCH(funcdisp); /* call native method */
- /* recompute ip from pc */
+ M_DSEG_BRANCH(funcdisp);
+
+ /* recompute pv */
/* TODO: this is only needed because of the tracer ... do we
really need it? */
+
s1 = (s4) (cd->mcodeptr - cd->mcodebase);
- M_RECOMPUTE_IP(s1);
+ M_RECOMPUTE_PV(s1);
#if !defined(__SOFTFP__)
/* TODO: this is only a hack, since we use R0/R1 for float return! */
/* remove native stackframe info */
/* TODO: improve this store/load */
- M_STMFD(BITMASK_RESULT | (1<<REG_IP), REG_SP);
- M_ADD_IMM(REG_A0, REG_SP, 12 + cd->stackframesize * 4 - SIZEOF_VOID_P);
+ M_STMFD(BITMASK_RESULT, REG_SP);
+
+ M_ADD_IMM(REG_A0, REG_SP, 2*4 + cd->stackframesize - SIZEOF_VOID_P);
disp = dseg_add_functionptr(cd, codegen_finish_native_call);
M_DSEG_BRANCH(disp);
+ s1 = (s4) (cd->mcodeptr - cd->mcodebase);
+ M_RECOMPUTE_PV(s1);
+
M_MOV(REG_ITMP1_XPTR, REG_RESULT);
- M_LDMFD(BITMASK_RESULT | (1<<REG_IP), REG_SP);
+ M_LDMFD(BITMASK_RESULT, REG_SP);
/* finish stub code, but do not yet return to caller */
- if (cd->stackframesize - 1)
- M_ADD_IMM_EXT_MUL4(REG_SP, REG_SP, cd->stackframesize - 1);
-
+ M_ADD_IMM_EXT_MUL4(REG_SP, REG_SP, cd->stackframesize / 4 - 1);
M_LDMFD(1<<REG_LR, REG_SP);
/* check for exception */
M_TST(REG_ITMP1_XPTR, REG_ITMP1_XPTR);
- M_MOVEQ(REG_PC, REG_LR); /* if no exception, return to caller */
+ M_MOVEQ(REG_LR, REG_PC); /* if no exception, return to caller */
/* handle exception here */
/* generate patcher stubs */
- emit_patcher_stubs(jd);
-
- codegen_finish(jd);
-
- return code->entrypoint;
+ emit_patcher_traps(jd);
}
{
printf("===> i am going to exit after this debugging message!\n");
printf("got asm_debug(%p, %p, %p, %p)\n",(void*)a1,(void*)a2,(void*)a3,(void*)a4);
- throw_cacao_exception_exit(string_java_lang_InternalError, "leave you now");
+ vm_abort("leave you now");
}
projects / cacao.git / blobdiff