Authors: Andreas Krall EMAIL: cacao@complang.tuwien.ac.at
Reinhard Grafl EMAIL: cacao@complang.tuwien.ac.at
- Last Change: 1998/08/10
+ Last Change: $Id: ngen.c 132 1999-09-27 15:54:42Z chris $
*******************************************************************************/
-
+#include "jitdef.h" /* phil */
/* *****************************************************************************
/* additional functions and macros to generate code ***************************/
-#define BlockPtrOfPC(pc) block+block_index[pc]
+/* #define BlockPtrOfPC(pc) block+block_index[pc] */
+#define BlockPtrOfPC(pc) ((basicblock *) iptr->target)
+
#ifdef STATISTICS
#define COUNT_SPILLS count_spills++
varinfo *var;
basicblock *bptr;
instruction *iptr;
+ xtable *ex;
{
int p, pa, t, l, r;
(void) dseg_adds4(exceptiontablelength); /* ExTableSize */
/* create exception table */
-
- for (len = 0; len < exceptiontablelength; len++) {
- dseg_addtarget(BlockPtrOfPC(extable[len].startpc));
- dseg_addtarget(BlockPtrOfPC(extable[len].endpc));
- dseg_addtarget(BlockPtrOfPC(extable[len].handlerpc));
- (void) dseg_addaddress(extable[len].catchtype);
+
+ for (ex = extable; ex != NULL; ex = ex->down) {
+
+#ifdef LOOP_DEBUG
+ if (ex->start != NULL)
+ printf("adding start - %d - ", ex->start->debug_nr);
+ else {
+ printf("PANIC - start is NULL");
+ exit(-1);
+ }
+#endif
+
+ dseg_addtarget(ex->start);
+
+#ifdef LOOP_DEBUG
+ if (ex->end != NULL)
+ printf("adding end - %d - ", ex->end->debug_nr);
+ else {
+ printf("PANIC - end is NULL");
+ exit(-1);
+ }
+#endif
+
+ dseg_addtarget(ex->end);
+
+#ifdef LOOP_DEBUG
+ if (ex->handler != NULL)
+ printf("adding handler - %d\n", ex->handler->debug_nr);
+ else {
+ printf("PANIC - handler is NULL");
+ exit(-1);
}
+#endif
+ dseg_addtarget(ex->handler);
+
+ (void) dseg_addaddress(ex->catchtype);
+ }
+
/* initialize mcode variables */
mcodeptr = (s4*) mcodebase;
/* end of header generation */
/* walk through all basic blocks */
+ for (/* bbs = block_count, */ bptr = block; /* --bbs >= 0 */ bptr != NULL; bptr = bptr->next) {
- for (bbs = block_count, bptr = block; --bbs >= 0; bptr++) {
bptr -> mpc = (int)((u1*) mcodeptr - mcodebase);
if (bptr->flags >= BBREACHED) {
}
/* walk through all instructions */
-
+
src = bptr->instack;
len = bptr->icount;
for (iptr = bptr->iinstr;
/* memory operations **************************************************/
-#define gen_bound_check \
+ /* #define gen_bound_check \
if (checkbounds) {\
M_ILD(REG_ITMP3, s1, OFFSET(java_arrayheader, size));\
M_CMPULT(s2, REG_ITMP3, REG_ITMP3);\
M_BEQZ(REG_ITMP3, 0);\
mcode_addxboundrefs(mcodeptr);\
}
+ */
+
+#define gen_bound_check \
+ if (checkbounds) { \
+ M_ILD(REG_ITMP3, s1, OFFSET(java_arrayheader, size));\
+ M_CMPULT(s2, REG_ITMP3, REG_ITMP3);\
+ M_BEQZ(REG_ITMP3, 0);\
+ mcode_addxboundrefs(mcodeptr); \
+ }
case ICMD_ARRAYLENGTH: /* ..., arrayref ==> ..., length */
var_to_reg_int(s1, src->prev, REG_ITMP1);
var_to_reg_int(s2, src, REG_ITMP2);
d = reg_of_var(iptr->dst, REG_ITMP3);
- gen_nullptr_check(s1);
- gen_bound_check;
+ if (iptr->op1 == 0) {
+ gen_nullptr_check(s1);
+ gen_bound_check;
+ }
M_SAADDQ(s2, s1, REG_ITMP1);
M_ALD( d, REG_ITMP1, OFFSET(java_objectarray, data[0]));
store_reg_to_var_int(iptr->dst, d);
var_to_reg_int(s1, src->prev, REG_ITMP1);
var_to_reg_int(s2, src, REG_ITMP2);
d = reg_of_var(iptr->dst, REG_ITMP3);
- gen_nullptr_check(s1);
- gen_bound_check;
+ if (iptr->op1 == 0) {
+ gen_nullptr_check(s1);
+ gen_bound_check;
+ }
M_S8ADDQ(s2, s1, REG_ITMP1);
M_LLD(d, REG_ITMP1, OFFSET(java_longarray, data[0]));
store_reg_to_var_int(iptr->dst, d);
var_to_reg_int(s1, src->prev, REG_ITMP1);
var_to_reg_int(s2, src, REG_ITMP2);
d = reg_of_var(iptr->dst, REG_ITMP3);
- gen_nullptr_check(s1);
- gen_bound_check;
+ if (iptr->op1 == 0) {
+ gen_nullptr_check(s1);
+ gen_bound_check;
+ }
+
M_S4ADDQ(s2, s1, REG_ITMP1);
M_ILD(d, REG_ITMP1, OFFSET(java_intarray, data[0]));
store_reg_to_var_int(iptr->dst, d);
var_to_reg_int(s1, src->prev, REG_ITMP1);
var_to_reg_int(s2, src, REG_ITMP2);
d = reg_of_var(iptr->dst, REG_FTMP3);
- gen_nullptr_check(s1);
- gen_bound_check;
+ if (iptr->op1 == 0) {
+ gen_nullptr_check(s1);
+ gen_bound_check;
+ }
M_S4ADDQ(s2, s1, REG_ITMP1);
M_FLD(d, REG_ITMP1, OFFSET(java_floatarray, data[0]));
store_reg_to_var_flt(iptr->dst, d);
var_to_reg_int(s1, src->prev, REG_ITMP1);
var_to_reg_int(s2, src, REG_ITMP2);
d = reg_of_var(iptr->dst, REG_FTMP3);
- gen_nullptr_check(s1);
- gen_bound_check;
+ if (iptr->op1 == 0) {
+ gen_nullptr_check(s1);
+ gen_bound_check;
+ }
M_S8ADDQ(s2, s1, REG_ITMP1);
M_DLD(d, REG_ITMP1, OFFSET(java_doublearray, data[0]));
store_reg_to_var_flt(iptr->dst, d);
var_to_reg_int(s1, src->prev, REG_ITMP1);
var_to_reg_int(s2, src, REG_ITMP2);
d = reg_of_var(iptr->dst, REG_ITMP3);
- gen_nullptr_check(s1);
- gen_bound_check;
+ if (iptr->op1 == 0) {
+ gen_nullptr_check(s1);
+ gen_bound_check;
+ }
if (has_ext_instr_set) {
M_LADD(s2, s1, REG_ITMP1);
M_LADD(s2, REG_ITMP1, REG_ITMP1);
var_to_reg_int(s1, src->prev, REG_ITMP1);
var_to_reg_int(s2, src, REG_ITMP2);
d = reg_of_var(iptr->dst, REG_ITMP3);
- gen_nullptr_check(s1);
- gen_bound_check;
+ if (iptr->op1 == 0) {
+ gen_nullptr_check(s1);
+ gen_bound_check;
+ }
if (has_ext_instr_set) {
M_LADD(s2, s1, REG_ITMP1);
M_LADD(s2, REG_ITMP1, REG_ITMP1);
var_to_reg_int(s1, src->prev, REG_ITMP1);
var_to_reg_int(s2, src, REG_ITMP2);
d = reg_of_var(iptr->dst, REG_ITMP3);
- gen_nullptr_check(s1);
- gen_bound_check;
+ if (iptr->op1 == 0) {
+ gen_nullptr_check(s1);
+ gen_bound_check;
+ }
if (has_ext_instr_set) {
M_LADD (s2, s1, REG_ITMP1);
M_BLDU (d, REG_ITMP1, OFFSET (java_shortarray, data[0]));
var_to_reg_int(s1, src->prev->prev, REG_ITMP1);
var_to_reg_int(s2, src->prev, REG_ITMP2);
- gen_nullptr_check(s1);
- gen_bound_check;
+ if (iptr->op1 == 0) {
+ gen_nullptr_check(s1);
+ gen_bound_check;
+ }
var_to_reg_int(s3, src, REG_ITMP3);
M_SAADDQ(s2, s1, REG_ITMP1);
M_AST (s3, REG_ITMP1, OFFSET(java_objectarray, data[0]));
var_to_reg_int(s1, src->prev->prev, REG_ITMP1);
var_to_reg_int(s2, src->prev, REG_ITMP2);
- gen_nullptr_check(s1);
- gen_bound_check;
+ if (iptr->op1 == 0) {
+ gen_nullptr_check(s1);
+ gen_bound_check;
+ }
var_to_reg_int(s3, src, REG_ITMP3);
M_S8ADDQ(s2, s1, REG_ITMP1);
M_LST (s3, REG_ITMP1, OFFSET(java_longarray, data[0]));
var_to_reg_int(s1, src->prev->prev, REG_ITMP1);
var_to_reg_int(s2, src->prev, REG_ITMP2);
- gen_nullptr_check(s1);
- gen_bound_check;
+ if (iptr->op1 == 0) {
+ gen_nullptr_check(s1);
+ gen_bound_check;
+ }
+
var_to_reg_int(s3, src, REG_ITMP3);
M_S4ADDQ(s2, s1, REG_ITMP1);
M_IST (s3, REG_ITMP1, OFFSET(java_intarray, data[0]));
var_to_reg_int(s1, src->prev->prev, REG_ITMP1);
var_to_reg_int(s2, src->prev, REG_ITMP2);
- gen_nullptr_check(s1);
- gen_bound_check;
+ if (iptr->op1 == 0) {
+ gen_nullptr_check(s1);
+ gen_bound_check;
+ }
var_to_reg_flt(s3, src, REG_FTMP3);
M_S4ADDQ(s2, s1, REG_ITMP1);
M_FST (s3, REG_ITMP1, OFFSET(java_floatarray, data[0]));
var_to_reg_int(s1, src->prev->prev, REG_ITMP1);
var_to_reg_int(s2, src->prev, REG_ITMP2);
- gen_nullptr_check(s1);
- gen_bound_check;
+ if (iptr->op1 == 0) {
+ gen_nullptr_check(s1);
+ gen_bound_check;
+ }
var_to_reg_flt(s3, src, REG_FTMP3);
M_S8ADDQ(s2, s1, REG_ITMP1);
M_DST (s3, REG_ITMP1, OFFSET(java_doublearray, data[0]));
var_to_reg_int(s1, src->prev->prev, REG_ITMP1);
var_to_reg_int(s2, src->prev, REG_ITMP2);
- gen_nullptr_check(s1);
- gen_bound_check;
+ if (iptr->op1 == 0) {
+ gen_nullptr_check(s1);
+ gen_bound_check;
+ }
var_to_reg_int(s3, src, REG_ITMP3);
if (has_ext_instr_set) {
M_LADD(s2, s1, REG_ITMP1);
var_to_reg_int(s1, src->prev->prev, REG_ITMP1);
var_to_reg_int(s2, src->prev, REG_ITMP2);
- gen_nullptr_check(s1);
- gen_bound_check;
+ if (iptr->op1 == 0) {
+ gen_nullptr_check(s1);
+ gen_bound_check;
+ }
var_to_reg_int(s3, src, REG_ITMP3);
if (has_ext_instr_set) {
M_LADD(s2, s1, REG_ITMP1);
var_to_reg_int(s1, src->prev->prev, REG_ITMP1);
var_to_reg_int(s2, src->prev, REG_ITMP2);
- gen_nullptr_check(s1);
- gen_bound_check;
+ if (iptr->op1 == 0) {
+ gen_nullptr_check(s1);
+ gen_bound_check;
+ }
var_to_reg_int(s3, src, REG_ITMP3);
if (has_ext_instr_set) {
M_LADD(s2, s1, REG_ITMP1);
var_to_reg_int(s1, src, REG_ITMP1);
d = reg_of_var(iptr->dst, REG_ITMP3);
- a = iptr->val.i;
+ s3 = iptr->val.i;
if (iptr[1].opc == ICMD_ELSE_ICONST) {
- if ((a == 1) && (iptr[1].val.i == 0)) {
+ if ((s3 == 1) && (iptr[1].val.i == 0)) {
M_CMPEQ(s1, REG_ZERO, d);
store_reg_to_var_int(iptr->dst, d);
break;
}
- if ((a == 0) && (iptr[1].val.i == 1)) {
+ if ((s3 == 0) && (iptr[1].val.i == 1)) {
M_CMPEQ(s1, REG_ZERO, d);
M_XOR_IMM(d, 1, d);
store_reg_to_var_int(iptr->dst, d);
}
ICONST(d, iptr[1].val.i);
}
- if ((a >= 0) && (a <= 255)) {
- M_CMOVEQ_IMM(s1, a, d);
+ if ((s3 >= 0) && (s3 <= 255)) {
+ M_CMOVEQ_IMM(s1, s3, d);
}
else {
- ICONST(REG_ITMP2, a);
+ ICONST(REG_ITMP2, s3);
M_CMOVEQ(s1, REG_ITMP2, d);
}
store_reg_to_var_int(iptr->dst, d);
var_to_reg_int(s1, src, REG_ITMP1);
d = reg_of_var(iptr->dst, REG_ITMP3);
- a = iptr->val.i;
+ s3 = iptr->val.i;
if (iptr[1].opc == ICMD_ELSE_ICONST) {
- if ((a == 0) && (iptr[1].val.i == 1)) {
+ if ((s3 == 0) && (iptr[1].val.i == 1)) {
M_CMPEQ(s1, REG_ZERO, d);
store_reg_to_var_int(iptr->dst, d);
break;
}
- if ((a == 1) && (iptr[1].val.i == 0)) {
+ if ((s3 == 1) && (iptr[1].val.i == 0)) {
M_CMPEQ(s1, REG_ZERO, d);
M_XOR_IMM(d, 1, d);
store_reg_to_var_int(iptr->dst, d);
}
ICONST(d, iptr[1].val.i);
}
- if ((a >= 0) && (a <= 255)) {
- M_CMOVNE_IMM(s1, a, d);
+ if ((s3 >= 0) && (s3 <= 255)) {
+ M_CMOVNE_IMM(s1, s3, d);
}
else {
- ICONST(REG_ITMP2, a);
+ ICONST(REG_ITMP2, s3);
M_CMOVNE(s1, REG_ITMP2, d);
}
store_reg_to_var_int(iptr->dst, d);
var_to_reg_int(s1, src, REG_ITMP1);
d = reg_of_var(iptr->dst, REG_ITMP3);
- a = iptr->val.i;
+ s3 = iptr->val.i;
if ((iptr[1].opc == ICMD_ELSE_ICONST)) {
- if ((a == 1) && (iptr[1].val.i == 0)) {
+ if ((s3 == 1) && (iptr[1].val.i == 0)) {
M_CMPLT(s1, REG_ZERO, d);
store_reg_to_var_int(iptr->dst, d);
break;
}
- if ((a == 0) && (iptr[1].val.i == 1)) {
+ if ((s3 == 0) && (iptr[1].val.i == 1)) {
M_CMPLE(REG_ZERO, s1, d);
store_reg_to_var_int(iptr->dst, d);
break;
}
ICONST(d, iptr[1].val.i);
}
- if ((a >= 0) && (a <= 255)) {
- M_CMOVLT_IMM(s1, a, d);
+ if ((s3 >= 0) && (s3 <= 255)) {
+ M_CMOVLT_IMM(s1, s3, d);
}
else {
- ICONST(REG_ITMP2, a);
+ ICONST(REG_ITMP2, s3);
M_CMOVLT(s1, REG_ITMP2, d);
}
store_reg_to_var_int(iptr->dst, d);
var_to_reg_int(s1, src, REG_ITMP1);
d = reg_of_var(iptr->dst, REG_ITMP3);
- a = iptr->val.i;
+ s3 = iptr->val.i;
if ((iptr[1].opc == ICMD_ELSE_ICONST)) {
- if ((a == 1) && (iptr[1].val.i == 0)) {
+ if ((s3 == 1) && (iptr[1].val.i == 0)) {
M_CMPLE(REG_ZERO, s1, d);
store_reg_to_var_int(iptr->dst, d);
break;
}
- if ((a == 0) && (iptr[1].val.i == 1)) {
+ if ((s3 == 0) && (iptr[1].val.i == 1)) {
M_CMPLT(s1, REG_ZERO, d);
store_reg_to_var_int(iptr->dst, d);
break;
}
ICONST(d, iptr[1].val.i);
}
- if ((a >= 0) && (a <= 255)) {
- M_CMOVGE_IMM(s1, a, d);
+ if ((s3 >= 0) && (s3 <= 255)) {
+ M_CMOVGE_IMM(s1, s3, d);
}
else {
- ICONST(REG_ITMP2, a);
+ ICONST(REG_ITMP2, s3);
M_CMOVGE(s1, REG_ITMP2, d);
}
store_reg_to_var_int(iptr->dst, d);
var_to_reg_int(s1, src, REG_ITMP1);
d = reg_of_var(iptr->dst, REG_ITMP3);
- a = iptr->val.i;
+ s3 = iptr->val.i;
if ((iptr[1].opc == ICMD_ELSE_ICONST)) {
- if ((a == 1) && (iptr[1].val.i == 0)) {
+ if ((s3 == 1) && (iptr[1].val.i == 0)) {
M_CMPLT(REG_ZERO, s1, d);
store_reg_to_var_int(iptr->dst, d);
break;
}
- if ((a == 0) && (iptr[1].val.i == 1)) {
+ if ((s3 == 0) && (iptr[1].val.i == 1)) {
M_CMPLE(s1, REG_ZERO, d);
store_reg_to_var_int(iptr->dst, d);
break;
}
ICONST(d, iptr[1].val.i);
}
- if ((a >= 0) && (a <= 255)) {
- M_CMOVGT_IMM(s1, a, d);
+ if ((s3 >= 0) && (s3 <= 255)) {
+ M_CMOVGT_IMM(s1, s3, d);
}
else {
- ICONST(REG_ITMP2, a);
+ ICONST(REG_ITMP2, s3);
M_CMOVGT(s1, REG_ITMP2, d);
}
store_reg_to_var_int(iptr->dst, d);
var_to_reg_int(s1, src, REG_ITMP1);
d = reg_of_var(iptr->dst, REG_ITMP3);
- a = iptr->val.i;
+ s3 = iptr->val.i;
if ((iptr[1].opc == ICMD_ELSE_ICONST)) {
- if ((a == 1) && (iptr[1].val.i == 0)) {
+ if ((s3 == 1) && (iptr[1].val.i == 0)) {
M_CMPLE(s1, REG_ZERO, d);
store_reg_to_var_int(iptr->dst, d);
break;
}
- if ((a == 0) && (iptr[1].val.i == 1)) {
+ if ((s3 == 0) && (iptr[1].val.i == 1)) {
M_CMPLT(REG_ZERO, s1, d);
store_reg_to_var_int(iptr->dst, d);
break;
}
ICONST(d, iptr[1].val.i);
}
- if ((a >= 0) && (a <= 255)) {
- M_CMOVLE_IMM(s1, a, d);
+ if ((s3 >= 0) && (s3 <= 255)) {
+ M_CMOVLE_IMM(s1, s3, d);
}
else {
- ICONST(REG_ITMP2, a);
+ ICONST(REG_ITMP2, s3);
M_CMOVLE(s1, REG_ITMP2, d);
}
store_reg_to_var_int(iptr->dst, d);
case ICMD_TABLESWITCH: /* ..., index ==> ... */
{
s4 i, l, *s4ptr;
+ void **tptr;
+
+ tptr = (void **) iptr->target;
s4ptr = iptr->val.a;
l = s4ptr[1]; /* low */
var_to_reg_int(s1, src, REG_ITMP1);
if (l == 0)
{M_INTMOVE(s1, REG_ITMP1);}
- else
+ else if (l <= 32768) {
M_LDA(REG_ITMP1, s1, -l);
+ }
+ else {
+ ICONST(REG_ITMP2, l);
+ M_ISUB(s1, REG_ITMP2, REG_ITMP1);
+ }
i = i - l + 1;
/* range check */
M_CMPULE(REG_ITMP1, REG_ITMP2, REG_ITMP2);
}
M_BEQZ(REG_ITMP2, 0);
- mcode_addreference(BlockPtrOfPC(s4ptr[0]), mcodeptr);
+
+
+ /* mcode_addreference(BlockPtrOfPC(s4ptr[0]), mcodeptr); */
+ mcode_addreference((basicblock *) tptr[0], mcodeptr);
/* build jump table top down and use address of lowest entry */
- s4ptr += 3 + i;
+ /* s4ptr += 3 + i; */
+ tptr += i;
+
while (--i >= 0) {
- dseg_addtarget(BlockPtrOfPC(*--s4ptr));
+ /* dseg_addtarget(BlockPtrOfPC(*--s4ptr)); */
+ dseg_addtarget((basicblock *) tptr[0]);
+ --tptr;
}
}
case ICMD_LOOKUPSWITCH: /* ..., key ==> ... */
{
s4 i, l, val, *s4ptr;
+ void **tptr;
+
+ tptr = (void **) iptr->target;
s4ptr = iptr->val.a;
l = s4ptr[0]; /* default */
var_to_reg_int(s1, src, REG_ITMP1);
while (--i >= 0) {
s4ptr += 2;
+ ++tptr;
+
val = s4ptr[0];
if ((val >= 0) && (val <= 255)) {
M_CMPEQ_IMM(s1, val, REG_ITMP2);
M_CMPEQ(s1, REG_ITMP2, REG_ITMP2);
}
M_BNEZ(REG_ITMP2, 0);
- mcode_addreference(BlockPtrOfPC(s4ptr[1]), mcodeptr);
+ /* mcode_addreference(BlockPtrOfPC(s4ptr[1]), mcodeptr); */
+ mcode_addreference((basicblock *) tptr[0], mcodeptr);
}
M_BR(0);
- mcode_addreference(BlockPtrOfPC(l), mcodeptr);
+ /* mcode_addreference(BlockPtrOfPC(l), mcodeptr); */
+
+ tptr = (void **) iptr->target;
+ mcode_addreference((basicblock *) tptr[0], mcodeptr);
+
ALIGNCODENOP;
break;
}
/* a0 = dimension count */
- M_LDA(argintregs[0], REG_ZERO, iptr->op1);
+ ICONST(argintregs[0], iptr->op1);
/* a1 = arraydescriptor */
while (ml < -32768) {ml += 65536; mh--;}
M_LDA(REG_PV, REG_RA, ml);
M_LDAH(REG_PV, REG_PV, mh);
- }
+ }
s1 = reg_of_var(iptr->dst, REG_RESULT);
M_INTMOVE(REG_RESULT, s1);
store_reg_to_var_int(iptr->dst, s1);
default: sprintf (logtext, "Unknown pseudo command: %d", iptr->opc);
error();
+
+
+
} /* switch */
+
} /* for instruction */
-
+
/* copy values to interface registers */
src = bptr->outstack;
} /* if (bptr -> flags >= BBREACHED) */
} /* for basic block */
- bptr -> mpc = (int)((u1*) mcodeptr - mcodebase);
+ /* bptr -> mpc = (int)((u1*) mcodeptr - mcodebase); */
{
/* generate bound check stubs */
continue;
}
+
gen_resolvebranch((u1*) mcodebase + xboundrefs->branchpos,
xboundrefs->branchpos, (u1*) mcodeptr - mcodebase);
MCODECHECK(8);
- M_LDA(REG_ITMP2_XPC, REG_PV, xboundrefs->branchpos);
+ M_LDA(REG_ITMP2_XPC, REG_PV, xboundrefs->branchpos - 4);
if (xcodeptr != NULL) {
M_BR((xcodeptr-mcodeptr)-1);
MCODECHECK(8);
- M_LDA(REG_ITMP2_XPC, REG_PV, xcheckarefs->branchpos);
+ M_LDA(REG_ITMP2_XPC, REG_PV, xcheckarefs->branchpos - 4);
if (xcodeptr != NULL) {
M_BR((xcodeptr-mcodeptr)-1);
MCODECHECK(8);
- M_LDA(REG_ITMP2_XPC, REG_PV, xcastrefs->branchpos);
+ M_LDA(REG_ITMP2_XPC, REG_PV, xcastrefs->branchpos - 4);
if (xcodeptr != NULL) {
M_BR((xcodeptr-mcodeptr)-1);
projects / cacao.git / blobdiff