/* src/vm/jit/powerpc/codegen.c - machine code generator for 32-bit PowerPC
- Copyright (C) 1996-2005, 2006 R. Grafl, A. Krall, C. Kruegel,
+ Copyright (C) 1996-2005, 2006, 2007 R. Grafl, A. Krall, C. Kruegel,
C. Oates, R. Obermaisser, M. Platter, M. Probst, S. Ring,
E. Steiner, C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich,
J. Wenninger, Institut f. Computersprachen - TU Wien
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA.
- Contact: cacao@cacaojvm.org
-
- Authors: Andreas Krall
- Stefan Ring
-
- Changes: Christian Thalinger
- Christian Ullrich
- Edwin Steiner
-
- $Id: codegen.c 5331 2006-09-05 19:06:22Z edwin $
+ $Id: codegen.c 7564 2007-03-23 23:36:17Z twisti $
*/
#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/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/emit-common.h"
#include "vm/jit/jit.h"
+#include "vm/jit/md.h"
#include "vm/jit/methodheader.h"
#include "vm/jit/parse.h"
#include "vm/jit/patcher.h"
#include "vm/jit/reg.h"
#include "vm/jit/replace.h"
+#include "vm/jit/stacktrace.h"
#if defined(ENABLE_LSRA)
# include "vm/jit/allocator/lsra.h"
#endif
+#include "vmcore/loader.h"
+#include "vmcore/options.h"
+
/* codegen *********************************************************************
*******************************************************************************/
-bool codegen(jitdata *jd)
+bool codegen_emit(jitdata *jd)
{
methodinfo *m;
codeinfo *code;
registerdata *rd;
s4 len, s1, s2, s3, d, disp;
ptrint a;
- stackptr src;
varinfo *var;
basicblock *bptr;
instruction *iptr;
- exceptiontable *ex;
+ exception_entry *ex;
u2 currentline;
methodinfo *lm; /* local methodinfo for ICMD_INVOKE* */
+ unresolved_method *um;
builtintable_entry *bte;
methoddesc *md;
- rplpoint *replacementpoint;
+ fieldinfo *fi;
+ unresolved_field *uf;
+ s4 fieldtype;
+ s4 varindex;
/* get required compiler data */
/* prevent compiler warnings */
- d = 0;
- lm = NULL;
- bte = NULL;
+ d = 0;
+ fieldtype = 0;
+ lm = NULL;
+ um = NULL;
+ uf = NULL;
+ bte = NULL;
{
s4 i, p, t, l;
dseg_addlinenumbertablesize(cd);
- (void) dseg_add_unique_s4(cd, cd->exceptiontablelength); /* ExTableSize */
+ (void) dseg_add_unique_s4(cd, jd->exceptiontablelength); /* ExTableSize */
/* create exception table */
- for (ex = cd->exceptiontable; ex != NULL; ex = ex->down) {
+ for (ex = jd->exceptiontable; ex != NULL; ex = ex->down) {
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);
+ (void) dseg_add_unique_address(cd, ex->catchtype.any);
}
-
+
+#if defined(ENABLE_PROFILING)
/* generate method profiling code */
if (JITDATA_HAS_FLAG_INSTRUMENT(jd)) {
/* PROFILE_CYCLE_START; */
}
+#endif
/* create stack frame (if necessary) */
for (p = 0, l = 0; p < md->paramcount; p++) {
t = md->paramtypes[p].type;
- var = &(rd->locals[l][t]);
+ varindex = jd->local_map[l * 5 + t];
+
l++;
if (IS_2_WORD_TYPE(t)) /* increment local counter for 2 word types */
l++;
- if (var->type < 0)
- continue;
+
+ if (varindex == UNUSED)
+ continue;
+
+ var = VAR(varindex);
+
s1 = md->params[p].regoff;
if (IS_INT_LNG_TYPE(t)) { /* integer args */
if (IS_2_WORD_TYPE(t))
else
s2 = rd->argintregs[s1];
if (!md->params[p].inmemory) { /* register arguments */
- if (!(var->flags & INMEMORY)) { /* reg arg -> register */
+ if (!IS_INMEMORY(var->flags)) { /* reg arg -> register */
if (IS_2_WORD_TYPE(t))
- M_LNGMOVE(s2, var->regoff);
+ M_LNGMOVE(s2, var->vv.regoff);
else
- M_INTMOVE(s2, var->regoff);
+ M_INTMOVE(s2, var->vv.regoff);
} else { /* reg arg -> spilled */
if (IS_2_WORD_TYPE(t))
- M_LST(s2, REG_SP, var->regoff * 4);
+ M_LST(s2, REG_SP, var->vv.regoff * 4);
else
- M_IST(s2, REG_SP, var->regoff * 4);
+ M_IST(s2, REG_SP, var->vv.regoff * 4);
}
} else { /* stack arguments */
- if (!(var->flags & INMEMORY)) { /* stack arg -> register */
+ if (!IS_INMEMORY(var->flags)) { /* stack arg -> register */
if (IS_2_WORD_TYPE(t))
- M_LLD(var->regoff, REG_SP, (cd->stackframesize + s1) * 4);
+ M_LLD(var->vv.regoff, REG_SP, (cd->stackframesize + s1) * 4);
else
- M_ILD(var->regoff, REG_SP, (cd->stackframesize + s1) * 4);
+ M_ILD(var->vv.regoff, REG_SP, (cd->stackframesize + s1) * 4);
} else { /* stack arg -> spilled */
#if 1
M_ILD(REG_ITMP1, REG_SP, (cd->stackframesize + s1) * 4);
- M_IST(REG_ITMP1, REG_SP, var->regoff * 4);
+ M_IST(REG_ITMP1, REG_SP, var->vv.regoff * 4);
if (IS_2_WORD_TYPE(t)) {
M_ILD(REG_ITMP1, REG_SP, (cd->stackframesize + s1) * 4 +4);
- M_IST(REG_ITMP1, REG_SP, var->regoff * 4 + 4);
+ M_IST(REG_ITMP1, REG_SP, var->vv.regoff * 4 + 4);
}
#else
/* Reuse Memory Position on Caller Stack */
- var->regoff = cd->stackframesize + s1;
+ var->vv.regoff = cd->stackframesize + s1;
#endif
}
}
} else { /* floating args */
if (!md->params[p].inmemory) { /* register arguments */
s2 = rd->argfltregs[s1];
- if (!(var->flags & INMEMORY)) { /* reg arg -> register */
- M_FLTMOVE(s2, var->regoff);
+ if (!IS_INMEMORY(var->flags)) { /* reg arg -> register */
+ M_FLTMOVE(s2, var->vv.regoff);
} else { /* reg arg -> spilled */
if (IS_2_WORD_TYPE(t))
- M_DST(s2, REG_SP, var->regoff * 4);
+ M_DST(s2, REG_SP, var->vv.regoff * 4);
else
- M_FST(s2, REG_SP, var->regoff * 4);
+ M_FST(s2, REG_SP, var->vv.regoff * 4);
}
} else { /* stack arguments */
- if (!(var->flags & INMEMORY)) { /* stack-arg -> register */
+ if (!IS_INMEMORY(var->flags)) { /* stack-arg -> register */
if (IS_2_WORD_TYPE(t))
- M_DLD(var->regoff, REG_SP, (cd->stackframesize + s1) * 4);
+ M_DLD(var->vv.regoff, REG_SP, (cd->stackframesize + s1) * 4);
else
- M_FLD(var->regoff, REG_SP, (cd->stackframesize + s1) * 4);
+ M_FLD(var->vv.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, (cd->stackframesize + s1) * 4);
- M_DST(REG_FTMP1, REG_SP, var->regoff * 4);
- var->regoff = cd->stackframesize + s1;
+ M_DST(REG_FTMP1, REG_SP, var->vv.regoff * 4);
+ var->vv.regoff = cd->stackframesize + s1;
} else {
M_FLD(REG_FTMP1, REG_SP, (cd->stackframesize + s1) * 4);
- M_FST(REG_FTMP1, REG_SP, var->regoff * 4);
+ M_FST(REG_FTMP1, REG_SP, var->vv.regoff * 4);
}
#else
/* Reuse Memory Position on Caller Stack */
- var->regoff = cd->stackframesize + s1;
+ var->vv.regoff = cd->stackframesize + s1;
#endif
}
}
if (m->flags & ACC_STATIC) {
p = dseg_add_address(cd, &m->class->object.header);
- M_ALD(rd->argintregs[0], REG_PV, p);
+ M_ALD(REG_A0, REG_PV, p);
}
else {
- M_TST(rd->argintregs[0]);
- M_BEQ(0);
- codegen_add_nullpointerexception_ref(cd);
+ M_TST(REG_A0);
+ M_BNE(1);
+ M_ALD_INTERN(REG_ZERO, REG_ZERO, EXCEPTION_HARDWARE_NULLPOINTER);
}
- M_AST(rd->argintregs[0], REG_SP, s1 * 4);
+ M_AST(REG_A0, REG_SP, s1 * 4);
M_JSR;
# if !defined(NDEBUG)
/* call trace function */
- if (JITDATA_HAS_FLAG_VERBOSECALL(jd))
- emit_verbosecall_enter(jd);
+ emit_verbosecall_enter(jd);
}
/* end of header generation */
- replacementpoint = code->rplpoints;
+ /* create replacement points */
+
+ REPLACEMENT_POINTS_INIT(cd, jd);
/* walk through all basic blocks */
- for (bptr = m->basicblocks; bptr != NULL; bptr = bptr->next) {
+ for (bptr = jd->basicblocks; bptr != NULL; bptr = bptr->next) {
bptr->mpc = (s4) (cd->mcodeptr - cd->mcodebase);
if (bptr->flags >= BBREACHED) {
-
/* branch resolving */
- {
- branchref *brefs;
- for (brefs = bptr->branchrefs; brefs != NULL; brefs = brefs->next) {
- gen_resolvebranch((u1*) cd->mcodebase + brefs->branchpos,
- brefs->branchpos,
- bptr->mpc);
- }
- }
+ codegen_resolve_branchrefs(cd, bptr);
/* handle replacement points */
- if (bptr->bitflags & BBFLAG_REPLACEMENT) {
- replacementpoint->pc = (u1*)(ptrint)bptr->mpc; /* will be resolved later */
-
- replacementpoint++;
- }
+ REPLACEMENT_POINT_BLOCK_START(cd, bptr);
+#if defined(ENABLE_PROFILING)
/* generate basicblock profiling code */
if (JITDATA_HAS_FLAG_INSTRUMENT(jd)) {
/* if (bptr->type == BBTYPE_EXH) */
/* PROFILE_CYCLE_START; */
}
+#endif
/* copy interface registers to their destination */
- src = bptr->instack;
len = bptr->indepth;
MCODECHECK(64+len);
if (opt_lsra) {
while (src != NULL) {
len--;
- if ((len == 0) && (bptr->type != BBTYPE_STD)) {
+ if ((len == bptr->indepth-1) && (bptr->type == BBTYPE_EXH)) {
/* d = reg_of_var(m, src, REG_ITMP1); */
- if (!(src->flags & INMEMORY))
- d = src->regoff;
+ if (!IS_INMEMORY(src->flags))
+ d = src->vv.regoff;
else
d = REG_ITMP1;
M_INTMOVE(REG_ITMP1, d);
}
} else {
#endif
- while (src != NULL) {
+ while (len > 0) {
len--;
- if ((len == 0) && (bptr->type != BBTYPE_STD)) {
- d = codegen_reg_of_var(rd, 0, src, REG_ITMP1);
+ var = VAR(bptr->invars[len]);
+ if ((len == bptr->indepth-1) && (bptr->type == BBTYPE_EXH)) {
+ d = codegen_reg_of_var(0, var, REG_ITMP1);
M_INTMOVE(REG_ITMP1, d);
- emit_store(jd, NULL, src, d);
+ emit_store(jd, NULL, var, d);
}
else {
- if (src->type == TYPE_LNG)
- 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)) {
- s2 = src->type;
- if (IS_FLT_DBL_TYPE(s2)) {
- if (!(rd->interfaces[len][s2].flags & INMEMORY)) {
- s1 = rd->interfaces[len][s2].regoff;
- M_FLTMOVE(s1, d);
- }
- else {
- if (IS_2_WORD_TYPE(s2)) {
- M_DLD(d, REG_SP,
- rd->interfaces[len][s2].regoff * 4);
- }
- else {
- M_FLD(d, REG_SP,
- rd->interfaces[len][s2].regoff * 4);
- }
- }
- emit_store(jd, NULL, src, d);
- }
- else {
- if (!(rd->interfaces[len][s2].flags & INMEMORY)) {
- s1 = rd->interfaces[len][s2].regoff;
- 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);
- else
- M_ILD(d, REG_SP,
- rd->interfaces[len][s2].regoff * 4);
- }
- emit_store(jd, NULL, src, d);
- }
- }
+ assert((var->flags & INOUT));
}
- src = src->prev;
}
#if defined(ENABLE_LSRA)
#endif
/* walk through all instructions */
- src = bptr->instack;
len = bptr->icount;
currentline = 0;
- for (iptr = bptr->iinstr; len > 0; src = iptr->dst, len--, iptr++) {
+ for (iptr = bptr->iinstr; len > 0; len--, iptr++) {
if (iptr->line != currentline) {
dseg_addlinenumber(cd, iptr->line);
currentline = iptr->line;
MCODECHECK(64); /* an instruction usually needs < 64 words */
- switch (iptr->opc) {
- case ICMD_NOP: /* ... ==> ... */
- case ICMD_INLINE_START:
- case ICMD_INLINE_END:
- break;
+ switch (iptr->opc) {
+ case ICMD_NOP: /* ... ==> ... */
+ case ICMD_POP: /* ..., value ==> ... */
+ case ICMD_POP2: /* ..., value, value ==> ... */
+ break;
+
+ case ICMD_INLINE_START:
+
+ REPLACEMENT_POINT_INLINE_START(cd, iptr);
+ break;
+
+ case ICMD_INLINE_BODY:
+
+ REPLACEMENT_POINT_INLINE_BODY(cd, iptr);
+ dseg_addlinenumber_inline_start(cd, iptr);
+ dseg_addlinenumber(cd, iptr->line);
+ break;
+
+ case ICMD_INLINE_END:
+
+ dseg_addlinenumber_inline_end(cd, iptr);
+ dseg_addlinenumber(cd, iptr->line);
+ break;
case ICMD_CHECKNULL: /* ..., objectref ==> ..., objectref */
s1 = emit_load_s1(jd, iptr, REG_ITMP1);
- M_TST(s1);
- M_BEQ(0);
- codegen_add_nullpointerexception_ref(cd);
+ emit_nullpointer_check(cd, iptr, s1);
break;
/* constant operations ************************************************/
codegen_addpatchref(cd, PATCHER_resolve_classref_to_classinfo,
cr, disp);
-
- if (opt_showdisassemble)
- M_NOP;
}
else
disp = dseg_add_address(cd, iptr->sx.val.anyptr);
break;
- /* load/store operations **********************************************/
+ /* load/store/copy/move operations ************************************/
case ICMD_ILOAD: /* ... ==> ..., content of local variable */
- case ICMD_ALOAD: /* op1 = local variable */
-
- var = &(rd->locals[iptr->s1.localindex][iptr->opc - ICMD_ILOAD]);
- d = codegen_reg_of_dst(jd, iptr, REG_ITMP1);
- if ((iptr->dst.var->varkind == LOCALVAR) &&
- (iptr->dst.var->varnum == iptr->s1.localindex))
- break;
- if (var->flags & INMEMORY)
- M_ILD(d, REG_SP, var->regoff * 4);
- else
- M_INTMOVE(var->regoff, d);
- emit_store_dst(jd, iptr, d);
- break;
-
- case ICMD_LLOAD: /* ... ==> ..., content of local variable */
- /* s1.localindex = local variable */
-
- var = &(rd->locals[iptr->s1.localindex][iptr->opc - ICMD_ILOAD]);
- d = codegen_reg_of_dst(jd, iptr, REG_ITMP12_PACKED);
- if ((iptr->dst.var->varkind == LOCALVAR) &&
- (iptr->dst.var->varnum == iptr->s1.localindex))
- break;
- if (var->flags & INMEMORY)
- M_LLD(d, REG_SP, var->regoff * 4);
- else
- M_LNGMOVE(var->regoff, d);
- emit_store_dst(jd, iptr, d);
- break;
-
- case ICMD_FLOAD: /* ... ==> ..., content of local variable */
- /* s1.localindex = local variable */
-
- d = codegen_reg_of_dst(jd, iptr, REG_FTMP1);
- if ((iptr->dst.var->varkind == LOCALVAR) &&
- (iptr->dst.var->varnum == iptr->s1.localindex))
- break;
- var = &(rd->locals[iptr->s1.localindex][iptr->opc - ICMD_ILOAD]);
- if (var->flags & INMEMORY)
- M_FLD(d, REG_SP, var->regoff * 4);
- else
- M_FLTMOVE(var->regoff, d);
- emit_store_dst(jd, iptr, d);
- break;
-
- case ICMD_DLOAD: /* ... ==> ..., content of local variable */
- /* s1.localindex = local variable */
-
- d = codegen_reg_of_dst(jd, iptr, REG_FTMP1);
- if ((iptr->dst.var->varkind == LOCALVAR) &&
- (iptr->dst.var->varnum == iptr->s1.localindex))
- break;
- var = &(rd->locals[iptr->s1.localindex][iptr->opc - ICMD_ILOAD]);
- if (var->flags & INMEMORY)
- M_DLD(d, REG_SP, var->regoff * 4);
- else
- M_FLTMOVE(var->regoff, d);
- emit_store_dst(jd, iptr, d);
- break;
-
-
+ case ICMD_ALOAD: /* s1 = local variable */
+ case ICMD_LLOAD:
+ case ICMD_FLOAD:
+ case ICMD_DLOAD:
case ICMD_ISTORE: /* ..., value ==> ... */
- case ICMD_ASTORE: /* op1 = local variable */
-
- if ((iptr->s1.var->varkind == LOCALVAR) && (iptr->s1.var->varnum == iptr->dst.localindex))
- break;
- var = &(rd->locals[iptr->dst.localindex][iptr->opc - ICMD_ISTORE]);
- if (var->flags & INMEMORY) {
- s1 = emit_load_s1(jd, iptr, REG_ITMP1);
- M_IST(s1, REG_SP, var->regoff * 4);
- } else {
- s1 = emit_load_s1(jd, iptr, var->regoff);
- M_INTMOVE(s1, var->regoff);
- }
- break;
-
- case ICMD_LSTORE: /* ..., value ==> ... */
- /* dst.localindex = local variable */
-
- if ((iptr->s1.var->varkind == LOCALVAR) && (iptr->s1.var->varnum == iptr->dst.localindex))
- break;
- var = &(rd->locals[iptr->dst.localindex][iptr->opc - ICMD_ISTORE]);
- if (var->flags & INMEMORY) {
- s1 = emit_load_s1(jd, iptr, REG_ITMP12_PACKED);
- M_LST(s1, REG_SP, var->regoff * 4);
- } else {
- s1 = emit_load_s1(jd, iptr, var->regoff);
- M_LNGMOVE(s1, var->regoff);
- }
- break;
-
- case ICMD_FSTORE: /* ..., value ==> ... */
- /* dst.localindex = local variable */
-
- if ((iptr->s1.var->varkind == LOCALVAR) && (iptr->s1.var->varnum == iptr->dst.localindex))
- break;
- var = &(rd->locals[iptr->dst.localindex][iptr->opc - ICMD_ISTORE]);
- if (var->flags & INMEMORY) {
- s1 = emit_load_s1(jd, iptr, REG_FTMP1);
- M_FST(s1, REG_SP, var->regoff * 4);
- } else {
- s1 = emit_load_s1(jd, iptr, var->regoff);
- M_FLTMOVE(s1, var->regoff);
- }
- break;
-
- case ICMD_DSTORE: /* ..., value ==> ... */
- /* dst.localindex = local variable */
-
- if ((iptr->s1.var->varkind == LOCALVAR) && (iptr->s1.var->varnum == iptr->dst.localindex))
- break;
- var = &(rd->locals[iptr->dst.localindex][iptr->opc - ICMD_ISTORE]);
- if (var->flags & INMEMORY) {
- s1 = emit_load_s1(jd, iptr, REG_FTMP1);
- M_DST(s1, REG_SP, var->regoff * 4);
- } else {
- s1 = emit_load_s1(jd, iptr, var->regoff);
- M_FLTMOVE(s1, var->regoff);
- }
- break;
-
-
- /* pop/dup/swap operations ********************************************/
-
- /* attention: double and longs are only one entry in CACAO ICMDs */
-
- case ICMD_POP: /* ..., value ==> ... */
- case ICMD_POP2: /* ..., value, value ==> ... */
- break;
-
- case ICMD_DUP: /* ..., a ==> ..., a, a */
- M_COPY(src, iptr->dst);
- break;
-
- case ICMD_DUP_X1: /* ..., a, b ==> ..., b, a, b */
-
- M_COPY(src, iptr->dst);
- M_COPY(src->prev, iptr->dst->prev);
- M_COPY(iptr->dst, iptr->dst->prev->prev);
- break;
-
- case ICMD_DUP_X2: /* ..., a, b, c ==> ..., c, a, b, c */
-
- M_COPY(src, iptr->dst);
- M_COPY(src->prev, iptr->dst->prev);
- M_COPY(src->prev->prev, iptr->dst->prev->prev);
- M_COPY(iptr->dst, iptr->dst->prev->prev->prev);
- break;
-
- case ICMD_DUP2: /* ..., a, b ==> ..., a, b, a, b */
-
- M_COPY(src, iptr->dst);
- M_COPY(src->prev, iptr->dst->prev);
- break;
-
- case ICMD_DUP2_X1: /* ..., a, b, c ==> ..., b, c, a, b, c */
-
- M_COPY(src, iptr->dst);
- M_COPY(src->prev, iptr->dst->prev);
- M_COPY(src->prev->prev, iptr->dst->prev->prev);
- M_COPY(iptr->dst, iptr->dst->prev->prev->prev);
- M_COPY(iptr->dst->prev, iptr->dst->prev->prev->prev->prev);
- break;
-
- case ICMD_DUP2_X2: /* ..., a, b, c, d ==> ..., c, d, a, b, c, d */
-
- M_COPY(src, iptr->dst);
- M_COPY(src->prev, iptr->dst->prev);
- M_COPY(src->prev->prev, iptr->dst->prev->prev);
- M_COPY(src->prev->prev->prev, iptr->dst->prev->prev->prev);
- M_COPY(iptr->dst, iptr->dst->prev->prev->prev->prev);
- M_COPY(iptr->dst->prev, iptr->dst->prev->prev->prev->prev->prev);
+ case ICMD_LSTORE:
+ case ICMD_FSTORE:
+ case ICMD_DSTORE:
+ case ICMD_COPY:
+ case ICMD_MOVE:
+
+ emit_copy(jd, iptr, VAROP(iptr->s1), VAROP(iptr->dst));
break;
+
+ case ICMD_ASTORE:
- case ICMD_SWAP: /* ..., a, b ==> ..., b, a */
-
- M_COPY(src, iptr->dst->prev);
- M_COPY(src->prev, iptr->dst);
+ if (!(iptr->flags.bits & INS_FLAG_RETADDR))
+ emit_copy(jd, iptr, VAROP(iptr->s1), VAROP(iptr->dst));
break;
emit_store_dst(jd, iptr, d);
break;
- case ICMD_IADDCONST: /* ..., value ==> ..., value + constant */
- /* sx.val.i = constant */
+ /* s1.localindex = variable, sx.val.i = constant*/
+
+ case ICMD_IINC:
+ case ICMD_IADDCONST:
s1 = emit_load_s1(jd, iptr, REG_ITMP1);
- d = codegen_reg_of_dst(jd, iptr, REG_ITMP2);
+ d = codegen_reg_of_dst(jd, iptr, REG_ITMP1);
if ((iptr->sx.val.i >= -32768) && (iptr->sx.val.i <= 32767)) {
M_IADD_IMM(s1, iptr->sx.val.i, d);
} else {
ICONST(REG_ITMP2, iptr->sx.val.i);
M_IADD(s1, REG_ITMP2, d);
}
+ /* XXX the old code for ICMD_IINC was as follows:
+ {
+ u4 m = iptr->sx.val.i;
+ if (m & 0x8000)
+ m += 65536;
+ if (m & 0xffff0000)
+ M_ADDIS(s1, m >> 16, d);
+ if (m & 0xffff)
+ M_IADD_IMM(s1, m & 0xffff, d);
+ }
+ */
emit_store_dst(jd, iptr, d);
break;
d = codegen_reg_of_dst(jd, iptr, REG_ITMP12_PACKED);
M_ADDC(s1, s2, GET_LOW_REG(d));
s1 = emit_load_s1_high(jd, iptr, REG_ITMP1);
- s2 = emit_load_s2_high(jd, iptr, REG_ITMP3); /* don't use REG_ITMP2 */
+ s2 = emit_load_s2_high(jd, iptr, REG_ITMP3);/* don't use REG_ITMP2*/
M_ADDE(s1, s2, GET_HIGH_REG(d));
emit_store_dst(jd, iptr, d);
break;
case ICMD_LADDCONST: /* ..., value ==> ..., value + constant */
- /* sx.val.l = constant */
+ /* sx.val.l = constant */
s3 = iptr->sx.val.l & 0xffffffff;
s1 = emit_load_s1_low(jd, iptr, REG_ITMP1);
d = codegen_reg_of_dst(jd, iptr, REG_ITMP12_PACKED);
- if ((s3 >= -32768) && (s3 <= 32767)) {
+ if ((s3 >= -32768) && (s3 <= 32767))
M_ADDIC(s1, s3, GET_LOW_REG(d));
- } else {
+ else {
ICONST(REG_ITMP2, s3);
M_ADDC(s1, REG_ITMP2, GET_LOW_REG(d));
}
s1 = emit_load_s1_high(jd, iptr, REG_ITMP1);
s3 = iptr->sx.val.l >> 32;
- if (s3 == -1) {
+ if (s3 == -1)
M_ADDME(s1, GET_HIGH_REG(d));
- } else if (s3 == 0) {
+ else if (s3 == 0)
M_ADDZE(s1, GET_HIGH_REG(d));
- } else {
+ else {
ICONST(REG_ITMP3, s3); /* don't use REG_ITMP2 */
M_ADDE(s1, REG_ITMP3, GET_HIGH_REG(d));
}
break;
case ICMD_ISUBCONST: /* ..., value ==> ..., value + constant */
- /* sx.val.i = constant */
+ /* sx.val.i = constant */
s1 = emit_load_s1(jd, iptr, REG_ITMP1);
d = codegen_reg_of_dst(jd, iptr, REG_ITMP2);
- if ((iptr->sx.val.i >= -32767) && (iptr->sx.val.i <= 32768)) {
+ if ((iptr->sx.val.i >= -32767) && (iptr->sx.val.i <= 32768))
M_IADD_IMM(s1, -iptr->sx.val.i, d);
- } else {
- ICONST(REG_ITMP2, -iptr->sx.val.i);
- M_IADD(s1, REG_ITMP2, d);
+ else {
+ ICONST(REG_ITMP2, iptr->sx.val.i);
+ M_ISUB(s1, REG_ITMP2, d);
}
emit_store_dst(jd, iptr, d);
break;
d = codegen_reg_of_dst(jd, iptr, REG_ITMP12_PACKED);
M_SUBC(s1, s2, GET_LOW_REG(d));
s1 = emit_load_s1_high(jd, iptr, REG_ITMP1);
- s2 = emit_load_s2_high(jd, iptr, REG_ITMP3); /* don't use REG_ITMP2 */
+ s2 = emit_load_s2_high(jd, iptr, REG_ITMP3);/* don't use REG_ITMP2*/
M_SUBE(s1, s2, GET_HIGH_REG(d));
emit_store_dst(jd, iptr, d);
break;
case ICMD_LSUBCONST: /* ..., value ==> ..., value - constant */
- /* sx.val.l = constant */
+ /* sx.val.l = constant */
s3 = (-iptr->sx.val.l) & 0xffffffff;
s1 = emit_load_s1_low(jd, iptr, REG_ITMP1);
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_TST(s2);
- M_BEQ(0);
- codegen_add_arithmeticexception_ref(cd);
+ emit_arithmetic_check(cd, iptr, s2);
M_LDAH(REG_ITMP3, REG_ZERO, 0x8000);
M_CMP(REG_ITMP3, s1);
M_BNE(3 + (s1 != 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_ITMP2);
- M_TST(s2);
- M_BEQ(0);
- codegen_add_arithmeticexception_ref(cd);
+ emit_arithmetic_check(cd, iptr, s2);
M_LDAH(REG_ITMP3, REG_ZERO, 0x8000);
M_CMP(REG_ITMP3, s1);
M_BNE(4);
case ICMD_LDIV: /* ..., val1, val2 ==> ..., val1 / val2 */
case ICMD_LREM: /* ..., val1, val2 ==> ..., val1 % val2 */
- bte = iptr->val.a;
- md = bte->md;
+ bte = iptr->sx.s23.s3.bte;
+ md = bte->md;
s2 = emit_load_s2(jd, iptr, REG_ITMP12_PACKED);
M_OR_TST(GET_HIGH_REG(s2), GET_LOW_REG(s2), REG_ITMP3);
- M_BEQ(0);
- codegen_add_arithmeticexception_ref(cd);
+ /* XXX could be optimized */
+ emit_arithmetic_check(cd, iptr, REG_ITMP3);
disp = dseg_add_functionptr(cd, bte->fp);
M_ALD(REG_ITMP3, REG_PV, disp);
break;
case ICMD_IMULCONST: /* ..., value ==> ..., value * constant */
- /* sx.val.i = constant */
+ /* sx.val.i = constant */
s1 = emit_load_s1(jd, iptr, REG_ITMP1);
d = codegen_reg_of_dst(jd, iptr, REG_ITMP2);
- if ((iptr->sx.val.i >= -32768) && (iptr->sx.val.i <= 32767)) {
+ if ((iptr->sx.val.i >= -32768) && (iptr->sx.val.i <= 32767))
M_IMUL_IMM(s1, iptr->sx.val.i, d);
- } else {
+ else {
ICONST(REG_ITMP3, iptr->sx.val.i);
M_IMUL(s1, REG_ITMP3, d);
}
break;
case ICMD_ISHLCONST: /* ..., value ==> ..., value << constant */
- /* sx.val.i = constant */
+ /* sx.val.i = constant */
s1 = emit_load_s1(jd, iptr, REG_ITMP1);
d = codegen_reg_of_dst(jd, iptr, REG_ITMP2);
break;
case ICMD_ISHRCONST: /* ..., value ==> ..., value >> constant */
- /* sx.val.i = constant */
+ /* sx.val.i = constant */
s1 = emit_load_s1(jd, iptr, REG_ITMP1);
d = codegen_reg_of_dst(jd, iptr, REG_ITMP2);
break;
case ICMD_IUSHRCONST: /* ..., value ==> ..., value >>> constant */
- /* sx.val.i = constant */
+ /* sx.val.i = constant */
s1 = emit_load_s1(jd, iptr, REG_ITMP1);
d = codegen_reg_of_dst(jd, iptr, REG_ITMP2);
- if (iptr->sx.val.i & 0x1f) {
+ if (iptr->sx.val.i & 0x1f)
M_SRL_IMM(s1, iptr->sx.val.i & 0x1f, d);
- } else {
+ else {
M_INTMOVE(s1, d);
}
emit_store_dst(jd, iptr, d);
break;
case ICMD_IANDCONST: /* ..., value ==> ..., value & constant */
- /* sx.val.i = constant */
+ /* sx.val.i = constant */
s1 = emit_load_s1(jd, iptr, REG_ITMP1);
d = codegen_reg_of_dst(jd, iptr, REG_ITMP2);
- if ((iptr->sx.val.i >= 0) && (iptr->sx.val.i <= 65535)) {
+ if ((iptr->sx.val.i >= 0) && (iptr->sx.val.i <= 65535))
M_AND_IMM(s1, iptr->sx.val.i, d);
- }
/*
else if (iptr->sx.val.i == 0xffffff) {
M_RLWINM(s1, 0, 8, 31, d);
d = codegen_reg_of_dst(jd, iptr, REG_ITMP12_PACKED);
M_AND(s1, s2, GET_LOW_REG(d));
s1 = emit_load_s1_high(jd, iptr, REG_ITMP1);
- s2 = emit_load_s2_high(jd, iptr, REG_ITMP3); /* don't use REG_ITMP2 */
+ s2 = emit_load_s2_high(jd, iptr, REG_ITMP3);/* don't use REG_ITMP2*/
M_AND(s1, s2, GET_HIGH_REG(d));
emit_store_dst(jd, iptr, d);
break;
case ICMD_LANDCONST: /* ..., value ==> ..., value & constant */
- /* sx.val.l = constant */
+ /* sx.val.l = constant */
s3 = iptr->sx.val.l & 0xffffffff;
s1 = emit_load_s1_low(jd, iptr, REG_ITMP1);
d = codegen_reg_of_dst(jd, iptr, REG_ITMP12_PACKED);
- if ((s3 >= 0) && (s3 <= 65535)) {
+ if ((s3 >= 0) && (s3 <= 65535))
M_AND_IMM(s1, s3, GET_LOW_REG(d));
- } else {
+ else {
ICONST(REG_ITMP3, s3);
M_AND(s1, REG_ITMP3, GET_LOW_REG(d));
}
s1 = emit_load_s1_high(jd, iptr, REG_ITMP1);
s3 = iptr->sx.val.l >> 32;
- if ((s3 >= 0) && (s3 <= 65535)) {
+ if ((s3 >= 0) && (s3 <= 65535))
M_AND_IMM(s1, s3, GET_HIGH_REG(d));
- } else {
+ else {
ICONST(REG_ITMP3, s3); /* don't use REG_ITMP2 */
M_AND(s1, REG_ITMP3, GET_HIGH_REG(d));
}
break;
case ICMD_IREMPOW2: /* ..., value ==> ..., value % constant */
- /* sx.val.i = constant */
+ /* sx.val.i = constant */
s1 = emit_load_s1(jd, iptr, REG_ITMP1);
d = codegen_reg_of_dst(jd, iptr, REG_ITMP2);
M_ADDIS(REG_ZERO, iptr->sx.val.i >> 16, REG_ITMP2);
M_OR_IMM(REG_ITMP2, iptr->sx.val.i, REG_ITMP2);
M_IADD(s1, REG_ITMP2, REG_ITMP2);
- } else {
+ }
+ else {
M_IADD_IMM(s1, iptr->sx.val.i, REG_ITMP2);
}
{
break;
case ICMD_IORCONST: /* ..., value ==> ..., value | constant */
- /* sx.val.i = constant */
+ /* sx.val.i = constant */
s1 = emit_load_s1(jd, iptr, REG_ITMP1);
d = codegen_reg_of_dst(jd, iptr, REG_ITMP2);
- if ((iptr->sx.val.i >= 0) && (iptr->sx.val.i <= 65535)) {
+ if ((iptr->sx.val.i >= 0) && (iptr->sx.val.i <= 65535))
M_OR_IMM(s1, iptr->sx.val.i, d);
- } else {
+ else {
ICONST(REG_ITMP3, iptr->sx.val.i);
M_OR(s1, REG_ITMP3, d);
}
d = codegen_reg_of_dst(jd, iptr, REG_ITMP12_PACKED);
M_OR(s1, s2, GET_LOW_REG(d));
s1 = emit_load_s1_high(jd, iptr, REG_ITMP1);
- s2 = emit_load_s2_high(jd, iptr, REG_ITMP3); /* don't use REG_ITMP2 */
+ s2 = emit_load_s2_high(jd, iptr, REG_ITMP3);/* don't use REG_ITMP2*/
M_OR(s1, s2, GET_HIGH_REG(d));
emit_store_dst(jd, iptr, d);
break;
case ICMD_LORCONST: /* ..., value ==> ..., value | constant */
- /* sx.val.l = constant */
+ /* sx.val.l = constant */
s3 = iptr->sx.val.l & 0xffffffff;
s1 = emit_load_s1_low(jd, iptr, REG_ITMP1);
d = codegen_reg_of_dst(jd, iptr, REG_ITMP12_PACKED);
- if ((s3 >= 0) && (s3 <= 65535)) {
+ if ((s3 >= 0) && (s3 <= 65535))
M_OR_IMM(s1, s3, GET_LOW_REG(d));
- } else {
+ else {
ICONST(REG_ITMP3, s3);
M_OR(s1, REG_ITMP3, GET_LOW_REG(d));
}
s1 = emit_load_s1_high(jd, iptr, REG_ITMP1);
s3 = iptr->sx.val.l >> 32;
- if ((s3 >= 0) && (s3 <= 65535)) {
+ if ((s3 >= 0) && (s3 <= 65535))
M_OR_IMM(s1, s3, GET_HIGH_REG(d));
- } else {
+ else {
ICONST(REG_ITMP3, s3); /* don't use REG_ITMP2 */
M_OR(s1, REG_ITMP3, GET_HIGH_REG(d));
}
break;
case ICMD_IXORCONST: /* ..., value ==> ..., value ^ constant */
- /* sx.val.i = constant */
+ /* sx.val.i = constant */
s1 = emit_load_s1(jd, iptr, REG_ITMP1);
d = codegen_reg_of_dst(jd, iptr, REG_ITMP2);
- if ((iptr->sx.val.i >= 0) && (iptr->sx.val.i <= 65535)) {
+ if ((iptr->sx.val.i >= 0) && (iptr->sx.val.i <= 65535))
M_XOR_IMM(s1, iptr->sx.val.i, d);
- } else {
+ else {
ICONST(REG_ITMP3, iptr->sx.val.i);
M_XOR(s1, REG_ITMP3, d);
}
d = codegen_reg_of_dst(jd, iptr, REG_ITMP12_PACKED);
M_XOR(s1, s2, GET_LOW_REG(d));
s1 = emit_load_s1_high(jd, iptr, REG_ITMP1);
- s2 = emit_load_s2_high(jd, iptr, REG_ITMP3); /* don't use REG_ITMP2 */
+ s2 = emit_load_s2_high(jd, iptr, REG_ITMP3);/* don't use REG_ITMP2*/
M_XOR(s1, s2, GET_HIGH_REG(d));
emit_store_dst(jd, iptr, d);
break;
case ICMD_LXORCONST: /* ..., value ==> ..., value ^ constant */
- /* sx.val.l = constant */
+ /* sx.val.l = constant */
s3 = iptr->sx.val.l & 0xffffffff;
s1 = emit_load_s1_low(jd, iptr, REG_ITMP1);
d = codegen_reg_of_dst(jd, iptr, REG_ITMP12_PACKED);
- if ((s3 >= 0) && (s3 <= 65535)) {
+ if ((s3 >= 0) && (s3 <= 65535))
M_XOR_IMM(s1, s3, GET_LOW_REG(d));
- } else {
+ else {
ICONST(REG_ITMP3, s3);
M_XOR(s1, REG_ITMP3, GET_LOW_REG(d));
}
s1 = emit_load_s1_high(jd, iptr, REG_ITMP1);
s3 = iptr->sx.val.l >> 32;
- if ((s3 >= 0) && (s3 <= 65535)) {
+ if ((s3 >= 0) && (s3 <= 65535))
M_XOR_IMM(s1, s3, GET_HIGH_REG(d));
- } else {
+ else {
ICONST(REG_ITMP3, s3); /* don't use REG_ITMP2 */
M_XOR(s1, REG_ITMP3, GET_HIGH_REG(d));
}
break;
case ICMD_LCMP: /* ..., val1, val2 ==> ..., val1 cmp val2 */
- /*******************************************************************
- TODO: CHANGE THIS TO A VERSION THAT WORKS !!!
- *******************************************************************/
+
s1 = emit_load_s1_high(jd, iptr, REG_ITMP3);
s2 = emit_load_s2_high(jd, iptr, REG_ITMP2);
d = codegen_reg_of_dst(jd, iptr, REG_ITMP1);
- {
- int tempreg = false;
- int dreg;
- u1 *br1;
-
- if (iptr->s1.var->flags & INMEMORY) {
- tempreg = tempreg || (d == REG_ITMP3) || (d == REG_ITMP2);
- } else {
- tempreg = tempreg || (d == GET_HIGH_REG(iptr->s1.var->regoff))
- || (d == GET_LOW_REG(iptr->s1.var->regoff));
- }
- if (iptr->sx.s23.s2.var->flags & INMEMORY) {
- tempreg = tempreg || (d == REG_ITMP3) || (d == REG_ITMP2);
- } else {
- tempreg = tempreg || (d == GET_HIGH_REG(iptr->sx.s23.s2.var->regoff))
- || (d == GET_LOW_REG(iptr->sx.s23.s2.var->regoff));
- }
-
- dreg = tempreg ? REG_ITMP1 : d;
- M_IADD_IMM(REG_ZERO, 1, dreg);
- M_CMP(s1, s2);
- M_BGT(0);
- br1 = cd->mcodeptr;
- M_BLT(0);
- s1 = emit_load_s1_low(jd, iptr, REG_ITMP3);
- s2 = emit_load_s2_low(jd, iptr, 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, br1, cd->mcodeptr);
- gen_resolvebranch(br1 + 1 * 4, br1 + 1 * 4, cd->mcodeptr - 2 * 4);
- M_INTMOVE(dreg, d);
- }
+ vm_abort("codegen: implement ICMD_LCMP!");
emit_store_dst(jd, iptr, d);
break;
- case ICMD_IINC: /* ..., value ==> ..., value + constant */
- /* s1.localindex = variable, sx.val.i = constant */
-
- var = &(rd->locals[iptr->s1.localindex][TYPE_INT]);
- if (var->flags & INMEMORY) {
- s1 = REG_ITMP1;
- M_ILD(s1, REG_SP, var->regoff * 4);
- } else
- s1 = var->regoff;
- {
- u4 m = iptr->sx.val.i;
- if (m & 0x8000)
- m += 65536;
- if (m & 0xffff0000)
- M_ADDIS(s1, m >> 16, s1);
- if (m & 0xffff)
- M_IADD_IMM(s1, m & 0xffff, s1);
- }
- if (var->flags & INMEMORY)
- M_IST(s1, REG_SP, var->regoff * 4);
- break;
-
/* floating operations ************************************************/
s2 = emit_load_s2(jd, iptr, REG_FTMP2);
M_FCMPU(s1, s2);
M_BNAN(1);
- M_BEQ(0);
- codegen_addreference(cd, iptr->dst.block);
+ emit_beq(cd, iptr->dst.block);
break;
case ICMD_IF_FCMPNE: /* ..., value, value ==> ... */
s1 = emit_load_s1(jd, iptr, REG_FTMP1);
s2 = emit_load_s2(jd, iptr, REG_FTMP2);
M_FCMPU(s1, s2);
- M_BNAN(0);
- codegen_addreference(cd, iptr->dst.block);
- M_BNE(0);
- codegen_addreference(cd, iptr->dst.block);
+ emit_bnan(cd, iptr->dst.block);
+ emit_bne(cd, iptr->dst.block);
break;
s1 = emit_load_s1(jd, iptr, REG_FTMP1);
s2 = emit_load_s2(jd, iptr, REG_FTMP2);
M_FCMPU(s1, s2);
- M_BNAN(0);
- codegen_addreference(cd, iptr->dst.block);
- M_BLT(0);
- codegen_addreference(cd, iptr->dst.block);
+ emit_bnan(cd, iptr->dst.block);
+ emit_blt(cd, iptr->dst.block);
break;
case ICMD_IF_FCMPL_GT: /* ..., value, value ==> ... */
s2 = emit_load_s2(jd, iptr, REG_FTMP2);
M_FCMPU(s1, s2);
M_BNAN(1);
- M_BGT(0);
- codegen_addreference(cd, iptr->dst.block);
+ emit_bgt(cd, iptr->dst.block);
break;
case ICMD_IF_FCMPL_LE: /* ..., value, value ==> ... */
s1 = emit_load_s1(jd, iptr, REG_FTMP1);
s2 = emit_load_s2(jd, iptr, REG_FTMP2);
M_FCMPU(s1, s2);
- M_BNAN(0);
- codegen_addreference(cd, iptr->dst.block);
- M_BLE(0);
- codegen_addreference(cd, iptr->dst.block);
+ emit_bnan(cd, iptr->dst.block);
+ emit_ble(cd, iptr->dst.block);
break;
case ICMD_IF_FCMPL_GE: /* ..., value, value ==> ... */
s2 = emit_load_s2(jd, iptr, REG_FTMP2);
M_FCMPU(s1, s2);
M_BNAN(1);
- M_BGE(0);
- codegen_addreference(cd, iptr->dst.block);
+ emit_bge(cd, iptr->dst.block);
break;
case ICMD_IF_FCMPG_LT: /* ..., value, value ==> ... */
s2 = emit_load_s2(jd, iptr, REG_FTMP2);
M_FCMPU(s1, s2);
M_BNAN(1);
- M_BLT(0);
- codegen_addreference(cd, iptr->dst.block);
+ emit_blt(cd, iptr->dst.block);
break;
case ICMD_IF_FCMPG_GT: /* ..., value, value ==> ... */
s1 = emit_load_s1(jd, iptr, REG_FTMP1);
s2 = emit_load_s2(jd, iptr, REG_FTMP2);
M_FCMPU(s1, s2);
- M_BNAN(0);
- codegen_addreference(cd, iptr->dst.block);
- M_BGT(0);
- codegen_addreference(cd, iptr->dst.block);
+ emit_bnan(cd, iptr->dst.block);
+ emit_bgt(cd, iptr->dst.block);
break;
case ICMD_IF_FCMPG_LE: /* ..., value, value ==> ... */
s2 = emit_load_s2(jd, iptr, REG_FTMP2);
M_FCMPU(s1, s2);
M_BNAN(1);
- M_BLE(0);
- codegen_addreference(cd, iptr->dst.block);
+ emit_ble(cd, iptr->dst.block);
break;
case ICMD_IF_FCMPG_GE: /* ..., value, value ==> ... */
s1 = emit_load_s1(jd, iptr, REG_FTMP1);
s2 = emit_load_s2(jd, iptr, REG_FTMP2);
M_FCMPU(s1, s2);
- M_BNAN(0);
- codegen_addreference(cd, iptr->dst.block);
- M_BGE(0);
- codegen_addreference(cd, iptr->dst.block);
+ emit_bnan(cd, iptr->dst.block);
+ emit_bge(cd, iptr->dst.block);
break;
s1 = emit_load_s1(jd, iptr, REG_ITMP1);
d = codegen_reg_of_dst(jd, iptr, REG_ITMP2);
- gen_nullptr_check(s1);
+ /* implicit null-pointer check */
M_ILD(d, s1, OFFSET(java_arrayheader, size));
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_ITMP2);
- if (INSTRUCTION_MUST_CHECK(iptr)) {
- gen_nullptr_check(s1);
- gen_bound_check;
- }
- M_IADD_IMM(s2, OFFSET(java_chararray, data[0]), REG_ITMP2);
+ emit_arrayindexoutofbounds_check(cd, iptr, s1, s2);
+ M_IADD_IMM(s2, OFFSET(java_bytearray, data[0]), REG_ITMP2);
+ /* implicit null-pointer check */
M_LBZX(d, s1, REG_ITMP2);
M_BSEXT(d, d);
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_ITMP2);
- if (INSTRUCTION_MUST_CHECK(iptr)) {
- gen_nullptr_check(s1);
- gen_bound_check;
- }
+ emit_arrayindexoutofbounds_check(cd, iptr, s1, s2);
M_SLL_IMM(s2, 1, REG_ITMP2);
M_IADD_IMM(REG_ITMP2, OFFSET(java_chararray, data[0]), REG_ITMP2);
+ /* implicit null-pointer check */
M_LHZX(d, 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_ITMP2);
- if (INSTRUCTION_MUST_CHECK(iptr)) {
- gen_nullptr_check(s1);
- gen_bound_check;
- }
+ emit_arrayindexoutofbounds_check(cd, iptr, s1, s2);
M_SLL_IMM(s2, 1, REG_ITMP2);
M_IADD_IMM(REG_ITMP2, OFFSET(java_shortarray, data[0]), REG_ITMP2);
+ /* implicit null-pointer check */
M_LHAX(d, 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_ITMP2);
- if (INSTRUCTION_MUST_CHECK(iptr)) {
- gen_nullptr_check(s1);
- gen_bound_check;
- }
+ emit_arrayindexoutofbounds_check(cd, iptr, s1, s2);
M_SLL_IMM(s2, 2, REG_ITMP2);
M_IADD_IMM(REG_ITMP2, OFFSET(java_intarray, data[0]), REG_ITMP2);
+ /* implicit null-pointer check */
M_LWZX(d, 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_ITMP12_PACKED);
- if (INSTRUCTION_MUST_CHECK(iptr)) {
- gen_nullptr_check(s1);
- gen_bound_check;
- }
+ /* implicit null-pointer check */
+ emit_arrayindexoutofbounds_check(cd, iptr, s1, s2);
M_SLL_IMM(s2, 3, REG_ITMP2);
M_IADD(s1, REG_ITMP2, REG_ITMP2);
M_LLD_INTERN(d, REG_ITMP2, OFFSET(java_longarray, data[0]));
s1 = emit_load_s1(jd, iptr, REG_ITMP1);
s2 = emit_load_s2(jd, iptr, REG_ITMP2);
d = codegen_reg_of_dst(jd, iptr, REG_FTMP1);
- if (INSTRUCTION_MUST_CHECK(iptr)) {
- gen_nullptr_check(s1);
- gen_bound_check;
- }
+ emit_arrayindexoutofbounds_check(cd, iptr, s1, s2);
M_SLL_IMM(s2, 2, REG_ITMP2);
M_IADD_IMM(REG_ITMP2, OFFSET(java_floatarray, data[0]), REG_ITMP2);
+ /* implicit null-pointer check */
M_LFSX(d, 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_FTMP1);
- if (INSTRUCTION_MUST_CHECK(iptr)) {
- gen_nullptr_check(s1);
- gen_bound_check;
- }
+ emit_arrayindexoutofbounds_check(cd, iptr, s1, s2);
M_SLL_IMM(s2, 3, REG_ITMP2);
M_IADD_IMM(REG_ITMP2, OFFSET(java_doublearray, data[0]), REG_ITMP2);
+ /* implicit null-pointer check */
M_LFDX(d, 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_ITMP2);
- if (INSTRUCTION_MUST_CHECK(iptr)) {
- gen_nullptr_check(s1);
- gen_bound_check;
- }
+ emit_arrayindexoutofbounds_check(cd, iptr, s1, s2);
M_SLL_IMM(s2, 2, REG_ITMP2);
M_IADD_IMM(REG_ITMP2, OFFSET(java_objectarray, data[0]), REG_ITMP2);
+ /* implicit null-pointer check */
M_LWZX(d, 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);
- if (INSTRUCTION_MUST_CHECK(iptr)) {
- gen_nullptr_check(s1);
- gen_bound_check;
- }
+ emit_arrayindexoutofbounds_check(cd, iptr, s1, s2);
s3 = emit_load_s3(jd, iptr, REG_ITMP3);
M_IADD_IMM(s2, OFFSET(java_bytearray, data[0]), REG_ITMP2);
+ /* implicit null-pointer check */
M_STBX(s3, s1, REG_ITMP2);
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;
- }
+ emit_arrayindexoutofbounds_check(cd, iptr, s1, s2);
s3 = emit_load_s3(jd, iptr, REG_ITMP3);
M_SLL_IMM(s2, 1, REG_ITMP2);
M_IADD_IMM(REG_ITMP2, OFFSET(java_chararray, data[0]), REG_ITMP2);
+ /* implicit null-pointer check */
M_STHX(s3, s1, REG_ITMP2);
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;
- }
+ emit_arrayindexoutofbounds_check(cd, iptr, s1, s2);
s3 = emit_load_s3(jd, iptr, REG_ITMP3);
M_SLL_IMM(s2, 1, REG_ITMP2);
M_IADD_IMM(REG_ITMP2, OFFSET(java_shortarray, data[0]), REG_ITMP2);
+ /* implicit null-pointer check */
M_STHX(s3, s1, REG_ITMP2);
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;
- }
+ emit_arrayindexoutofbounds_check(cd, iptr, s1, s2);
s3 = emit_load_s3(jd, iptr, REG_ITMP3);
M_SLL_IMM(s2, 2, REG_ITMP2);
M_IADD_IMM(REG_ITMP2, OFFSET(java_intarray, data[0]), REG_ITMP2);
+ /* implicit null-pointer check */
M_STWX(s3, s1, REG_ITMP2);
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;
- }
+ emit_arrayindexoutofbounds_check(cd, iptr, s1, s2);
s3 = emit_load_s3_high(jd, iptr, REG_ITMP3);
M_SLL_IMM(s2, 3, REG_ITMP2);
M_IADD_IMM(REG_ITMP2, OFFSET(java_longarray, data[0]), REG_ITMP2);
+ /* implicit null-pointer check */
M_STWX(s3, s1, REG_ITMP2);
M_IADD_IMM(REG_ITMP2, 4, REG_ITMP2);
s3 = emit_load_s3_low(jd, iptr, REG_ITMP3);
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;
- }
+ emit_arrayindexoutofbounds_check(cd, iptr, s1, s2);
s3 = emit_load_s3(jd, iptr, REG_FTMP3);
M_SLL_IMM(s2, 2, REG_ITMP2);
M_IADD_IMM(REG_ITMP2, OFFSET(java_floatarray, data[0]), REG_ITMP2);
+ /* implicit null-pointer check */
M_STFSX(s3, s1, REG_ITMP2);
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;
- }
+ emit_arrayindexoutofbounds_check(cd, iptr, s1, s2);
s3 = emit_load_s3(jd, iptr, REG_FTMP3);
M_SLL_IMM(s2, 3, REG_ITMP2);
M_IADD_IMM(REG_ITMP2, OFFSET(java_doublearray, data[0]), REG_ITMP2);
+ /* implicit null-pointer check */
M_STFDX(s3, s1, REG_ITMP2);
break;
case ICMD_AASTORE: /* ..., arrayref, index, value ==> ... */
- s1 = emit_load_s1(jd, iptr, rd->argintregs[0]);
+ s1 = emit_load_s1(jd, iptr, REG_A0);
s2 = emit_load_s2(jd, iptr, REG_ITMP2);
- if (INSTRUCTION_MUST_CHECK(iptr)) {
- gen_nullptr_check(s1);
- gen_bound_check;
- }
- s3 = emit_load_s3(jd, iptr, rd->argintregs[1]);
+ emit_arrayindexoutofbounds_check(cd, iptr, s1, s2);
+ s3 = emit_load_s3(jd, iptr, REG_A1);
+ /* XXX what if array is NULL */
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]);
+ M_INTMOVE(s1, REG_A0);
+ M_INTMOVE(s3, REG_A1);
M_JSR;
- M_TST(REG_RESULT);
- M_BEQ(0);
- codegen_add_arraystoreexception_ref(cd);
+ emit_exception_check(cd, iptr);
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_SLL_IMM(s2, 2, REG_ITMP2);
M_IADD_IMM(REG_ITMP2, OFFSET(java_objectarray, data[0]), REG_ITMP2);
+ /* implicit null-pointer check */
M_STWX(s3, s1, REG_ITMP2);
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;
-
- unresolved_field *uf = iptr->sx.s23.s3.uf;
-
- disp = dseg_add_unique_address(cd, uf);
+ disp = dseg_add_unique_address(cd, uf);
codegen_addpatchref(cd, 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));
- disp = dseg_add_address(cd, &(fi->value));
-
- if (!CLASS_IS_OR_ALMOST_INITIALIZED(fi->class)) {
+ if (!CLASS_IS_OR_ALMOST_INITIALIZED(fi->class))
codegen_addpatchref(cd, PATCHER_initialize_class,
fi->class, disp);
-
- if (opt_showdisassemble)
- M_NOP;
- }
}
M_ALD(REG_ITMP1, REG_PV, 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;
-
- unresolved_field *uf = iptr->sx.s23.s3.uf;
-
- disp = dseg_add_unique_address(cd, uf);
+ disp = dseg_add_unique_address(cd, uf);
codegen_addpatchref(cd, PATCHER_get_putstatic, uf, disp);
-
- if (opt_showdisassemble)
- M_NOP;
}
else {
- fieldinfo *fi = iptr->sx.s23.s3.fmiref->p.field;
-
- disp = dseg_add_address(cd, &(fi->value));
+ 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)) {
+ if (!CLASS_IS_OR_ALMOST_INITIALIZED(fi->class))
codegen_addpatchref(cd, PATCHER_initialize_class,
fi->class, disp);
-
- if (opt_showdisassemble)
- M_NOP;
- }
}
M_ALD(REG_ITMP1, REG_PV, disp);
case ICMD_GETFIELD: /* ... ==> ..., value */
s1 = emit_load_s1(jd, iptr, REG_ITMP1);
- gen_nullptr_check(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;
-
- unresolved_field *uf = iptr->sx.s23.s3.uf;
+ disp = 0;
codegen_addpatchref(cd, PATCHER_get_putfield, uf, 0);
-
- if (opt_showdisassemble)
- M_NOP;
-
- disp = 0;
}
else {
- fieldinfo *fi = iptr->sx.s23.s3.fmiref->p.field;
- disp = fi->offset;
+ fi = iptr->sx.s23.s3.fmiref->p.field;
+ fieldtype = fi->type;
+ disp = fi->offset;
}
+ /* implicit null-pointer check */
switch (fieldtype) {
case TYPE_INT:
d = codegen_reg_of_dst(jd, iptr, REG_ITMP2);
case ICMD_PUTFIELD: /* ..., value ==> ... */
s1 = emit_load_s1(jd, iptr, REG_ITMP1);
- gen_nullptr_check(s1);
- if (!IS_FLT_DBL_TYPE(fieldtype)) {
+ 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 (IS_INT_LNG_TYPE(fieldtype)) {
if (IS_2_WORD_TYPE(fieldtype))
s2 = emit_load_s2(jd, iptr, REG_ITMP23_PACKED);
else
else
s2 = emit_load_s2(jd, iptr, REG_FTMP2);
- if (INSTRUCTION_IS_UNRESOLVED(iptr)) {
- unresolved_field *uf = iptr->sx.s23.s3.uf;
-
- fieldtype = uf->fieldref->parseddesc.fd->type;
-
- unresolved_field *uf = iptr->sx.s23.s3.uf;
-
+ if (INSTRUCTION_IS_UNRESOLVED(iptr))
codegen_addpatchref(cd, PATCHER_get_putfield, uf, 0);
- if (opt_showdisassemble)
- M_NOP;
-
- disp = 0;
- }
- else {
- fieldinfo *fi = iptr->sx.s23.s3.fmiref->p.field;
- disp = fi->offset;
- }
-
+ /* implicit null-pointer check */
switch (fieldtype) {
case TYPE_INT:
M_IST(s2, s1, disp);
unresolved_class *uc = iptr->sx.s23.s2.uc;
codegen_addpatchref(cd, PATCHER_resolve_class, uc, 0);
-
- if (opt_showdisassemble)
- M_NOP;
}
#endif /* ENABLE_VERIFIER */
break;
case ICMD_GOTO: /* ... ==> ... */
- M_BR(0);
- codegen_addreference(cd, iptr->dst.block);
+ case ICMD_RET: /* ... ==> ... */
+
+ emit_br(cd, iptr->dst.block);
ALIGNCODENOP;
break;
case ICMD_JSR: /* ... ==> ... */
- if (jd->isleafmethod)
- M_MFLR(REG_ITMP2);
-
- M_BL(0);
- M_MFLR(REG_ITMP1);
- 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, iptr->sx.s23.s3.jsrtarget.block);
- break;
-
- case ICMD_RET: /* ... ==> ... */
- /* s1.localindex = local variable */
-
- var = &(rd->locals[iptr->s1.localindex][TYPE_ADR]);
- if (var->flags & INMEMORY) {
- M_ALD(REG_ITMP1, REG_SP, var->regoff * 4);
- M_MTCTR(REG_ITMP1);
- } else {
- M_MTCTR(var->regoff);
- }
- M_RTS;
+ emit_br(cd, iptr->sx.s23.s3.jsrtarget.block);
ALIGNCODENOP;
break;
case ICMD_IFNULL: /* ..., value ==> ... */
+ case ICMD_IFNONNULL:
s1 = emit_load_s1(jd, iptr, REG_ITMP1);
M_TST(s1);
- M_BEQ(0);
- codegen_addreference(cd, iptr->dst.block);
- break;
-
- case ICMD_IFNONNULL: /* ..., value ==> ... */
-
- s1 = emit_load_s1(jd, iptr, REG_ITMP1);
- M_TST(s1);
- 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:
ICONST(REG_ITMP2, iptr->sx.val.i);
M_CMP(s1, REG_ITMP2);
}
- switch (iptr->opc) {
- case ICMD_IFLT:
- M_BLT(0);
- break;
- case ICMD_IFLE:
- M_BLE(0);
- break;
- case ICMD_IFNE:
- M_BNE(0);
- break;
- case ICMD_IFGT:
- M_BGT(0);
- break;
- case ICMD_IFGE:
- M_BGE(0);
- break;
- case ICMD_IFEQ:
- M_BEQ(0);
- break;
- }
- codegen_addreference(cd, iptr->dst.block);
+ emit_bcc(cd, iptr->dst.block, iptr->opc - ICMD_IFEQ, BRANCH_OPT_NONE);
break;
case ICMD_IF_LEQ: /* ..., value ==> ... */
s1 = emit_load_s1_low(jd, iptr, REG_ITMP1);
- s2 = emit_load_s2_high(jd, iptr, REG_ITMP2);
+ s2 = emit_load_s1_high(jd, iptr, REG_ITMP2);
if (iptr->sx.val.l == 0) {
M_OR_TST(s1, s2, REG_ITMP3);
- } else if ((iptr->sx.val.l >= 0) && (iptr->sx.val.l <= 0xffff)) {
+ }
+ else if ((iptr->sx.val.l >= 0) && (iptr->sx.val.l <= 0xffff)) {
M_XOR_IMM(s2, 0, REG_ITMP2);
M_XOR_IMM(s1, iptr->sx.val.l & 0xffff, REG_ITMP1);
M_OR_TST(REG_ITMP1, REG_ITMP2, REG_ITMP3);
- } else {
+ }
+ else {
ICONST(REG_ITMP3, iptr->sx.val.l & 0xffffffff);
M_XOR(s1, REG_ITMP3, REG_ITMP1);
ICONST(REG_ITMP3, iptr->sx.val.l >> 32);
M_XOR(s2, REG_ITMP3, REG_ITMP2);
M_OR_TST(REG_ITMP1, REG_ITMP2, REG_ITMP3);
}
- M_BEQ(0);
- codegen_addreference(cd, iptr->dst.block);
+ emit_beq(cd, iptr->dst.block);
break;
case ICMD_IF_LLT: /* ..., value ==> ... */
+
s1 = emit_load_s1_low(jd, iptr, REG_ITMP1);
- s2 = emit_load_s2_high(jd, iptr, REG_ITMP2);
+ s2 = emit_load_s1_high(jd, iptr, REG_ITMP2);
if (iptr->sx.val.l == 0) {
/* if high word is less than zero, the whole long is too */
M_CMPI(s2, 0);
- } else if ((iptr->sx.val.l >= 0) && (iptr->sx.val.l <= 0xffff)) {
+ emit_blt(cd, iptr->dst.block);
+ }
+ else if ((iptr->sx.val.l >= 0) && (iptr->sx.val.l <= 0xffff)) {
M_CMPI(s2, 0);
- M_BLT(0);
- codegen_addreference(cd, iptr->dst.block);
- M_BGT(2);
+ emit_blt(cd, iptr->dst.block);
+ emit_label_bgt(cd, BRANCH_LABEL_1);
M_CMPUI(s1, iptr->sx.val.l & 0xffff);
- } else {
+ emit_blt(cd, iptr->dst.block);
+ emit_label(cd, BRANCH_LABEL_1);
+ }
+ else {
ICONST(REG_ITMP3, iptr->sx.val.l >> 32);
M_CMP(s2, REG_ITMP3);
- M_BLT(0);
- codegen_addreference(cd, iptr->dst.block);
- M_BGT(3);
+ emit_blt(cd, iptr->dst.block);
+ emit_label_bgt(cd, BRANCH_LABEL_1);
ICONST(REG_ITMP3, iptr->sx.val.l & 0xffffffff);
M_CMPU(s1, REG_ITMP3);
+ emit_blt(cd, iptr->dst.block);
+ emit_label(cd, BRANCH_LABEL_1);
}
- M_BLT(0);
- codegen_addreference(cd, iptr->dst.block);
break;
case ICMD_IF_LLE: /* ..., value ==> ... */
s1 = emit_load_s1_low(jd, iptr, REG_ITMP1);
- s2 = emit_load_s2_high(jd, iptr, REG_ITMP2);
+ s2 = emit_load_s1_high(jd, iptr, REG_ITMP2);
/* if (iptr->sx.val.l == 0) { */
/* M_OR(s1, s2, REG_ITMP3); */
/* M_CMPI(REG_ITMP3, 0); */
/* } else */
if ((iptr->sx.val.l >= 0) && (iptr->sx.val.l <= 0xffff)) {
M_CMPI(s2, 0);
- M_BLT(0);
- codegen_addreference(cd, iptr->dst.block);
- M_BGT(2);
+ emit_blt(cd, iptr->dst.block);
+ emit_label_bgt(cd, BRANCH_LABEL_1);
M_CMPUI(s1, iptr->sx.val.l & 0xffff);
- } else {
+ }
+ else {
ICONST(REG_ITMP3, iptr->sx.val.l >> 32);
M_CMP(s2, REG_ITMP3);
- M_BLT(0);
- codegen_addreference(cd, iptr->dst.block);
- M_BGT(3);
+ emit_blt(cd, iptr->dst.block);
+ emit_label_bgt(cd, BRANCH_LABEL_1);
ICONST(REG_ITMP3, iptr->sx.val.l & 0xffffffff);
M_CMPU(s1, REG_ITMP3);
}
- M_BLE(0);
- codegen_addreference(cd, iptr->dst.block);
+ emit_ble(cd, iptr->dst.block);
+ emit_label(cd, BRANCH_LABEL_1);
break;
case ICMD_IF_LNE: /* ..., value ==> ... */
s1 = emit_load_s1_low(jd, iptr, REG_ITMP1);
- s2 = emit_load_s2_high(jd, iptr, REG_ITMP2);
+ s2 = emit_load_s1_high(jd, iptr, REG_ITMP2);
if (iptr->sx.val.l == 0) {
M_OR_TST(s1, s2, REG_ITMP3);
- } else if ((iptr->sx.val.l >= 0) && (iptr->sx.val.l <= 0xffff)) {
+ }
+ else if ((iptr->sx.val.l >= 0) && (iptr->sx.val.l <= 0xffff)) {
M_XOR_IMM(s2, 0, REG_ITMP2);
M_XOR_IMM(s1, iptr->sx.val.l & 0xffff, REG_ITMP1);
M_OR_TST(REG_ITMP1, REG_ITMP2, REG_ITMP3);
- } else {
+ }
+ else {
ICONST(REG_ITMP3, iptr->sx.val.l & 0xffffffff);
M_XOR(s1, REG_ITMP3, REG_ITMP1);
ICONST(REG_ITMP3, iptr->sx.val.l >> 32);
M_XOR(s2, REG_ITMP3, REG_ITMP2);
M_OR_TST(REG_ITMP1, REG_ITMP2, REG_ITMP3);
}
- M_BNE(0);
- codegen_addreference(cd, iptr->dst.block);
+ emit_bne(cd, iptr->dst.block);
break;
case ICMD_IF_LGT: /* ..., value ==> ... */
s1 = emit_load_s1_low(jd, iptr, REG_ITMP1);
- s2 = emit_load_s2_high(jd, iptr, REG_ITMP2);
+ s2 = emit_load_s1_high(jd, iptr, REG_ITMP2);
/* if (iptr->sx.val.l == 0) { */
/* M_OR(s1, s2, REG_ITMP3); */
/* M_CMPI(REG_ITMP3, 0); */
/* } else */
if ((iptr->sx.val.l >= 0) && (iptr->sx.val.l <= 0xffff)) {
M_CMPI(s2, 0);
- M_BGT(0);
- codegen_addreference(cd, iptr->dst.block);
- M_BLT(2);
+ emit_bgt(cd, iptr->dst.block);
+ emit_label_blt(cd, BRANCH_LABEL_1);
M_CMPUI(s1, iptr->sx.val.l & 0xffff);
- } else {
+ }
+ else {
ICONST(REG_ITMP3, iptr->sx.val.l >> 32);
M_CMP(s2, REG_ITMP3);
- M_BGT(0);
- codegen_addreference(cd, iptr->dst.block);
- M_BLT(3);
+ emit_bgt(cd, iptr->dst.block);
+ emit_label_blt(cd, BRANCH_LABEL_1);
ICONST(REG_ITMP3, iptr->sx.val.l & 0xffffffff);
M_CMPU(s1, REG_ITMP3);
}
- M_BGT(0);
- codegen_addreference(cd, iptr->dst.block);
+ emit_bgt(cd, iptr->dst.block);
+ emit_label(cd, BRANCH_LABEL_1);
break;
case ICMD_IF_LGE: /* ..., value ==> ... */
s1 = emit_load_s1_low(jd, iptr, REG_ITMP1);
- s2 = emit_load_s2_high(jd, iptr, REG_ITMP2);
+ s2 = emit_load_s1_high(jd, iptr, REG_ITMP2);
if (iptr->sx.val.l == 0) {
/* if high word is greater equal zero, the whole long is too */
M_CMPI(s2, 0);
- } else if ((iptr->sx.val.l >= 0) && (iptr->sx.val.l <= 0xffff)) {
+ emit_bge(cd, iptr->dst.block);
+ }
+ else if ((iptr->sx.val.l >= 0) && (iptr->sx.val.l <= 0xffff)) {
M_CMPI(s2, 0);
- M_BGT(0);
- codegen_addreference(cd, iptr->dst.block);
- M_BLT(2);
+ emit_bgt(cd, iptr->dst.block);
+ emit_label_blt(cd, BRANCH_LABEL_1);
M_CMPUI(s1, iptr->sx.val.l & 0xffff);
- } else {
+ emit_bge(cd, iptr->dst.block);
+ emit_label(cd, BRANCH_LABEL_1);
+ }
+ else {
ICONST(REG_ITMP3, iptr->sx.val.l >> 32);
M_CMP(s2, REG_ITMP3);
- M_BGT(0);
- codegen_addreference(cd, iptr->dst.block);
- M_BLT(3);
+ emit_bgt(cd, iptr->dst.block);
+ emit_label_blt(cd, BRANCH_LABEL_1);
ICONST(REG_ITMP3, iptr->sx.val.l & 0xffffffff);
M_CMPU(s1, REG_ITMP3);
+ emit_bge(cd, iptr->dst.block);
+ emit_label(cd, BRANCH_LABEL_1);
}
- M_BGE(0);
- codegen_addreference(cd, iptr->dst.block);
break;
case ICMD_IF_ICMPEQ: /* ..., value, value ==> ... */
+ case ICMD_IF_ICMPNE:
+ case ICMD_IF_ICMPLT:
+ case ICMD_IF_ICMPGT:
+ case ICMD_IF_ICMPLE:
+ case ICMD_IF_ICMPGE:
+
+ 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_ICMPEQ, BRANCH_OPT_NONE);
+ break;
+
case ICMD_IF_ACMPEQ: /* op1 = target JavaVM pc */
+ case ICMD_IF_ACMPNE:
s1 = emit_load_s1(jd, iptr, REG_ITMP1);
s2 = emit_load_s2(jd, iptr, REG_ITMP2);
M_CMP(s1, s2);
- M_BEQ(0);
- codegen_addreference(cd, iptr->dst.block);
+ emit_bcc(cd, iptr->dst.block, iptr->opc - ICMD_IF_ACMPEQ, BRANCH_OPT_NONE);
break;
case ICMD_IF_LCMPEQ: /* ..., value, value ==> ... */
s1 = emit_load_s1_high(jd, iptr, REG_ITMP1);
s2 = emit_load_s2_high(jd, iptr, REG_ITMP2);
M_CMP(s1, s2);
- /* load low-bits before the branch, so we know the distance */
+ emit_label_bne(cd, BRANCH_LABEL_1);
s1 = emit_load_s1_low(jd, iptr, REG_ITMP1);
s2 = emit_load_s2_low(jd, iptr, REG_ITMP2);
- M_BNE(2);
M_CMP(s1, s2);
- M_BEQ(0);
- codegen_addreference(cd, iptr->dst.block);
- break;
-
- case ICMD_IF_ICMPNE: /* ..., value, value ==> ... */
- case ICMD_IF_ACMPNE: /* op1 = target JavaVM pc */
-
- s1 = emit_load_s1(jd, iptr, REG_ITMP1);
- s2 = emit_load_s2(jd, iptr, REG_ITMP2);
- M_CMP(s1, s2);
- M_BNE(0);
- codegen_addreference(cd, iptr->dst.block);
+ emit_beq(cd, iptr->dst.block);
+ emit_label(cd, BRANCH_LABEL_1);
break;
case ICMD_IF_LCMPNE: /* ..., value, value ==> ... */
s1 = emit_load_s1_high(jd, iptr, REG_ITMP1);
s2 = emit_load_s2_high(jd, iptr, REG_ITMP2);
M_CMP(s1, s2);
- M_BNE(0);
- codegen_addreference(cd, iptr->dst.block);
+ emit_bne(cd, iptr->dst.block);
s1 = emit_load_s1_low(jd, iptr, REG_ITMP1);
s2 = emit_load_s2_low(jd, iptr, REG_ITMP2);
M_CMP(s1, s2);
- M_BNE(0);
- codegen_addreference(cd, iptr->dst.block);
- break;
-
- case ICMD_IF_ICMPLT: /* ..., value, value ==> ... */
-
- s1 = emit_load_s1(jd, iptr, REG_ITMP1);
- s2 = emit_load_s2(jd, iptr, REG_ITMP2);
- M_CMP(s1, s2);
- M_BLT(0);
- codegen_addreference(cd, iptr->dst.block);
+ emit_bne(cd, iptr->dst.block);
break;
case ICMD_IF_LCMPLT: /* ..., value, value ==> ... */
s1 = emit_load_s1_high(jd, iptr, REG_ITMP1);
s2 = emit_load_s2_high(jd, iptr, REG_ITMP2);
M_CMP(s1, s2);
- M_BLT(0);
- codegen_addreference(cd, iptr->dst.block);
- /* load low-bits before the branch, so we know the distance */
+ emit_blt(cd, iptr->dst.block);
+ emit_label_bgt(cd, BRANCH_LABEL_1);
s1 = emit_load_s1_low(jd, iptr, REG_ITMP1);
s2 = emit_load_s2_low(jd, iptr, REG_ITMP2);
- M_BGT(2);
M_CMPU(s1, s2);
- M_BLT(0);
- codegen_addreference(cd, iptr->dst.block);
- break;
-
- case ICMD_IF_ICMPGT: /* ..., value, value ==> ... */
-
- s1 = emit_load_s1(jd, iptr, REG_ITMP1);
- s2 = emit_load_s2(jd, iptr, REG_ITMP2);
- M_CMP(s1, s2);
- M_BGT(0);
- codegen_addreference(cd, iptr->dst.block);
+ emit_blt(cd, iptr->dst.block);
+ emit_label(cd, BRANCH_LABEL_1);
break;
case ICMD_IF_LCMPGT: /* ..., value, value ==> ... */
s1 = emit_load_s1_high(jd, iptr, REG_ITMP1);
s2 = emit_load_s2_high(jd, iptr, REG_ITMP2);
M_CMP(s1, s2);
- M_BGT(0);
- codegen_addreference(cd, iptr->dst.block);
- /* load low-bits before the branch, so we know the distance */
+ emit_bgt(cd, iptr->dst.block);
+ emit_label_blt(cd, BRANCH_LABEL_1);
s1 = emit_load_s1_low(jd, iptr, REG_ITMP1);
s2 = emit_load_s2_low(jd, iptr, REG_ITMP2);
- M_BLT(2);
M_CMPU(s1, s2);
- M_BGT(0);
- codegen_addreference(cd, iptr->dst.block);
- break;
-
- case ICMD_IF_ICMPLE: /* ..., value, value ==> ... */
-
- s1 = emit_load_s1(jd, iptr, REG_ITMP1);
- s2 = emit_load_s2(jd, iptr, REG_ITMP2);
- M_CMP(s1, s2);
- M_BLE(0);
- codegen_addreference(cd, iptr->dst.block);
+ emit_bgt(cd, iptr->dst.block);
+ emit_label(cd, BRANCH_LABEL_1);
break;
case ICMD_IF_LCMPLE: /* ..., value, value ==> ... */
s1 = emit_load_s1_high(jd, iptr, REG_ITMP1);
s2 = emit_load_s2_high(jd, iptr, REG_ITMP2);
M_CMP(s1, s2);
- M_BLT(0);
- codegen_addreference(cd, iptr->dst.block);
- /* load low-bits before the branch, so we know the distance */
+ emit_blt(cd, iptr->dst.block);
+ emit_label_bgt(cd, BRANCH_LABEL_1);
s1 = emit_load_s1_low(jd, iptr, REG_ITMP1);
s2 = emit_load_s2_low(jd, iptr, REG_ITMP2);
- M_BGT(2);
M_CMPU(s1, s2);
- M_BLE(0);
- codegen_addreference(cd, iptr->dst.block);
- break;
-
- case ICMD_IF_ICMPGE: /* ..., value, value ==> ... */
-
- s1 = emit_load_s1(jd, iptr, REG_ITMP1);
- s2 = emit_load_s2(jd, iptr, REG_ITMP2);
- M_CMP(s1, s2);
- M_BGE(0);
- codegen_addreference(cd, iptr->dst.block);
+ emit_ble(cd, iptr->dst.block);
+ emit_label(cd, BRANCH_LABEL_1);
break;
case ICMD_IF_LCMPGE: /* ..., value, value ==> ... */
s1 = emit_load_s1_high(jd, iptr, REG_ITMP1);
s2 = emit_load_s2_high(jd, iptr, REG_ITMP2);
M_CMP(s1, s2);
- M_BGT(0);
- codegen_addreference(cd, iptr->dst.block);
- /* load low-bits before the branch, so we know the distance */
+ emit_bgt(cd, iptr->dst.block);
+ emit_label_blt(cd, BRANCH_LABEL_1);
s1 = emit_load_s1_low(jd, iptr, REG_ITMP1);
s2 = emit_load_s2_low(jd, iptr, REG_ITMP2);
- M_BLT(2);
M_CMPU(s1, s2);
- M_BGE(0);
- codegen_addreference(cd, iptr->dst.block);
+ emit_bge(cd, iptr->dst.block);
+ emit_label(cd, BRANCH_LABEL_1);
break;
case ICMD_IRETURN: /* ..., retvalue ==> ... */
+ REPLACEMENT_POINT_RETURN(cd, iptr);
s1 = emit_load_s1(jd, iptr, REG_RESULT);
M_INTMOVE(s1, REG_RESULT);
goto nowperformreturn;
case ICMD_ARETURN: /* ..., retvalue ==> ... */
+ REPLACEMENT_POINT_RETURN(cd, iptr);
s1 = emit_load_s1(jd, iptr, REG_RESULT);
M_INTMOVE(s1, REG_RESULT);
unresolved_class *uc = iptr->sx.s23.s2.uc;
codegen_addpatchref(cd, PATCHER_resolve_class, uc, 0);
-
- if (opt_showdisassemble)
- M_NOP;
}
#endif /* ENABLE_VERIFIER */
goto nowperformreturn;
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 nowperformreturn;
case ICMD_FRETURN: /* ..., retvalue ==> ... */
case ICMD_DRETURN:
+ REPLACEMENT_POINT_RETURN(cd, iptr);
s1 = emit_load_s1(jd, iptr, REG_FRESULT);
M_FLTMOVE(s1, REG_FRESULT);
goto nowperformreturn;
case ICMD_RETURN: /* ... ==> ... */
+ REPLACEMENT_POINT_RETURN(cd, iptr);
+
nowperformreturn:
{
s4 i, p;
/* call trace function */
- if (JITDATA_HAS_FLAG_VERBOSECALL(jd))
- emit_verbosecall_exit(jd);
+ emit_verbosecall_exit(jd);
#if defined(ENABLE_THREADS)
if (checksync && (m->flags & ACC_SYNCHRONIZED)) {
break;
}
- M_ALD(rd->argintregs[0], REG_SP, rd->memuse * 4);
+ M_ALD(REG_A0, REG_SP, rd->memuse * 4);
M_JSR;
/* and now restore the proper return value */
case ICMD_TABLESWITCH: /* ..., index ==> ... */
{
- s4 i, l, *s4ptr;
- void **tptr;
+ s4 i, l;
+ branch_target_t *table;
- tptr = iptr->dst.table;
+ table = iptr->dst.table;
- s4ptr = iptr->val.a;
- l = s4ptr[1]; /* low */
- i = s4ptr[2]; /* high */
+ l = iptr->sx.s23.s2.tablelow;
+ i = iptr->sx.s23.s3.tablehigh;
s1 = emit_load_s1(jd, iptr, REG_ITMP1);
- if (l == 0) {
+ if (l == 0)
M_INTMOVE(s1, REG_ITMP1);
- } else if (l <= 32768) {
+ else if (l <= 32768)
M_LDA(REG_ITMP1, s1, -l);
- } else {
+ else {
ICONST(REG_ITMP2, l);
M_ISUB(s1, REG_ITMP2, REG_ITMP1);
}
+
i = i - l + 1;
/* range check */
M_CMPUI(REG_ITMP1, i - 1);
- M_BGT(0);
- codegen_addreference(cd, (basicblock *) tptr[0]);
+ emit_bgt(cd, table[0].block);
/* build jump table top down and use address of lowest entry */
- /* s4ptr += 3 + i; */
- tptr += i;
+ table += i;
while (--i >= 0) {
- dseg_add_target(cd, (basicblock *) tptr[0]);
- --tptr;
- }
+ dseg_add_target(cd, table->block);
+ --table;
}
/* length of dataseg after last dseg_add_target is used by load */
M_MTCTR(REG_ITMP2);
M_RTS;
ALIGNCODENOP;
+ }
break;
case ICMD_LOOKUPSWITCH: /* ..., key ==> ... */
{
- s4 i, l, val, *s4ptr;
- void **tptr;
+ s4 i;
+ lookup_target_t *lookup;
- tptr = iptr->dst.lookup;
+ lookup = iptr->dst.lookup;
- s4ptr = iptr->val.a;
- l = s4ptr[0]; /* default */
- i = s4ptr[1]; /* count */
+ i = iptr->sx.s23.s2.lookupcount;
MCODECHECK((i<<2)+8);
s1 = emit_load_s1(jd, iptr, REG_ITMP1);
- while (--i >= 0) {
- s4ptr += 2;
- ++tptr;
- val = s4ptr[0];
- if ((val >= -32768) && (val <= 32767)) {
- M_CMPI(s1, val);
+ while (--i >= 0) {
+ if ((lookup->value >= -32768) && (lookup->value <= 32767)) {
+ M_CMPI(s1, lookup->value);
}
else {
- a = dseg_add_s4(cd, val);
- M_ILD(REG_ITMP2, REG_PV, a);
+ disp = dseg_add_s4(cd, lookup->value);
+ M_ILD(REG_ITMP2, REG_PV, disp);
M_CMP(s1, REG_ITMP2);
}
- M_BEQ(0);
- codegen_addreference(cd, (basicblock *) tptr[0]);
+ emit_beq(cd, lookup->target.block);
+ lookup++;
}
- M_BR(0);
- tptr = iptr->dst.lookup;
- codegen_addreference(cd, (basicblock *) tptr[0]);
-
+ emit_br(cd, iptr->sx.s23.s3.lookupdefault.block);
ALIGNCODENOP;
break;
}
case ICMD_BUILTIN: /* ..., [arg1, [arg2 ...]] ==> ... */
- bte = iptr->val.a;
- md = bte->md;
+ bte = iptr->sx.s23.s3.bte;
+ md = bte->md;
goto gen_method;
case ICMD_INVOKESTATIC: /* ..., [arg1, [arg2 ...]] ==> ... */
case ICMD_INVOKEVIRTUAL:/* op1 = arg count, val.a = method pointer */
case ICMD_INVOKEINTERFACE:
+ REPLACEMENT_POINT_INVOKE(cd, iptr);
+
if (INSTRUCTION_IS_UNRESOLVED(iptr)) {
- md = iptr->sx.s23.s3.um->methodref->parseddesc.md;
lm = NULL;
+ um = iptr->sx.s23.s3.um;
+ md = um->methodref->parseddesc.md;
}
else {
lm = iptr->sx.s23.s3.fmiref->p.method;
+ um = NULL;
md = lm->parseddesc;
}
/* copy arguments to registers or stack location */
- for (s3 = s3 - 1; s3 >= 0; s3--, src = src->prev) {
- if (src->varkind == ARGVAR)
+ for (s3 = s3 - 1; s3 >= 0; s3--) {
+ var = VAR(iptr->sx.s23.s2.args[s3]);
+
+ /* Already Preallocated? */
+ if (var->flags & PREALLOC)
continue;
- if (IS_INT_LNG_TYPE(src->type)) {
+
+ if (IS_INT_LNG_TYPE(var->type)) {
if (!md->params[s3].inmemory) {
- if (IS_2_WORD_TYPE(src->type)) {
+ if (IS_2_WORD_TYPE(var->type)) {
s1 = PACK_REGS(
rd->argintregs[GET_LOW_REG(md->params[s3].regoff)],
rd->argintregs[GET_HIGH_REG(md->params[s3].regoff)]);
- d = emit_load(jd, iptr, src, s1);
+ d = emit_load(jd, iptr, var, s1);
M_LNGMOVE(d, s1);
}
else {
s1 = rd->argintregs[md->params[s3].regoff];
- d = emit_load(jd, iptr, src, s1);
+ d = emit_load(jd, iptr, var, s1);
M_INTMOVE(d, s1);
}
}
else {
- if (IS_2_WORD_TYPE(src->type)) {
- d = emit_load(jd, iptr, src, REG_ITMP12_PACKED);
+ 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);
}
else {
- d = emit_load(jd, iptr, src, REG_ITMP1);
+ d = emit_load(jd, iptr, var, REG_ITMP1);
M_IST(d, REG_SP, md->params[s3].regoff * 4);
}
}
else {
if (!md->params[s3].inmemory) {
s1 = rd->argfltregs[md->params[s3].regoff];
- d = emit_load(jd, iptr, src, s1);
+ d = emit_load(jd, iptr, var, s1);
M_FLTMOVE(d, s1);
}
else {
- d = emit_load(jd, iptr, src, REG_FTMP1);
- if (IS_2_WORD_TYPE(src->type))
+ d = emit_load(jd, iptr, var, REG_FTMP1);
+ if (IS_2_WORD_TYPE(var->type))
M_DST(d, REG_SP, md->params[s3].regoff * 4);
else
M_FST(d, REG_SP, md->params[s3].regoff * 4);
}
}
- } /* end of for */
+ }
switch (iptr->opc) {
case ICMD_BUILTIN:
disp = dseg_add_functionptr(cd, bte->fp);
- d = md->returntype.type;
M_ALD(REG_PV, REG_PV, disp); /* pointer to built-in-function */
+
+ /* generate the actual call */
+
M_MTCTR(REG_PV);
M_JSR;
+ REPLACEMENT_POINT_INVOKE_RETURN(cd, iptr);
disp = (s4) (cd->mcodeptr - cd->mcodebase);
M_MFLR(REG_ITMP1);
M_LDA(REG_PV, REG_ITMP1, -disp);
-
- if (INSTRUCTION_MUST_CHECK(iptr)) {
- M_CMPI(REG_RESULT, 0);
- M_BEQ(0);
- codegen_add_fillinstacktrace_ref(cd);
- }
+ emit_exception_check(cd, iptr);
break;
case ICMD_INVOKESPECIAL:
- gen_nullptr_check(rd->argintregs[0]);
- M_ILD(REG_ITMP1, rd->argintregs[0], 0); /* hardware nullptr */
- /* fall through */
+ emit_nullpointer_check(cd, iptr, REG_A0);
+ /* fall-through */
case ICMD_INVOKESTATIC:
if (lm == NULL) {
- unresolved_method *um = iptr->sx.s23.s3.um;
-
disp = dseg_add_unique_address(cd, um);
codegen_addpatchref(cd, PATCHER_invokestatic_special,
um, disp);
-
- if (opt_showdisassemble)
- M_NOP;
-
- d = md->returntype.type;
}
- else {
+ else
disp = dseg_add_address(cd, lm->stubroutine);
- d = md->returntype.type;
- }
M_ALD(REG_PV, REG_PV, disp);
+
+ /* generate the actual call */
+
M_MTCTR(REG_PV);
M_JSR;
+ REPLACEMENT_POINT_INVOKE_RETURN(cd, iptr);
disp = (s4) (cd->mcodeptr - cd->mcodebase);
M_MFLR(REG_ITMP1);
M_LDA(REG_PV, REG_ITMP1, -disp);
break;
case ICMD_INVOKEVIRTUAL:
- gen_nullptr_check(rd->argintregs[0]);
-
if (lm == NULL) {
- unresolved_method *um = iptr->sx.s23.s3.um;
-
codegen_addpatchref(cd, PATCHER_invokevirtual, um, 0);
- if (opt_showdisassemble)
- M_NOP;
-
s1 = 0;
- d = md->returntype.type;
}
else {
s1 = OFFSET(vftbl_t, table[0]) +
sizeof(methodptr) * lm->vftblindex;
- d = md->returntype.type;
}
- M_ALD(REG_METHODPTR, rd->argintregs[0],
- OFFSET(java_objectheader, vftbl));
+ /* implicit null-pointer check */
+ M_ALD(REG_METHODPTR, REG_A0, OFFSET(java_objectheader, vftbl));
M_ALD(REG_PV, REG_METHODPTR, s1);
+
+ /* generate the actual call */
+
M_MTCTR(REG_PV);
M_JSR;
+ REPLACEMENT_POINT_INVOKE_RETURN(cd, iptr);
disp = (s4) (cd->mcodeptr - cd->mcodebase);
M_MFLR(REG_ITMP1);
M_LDA(REG_PV, REG_ITMP1, -disp);
break;
case ICMD_INVOKEINTERFACE:
- gen_nullptr_check(rd->argintregs[0]);
-
if (lm == NULL) {
- unresolved_method *um = iptr->sx.s23.s3.um;
-
codegen_addpatchref(cd, PATCHER_invokeinterface, um, 0);
- if (opt_showdisassemble)
- M_NOP;
-
s1 = 0;
s2 = 0;
- d = md->returntype.type;
}
else {
s1 = OFFSET(vftbl_t, interfacetable[0]) -
sizeof(methodptr*) * lm->class->index;
s2 = sizeof(methodptr) * (lm - lm->class->methods);
-
- d = md->returntype.type;
}
- M_ALD(REG_METHODPTR, rd->argintregs[0],
- OFFSET(java_objectheader, vftbl));
+ /* implicit null-pointer check */
+ M_ALD(REG_METHODPTR, REG_A0, OFFSET(java_objectheader, vftbl));
M_ALD(REG_METHODPTR, REG_METHODPTR, s1);
M_ALD(REG_PV, REG_METHODPTR, s2);
+
+ /* generate the actual call */
+
M_MTCTR(REG_PV);
M_JSR;
+ REPLACEMENT_POINT_INVOKE_RETURN(cd, iptr);
disp = (s4) (cd->mcodeptr - cd->mcodebase);
M_MFLR(REG_ITMP1);
M_LDA(REG_PV, REG_ITMP1, -disp);
break;
}
- /* d contains return type */
+ /* store return value */
+
+ d = md->returntype.type;
if (d != TYPE_VOID) {
- if (IS_INT_LNG_TYPE(iptr->dst->type)) {
- if (IS_2_WORD_TYPE(iptr->dst->type)) {
+ if (IS_INT_LNG_TYPE(d)) {
+ if (IS_2_WORD_TYPE(d)) {
s1 = codegen_reg_of_dst(jd, iptr, REG_RESULT_PACKED);
M_LNGMOVE(REG_RESULT_PACKED, s1);
}
classinfo *super;
s4 superindex;
- super = iptr->sx.s23.s3.c.cls;
-
- if (super == NULL)
+ if (INSTRUCTION_IS_UNRESOLVED(iptr)) {
+ super = NULL;
superindex = 0;
- else
+ }
+ else {
+ super = iptr->sx.s23.s3.c.cls;
superindex = super->index;
-
+ }
+
#if defined(ENABLE_THREADS)
codegen_threadcritrestart(cd, cd->mcodeptr - cd->mcodebase);
#endif
- s1 = emit_load_s1(jd, iptr, REG_ITMP1);
-
- /* calculate interface checkcast code size */
-
- s2 = 7;
- if (!super)
- s2 += (opt_showdisassemble ? 1 : 0);
- /* calculate class checkcast code size */
-
- s3 = 8 + (s1 == REG_ITMP1);
- if (!super)
- s3 += (opt_showdisassemble ? 1 : 0);
+ s1 = emit_load_s1(jd, iptr, REG_ITMP1);
/* if class is not resolved, check which code to call */
if (super == NULL) {
M_TST(s1);
- M_BEQ(3 + (opt_showdisassemble ? 1 : 0) + s2 + 1 + s3);
+ emit_label_beq(cd, BRANCH_LABEL_1);
disp = dseg_add_unique_s4(cd, 0); /* super->flags */
iptr->sx.s23.s3.c.ref,
disp);
- if (opt_showdisassemble)
- M_NOP;
-
M_ILD(REG_ITMP2, REG_PV, disp);
M_AND_IMM(REG_ITMP2, ACC_INTERFACE, REG_ITMP2);
- M_BEQ(s2 + 1);
+ emit_label_beq(cd, BRANCH_LABEL_2);
}
/* interface checkcast code */
if ((super == NULL) || (super->flags & ACC_INTERFACE)) {
if (super == NULL) {
codegen_addpatchref(cd,
- PATCHER_checkcast_instanceof_interface,
+ PATCHER_checkcast_interface,
iptr->sx.s23.s3.c.ref,
0);
-
- if (opt_showdisassemble)
- M_NOP;
}
else {
M_TST(s1);
- M_BEQ(s2);
+ emit_label_beq(cd, BRANCH_LABEL_3);
}
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, s1);
+ emit_classcast_check(cd, iptr, BRANCH_LE, REG_ITMP3, 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, s1);
+ emit_classcast_check(cd, iptr, BRANCH_EQ, REG_ITMP3, s1);
if (super == NULL)
- M_BR(s3);
+ 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_resolve_classref_to_vftbl,
iptr->sx.s23.s3.c.ref,
disp);
-
- if (opt_showdisassemble)
- M_NOP;
}
else {
disp = dseg_add_address(cd, super->vftbl);
M_TST(s1);
- M_BEQ(s3);
+ emit_label_beq(cd, BRANCH_LABEL_5);
}
M_ALD(REG_ITMP2, s1, OFFSET(java_objectheader, vftbl));
codegen_threadcritstop(cd, cd->mcodeptr - cd->mcodebase);
#endif
M_ISUB(REG_ITMP3, REG_ITMP1, REG_ITMP3);
- } else {
+ }
+ else {
M_ILD(REG_ITMP2, REG_ITMP2, OFFSET(vftbl_t, baseval));
M_ISUB(REG_ITMP3, REG_ITMP2, REG_ITMP3);
M_ALD(REG_ITMP2, REG_PV, disp);
#endif
}
M_CMPU(REG_ITMP3, REG_ITMP2);
- M_BGT(0);
- codegen_add_classcastexception_ref(cd, s1);
+ emit_classcast_check(cd, iptr, BRANCH_GT, REG_ITMP3, s1);
+
+ if (super != NULL)
+ emit_label(cd, BRANCH_LABEL_5);
+ }
+
+ if (super == NULL) {
+ emit_label(cd, BRANCH_LABEL_1);
+ emit_label(cd, BRANCH_LABEL_4);
}
+
d = codegen_reg_of_dst(jd, iptr, s1);
}
else {
/* array type cast-check */
- s1 = emit_load_s1(jd, iptr, rd->argintregs[0]);
- M_INTMOVE(s1, rd->argintregs[0]);
+ s1 = emit_load_s1(jd, iptr, REG_A0);
+ M_INTMOVE(s1, REG_A0);
if (INSTRUCTION_IS_UNRESOLVED(iptr)) {
disp = dseg_add_unique_address(cd, NULL);
codegen_addpatchref(cd, PATCHER_resolve_classref_to_classinfo,
iptr->sx.s23.s3.c.ref,
disp);
-
- if (opt_showdisassemble)
- M_NOP;
}
else
disp = dseg_add_address(cd, iptr->sx.s23.s3.c.cls);
- M_ALD(rd->argintregs[1], REG_PV, disp);
+ M_ALD(REG_A1, REG_PV, disp);
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, s1);
+ emit_classcast_check(cd, iptr, BRANCH_EQ, REG_RESULT, s1);
s1 = emit_load_s1(jd, iptr, REG_ITMP1);
d = codegen_reg_of_dst(jd, iptr, s1);
classinfo *super;
s4 superindex;
- super = (classinfo *) iptr->val.a;
-
- if (super == NULL)
+ if (INSTRUCTION_IS_UNRESOLVED(iptr)) {
+ super = NULL;
superindex = 0;
- else
+ }
+ else {
+ super = iptr->sx.s23.s3.c.cls;
superindex = super->index;
+ }
#if defined(ENABLE_THREADS)
- codegen_threadcritrestart(cd, cd->mcodeptr - cd->mcodebase);
+ codegen_threadcritrestart(cd, cd->mcodeptr - cd->mcodebase);
#endif
s1 = emit_load_s1(jd, iptr, REG_ITMP1);
+
d = codegen_reg_of_dst(jd, iptr, REG_ITMP2);
if (s1 == d) {
M_MOV(s1, REG_ITMP1);
s1 = REG_ITMP1;
}
- /* calculate interface instanceof code size */
-
- s2 = 8;
- if (!super)
- s2 += (opt_showdisassemble ? 1 : 0);
-
- /* calculate class instanceof code size */
-
- s3 = 10;
- if (!super)
- s3 += (opt_showdisassemble ? 1 : 0);
-
M_CLR(d);
/* if class is not resolved, check which code to call */
if (super == NULL) {
M_TST(s1);
- M_BEQ(3 + (opt_showdisassemble ? 1 : 0) + s2 + 1 + s3);
+ emit_label_beq(cd, BRANCH_LABEL_1);
disp = dseg_add_unique_s4(cd, 0); /* super->flags */
codegen_addpatchref(cd, PATCHER_resolve_classref_to_flags,
iptr->sx.s23.s3.c.ref, disp);
- if (opt_showdisassemble)
- M_NOP;
-
M_ILD(REG_ITMP3, REG_PV, disp);
M_AND_IMM(REG_ITMP3, ACC_INTERFACE, REG_ITMP3);
- M_BEQ(s2 + 1);
+ emit_label_beq(cd, BRANCH_LABEL_2);
}
/* interface instanceof code */
if ((super == NULL) || (super->flags & ACC_INTERFACE)) {
if (super == NULL) {
codegen_addpatchref(cd,
- PATCHER_checkcast_instanceof_interface,
+ PATCHER_instanceof_interface,
iptr->sx.s23.s3.c.ref, 0);
-
- if (opt_showdisassemble)
- M_NOP;
}
else {
M_TST(s1);
- M_BEQ(s2);
+ emit_label_beq(cd, BRANCH_LABEL_3);
}
M_ALD(REG_ITMP1, s1, OFFSET(java_objectheader, vftbl));
M_IADD_IMM(REG_ZERO, 1, d);
if (super == NULL)
- M_BR(s3);
+ emit_label_br(cd, BRANCH_LABEL_4);
+ else
+ emit_label(cd, BRANCH_LABEL_3);
}
/* class instanceof 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_resolve_classref_to_vftbl,
iptr->sx.s23.s3.c.ref,
disp);
-
- if (opt_showdisassemble)
- M_NOP;
}
else {
disp = dseg_add_address(cd, super->vftbl);
M_TST(s1);
- M_BEQ(s3);
+ emit_label_beq(cd, BRANCH_LABEL_5);
}
M_ALD(REG_ITMP1, s1, OFFSET(java_objectheader, vftbl));
M_CLR(d);
M_BGT(1);
M_IADD_IMM(REG_ZERO, 1, d);
+
+ if (super != NULL)
+ emit_label(cd, BRANCH_LABEL_5);
}
+
+ if (super == NULL) {
+ emit_label(cd, BRANCH_LABEL_1);
+ emit_label(cd, BRANCH_LABEL_4);
+ }
+
emit_store_dst(jd, iptr, d);
}
break;
MCODECHECK((iptr->s1.argcount << 1) + 64);
- for (s1 = iptr->s1.argcount; --s1 >= 0; src = src->prev) {
+ for (s1 = iptr->s1.argcount; --s1 >= 0;) {
+ var = VAR(iptr->sx.s23.s2.args[s1]);
+
/* copy SAVEDVAR sizes to stack */
- if (src->varkind != ARGVAR) {
- s2 = emit_load(jd, iptr, src, REG_ITMP1);
+ /* Already Preallocated? */
+ if (!(var->flags & PREALLOC)) {
+ s2 = emit_load(jd, iptr, var, REG_ITMP1);
#if defined(__DARWIN__)
M_IST(s2, REG_SP, LA_SIZE + (s1 + INT_ARG_CNT) * 4);
#else
/* a0 = dimension count */
- ICONST(rd->argintregs[0], iptr->s1.argcount);
+ ICONST(REG_A0, iptr->s1.argcount);
/* is patcher function set? */
codegen_addpatchref(cd, PATCHER_resolve_classref_to_classinfo,
iptr->sx.s23.s3.c.ref, disp);
-
- if (opt_showdisassemble)
- M_NOP;
}
else
disp = dseg_add_address(cd, iptr->sx.s23.s3.c.cls);
/* a1 = arraydescriptor */
- M_ALD(rd->argintregs[1], REG_PV, disp);
+ M_ALD(REG_A1, REG_PV, disp);
/* a2 = pointer to dimensions = stack pointer */
#if defined(__DARWIN__)
- M_LDA(rd->argintregs[2], REG_SP, LA_SIZE + INT_ARG_CNT * 4);
+ M_LDA(REG_A2, REG_SP, LA_SIZE + INT_ARG_CNT * 4);
#else
- M_LDA(rd->argintregs[2], REG_SP, LA_SIZE + 3 * 4);
+ M_LDA(REG_A2, REG_SP, LA_SIZE + 3 * 4);
#endif
disp = dseg_add_functionptr(cd, BUILTIN_multianewarray);
/* check for exception before result assignment */
- M_CMPI(REG_RESULT, 0);
- M_BEQ(0);
- codegen_add_fillinstacktrace_ref(cd);
+ emit_exception_check(cd, iptr);
d = codegen_reg_of_dst(jd, iptr, REG_RESULT);
M_INTMOVE(REG_RESULT, d);
break;
default:
- *exceptionptr =
- new_internalerror("Unknown ICMD %d during code generation",
- iptr->opc);
+ exceptions_throw_internalerror("Unknown ICMD %d during code generation",
+ iptr->opc);
return false;
} /* switch */
} /* for instruction */
- /* copy values to interface registers */
-
- src = bptr->outstack;
- len = bptr->outdepth;
- MCODECHECK(64 + len);
-#if defined(ENABLE_LSRA)
- if (!opt_lsra)
-#endif
- while (src) {
- len--;
- if ((src->varkind != STACKVAR)) {
- s2 = src->type;
- if (IS_FLT_DBL_TYPE(s2)) {
- s1 = emit_load(jd, iptr, src, REG_FTMP1);
- if (!(rd->interfaces[len][s2].flags & INMEMORY))
- M_FLTMOVE(s1, rd->interfaces[len][s2].regoff);
- else
- M_DST(s1, REG_SP, rd->interfaces[len][s2].regoff * 4);
-
- } else {
- s1 = emit_load(jd, iptr, src, REG_ITMP1);
- if (!(rd->interfaces[len][s2].flags & INMEMORY)) {
- 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_LST(s1, REG_SP, rd->interfaces[len][s2].regoff * 4);
- else
- M_IST(s1, REG_SP, rd->interfaces[len][s2].regoff * 4);
- }
- }
- }
- src = src->prev;
- }
} /* if (bptr -> flags >= BBREACHED) */
} /* for basic block */
/* generate stubs */
- emit_exception_stubs(jd);
emit_patcher_stubs(jd);
- emit_replacement_stubs(jd);
-
- codegen_finish(jd);
+ REPLACEMENT_EMIT_STUBS(jd);
/* everything's ok */
{
u1 *s; /* memory to hold the stub */
ptrint *d;
- codeinfo *code;
codegendata *cd;
s4 dumpsize;
cd = DNEW(codegendata);
cd->mcodeptr = s;
- /* Store the codeinfo pointer in the same place as in the
- methodheader for compiled methods. */
-
- code = code_codeinfo_new(m);
+ /* 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) code;
+ d[2] = (ptrint) &d[1]; /* fake code->m */
M_ALD_INTERN(REG_ITMP1, REG_PV, -2 * SIZEOF_VOID_P);
M_ALD_INTERN(REG_PV, REG_PV, -3 * SIZEOF_VOID_P);
M_AST_INTERN(REG_ZERO, REG_SP, LA_LR_OFFSET);
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_add_functionptr(cd, f);
#if !defined(WITH_STATIC_CLASSPATH)
- if (f == NULL) {
+ if (f == NULL)
codegen_addpatchref(cd, PATCHER_resolve_native_function, m, funcdisp);
-
- if (opt_showdisassemble)
- M_NOP;
- }
#endif
+ /* emit trace code */
+
+ emit_verbosecall_enter(jd);
+
/* save integer and float argument registers */
j = 0;
/* create native stack info */
- M_AADD_IMM(REG_SP, cd->stackframesize * 4, rd->argintregs[0]);
- M_MOV(REG_PV, rd->argintregs[1]);
- M_AADD_IMM(REG_SP, cd->stackframesize * 4, rd->argintregs[2]);
- M_ALD(rd->argintregs[3], REG_SP, cd->stackframesize * 4 + LA_LR_OFFSET);
+ M_AADD_IMM(REG_SP, cd->stackframesize * 4, REG_A0);
+ M_MOV(REG_PV, REG_A1);
+ M_AADD_IMM(REG_SP, cd->stackframesize * 4, REG_A2);
+ M_ALD(REG_A3, 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);
if (m->flags & ACC_STATIC) {
disp = dseg_add_address(cd, m->class);
- M_ALD(rd->argintregs[1], REG_PV, disp);
+ M_ALD(REG_A1, REG_PV, disp);
}
/* put env into first argument register */
disp = dseg_add_address(cd, _Jv_env);
- M_ALD(rd->argintregs[0], REG_PV, disp);
+ M_ALD(REG_A0, REG_PV, disp);
/* generate the actual native call */
/* print call trace */
- if (JITDATA_HAS_FLAG_VERBOSECALL(jd))
- emit_verbosecall_exit(jd);
+ emit_verbosecall_exit(jd);
/* save return value */
/* remove native stackframe info */
- M_AADD_IMM(REG_SP, cd->stackframesize * 4, rd->argintregs[0]);
+ M_AADD_IMM(REG_SP, cd->stackframesize * 4, REG_A0);
disp = dseg_add_functionptr(cd, codegen_finish_native_call);
M_ALD(REG_ITMP1, REG_PV, disp);
M_MTCTR(REG_ITMP1);
projects / cacao.git / blobdiff