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++
#ifdef SOFTNULLPTRCHECK
#define gen_nullptr_check(objreg) \
if (checknull) {\
- M_BEQZ((objreg), REG);\
+ M_BEQZ((objreg), 0);\
mcode_addxnullrefs(mcodeptr);\
}
#else
}
-/* NullPointerException handlers and exception handling initialisation */
-
-/* asm_signal_exception passes exception pointer and the signal context
- structure (contains the saved registers) to the assembler handler which
- restores registers and walks through the Java exception tables.
-*/
-
-void asm_signal_exception(void *xptr, void *sigctx);
+/* NullPointerException handlers and exception handling initialisation */
+
+typedef struct sigctx_struct {
+
+ long sc_onstack; /* sigstack state to restore */
+ long sc_mask; /* signal mask to restore */
+ long sc_pc; /* pc at time of signal */
+ long sc_ps; /* psl to retore */
+ long sc_regs[32]; /* processor regs 0 to 31 */
+ long sc_ownedfp; /* fp has been used */
+ long sc_fpregs[32]; /* fp regs 0 to 31 */
+ unsigned long sc_fpcr; /* floating point control register */
+ unsigned long sc_fp_control; /* software fpcr */
+ /* rest is unused */
+ unsigned long sc_reserved1, sc_reserved2;
+ unsigned long sc_ssize;
+ char *sc_sbase;
+ unsigned long sc_traparg_a0;
+ unsigned long sc_traparg_a1;
+ unsigned long sc_traparg_a2;
+ unsigned long sc_fp_trap_pc;
+ unsigned long sc_fp_trigger_sum;
+ unsigned long sc_fp_trigger_inst;
+ unsigned long sc_retcode[2];
+} sigctx_struct;
/* NullPointerException signal handler for hardware null pointer check */
-void catch_NullPointerException(int sig, int code, void *sigctx)
+void catch_NullPointerException(int sig, int code, sigctx_struct *sigctx)
{
sigset_t nsig;
+ int instr;
+ long faultaddr;
/* Reset signal handler - necessary for SysV, does no harm for BSD */
- signal(sig, (void*) catch_NullPointerException); /* reinstall handler */
- sigemptyset(&nsig);
- sigaddset(&nsig, sig);
- sigprocmask(SIG_UNBLOCK, &nsig, NULL); /* unblock signal */
- asm_signal_exception(proto_java_lang_NullPointerException, sigctx);
+ instr = *((int*)(sigctx->sc_pc));
+ faultaddr = sigctx->sc_regs[(instr >> 16) & 0x1f];
+
+ if (faultaddr == 0) {
+ signal(sig, (void*) catch_NullPointerException); /* reinstall handler */
+ sigemptyset(&nsig);
+ sigaddset(&nsig, sig);
+ sigprocmask(SIG_UNBLOCK, &nsig, NULL); /* unblock signal */
+ sigctx->sc_regs[REG_ITMP1_XPTR] =
+ (long) proto_java_lang_NullPointerException;
+ sigctx->sc_regs[REG_ITMP2_XPC] = sigctx->sc_pc;
+ sigctx->sc_pc = (long) asm_handle_nat_exception;
+ return;
+ }
+ else {
+ faultaddr += (long) ((instr << 16) >> 16);
+ fprintf(stderr, "faulting address: 0x%16lx\n", faultaddr);
+ panic("Stack overflow");
+ }
}
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;
*/
if (runverbose && isleafmethod) {
- M_LDA (REG_SP, REG_SP, -(8*8));
+ M_LDA (REG_SP, REG_SP, -(14*8));
M_AST(REG_RA, REG_SP, 1*8);
- M_LST(argintregs[0], REG_SP, 2*8);
- M_LST(argintregs[1], REG_SP, 3*8);
- M_LST(argintregs[2], REG_SP, 4*8);
- M_LST(argintregs[3], REG_SP, 5*8);
- M_LST(argintregs[4], REG_SP, 6*8);
- M_LST(argintregs[5], REG_SP, 7*8);
+
+ M_LST(argintregs[0], REG_SP, 2*8);
+ M_LST(argintregs[1], REG_SP, 3*8);
+ M_LST(argintregs[2], REG_SP, 4*8);
+ M_LST(argintregs[3], REG_SP, 5*8);
+ M_LST(argintregs[4], REG_SP, 6*8);
+ M_LST(argintregs[5], REG_SP, 7*8);
+
+ M_DST(argfltregs[0], REG_SP, 8*8);
+ M_DST(argfltregs[1], REG_SP, 9*8);
+ M_DST(argfltregs[2], REG_SP, 10*8);
+ M_DST(argfltregs[3], REG_SP, 11*8);
+ M_DST(argfltregs[4], REG_SP, 12*8);
+ M_DST(argfltregs[5], REG_SP, 13*8);
+
p = dseg_addaddress (method);
M_ALD(REG_ITMP1, REG_PV, p);
- M_AST(REG_ITMP1, REG_SP, REG);
+ M_AST(REG_ITMP1, REG_SP, 0);
p = dseg_addaddress ((void*) (builtin_trace_args));
M_ALD(REG_PV, REG_PV, p);
M_JSR(REG_RA, REG_PV);
M_LDA(REG_PV, REG_RA, -(int)((u1*) mcodeptr - mcodebase));
M_ALD(REG_RA, REG_SP, 1*8);
- M_LLD(argintregs[0], REG_SP, 2*8);
- M_LLD(argintregs[1], REG_SP, 3*8);
- M_LLD(argintregs[2], REG_SP, 4*8);
- M_LLD(argintregs[3], REG_SP, 5*8);
- M_LLD(argintregs[4], REG_SP, 6*8);
- M_LLD(argintregs[5], REG_SP, 7*8);
- M_LDA (REG_SP, REG_SP, 8*8);
+
+ M_LLD(argintregs[0], REG_SP, 2*8);
+ M_LLD(argintregs[1], REG_SP, 3*8);
+ M_LLD(argintregs[2], REG_SP, 4*8);
+ M_LLD(argintregs[3], REG_SP, 5*8);
+ M_LLD(argintregs[4], REG_SP, 6*8);
+ M_LLD(argintregs[5], REG_SP, 7*8);
+
+ M_DLD(argfltregs[0], REG_SP, 8*8);
+ M_DLD(argfltregs[1], REG_SP, 9*8);
+ M_DLD(argfltregs[2], REG_SP, 10*8);
+ M_DLD(argfltregs[3], REG_SP, 11*8);
+ M_DLD(argfltregs[4], REG_SP, 12*8);
+ M_DLD(argfltregs[5], REG_SP, 13*8);
+
+ M_LDA (REG_SP, REG_SP, 14*8);
}
/* take arguments out of register or stack frame */
M_LDA (REG_SP, REG_SP, -8);
p = dseg_addaddress (method);
M_ALD(REG_ITMP1, REG_PV, p);
- M_AST(REG_ITMP1, REG_SP, REG);
+ M_AST(REG_ITMP1, REG_SP, 0);
p = dseg_addaddress ((void*) (builtin_trace_args));
M_ALD(REG_PV, REG_PV, p);
M_JSR(REG_RA, REG_PV);
/* 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;
case ICMD_NULLCHECKPOP: /* ..., objectref ==> ... */
var_to_reg_int(s1, src, REG_ITMP1);
- gen_nullptr_check(s1);
+ M_BEQZ(s1, 0);
+ mcode_addxnullrefs(mcodeptr);
break;
/* constant operations ************************************************/
var_to_reg_int(s1, src, REG_ITMP1);
d = reg_of_var(iptr->dst, REG_ITMP3);
- M_ISUB(REG_ZERO, s1, d, REG);
+ M_ISUB(REG_ZERO, s1, d);
store_reg_to_var_int(iptr->dst, d);
break;
var_to_reg_int(s1, src, REG_ITMP1);
d = reg_of_var(iptr->dst, REG_ITMP3);
- M_LSUB(REG_ZERO, s1, d, REG);
+ M_LSUB(REG_ZERO, s1, d);
store_reg_to_var_int(iptr->dst, d);
break;
var_to_reg_int(s1, src, REG_ITMP1);
d = reg_of_var(iptr->dst, REG_ITMP3);
- M_IADD(s1, REG_ZERO, d , REG);
+ M_IADD(s1, REG_ZERO, d );
store_reg_to_var_int(iptr->dst, d);
break;
M_BSEXT(s1, d);
}
else {
- M_SLL(s1, 56, d, CONST);
- M_SRA( d, 56, d, CONST);
+ M_SLL_IMM(s1, 56, d);
+ M_SRA_IMM( d, 56, d);
}
store_reg_to_var_int(iptr->dst, d);
break;
M_SSEXT(s1, d);
}
else {
- M_SLL(s1, 48, d, CONST);
- M_SRA( d, 48, d, CONST);
+ M_SLL_IMM(s1, 48, d);
+ M_SRA_IMM( d, 48, d);
}
store_reg_to_var_int(iptr->dst, d);
break;
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);
- M_IADD(s1, s2, d, 0);
+ M_IADD(s1, s2, d);
store_reg_to_var_int(iptr->dst, d);
break;
var_to_reg_int(s1, src, REG_ITMP1);
d = reg_of_var(iptr->dst, REG_ITMP3);
if ((iptr->val.i >= 0) && (iptr->val.i <= 255)) {
- M_IADD(s1, iptr->val.i, d, CONST);
+ M_IADD_IMM(s1, iptr->val.i, d);
}
else {
ICONST(REG_ITMP2, iptr->val.i);
- M_IADD(s1, REG_ITMP2, d, REG);
+ M_IADD(s1, REG_ITMP2, d);
}
store_reg_to_var_int(iptr->dst, d);
break;
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);
- M_LADD(s1, s2, d, 0);
+ M_LADD(s1, s2, d);
store_reg_to_var_int(iptr->dst, d);
break;
var_to_reg_int(s1, src, REG_ITMP1);
d = reg_of_var(iptr->dst, REG_ITMP3);
if ((iptr->val.l >= 0) && (iptr->val.l <= 255)) {
- M_LADD(s1, iptr->val.l, d, CONST);
+ M_LADD_IMM(s1, iptr->val.l, d);
}
else {
LCONST(REG_ITMP2, iptr->val.l);
- M_LADD(s1, REG_ITMP2, d, REG);
+ M_LADD(s1, REG_ITMP2, d);
}
store_reg_to_var_int(iptr->dst, d);
break;
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);
- M_ISUB(s1, s2, d, REG);
+ M_ISUB(s1, s2, d);
store_reg_to_var_int(iptr->dst, d);
break;
var_to_reg_int(s1, src, REG_ITMP1);
d = reg_of_var(iptr->dst, REG_ITMP3);
if ((iptr->val.i >= 0) && (iptr->val.i <= 255)) {
- M_ISUB(s1, iptr->val.i, d, CONST);
+ M_ISUB_IMM(s1, iptr->val.i, d);
}
else {
ICONST(REG_ITMP2, iptr->val.i);
- M_ISUB(s1, REG_ITMP2, d, REG);
+ M_ISUB(s1, REG_ITMP2, d);
}
store_reg_to_var_int(iptr->dst, d);
break;
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);
- M_LSUB(s1, s2, d, REG);
+ M_LSUB(s1, s2, d);
store_reg_to_var_int(iptr->dst, d);
break;
var_to_reg_int(s1, src, REG_ITMP1);
d = reg_of_var(iptr->dst, REG_ITMP3);
if ((iptr->val.l >= 0) && (iptr->val.l <= 255)) {
- M_LSUB(s1, iptr->val.l, d, CONST);
+ M_LSUB_IMM(s1, iptr->val.l, d);
}
else {
LCONST(REG_ITMP2, iptr->val.l);
- M_LSUB(s1, REG_ITMP2, d, REG);
+ M_LSUB(s1, REG_ITMP2, d);
}
store_reg_to_var_int(iptr->dst, d);
break;
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);
- M_IMUL(s1, s2, d, REG);
+ M_IMUL(s1, s2, d);
store_reg_to_var_int(iptr->dst, d);
break;
var_to_reg_int(s1, src, REG_ITMP1);
d = reg_of_var(iptr->dst, REG_ITMP3);
if ((iptr->val.i >= 0) && (iptr->val.i <= 255)) {
- M_IMUL(s1, iptr->val.i, d, CONST);
+ M_IMUL_IMM(s1, iptr->val.i, d);
}
else {
ICONST(REG_ITMP2, iptr->val.i);
- M_IMUL(s1, REG_ITMP2, d, REG);
+ M_IMUL(s1, REG_ITMP2, d);
}
store_reg_to_var_int(iptr->dst, d);
break;
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);
- M_LMUL (s1, s2, d, REG);
+ M_LMUL (s1, s2, d);
store_reg_to_var_int(iptr->dst, d);
break;
var_to_reg_int(s1, src, REG_ITMP1);
d = reg_of_var(iptr->dst, REG_ITMP3);
if ((iptr->val.l >= 0) && (iptr->val.l <= 255)) {
- M_LMUL(s1, iptr->val.l, d, CONST);
+ M_LMUL_IMM(s1, iptr->val.l, d);
}
else {
LCONST(REG_ITMP2, iptr->val.l);
- M_LMUL(s1, REG_ITMP2, d, REG);
+ M_LMUL(s1, REG_ITMP2, d);
}
store_reg_to_var_int(iptr->dst, d);
break;
d = reg_of_var(iptr->dst, REG_ITMP3);
if (iptr->val.i <= 15) {
M_LDA(REG_ITMP2, s1, (1 << iptr->val.i) -1);
- M_CMOVGE(s1, s1, REG_ITMP2, REG);
+ M_CMOVGE(s1, s1, REG_ITMP2);
}
else {
- M_SRA(s1, 63, REG_ITMP2, CONST);
- M_SRL(REG_ITMP2, 64 - iptr->val.i, REG_ITMP2, CONST);
- M_LADD(s1, REG_ITMP2, REG_ITMP2, REG);
+ M_SRA_IMM(s1, 63, REG_ITMP2);
+ M_SRL_IMM(REG_ITMP2, 64 - iptr->val.i, REG_ITMP2);
+ M_LADD(s1, REG_ITMP2, REG_ITMP2);
}
- M_SRA(REG_ITMP2, iptr->val.i, d, CONST);
+ M_SRA_IMM(REG_ITMP2, iptr->val.i, d);
store_reg_to_var_int(iptr->dst, d);
break;
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);
- M_AND(s2, 0x1f, REG_ITMP3, CONST);
- M_SLL(s1, REG_ITMP3, d, REG);
- M_IADD(d, REG_ZERO, d, REG);
+ M_AND_IMM(s2, 0x1f, REG_ITMP3);
+ M_SLL(s1, REG_ITMP3, d);
+ M_IADD(d, REG_ZERO, d);
store_reg_to_var_int(iptr->dst, d);
break;
var_to_reg_int(s1, src, REG_ITMP1);
d = reg_of_var(iptr->dst, REG_ITMP3);
- M_SLL(s1, iptr->val.i & 0x1f, d, CONST);
- M_IADD(d, REG_ZERO, d, REG);
+ M_SLL_IMM(s1, iptr->val.i & 0x1f, d);
+ M_IADD(d, REG_ZERO, d);
store_reg_to_var_int(iptr->dst, d);
break;
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);
- M_AND(s2, 0x1f, REG_ITMP3, 1);
- M_SRA(s1, REG_ITMP3, d, 0);
+ M_AND_IMM(s2, 0x1f, REG_ITMP3);
+ M_SRA(s1, REG_ITMP3, d);
store_reg_to_var_int(iptr->dst, d);
break;
var_to_reg_int(s1, src, REG_ITMP1);
d = reg_of_var(iptr->dst, REG_ITMP3);
- M_SRA(s1, iptr->val.i & 0x1f, d, CONST);
+ M_SRA_IMM(s1, iptr->val.i & 0x1f, d);
store_reg_to_var_int(iptr->dst, d);
break;
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);
- M_AND (s2, 0x1f, REG_ITMP2, 1);
+ M_AND_IMM(s2, 0x1f, REG_ITMP2);
M_IZEXT(s1, d);
- M_SRL ( d, REG_ITMP2, d, REG);
- M_IADD ( d, REG_ZERO, d, REG);
+ M_SRL(d, REG_ITMP2, d);
+ M_IADD(d, REG_ZERO, d);
store_reg_to_var_int(iptr->dst, d);
break;
var_to_reg_int(s1, src, REG_ITMP1);
d = reg_of_var(iptr->dst, REG_ITMP3);
M_IZEXT(s1, d);
- M_SRL(d, iptr->val.i & 0x1f, d, CONST);
- M_IADD(d, REG_ZERO, d, REG);
+ M_SRL_IMM(d, iptr->val.i & 0x1f, d);
+ M_IADD(d, REG_ZERO, d);
store_reg_to_var_int(iptr->dst, d);
break;
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);
- M_SLL(s1, s2, d, REG);
+ M_SLL(s1, s2, d);
store_reg_to_var_int(iptr->dst, d);
break;
var_to_reg_int(s1, src, REG_ITMP1);
d = reg_of_var(iptr->dst, REG_ITMP3);
- M_SLL(s1, iptr->val.l & 0x3f, d, CONST);
+ M_SLL_IMM(s1, iptr->val.l & 0x3f, d);
store_reg_to_var_int(iptr->dst, d);
break;
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);
- M_SRA(s1, s2, d, 0);
+ M_SRA(s1, s2, d);
store_reg_to_var_int(iptr->dst, d);
break;
var_to_reg_int(s1, src, REG_ITMP1);
d = reg_of_var(iptr->dst, REG_ITMP3);
- M_SRA(s1, iptr->val.l & 0x3f, d, CONST);
+ M_SRA_IMM(s1, iptr->val.l & 0x3f, d);
store_reg_to_var_int(iptr->dst, d);
break;
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);
- M_SRL(s1, s2, d, 0);
+ M_SRL(s1, s2, d);
store_reg_to_var_int(iptr->dst, d);
break;
var_to_reg_int(s1, src, REG_ITMP1);
d = reg_of_var(iptr->dst, REG_ITMP3);
- M_SRL(s1, iptr->val.l & 0x3f, d, CONST);
+ M_SRL_IMM(s1, iptr->val.l & 0x3f, d);
store_reg_to_var_int(iptr->dst, d);
break;
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);
- M_AND(s1, s2, d, REG);
+ M_AND(s1, s2, d);
store_reg_to_var_int(iptr->dst, d);
break;
var_to_reg_int(s1, src, REG_ITMP1);
d = reg_of_var(iptr->dst, REG_ITMP3);
if ((iptr->val.i >= 0) && (iptr->val.i <= 255)) {
- M_AND(s1, iptr->val.i, d, CONST);
+ M_AND_IMM(s1, iptr->val.i, d);
}
else if (iptr->val.i == 0xffff) {
M_CZEXT(s1, d);
}
else if (iptr->val.i == 0xffffff) {
- M_ZAPNOT(s1, 0x07, d, CONST);
+ M_ZAPNOT_IMM(s1, 0x07, d);
}
else {
ICONST(REG_ITMP2, iptr->val.i);
- M_AND(s1, REG_ITMP2, d, REG);
+ M_AND(s1, REG_ITMP2, d);
}
store_reg_to_var_int(iptr->dst, d);
break;
s1 = REG_ITMP1;
}
if ((iptr->val.i >= 0) && (iptr->val.i <= 255)) {
- M_AND(s1, iptr->val.i, d, CONST);
+ M_AND_IMM(s1, iptr->val.i, d);
M_BGEZ(s1, 3);
- M_ISUB(REG_ZERO, s1, d, REG);
- M_AND(d, iptr->val.i, d, CONST);
+ M_ISUB(REG_ZERO, s1, d);
+ M_AND_IMM(d, iptr->val.i, d);
}
else if (iptr->val.i == 0xffff) {
M_CZEXT(s1, d);
M_BGEZ(s1, 3);
- M_ISUB(REG_ZERO, s1, d, REG);
+ M_ISUB(REG_ZERO, s1, d);
M_CZEXT(d, d);
}
else if (iptr->val.i == 0xffffff) {
- M_ZAPNOT(s1, 0x07, d, CONST);
+ M_ZAPNOT_IMM(s1, 0x07, d);
M_BGEZ(s1, 3);
- M_ISUB(REG_ZERO, s1, d, REG);
- M_ZAPNOT(d, 0x07, d, CONST);
+ M_ISUB(REG_ZERO, s1, d);
+ M_ZAPNOT_IMM(d, 0x07, d);
}
else {
ICONST(REG_ITMP2, iptr->val.i);
- M_AND(s1, REG_ITMP2, d, REG);
+ M_AND(s1, REG_ITMP2, d);
M_BGEZ(s1, 3);
- M_ISUB(REG_ZERO, s1, d, REG);
- M_AND(d, REG_ITMP2, d, REG);
+ M_ISUB(REG_ZERO, s1, d);
+ M_AND(d, REG_ITMP2, d);
}
- M_ISUB(REG_ZERO, d, d, REG);
+ M_ISUB(REG_ZERO, d, d);
store_reg_to_var_int(iptr->dst, d);
break;
}
M_BLTZ(s1, 7);
M_CZEXT(s1, REG_ITMP2);
- M_SRA(s1, 16, d, CONST);
- M_CMPLT(REG_ITMP2, d, REG_ITMP1, REG);
- M_ISUB(REG_ITMP2, d, d, REG);
+ M_SRA_IMM(s1, 16, d);
+ M_CMPLT(REG_ITMP2, d, REG_ITMP1);
+ M_ISUB(REG_ITMP2, d, d);
M_CZEXT(d, d);
- M_IADD(d, REG_ITMP1, d, REG);
+ M_IADD(d, REG_ITMP1, d);
M_BR(11 + (s1 == REG_ITMP1));
- M_ISUB(REG_ZERO, s1, REG_ITMP1, REG);
+ M_ISUB(REG_ZERO, s1, REG_ITMP1);
M_CZEXT(REG_ITMP1, REG_ITMP2);
- M_SRA(REG_ITMP1, 16, d, CONST);
- M_CMPLT(REG_ITMP2, d, REG_ITMP1, REG);
- M_ISUB(REG_ITMP2, d, d, REG);
+ M_SRA_IMM(REG_ITMP1, 16, d);
+ M_CMPLT(REG_ITMP2, d, REG_ITMP1);
+ M_ISUB(REG_ITMP2, d, d);
M_CZEXT(d, d);
- M_IADD(d, REG_ITMP1, d, REG);
- M_ISUB(REG_ZERO, d, d, REG);
+ M_IADD(d, REG_ITMP1, d);
+ M_ISUB(REG_ZERO, d, d);
if (s1 == REG_ITMP1) {
var_to_reg_int(s1, src, REG_ITMP1);
}
- M_SLL(s1, 33, REG_ITMP2, CONST);
- M_CMPEQ(REG_ITMP2, REG_ZERO, REG_ITMP2, REG);
- M_ISUB(d, REG_ITMP2, d, REG);
+ M_SLL_IMM(s1, 33, REG_ITMP2);
+ M_CMPEQ(REG_ITMP2, REG_ZERO, REG_ITMP2);
+ M_ISUB(d, REG_ITMP2, d);
store_reg_to_var_int(iptr->dst, d);
break;
var_to_reg_int(s1, src, REG_ITMP1);
d = reg_of_var(iptr->dst, REG_ITMP3);
if ((iptr->val.l >= 0) && (iptr->val.l <= 255)) {
- M_AND(s1, iptr->val.l, d, CONST);
+ M_AND_IMM(s1, iptr->val.l, d);
}
else if (iptr->val.l == 0xffffL) {
M_CZEXT(s1, d);
}
else if (iptr->val.l == 0xffffffL) {
- M_ZAPNOT(s1, 0x07, d, CONST);
+ M_ZAPNOT_IMM(s1, 0x07, d);
}
else if (iptr->val.l == 0xffffffffL) {
M_IZEXT(s1, d);
}
else if (iptr->val.l == 0xffffffffffL) {
- M_ZAPNOT(s1, 0x1f, d, CONST);
+ M_ZAPNOT_IMM(s1, 0x1f, d);
}
else if (iptr->val.l == 0xffffffffffffL) {
- M_ZAPNOT(s1, 0x3f, d, CONST);
+ M_ZAPNOT_IMM(s1, 0x3f, d);
}
else if (iptr->val.l == 0xffffffffffffffL) {
- M_ZAPNOT(s1, 0x7f, d, CONST);
+ M_ZAPNOT_IMM(s1, 0x7f, d);
}
else {
LCONST(REG_ITMP2, iptr->val.l);
- M_AND(s1, REG_ITMP2, d, REG);
+ M_AND(s1, REG_ITMP2, d);
}
store_reg_to_var_int(iptr->dst, d);
break;
s1 = REG_ITMP1;
}
if ((iptr->val.l >= 0) && (iptr->val.l <= 255)) {
- M_AND(s1, iptr->val.l, d, CONST);
+ M_AND_IMM(s1, iptr->val.l, d);
M_BGEZ(s1, 3);
- M_LSUB(REG_ZERO, s1, d, REG);
- M_AND(d, iptr->val.l, d, CONST);
+ M_LSUB(REG_ZERO, s1, d);
+ M_AND_IMM(d, iptr->val.l, d);
}
else if (iptr->val.l == 0xffffL) {
M_CZEXT(s1, d);
M_BGEZ(s1, 3);
- M_LSUB(REG_ZERO, s1, d, REG);
+ M_LSUB(REG_ZERO, s1, d);
M_CZEXT(d, d);
}
else if (iptr->val.l == 0xffffffL) {
- M_ZAPNOT(s1, 0x07, d, CONST);
+ M_ZAPNOT_IMM(s1, 0x07, d);
M_BGEZ(s1, 3);
- M_LSUB(REG_ZERO, s1, d, REG);
- M_ZAPNOT(d, 0x07, d, CONST);
+ M_LSUB(REG_ZERO, s1, d);
+ M_ZAPNOT_IMM(d, 0x07, d);
}
else if (iptr->val.l == 0xffffffffL) {
M_IZEXT(s1, d);
M_BGEZ(s1, 3);
- M_LSUB(REG_ZERO, s1, d, REG);
+ M_LSUB(REG_ZERO, s1, d);
M_IZEXT(d, d);
}
else if (iptr->val.l == 0xffffffffffL) {
- M_ZAPNOT(s1, 0x1f, d, CONST);
+ M_ZAPNOT_IMM(s1, 0x1f, d);
M_BGEZ(s1, 3);
- M_LSUB(REG_ZERO, s1, d, REG);
- M_ZAPNOT(d, 0x1f, d, CONST);
+ M_LSUB(REG_ZERO, s1, d);
+ M_ZAPNOT_IMM(d, 0x1f, d);
}
else if (iptr->val.l == 0xffffffffffffL) {
- M_ZAPNOT(s1, 0x3f, d, CONST);
+ M_ZAPNOT_IMM(s1, 0x3f, d);
M_BGEZ(s1, 3);
- M_LSUB(REG_ZERO, s1, d, REG);
- M_ZAPNOT(d, 0x3f, d, CONST);
+ M_LSUB(REG_ZERO, s1, d);
+ M_ZAPNOT_IMM(d, 0x3f, d);
}
else if (iptr->val.l == 0xffffffffffffffL) {
- M_ZAPNOT(s1, 0x7f, d, CONST);
+ M_ZAPNOT_IMM(s1, 0x7f, d);
M_BGEZ(s1, 3);
- M_LSUB(REG_ZERO, s1, d, REG);
- M_ZAPNOT(d, 0x7f, d, CONST);
+ M_LSUB(REG_ZERO, s1, d);
+ M_ZAPNOT_IMM(d, 0x7f, d);
}
else {
LCONST(REG_ITMP2, iptr->val.l);
- M_AND(s1, REG_ITMP2, d, REG);
+ M_AND(s1, REG_ITMP2, d);
M_BGEZ(s1, 3);
- M_LSUB(REG_ZERO, s1, d, REG);
- M_AND(d, REG_ITMP2, d, REG);
+ M_LSUB(REG_ZERO, s1, d);
+ M_AND(d, REG_ITMP2, d);
}
- M_LSUB(REG_ZERO, d, d, REG);
+ M_LSUB(REG_ZERO, d, d);
store_reg_to_var_int(iptr->dst, d);
break;
s1 = REG_ITMP3;
}
M_CZEXT(s1, REG_ITMP2);
- M_SRA(s1, 16, d, CONST);
- M_CMPLT(REG_ITMP2, d, REG_ITMP1, REG);
- M_LSUB(REG_ITMP2, d, d, REG);
+ M_SRA_IMM(s1, 16, d);
+ M_CMPLT(REG_ITMP2, d, REG_ITMP1);
+ M_LSUB(REG_ITMP2, d, d);
M_CZEXT(d, d);
- M_LADD(d, REG_ITMP1, d, REG);
+ M_LADD(d, REG_ITMP1, d);
M_LDA(REG_ITMP2, REG_ZERO, -1);
- M_SRL(REG_ITMP2, 33, REG_ITMP2, CONST);
+ M_SRL_IMM(REG_ITMP2, 33, REG_ITMP2);
if (s1 == REG_ITMP1) {
var_to_reg_int(s1, src, REG_ITMP1);
}
- M_CMPULT(s1, REG_ITMP2, REG_ITMP2, REG);
+ M_CMPULT(s1, REG_ITMP2, REG_ITMP2);
M_BNEZ(REG_ITMP2, 11);
M_LDA(d, REG_ZERO, -257);
- M_ZAPNOT(d, 0xcd, d, CONST);
- M_LSUB(REG_ZERO, s1, REG_ITMP2, REG);
- M_CMOVGE(s1, s1, REG_ITMP2, REG);
- M_UMULH(REG_ITMP2, d, REG_ITMP2, REG);
- M_SRL(REG_ITMP2, 16, REG_ITMP2, CONST);
- M_LSUB(REG_ZERO, REG_ITMP2, d, REG);
- M_CMOVGE(s1, REG_ITMP2, d, REG);
- M_SLL(d, 16, REG_ITMP2, CONST);
- M_LADD(d, REG_ITMP2, d, REG);
- M_LSUB(s1, d, d, REG);
+ M_ZAPNOT_IMM(d, 0xcd, d);
+ M_LSUB(REG_ZERO, s1, REG_ITMP2);
+ M_CMOVGE(s1, s1, REG_ITMP2);
+ M_UMULH(REG_ITMP2, d, REG_ITMP2);
+ M_SRL_IMM(REG_ITMP2, 16, REG_ITMP2);
+ M_LSUB(REG_ZERO, REG_ITMP2, d);
+ M_CMOVGE(s1, REG_ITMP2, d);
+ M_SLL_IMM(d, 16, REG_ITMP2);
+ M_LADD(d, REG_ITMP2, d);
+ M_LSUB(s1, d, d);
store_reg_to_var_int(iptr->dst, d);
break;
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);
- M_OR( s1,s2, d, REG);
+ M_OR( s1,s2, d);
store_reg_to_var_int(iptr->dst, d);
break;
var_to_reg_int(s1, src, REG_ITMP1);
d = reg_of_var(iptr->dst, REG_ITMP3);
if ((iptr->val.i >= 0) && (iptr->val.i <= 255)) {
- M_OR(s1, iptr->val.i, d, CONST);
+ M_OR_IMM(s1, iptr->val.i, d);
}
else {
ICONST(REG_ITMP2, iptr->val.i);
- M_OR(s1, REG_ITMP2, d, REG);
+ M_OR(s1, REG_ITMP2, d);
}
store_reg_to_var_int(iptr->dst, d);
break;
var_to_reg_int(s1, src, REG_ITMP1);
d = reg_of_var(iptr->dst, REG_ITMP3);
if ((iptr->val.l >= 0) && (iptr->val.l <= 255)) {
- M_OR(s1, iptr->val.l, d, CONST);
+ M_OR_IMM(s1, iptr->val.l, d);
}
else {
LCONST(REG_ITMP2, iptr->val.l);
- M_OR(s1, REG_ITMP2, d, REG);
+ M_OR(s1, REG_ITMP2, d);
}
store_reg_to_var_int(iptr->dst, d);
break;
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);
- M_XOR(s1, s2, d, REG);
+ M_XOR(s1, s2, d);
store_reg_to_var_int(iptr->dst, d);
break;
var_to_reg_int(s1, src, REG_ITMP1);
d = reg_of_var(iptr->dst, REG_ITMP3);
if ((iptr->val.i >= 0) && (iptr->val.i <= 255)) {
- M_XOR(s1, iptr->val.i, d, CONST);
+ M_XOR_IMM(s1, iptr->val.i, d);
}
else {
ICONST(REG_ITMP2, iptr->val.i);
- M_XOR(s1, REG_ITMP2, d, REG);
+ M_XOR(s1, REG_ITMP2, d);
}
store_reg_to_var_int(iptr->dst, d);
break;
var_to_reg_int(s1, src, REG_ITMP1);
d = reg_of_var(iptr->dst, REG_ITMP3);
if ((iptr->val.l >= 0) && (iptr->val.l <= 255)) {
- M_XOR(s1, iptr->val.l, d, CONST);
+ M_XOR_IMM(s1, iptr->val.l, d);
}
else {
LCONST(REG_ITMP2, iptr->val.l);
- M_XOR(s1, REG_ITMP2, d, REG);
+ M_XOR(s1, REG_ITMP2, d);
}
store_reg_to_var_int(iptr->dst, d);
break;
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);
- M_CMPLT(s1, s2, REG_ITMP3, REG);
- M_CMPLT(s2, s1, REG_ITMP1, REG);
- M_LSUB (REG_ITMP1, REG_ITMP3, d, REG);
+ M_CMPLT(s1, s2, REG_ITMP3);
+ M_CMPLT(s2, s1, REG_ITMP1);
+ M_LSUB (REG_ITMP1, REG_ITMP3, d);
store_reg_to_var_int(iptr->dst, d);
break;
else
s1 = var->regoff;
if ((iptr->val.i >= 0) && (iptr->val.i <= 255)) {
- M_IADD(s1, iptr->val.i, s1, CONST);
+ M_IADD_IMM(s1, iptr->val.i, s1);
}
else if ((iptr->val.i > -256) && (iptr->val.i < 0)) {
- M_ISUB(s1, (-iptr->val.i), s1, CONST);
+ M_ISUB_IMM(s1, (-iptr->val.i), s1);
}
else {
M_LDA (s1, s1, iptr->val.i);
- M_IADD(s1, REG_ZERO, s1, REG);
+ M_IADD(s1, REG_ZERO, s1);
}
if (var->flags & INMEMORY)
M_LST(s1, REG_SP, 8 * var->regoff);
if (checkfloats) {
M_FDIVS(s1,s2, REG_FTMP3);
M_TRAPB;
- M_CVTDL_CS(REG_ZERO, REG_FTMP3, REG_FTMP3); /* round to integer */
+ M_CVTDL_CS(REG_FTMP3, REG_FTMP3); /* round to integer */
M_TRAPB;
- M_CVTLF(REG_ZERO, REG_FTMP3, REG_FTMP3);
+ M_CVTLF(REG_FTMP3, REG_FTMP3);
M_FMULS(REG_FTMP3, s2, REG_FTMP3);
M_TRAPB;
M_FSUBS(s1, REG_FTMP3, d);
}
else {
M_FDIV(s1,s2, REG_FTMP3);
- M_CVTDL_C(REG_ZERO, REG_FTMP3, REG_FTMP3); /* round to integer */
- M_CVTLF(REG_ZERO, REG_FTMP3, REG_FTMP3);
+ M_CVTDL_C(REG_FTMP3, REG_FTMP3); /* round to integer */
+ M_CVTLF(REG_FTMP3, REG_FTMP3);
M_FMUL(REG_FTMP3, s2, REG_FTMP3);
M_FSUB(s1, REG_FTMP3, d);
}
if (checkfloats) {
M_DDIVS(s1,s2, REG_FTMP3);
M_TRAPB;
- M_CVTDL_CS(REG_ZERO, REG_FTMP3, REG_FTMP3); /* round to integer */
+ M_CVTDL_CS(REG_FTMP3, REG_FTMP3); /* round to integer */
M_TRAPB;
- M_CVTLD(REG_ZERO, REG_FTMP3, REG_FTMP3);
+ M_CVTLD(REG_FTMP3, REG_FTMP3);
M_DMULS(REG_FTMP3, s2, REG_FTMP3);
M_TRAPB;
M_DSUBS(s1, REG_FTMP3, d);
}
else {
M_DDIV(s1,s2, REG_FTMP3);
- M_CVTDL_C(REG_ZERO, REG_FTMP3, REG_FTMP3); /* round to integer */
- M_CVTLD(REG_ZERO, REG_FTMP3, REG_FTMP3);
+ M_CVTDL_C(REG_FTMP3, REG_FTMP3); /* round to integer */
+ M_CVTLD(REG_FTMP3, REG_FTMP3);
M_DMUL(REG_FTMP3, s2, REG_FTMP3);
M_DSUB(s1, REG_FTMP3, d);
}
a = dseg_adddouble(0.0);
M_LST (s1, REG_PV, a);
M_DLD (d, REG_PV, a);
- M_CVTLF(REG_ZERO, d, d);
+ M_CVTLF(d, d);
store_reg_to_var_flt(iptr->dst, d);
break;
a = dseg_adddouble(0.0);
M_LST (s1, REG_PV, a);
M_DLD (d, REG_PV, a);
- M_CVTLD(REG_ZERO, d, d);
+ M_CVTLD(d, d);
store_reg_to_var_flt(iptr->dst, d);
break;
d = reg_of_var(iptr->dst, REG_ITMP3);
a = dseg_adddouble(0.0);
if (checkfloats) {
- M_CVTDL_CS(REG_ZERO, s1, REG_FTMP1);
+ M_CVTDL_CS(s1, REG_FTMP1);
M_TRAPB;
M_CVTLIS(REG_FTMP1, REG_FTMP2);
M_TRAPB;
}
else {
- M_CVTDL_C(REG_ZERO, s1, REG_FTMP1);
+ M_CVTDL_C(s1, REG_FTMP1);
M_CVTLI(REG_FTMP1, REG_FTMP2);
}
M_DST (REG_FTMP1, REG_PV, a);
d = reg_of_var(iptr->dst, REG_ITMP3);
a = dseg_adddouble(0.0);
if (checkfloats) {
- M_CVTDL_CS(REG_ZERO, s1, REG_FTMP1);
+ M_CVTDL_CS(s1, REG_FTMP1);
M_TRAPB;
}
else {
- M_CVTDL_C(REG_ZERO, s1, REG_FTMP1);
+ M_CVTDL_C(s1, REG_FTMP1);
}
M_DST (REG_FTMP1, REG_PV, a);
M_LLD (d, REG_PV, a);
var_to_reg_flt(s1, src, REG_FTMP1);
d = reg_of_var(iptr->dst, REG_FTMP3);
if (checkfloats) {
- M_CVTDFS(REG_ZERO, s1, d);
+ M_CVTDFS(s1, d);
M_TRAPB;
}
else {
- M_CVTDF(REG_ZERO, s1, d);
+ M_CVTDF(s1, d);
}
store_reg_to_var_flt(iptr->dst, d);
break;
var_to_reg_flt(s2, src, REG_FTMP2);
d = reg_of_var(iptr->dst, REG_ITMP3);
if (checkfloats) {
- M_LSUB (REG_ZERO, 1, d, CONST);
+ M_LSUB_IMM(REG_ZERO, 1, d);
M_FCMPEQS(s1, s2, REG_FTMP3);
M_TRAPB;
- M_FBEQZ (REG_FTMP3, CONST); /* jump over next instructions */
+ M_FBEQZ (REG_FTMP3, 1); /* jump over next instructions */
M_CLR (d);
M_FCMPLTS(s2, s1, REG_FTMP3);
M_TRAPB;
- M_FBEQZ (REG_FTMP3, CONST); /* jump over next instruction */
- M_LADD (REG_ZERO, 1, d, CONST);
+ M_FBEQZ (REG_FTMP3, 1); /* jump over next instruction */
+ M_LADD_IMM(REG_ZERO, 1, d);
}
else {
- M_LSUB (REG_ZERO, 1, d, CONST);
+ M_LSUB_IMM(REG_ZERO, 1, d);
M_FCMPEQ(s1, s2, REG_FTMP3);
- M_FBEQZ (REG_FTMP3, CONST); /* jump over next instructions */
+ M_FBEQZ (REG_FTMP3, 1); /* jump over next instructions */
M_CLR (d);
M_FCMPLT(s2, s1, REG_FTMP3);
- M_FBEQZ (REG_FTMP3, CONST); /* jump over next instruction */
- M_LADD (REG_ZERO, 1, d, CONST);
+ M_FBEQZ (REG_FTMP3, 1); /* jump over next instruction */
+ M_LADD_IMM(REG_ZERO, 1, d);
}
store_reg_to_var_int(iptr->dst, d);
break;
var_to_reg_flt(s2, src, REG_FTMP2);
d = reg_of_var(iptr->dst, REG_ITMP3);
if (checkfloats) {
- M_LADD (REG_ZERO, 1, d, CONST);
+ M_LADD_IMM(REG_ZERO, 1, d);
M_FCMPEQS(s1, s2, REG_FTMP3);
M_TRAPB;
- M_FBEQZ (REG_FTMP3, CONST); /* jump over next instruction */
+ M_FBEQZ (REG_FTMP3, 1); /* jump over next instruction */
M_CLR (d);
M_FCMPLTS(s1, s2, REG_FTMP3);
M_TRAPB;
- M_FBEQZ (REG_FTMP3, CONST); /* jump over next instruction */
- M_LSUB (REG_ZERO, 1, d, CONST);
+ M_FBEQZ (REG_FTMP3, 1); /* jump over next instruction */
+ M_LSUB_IMM(REG_ZERO, 1, d);
}
else {
- M_LADD (REG_ZERO, 1, d, CONST);
+ M_LADD_IMM(REG_ZERO, 1, d);
M_FCMPEQ(s1, s2, REG_FTMP3);
- M_FBEQZ (REG_FTMP3, CONST); /* jump over next instruction */
+ M_FBEQZ (REG_FTMP3, 1); /* jump over next instruction */
M_CLR (d);
M_FCMPLT(s1, s2, REG_FTMP3);
- M_FBEQZ (REG_FTMP3, CONST); /* jump over next instruction */
- M_LSUB (REG_ZERO, 1, d, CONST);
+ M_FBEQZ (REG_FTMP3, 1); /* jump over next instruction */
+ M_LSUB_IMM(REG_ZERO, 1, d);
}
store_reg_to_var_int(iptr->dst, d);
break;
/* 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, REG);\
- M_BEQZ(REG_ITMP3, REG);\
+ 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;
- M_SAADDQ(s2, s1, REG_ITMP1, REG);
+ 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);
break;
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;
- M_S8ADDQ(s2, s1, REG_ITMP1, REG);
+ 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);
break;
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;
- M_S4ADDQ(s2, s1, REG_ITMP1, REG);
+ 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);
break;
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;
- M_S4ADDQ(s2, s1, REG_ITMP1, REG);
+ 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);
break;
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;
- M_S8ADDQ(s2, s1, REG_ITMP1, REG);
+ 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);
break;
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, REG);
- M_LADD(s2, REG_ITMP1, REG_ITMP1, REG);
+ M_LADD(s2, s1, REG_ITMP1);
+ M_LADD(s2, REG_ITMP1, REG_ITMP1);
M_SLDU(d, REG_ITMP1, OFFSET(java_chararray, data[0]));
}
else {
- M_LADD (s2, s1, REG_ITMP1, 0);
- M_LADD (s2, REG_ITMP1, REG_ITMP1, REG);
+ M_LADD (s2, s1, REG_ITMP1);
+ M_LADD (s2, REG_ITMP1, REG_ITMP1);
M_LLD_U(REG_ITMP2, REG_ITMP1, OFFSET(java_chararray, data[0]));
M_LDA (REG_ITMP1, REG_ITMP1, OFFSET(java_chararray, data[0]));
- M_EXTWL(REG_ITMP2, REG_ITMP1, d, REG);
+ M_EXTWL(REG_ITMP2, REG_ITMP1, d);
}
store_reg_to_var_int(iptr->dst, d);
break;
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, REG);
- M_LADD(s2, REG_ITMP1, REG_ITMP1, REG);
+ M_LADD(s2, s1, REG_ITMP1);
+ M_LADD(s2, REG_ITMP1, REG_ITMP1);
M_SLDU( d, REG_ITMP1, OFFSET (java_shortarray, data[0]));
M_SSEXT(d, d);
}
else {
- M_LADD(s2, s1, REG_ITMP1, 0);
- M_LADD(s2, REG_ITMP1, REG_ITMP1, REG);
+ M_LADD(s2, s1, REG_ITMP1);
+ M_LADD(s2, REG_ITMP1, REG_ITMP1);
M_LLD_U(REG_ITMP2, REG_ITMP1, OFFSET(java_shortarray, data[0]));
M_LDA(REG_ITMP1, REG_ITMP1, OFFSET(java_shortarray, data[0])+2);
- M_EXTQH(REG_ITMP2, REG_ITMP1, d, REG);
- M_SRA(d, 48, d, CONST);
+ M_EXTQH(REG_ITMP2, REG_ITMP1, d);
+ M_SRA_IMM(d, 48, d);
}
store_reg_to_var_int(iptr->dst, d);
break;
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, REG);
+ M_LADD (s2, s1, REG_ITMP1);
M_BLDU (d, REG_ITMP1, OFFSET (java_shortarray, data[0]));
M_BSEXT (d, d);
}
else {
- M_LADD(s2, s1, REG_ITMP1, REG);
+ M_LADD(s2, s1, REG_ITMP1);
M_LLD_U(REG_ITMP2, REG_ITMP1, OFFSET(java_bytearray, data[0]));
M_LDA(REG_ITMP1, REG_ITMP1, OFFSET(java_bytearray, data[0])+1);
- M_EXTQH(REG_ITMP2, REG_ITMP1, d, REG);
- M_SRA(d, 56, d, CONST);
+ M_EXTQH(REG_ITMP2, REG_ITMP1, d);
+ M_SRA_IMM(d, 56, d);
}
store_reg_to_var_int(iptr->dst, d);
break;
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, REG);
+ M_SAADDQ(s2, s1, REG_ITMP1);
M_AST (s3, REG_ITMP1, OFFSET(java_objectarray, data[0]));
break;
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, REG);
+ M_S8ADDQ(s2, s1, REG_ITMP1);
M_LST (s3, REG_ITMP1, OFFSET(java_longarray, data[0]));
break;
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, REG);
+ M_S4ADDQ(s2, s1, REG_ITMP1);
M_IST (s3, REG_ITMP1, OFFSET(java_intarray, data[0]));
break;
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, REG);
+ M_S4ADDQ(s2, s1, REG_ITMP1);
M_FST (s3, REG_ITMP1, OFFSET(java_floatarray, data[0]));
break;
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, REG);
+ M_S8ADDQ(s2, s1, REG_ITMP1);
M_DST (s3, REG_ITMP1, OFFSET(java_doublearray, data[0]));
break;
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, REG);
- M_LADD(s2, REG_ITMP1, REG_ITMP1, REG);
+ M_LADD(s2, s1, REG_ITMP1);
+ M_LADD(s2, REG_ITMP1, REG_ITMP1);
M_SST (s3, REG_ITMP1, OFFSET(java_chararray, data[0]));
}
else {
- M_LADD (s2, s1, REG_ITMP1, REG);
- M_LADD (s2, REG_ITMP1, REG_ITMP1, REG);
+ M_LADD (s2, s1, REG_ITMP1);
+ M_LADD (s2, REG_ITMP1, REG_ITMP1);
M_LLD_U(REG_ITMP2, REG_ITMP1, OFFSET(java_chararray, data[0]));
M_LDA (REG_ITMP1, REG_ITMP1, OFFSET(java_chararray, data[0]));
- M_INSWL(s3, REG_ITMP1, REG_ITMP3, REG);
- M_MSKWL(REG_ITMP2, REG_ITMP1, REG_ITMP2, REG);
- M_OR (REG_ITMP2, REG_ITMP3, REG_ITMP2, REG);
- M_LST_U(REG_ITMP2, REG_ITMP1, REG);
+ M_INSWL(s3, REG_ITMP1, REG_ITMP3);
+ M_MSKWL(REG_ITMP2, REG_ITMP1, REG_ITMP2);
+ M_OR (REG_ITMP2, REG_ITMP3, REG_ITMP2);
+ M_LST_U(REG_ITMP2, REG_ITMP1, 0);
}
break;
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, REG);
- M_LADD(s2, REG_ITMP1, REG_ITMP1, REG);
+ M_LADD(s2, s1, REG_ITMP1);
+ M_LADD(s2, REG_ITMP1, REG_ITMP1);
M_SST (s3, REG_ITMP1, OFFSET(java_shortarray, data[0]));
}
else {
- M_LADD (s2, s1, REG_ITMP1, REG);
- M_LADD (s2, REG_ITMP1, REG_ITMP1, REG);
+ M_LADD (s2, s1, REG_ITMP1);
+ M_LADD (s2, REG_ITMP1, REG_ITMP1);
M_LLD_U(REG_ITMP2, REG_ITMP1, OFFSET(java_shortarray, data[0]));
M_LDA (REG_ITMP1, REG_ITMP1, OFFSET(java_shortarray, data[0]));
- M_INSWL(s3, REG_ITMP1, REG_ITMP3, REG);
- M_MSKWL(REG_ITMP2, REG_ITMP1, REG_ITMP2, REG);
- M_OR (REG_ITMP2, REG_ITMP3, REG_ITMP2, REG);
- M_LST_U(REG_ITMP2, REG_ITMP1, REG);
+ M_INSWL(s3, REG_ITMP1, REG_ITMP3);
+ M_MSKWL(REG_ITMP2, REG_ITMP1, REG_ITMP2);
+ M_OR (REG_ITMP2, REG_ITMP3, REG_ITMP2);
+ M_LST_U(REG_ITMP2, REG_ITMP1, 0);
}
break;
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, REG);
+ M_LADD(s2, s1, REG_ITMP1);
M_BST (s3, REG_ITMP1, OFFSET(java_bytearray, data[0]));
}
else {
- M_LADD (s2, s1, REG_ITMP1, 0);
+ M_LADD (s2, s1, REG_ITMP1);
M_LLD_U(REG_ITMP2, REG_ITMP1, OFFSET(java_bytearray, data[0]));
M_LDA (REG_ITMP1, REG_ITMP1, OFFSET(java_bytearray, data[0]));
- M_INSBL(s3, REG_ITMP1, REG_ITMP3, REG);
- M_MSKBL(REG_ITMP2, REG_ITMP1, REG_ITMP2, REG);
- M_OR (REG_ITMP2, REG_ITMP3, REG_ITMP2, REG);
- M_LST_U(REG_ITMP2, REG_ITMP1, REG);
+ M_INSBL(s3, REG_ITMP1, REG_ITMP3);
+ M_MSKBL(REG_ITMP2, REG_ITMP1, REG_ITMP2);
+ M_OR (REG_ITMP2, REG_ITMP3, REG_ITMP2);
+ M_LST_U(REG_ITMP2, REG_ITMP1, 0);
}
break;
switch (iptr->op1) {
case TYPE_INT:
var_to_reg_int(s2, src, REG_ITMP2);
- M_IST(s2, REG_ITMP1, REG);
+ M_IST(s2, REG_ITMP1, 0);
break;
case TYPE_LNG:
var_to_reg_int(s2, src, REG_ITMP2);
- M_LST(s2, REG_ITMP1, REG);
+ M_LST(s2, REG_ITMP1, 0);
break;
case TYPE_ADR:
var_to_reg_int(s2, src, REG_ITMP2);
- M_AST(s2, REG_ITMP1, REG);
+ M_AST(s2, REG_ITMP1, 0);
break;
case TYPE_FLT:
var_to_reg_flt(s2, src, REG_FTMP2);
- M_FST(s2, REG_ITMP1, REG);
+ M_FST(s2, REG_ITMP1, 0);
break;
case TYPE_DBL:
var_to_reg_flt(s2, src, REG_FTMP2);
- M_DST(s2, REG_ITMP1, REG);
+ M_DST(s2, REG_ITMP1, 0);
break;
default: panic ("internal error");
}
switch (iptr->op1) {
case TYPE_INT:
d = reg_of_var(iptr->dst, REG_ITMP3);
- M_ILD(d, REG_ITMP1, REG);
+ M_ILD(d, REG_ITMP1, 0);
store_reg_to_var_int(iptr->dst, d);
break;
case TYPE_LNG:
d = reg_of_var(iptr->dst, REG_ITMP3);
- M_LLD(d, REG_ITMP1, REG);
+ M_LLD(d, REG_ITMP1, 0);
store_reg_to_var_int(iptr->dst, d);
break;
case TYPE_ADR:
d = reg_of_var(iptr->dst, REG_ITMP3);
- M_ALD(d, REG_ITMP1, REG);
+ M_ALD(d, REG_ITMP1, 0);
store_reg_to_var_int(iptr->dst, d);
break;
case TYPE_FLT:
d = reg_of_var(iptr->dst, REG_FTMP1);
- M_FLD(d, REG_ITMP1, REG);
+ M_FLD(d, REG_ITMP1, 0);
store_reg_to_var_flt(iptr->dst, d);
break;
case TYPE_DBL:
d = reg_of_var(iptr->dst, REG_FTMP1);
- M_DLD(d, REG_ITMP1, REG);
+ M_DLD(d, REG_ITMP1, 0);
store_reg_to_var_flt(iptr->dst, d);
break;
default: panic ("internal error");
case ICMD_JSR: /* ... ==> ... */
/* op1 = target JavaVM pc */
- M_BSR(REG_ITMP1, REG);
+ M_BSR(REG_ITMP1, 0);
mcode_addreference(BlockPtrOfPC(iptr->op1), mcodeptr);
break;
/* op1 = target JavaVM pc */
var_to_reg_int(s1, src, REG_ITMP1);
- M_BEQZ(s1, REG);
+ M_BEQZ(s1, 0);
mcode_addreference(BlockPtrOfPC(iptr->op1), mcodeptr);
break;
/* op1 = target JavaVM pc */
var_to_reg_int(s1, src, REG_ITMP1);
- M_BNEZ(s1, REG);
+ M_BNEZ(s1, 0);
mcode_addreference(BlockPtrOfPC(iptr->op1), mcodeptr);
break;
var_to_reg_int(s1, src, REG_ITMP1);
if (iptr->val.i == 0) {
- M_BEQZ(s1, REG);
+ M_BEQZ(s1, 0);
}
else {
if ((iptr->val.i > 0) && (iptr->val.i <= 255)) {
- M_CMPEQ(s1, iptr->val.i, REG_ITMP1, CONST);
+ M_CMPEQ_IMM(s1, iptr->val.i, REG_ITMP1);
}
else {
ICONST(REG_ITMP2, iptr->val.i);
- M_CMPEQ(s1, REG_ITMP2, REG_ITMP1, REG);
+ M_CMPEQ(s1, REG_ITMP2, REG_ITMP1);
}
- M_BNEZ(REG_ITMP1, REG);
+ M_BNEZ(REG_ITMP1, 0);
}
mcode_addreference(BlockPtrOfPC(iptr->op1), mcodeptr);
break;
var_to_reg_int(s1, src, REG_ITMP1);
if (iptr->val.i == 0) {
- M_BLTZ(s1, REG);
+ M_BLTZ(s1, 0);
}
else {
if ((iptr->val.i > 0) && (iptr->val.i <= 255)) {
- M_CMPLT(s1, iptr->val.i, REG_ITMP1, CONST);
+ M_CMPLT_IMM(s1, iptr->val.i, REG_ITMP1);
}
else {
ICONST(REG_ITMP2, iptr->val.i);
- M_CMPLT(s1, REG_ITMP2, REG_ITMP1, REG);
+ M_CMPLT(s1, REG_ITMP2, REG_ITMP1);
}
- M_BNEZ(REG_ITMP1, REG);
+ M_BNEZ(REG_ITMP1, 0);
}
mcode_addreference(BlockPtrOfPC(iptr->op1), mcodeptr);
break;
var_to_reg_int(s1, src, REG_ITMP1);
if (iptr->val.i == 0) {
- M_BLEZ(s1, REG);
+ M_BLEZ(s1, 0);
}
else {
if ((iptr->val.i > 0) && (iptr->val.i <= 255)) {
- M_CMPLE(s1, iptr->val.i, REG_ITMP1, CONST);
+ M_CMPLE_IMM(s1, iptr->val.i, REG_ITMP1);
}
else {
ICONST(REG_ITMP2, iptr->val.i);
- M_CMPLE(s1, REG_ITMP2, REG_ITMP1, REG);
+ M_CMPLE(s1, REG_ITMP2, REG_ITMP1);
}
- M_BNEZ(REG_ITMP1, REG);
+ M_BNEZ(REG_ITMP1, 0);
}
mcode_addreference(BlockPtrOfPC(iptr->op1), mcodeptr);
break;
var_to_reg_int(s1, src, REG_ITMP1);
if (iptr->val.i == 0) {
- M_BNEZ(s1, REG);
+ M_BNEZ(s1, 0);
}
else {
if ((iptr->val.i > 0) && (iptr->val.i <= 255)) {
- M_CMPEQ(s1, iptr->val.i, REG_ITMP1, CONST);
+ M_CMPEQ_IMM(s1, iptr->val.i, REG_ITMP1);
}
else {
ICONST(REG_ITMP2, iptr->val.i);
- M_CMPEQ(s1, REG_ITMP2, REG_ITMP1, REG);
+ M_CMPEQ(s1, REG_ITMP2, REG_ITMP1);
}
- M_BEQZ(REG_ITMP1, REG);
+ M_BEQZ(REG_ITMP1, 0);
}
mcode_addreference(BlockPtrOfPC(iptr->op1), mcodeptr);
break;
var_to_reg_int(s1, src, REG_ITMP1);
if (iptr->val.i == 0) {
- M_BGTZ(s1, REG);
+ M_BGTZ(s1, 0);
}
else {
if ((iptr->val.i > 0) && (iptr->val.i <= 255)) {
- M_CMPLE(s1, iptr->val.i, REG_ITMP1, CONST);
+ M_CMPLE_IMM(s1, iptr->val.i, REG_ITMP1);
}
else {
ICONST(REG_ITMP2, iptr->val.i);
- M_CMPLE(s1, REG_ITMP2, REG_ITMP1, REG);
+ M_CMPLE(s1, REG_ITMP2, REG_ITMP1);
}
- M_BEQZ(REG_ITMP1, REG);
+ M_BEQZ(REG_ITMP1, 0);
}
mcode_addreference(BlockPtrOfPC(iptr->op1), mcodeptr);
break;
var_to_reg_int(s1, src, REG_ITMP1);
if (iptr->val.i == 0) {
- M_BGEZ(s1, REG);
+ M_BGEZ(s1, 0);
}
else {
if ((iptr->val.i > 0) && (iptr->val.i <= 255)) {
- M_CMPLT(s1, iptr->val.i, REG_ITMP1, CONST);
+ M_CMPLT_IMM(s1, iptr->val.i, REG_ITMP1);
}
else {
ICONST(REG_ITMP2, iptr->val.i);
- M_CMPLT(s1, REG_ITMP2, REG_ITMP1, REG);
+ M_CMPLT(s1, REG_ITMP2, REG_ITMP1);
}
- M_BEQZ(REG_ITMP1, REG);
+ M_BEQZ(REG_ITMP1, 0);
}
mcode_addreference(BlockPtrOfPC(iptr->op1), mcodeptr);
break;
var_to_reg_int(s1, src, REG_ITMP1);
if (iptr->val.l == 0) {
- M_BEQZ(s1, REG);
+ M_BEQZ(s1, 0);
}
else {
if ((iptr->val.l > 0) && (iptr->val.l <= 255)) {
- M_CMPEQ(s1, iptr->val.l, REG_ITMP1, CONST);
+ M_CMPEQ_IMM(s1, iptr->val.l, REG_ITMP1);
}
else {
LCONST(REG_ITMP2, iptr->val.l);
- M_CMPEQ(s1, REG_ITMP2, REG_ITMP1, REG);
+ M_CMPEQ(s1, REG_ITMP2, REG_ITMP1);
}
- M_BNEZ(REG_ITMP1, REG);
+ M_BNEZ(REG_ITMP1, 0);
}
mcode_addreference(BlockPtrOfPC(iptr->op1), mcodeptr);
break;
var_to_reg_int(s1, src, REG_ITMP1);
if (iptr->val.l == 0) {
- M_BLTZ(s1, REG);
+ M_BLTZ(s1, 0);
}
else {
if ((iptr->val.l > 0) && (iptr->val.l <= 255)) {
- M_CMPLT(s1, iptr->val.l, REG_ITMP1, CONST);
+ M_CMPLT_IMM(s1, iptr->val.l, REG_ITMP1);
}
else {
LCONST(REG_ITMP2, iptr->val.l);
- M_CMPLT(s1, REG_ITMP2, REG_ITMP1, REG);
+ M_CMPLT(s1, REG_ITMP2, REG_ITMP1);
}
- M_BNEZ(REG_ITMP1, REG);
+ M_BNEZ(REG_ITMP1, 0);
}
mcode_addreference(BlockPtrOfPC(iptr->op1), mcodeptr);
break;
var_to_reg_int(s1, src, REG_ITMP1);
if (iptr->val.l == 0) {
- M_BLEZ(s1, REG);
+ M_BLEZ(s1, 0);
}
else {
if ((iptr->val.l > 0) && (iptr->val.l <= 255)) {
- M_CMPLE(s1, iptr->val.l, REG_ITMP1, CONST);
+ M_CMPLE_IMM(s1, iptr->val.l, REG_ITMP1);
}
else {
LCONST(REG_ITMP2, iptr->val.l);
- M_CMPLE(s1, REG_ITMP2, REG_ITMP1, REG);
+ M_CMPLE(s1, REG_ITMP2, REG_ITMP1);
}
- M_BNEZ(REG_ITMP1, REG);
+ M_BNEZ(REG_ITMP1, 0);
}
mcode_addreference(BlockPtrOfPC(iptr->op1), mcodeptr);
break;
var_to_reg_int(s1, src, REG_ITMP1);
if (iptr->val.l == 0) {
- M_BNEZ(s1, REG);
+ M_BNEZ(s1, 0);
}
else {
if ((iptr->val.l > 0) && (iptr->val.l <= 255)) {
- M_CMPEQ(s1, iptr->val.l, REG_ITMP1, CONST);
+ M_CMPEQ_IMM(s1, iptr->val.l, REG_ITMP1);
}
else {
LCONST(REG_ITMP2, iptr->val.l);
- M_CMPEQ(s1, REG_ITMP2, REG_ITMP1, REG);
+ M_CMPEQ(s1, REG_ITMP2, REG_ITMP1);
}
- M_BEQZ(REG_ITMP1, REG);
+ M_BEQZ(REG_ITMP1, 0);
}
mcode_addreference(BlockPtrOfPC(iptr->op1), mcodeptr);
break;
var_to_reg_int(s1, src, REG_ITMP1);
if (iptr->val.l == 0) {
- M_BGTZ(s1, REG);
+ M_BGTZ(s1, 0);
}
else {
if ((iptr->val.l > 0) && (iptr->val.l <= 255)) {
- M_CMPLE(s1, iptr->val.l, REG_ITMP1, CONST);
+ M_CMPLE_IMM(s1, iptr->val.l, REG_ITMP1);
}
else {
LCONST(REG_ITMP2, iptr->val.l);
- M_CMPLE(s1, REG_ITMP2, REG_ITMP1, REG);
+ M_CMPLE(s1, REG_ITMP2, REG_ITMP1);
}
- M_BEQZ(REG_ITMP1, REG);
+ M_BEQZ(REG_ITMP1, 0);
}
mcode_addreference(BlockPtrOfPC(iptr->op1), mcodeptr);
break;
var_to_reg_int(s1, src, REG_ITMP1);
if (iptr->val.l == 0) {
- M_BGEZ(s1, REG);
+ M_BGEZ(s1, 0);
}
else {
if ((iptr->val.l > 0) && (iptr->val.l <= 255)) {
- M_CMPLT(s1, iptr->val.l, REG_ITMP1, CONST);
+ M_CMPLT_IMM(s1, iptr->val.l, REG_ITMP1);
}
else {
LCONST(REG_ITMP2, iptr->val.l);
- M_CMPLT(s1, REG_ITMP2, REG_ITMP1, REG);
+ M_CMPLT(s1, REG_ITMP2, REG_ITMP1);
}
- M_BEQZ(REG_ITMP1, REG);
+ M_BEQZ(REG_ITMP1, 0);
}
mcode_addreference(BlockPtrOfPC(iptr->op1), mcodeptr);
break;
var_to_reg_int(s1, src->prev, REG_ITMP1);
var_to_reg_int(s2, src, REG_ITMP2);
- M_CMPEQ(s1, s2, REG_ITMP1, REG);
- M_BNEZ(REG_ITMP1, REG);
+ M_CMPEQ(s1, s2, REG_ITMP1);
+ M_BNEZ(REG_ITMP1, 0);
mcode_addreference(BlockPtrOfPC(iptr->op1), mcodeptr);
break;
var_to_reg_int(s1, src->prev, REG_ITMP1);
var_to_reg_int(s2, src, REG_ITMP2);
- M_CMPEQ(s1, s2, REG_ITMP1, REG);
- M_BEQZ(REG_ITMP1, REG);
+ M_CMPEQ(s1, s2, REG_ITMP1);
+ M_BEQZ(REG_ITMP1, 0);
mcode_addreference(BlockPtrOfPC(iptr->op1), mcodeptr);
break;
var_to_reg_int(s1, src->prev, REG_ITMP1);
var_to_reg_int(s2, src, REG_ITMP2);
- M_CMPLT(s1, s2, REG_ITMP1, REG);
- M_BNEZ(REG_ITMP1, REG);
+ M_CMPLT(s1, s2, REG_ITMP1);
+ M_BNEZ(REG_ITMP1, 0);
mcode_addreference(BlockPtrOfPC(iptr->op1), mcodeptr);
break;
var_to_reg_int(s1, src->prev, REG_ITMP1);
var_to_reg_int(s2, src, REG_ITMP2);
- M_CMPLE(s1, s2, REG_ITMP1, REG);
- M_BEQZ(REG_ITMP1, REG);
+ M_CMPLE(s1, s2, REG_ITMP1);
+ M_BEQZ(REG_ITMP1, 0);
mcode_addreference(BlockPtrOfPC(iptr->op1), mcodeptr);
break;
var_to_reg_int(s1, src->prev, REG_ITMP1);
var_to_reg_int(s2, src, REG_ITMP2);
- M_CMPLE(s1, s2, REG_ITMP1, REG);
- M_BNEZ(REG_ITMP1, REG);
+ M_CMPLE(s1, s2, REG_ITMP1);
+ M_BNEZ(REG_ITMP1, 0);
mcode_addreference(BlockPtrOfPC(iptr->op1), mcodeptr);
break;
var_to_reg_int(s1, src->prev, REG_ITMP1);
var_to_reg_int(s2, src, REG_ITMP2);
- M_CMPLT(s1, s2, REG_ITMP1, 0);
- M_BEQZ(REG_ITMP1, REG);
+ M_CMPLT(s1, s2, REG_ITMP1);
+ M_BEQZ(REG_ITMP1, 0);
mcode_addreference(BlockPtrOfPC(iptr->op1), mcodeptr);
break;
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)) {
- M_CMPEQ(s1, REG_ZERO, d, 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)) {
- M_CMPEQ(s1, REG_ZERO, d, 0);
- M_XOR(d, 1, d, CONST);
+ 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);
break;
}
}
ICONST(d, iptr[1].val.i);
}
- if ((a >= 0) && (a <= 255)) {
- M_CMOVEQ(s1, a, d, CONST);
+ if ((s3 >= 0) && (s3 <= 255)) {
+ M_CMOVEQ_IMM(s1, s3, d);
}
else {
- ICONST(REG_ITMP2, a);
- M_CMOVEQ(s1, REG_ITMP2, d, REG);
+ ICONST(REG_ITMP2, s3);
+ M_CMOVEQ(s1, REG_ITMP2, d);
}
store_reg_to_var_int(iptr->dst, d);
break;
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)) {
- M_CMPEQ(s1, REG_ZERO, d, 0);
+ 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)) {
- M_CMPEQ(s1, REG_ZERO, d, 0);
- M_XOR(d, 1, d, CONST);
+ 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);
break;
}
}
ICONST(d, iptr[1].val.i);
}
- if ((a >= 0) && (a <= 255)) {
- M_CMOVNE(s1, a, d, CONST);
+ if ((s3 >= 0) && (s3 <= 255)) {
+ M_CMOVNE_IMM(s1, s3, d);
}
else {
- ICONST(REG_ITMP2, a);
- M_CMOVNE(s1, REG_ITMP2, d, REG);
+ ICONST(REG_ITMP2, s3);
+ M_CMOVNE(s1, REG_ITMP2, d);
}
store_reg_to_var_int(iptr->dst, d);
break;
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)) {
- M_CMPLT(s1, REG_ZERO, d, 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)) {
- M_CMPLE(REG_ZERO, s1, d, 0);
+ 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(s1, a, d, CONST);
+ if ((s3 >= 0) && (s3 <= 255)) {
+ M_CMOVLT_IMM(s1, s3, d);
}
else {
- ICONST(REG_ITMP2, a);
- M_CMOVLT(s1, REG_ITMP2, d, REG);
+ ICONST(REG_ITMP2, s3);
+ M_CMOVLT(s1, REG_ITMP2, d);
}
store_reg_to_var_int(iptr->dst, d);
break;
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)) {
- M_CMPLE(REG_ZERO, s1, d, 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)) {
- M_CMPLT(s1, REG_ZERO, d, 0);
+ 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(s1, a, d, CONST);
+ if ((s3 >= 0) && (s3 <= 255)) {
+ M_CMOVGE_IMM(s1, s3, d);
}
else {
- ICONST(REG_ITMP2, a);
- M_CMOVGE(s1, REG_ITMP2, d, REG);
+ ICONST(REG_ITMP2, s3);
+ M_CMOVGE(s1, REG_ITMP2, d);
}
store_reg_to_var_int(iptr->dst, d);
break;
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)) {
- M_CMPLT(REG_ZERO, s1, d, 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)) {
- M_CMPLE(s1, REG_ZERO, d, 0);
+ 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(s1, a, d, CONST);
+ if ((s3 >= 0) && (s3 <= 255)) {
+ M_CMOVGT_IMM(s1, s3, d);
}
else {
- ICONST(REG_ITMP2, a);
- M_CMOVGT(s1, REG_ITMP2, d, REG);
+ ICONST(REG_ITMP2, s3);
+ M_CMOVGT(s1, REG_ITMP2, d);
}
store_reg_to_var_int(iptr->dst, d);
break;
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)) {
- M_CMPLE(s1, REG_ZERO, d, 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)) {
- M_CMPLT(REG_ZERO, s1, d, 0);
+ 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(s1, a, d, CONST);
+ if ((s3 >= 0) && (s3 <= 255)) {
+ M_CMOVLE_IMM(s1, s3, d);
}
else {
- ICONST(REG_ITMP2, a);
- M_CMOVLE(s1, REG_ITMP2, d, REG);
+ ICONST(REG_ITMP2, s3);
+ M_CMOVLE(s1, REG_ITMP2, d);
}
store_reg_to_var_int(iptr->dst, d);
break;
if (runverbose) {
M_LDA (REG_SP, REG_SP, -24);
- M_AST(REG_RA, REG_SP, REG);
+ M_AST(REG_RA, REG_SP, 0);
M_LST(REG_RESULT, REG_SP, 8);
M_DST(REG_FRESULT, REG_SP,16);
a = dseg_addaddress (method);
}
M_DLD(REG_FRESULT, REG_SP,16);
M_LLD(REG_RESULT, REG_SP, 8);
- M_ALD(REG_RA, REG_SP, REG);
+ M_ALD(REG_RA, REG_SP, 0);
M_LDA (REG_SP, REG_SP, 24);
}
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 */
if (i <= 256)
- M_CMPULE(REG_ITMP1, i - 1, REG_ITMP2, CONST);
+ M_CMPULE_IMM(REG_ITMP1, i - 1, REG_ITMP2);
else {
M_LDA(REG_ITMP2, REG_ZERO, i - 1);
- M_CMPULE(REG_ITMP1, REG_ITMP2, REG_ITMP2, REG);
+ M_CMPULE(REG_ITMP1, REG_ITMP2, REG_ITMP2);
}
- M_BEQZ(REG_ITMP2, REG);
- mcode_addreference(BlockPtrOfPC(s4ptr[0]), mcodeptr);
+ M_BEQZ(REG_ITMP2, 0);
+
+
+ /* 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;
}
}
/* length of dataseg after last dseg_addtarget is used by load */
- M_SAADDQ(REG_ITMP1, REG_PV, REG_ITMP2, REG);
+ M_SAADDQ(REG_ITMP1, REG_PV, REG_ITMP2);
M_ALD(REG_ITMP2, REG_ITMP2, -dseglen);
M_JMP(REG_ZERO, REG_ITMP2);
ALIGNCODENOP;
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(s1, val, REG_ITMP2, CONST);
+ M_CMPEQ_IMM(s1, val, REG_ITMP2);
}
else {
if ((val >= -32768) && (val <= 32767)) {
a = dseg_adds4 (val);
M_ILD(REG_ITMP2, REG_PV, a);
}
- M_CMPEQ(s1, REG_ITMP2, REG_ITMP2, REG);
+ M_CMPEQ(s1, REG_ITMP2, REG_ITMP2);
}
- M_BNEZ(REG_ITMP2, REG);
- mcode_addreference(BlockPtrOfPC(s4ptr[1]), mcodeptr);
+ M_BNEZ(REG_ITMP2, 0);
+ /* 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;
}
M_ALD(REG_ITMP1, REG_ITMP1,
OFFSET(vftbl, interfacetable[0]) -
super->index * sizeof(methodptr*));
- M_CMPULT(REG_ZERO, REG_ITMP1, d, REG); /* REG_ITMP1 != 0 */
+ M_CMPULT(REG_ZERO, REG_ITMP1, d); /* REG_ITMP1 != 0 */
}
else { /* class */
s2 = super->vftbl->diffval;
M_ILD(REG_ITMP1, REG_ITMP1, OFFSET(vftbl, baseval));
M_LDA(REG_ITMP1, REG_ITMP1, - super->vftbl->baseval);
if (s2 <= 255)
- M_CMPULE(REG_ITMP1, s2, d, CONST);
+ M_CMPULE_IMM(REG_ITMP1, s2, d);
else {
M_LDA(REG_ITMP2, REG_ZERO, s2);
- M_CMPULE(REG_ITMP1, REG_ITMP2, d, REG);
+ M_CMPULE(REG_ITMP1, REG_ITMP2, d);
}
}
}
M_ALD(REG_ITMP1, s1, OFFSET(java_objectheader, vftbl));
M_ILD(REG_ITMP2, REG_ITMP1, OFFSET(vftbl, interfacetablelength));
M_LDA(REG_ITMP2, REG_ITMP2, - super->index);
- M_BLEZ(REG_ITMP2, REG);
+ M_BLEZ(REG_ITMP2, 0);
mcode_addxcastrefs(mcodeptr);
M_ALD(REG_ITMP2, REG_ITMP1,
OFFSET(vftbl, interfacetable[0]) -
super->index * sizeof(methodptr*));
- M_BEQZ(REG_ITMP2, REG);
+ M_BEQZ(REG_ITMP2, 0);
mcode_addxcastrefs(mcodeptr);
}
else { /* class */
M_ILD(REG_ITMP1, REG_ITMP1, OFFSET(vftbl, baseval));
M_LDA(REG_ITMP1, REG_ITMP1, - super->vftbl->baseval);
if (s2 == 0) {
- M_BNEZ(REG_ITMP1, REG);
+ M_BNEZ(REG_ITMP1, 0);
}
else if (s2 <= 255) {
- M_CMPULE(REG_ITMP1, s2, REG_ITMP2, CONST);
- M_BEQZ(REG_ITMP2, REG);
+ M_CMPULE_IMM(REG_ITMP1, s2, REG_ITMP2);
+ M_BEQZ(REG_ITMP2, 0);
}
else {
M_LDA(REG_ITMP2, REG_ZERO, s2);
- M_CMPULE(REG_ITMP1, REG_ITMP2, REG_ITMP2, REG);
- M_BEQZ(REG_ITMP2, REG);
+ M_CMPULE(REG_ITMP1, REG_ITMP2, REG_ITMP2);
+ M_BEQZ(REG_ITMP2, 0);
}
mcode_addxcastrefs(mcodeptr);
}
case ICMD_CHECKASIZE: /* ..., size ==> ..., size */
var_to_reg_int(s1, src, REG_ITMP1);
- M_BLTZ(s1, REG);
+ M_BLTZ(s1, 0);
mcode_addxcheckarefs(mcodeptr);
break;
for (s1 = iptr->op1; --s1 >= 0; src = src->prev) {
var_to_reg_int(s2, src, REG_ITMP1);
- M_BLTZ(s2, REG);
+ M_BLTZ(s2, 0);
mcode_addxcheckarefs(mcodeptr);
/* copy sizes to stack (argument numbers >= INT_ARG_CNT) */
/* 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);
}
-/* function: ncreatenativestub *************************************************
+/* function: createnativestub **************************************************
creates a stub routine which calls a native method
#define NATIVESTUBSIZE 11
-u1 *ncreatenativestub (functionptr f, methodinfo *m)
+u1 *createnativestub (functionptr f, methodinfo *m)
{
u8 *s = CNEW (u8, NATIVESTUBSIZE); /* memory to hold the stub */
s4 *p = (s4*) s; /* code generation pointer */
M_LDA (REG_SP, REG_SP, -8); /* build up stackframe */
- M_AST (REG_RA, REG_SP, REG); /* store return address */
+ M_AST (REG_RA, REG_SP, 0); /* store return address */
M_ALD (REG_PV, REG_PV, 8*8); /* load adress of native method */
M_JSR (REG_RA, REG_PV); /* call native method */
M_LDA (REG_PV, REG_RA, -4*4); /* recompute pv from ra */
M_ALD (REG_ITMP3, REG_PV, 9*8); /* get address of exceptionptr */
- M_ALD (REG_RA, REG_SP, REG); /* load return address */
- M_ALD (REG_ITMP1, REG_ITMP3, REG); /* load exception into reg. itmp1 */
+ M_ALD (REG_RA, REG_SP, 0); /* load return address */
+ M_ALD (REG_ITMP1, REG_ITMP3, 0); /* load exception into reg. itmp1 */
M_LDA (REG_SP, REG_SP, 8); /* remove stackframe */
- M_BNEZ (REG_ITMP1, CONST); /* if no exception then return */
+ M_BNEZ (REG_ITMP1, 1); /* if no exception then return */
M_RET (REG_ZERO, REG_RA); /* return to caller */
- M_AST (REG_ZERO, REG_ITMP3, REG); /* store NULL into exceptionptr */
+ M_AST (REG_ZERO, REG_ITMP3, 0); /* store NULL into exceptionptr */
M_LDA (REG_ITMP2, REG_RA, -4); /* move fault address into reg. itmp2 */
M_ALD (REG_ITMP3, REG_PV,10*8); /* load asm exception handler address */
projects / cacao.git / blobdiff