/* src/vm/jit/mips/codegen.c - machine code generator for MIPS
- Copyright (C) 1996-2005 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
+ Copyright (C) 1996-2005, 2006 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
This file is part of CACAO.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- 02111-1307, USA.
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ 02110-1301, USA.
- Contact: cacao@complang.tuwien.ac.at
+ Contact: cacao@cacaojvm.org
Authors: Andreas Krall
Reinhard Grafl
Changes: Christian Thalinger
Christian Ullrich
+ Edwin Steiner
Contains the codegenerator for an MIPS (R4000 or higher) processor.
This module generates MIPS machine code for a sequence of
intermediate code commands (ICMDs).
- $Id: codegen.c 3023 2005-07-12 23:49:49Z twisti $
+ $Id: codegen.c 4654 2006-03-19 19:46:11Z edwin $
*/
+#include "config.h"
+
#include <assert.h>
#include <stdio.h>
-#include "config.h"
+#include "vm/types.h"
#include "md.h"
#include "md-abi.h"
-#include "md-abi.inc"
#include "vm/jit/mips/arch.h"
#include "vm/jit/mips/codegen.h"
-#include "vm/jit/mips/types.h"
-#include "cacao/cacao.h"
#include "native/native.h"
#include "vm/builtin.h"
+#include "vm/class.h"
+#include "vm/exceptions.h"
+#include "vm/options.h"
#include "vm/stringlocal.h"
+#include "vm/vm.h"
#include "vm/jit/asmpart.h"
-#include "vm/jit/codegen.inc"
+#include "vm/jit/codegen-common.h"
+#include "vm/jit/dseg.h"
#include "vm/jit/jit.h"
-
-#if defined(LSRA)
-# include "vm/jit/lsra.h"
-# include "vm/jit/lsra.inc"
-#endif
-
#include "vm/jit/patcher.h"
#include "vm/jit/reg.h"
-#include "vm/jit/reg.inc"
+#include "vm/jit/replace.h"
+
+#if defined(ENABLE_LSRA)
+# include "vm/jit/allocator/lsra.h"
+#endif
/* codegen *********************************************************************
*******************************************************************************/
-void codegen(methodinfo *m, codegendata *cd, registerdata *rd)
+bool codegen(methodinfo *m, codegendata *cd, registerdata *rd)
{
s4 len, s1, s2, s3, d, disp;
ptrint a;
methodinfo *lm; /* local methodinfo for ICMD_INVOKE* */
builtintable_entry *bte;
methoddesc *md;
+ rplpoint *replacementpoint;
{
s4 i, p, t, l;
(void) dseg_adds4(cd, m->isleafmethod); /* IsLeaf */
(void) dseg_adds4(cd, INT_SAV_CNT - rd->savintreguse); /* IntSave */
(void) dseg_adds4(cd, FLT_SAV_CNT - rd->savfltreguse); /* FltSave */
-
dseg_addlinenumbertablesize(cd);
-
(void) dseg_adds4(cd, cd->exceptiontablelength); /* ExTableSize */
/* create exception table */
/* initialize mcode variables */
- mcodeptr = (s4 *) cd->mcodebase;
- cd->mcodeend = (s4 *) (cd->mcodebase + cd->mcodesize);
- MCODECHECK(128 + m->paramcount);
+ mcodeptr = (s4 *) cd->mcodeptr;
+
+ /* initialize the last patcher pointer */
+
+ cd->lastmcodeptr = (u1 *) mcodeptr;
/* create stack frame (if necessary) */
s1 = rd->memuse;
- if (runverbose) {
+ if (opt_verbosecall) {
M_LDA(REG_SP, REG_SP, -(INT_ARG_CNT + FLT_ARG_CNT) * 8);
for (p = 0; p < INT_ARG_CNT; p++)
if (m->flags & ACC_STATIC) {
p = dseg_addaddress(cd, m->class);
- M_ALD(REG_ITMP1, REG_PV, p);
- M_AST(REG_ITMP1, REG_SP, s1 * 8);
+ M_ALD(rd->argintregs[0], REG_PV, p);
p = dseg_addaddress(cd, BUILTIN_staticmonitorenter);
M_ALD(REG_ITMP3, REG_PV, p);
M_JSR(REG_RA, REG_ITMP3);
- M_INTMOVE(REG_ITMP1, rd->argintregs[0]); /* branch delay */
- d = -(s4) ((u1 *) mcodeptr - cd->mcodebase);
- M_LDA(REG_PV, REG_RA, d);
-
+ M_AST(rd->argintregs[0], REG_SP, s1 * 8); /* branch delay */
+
} else {
M_BEQZ(rd->argintregs[0], 0);
- codegen_addxnullrefs(cd, mcodeptr);
+ codegen_add_nullpointerexception_ref(cd, mcodeptr);
p = dseg_addaddress(cd, BUILTIN_monitorenter);
M_ALD(REG_ITMP3, REG_PV, p);
M_JSR(REG_RA, REG_ITMP3);
- M_AST(rd->argintregs[0], REG_SP, s1 * 8); /* br delay */
- d = -(s4) ((u1 *) mcodeptr - cd->mcodebase);
- M_LDA(REG_PV, REG_RA, d);
+ M_AST(rd->argintregs[0], REG_SP, s1 * 8); /* branch delay */
}
- if (runverbose) {
+ if (opt_verbosecall) {
for (p = 0; p < INT_ARG_CNT; p++)
M_LLD(rd->argintregs[p], REG_SP, p * 8);
/* copy argument registers to stack and call trace function */
- if (runverbose) {
+ if (opt_verbosecall) {
M_LDA(REG_SP, REG_SP, -(2 + INT_ARG_CNT + FLT_ARG_CNT + INT_TMP_CNT + FLT_TMP_CNT) * 8);
- M_LST(REG_RA, REG_SP, 1 * 8);
+ M_AST(REG_RA, REG_SP, 1 * 8);
/* save integer argument registers */
p = dseg_addaddress(cd, m);
M_ALD(REG_ITMP1, REG_PV, p);
- M_LST(REG_ITMP1, REG_SP, 0);
- p = dseg_addaddress(cd, (void *) builtin_trace_args);
- M_ALD(REG_ITMP3, REG_PV, p);
+ M_AST(REG_ITMP1, REG_SP, 0 * 8);
+ disp = dseg_addaddress(cd, (void *) builtin_trace_args);
+ M_ALD(REG_ITMP3, REG_PV, disp);
M_JSR(REG_RA, REG_ITMP3);
M_NOP;
- M_LLD(REG_RA, REG_SP, 1 * 8);
+ M_ALD(REG_RA, REG_SP, 1 * 8);
/* restore integer argument registers */
/* end of header generation */
+ replacementpoint = cd->code->rplpoints;
+
/* walk through all basic blocks */
for (bptr = m->basicblocks; bptr != NULL; bptr = bptr->next) {
+ /* handle replacement points */
+
+ if (bptr->bitflags & BBFLAG_REPLACEMENT && bptr->flags >= BBREACHED) {
+
+ /* 8-byte align pc */
+ if ((ptrint)mcodeptr & 4) {
+ M_NOP;
+ }
+
+ replacementpoint->pc = (u1*)(ptrint)((u1*)mcodeptr - cd->mcodebase);
+ replacementpoint++;
+
+ assert(cd->lastmcodeptr <= (u1*)mcodeptr);
+ cd->lastmcodeptr = (u1*)cd->mcodeptr + 2*4; /* br + delay slot */
+ }
+
+ /* store relative start of block */
+
bptr->mpc = (s4) ((u1 *) mcodeptr - cd->mcodebase);
if (bptr->flags >= BBREACHED) {
src = bptr->instack;
len = bptr->indepth;
MCODECHECK(64+len);
-#ifdef LSRA
+#if defined(ENABLE_LSRA)
if (opt_lsra) {
while (src != NULL) {
len--;
M_TFLTMOVE(s2, s1, d);
} else {
- M_DLD(d, REG_SP, 8 * rd->interfaces[len][s2].regoff);
+ M_DLD(d, REG_SP, rd->interfaces[len][s2].regoff * 8);
}
store_reg_to_var_flt(src, d);
M_INTMOVE(s1,d);
} else {
- M_LLD(d, REG_SP, 8 * rd->interfaces[len][s2].regoff);
+ M_LLD(d, REG_SP, rd->interfaces[len][s2].regoff * 8);
}
store_reg_to_var_int(src, d);
}
}
src = src->prev;
}
-#ifdef LSRA
+#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++) {
if (iptr->line != currentline) {
var_to_reg_int(s1, src, REG_ITMP1);
M_BEQZ(s1, 0);
- codegen_addxnullrefs(cd, mcodeptr);
+ codegen_add_nullpointerexception_ref(cd, mcodeptr);
M_NOP;
break;
/* op1 = 0, val.f = constant */
d = reg_of_var(rd, iptr->dst, REG_FTMP1);
- a = dseg_addfloat(cd, iptr->val.f);
- M_FLD(d, REG_PV, a);
+ disp = dseg_addfloat(cd, iptr->val.f);
+ M_FLD(d, REG_PV, disp);
store_reg_to_var_flt(iptr->dst, d);
break;
/* op1 = 0, val.d = constant */
d = reg_of_var(rd, iptr->dst, REG_FTMP1);
- a = dseg_adddouble(cd, iptr->val.d);
- M_DLD(d, REG_PV, a);
+ disp = dseg_adddouble(cd, iptr->val.d);
+ M_DLD(d, REG_PV, disp);
store_reg_to_var_flt (iptr->dst, d);
break;
/* op1 = 0, val.a = constant */
d = reg_of_var(rd, iptr->dst, REG_ITMP1);
- if (iptr->val.a) {
- a = dseg_addaddress(cd, iptr->val.a);
- M_ALD(d, REG_PV, a);
+
+ if ((iptr->target != NULL) && (iptr->val.a == NULL)) {
+ disp = dseg_addaddress(cd, iptr->val.a);
+
+ codegen_addpatchref(cd, mcodeptr,
+ PATCHER_aconst,
+ (unresolved_class *) iptr->target, disp);
+
+ if (opt_showdisassemble) {
+ M_NOP; M_NOP;
+ }
+
+ M_ALD(d, REG_PV, disp);
+
} else {
- M_INTMOVE(REG_ZERO, d);
+ if (iptr->val.a == NULL) {
+ M_INTMOVE(REG_ZERO, d);
+ } else {
+ disp = dseg_addaddress(cd, iptr->val.a);
+ M_ALD(d, REG_PV, disp);
+ }
}
store_reg_to_var_int(iptr->dst, d);
break;
case ICMD_INEG: /* ..., value ==> ..., - value */
var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(rd, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP2);
M_ISUB(REG_ZERO, s1, d);
store_reg_to_var_int(iptr->dst, d);
break;
case ICMD_LNEG: /* ..., value ==> ..., - value */
var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(rd, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP2);
M_LSUB(REG_ZERO, s1, d);
store_reg_to_var_int(iptr->dst, d);
break;
case ICMD_I2L: /* ..., value ==> ..., value */
var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(rd, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP2);
M_INTMOVE(s1, d);
store_reg_to_var_int(iptr->dst, d);
break;
case ICMD_L2I: /* ..., value ==> ..., value */
var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(rd, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP2);
M_ISLL_IMM(s1, 0, d );
store_reg_to_var_int(iptr->dst, d);
break;
case ICMD_INT2BYTE: /* ..., value ==> ..., value */
var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(rd, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP2);
M_LSLL_IMM(s1, 56, d);
M_LSRA_IMM( d, 56, d);
store_reg_to_var_int(iptr->dst, d);
case ICMD_INT2CHAR: /* ..., value ==> ..., value */
var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(rd, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP2);
M_CZEXT(s1, d);
store_reg_to_var_int(iptr->dst, d);
break;
case ICMD_INT2SHORT: /* ..., value ==> ..., value */
var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(rd, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP2);
M_LSLL_IMM(s1, 48, d);
M_LSRA_IMM( d, 48, d);
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(rd, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP2);
M_IADD(s1, s2, d);
store_reg_to_var_int(iptr->dst, d);
break;
/* val.i = constant */
var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(rd, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP2);
if ((iptr->val.i >= -32768) && (iptr->val.i <= 32767)) {
M_IADD_IMM(s1, iptr->val.i, d);
- }
- else {
+ } else {
ICONST(REG_ITMP2, iptr->val.i);
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(rd, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP2);
M_LADD(s1, s2, d);
store_reg_to_var_int(iptr->dst, d);
break;
/* val.l = constant */
var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(rd, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP2);
if ((iptr->val.l >= -32768) && (iptr->val.l <= 32767)) {
M_LADD_IMM(s1, iptr->val.l, d);
- }
- else {
+ } else {
LCONST(REG_ITMP2, iptr->val.l);
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(rd, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP2);
M_ISUB(s1, s2, d);
store_reg_to_var_int(iptr->dst, d);
break;
/* val.i = constant */
var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(rd, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP2);
if ((iptr->val.i >= -32767) && (iptr->val.i <= 32768)) {
M_IADD_IMM(s1, -iptr->val.i, d);
- }
- else {
+ } else {
ICONST(REG_ITMP2, iptr->val.i);
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(rd, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP2);
M_LSUB(s1, s2, d);
store_reg_to_var_int(iptr->dst, d);
break;
/* val.l = constant */
var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(rd, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP2);
if ((iptr->val.l >= -32767) && (iptr->val.l <= 32768)) {
M_LADD_IMM(s1, -iptr->val.l, d);
- }
- else {
+ } else {
LCONST(REG_ITMP2, iptr->val.l);
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(rd, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP2);
M_IMUL(s1, s2);
M_MFLO(d);
M_NOP;
/* val.i = constant */
var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(rd, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP2);
ICONST(REG_ITMP2, iptr->val.i);
M_IMUL(s1, REG_ITMP2);
M_MFLO(d);
var_to_reg_int(s1, src->prev, REG_ITMP1);
var_to_reg_int(s2, src, REG_ITMP2);
- d = reg_of_var(rd, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP2);
M_LMUL(s1, s2);
M_MFLO(d);
M_NOP;
/* val.l = constant */
var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(rd, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP2);
LCONST(REG_ITMP2, iptr->val.l);
M_LMUL(s1, REG_ITMP2);
M_MFLO(d);
var_to_reg_int(s1, src->prev, REG_ITMP1);
var_to_reg_int(s2, src, REG_ITMP2);
- d = reg_of_var(rd, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP2);
gen_div_check(s2);
M_IDIV(s1, s2);
M_MFLO(d);
var_to_reg_int(s1, src->prev, REG_ITMP1);
var_to_reg_int(s2, src, REG_ITMP2);
- d = reg_of_var(rd, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP2);
gen_div_check(s2);
M_LDIV(s1, s2);
M_MFLO(d);
var_to_reg_int(s1, src->prev, REG_ITMP1);
var_to_reg_int(s2, src, REG_ITMP2);
- d = reg_of_var(rd, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP2);
gen_div_check(s2);
M_IDIV(s1, s2);
M_MFHI(d);
var_to_reg_int(s1, src->prev, REG_ITMP1);
var_to_reg_int(s2, src, REG_ITMP2);
- d = reg_of_var(rd, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP2);
gen_div_check(s2);
M_LDIV(s1, s2);
M_MFHI(d);
case ICMD_LDIVPOW2: /* val.i = constant */
var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(rd, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP2);
M_LSRA_IMM(s1, 63, REG_ITMP2);
M_LSRL_IMM(REG_ITMP2, 64 - iptr->val.i, REG_ITMP2);
M_LADD(s1, REG_ITMP2, REG_ITMP2);
var_to_reg_int(s1, src->prev, REG_ITMP1);
var_to_reg_int(s2, src, REG_ITMP2);
- d = reg_of_var(rd, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP2);
M_ISLL(s1, s2, d);
store_reg_to_var_int(iptr->dst, d);
break;
/* val.i = constant */
var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(rd, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP2);
M_ISLL_IMM(s1, 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(rd, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP2);
M_ISRA(s1, s2, d);
store_reg_to_var_int(iptr->dst, d);
break;
/* val.i = constant */
var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(rd, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP2);
M_ISRA_IMM(s1, 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(rd, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP2);
M_ISRL(s1, s2, d);
store_reg_to_var_int(iptr->dst, d);
break;
/* val.i = constant */
var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(rd, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP2);
M_ISRL_IMM(s1, 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(rd, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP2);
M_LSLL(s1, s2, d);
store_reg_to_var_int(iptr->dst, d);
break;
/* val.i = constant */
var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(rd, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP2);
M_LSLL_IMM(s1, 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(rd, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP2);
M_LSRA(s1, s2, d);
store_reg_to_var_int(iptr->dst, d);
break;
/* val.i = constant */
var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(rd, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP2);
M_LSRA_IMM(s1, 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(rd, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP2);
M_LSRL(s1, s2, d);
store_reg_to_var_int(iptr->dst, d);
break;
/* val.i = constant */
var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(rd, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP2);
M_LSRL_IMM(s1, 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(rd, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP2);
M_AND(s1, s2, d);
store_reg_to_var_int(iptr->dst, d);
break;
/* val.i = constant */
var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(rd, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP2);
if ((iptr->val.i >= 0) && (iptr->val.i <= 0xffff)) {
M_AND_IMM(s1, iptr->val.i, d);
- }
- else {
+ } else {
ICONST(REG_ITMP2, iptr->val.i);
M_AND(s1, REG_ITMP2, d);
- }
+ }
store_reg_to_var_int(iptr->dst, d);
break;
/* val.i = constant */
var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(rd, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP2);
if (s1 == d) {
M_MOV(s1, REG_ITMP1);
s1 = REG_ITMP1;
- }
+ }
if ((iptr->val.i >= 0) && (iptr->val.i <= 0xffff)) {
M_AND_IMM(s1, iptr->val.i, d);
M_BGEZ(s1, 4);
M_NOP;
M_ISUB(REG_ZERO, s1, d);
M_AND_IMM(d, iptr->val.i, d);
- }
- else {
+ } else {
ICONST(REG_ITMP2, iptr->val.i);
M_AND(s1, REG_ITMP2, d);
M_BGEZ(s1, 4);
M_NOP;
M_ISUB(REG_ZERO, s1, d);
M_AND(d, REG_ITMP2, d);
- }
+ }
M_ISUB(REG_ZERO, d, d);
store_reg_to_var_int(iptr->dst, d);
break;
/* val.l = constant */
var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(rd, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP2);
if ((iptr->val.l >= 0) && (iptr->val.l <= 0xffff)) {
M_AND_IMM(s1, iptr->val.l, d);
- }
- else {
+ } else {
LCONST(REG_ITMP2, iptr->val.l);
M_AND(s1, REG_ITMP2, d);
- }
+ }
store_reg_to_var_int(iptr->dst, d);
break;
/* val.l = constant */
var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(rd, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP2);
if (s1 == d) {
M_MOV(s1, REG_ITMP1);
s1 = REG_ITMP1;
- }
+ }
if ((iptr->val.l >= 0) && (iptr->val.l <= 0xffff)) {
M_AND_IMM(s1, iptr->val.l, d);
M_BGEZ(s1, 4);
M_NOP;
M_LSUB(REG_ZERO, s1, d);
M_AND_IMM(d, iptr->val.l, d);
- }
- else {
+ } else {
LCONST(REG_ITMP2, iptr->val.l);
M_AND(s1, REG_ITMP2, d);
M_BGEZ(s1, 4);
M_NOP;
M_LSUB(REG_ZERO, s1, d);
M_AND(d, REG_ITMP2, d);
- }
+ }
M_LSUB(REG_ZERO, 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(rd, iptr->dst, REG_ITMP3);
- M_OR( s1,s2, d);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP2);
+ M_OR(s1,s2, d);
store_reg_to_var_int(iptr->dst, d);
break;
/* val.i = constant */
var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(rd, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP2);
if ((iptr->val.i >= 0) && (iptr->val.i <= 0xffff)) {
M_OR_IMM(s1, iptr->val.i, d);
- }
- else {
+ } else {
ICONST(REG_ITMP2, iptr->val.i);
M_OR(s1, REG_ITMP2, d);
- }
+ }
store_reg_to_var_int(iptr->dst, d);
break;
/* val.l = constant */
var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(rd, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP2);
if ((iptr->val.l >= 0) && (iptr->val.l <= 0xffff)) {
M_OR_IMM(s1, iptr->val.l, d);
- }
- else {
+ } else {
LCONST(REG_ITMP2, iptr->val.l);
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(rd, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP2);
M_XOR(s1, s2, d);
store_reg_to_var_int(iptr->dst, d);
break;
/* val.i = constant */
var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(rd, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP2);
if ((iptr->val.i >= 0) && (iptr->val.i <= 0xffff)) {
M_XOR_IMM(s1, iptr->val.i, d);
- }
- else {
+ } else {
ICONST(REG_ITMP2, iptr->val.i);
M_XOR(s1, REG_ITMP2, d);
- }
+ }
store_reg_to_var_int(iptr->dst, d);
break;
/* val.l = constant */
var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(rd, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP2);
if ((iptr->val.l >= 0) && (iptr->val.l <= 0xffff)) {
M_XOR_IMM(s1, iptr->val.l, d);
- }
- else {
+ } else {
LCONST(REG_ITMP2, iptr->val.l);
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(rd, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP2);
M_CMPLT(s1, s2, REG_ITMP3);
M_CMPLT(s2, s1, REG_ITMP1);
- M_LSUB (REG_ITMP1, REG_ITMP3, d);
+ M_LSUB(REG_ITMP1, REG_ITMP3, d);
store_reg_to_var_int(iptr->dst, d);
break;
var = &(rd->locals[iptr->op1][TYPE_INT]);
if (var->flags & INMEMORY) {
s1 = REG_ITMP1;
- M_LLD(s1, REG_SP, 8 * var->regoff);
-
+ M_LLD(s1, REG_SP, var->regoff * 8);
} else
s1 = var->regoff;
M_IADD_IMM(s1, iptr->val.i, s1);
if (var->flags & INMEMORY)
- M_LST(s1, REG_SP, 8 * var->regoff);
+ M_LST(s1, REG_SP, var->regoff * 8);
break;
case ICMD_FNEG: /* ..., value ==> ..., - value */
var_to_reg_flt(s1, src, REG_FTMP1);
- d = reg_of_var(rd, iptr->dst, REG_FTMP3);
+ d = reg_of_var(rd, iptr->dst, REG_FTMP2);
M_FNEG(s1, d);
store_reg_to_var_flt(iptr->dst, d);
break;
case ICMD_DNEG: /* ..., value ==> ..., - value */
var_to_reg_flt(s1, src, REG_FTMP1);
- d = reg_of_var(rd, iptr->dst, REG_FTMP3);
+ d = reg_of_var(rd, iptr->dst, REG_FTMP2);
M_DNEG(s1, d);
store_reg_to_var_flt(iptr->dst, d);
break;
var_to_reg_flt(s1, src->prev, REG_FTMP1);
var_to_reg_flt(s2, src, REG_FTMP2);
- d = reg_of_var(rd, iptr->dst, REG_FTMP3);
+ d = reg_of_var(rd, iptr->dst, REG_FTMP2);
M_FADD(s1, s2, d);
store_reg_to_var_flt(iptr->dst, d);
break;
var_to_reg_flt(s1, src->prev, REG_FTMP1);
var_to_reg_flt(s2, src, REG_FTMP2);
- d = reg_of_var(rd, iptr->dst, REG_FTMP3);
+ d = reg_of_var(rd, iptr->dst, REG_FTMP2);
M_DADD(s1, s2, d);
store_reg_to_var_flt(iptr->dst, d);
break;
var_to_reg_flt(s1, src->prev, REG_FTMP1);
var_to_reg_flt(s2, src, REG_FTMP2);
- d = reg_of_var(rd, iptr->dst, REG_FTMP3);
+ d = reg_of_var(rd, iptr->dst, REG_FTMP2);
M_FSUB(s1, s2, d);
store_reg_to_var_flt(iptr->dst, d);
break;
var_to_reg_flt(s1, src->prev, REG_FTMP1);
var_to_reg_flt(s2, src, REG_FTMP2);
- d = reg_of_var(rd, iptr->dst, REG_FTMP3);
+ d = reg_of_var(rd, iptr->dst, REG_FTMP2);
M_DSUB(s1, s2, d);
store_reg_to_var_flt(iptr->dst, d);
break;
var_to_reg_flt(s1, src->prev, REG_FTMP1);
var_to_reg_flt(s2, src, REG_FTMP2);
- d = reg_of_var(rd, iptr->dst, REG_FTMP3);
+ d = reg_of_var(rd, iptr->dst, REG_FTMP2);
M_FMUL(s1, s2, d);
store_reg_to_var_flt(iptr->dst, d);
break;
- case ICMD_DMUL: /* ..., val1, val2 ==> ..., val1 *** val2 */
+ case ICMD_DMUL: /* ..., val1, val2 ==> ..., val1 *** val2 */
var_to_reg_flt(s1, src->prev, REG_FTMP1);
var_to_reg_flt(s2, src, REG_FTMP2);
- d = reg_of_var(rd, iptr->dst, REG_FTMP3);
+ d = reg_of_var(rd, iptr->dst, REG_FTMP2);
M_DMUL(s1, s2, d);
store_reg_to_var_flt(iptr->dst, d);
break;
var_to_reg_flt(s1, src->prev, REG_FTMP1);
var_to_reg_flt(s2, src, REG_FTMP2);
- d = reg_of_var(rd, iptr->dst, REG_FTMP3);
+ d = reg_of_var(rd, iptr->dst, REG_FTMP2);
M_FDIV(s1, s2, d);
store_reg_to_var_flt(iptr->dst, d);
break;
var_to_reg_flt(s1, src->prev, REG_FTMP1);
var_to_reg_flt(s2, src, REG_FTMP2);
- d = reg_of_var(rd, iptr->dst, REG_FTMP3);
+ d = reg_of_var(rd, iptr->dst, REG_FTMP2);
M_DDIV(s1, s2, d);
store_reg_to_var_flt(iptr->dst, d);
break;
case ICMD_I2F: /* ..., value ==> ..., (float) value */
case ICMD_L2F:
var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(rd, iptr->dst, REG_FTMP3);
+ d = reg_of_var(rd, iptr->dst, REG_FTMP2);
M_MOVLD(s1, d);
M_CVTLF(d, d);
store_reg_to_var_flt(iptr->dst, d);
case ICMD_I2D: /* ..., value ==> ..., (double) value */
case ICMD_L2D:
var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(rd, iptr->dst, REG_FTMP3);
+ d = reg_of_var(rd, iptr->dst, REG_FTMP2);
M_MOVLD(s1, d);
M_CVTLD(d, d);
store_reg_to_var_flt(iptr->dst, d);
break;
-
+
+#if 0
+ /* XXX these do not work correctly */
+
case ICMD_F2I: /* ..., (float) value ==> ..., (int) value */
var_to_reg_flt(s1, src, REG_FTMP1);
- d = reg_of_var(rd, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP2);
M_TRUNCFI(s1, REG_FTMP1);
M_MOVDI(REG_FTMP1, d);
M_NOP;
case ICMD_D2I: /* ..., (double) value ==> ..., (int) value */
var_to_reg_flt(s1, src, REG_FTMP1);
- d = reg_of_var(rd, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP1);
M_TRUNCDI(s1, REG_FTMP1);
M_MOVDI(REG_FTMP1, d);
M_NOP;
case ICMD_F2L: /* ..., (float) value ==> ..., (long) value */
var_to_reg_flt(s1, src, REG_FTMP1);
- d = reg_of_var(rd, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP1);
M_TRUNCFL(s1, REG_FTMP1);
M_MOVDL(REG_FTMP1, d);
M_NOP;
case ICMD_D2L: /* ..., (double) value ==> ..., (long) value */
var_to_reg_flt(s1, src, REG_FTMP1);
- d = reg_of_var(rd, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP1);
M_TRUNCDL(s1, REG_FTMP1);
M_MOVDL(REG_FTMP1, d);
M_NOP;
store_reg_to_var_int(iptr->dst, d);
break;
+#endif
case ICMD_F2D: /* ..., value ==> ..., (double) value */
var_to_reg_flt(s1, src, REG_FTMP1);
- d = reg_of_var(rd, iptr->dst, REG_FTMP3);
+ d = reg_of_var(rd, iptr->dst, REG_FTMP2);
M_CVTFD(s1, d);
store_reg_to_var_flt(iptr->dst, d);
break;
case ICMD_D2F: /* ..., value ==> ..., (double) value */
var_to_reg_flt(s1, src, REG_FTMP1);
- d = reg_of_var(rd, iptr->dst, REG_FTMP3);
+ d = reg_of_var(rd, iptr->dst, REG_FTMP2);
M_CVTDF(s1, d);
store_reg_to_var_flt(iptr->dst, d);
break;
var_to_reg_flt(s1, src->prev, REG_FTMP1);
var_to_reg_flt(s2, src, REG_FTMP2);
- d = reg_of_var(rd, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP1);
M_FCMPULEF(s1, s2);
M_FBT(3);
M_LADD_IMM(REG_ZERO, 1, d);
var_to_reg_flt(s1, src->prev, REG_FTMP1);
var_to_reg_flt(s2, src, REG_FTMP2);
- d = reg_of_var(rd, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP1);
M_FCMPULED(s1, s2);
M_FBT(3);
M_LADD_IMM(REG_ZERO, 1, d);
var_to_reg_flt(s1, src->prev, REG_FTMP1);
var_to_reg_flt(s2, src, REG_FTMP2);
- d = reg_of_var(rd, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP1);
M_FCMPOLTF(s1, s2);
M_FBF(3);
M_LSUB_IMM(REG_ZERO, 1, d);
var_to_reg_flt(s1, src->prev, REG_FTMP1);
var_to_reg_flt(s2, src, REG_FTMP2);
- d = reg_of_var(rd, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP1);
M_FCMPOLTD(s1, s2);
M_FBF(3);
M_LSUB_IMM(REG_ZERO, 1, d);
case ICMD_ARRAYLENGTH: /* ..., arrayref ==> ..., length */
var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(rd, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP2);
gen_nullptr_check(s1);
M_ILD(d, s1, OFFSET(java_arrayheader, size));
store_reg_to_var_int(iptr->dst, d);
break;
- case ICMD_AALOAD: /* ..., arrayref, index ==> ..., value */
+ case ICMD_BALOAD: /* ..., arrayref, index ==> ..., value */
var_to_reg_int(s1, src->prev, REG_ITMP1);
var_to_reg_int(s2, src, REG_ITMP2);
- d = reg_of_var(rd, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP2);
if (iptr->op1 == 0) {
gen_nullptr_check(s1);
gen_bound_check;
}
- M_ASLL_IMM(s2, POINTERSHIFT, REG_ITMP2);
- M_AADD(REG_ITMP2, s1, REG_ITMP1);
- M_ALD(d, REG_ITMP1, OFFSET(java_objectarray, data[0]));
+ M_AADD(s2, s1, REG_ITMP3);
+ M_BLDS(d, REG_ITMP3, OFFSET(java_chararray, data[0]));
+ store_reg_to_var_int(iptr->dst, d);
+ break;
+
+ case ICMD_CALOAD: /* ..., arrayref, index ==> ..., value */
+
+ var_to_reg_int(s1, src->prev, REG_ITMP1);
+ var_to_reg_int(s2, src, REG_ITMP2);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP2);
+ if (iptr->op1 == 0) {
+ gen_nullptr_check(s1);
+ gen_bound_check;
+ }
+ M_AADD(s2, s1, REG_ITMP3);
+ M_AADD(s2, REG_ITMP3, REG_ITMP3);
+ M_SLDU(d, REG_ITMP3, OFFSET(java_chararray, data[0]));
+ store_reg_to_var_int(iptr->dst, d);
+ break;
+
+ case ICMD_SALOAD: /* ..., arrayref, index ==> ..., value */
+
+ var_to_reg_int(s1, src->prev, REG_ITMP1);
+ var_to_reg_int(s2, src, REG_ITMP2);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP2);
+ if (iptr->op1 == 0) {
+ gen_nullptr_check(s1);
+ gen_bound_check;
+ }
+ M_AADD(s2, s1, REG_ITMP3);
+ M_AADD(s2, REG_ITMP3, REG_ITMP3);
+ M_SLDS(d, REG_ITMP3, OFFSET(java_chararray, 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(rd, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP2);
if (iptr->op1 == 0) {
gen_nullptr_check(s1);
gen_bound_check;
}
- M_ASLL_IMM(s2, 2, REG_ITMP2);
- M_AADD(REG_ITMP2, s1, REG_ITMP1);
- M_ILD(d, REG_ITMP1, OFFSET(java_intarray, data[0]));
+ M_ASLL_IMM(s2, 2, REG_ITMP3);
+ M_AADD(REG_ITMP3, s1, REG_ITMP3);
+ M_ILD(d, REG_ITMP3, 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(rd, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP2);
if (iptr->op1 == 0) {
gen_nullptr_check(s1);
gen_bound_check;
}
- M_ASLL_IMM(s2, 3, REG_ITMP2);
- M_AADD(REG_ITMP2, s1, REG_ITMP1);
- M_LLD(d, REG_ITMP1, OFFSET(java_longarray, data[0]));
+ M_ASLL_IMM(s2, 3, REG_ITMP3);
+ M_AADD(REG_ITMP3, s1, REG_ITMP3);
+ M_LLD(d, REG_ITMP3, 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(rd, iptr->dst, REG_FTMP3);
+ d = reg_of_var(rd, iptr->dst, REG_FTMP1);
if (iptr->op1 == 0) {
gen_nullptr_check(s1);
gen_bound_check;
}
- M_ASLL_IMM(s2, 2, REG_ITMP2);
- M_AADD(REG_ITMP2, s1, REG_ITMP1);
- M_FLD(d, REG_ITMP1, OFFSET(java_floatarray, data[0]));
+ M_ASLL_IMM(s2, 2, REG_ITMP3);
+ M_AADD(REG_ITMP3, s1, REG_ITMP3);
+ M_FLD(d, REG_ITMP3, 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(rd, iptr->dst, REG_FTMP3);
+ d = reg_of_var(rd, iptr->dst, REG_FTMP1);
if (iptr->op1 == 0) {
gen_nullptr_check(s1);
gen_bound_check;
}
- M_ASLL_IMM(s2, 3, REG_ITMP2);
- M_AADD(REG_ITMP2, s1, REG_ITMP1);
- M_DLD(d, REG_ITMP1, OFFSET(java_doublearray, data[0]));
+ M_ASLL_IMM(s2, 3, REG_ITMP3);
+ M_AADD(REG_ITMP3, s1, REG_ITMP3);
+ M_DLD(d, REG_ITMP3, OFFSET(java_doublearray, data[0]));
store_reg_to_var_flt(iptr->dst, d);
break;
- case ICMD_CALOAD: /* ..., arrayref, index ==> ..., value */
+ case ICMD_AALOAD: /* ..., arrayref, index ==> ..., value */
var_to_reg_int(s1, src->prev, REG_ITMP1);
var_to_reg_int(s2, src, REG_ITMP2);
- d = reg_of_var(rd, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP2);
if (iptr->op1 == 0) {
gen_nullptr_check(s1);
gen_bound_check;
}
- M_AADD(s2, s1, REG_ITMP1);
- M_AADD(s2, REG_ITMP1, REG_ITMP1);
- M_SLDU(d, REG_ITMP1, OFFSET(java_chararray, data[0]));
+ M_ASLL_IMM(s2, POINTERSHIFT, REG_ITMP3);
+ M_AADD(REG_ITMP3, s1, REG_ITMP3);
+ M_ALD(d, REG_ITMP3, OFFSET(java_objectarray, data[0]));
store_reg_to_var_int(iptr->dst, d);
- break;
+ break;
- case ICMD_SALOAD: /* ..., arrayref, index ==> ..., value */
- var_to_reg_int(s1, src->prev, REG_ITMP1);
- var_to_reg_int(s2, src, REG_ITMP2);
- d = reg_of_var(rd, iptr->dst, REG_ITMP3);
+ case ICMD_BASTORE: /* ..., arrayref, index, value ==> ... */
+
+ var_to_reg_int(s1, src->prev->prev, REG_ITMP1);
+ var_to_reg_int(s2, src->prev, REG_ITMP2);
if (iptr->op1 == 0) {
gen_nullptr_check(s1);
gen_bound_check;
}
M_AADD(s2, s1, REG_ITMP1);
- M_AADD(s2, REG_ITMP1, REG_ITMP1);
- M_SLDS(d, REG_ITMP1, OFFSET(java_chararray, data[0]));
- store_reg_to_var_int(iptr->dst, d);
+ var_to_reg_int(s3, src, REG_ITMP3);
+ M_BST(s3, REG_ITMP1, OFFSET(java_bytearray, data[0]));
break;
- case ICMD_BALOAD: /* ..., arrayref, index ==> ..., value */
+ case ICMD_CASTORE: /* ..., arrayref, index, value ==> ... */
+ case ICMD_SASTORE: /* ..., arrayref, index, value ==> ... */
- var_to_reg_int(s1, src->prev, REG_ITMP1);
- var_to_reg_int(s2, src, REG_ITMP2);
- d = reg_of_var(rd, iptr->dst, REG_ITMP3);
+ var_to_reg_int(s1, src->prev->prev, REG_ITMP1);
+ var_to_reg_int(s2, src->prev, REG_ITMP2);
if (iptr->op1 == 0) {
gen_nullptr_check(s1);
gen_bound_check;
}
M_AADD(s2, s1, REG_ITMP1);
- M_BLDS(d, REG_ITMP1, OFFSET(java_chararray, data[0]));
- store_reg_to_var_int(iptr->dst, d);
+ M_AADD(s2, REG_ITMP1, REG_ITMP1);
+ var_to_reg_int(s3, src, REG_ITMP3);
+ M_SST(s3, REG_ITMP1, OFFSET(java_chararray, data[0]));
break;
-
case ICMD_IASTORE: /* ..., arrayref, index, value ==> ... */
var_to_reg_int(s1, src->prev->prev, REG_ITMP1);
gen_nullptr_check(s1);
gen_bound_check;
}
- var_to_reg_int(s3, src, REG_ITMP3);
M_ASLL_IMM(s2, 2, REG_ITMP2);
M_AADD(REG_ITMP2, s1, REG_ITMP1);
- M_IST(s3, REG_ITMP1, OFFSET(java_intarray, data[0]));
+ var_to_reg_int(s3, src, REG_ITMP3);
+ M_IST_INTERN(s3, REG_ITMP1, OFFSET(java_intarray, data[0]));
break;
case ICMD_LASTORE: /* ..., arrayref, index, value ==> ... */
gen_nullptr_check(s1);
gen_bound_check;
}
- var_to_reg_int(s3, src, REG_ITMP3);
M_ASLL_IMM(s2, 3, REG_ITMP2);
M_AADD(REG_ITMP2, s1, REG_ITMP1);
- M_LST(s3, REG_ITMP1, OFFSET(java_longarray, data[0]));
+ var_to_reg_int(s3, src, REG_ITMP3);
+ M_LST_INTERN(s3, REG_ITMP1, OFFSET(java_longarray, data[0]));
break;
case ICMD_FASTORE: /* ..., arrayref, index, value ==> ... */
gen_nullptr_check(s1);
gen_bound_check;
}
- var_to_reg_flt(s3, src, REG_FTMP3);
M_ASLL_IMM(s2, 2, REG_ITMP2);
M_AADD(REG_ITMP2, s1, REG_ITMP1);
- M_FST(s3, REG_ITMP1, OFFSET(java_floatarray, data[0]));
+ var_to_reg_flt(s3, src, REG_FTMP1);
+ M_FST_INTERN(s3, REG_ITMP1, OFFSET(java_floatarray, data[0]));
break;
case ICMD_DASTORE: /* ..., arrayref, index, value ==> ... */
gen_nullptr_check(s1);
gen_bound_check;
}
- var_to_reg_flt(s3, src, REG_FTMP3);
M_ASLL_IMM(s2, 3, REG_ITMP2);
M_AADD(REG_ITMP2, s1, REG_ITMP1);
- M_DST(s3, REG_ITMP1, OFFSET(java_doublearray, data[0]));
+ var_to_reg_flt(s3, src, REG_FTMP1);
+ M_DST_INTERN(s3, REG_ITMP1, OFFSET(java_doublearray, data[0]));
break;
- case ICMD_CASTORE: /* ..., arrayref, index, value ==> ... */
- case ICMD_SASTORE: /* ..., arrayref, index, value ==> ... */
-
- var_to_reg_int(s1, src->prev->prev, REG_ITMP1);
- var_to_reg_int(s2, src->prev, REG_ITMP2);
- if (iptr->op1 == 0) {
- gen_nullptr_check(s1);
- gen_bound_check;
- }
- var_to_reg_int(s3, src, REG_ITMP3);
- M_AADD(s2, s1, REG_ITMP1);
- M_AADD(s2, REG_ITMP1, REG_ITMP1);
- M_SST(s3, REG_ITMP1, OFFSET(java_chararray, data[0]));
- break;
- case ICMD_BASTORE: /* ..., arrayref, index, value ==> ... */
+ case ICMD_AASTORE: /* ..., arrayref, index, value ==> ... */
var_to_reg_int(s1, src->prev->prev, REG_ITMP1);
var_to_reg_int(s2, src->prev, REG_ITMP2);
gen_bound_check;
}
var_to_reg_int(s3, src, REG_ITMP3);
- M_AADD(s2, s1, REG_ITMP1);
- M_BST(s3, REG_ITMP1, OFFSET(java_bytearray, data[0]));
- break;
-
-
- case ICMD_AASTORE: /* ..., arrayref, index, value ==> ... */
-
- var_to_reg_int(s1, src->prev->prev, REG_ITMP1);
- var_to_reg_int(s2, src->prev, REG_ITMP2);
-/* if (iptr->op1 == 0) { */
- gen_nullptr_check(s1);
- gen_bound_check;
-/* } */
- var_to_reg_int(s3, src, REG_ITMP3);
M_MOV(s1, rd->argintregs[0]);
M_MOV(s3, rd->argintregs[1]);
- bte = iptr->val.a;
- disp = dseg_addaddress(cd, bte->fp);
+ disp = dseg_addaddress(cd, BUILTIN_canstore);
M_ALD(REG_ITMP3, REG_PV, disp);
M_JSR(REG_RA, REG_ITMP3);
M_NOP;
M_BEQZ(REG_RESULT, 0);
- codegen_addxstorerefs(cd, mcodeptr);
+ codegen_add_arraystoreexception_ref(cd, mcodeptr);
M_NOP;
var_to_reg_int(s1, src->prev->prev, REG_ITMP1);
var_to_reg_int(s2, src->prev, REG_ITMP2);
- var_to_reg_int(s3, src, REG_ITMP3);
M_ASLL_IMM(s2, POINTERSHIFT, REG_ITMP2);
M_AADD(REG_ITMP2, s1, REG_ITMP1);
- M_AST(s3, REG_ITMP1, OFFSET(java_objectarray, data[0]));
+ var_to_reg_int(s3, src, REG_ITMP3);
+ M_AST_INTERN(s3, REG_ITMP1, OFFSET(java_objectarray, data[0]));
break;
- case ICMD_IASTORECONST: /* ..., arrayref, index ==> ... */
+ case ICMD_BASTORECONST: /* ..., arrayref, index ==> ... */
var_to_reg_int(s1, src->prev, REG_ITMP1);
var_to_reg_int(s2, src, REG_ITMP2);
gen_nullptr_check(s1);
gen_bound_check;
}
- M_ASLL_IMM(s2, 2, REG_ITMP2);
- M_AADD(REG_ITMP2, s1, REG_ITMP1);
- M_IST(REG_ZERO, REG_ITMP1, OFFSET(java_intarray, data[0]));
+ M_AADD(s2, s1, REG_ITMP1);
+ M_BST(REG_ZERO, REG_ITMP1, OFFSET(java_bytearray, data[0]));
break;
- case ICMD_LASTORECONST: /* ..., arrayref, index ==> ... */
+ case ICMD_CASTORECONST: /* ..., arrayref, index ==> ... */
+ case ICMD_SASTORECONST: /* ..., arrayref, index ==> ... */
var_to_reg_int(s1, src->prev, REG_ITMP1);
var_to_reg_int(s2, src, REG_ITMP2);
gen_nullptr_check(s1);
gen_bound_check;
}
- M_ASLL_IMM(s2, 3, REG_ITMP2);
- M_AADD(REG_ITMP2, s1, REG_ITMP1);
- M_LST(REG_ZERO, REG_ITMP1, OFFSET(java_longarray, data[0]));
+ M_AADD(s2, s1, REG_ITMP1);
+ M_AADD(s2, REG_ITMP1, REG_ITMP1);
+ M_SST(REG_ZERO, REG_ITMP1, OFFSET(java_chararray, data[0]));
break;
- case ICMD_AASTORECONST: /* ..., arrayref, index ==> ... */
+ case ICMD_IASTORECONST: /* ..., arrayref, index ==> ... */
var_to_reg_int(s1, src->prev, REG_ITMP1);
var_to_reg_int(s2, src, REG_ITMP2);
gen_nullptr_check(s1);
gen_bound_check;
}
- M_ASLL_IMM(s2, POINTERSHIFT, REG_ITMP2);
+ M_ASLL_IMM(s2, 2, REG_ITMP2);
M_AADD(REG_ITMP2, s1, REG_ITMP1);
- M_AST(REG_ZERO, REG_ITMP1, OFFSET(java_objectarray, data[0]));
+ M_IST_INTERN(REG_ZERO, REG_ITMP1, OFFSET(java_intarray, data[0]));
break;
- case ICMD_BASTORECONST: /* ..., arrayref, index ==> ... */
+ case ICMD_LASTORECONST: /* ..., arrayref, index ==> ... */
var_to_reg_int(s1, src->prev, REG_ITMP1);
var_to_reg_int(s2, src, REG_ITMP2);
gen_nullptr_check(s1);
gen_bound_check;
}
- M_AADD(s2, s1, REG_ITMP1);
- M_BST(REG_ZERO, REG_ITMP1, OFFSET(java_bytearray, data[0]));
+ M_ASLL_IMM(s2, 3, REG_ITMP2);
+ M_AADD(REG_ITMP2, s1, REG_ITMP1);
+ M_LST_INTERN(REG_ZERO, REG_ITMP1, OFFSET(java_longarray, data[0]));
break;
- case ICMD_CASTORECONST: /* ..., arrayref, index ==> ... */
- case ICMD_SASTORECONST: /* ..., arrayref, index ==> ... */
+ case ICMD_AASTORECONST: /* ..., arrayref, index ==> ... */
var_to_reg_int(s1, src->prev, REG_ITMP1);
var_to_reg_int(s2, src, REG_ITMP2);
gen_nullptr_check(s1);
gen_bound_check;
}
- M_AADD(s2, s1, REG_ITMP1);
- M_AADD(s2, REG_ITMP1, REG_ITMP1);
- M_SST(REG_ZERO, REG_ITMP1, OFFSET(java_chararray, data[0]));
+ M_ASLL_IMM(s2, POINTERSHIFT, REG_ITMP2);
+ M_AADD(REG_ITMP2, s1, REG_ITMP1);
+ M_AST_INTERN(REG_ZERO, REG_ITMP1, OFFSET(java_objectarray, data[0]));
break;
case ICMD_GETSTATIC: /* ... ==> ..., value */
/* op1 = type, val.a = field address */
- if (!iptr->val.a) {
+ if (iptr->val.a == NULL) {
+ disp = dseg_addaddress(cd, NULL);
+
codegen_addpatchref(cd, mcodeptr,
PATCHER_get_putstatic,
- (unresolved_field *) iptr->target);
+ (unresolved_field *) iptr->target, disp);
if (opt_showdisassemble) {
M_NOP; M_NOP;
}
- a = 0;
-
} else {
fieldinfo *fi = iptr->val.a;
- if (!fi->class->initialized) {
+ disp = dseg_addaddress(cd, &(fi->value));
+
+ if (!CLASS_IS_OR_ALMOST_INITIALIZED(fi->class)) {
codegen_addpatchref(cd, mcodeptr,
- PATCHER_clinit, fi->class);
+ PATCHER_clinit, fi->class, 0);
if (opt_showdisassemble) {
M_NOP; M_NOP;
}
}
-
- a = (ptrint) &(fi->value);
}
- a = dseg_addaddress(cd, a);
- M_ALD(REG_ITMP1, REG_PV, a);
+ M_ALD(REG_ITMP1, REG_PV, disp);
switch (iptr->op1) {
case TYPE_INT:
- d = reg_of_var(rd, iptr->dst, REG_ITMP3);
- M_ILD(d, REG_ITMP1, 0);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP2);
+ M_ILD_INTERN(d, REG_ITMP1, 0);
store_reg_to_var_int(iptr->dst, d);
break;
case TYPE_LNG:
- d = reg_of_var(rd, iptr->dst, REG_ITMP3);
- M_LLD(d, REG_ITMP1, 0);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP2);
+ M_LLD_INTERN(d, REG_ITMP1, 0);
store_reg_to_var_int(iptr->dst, d);
break;
case TYPE_ADR:
- d = reg_of_var(rd, iptr->dst, REG_ITMP3);
- M_ALD(d, REG_ITMP1, 0);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP2);
+ M_ALD_INTERN(d, REG_ITMP1, 0);
store_reg_to_var_int(iptr->dst, d);
break;
case TYPE_FLT:
d = reg_of_var(rd, iptr->dst, REG_FTMP1);
- M_FLD(d, REG_ITMP1, 0);
+ M_FLD_INTERN(d, REG_ITMP1, 0);
store_reg_to_var_flt(iptr->dst, d);
break;
case TYPE_DBL:
d = reg_of_var(rd, iptr->dst, REG_FTMP1);
- M_DLD(d, REG_ITMP1, 0);
+ M_DLD_INTERN(d, REG_ITMP1, 0);
store_reg_to_var_flt(iptr->dst, d);
break;
}
case ICMD_PUTSTATIC: /* ..., value ==> ... */
/* op1 = type, val.a = field address */
- if (!iptr->val.a) {
+ if (iptr->val.a == NULL) {
+ disp = dseg_addaddress(cd, NULL);
+
codegen_addpatchref(cd, mcodeptr,
PATCHER_get_putstatic,
- (unresolved_field *) iptr->target);
+ (unresolved_field *) iptr->target, disp);
if (opt_showdisassemble) {
M_NOP; M_NOP;
}
- a = 0;
-
} else {
fieldinfo *fi = iptr->val.a;
- if (!fi->class->initialized) {
+ disp = dseg_addaddress(cd, &(fi->value));
+
+ if (!CLASS_IS_OR_ALMOST_INITIALIZED(fi->class)) {
codegen_addpatchref(cd, mcodeptr,
- PATCHER_clinit, fi->class);
+ PATCHER_clinit, fi->class, 0);
if (opt_showdisassemble) {
M_NOP; M_NOP;
}
}
-
- a = (ptrint) &(fi->value);
}
- a = dseg_addaddress(cd, a);
- M_ALD(REG_ITMP1, REG_PV, a);
+ M_ALD(REG_ITMP1, REG_PV, disp);
switch (iptr->op1) {
case TYPE_INT:
var_to_reg_int(s2, src, REG_ITMP2);
- M_IST(s2, REG_ITMP1, 0);
+ M_IST_INTERN(s2, REG_ITMP1, 0);
break;
case TYPE_LNG:
var_to_reg_int(s2, src, REG_ITMP2);
- M_LST(s2, REG_ITMP1, 0);
+ M_LST_INTERN(s2, REG_ITMP1, 0);
break;
case TYPE_ADR:
var_to_reg_int(s2, src, REG_ITMP2);
- M_AST(s2, REG_ITMP1, 0);
+ M_AST_INTERN(s2, REG_ITMP1, 0);
break;
case TYPE_FLT:
var_to_reg_flt(s2, src, REG_FTMP2);
- M_FST(s2, REG_ITMP1, 0);
+ M_FST_INTERN(s2, REG_ITMP1, 0);
break;
case TYPE_DBL:
var_to_reg_flt(s2, src, REG_FTMP2);
- M_DST(s2, REG_ITMP1, 0);
+ M_DST_INTERN(s2, REG_ITMP1, 0);
break;
}
break;
/* op1 = type, val.a = field address (in */
/* following NOP) */
- if (!iptr[1].val.a) {
+ if (iptr[1].val.a == NULL) {
+ disp = dseg_addaddress(cd, NULL);
+
codegen_addpatchref(cd, mcodeptr,
PATCHER_get_putstatic,
- (unresolved_field *) iptr[1].target);
+ (unresolved_field *) iptr[1].target, disp);
if (opt_showdisassemble) {
M_NOP; M_NOP;
}
- a = 0;
-
} else {
fieldinfo *fi = iptr[1].val.a;
- if (!fi->class->initialized) {
+ disp = dseg_addaddress(cd, &(fi->value));
+
+ if (!CLASS_IS_OR_ALMOST_INITIALIZED(fi->class)) {
codegen_addpatchref(cd, mcodeptr,
- PATCHER_clinit, fi->class);
+ PATCHER_clinit, fi->class, 0);
if (opt_showdisassemble) {
M_NOP; M_NOP;
}
}
-
- a = (ptrint) &(fi->value);
}
- a = dseg_addaddress(cd, a);
- M_ALD(REG_ITMP1, REG_PV, a);
+ M_ALD(REG_ITMP1, REG_PV, disp);
switch (iptr->op1) {
case TYPE_INT:
- M_IST(REG_ZERO, REG_ITMP1, 0);
+ M_IST_INTERN(REG_ZERO, REG_ITMP1, 0);
break;
case TYPE_LNG:
- M_LST(REG_ZERO, REG_ITMP1, 0);
+ M_LST_INTERN(REG_ZERO, REG_ITMP1, 0);
break;
case TYPE_ADR:
- M_AST(REG_ZERO, REG_ITMP1, 0);
+ M_AST_INTERN(REG_ZERO, REG_ITMP1, 0);
break;
case TYPE_FLT:
- M_FST(REG_ZERO, REG_ITMP1, 0);
+ M_FST_INTERN(REG_ZERO, REG_ITMP1, 0);
break;
case TYPE_DBL:
- M_DST(REG_ZERO, REG_ITMP1, 0);
+ M_DST_INTERN(REG_ZERO, REG_ITMP1, 0);
break;
}
break;
var_to_reg_int(s1, src, REG_ITMP1);
gen_nullptr_check(s1);
- if (!iptr->val.a) {
+ if (iptr->val.a == NULL) {
codegen_addpatchref(cd, mcodeptr,
PATCHER_get_putfield,
- (unresolved_field *) iptr->target);
+ (unresolved_field *) iptr->target, 0);
if (opt_showdisassemble) {
M_NOP; M_NOP;
switch (iptr->op1) {
case TYPE_INT:
- d = reg_of_var(rd, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP2);
M_ILD(d, s1, a);
store_reg_to_var_int(iptr->dst, d);
break;
case TYPE_LNG:
- d = reg_of_var(rd, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP2);
M_LLD(d, s1, a);
store_reg_to_var_int(iptr->dst, d);
break;
case TYPE_ADR:
- d = reg_of_var(rd, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP2);
M_ALD(d, s1, a);
store_reg_to_var_int(iptr->dst, d);
break;
store_reg_to_var_flt(iptr->dst, d);
break;
}
- /* XXX quick hack */
- M_NOP;
break;
case ICMD_PUTFIELD: /* ..., objectref, value ==> ... */
var_to_reg_flt(s2, src, REG_FTMP2);
}
- if (!iptr->val.a) {
+ if (iptr->val.a == NULL) {
codegen_addpatchref(cd, mcodeptr,
PATCHER_get_putfield,
- (unresolved_field *) iptr->target);
+ (unresolved_field *) iptr->target, 0);
if (opt_showdisassemble) {
M_NOP; M_NOP;
M_DST(s2, s1, a);
break;
}
- /* XXX quick hack */
- M_NOP;
break;
case ICMD_PUTFIELDCONST: /* ..., objectref ==> ... */
var_to_reg_int(s1, src, REG_ITMP1);
gen_nullptr_check(s1);
- if (!iptr[1].val.a) {
+ if (iptr[1].val.a == NULL) {
codegen_addpatchref(cd, mcodeptr,
PATCHER_get_putfield,
- (unresolved_field *) iptr[1].target);
+ (unresolved_field *) iptr[1].target, 0);
if (opt_showdisassemble) {
M_NOP; M_NOP;
M_DST(REG_ZERO, s1, a);
break;
}
- /* XXX quick hack */
- M_NOP;
break;
var_to_reg_int(s1, src, REG_ITMP1);
M_INTMOVE(s1, REG_ITMP1_XPTR);
- a = dseg_addaddress(cd, asm_handle_exception);
- M_ALD(REG_ITMP2, REG_PV, a);
+
+#ifdef ENABLE_VERIFIER
+ if (iptr->val.a) {
+ codegen_addpatchref(cd, mcodeptr,
+ PATCHER_athrow_areturn,
+ (unresolved_class *) iptr->val.a, 0);
+
+ if (opt_showdisassemble) {
+ M_NOP; M_NOP;
+ }
+ }
+#endif /* ENABLE_VERIFIER */
+
+ disp = dseg_addaddress(cd, asm_handle_exception);
+ M_ALD(REG_ITMP2, REG_PV, disp);
M_JSR(REG_ITMP2_XPC, REG_ITMP2);
M_NOP;
M_NOP; /* nop ensures that XPC is less than the end */
case ICMD_GOTO: /* ... ==> ... */
/* op1 = target JavaVM pc */
M_BR(0);
- codegen_addreference(cd, BlockPtrOfPC(iptr->op1), mcodeptr);
+ codegen_addreference(cd, (basicblock *) iptr->target, mcodeptr);
M_NOP;
ALIGNCODENOP;
break;
case ICMD_JSR: /* ... ==> ... */
/* op1 = target JavaVM pc */
- dseg_addtarget(cd, BlockPtrOfPC(iptr->op1));
+ dseg_addtarget(cd, (basicblock *) iptr->target);
M_ALD(REG_ITMP1, REG_PV, -(cd->dseglen));
M_JSR(REG_ITMP1, REG_ITMP1); /* REG_ITMP1 = return address */
M_NOP;
/* op1 = local variable */
var = &(rd->locals[iptr->op1][TYPE_ADR]);
if (var->flags & INMEMORY) {
- M_ALD(REG_ITMP1, REG_SP, 8 * var->regoff);
+ M_ALD(REG_ITMP1, REG_SP, var->regoff * 8);
M_RET(REG_ITMP1);
- }
- else
+ } else
M_RET(var->regoff);
M_NOP;
ALIGNCODENOP;
var_to_reg_int(s1, src, REG_ITMP1);
M_BEQZ(s1, 0);
- codegen_addreference(cd, BlockPtrOfPC(iptr->op1), mcodeptr);
+ codegen_addreference(cd, (basicblock *) iptr->target, mcodeptr);
M_NOP;
break;
var_to_reg_int(s1, src, REG_ITMP1);
M_BNEZ(s1, 0);
- codegen_addreference(cd, BlockPtrOfPC(iptr->op1), mcodeptr);
+ codegen_addreference(cd, (basicblock *) iptr->target, mcodeptr);
M_NOP;
break;
var_to_reg_int(s1, src, REG_ITMP1);
if (iptr->val.i == 0) {
M_BEQZ(s1, 0);
- }
- else {
+ } else {
ICONST(REG_ITMP2, iptr->val.i);
M_BEQ(s1, REG_ITMP2, 0);
- }
- codegen_addreference(cd, BlockPtrOfPC(iptr->op1), mcodeptr);
+ }
+ codegen_addreference(cd, (basicblock *) iptr->target, mcodeptr);
M_NOP;
break;
var_to_reg_int(s1, src, REG_ITMP1);
if (iptr->val.i == 0) {
M_BLTZ(s1, 0);
- }
- else {
+ } else {
if ((iptr->val.i >= -32768) && (iptr->val.i <= 32767)) {
M_CMPLT_IMM(s1, iptr->val.i, REG_ITMP1);
- }
- else {
+ } else {
ICONST(REG_ITMP2, iptr->val.i);
M_CMPLT(s1, REG_ITMP2, REG_ITMP1);
- }
- M_BNEZ(REG_ITMP1, 0);
}
- codegen_addreference(cd, BlockPtrOfPC(iptr->op1), mcodeptr);
+ M_BNEZ(REG_ITMP1, 0);
+ }
+ codegen_addreference(cd, (basicblock *) iptr->target, mcodeptr);
M_NOP;
break;
M_BEQZ(REG_ITMP1, 0);
}
}
- codegen_addreference(cd, BlockPtrOfPC(iptr->op1), mcodeptr);
+ codegen_addreference(cd, (basicblock *) iptr->target, mcodeptr);
M_NOP;
break;
ICONST(REG_ITMP2, iptr->val.i);
M_BNE(s1, REG_ITMP2, 0);
}
- codegen_addreference(cd, BlockPtrOfPC(iptr->op1), mcodeptr);
+ codegen_addreference(cd, (basicblock *) iptr->target, mcodeptr);
M_NOP;
break;
M_BNEZ(REG_ITMP1, 0);
}
}
- codegen_addreference(cd, BlockPtrOfPC(iptr->op1), mcodeptr);
+ codegen_addreference(cd, (basicblock *) iptr->target, mcodeptr);
M_NOP;
break;
}
M_BEQZ(REG_ITMP1, 0);
}
- codegen_addreference(cd, BlockPtrOfPC(iptr->op1), mcodeptr);
+ codegen_addreference(cd, (basicblock *) iptr->target, mcodeptr);
M_NOP;
break;
LCONST(REG_ITMP2, iptr->val.l);
M_BEQ(s1, REG_ITMP2, 0);
}
- codegen_addreference(cd, BlockPtrOfPC(iptr->op1), mcodeptr);
+ codegen_addreference(cd, (basicblock *) iptr->target, mcodeptr);
M_NOP;
break;
}
M_BNEZ(REG_ITMP1, 0);
}
- codegen_addreference(cd, BlockPtrOfPC(iptr->op1), mcodeptr);
+ codegen_addreference(cd, (basicblock *) iptr->target, mcodeptr);
M_NOP;
break;
M_BEQZ(REG_ITMP1, 0);
}
}
- codegen_addreference(cd, BlockPtrOfPC(iptr->op1), mcodeptr);
+ codegen_addreference(cd, (basicblock *) iptr->target, mcodeptr);
M_NOP;
break;
LCONST(REG_ITMP2, iptr->val.l);
M_BNE(s1, REG_ITMP2, 0);
}
- codegen_addreference(cd, BlockPtrOfPC(iptr->op1), mcodeptr);
+ codegen_addreference(cd, (basicblock *) iptr->target, mcodeptr);
M_NOP;
break;
M_BNEZ(REG_ITMP1, 0);
}
}
- codegen_addreference(cd, BlockPtrOfPC(iptr->op1), mcodeptr);
+ codegen_addreference(cd, (basicblock *) iptr->target, mcodeptr);
M_NOP;
break;
}
M_BEQZ(REG_ITMP1, 0);
}
- codegen_addreference(cd, BlockPtrOfPC(iptr->op1), mcodeptr);
+ codegen_addreference(cd, (basicblock *) iptr->target, mcodeptr);
M_NOP;
break;
var_to_reg_int(s1, src->prev, REG_ITMP1);
var_to_reg_int(s2, src, REG_ITMP2);
M_BEQ(s1, s2, 0);
- codegen_addreference(cd, BlockPtrOfPC(iptr->op1), mcodeptr);
+ codegen_addreference(cd, (basicblock *) iptr->target, mcodeptr);
M_NOP;
break;
var_to_reg_int(s1, src->prev, REG_ITMP1);
var_to_reg_int(s2, src, REG_ITMP2);
M_BNE(s1, s2, 0);
- codegen_addreference(cd, BlockPtrOfPC(iptr->op1), mcodeptr);
+ codegen_addreference(cd, (basicblock *) iptr->target, mcodeptr);
M_NOP;
break;
var_to_reg_int(s2, src, REG_ITMP2);
M_CMPLT(s1, s2, REG_ITMP1);
M_BNEZ(REG_ITMP1, 0);
- codegen_addreference(cd, BlockPtrOfPC(iptr->op1), mcodeptr);
+ codegen_addreference(cd, (basicblock *) iptr->target, mcodeptr);
M_NOP;
break;
var_to_reg_int(s2, src, REG_ITMP2);
M_CMPGT(s1, s2, REG_ITMP1);
M_BNEZ(REG_ITMP1, 0);
- codegen_addreference(cd, BlockPtrOfPC(iptr->op1), mcodeptr);
+ codegen_addreference(cd, (basicblock *) iptr->target, mcodeptr);
M_NOP;
break;
var_to_reg_int(s2, src, REG_ITMP2);
M_CMPGT(s1, s2, REG_ITMP1);
M_BEQZ(REG_ITMP1, 0);
- codegen_addreference(cd, BlockPtrOfPC(iptr->op1), mcodeptr);
+ codegen_addreference(cd, (basicblock *) iptr->target, mcodeptr);
M_NOP;
break;
var_to_reg_int(s2, src, REG_ITMP2);
M_CMPLT(s1, s2, REG_ITMP1);
M_BEQZ(REG_ITMP1, 0);
- codegen_addreference(cd, BlockPtrOfPC(iptr->op1), mcodeptr);
+ codegen_addreference(cd, (basicblock *) iptr->target, mcodeptr);
M_NOP;
break;
/* val.i = constant */
var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(rd, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP2);
s3 = iptr->val.i;
if (iptr[1].opc == ICMD_ELSE_ICONST) {
if ((s3 == 1) && (iptr[1].val.i == 0)) {
M_CMPEQ(s1, REG_ZERO, d);
store_reg_to_var_int(iptr->dst, d);
break;
- }
+ }
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;
- }
+ }
if (s1 == d) {
M_MOV(s1, REG_ITMP1);
s1 = REG_ITMP1;
- }
- ICONST(d, iptr[1].val.i);
}
+ ICONST(d, iptr[1].val.i);
+ }
if ((s3 >= 0) && (s3 <= 255)) {
M_CMOVEQ_IMM(s1, s3, d);
- }
- else {
- ICONST(REG_ITMP2, s3);
- M_CMOVEQ(s1, REG_ITMP2, d);
- }
+ } else {
+ ICONST(REG_ITMP3, s3);
+ M_CMOVEQ(s1, REG_ITMP3, d);
+ }
store_reg_to_var_int(iptr->dst, d);
break;
/* val.i = constant */
var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(rd, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP2);
s3 = iptr->val.i;
if (iptr[1].opc == ICMD_ELSE_ICONST) {
if ((s3 == 0) && (iptr[1].val.i == 1)) {
M_CMPEQ(s1, REG_ZERO, d);
store_reg_to_var_int(iptr->dst, d);
break;
- }
+ }
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;
- }
+ }
if (s1 == d) {
M_MOV(s1, REG_ITMP1);
s1 = REG_ITMP1;
- }
- ICONST(d, iptr[1].val.i);
}
+ ICONST(d, iptr[1].val.i);
+ }
if ((s3 >= 0) && (s3 <= 255)) {
M_CMOVNE_IMM(s1, s3, d);
- }
- else {
- ICONST(REG_ITMP2, s3);
- M_CMOVNE(s1, REG_ITMP2, d);
- }
+ } else {
+ ICONST(REG_ITMP3, s3);
+ M_CMOVNE(s1, REG_ITMP3, d);
+ }
store_reg_to_var_int(iptr->dst, d);
break;
/* val.i = constant */
var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(rd, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP2);
s3 = iptr->val.i;
if ((iptr[1].opc == ICMD_ELSE_ICONST)) {
if ((s3 == 1) && (iptr[1].val.i == 0)) {
M_CMPLT(s1, REG_ZERO, d);
store_reg_to_var_int(iptr->dst, d);
break;
- }
+ }
if ((s3 == 0) && (iptr[1].val.i == 1)) {
M_CMPLE(REG_ZERO, s1, d);
store_reg_to_var_int(iptr->dst, d);
break;
- }
+ }
if (s1 == d) {
M_MOV(s1, REG_ITMP1);
s1 = REG_ITMP1;
- }
- ICONST(d, iptr[1].val.i);
}
+ ICONST(d, iptr[1].val.i);
+ }
if ((s3 >= 0) && (s3 <= 255)) {
M_CMOVLT_IMM(s1, s3, d);
- }
- else {
- ICONST(REG_ITMP2, s3);
- M_CMOVLT(s1, REG_ITMP2, d);
- }
+ } else {
+ ICONST(REG_ITMP3, s3);
+ M_CMOVLT(s1, REG_ITMP3, d);
+ }
store_reg_to_var_int(iptr->dst, d);
break;
/* val.i = constant */
var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(rd, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP2);
s3 = iptr->val.i;
if ((iptr[1].opc == ICMD_ELSE_ICONST)) {
if ((s3 == 1) && (iptr[1].val.i == 0)) {
M_CMPLE(REG_ZERO, s1, d);
store_reg_to_var_int(iptr->dst, d);
break;
- }
+ }
if ((s3 == 0) && (iptr[1].val.i == 1)) {
M_CMPLT(s1, REG_ZERO, d);
store_reg_to_var_int(iptr->dst, d);
break;
- }
+ }
if (s1 == d) {
M_MOV(s1, REG_ITMP1);
s1 = REG_ITMP1;
- }
- ICONST(d, iptr[1].val.i);
}
+ ICONST(d, iptr[1].val.i);
+ }
if ((s3 >= 0) && (s3 <= 255)) {
M_CMOVGE_IMM(s1, s3, d);
- }
- else {
- ICONST(REG_ITMP2, s3);
- M_CMOVGE(s1, REG_ITMP2, d);
- }
+ } else {
+ ICONST(REG_ITMP3, s3);
+ M_CMOVGE(s1, REG_ITMP3, d);
+ }
store_reg_to_var_int(iptr->dst, d);
break;
/* val.i = constant */
var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(rd, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP2);
s3 = iptr->val.i;
if ((iptr[1].opc == ICMD_ELSE_ICONST)) {
if ((s3 == 1) && (iptr[1].val.i == 0)) {
M_CMPLT(REG_ZERO, s1, d);
store_reg_to_var_int(iptr->dst, d);
break;
- }
+ }
if ((s3 == 0) && (iptr[1].val.i == 1)) {
M_CMPLE(s1, REG_ZERO, d);
store_reg_to_var_int(iptr->dst, d);
break;
- }
+ }
if (s1 == d) {
M_MOV(s1, REG_ITMP1);
s1 = REG_ITMP1;
- }
- ICONST(d, iptr[1].val.i);
}
+ ICONST(d, iptr[1].val.i);
+ }
if ((s3 >= 0) && (s3 <= 255)) {
M_CMOVGT_IMM(s1, s3, d);
- }
- else {
- ICONST(REG_ITMP2, s3);
- M_CMOVGT(s1, REG_ITMP2, d);
- }
+ } else {
+ ICONST(REG_ITMP3, s3);
+ M_CMOVGT(s1, REG_ITMP3, d);
+ }
store_reg_to_var_int(iptr->dst, d);
break;
/* val.i = constant */
var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(rd, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP2);
s3 = iptr->val.i;
if ((iptr[1].opc == ICMD_ELSE_ICONST)) {
if ((s3 == 1) && (iptr[1].val.i == 0)) {
M_CMPLE(s1, REG_ZERO, d);
store_reg_to_var_int(iptr->dst, d);
break;
- }
+ }
if ((s3 == 0) && (iptr[1].val.i == 1)) {
M_CMPLT(REG_ZERO, s1, d);
store_reg_to_var_int(iptr->dst, d);
break;
- }
+ }
if (s1 == d) {
M_MOV(s1, REG_ITMP1);
s1 = REG_ITMP1;
- }
- ICONST(d, iptr[1].val.i);
}
+ ICONST(d, iptr[1].val.i);
+ }
if ((s3 >= 0) && (s3 <= 255)) {
M_CMOVLE_IMM(s1, s3, d);
- }
- else {
- ICONST(REG_ITMP2, s3);
- M_CMOVLE(s1, REG_ITMP2, d);
- }
+ } else {
+ ICONST(REG_ITMP3, s3);
+ M_CMOVLE(s1, REG_ITMP3, d);
+ }
store_reg_to_var_int(iptr->dst, d);
break;
#endif
case ICMD_IRETURN: /* ..., retvalue ==> ... */
case ICMD_LRETURN:
- case ICMD_ARETURN:
+
var_to_reg_int(s1, src, REG_RESULT);
M_INTMOVE(s1, REG_RESULT);
+ goto nowperformreturn;
-#if defined(USE_THREADS)
- if (checksync && (m->flags & ACC_SYNCHRONIZED)) {
- s4 disp;
- a = dseg_addaddress(cd, (void *) builtin_monitorexit);
- M_ALD(REG_ITMP3, REG_PV, a);
- M_ALD(rd->argintregs[0], REG_SP, rd->memuse * 8);
- M_JSR(REG_RA, REG_ITMP3);
- M_LST(REG_RESULT, REG_SP, rd->memuse * 8); /* delay slot */
+ case ICMD_ARETURN: /* ..., retvalue ==> ... */
+
+ var_to_reg_int(s1, src, REG_RESULT);
+ M_INTMOVE(s1, REG_RESULT);
+
+#ifdef ENABLE_VERIFIER
+ if (iptr->val.a) {
+ codegen_addpatchref(cd, mcodeptr,
+ PATCHER_athrow_areturn,
+ (unresolved_class *) iptr->val.a, 0);
- disp = -(s4) ((u1 *) mcodeptr - cd->mcodebase);
- M_LDA(REG_PV, REG_RA, disp);
- M_LLD(REG_RESULT, REG_SP, rd->memuse * 8);
+ if (opt_showdisassemble) {
+ M_NOP; M_NOP;
+ }
}
-#endif
+#endif /* ENABLE_VERIFIER */
goto nowperformreturn;
case ICMD_FRETURN: /* ..., retvalue ==> ... */
int t = ((iptr->opc == ICMD_FRETURN) ? TYPE_FLT : TYPE_DBL);
M_TFLTMOVE(t, s1, REG_FRESULT);
}
-
-#if defined(USE_THREADS)
- if (checksync && (m->flags & ACC_SYNCHRONIZED)) {
- s4 disp;
- a = dseg_addaddress(cd, (void *) builtin_monitorexit);
- M_ALD(REG_ITMP3, REG_PV, a);
- M_ALD(rd->argintregs[0], REG_SP, rd->memuse * 8);
- M_JSR(REG_RA, REG_ITMP3);
- M_DST(REG_FRESULT, REG_SP, rd->memuse * 8); /* delay slot */
-
- disp = -(s4) ((u1 *) mcodeptr - cd->mcodebase);
- M_LDA(REG_PV, REG_RA, disp);
- M_DLD(REG_FRESULT, REG_SP, rd->memuse * 8);
- }
-#endif
goto nowperformreturn;
case ICMD_RETURN: /* ... ==> ... */
-#if defined(USE_THREADS)
- if (checksync && (m->flags & ACC_SYNCHRONIZED)) {
- s4 disp;
- a = dseg_addaddress(cd, (void *) builtin_monitorexit);
- M_ALD(REG_ITMP3, REG_PV, a);
- M_JSR(REG_RA, REG_ITMP3);
- M_ALD(rd->argintregs[0], REG_SP, rd->memuse * 8); /* delay slot */
- disp = -(s4) ((u1 *) mcodeptr - cd->mcodebase);
- M_LDA(REG_PV, REG_RA, disp);
- }
-#endif
-
nowperformreturn:
{
s4 i, p;
p = parentargs_base;
+ /* call trace function */
+
+ if (opt_verbosecall) {
+ M_LDA(REG_SP, REG_SP, -3 * 8);
+ M_LST(REG_RA, REG_SP, 0 * 8);
+ M_LST(REG_RESULT, REG_SP, 1 * 8);
+ M_DST(REG_FRESULT, REG_SP, 2 * 8);
+
+ disp = dseg_addaddress(cd, m);
+ M_ALD(rd->argintregs[0], REG_PV, disp);
+ M_MOV(REG_RESULT, rd->argintregs[1]);
+ M_FLTMOVE(REG_FRESULT, rd->argfltregs[2]);
+ M_FMOV(REG_FRESULT, rd->argfltregs[3]);
+
+ disp = dseg_addaddress(cd, (void *) builtin_displaymethodstop);
+ M_ALD(REG_ITMP3, REG_PV, disp);
+ M_JSR(REG_RA, REG_ITMP3);
+ M_NOP;
+
+ M_DLD(REG_FRESULT, REG_SP, 2 * 8);
+ M_LLD(REG_RESULT, REG_SP, 1 * 8);
+ M_LLD(REG_RA, REG_SP, 0 * 8);
+ M_LDA(REG_SP, REG_SP, 3 * 8);
+ }
+
+#if defined(USE_THREADS)
+ if (checksync && (m->flags & ACC_SYNCHRONIZED)) {
+ disp = dseg_addaddress(cd, (void *) builtin_monitorexit);
+ M_ALD(REG_ITMP3, REG_PV, disp);
+
+ /* we need to save the proper return value */
+
+ switch (iptr->opc) {
+ case ICMD_IRETURN:
+ case ICMD_ARETURN:
+ case ICMD_LRETURN:
+ M_ALD(rd->argintregs[0], REG_SP, rd->memuse * 8);
+ M_JSR(REG_RA, REG_ITMP3);
+ M_LST(REG_RESULT, REG_SP, rd->memuse * 8); /* delay slot */
+ break;
+ case ICMD_FRETURN:
+ case ICMD_DRETURN:
+ M_ALD(rd->argintregs[0], REG_SP, rd->memuse * 8);
+ M_JSR(REG_RA, REG_ITMP3);
+ M_DST(REG_FRESULT, REG_SP, rd->memuse * 8); /* delay slot */
+ break;
+ case ICMD_RETURN:
+ M_JSR(REG_RA, REG_ITMP3);
+ M_ALD(rd->argintregs[0], REG_SP, rd->memuse * 8); /* delay*/
+ break;
+ }
+
+ /* and now restore the proper return value */
+
+ switch (iptr->opc) {
+ case ICMD_IRETURN:
+ case ICMD_ARETURN:
+ case ICMD_LRETURN:
+ M_LLD(REG_RESULT, REG_SP, rd->memuse * 8);
+ break;
+ case ICMD_FRETURN:
+ case ICMD_DRETURN:
+ M_DLD(REG_FRESULT, REG_SP, rd->memuse * 8);
+ break;
+ }
+ }
+#endif
+
/* restore return address */
if (!m->isleafmethod) {
- p--; M_LLD(REG_RA, REG_SP, 8 * p);
+ p--; M_ALD(REG_RA, REG_SP, p * 8);
}
/* restore saved registers */
for (i = INT_SAV_CNT - 1; i >= rd->savintreguse; i--) {
- p--; M_LLD(rd->savintregs[i], REG_SP, 8 * p);
+ p--; M_LLD(rd->savintregs[i], REG_SP, p * 8);
}
for (i = FLT_SAV_CNT - 1; i >= rd->savfltreguse; i--) {
- p--; M_DLD(rd->savfltregs[i], REG_SP, 8 * p);
+ p--; M_DLD(rd->savfltregs[i], REG_SP, p * 8);
}
- /* call trace function */
+ /* deallocate stack and return */
- if (runverbose) {
- M_LDA (REG_SP, REG_SP, -24);
- M_LST(REG_RA, REG_SP, 0);
- M_LST(REG_RESULT, REG_SP, 8);
- M_DST(REG_FRESULT, REG_SP,16);
- a = dseg_addaddress(cd, m);
- M_ALD(rd->argintregs[0], REG_PV, a);
- M_MOV(REG_RESULT, rd->argintregs[1]);
- M_FLTMOVE(REG_FRESULT, rd->argfltregs[2]);
- M_FMOV(REG_FRESULT, rd->argfltregs[3]);
- a = dseg_addaddress(cd, (void *) builtin_displaymethodstop);
- M_ALD(REG_ITMP3, REG_PV, a);
- M_JSR (REG_RA, REG_ITMP3);
- M_NOP;
- M_DLD(REG_FRESULT, REG_SP,16);
- M_LLD(REG_RESULT, REG_SP, 8);
- M_LLD(REG_RA, REG_SP, 0);
- M_LDA (REG_SP, REG_SP, 24);
- }
-
- M_RET(REG_RA);
+ if (parentargs_base) {
+ s4 lo, hi;
- /* deallocate stack */
+ disp = parentargs_base * 8;
+ lo = (short) (disp);
+ hi = (short) (((disp) - lo) >> 16);
- if (parentargs_base) {
- M_LDA(REG_SP, REG_SP, parentargs_base * 8);
+ if (hi == 0) {
+ M_RET(REG_RA);
+ M_LADD_IMM(REG_SP, lo, REG_SP); /* delay slot */
+ } else {
+ M_LUI(REG_ITMP3,hi);
+ M_LADD_IMM(REG_ITMP3,lo,REG_ITMP3);
+ M_RET(REG_RA);
+ M_LADD(REG_ITMP3,REG_SP,REG_SP); /* delay slot */
+ }
} else {
+ M_RET(REG_RA);
M_NOP;
}
lm = iptr->val.a;
- if (lm)
- md = lm->parseddesc;
- else {
+ if (lm == NULL) {
unresolved_method *um = iptr->target;
md = um->methodref->parseddesc.md;
+ } else {
+ md = lm->parseddesc;
}
gen_method:
- s3 = iptr->op1;
+ s3 = md->paramcount;
MCODECHECK((s3 << 1) + 64);
switch (iptr->opc) {
case ICMD_BUILTIN:
- if (iptr->target) {
- codegen_addpatchref(cd, mcodeptr, bte->fp, iptr->target);
-
- if (opt_showdisassemble) {
- M_NOP; M_NOP;
- }
-
- a = 0;
-
- } else {
- a = (ptrint) bte->fp;
- }
-
- a = dseg_addaddress(cd, a);
+ disp = dseg_addaddress(cd, bte->fp);
d = md->returntype.type;
- M_ALD(REG_ITMP3, REG_PV, a); /* built-in-function pointer */
+ M_ALD(REG_ITMP3, REG_PV, disp); /* built-in-function pointer */
M_JSR(REG_RA, REG_ITMP3);
M_NOP;
- goto afteractualcall;
+ disp = (s4) ((u1 *) mcodeptr - cd->mcodebase);
+ M_LDA(REG_PV, REG_RA, -disp);
+
+ /* if op1 == true, we need to check for an exception */
+
+ if (iptr->op1 == true) {
+ M_BEQZ(REG_RESULT, 0);
+ codegen_add_fillinstacktrace_ref(cd, mcodeptr);
+ M_NOP;
+ }
+ break;
case ICMD_INVOKESPECIAL:
- gen_nullptr_check(rd->argintregs[0]);
- M_ILD(REG_ITMP1, rd->argintregs[0], 0); /* hardware nullptr */
+ M_BEQZ(rd->argintregs[0], 0);
+ codegen_add_nullpointerexception_ref(cd, mcodeptr);
+ M_NOP;
/* fall through */
case ICMD_INVOKESTATIC:
- if (!lm) {
+ if (lm == NULL) {
unresolved_method *um = iptr->target;
+ disp = dseg_addaddress(cd, NULL);
+
codegen_addpatchref(cd, mcodeptr,
- PATCHER_invokestatic_special, um);
+ PATCHER_invokestatic_special, um, disp);
if (opt_showdisassemble) {
M_NOP; M_NOP;
}
- a = 0;
d = um->methodref->parseddesc.md->returntype.type;
} else {
- a = (ptrint) lm->stubroutine;
+ disp = dseg_addaddress(cd, lm->stubroutine);
d = lm->parseddesc->returntype.type;
}
- a = dseg_addaddress(cd, a);
- M_ALD(REG_PV, REG_PV, a); /* method pointer in pv */
+ M_ALD(REG_PV, REG_PV, disp); /* method pointer in pv */
+ M_JSR(REG_RA, REG_PV);
+ M_NOP;
+ disp = (s4) ((u1 *) mcodeptr - cd->mcodebase);
+ M_LDA(REG_PV, REG_RA, -disp);
break;
case ICMD_INVOKEVIRTUAL:
gen_nullptr_check(rd->argintregs[0]);
- if (!lm) {
+ if (lm == NULL) {
unresolved_method *um = iptr->target;
codegen_addpatchref(cd, mcodeptr,
- PATCHER_invokevirtual, um);
+ PATCHER_invokevirtual, um, 0);
if (opt_showdisassemble) {
M_NOP; M_NOP;
M_ALD(REG_METHODPTR, rd->argintregs[0],
OFFSET(java_objectheader, vftbl));
M_ALD(REG_PV, REG_METHODPTR, s1);
+ M_JSR(REG_RA, REG_PV);
+ M_NOP;
+ disp = (s4) ((u1 *) mcodeptr - cd->mcodebase);
+ M_LDA(REG_PV, REG_RA, -disp);
break;
case ICMD_INVOKEINTERFACE:
gen_nullptr_check(rd->argintregs[0]);
- if (!lm) {
+ if (lm == NULL) {
unresolved_method *um = iptr->target;
codegen_addpatchref(cd, mcodeptr,
- PATCHER_invokeinterface, um);
+ PATCHER_invokeinterface, um, 0);
if (opt_showdisassemble) {
M_NOP; M_NOP;
OFFSET(java_objectheader, vftbl));
M_ALD(REG_METHODPTR, REG_METHODPTR, s1);
M_ALD(REG_PV, REG_METHODPTR, s2);
+ M_JSR(REG_RA, REG_PV);
+ M_NOP;
+ disp = (s4) ((u1 *) mcodeptr - cd->mcodebase);
+ M_LDA(REG_PV, REG_RA, -disp);
break;
}
- M_JSR(REG_RA, REG_PV);
- M_NOP;
-
- /* recompute pv */
-
-afteractualcall:
-
- s1 = (s4) ((u1 *) mcodeptr - cd->mcodebase);
- if (s1 <= 32768) M_LDA(REG_PV, REG_RA, -s1);
- else {
- s4 ml = -s1, mh = 0;
- while (ml < -32768) { ml += 65536; mh--; }
- M_LUI(REG_PV, mh);
- M_IADD_IMM(REG_PV, ml, REG_PV);
- M_LADD(REG_PV, REG_RA, REG_PV);
- }
-
/* d contains return type */
if (d != TYPE_VOID) {
* super->vftbl->diffvall));
*/
- {
- classinfo *super;
- vftbl_t *supervftbl;
- s4 superindex;
+ if (iptr->op1 == 1) {
+ classinfo *super;
+ vftbl_t *supervftbl;
+ s4 superindex;
- super = (classinfo *) iptr->val.a;
+ super = (classinfo *) iptr->val.a;
- if (!super) {
- superindex = 0;
- supervftbl = NULL;
+ if (!super) {
+ superindex = 0;
+ supervftbl = NULL;
- } else {
- superindex = super->index;
- supervftbl = super->vftbl;
- }
+ } else {
+ superindex = super->index;
+ supervftbl = super->vftbl;
+ }
#if defined(USE_THREADS) && defined(NATIVE_THREADS)
- codegen_threadcritrestart(cd, (u1 *) mcodeptr - cd->mcodebase);
+ codegen_threadcritrestart(cd, (u1 *) mcodeptr - cd->mcodebase);
#endif
- var_to_reg_int(s1, src, REG_ITMP1);
-
- /* calculate interface checkcast code size */
-
- s2 = 8;
- if (!super)
- s2 += (opt_showdisassemble ? 2 : 0);
-
- /* calculate class checkcast code size */
-
- s3 = 10 /* 10 + (s1 == REG_ITMP1) */;
- if (!super)
- s3 += (opt_showdisassemble ? 2 : 0);
-
- /* if class is not resolved, check which code to call */
+ var_to_reg_int(s1, src, REG_ITMP1);
- if (!super) {
- M_BEQZ(s1, 5 + (opt_showdisassemble ? 2 : 0) + s2 + 2 + s3);
- M_NOP;
+ /* calculate interface checkcast code size */
- codegen_addpatchref(cd, mcodeptr,
- PATCHER_checkcast_instanceof_flags,
- (constant_classref *) iptr->target);
+ s2 = 8;
+ if (!super)
+ s2 += (opt_showdisassemble ? 2 : 0);
- if (opt_showdisassemble) {
- M_NOP; M_NOP;
- }
+ /* calculate class checkcast code size */
- a = dseg_adds4(cd, 0); /* super->flags */
- M_ILD(REG_ITMP2, REG_PV, a);
- M_AND_IMM(REG_ITMP2, ACC_INTERFACE, REG_ITMP2);
- M_BEQZ(REG_ITMP2, 1 + s2 + 2);
- M_NOP;
- }
+ s3 = 10 /* 10 + (s1 == REG_ITMP1) */;
+ if (!super)
+ s3 += (opt_showdisassemble ? 2 : 0);
- /* interface checkcast code */
+ /* if class is not resolved, check which code to call */
- if (!super || super->flags & ACC_INTERFACE) {
- if (super) {
- M_BEQZ(s1, 1 + s2);
+ if (!super) {
+ M_BEQZ(s1, 5 + (opt_showdisassemble ? 2 : 0) + s2 + 2 + s3);
M_NOP;
- } else {
+ disp = dseg_adds4(cd, 0); /* super->flags */
+
codegen_addpatchref(cd, mcodeptr,
- PATCHER_checkcast_instanceof_interface,
- (constant_classref *) iptr->target);
+ PATCHER_checkcast_instanceof_flags,
+ (constant_classref *) iptr->target,
+ disp);
if (opt_showdisassemble) {
M_NOP; M_NOP;
}
+
+ /* XXX TWISTI M_ILD can be 2 instructions long (jump offset) */
+ M_ILD(REG_ITMP2, REG_PV, disp);
+ M_AND_IMM(REG_ITMP2, ACC_INTERFACE, REG_ITMP2);
+ M_BEQZ(REG_ITMP2, 1 + s2 + 2);
+ M_NOP;
}
- M_ALD(REG_ITMP2, s1, OFFSET(java_objectheader, vftbl));
- M_ILD(REG_ITMP3, REG_ITMP2, OFFSET(vftbl_t, interfacetablelength));
- M_IADD_IMM(REG_ITMP3, -superindex, REG_ITMP3);
- M_BLEZ(REG_ITMP3, 0);
- codegen_addxcastrefs(cd, mcodeptr);
- M_NOP;
- M_ALD(REG_ITMP3, REG_ITMP2,
- OFFSET(vftbl_t, interfacetable[0]) -
- superindex * sizeof(methodptr*));
- M_BEQZ(REG_ITMP3, 0);
- codegen_addxcastrefs(cd, mcodeptr);
- M_NOP;
+ /* interface checkcast code */
- if (!super) {
- M_BR(1 + s3);
+ if (!super || super->flags & ACC_INTERFACE) {
+ if (super) {
+ M_BEQZ(s1, 1 + s2);
+ M_NOP;
+
+ } else {
+ codegen_addpatchref(cd, mcodeptr,
+ PATCHER_checkcast_instanceof_interface,
+ (constant_classref *) iptr->target,
+ 0);
+
+ if (opt_showdisassemble) {
+ M_NOP; M_NOP;
+ }
+ }
+
+ M_ALD(REG_ITMP2, s1, OFFSET(java_objectheader, vftbl));
+ M_ILD(REG_ITMP3, REG_ITMP2, OFFSET(vftbl_t, interfacetablelength));
+ M_IADD_IMM(REG_ITMP3, -superindex, REG_ITMP3);
+ M_BLEZ(REG_ITMP3, 0);
+ codegen_add_classcastexception_ref(cd, mcodeptr);
M_NOP;
+ M_ALD(REG_ITMP3, REG_ITMP2,
+ OFFSET(vftbl_t, interfacetable[0]) -
+ superindex * sizeof(methodptr*));
+ M_BEQZ(REG_ITMP3, 0);
+ codegen_add_classcastexception_ref(cd, mcodeptr);
+ M_NOP;
+
+ if (!super) {
+ M_BR(1 + s3);
+ M_NOP;
+ }
}
- }
- /* class checkcast code */
+ /* class checkcast code */
- if (!super || !(super->flags & ACC_INTERFACE)) {
- if (super) {
- M_BEQZ(s1, 1 + s3);
- M_NOP;
+ if (!super || !(super->flags & ACC_INTERFACE)) {
+ disp = dseg_addaddress(cd, (void *) supervftbl);
- } else {
- codegen_addpatchref(cd, mcodeptr,
- PATCHER_checkcast_instanceof_class,
- (constant_classref *) iptr->target);
+ if (super) {
+ M_BEQZ(s1, 1 + s3);
+ M_NOP;
- if (opt_showdisassemble) {
- M_NOP; M_NOP;
+ } else {
+ codegen_addpatchref(cd, mcodeptr,
+ PATCHER_checkcast_instanceof_class,
+ (constant_classref *) iptr->target,
+ disp);
+
+ if (opt_showdisassemble) {
+ M_NOP; M_NOP;
+ }
}
- }
- M_ALD(REG_ITMP2, s1, OFFSET(java_objectheader, vftbl));
- a = dseg_addaddress(cd, (void *) supervftbl);
- M_ALD(REG_ITMP3, REG_PV, a);
+ M_ALD(REG_ITMP2, s1, OFFSET(java_objectheader, vftbl));
+ M_ALD(REG_ITMP3, REG_PV, disp);
#if defined(USE_THREADS) && defined(NATIVE_THREADS)
- codegen_threadcritstart(cd, (u1 *) mcodeptr - cd->mcodebase);
+ codegen_threadcritstart(cd, (u1 *) mcodeptr - cd->mcodebase);
#endif
- M_ILD(REG_ITMP2, REG_ITMP2, OFFSET(vftbl_t, baseval));
-/* if (s1 != REG_ITMP1) { */
-/* M_ILD(REG_ITMP1, REG_ITMP3, OFFSET(vftbl_t, baseval)); */
-/* M_ILD(REG_ITMP3, REG_ITMP3, OFFSET(vftbl_t, diffval)); */
-/* #if defined(USE_THREADS) && defined(NATIVE_THREADS) */
-/* codegen_threadcritstop(cd, (u1 *) mcodeptr - cd->mcodebase); */
-/* #endif */
-/* M_ISUB(REG_ITMP2, REG_ITMP1, REG_ITMP2); */
-/* } else { */
+ M_ILD(REG_ITMP2, REG_ITMP2, OFFSET(vftbl_t, baseval));
+ /* if (s1 != REG_ITMP1) { */
+ /* M_ILD(REG_ITMP1, REG_ITMP3, OFFSET(vftbl_t, baseval)); */
+ /* M_ILD(REG_ITMP3, REG_ITMP3, OFFSET(vftbl_t, diffval)); */
+ /* #if defined(USE_THREADS) && defined(NATIVE_THREADS) */
+ /* codegen_threadcritstop(cd, (u1 *) mcodeptr - cd->mcodebase); */
+ /* #endif */
+ /* M_ISUB(REG_ITMP2, REG_ITMP1, REG_ITMP2); */
+ /* } else { */
M_ILD(REG_ITMP3, REG_ITMP3, OFFSET(vftbl_t, baseval));
M_ISUB(REG_ITMP2, REG_ITMP3, REG_ITMP2);
- M_ALD(REG_ITMP3, REG_PV, a);
+ M_ALD(REG_ITMP3, REG_PV, disp);
M_ILD(REG_ITMP3, REG_ITMP3, OFFSET(vftbl_t, diffval));
#if defined(USE_THREADS) && defined(NATIVE_THREADS)
codegen_threadcritstop(cd, (u1 *) mcodeptr - cd->mcodebase);
#endif
-/* } */
- M_CMPULT(REG_ITMP3, REG_ITMP2, REG_ITMP3);
- M_BNEZ(REG_ITMP3, 0);
- codegen_addxcastrefs(cd, mcodeptr);
- M_NOP;
- }
- d = reg_of_var(rd, iptr->dst, REG_ITMP3);
- M_INTMOVE(s1, d);
- store_reg_to_var_int(iptr->dst, d);
- }
- break;
+ /* } */
+ M_CMPULT(REG_ITMP3, REG_ITMP2, REG_ITMP3);
+ M_BNEZ(REG_ITMP3, 0);
+ codegen_add_classcastexception_ref(cd, mcodeptr);
+ M_NOP;
+ }
+ d = reg_of_var(rd, iptr->dst, s1);
- case ICMD_ARRAYCHECKCAST: /* ..., objectref ==> ..., objectref */
- /* op1: 1... resolved, 0... not resolved */
+ } else {
+ var_to_reg_int(s1, src, rd->argintregs[0]);
+ M_INTMOVE(s1, rd->argintregs[0]);
- var_to_reg_int(s1, src, rd->argintregs[0]);
- M_INTMOVE(s1, rd->argintregs[0]);
+ disp = dseg_addaddress(cd, iptr->val.a);
- bte = iptr->val.a;
-
- if (!iptr->op1) {
- codegen_addpatchref(cd, mcodeptr, bte->fp, iptr->target);
+ if (iptr->val.a == NULL) {
+ codegen_addpatchref(cd, mcodeptr,
+ PATCHER_builtin_arraycheckcast,
+ (constant_classref *) iptr->target,
+ disp);
- if (opt_showdisassemble) {
- M_NOP; M_NOP;
+ if (opt_showdisassemble) {
+ M_NOP; M_NOP;
+ }
}
- a = 0;
-
- } else {
- a = (ptrint) bte->fp;
- }
-
- disp = dseg_addaddress(cd, iptr->target);
- M_ALD(rd->argintregs[1], REG_PV, disp);
- disp = dseg_addaddress(cd, a);
- M_ALD(REG_ITMP3, REG_PV, disp);
- M_JSR(REG_RA, REG_ITMP3);
- M_NOP;
+ M_ALD(rd->argintregs[1], REG_PV, disp);
+ disp = dseg_addaddress(cd, BUILTIN_arraycheckcast);
+ M_ALD(REG_ITMP3, REG_PV, disp);
+ M_JSR(REG_RA, REG_ITMP3);
+ M_NOP;
- M_BEQZ(REG_RESULT, 0);
- codegen_addxcastrefs(cd, mcodeptr);
- M_NOP;
+ M_BEQZ(REG_RESULT, 0);
+ codegen_add_classcastexception_ref(cd, mcodeptr);
+ M_NOP;
- var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(rd, iptr->dst, s1);
+ var_to_reg_int(s1, src, REG_ITMP1);
+ d = reg_of_var(rd, iptr->dst, s1);
+ }
M_INTMOVE(s1, d);
store_reg_to_var_int(iptr->dst, d);
break;
M_BEQZ(s1, 5 + (opt_showdisassemble ? 2 : 0) + s2 + 2 + s3);
M_NOP;
+ disp = dseg_adds4(cd, 0); /* super->flags */
+
codegen_addpatchref(cd, mcodeptr,
PATCHER_checkcast_instanceof_flags,
- (constant_classref *) iptr->target);
+ (constant_classref *) iptr->target, disp);
if (opt_showdisassemble) {
M_NOP; M_NOP;
}
- a = dseg_adds4(cd, 0); /* super->flags */
- M_ILD(REG_ITMP3, REG_PV, a);
+ /* XXX TWISTI M_ILD can be 2 instructions long (jump offset) */
+ M_ILD(REG_ITMP3, REG_PV, disp);
M_AND_IMM(REG_ITMP3, ACC_INTERFACE, REG_ITMP3);
M_BEQZ(REG_ITMP3, 1 + s2 + 2);
M_NOP;
} else {
codegen_addpatchref(cd, mcodeptr,
PATCHER_checkcast_instanceof_interface,
- (constant_classref *) iptr->target);
+ (constant_classref *) iptr->target, 0);
if (opt_showdisassemble) {
M_NOP; M_NOP;
/* class instanceof code */
if (!super || !(super->flags & ACC_INTERFACE)) {
+ disp = dseg_addaddress(cd, supervftbl);
+
if (super) {
M_BEQZ(s1, 1 + s3);
M_NOP;
} else {
codegen_addpatchref(cd, mcodeptr,
PATCHER_checkcast_instanceof_class,
- (constant_classref *) iptr->target);
+ (constant_classref *) iptr->target,
+ disp);
if (opt_showdisassemble) {
M_NOP; M_NOP;
}
M_ALD(REG_ITMP1, s1, OFFSET(java_objectheader, vftbl));
- a = dseg_addaddress(cd, supervftbl);
- M_ALD(REG_ITMP2, REG_PV, a);
+ M_ALD(REG_ITMP2, REG_PV, disp);
#if defined(USE_THREADS) && defined(NATIVE_THREADS)
codegen_threadcritstart(cd, (u1 *) mcodeptr - cd->mcodebase);
#endif
}
break;
- case ICMD_CHECKASIZE: /* ..., size ==> ..., size */
-
- var_to_reg_int(s1, src, REG_ITMP1);
- M_BLTZ(s1, 0);
- codegen_addxcheckarefs(cd, mcodeptr);
- M_NOP;
- break;
-
- case ICMD_CHECKEXCEPTION: /* ... ==> ... */
-
- M_BEQZ(REG_RESULT, 0);
- codegen_addxexceptionrefs(cd, mcodeptr);
- M_NOP;
- break;
-
case ICMD_MULTIANEWARRAY:/* ..., cnt1, [cnt2, ...] ==> ..., arrayref */
- /* op1 = dimension, val.a = array descriptor */
+ /* op1 = dimension, val.a = class */
/* check for negative sizes and copy sizes to stack if necessary */
MCODECHECK((iptr->op1 << 1) + 64);
for (s1 = iptr->op1; --s1 >= 0; src = src->prev) {
- var_to_reg_int(s2, src, REG_ITMP1);
- M_BLTZ(s2, 0);
- codegen_addxcheckarefs(cd, mcodeptr);
- M_NOP;
-
/* copy SAVEDVAR sizes to stack */
if (src->varkind != ARGVAR) {
+ var_to_reg_int(s2, src, REG_ITMP1);
M_LST(s2, REG_SP, s1 * 8);
}
}
+ /* a0 = dimension count */
+
+ ICONST(rd->argintregs[0], iptr->op1);
+
/* is patcher function set? */
- if (iptr->target) {
+ if (iptr->val.a == NULL) {
+ disp = dseg_addaddress(cd, NULL);
+
codegen_addpatchref(cd, mcodeptr,
- (functionptr) iptr->target, iptr->val.a);
+ PATCHER_builtin_multianewarray,
+ (constant_classref *) iptr->target,
+ disp);
if (opt_showdisassemble) {
M_NOP; M_NOP;
}
- a = 0;
-
} else {
- a = (ptrint) iptr->val.a;
+ disp = dseg_addaddress(cd, iptr->val.a);
}
- /* a0 = dimension count */
-
- ICONST(rd->argintregs[0], iptr->op1);
-
/* a1 = arraydescriptor */
- a = dseg_addaddress(cd, a);
- M_ALD(rd->argintregs[1], REG_PV, a);
+ M_ALD(rd->argintregs[1], REG_PV, disp);
/* a2 = pointer to dimensions = stack pointer */
M_INTMOVE(REG_SP, rd->argintregs[2]);
- a = dseg_addaddress(cd, BUILTIN_multianewarray);
- M_ALD(REG_ITMP3, REG_PV, a);
+ disp = dseg_addaddress(cd, BUILTIN_multianewarray);
+ M_ALD(REG_ITMP3, REG_PV, disp);
M_JSR(REG_RA, REG_ITMP3);
M_NOP;
- s1 = (s4)((u1 *) mcodeptr - cd->mcodebase);
- if (s1 <= 32768)
- M_LDA(REG_PV, REG_RA, -s1);
- else {
- assert(0);
- }
- s1 = reg_of_var(rd, iptr->dst, REG_RESULT);
- M_INTMOVE(REG_RESULT, s1);
- store_reg_to_var_int(iptr->dst, s1);
+
+ /* check for exception before result assignment */
+
+ M_BEQZ(REG_RESULT, 0);
+ codegen_add_fillinstacktrace_ref(cd, mcodeptr);
+ M_NOP;
+
+ d = reg_of_var(rd, iptr->dst, REG_RESULT);
+ M_INTMOVE(REG_RESULT, d);
+ store_reg_to_var_int(iptr->dst, d);
break;
default:
- throw_cacao_exception_exit(string_java_lang_InternalError,
- "Unknown ICMD %d", iptr->opc);
+ *exceptionptr = new_internalerror("Unknown ICMD %d", iptr->opc);
+ return false;
} /* switch */
} /* for instruction */
src = bptr->outstack;
len = bptr->outdepth;
MCODECHECK(64+len);
-#ifdef LSRA
+#if defined(ENABLE_LSRA)
if (!opt_lsra)
#endif
while (src) {
}
src = src->prev;
}
+
+ /* At the end of a basic block we may have to append some nops,
+ because the patcher stub calling code might be longer than the
+ actual instruction. So codepatching does not change the
+ following block unintentionally. */
+
+ if ((u1 *) mcodeptr < cd->lastmcodeptr) {
+ while ((u1 *) mcodeptr < cd->lastmcodeptr) {
+ M_NOP;
+ }
+ }
+
} /* if (bptr -> flags >= BBREACHED) */
} /* for basic block */
- codegen_createlinenumbertable(cd);
+ dseg_createlinenumbertable(cd);
+#if 0
{
s4 *xcodeptr;
branchref *bref;
xcodeptr = NULL;
for (bref = cd->xdivrefs; bref != NULL; bref = bref->next) {
- if ((cd->exceptiontablelength == 0) && (xcodeptr != NULL)) {
- gen_resolvebranch((u1 *) cd->mcodebase + bref->branchpos,
- bref->branchpos,
- (u1 *) xcodeptr - cd->mcodebase - 4);
- continue;
- }
-
gen_resolvebranch((u1 *) cd->mcodebase + bref->branchpos,
bref->branchpos,
(u1 *) mcodeptr - cd->mcodebase);
- MCODECHECK(16);
-
- M_AADD_IMM(REG_PV, bref->branchpos - 4, REG_ITMP2_XPC);
+ MCODECHECK(100);
if (xcodeptr != NULL) {
M_BR(xcodeptr - mcodeptr);
- M_NOP;
+ M_AADD_IMM(REG_PV, bref->branchpos - 4, REG_ITMP2_XPC); /* delay */
} else {
+ M_AADD_IMM(REG_PV, bref->branchpos - 4, REG_ITMP2_XPC);
+
xcodeptr = mcodeptr;
M_MOV(REG_PV, rd->argintregs[0]);
bref->branchpos,
(u1 *) mcodeptr - cd->mcodebase);
- MCODECHECK(20);
+ MCODECHECK(100);
/* move index register into REG_ITMP1 */
xcodeptr = NULL;
for (bref = cd->xstorerefs; bref != NULL; bref = bref->next) {
- if ((cd->exceptiontablelength == 0) && (xcodeptr != NULL)) {
- gen_resolvebranch((u1 *) cd->mcodebase + bref->branchpos,
- bref->branchpos,
- (u1 *) xcodeptr - cd->mcodebase - 4);
- continue;
- }
-
gen_resolvebranch((u1 *) cd->mcodebase + bref->branchpos,
bref->branchpos,
(u1 *) mcodeptr - cd->mcodebase);
- MCODECHECK(16);
+ MCODECHECK(100);
M_AADD_IMM(REG_PV, bref->branchpos - 4, REG_ITMP2_XPC);
xcodeptr = NULL;
for (bref = cd->xcastrefs; bref != NULL; bref = bref->next) {
- if ((cd->exceptiontablelength == 0) && (xcodeptr != NULL)) {
- gen_resolvebranch((u1 *) cd->mcodebase + bref->branchpos,
- bref->branchpos,
- (u1 *) xcodeptr - cd->mcodebase - 4);
- continue;
- }
-
gen_resolvebranch((u1 *) cd->mcodebase + bref->branchpos,
bref->branchpos,
(u1 *) mcodeptr - cd->mcodebase);
- MCODECHECK(16);
+ MCODECHECK(100);
M_AADD_IMM(REG_PV, bref->branchpos - 4, REG_ITMP2_XPC);
}
}
- /* generate NegativeArraySizeException stubs */
-
- xcodeptr = NULL;
-
- for (bref = cd->xcheckarefs; bref != NULL; bref = bref->next) {
- if ((cd->exceptiontablelength == 0) && (xcodeptr != NULL)) {
- gen_resolvebranch((u1 *) cd->mcodebase + bref->branchpos,
- bref->branchpos,
- (u1 *) xcodeptr - cd->mcodebase - 4);
- continue;
- }
-
- gen_resolvebranch((u1 *) cd->mcodebase + bref->branchpos,
- bref->branchpos,
- (u1 *) mcodeptr - cd->mcodebase);
-
- MCODECHECK(16);
-
- M_AADD_IMM(REG_PV, bref->branchpos - 4, REG_ITMP2_XPC);
-
- if (xcodeptr != NULL) {
- M_BR(xcodeptr - mcodeptr);
- M_NOP;
-
- } else {
- xcodeptr = mcodeptr;
-
- M_MOV(REG_PV, rd->argintregs[0]);
- M_MOV(REG_SP, rd->argintregs[1]);
- M_ALD(rd->argintregs[2],
- REG_SP, parentargs_base * 8 - SIZEOF_VOID_P);
- M_MOV(REG_ITMP2_XPC, rd->argintregs[3]);
-
- M_ASUB_IMM(REG_SP, 1 * 8, REG_SP);
- M_AST(REG_ITMP2_XPC, REG_SP, 0 * 8);
-
- a = dseg_addaddress(cd, stacktrace_inline_negativearraysizeexception);
- M_ALD(REG_ITMP3, REG_PV, a);
- M_JSR(REG_RA, REG_ITMP3);
- M_NOP;
- M_MOV(REG_RESULT, REG_ITMP1_XPTR);
-
- M_ALD(REG_ITMP2_XPC, REG_SP, 0 * 8);
- M_AADD_IMM(REG_SP, 1 * 8, REG_SP);
-
- a = dseg_addaddress(cd, asm_handle_exception);
- M_ALD(REG_ITMP3, REG_PV, a);
- M_JMP(REG_ITMP3);
- M_NOP;
- }
- }
-
/* generate NullPointerException stubs */
xcodeptr = NULL;
for (bref = cd->xnullrefs; bref != NULL; bref = bref->next) {
- if ((cd->exceptiontablelength == 0) && (xcodeptr != NULL)) {
- gen_resolvebranch((u1 *) cd->mcodebase + bref->branchpos,
- bref->branchpos,
- (u1 *) xcodeptr - cd->mcodebase - 4);
- continue;
- }
-
gen_resolvebranch((u1 *) cd->mcodebase + bref->branchpos,
bref->branchpos,
(u1 *) mcodeptr - cd->mcodebase);
- MCODECHECK(16);
+ MCODECHECK(100);
M_AADD_IMM(REG_PV, bref->branchpos - 4, REG_ITMP2_XPC);
}
}
- /* generate ICMD_CHECKEXCEPTION stubs */
+ /* generate exception check stubs */
xcodeptr = NULL;
for (bref = cd->xexceptionrefs; bref != NULL; bref = bref->next) {
- if ((cd->exceptiontablelength == 0) && (xcodeptr != NULL)) {
- gen_resolvebranch((u1 *) cd->mcodebase + bref->branchpos,
- bref->branchpos,
- (u1 *) xcodeptr - cd->mcodebase - 4);
- continue;
- }
-
gen_resolvebranch((u1 *) cd->mcodebase + bref->branchpos,
bref->branchpos,
(u1 *) mcodeptr - cd->mcodebase);
- MCODECHECK(16);
-
- M_AADD_IMM(REG_PV, bref->branchpos - 4, REG_ITMP2_XPC);
+ MCODECHECK(100);
if (xcodeptr != NULL) {
M_BR(xcodeptr - mcodeptr);
- M_NOP;
+ M_AADD_IMM(REG_PV, bref->branchpos - 4, REG_ITMP2_XPC); /* delay */
} else {
+ M_AADD_IMM(REG_PV, bref->branchpos - 4, REG_ITMP2_XPC);
+
xcodeptr = mcodeptr;
M_MOV(REG_PV, rd->argintregs[0]);
M_NOP;
}
}
+#endif
- /* generate patcher stub call code */
+
+ /* generate exception and patcher stubs */
{
- patchref *pref;
- u8 mcode;
- s4 *tmpmcodeptr;
+ exceptionref *eref;
+ patchref *pref;
+ u8 mcode;
+ s4 *savedmcodeptr;
+ s4 *tmpmcodeptr;
+
+ savedmcodeptr = NULL;
+
+ /* generate exception stubs */
+
+ for (eref = cd->exceptionrefs; eref != NULL; eref = eref->next) {
+ gen_resolvebranch((u1 *) cd->mcodebase + eref->branchpos,
+ eref->branchpos,
+ (u1 *) mcodeptr - cd->mcodebase);
+
+ MCODECHECK(100);
+
+ /* Check if the exception is an
+ ArrayIndexOutOfBoundsException. If so, move index register
+ into REG_ITMP1. */
+
+ if (eref->reg != -1)
+ M_MOV(eref->reg, REG_ITMP1);
+
+ /* calcuate exception address */
+
+ M_LDA(REG_ITMP2_XPC, REG_PV, eref->branchpos - 4);
+
+ /* move function to call into REG_ITMP3 */
+
+ disp = dseg_addaddress(cd, eref->function);
+ M_ALD(REG_ITMP3, REG_PV, disp);
+
+ if (savedmcodeptr != NULL) {
+ M_BR(savedmcodeptr - mcodeptr);
+ M_NOP;
+
+ } else {
+ savedmcodeptr = mcodeptr;
+
+ M_MOV(REG_PV, rd->argintregs[0]);
+ M_MOV(REG_SP, rd->argintregs[1]);
+
+ if (m->isleafmethod)
+ M_MOV(REG_RA, rd->argintregs[2]);
+ else
+ M_ALD(rd->argintregs[2],
+ REG_SP, parentargs_base * 8 - SIZEOF_VOID_P);
+
+ M_MOV(REG_ITMP2_XPC, rd->argintregs[3]);
+ M_MOV(REG_ITMP1, rd->argintregs[4]);
+
+ M_ASUB_IMM(REG_SP, 2 * 8, REG_SP);
+ M_AST(REG_ITMP2_XPC, REG_SP, 0 * 8);
+
+ if (m->isleafmethod)
+ M_AST(REG_RA, REG_SP, 1 * 8);
+
+ M_JSR(REG_RA, REG_ITMP3);
+ M_NOP;
+ M_MOV(REG_RESULT, REG_ITMP1_XPTR);
+
+ if (m->isleafmethod)
+ M_ALD(REG_RA, REG_SP, 1 * 8);
+
+ M_ALD(REG_ITMP2_XPC, REG_SP, 0 * 8);
+ M_AADD_IMM(REG_SP, 2 * 8, REG_SP);
+
+ a = dseg_addaddress(cd, asm_handle_exception);
+ M_ALD(REG_ITMP3, REG_PV, a);
+ M_JMP(REG_ITMP3);
+ M_NOP;
+ }
+ }
+
+
+ /* generate code patching stub call code */
for (pref = cd->patchrefs; pref != NULL; pref = pref->next) {
/* check code segment size */
- MCODECHECK(24);
+ MCODECHECK(100);
- /* Get machine code which is patched back in later. The call is */
- /* 2 instruction words long. */
+ /* Get machine code which is patched back in later. The
+ call is 2 instruction words long. */
- xcodeptr = (s4 *) (cd->mcodebase + pref->branchpos);
+ tmpmcodeptr = (s4 *) (cd->mcodebase + pref->branchpos);
- /* We need to split this, because an unaligned 8 byte read causes */
- /* a SIGSEGV. */
+ /* We need to split this, because an unaligned 8 byte read
+ causes a SIGSEGV. */
- mcode = ((u8) xcodeptr[1] << 32) + (u4) xcodeptr[0];
+ mcode = ((u8) tmpmcodeptr[1] << 32) + (u4) tmpmcodeptr[0];
- /* patch in the call to call the following code (done at compile */
- /* time) */
+ /* Patch in the call to call the following code (done at
+ compile time). */
- tmpmcodeptr = mcodeptr; /* save current mcodeptr */
- mcodeptr = xcodeptr; /* set mcodeptr to patch position */
+ savedmcodeptr = mcodeptr; /* save current mcodeptr */
+ mcodeptr = tmpmcodeptr; /* set mcodeptr to patch position */
- M_BRS(tmpmcodeptr - (xcodeptr + 1));
- M_MOV(REG_RA, REG_ITMP3); /* branch delay slot */
+ disp = (s4) (savedmcodeptr - (tmpmcodeptr + 1));
- mcodeptr = tmpmcodeptr; /* restore the current mcodeptr */
+ if ((disp < (s4) 0xffff8000) || (disp > (s4) 0x00007fff)) {
+ *exceptionptr =
+ new_internalerror("Jump offset is out of range: %d > +/-%d",
+ disp, 0x00007fff);
+ return false;
+ }
+
+ M_BR(disp);
+ M_NOP;
+
+ mcodeptr = savedmcodeptr; /* restore the current mcodeptr */
/* create stack frame */
- M_ASUB_IMM(REG_SP, 5 * 8, REG_SP);
+ M_ASUB_IMM(REG_SP, 6 * 8, REG_SP);
- /* move return address onto stack */
+ /* calculate return address and move it onto the stack */
- M_AST(REG_RA, REG_SP, 4 * 8);
- M_MOV(REG_ITMP3, REG_RA); /* restore return address */
+ M_LDA(REG_ITMP3, REG_PV, pref->branchpos);
+ M_AST(REG_ITMP3, REG_SP, 5 * 8);
/* move pointer to java_objectheader onto stack */
/* create a virtual java_objectheader */
(void) dseg_addaddress(cd, get_dummyLR()); /* monitorPtr */
- a = dseg_addaddress(cd, NULL); /* vftbl */
+ disp = dseg_addaddress(cd, NULL); /* vftbl */
- if (a >= -32768) {
- M_LDA(REG_ITMP3, REG_PV, a);
- } else {
- M_LUI(REG_ITMP3, (a >> 16) & 0x0000ffff);
- M_OR_IMM(REG_ITMP3, a & 0x0000ffff, REG_ITMP3);
- M_AADD(REG_PV, REG_ITMP3, REG_ITMP3);
- }
- M_AST(REG_ITMP3, REG_SP, 3 * 8);
+ M_LDA(REG_ITMP3, REG_PV, disp);
+ M_AST(REG_ITMP3, REG_SP, 4 * 8);
#else
- M_AST(REG_ZERO, REG_SP, 3 * 8);
+ /* do nothing */
#endif
/* move machine code onto stack */
- a = dseg_adds8(cd, mcode);
- if (a >= -32768) {
- M_LLD(REG_ITMP3, REG_PV, a);
- } else {
- M_LUI(REG_ITMP3, (a >> 16) & 0x0000ffff);
- M_AADD(REG_PV, REG_ITMP3, REG_ITMP3);
- M_LLD(REG_ITMP3, REG_ITMP3, a & 0x0000ffff);
- }
- M_LST(REG_ITMP3, REG_SP, 2 * 8);
+ disp = dseg_adds8(cd, mcode);
+ M_LLD(REG_ITMP3, REG_PV, disp);
+ M_LST(REG_ITMP3, REG_SP, 3 * 8);
/* move class/method/field reference onto stack */
- a = dseg_addaddress(cd, pref->ref);
- if (a >= -32768) {
- M_ALD(REG_ITMP3, REG_PV, a);
- } else {
- M_LUI(REG_ITMP3, (a >> 16) & 0x0000ffff);
- M_AADD(REG_PV, REG_ITMP3, REG_ITMP3);
- M_ALD(REG_ITMP3, REG_ITMP3, a & 0x0000ffff);
- }
- M_AST(REG_ITMP3, REG_SP, 1 * 8);
+ disp = dseg_addaddress(cd, pref->ref);
+ M_ALD(REG_ITMP3, REG_PV, disp);
+ M_AST(REG_ITMP3, REG_SP, 2 * 8);
+
+ /* move data segment displacement onto stack */
+
+ disp = dseg_adds4(cd, pref->disp);
+ M_ILD(REG_ITMP3, REG_PV, disp);
+ M_IST(REG_ITMP3, REG_SP, 1 * 8);
/* move patcher function pointer onto stack */
- a = dseg_addaddress(cd, pref->patcher);
- if (a >= -32768) {
- M_ALD(REG_ITMP3, REG_PV, a);
- } else {
- M_LUI(REG_ITMP3, (a >> 16) & 0x0000ffff);
- M_AADD(REG_PV, REG_ITMP3, REG_ITMP3);
- M_ALD(REG_ITMP3, REG_ITMP3, a & 0x0000ffff);
- }
+ disp = dseg_addaddress(cd, pref->patcher);
+ M_ALD(REG_ITMP3, REG_PV, disp);
M_AST(REG_ITMP3, REG_SP, 0 * 8);
- a = dseg_addaddress(cd, asm_wrapper_patcher);
- if (a >= -32768) {
- M_ALD(REG_ITMP3, REG_PV, a);
- } else {
- M_LUI(REG_ITMP3, (a >> 16) & 0x0000ffff);
- M_AADD(REG_PV, REG_ITMP3, REG_ITMP3);
- M_ALD(REG_ITMP3, REG_ITMP3, a & 0x0000ffff);
- }
+ disp = dseg_addaddress(cd, asm_wrapper_patcher);
+ M_ALD(REG_ITMP3, REG_PV, disp);
M_JMP(REG_ITMP3);
M_NOP;
}
- }
+
+ /* generate replacement-out stubs */
+
+ {
+ int i;
+
+ replacementpoint = cd->code->rplpoints;
+ for (i=0; i<cd->code->rplpointcount; ++i, ++replacementpoint) {
+ /* check code segment size */
+
+ MCODECHECK(100);
+
+ /* note start of stub code */
+
+ replacementpoint->outcode = (u1*) (ptrint)((u1*)mcodeptr - cd->mcodebase);
+
+ /* make machine code for patching */
+
+ tmpmcodeptr = mcodeptr;
+ mcodeptr = (s4*) &(replacementpoint->mcode);
+
+ disp = (ptrint)((s4*)replacementpoint->outcode - (s4*)replacementpoint->pc) - 1;
+ if ((disp < (s4) 0xffff8000) || (disp > (s4) 0x00007fff)) {
+ *exceptionptr =
+ new_internalerror("Jump offset is out of range: %d > +/-%d",
+ disp, 0x00007fff);
+ return false;
+ }
+ M_BR(disp);
+ M_NOP; /* delay slot */
+
+ mcodeptr = tmpmcodeptr;
+
+ /* create stack frame - 16-byte aligned */
+
+ M_ASUB_IMM(REG_SP, 2 * 8, REG_SP);
+
+ /* push address of `rplpoint` struct */
+
+ disp = dseg_addaddress(cd, replacementpoint);
+ M_ALD(REG_ITMP3, REG_PV, disp);
+ M_AST(REG_ITMP3, REG_SP, 0 * 8);
+
+ /* jump to replacement function */
+
+ disp = dseg_addaddress(cd, asm_replacement_out);
+ M_ALD(REG_ITMP3, REG_PV, disp);
+ M_JMP(REG_ITMP3);
+ M_NOP; /* delay slot */
+ }
+ }
}
codegen_finish(m, cd, (s4) ((u1 *) mcodeptr - cd->mcodebase));
- docacheflush((void *) m->entrypoint, ((u1 *) mcodeptr - cd->mcodebase));
+ docacheflush((void *) cd->code->entrypoint, ((u1 *) mcodeptr - cd->mcodebase));
+
+ /* everything's ok */
+
+ return true;
}
#define COMPILERSTUB_SIZE COMPILERSTUB_DATASIZE + COMPILERSTUB_CODESIZE
-functionptr createcompilerstub(methodinfo *m)
+u1 *createcompilerstub(methodinfo *m)
{
- ptrint *s; /* memory to hold the stub */
+ u1 *s; /* memory to hold the stub */
+ ptrint *d;
s4 *mcodeptr; /* code generation pointer */
- s = (ptrint *) CNEW(u1, COMPILERSTUB_SIZE);
+ s = CNEW(u1, COMPILERSTUB_SIZE);
- s[0] = (ptrint) m;
- s[1] = (ptrint) asm_call_jit_compiler;
+ /* set data pointer and code pointer */
- mcodeptr = (s4 *) (s + 2);
+ d = (ptrint *) s;
+ s = s + COMPILERSTUB_DATASIZE;
+
+ mcodeptr = (s4 *) s;
+
+ /* Store the methodinfo* in the same place as in the methodheader
+ for compiled methods. */
- M_ALD(REG_ITMP1, REG_PV, -2 * SIZEOF_VOID_P); /* method pointer */
- M_ALD(REG_PV, REG_PV, -1 * SIZEOF_VOID_P); /* pointer to compiler */
+ d[0] = (ptrint) asm_call_jit_compiler;
+ d[1] = (ptrint) m;
+
+ M_ALD_INTERN(REG_ITMP1, REG_PV, -1 * SIZEOF_VOID_P); /* method pointer */
+ M_ALD_INTERN(REG_PV, REG_PV, -2 * SIZEOF_VOID_P); /* pointer to compiler */
M_JMP(REG_PV);
M_NOP;
(void) docacheflush((void *) s, (char *) mcodeptr - (char *) s);
-#if defined(STATISTICS)
+#if defined(ENABLE_STATISTICS)
if (opt_stat)
count_cstub_len += COMPILERSTUB_SIZE;
#endif
- return (functionptr) (((u1 *) s) + COMPILERSTUB_DATASIZE);
+ return s;
}
*******************************************************************************/
-functionptr createnativestub(functionptr f, methodinfo *m, codegendata *cd,
- registerdata *rd, methoddesc *nmd)
+u1 *createnativestub(functionptr f, methodinfo *m, codegendata *cd,
+ registerdata *rd, methoddesc *nmd)
{
s4 *mcodeptr; /* code generation pointer */
s4 stackframesize; /* size of stackframe if needed */
s4 i, j; /* count variables */
s4 t;
s4 s1, s2, disp;
+ s4 funcdisp; /* displacement of the function */
+
/* initialize variables */
stackframesize =
1 + /* return address */
sizeof(stackframeinfo) / SIZEOF_VOID_P +
+ sizeof(localref_table) / SIZEOF_VOID_P +
md->paramcount + /* for saving arguments over calls */
1 + /* for saving return address */
nmd->memuse;
/* initialize mcode variables */
- mcodeptr = (s4 *) cd->mcodebase;
- cd->mcodeend = (s4 *) (cd->mcodebase + cd->mcodesize);
+ mcodeptr = (s4 *) cd->mcodeptr;
/* generate stub code */
M_LDA(REG_SP, REG_SP, -stackframesize * 8); /* build up stackframe */
M_AST(REG_RA, REG_SP, stackframesize * 8 - SIZEOF_VOID_P); /* store ra */
- /* if function is static, check for initialized */
-
- if ((m->flags & ACC_STATIC) && !m->class->initialized) {
- codegen_addpatchref(cd, mcodeptr, PATCHER_clinit, m->class);
-
- if (opt_showdisassemble) {
- M_NOP; M_NOP;
- }
- }
/* call trace function */
- if (runverbose) {
+ if (opt_verbosecall) {
M_LDA(REG_SP, REG_SP, -(1 + INT_ARG_CNT + FLT_ARG_CNT) * 8);
/* save integer argument registers */
}
-#if 1
+ /* get function address (this must happen before the stackframeinfo) */
+
+ funcdisp = dseg_addaddress(cd, f);
+
+#if !defined(WITH_STATIC_CLASSPATH)
+ if (f == NULL) {
+ codegen_addpatchref(cd, mcodeptr, PATCHER_resolve_native, m, funcdisp);
+
+ if (opt_showdisassemble) {
+ M_NOP; M_NOP;
+ }
+ }
+#endif
+
/* save integer and float argument registers */
- for (i = 0, j = 0; i < md->paramcount && i < INT_ARG_CNT; i++)
- if (IS_INT_LNG_TYPE(md->paramtypes[i].type))
- M_LST(rd->argintregs[i], REG_SP, j++ * 8);
+ for (i = 0, j = 0; i < md->paramcount && i < INT_ARG_CNT; i++) {
+ if (IS_INT_LNG_TYPE(md->paramtypes[i].type)) {
+ M_LST(rd->argintregs[i], REG_SP, j * 8);
+ j++;
+ }
+ }
- for (i = 0; i < md->paramcount && i < FLT_ARG_CNT; i++)
- if (IS_FLT_DBL_TYPE(md->paramtypes[i].type))
- M_DST(rd->argfltregs[i], REG_SP, j++ * 8);
+ for (i = 0; i < md->paramcount && i < FLT_ARG_CNT; i++) {
+ if (IS_FLT_DBL_TYPE(md->paramtypes[i].type)) {
+ M_DST(rd->argfltregs[i], REG_SP, j * 8);
+ j++;
+ }
+ }
- /* create native stackframe info */
+ /* prepare data structures for native function call */
- M_AADD_IMM(REG_SP,
- stackframesize * 8 - SIZEOF_VOID_P - sizeof(stackframeinfo),
- rd->argintregs[0]);
+ M_AADD_IMM(REG_SP, stackframesize * 8 - SIZEOF_VOID_P, rd->argintregs[0]);
M_MOV(REG_PV, rd->argintregs[1]);
M_AADD_IMM(REG_SP, stackframesize * 8, rd->argintregs[2]);
M_ALD(rd->argintregs[3], REG_SP, stackframesize * 8 - SIZEOF_VOID_P);
- disp = dseg_addaddress(cd, stacktrace_create_native_stackframeinfo);
+ disp = dseg_addaddress(cd, codegen_start_native_call);
M_ALD(REG_ITMP3, REG_PV, disp);
M_JSR(REG_RA, REG_ITMP3);
M_NOP; /* XXX fill me! */
/* restore integer and float argument registers */
- for (i = 0, j = 0; i < md->paramcount && i < INT_ARG_CNT; i++)
- if (IS_INT_LNG_TYPE(md->paramtypes[i].type))
- M_LLD(rd->argintregs[i], REG_SP, j++ * 8);
-
- for (i = 0; i < md->paramcount && i < FLT_ARG_CNT; i++)
- if (IS_FLT_DBL_TYPE(md->paramtypes[i].type))
- M_DLD(rd->argfltregs[i], REG_SP, j++ * 8);
-#endif
+ for (i = 0, j = 0; i < md->paramcount && i < INT_ARG_CNT; i++) {
+ if (IS_INT_LNG_TYPE(md->paramtypes[i].type)) {
+ M_LLD(rd->argintregs[i], REG_SP, j * 8);
+ j++;
+ }
+ }
+ for (i = 0; i < md->paramcount && i < FLT_ARG_CNT; i++) {
+ if (IS_FLT_DBL_TYPE(md->paramtypes[i].type)) {
+ M_DLD(rd->argfltregs[i], REG_SP, j * 8);
+ j++;
+ }
+ }
/* copy or spill arguments to new locations */
/* put env into first argument register */
- disp = dseg_addaddress(cd, &env);
+ disp = dseg_addaddress(cd, _Jv_env);
M_ALD(rd->argintregs[0], REG_PV, disp);
/* do the native function call */
-#if !defined(ENABLE_STATICVM)
- if (f == NULL) {
- codegen_addpatchref(cd, mcodeptr, PATCHER_resolve_native, m);
-
- if (opt_showdisassemble) {
- M_NOP; M_NOP;
- }
- }
-#endif
-
- disp = dseg_addaddress(cd, f);
- M_ALD(REG_ITMP3, REG_PV, disp); /* load adress of native method */
+ M_ALD(REG_ITMP3, REG_PV, funcdisp); /* load adress of native method */
M_JSR(REG_RA, REG_ITMP3); /* call native method */
M_NOP; /* delay slot */
-
-#if 1
- /* remove native stackframe info */
+ /* save return value */
if (IS_INT_LNG_TYPE(md->returntype.type))
M_LST(REG_RESULT, REG_SP, 0 * 8);
else
M_DST(REG_FRESULT, REG_SP, 0 * 8);
- M_AADD_IMM(REG_SP,
- stackframesize * 8 - SIZEOF_VOID_P - sizeof(stackframeinfo),
- rd->argintregs[0]);
- disp = dseg_addaddress(cd, stacktrace_remove_stackframeinfo);
+ /* remove native stackframe info */
+
+ M_AADD_IMM(REG_SP, stackframesize * 8 - SIZEOF_VOID_P, rd->argintregs[0]);
+ disp = dseg_addaddress(cd, codegen_finish_native_call);
M_ALD(REG_ITMP3, REG_PV, disp);
M_JSR(REG_RA, REG_ITMP3);
M_NOP; /* XXX fill me! */
- if (IS_INT_LNG_TYPE(md->returntype.type))
- M_LLD(REG_RESULT, REG_SP, 0 * 8);
- else
- M_DLD(REG_FRESULT, REG_SP, 0 * 8);
-#endif
-
-
/* call finished trace function */
- if (runverbose) {
- M_LDA(REG_SP, REG_SP, -(2 * 8));
-
- M_AST(REG_RESULT, REG_SP, 0 * 8);
- M_DST(REG_FRESULT, REG_SP, 1 * 8);
+ if (opt_verbosecall) {
+ if (IS_INT_LNG_TYPE(md->returntype.type))
+ M_LLD(REG_RESULT, REG_SP, 0 * 8);
+ else
+ M_DLD(REG_FRESULT, REG_SP, 0 * 8);
disp = dseg_addaddress(cd, m);
M_ALD(rd->argintregs[0], REG_PV, disp);
M_ALD(REG_ITMP3, REG_PV, disp);
M_JSR(REG_RA, REG_ITMP3);
M_NOP;
-
- M_ALD(REG_RESULT, REG_SP, 0 * 8);
- M_DLD(REG_FRESULT, REG_SP, 1 * 8);
-
- M_LDA(REG_SP, REG_SP, 2 * 8);
}
/* check for exception */
disp = dseg_addaddress(cd, builtin_get_exceptionptrptr);
M_ALD(REG_ITMP3, REG_PV, disp);
M_JSR(REG_RA, REG_ITMP3);
-
- /* delay slot */
- if (IS_INT_LNG_TYPE(md->returntype.type))
- M_AST(REG_RESULT, REG_SP, 0 * 8);
- else
- M_DST(REG_FRESULT, REG_SP, 0 * 8);
-
+ M_NOP;
M_MOV(REG_RESULT, REG_ITMP3);
-
- if (IS_INT_LNG_TYPE(md->returntype.type))
- M_ALD(REG_RESULT, REG_SP, 0 * 8);
- else
- M_DLD(REG_FRESULT, REG_SP, 0 * 8);
#else
disp = dseg_addaddress(cd, &_exceptionptr);
M_ALD(REG_ITMP3, REG_PV, disp); /* get address of exceptionptr */
#endif
+ M_ALD(REG_ITMP1, REG_ITMP3, 0); /* load exception into reg. itmp1 */
M_ALD(REG_RA, REG_SP, stackframesize * 8 - SIZEOF_VOID_P); /* load ra */
- M_ALD(REG_ITMP1, REG_ITMP3, 0); /* load exception into reg. itmp1 */
+
+ /* restore return value */
+
+ if (IS_INT_LNG_TYPE(md->returntype.type))
+ M_LLD(REG_RESULT, REG_SP, 0 * 8);
+ else
+ M_DLD(REG_FRESULT, REG_SP, 0 * 8);
M_BNEZ(REG_ITMP1, 2); /* if no exception then return */
- M_LDA(REG_SP, REG_SP, stackframesize * 8);/* remove stackframe, delay slot*/
+ M_LDA(REG_SP, REG_SP, stackframesize * 8);/* remove stackframe, DELAY SLOT*/
M_RET(REG_RA); /* return to caller */
- M_NOP; /* delay slot */
+ M_NOP; /* DELAY SLOT */
/* handle exception */
M_ALD(REG_ITMP3, REG_PV, disp); /* load asm exception handler address */
M_JMP(REG_ITMP3); /* jump to asm exception handler */
M_LDA(REG_ITMP2, REG_RA, -4); /* move fault address into reg. itmp2 */
- /* delay slot */
+ /* DELAY SLOT */
/* generate static stub call code */
{
patchref *pref;
- s4 *xcodeptr;
- s8 mcode;
+ u8 mcode;
+ s4 *savedmcodeptr;
s4 *tmpmcodeptr;
for (pref = cd->patchrefs; pref != NULL; pref = pref->next) {
- /* Get machine code which is patched back in later. The call is */
- /* 2 instruction words long. */
+ /* Get machine code which is patched back in later. The
+ call is 2 instruction words long. */
- xcodeptr = (s4 *) (cd->mcodebase + pref->branchpos);
+ tmpmcodeptr = (s4 *) (cd->mcodebase + pref->branchpos);
- /* We need to split this, because an unaligned 8 byte read causes */
- /* a SIGSEGV. */
+ /* We need to split this, because an unaligned 8 byte read
+ causes a SIGSEGV. */
- mcode = ((u8) xcodeptr[1] << 32) + (u4) xcodeptr[0];
+ mcode = ((u8) tmpmcodeptr[1] << 32) + (u4) tmpmcodeptr[0];
- /* patch in the call to call the following code (done at compile */
- /* time) */
+ /* Patch in the call to call the following code (done at
+ compile time). */
- tmpmcodeptr = mcodeptr; /* save current mcodeptr */
- mcodeptr = xcodeptr; /* set mcodeptr to patch position */
+ savedmcodeptr = mcodeptr; /* save current mcodeptr */
+ mcodeptr = tmpmcodeptr; /* set mcodeptr to patch position */
- M_BRS(tmpmcodeptr - (xcodeptr + 1));
+ M_BRS(savedmcodeptr - (tmpmcodeptr + 1));
M_NOP; /* branch delay slot */
- mcodeptr = tmpmcodeptr; /* restore the current mcodeptr */
+ mcodeptr = savedmcodeptr; /* restore the current mcodeptr */
/* create stack frame */
- M_LSUB_IMM(REG_SP, 5 * 8, REG_SP);
+ M_LSUB_IMM(REG_SP, 6 * 8, REG_SP);
/* move return address onto stack */
- M_AST(REG_RA, REG_SP, 4 * 8);
+ M_AST(REG_RA, REG_SP, 5 * 8);
/* move pointer to java_objectheader onto stack */
disp = dseg_addaddress(cd, NULL); /* vftbl */
M_LDA(REG_ITMP3, REG_PV, disp);
- M_AST(REG_ITMP3, REG_SP, 3 * 8);
+ M_AST(REG_ITMP3, REG_SP, 4 * 8);
#else
- M_AST(REG_ZERO, REG_SP, 3 * 8);
+ M_AST(REG_ZERO, REG_SP, 4 * 8);
#endif
- /* move machine code onto stack */
+ /* move machine code onto stack */
disp = dseg_adds8(cd, mcode);
M_LLD(REG_ITMP3, REG_PV, disp);
- M_LST(REG_ITMP3, REG_SP, 2 * 8);
+ M_LST(REG_ITMP3, REG_SP, 3 * 8);
/* move class/method/field reference onto stack */
disp = dseg_addaddress(cd, pref->ref);
M_ALD(REG_ITMP3, REG_PV, disp);
- M_AST(REG_ITMP3, REG_SP, 1 * 8);
+ M_AST(REG_ITMP3, REG_SP, 2 * 8);
- /* move patcher function pointer onto stack */
+ /* move data segment displacement onto stack */
+
+ disp = dseg_adds4(cd, pref->disp);
+ M_ILD(REG_ITMP3, REG_PV, disp);
+ M_IST(REG_ITMP3, REG_SP, 1 * 8);
+
+ /* move patcher function pointer onto stack */
disp = dseg_addaddress(cd, pref->patcher);
M_ALD(REG_ITMP3, REG_PV, disp);
codegen_finish(m, cd, (s4) ((u1 *) mcodeptr - cd->mcodebase));
- docacheflush((void *) m->entrypoint, ((u1 *) mcodeptr - cd->mcodebase));
+ docacheflush((void *) cd->code->entrypoint, ((u1 *) mcodeptr - cd->mcodebase));
- return m->entrypoint;
+ return cd->code->entrypoint;
}
* c-basic-offset: 4
* tab-width: 4
* End:
+ * vim:noexpandtab:sw=4:ts=4:
*/
projects / cacao.git / blobdiff