Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA.
- $Id: codegen.c 7596 2007-03-28 21:05:53Z twisti $
-
*/
#include "mm/memory.h"
+#include "native/localref.h"
#include "native/native.h"
-#if defined(ENABLE_THREADS)
-# include "threads/native/lock.h"
-#endif
+#include "threads/lock-common.h"
#include "vm/builtin.h"
#include "vm/exceptions.h"
#include "vm/vm.h"
+#include "vm/jit/abi.h"
#include "vm/jit/asmpart.h"
#include "vm/jit/codegen-common.h"
#include "vm/jit/dseg.h"
#include "vm/jit/emit-common.h"
#include "vm/jit/jit.h"
#include "vm/jit/md.h"
-#include "vm/jit/patcher.h"
+#include "vm/jit/patcher-common.h"
#include "vm/jit/reg.h"
#include "vm/jit/replace.h"
continue;
var = VAR(varindex);
+ s1 = md->params[p].regoff;
- s1 = md->params[p].regoff;
if (IS_INT_LNG_TYPE(t)) { /* integer args */
if (!md->params[p].inmemory) { /* register arguments */
#if SIZEOF_VOID_P == 8
- s2 = rd->argintregs[s1];
- if (!(var->flags & INMEMORY)) { /* reg arg -> register */
- M_INTMOVE(s2, var->vv.regoff);
- } else { /* reg arg -> spilled */
- M_LST(s2, REG_SP, var->vv.regoff * 8);
- }
+ if (!(var->flags & INMEMORY))
+ M_INTMOVE(s1, var->vv.regoff);
+ else
+ M_LST(s1, REG_SP, var->vv.regoff);
#else
- if (IS_2_WORD_TYPE(t)) {
- s2 = PACK_REGS(rd->argintregs[GET_LOW_REG(s1)],
- rd->argintregs[GET_HIGH_REG(s1)]);
- if (!(var->flags & INMEMORY)) /* reg arg -> register */
- M_LNGMOVE(s2, var->vv.regoff);
- else /* reg arg -> spilled */
- M_LST(s2, REG_SP, var->vv.regoff * 8);
+ if (!(var->flags & INMEMORY)) {
+ if (IS_2_WORD_TYPE(t))
+ M_LNGMOVE(s1, var->vv.regoff);
+ else
+ M_INTMOVE(s1, var->vv.regoff);
}
else {
- s2 = rd->argintregs[s1];
- if (!(var->flags & INMEMORY)) /* reg arg -> register */
- M_INTMOVE(s2, var->vv.regoff);
- else /* reg arg -> spilled */
- M_IST(s2, REG_SP, var->vv.regoff * 8);
+ if (IS_2_WORD_TYPE(t))
+ M_LST(s1, REG_SP, var->vv.regoff);
+ else
+ M_IST(s1, REG_SP, var->vv.regoff);
}
#endif
- } else { /* stack arguments */
- if (!(var->flags & INMEMORY)) { /* stack arg -> register */
+ }
+ else { /* stack arguments */
+ if (!(var->flags & INMEMORY)) {
#if SIZEOF_VOID_P == 8
- M_LLD(var->vv.regoff, REG_SP, (cd->stackframesize + s1) * 8);
+ M_LLD(var->vv.regoff, REG_SP, cd->stackframesize * 8 + s1);
#else
if (IS_2_WORD_TYPE(t))
- M_LLD(var->vv.regoff, REG_SP, (cd->stackframesize + s1) * 8);
+ M_LLD(var->vv.regoff, REG_SP, cd->stackframesize * 8 + s1);
else
- M_ILD(var->vv.regoff, REG_SP, (cd->stackframesize + s1) * 8);
+ M_ILD(var->vv.regoff, REG_SP, cd->stackframesize * 8 + s1);
#endif
- } else { /* stack arg -> spilled */
- var->vv.regoff = cd->stackframesize + s1;
- }
+ }
+ else
+ var->vv.regoff = cd->stackframesize * 8 + s1;
}
-
- } else { /* floating args */
- if (!md->params[p].inmemory) { /* register arguments */
-#if SIZEOF_VOID_P == 8
- s2 = rd->argfltregs[s1];
- if (!(var->flags & INMEMORY)) { /* reg arg -> register */
+ }
+ else { /* floating args */
+ if (!md->params[p].inmemory) {
+ if (!(var->flags & INMEMORY)) {
if (IS_2_WORD_TYPE(t))
- M_DMOV(s2, var->vv.regoff);
+ M_DBLMOVE(s1, var->vv.regoff);
else
- M_FMOV(s2, var->vv.regoff);
- } else { /* reg arg -> spilled */
+ M_FLTMOVE(s1, var->vv.regoff);
+ }
+ else {
if (IS_2_WORD_TYPE(t))
- M_DST(s2, REG_SP, var->vv.regoff * 8);
+ M_DST(s1, REG_SP, var->vv.regoff);
else
- M_FST(s2, REG_SP, var->vv.regoff * 8);
+ M_FST(s1, REG_SP, var->vv.regoff);
}
-#else
- if ((p == 0) ||
- ((p == 1) && IS_FLT_DBL_TYPE(md->paramtypes[0].type))) {
- s2 = rd->argfltregs[s1];
- if (!(var->flags & INMEMORY)) { /* reg arg -> register */
- if (IS_2_WORD_TYPE(t))
- M_DBLMOVE(s2, var->vv.regoff);
- else
- M_FLTMOVE(s2, var->vv.regoff);
- }
- else { /* reg arg -> spilled */
- if (IS_2_WORD_TYPE(t))
- M_DST(s2, REG_SP, var->vv.regoff * 8);
- else
- M_FST(s2, REG_SP, var->vv.regoff * 8);
- }
- }
- else {
- if (IS_2_WORD_TYPE(t)) {
- s2 = PACK_REGS(rd->argintregs[GET_LOW_REG(s1)],
- rd->argintregs[GET_HIGH_REG(s1)]);
- if (!(var->flags & INMEMORY)) {
- M_MTC1(GET_LOW_REG(s2), var->vv.regoff);
- M_MTC1(GET_HIGH_REG(s2), var->vv.regoff + 1);
- M_NOP;
- }
- else
- M_LST(s2, REG_SP, var->vv.regoff * 8);
- }
- else {
- s2 = rd->argintregs[s1];
- if (!(var->flags & INMEMORY)) {
- M_MTC1(s2, var->vv.regoff);
- M_NOP;
- }
- else
- M_IST(s2, REG_SP, var->vv.regoff * 8);
- }
- }
-#endif
-
- } else { /* stack arguments */
- if (!(var->flags & INMEMORY)) { /* stack-arg -> register */
+ }
+ else {
+ if (!(var->flags & INMEMORY)) {
if (IS_2_WORD_TYPE(t))
- M_DLD(var->vv.regoff, REG_SP, (cd->stackframesize + s1) * 8);
+ M_DLD(var->vv.regoff, REG_SP, cd->stackframesize * 8 + s1);
else
- M_FLD(var->vv.regoff, REG_SP, (cd->stackframesize + s1) * 8);
- } else /* stack-arg -> spilled */
- var->vv.regoff = cd->stackframesize + s1;
+ M_FLD(var->vv.regoff, REG_SP, cd->stackframesize * 8 + s1);
+ }
+ else
+ var->vv.regoff = cd->stackframesize * 8 + s1;
}
}
- } /* end for */
+ }
/* call monitorenter function */
M_LDA(REG_SP, REG_SP, -(INT_ARG_CNT + FLT_ARG_CNT) * 8);
for (p = 0; p < INT_ARG_CNT; p++)
- M_AST(rd->argintregs[p], REG_SP, p * 8);
+ M_AST(abi_registers_integer_argument[p], REG_SP, p * 8);
for (p = 0; p < FLT_ARG_CNT; p++)
- M_DST(rd->argfltregs[p], REG_SP, (INT_ARG_CNT + p) * 8);
+ M_DST(abi_registers_float_argument[p], REG_SP, (INT_ARG_CNT + p) * 8);
s1 += INT_ARG_CNT + FLT_ARG_CNT;
}
# if !defined(NDEBUG)
if (opt_verbosecall) {
for (p = 0; p < INT_ARG_CNT; p++)
- M_ALD(rd->argintregs[p], REG_SP, p * 8);
+ M_ALD(abi_registers_integer_argument[p], REG_SP, p * 8);
for (p = 0; p < FLT_ARG_CNT; p++)
- M_DLD(rd->argfltregs[p], REG_SP, (INT_ARG_CNT + p) * 8);
+ M_DLD(abi_registers_float_argument[p], REG_SP, (INT_ARG_CNT + p) * 8);
M_LDA(REG_SP, REG_SP, (INT_ARG_CNT + FLT_ARG_CNT) * 8);
cr = iptr->sx.val.c.ref;
disp = dseg_add_unique_address(cd, cr);
- codegen_add_patch_ref(cd, PATCHER_aconst, cr, disp);
+ patcher_add_patch_ref(jd, PATCHER_resolve_classref_to_classinfo,
+ cr, disp);
M_ALD(d, REG_PV, disp);
}
/* load/store/copy/move operations ************************************/
case ICMD_ILOAD: /* ... ==> ..., content of local variable */
- case ICMD_LLOAD: /* ... ==> ..., content of local variable */
- case ICMD_ALOAD: /* ... ==> ..., content of local variable */
- case ICMD_FLOAD: /* ... ==> ..., content of local variable */
- case ICMD_DLOAD: /* ... ==> ..., content of local variable */
+ case ICMD_LLOAD:
+ case ICMD_ALOAD:
+ case ICMD_FLOAD:
+ case ICMD_DLOAD:
case ICMD_ISTORE: /* ..., value ==> ... */
- case ICMD_LSTORE: /* ..., value ==> ... */
- case ICMD_FSTORE: /* ..., value ==> ... */
- case ICMD_DSTORE: /* ..., value ==> ... */
+ case ICMD_LSTORE:
+ case ICMD_FSTORE:
+ case ICMD_DSTORE:
case ICMD_COPY:
case ICMD_MOVE:
- emit_copy(jd, iptr, VAROP(iptr->s1), VAROP(iptr->dst));
+ emit_copy(jd, iptr);
break;
case ICMD_ASTORE:
if (!(iptr->flags.bits & INS_FLAG_RETADDR))
- emit_copy(jd, iptr, VAROP(iptr->s1), VAROP(iptr->dst));
+ emit_copy(jd, iptr);
break;
case ICMD_LDIV: /* ..., val1, val2 ==> ..., val1 / val2 */
case ICMD_LREM: /* ..., val1, val2 ==> ..., val1 % val2 */
- bte = iptr->sx.s23.s3.bte;
- md = bte->md;
+ s1 = emit_load_s1(jd, iptr, REG_A0_A1_PACKED);
+ s2 = emit_load_s2(jd, iptr, REG_A2_A3_PACKED);
- s2 = emit_load_s2(jd, iptr, REG_ITMP12_PACKED);
+ /* XXX TODO: only do this if arithmetic check is really done! */
M_OR(GET_HIGH_REG(s2), GET_LOW_REG(s2), REG_ITMP3);
emit_arithmetic_check(cd, iptr, REG_ITMP3);
- s3 = PACK_REGS(rd->argintregs[GET_LOW_REG(md->params[1].regoff)],
- rd->argintregs[GET_HIGH_REG(md->params[1].regoff)]);
- M_LNGMOVE(s2, s3);
-
- s1 = emit_load_s1(jd, iptr, REG_ITMP12_PACKED);
- s3 = PACK_REGS(rd->argintregs[GET_LOW_REG(md->params[0].regoff)],
- rd->argintregs[GET_HIGH_REG(md->params[0].regoff)]);
- M_LNGMOVE(s1, s3);
+ M_LNGMOVE(s1, REG_A0_A1_PACKED);
+ M_LNGMOVE(s2, REG_A2_A3_PACKED);
+ bte = iptr->sx.s23.s3.bte;
disp = dseg_add_functionptr(cd, bte->fp);
M_ALD(REG_ITMP3, REG_PV, disp);
M_JSR(REG_RA, REG_ITMP3);
s1 = emit_load_s1(jd, iptr, REG_ITMP1);
d = codegen_reg_of_dst(jd, iptr, REG_ITMP2);
/* implicit null-pointer check */
- M_ILD(d, s1, OFFSET(java_arrayheader, size));
+ M_ILD(d, s1, OFFSET(java_array_t, size));
emit_store_dst(jd, iptr, d);
break;
emit_arrayindexoutofbounds_check(cd, iptr, s1, s2);
M_AADD(s2, s1, REG_ITMP3);
/* implicit null-pointer check */
- M_BLDS(d, REG_ITMP3, OFFSET(java_bytearray, data[0]));
+ M_BLDS(d, REG_ITMP3, OFFSET(java_bytearray_t, data[0]));
emit_store_dst(jd, iptr, d);
break;
M_AADD(s2, s1, REG_ITMP3);
M_AADD(s2, REG_ITMP3, REG_ITMP3);
/* implicit null-pointer check */
- M_SLDU(d, REG_ITMP3, OFFSET(java_chararray, data[0]));
+ M_SLDU(d, REG_ITMP3, OFFSET(java_chararray_t, data[0]));
emit_store_dst(jd, iptr, d);
break;
M_AADD(s2, s1, REG_ITMP3);
M_AADD(s2, REG_ITMP3, REG_ITMP3);
/* implicit null-pointer check */
- M_SLDS(d, REG_ITMP3, OFFSET(java_shortarray, data[0]));
+ M_SLDS(d, REG_ITMP3, OFFSET(java_shortarray_t, data[0]));
emit_store_dst(jd, iptr, d);
break;
M_ASLL_IMM(s2, 2, REG_ITMP3);
M_AADD(REG_ITMP3, s1, REG_ITMP3);
/* implicit null-pointer check */
- M_ILD_INTERN(d, REG_ITMP3, OFFSET(java_intarray, data[0]));
+ M_ILD_INTERN(d, REG_ITMP3, OFFSET(java_intarray_t, data[0]));
emit_store_dst(jd, iptr, d);
break;
M_ASLL_IMM(s2, 3, REG_ITMP3);
M_AADD(REG_ITMP3, s1, REG_ITMP3);
/* implicit null-pointer check */
- M_LLD_INTERN(d, REG_ITMP3, OFFSET(java_longarray, data[0]));
+ M_LLD_INTERN(d, REG_ITMP3, OFFSET(java_longarray_t, data[0]));
emit_store_dst(jd, iptr, d);
break;
M_ASLL_IMM(s2, 2, REG_ITMP3);
M_AADD(REG_ITMP3, s1, REG_ITMP3);
/* implicit null-pointer check */
- M_FLD_INTERN(d, REG_ITMP3, OFFSET(java_floatarray, data[0]));
+ M_FLD_INTERN(d, REG_ITMP3, OFFSET(java_floatarray_t, data[0]));
emit_store_dst(jd, iptr, d);
break;
M_ASLL_IMM(s2, 3, REG_ITMP3);
M_AADD(REG_ITMP3, s1, REG_ITMP3);
/* implicit null-pointer check */
- M_DLD_INTERN(d, REG_ITMP3, OFFSET(java_doublearray, data[0]));
+ M_DLD_INTERN(d, REG_ITMP3, OFFSET(java_doublearray_t, data[0]));
emit_store_dst(jd, iptr, d);
break;
M_ASLL_IMM(s2, POINTERSHIFT, REG_ITMP3);
M_AADD(REG_ITMP3, s1, REG_ITMP3);
/* implicit null-pointer check */
- M_ALD_INTERN(d, REG_ITMP3, OFFSET(java_objectarray, data[0]));
+ M_ALD_INTERN(d, REG_ITMP3, OFFSET(java_objectarray_t, data[0]));
emit_store_dst(jd, iptr, d);
break;
M_AADD(s2, s1, REG_ITMP1);
s3 = emit_load_s3(jd, iptr, REG_ITMP3);
/* implicit null-pointer check */
- M_BST(s3, REG_ITMP1, OFFSET(java_bytearray, data[0]));
+ M_BST(s3, REG_ITMP1, OFFSET(java_bytearray_t, data[0]));
break;
case ICMD_CASTORE: /* ..., arrayref, index, value ==> ... */
M_AADD(s2, REG_ITMP1, REG_ITMP1);
s3 = emit_load_s3(jd, iptr, REG_ITMP3);
/* implicit null-pointer check */
- M_SST(s3, REG_ITMP1, OFFSET(java_chararray, data[0]));
+ M_SST(s3, REG_ITMP1, OFFSET(java_chararray_t, data[0]));
break;
case ICMD_IASTORE: /* ..., arrayref, index, value ==> ... */
M_AADD(REG_ITMP2, s1, REG_ITMP1);
s3 = emit_load_s3(jd, iptr, REG_ITMP3);
/* implicit null-pointer check */
- M_IST_INTERN(s3, REG_ITMP1, OFFSET(java_intarray, data[0]));
+ M_IST_INTERN(s3, REG_ITMP1, OFFSET(java_intarray_t, data[0]));
break;
case ICMD_LASTORE: /* ..., arrayref, index, value ==> ... */
s3 = emit_load_s3(jd, iptr, REG_ITMP23_PACKED);
#endif
/* implicit null-pointer check */
- M_LST_INTERN(s3, REG_ITMP1, OFFSET(java_longarray, data[0]));
+ M_LST_INTERN(s3, REG_ITMP1, OFFSET(java_longarray_t, data[0]));
break;
case ICMD_FASTORE: /* ..., arrayref, index, value ==> ... */
M_AADD(REG_ITMP2, s1, REG_ITMP1);
s3 = emit_load_s3(jd, iptr, REG_FTMP1);
/* implicit null-pointer check */
- M_FST_INTERN(s3, REG_ITMP1, OFFSET(java_floatarray, data[0]));
+ M_FST_INTERN(s3, REG_ITMP1, OFFSET(java_floatarray_t, data[0]));
break;
case ICMD_DASTORE: /* ..., arrayref, index, value ==> ... */
M_AADD(REG_ITMP2, s1, REG_ITMP1);
s3 = emit_load_s3(jd, iptr, REG_FTMP1);
/* implicit null-pointer check */
- M_DST_INTERN(s3, REG_ITMP1, OFFSET(java_doublearray, data[0]));
+ M_DST_INTERN(s3, REG_ITMP1, OFFSET(java_doublearray_t, data[0]));
break;
M_AADD(REG_ITMP2, s1, REG_ITMP1);
s3 = emit_load_s3(jd, iptr, REG_ITMP3);
/* implicit null-pointer check */
- M_AST_INTERN(s3, REG_ITMP1, OFFSET(java_objectarray, data[0]));
+ M_AST_INTERN(s3, REG_ITMP1, OFFSET(java_objectarray_t, data[0]));
break;
emit_arrayindexoutofbounds_check(cd, iptr, s1, s2);
M_AADD(s2, s1, REG_ITMP1);
/* implicit null-pointer check */
- M_BST(REG_ZERO, REG_ITMP1, OFFSET(java_bytearray, data[0]));
+ M_BST(REG_ZERO, REG_ITMP1, OFFSET(java_bytearray_t, data[0]));
break;
case ICMD_CASTORECONST: /* ..., arrayref, index ==> ... */
M_AADD(s2, s1, REG_ITMP1);
M_AADD(s2, REG_ITMP1, REG_ITMP1);
/* implicit null-pointer check */
- M_SST(REG_ZERO, REG_ITMP1, OFFSET(java_chararray, data[0]));
+ M_SST(REG_ZERO, REG_ITMP1, OFFSET(java_chararray_t, data[0]));
break;
case ICMD_IASTORECONST: /* ..., arrayref, index ==> ... */
M_ASLL_IMM(s2, 2, REG_ITMP2);
M_AADD(REG_ITMP2, s1, REG_ITMP1);
/* implicit null-pointer check */
- M_IST_INTERN(REG_ZERO, REG_ITMP1, OFFSET(java_intarray, data[0]));
+ M_IST_INTERN(REG_ZERO, REG_ITMP1, OFFSET(java_intarray_t, data[0]));
break;
case ICMD_LASTORECONST: /* ..., arrayref, index ==> ... */
M_AADD(REG_ITMP2, s1, REG_ITMP1);
/* implicit null-pointer check */
#if SIZEOF_VOID_P == 8
- M_LST_INTERN(REG_ZERO, REG_ITMP1, OFFSET(java_longarray, data[0]));
+ M_LST_INTERN(REG_ZERO, REG_ITMP1, OFFSET(java_longarray_t, data[0]));
#else
- M_LST_INTERN(PACK_REGS(REG_ZERO, REG_ZERO), REG_ITMP1, OFFSET(java_longarray, data[0]));
+ M_LST_INTERN(PACK_REGS(REG_ZERO, REG_ZERO), REG_ITMP1, OFFSET(java_longarray_t, data[0]));
#endif
break;
M_ASLL_IMM(s2, POINTERSHIFT, REG_ITMP2);
M_AADD(REG_ITMP2, s1, REG_ITMP1);
/* implicit null-pointer check */
- M_AST_INTERN(REG_ZERO, REG_ITMP1, OFFSET(java_objectarray, data[0]));
+ M_AST_INTERN(REG_ZERO, REG_ITMP1, OFFSET(java_objectarray_t, data[0]));
break;
fieldtype = uf->fieldref->parseddesc.fd->type;
disp = dseg_add_unique_address(cd, uf);
- codegen_add_patch_ref(cd, PATCHER_get_putstatic, uf, disp);
+ patcher_add_patch_ref(jd, PATCHER_get_putstatic, uf, disp);
}
else {
fi = iptr->sx.s23.s3.fmiref->p.field;
fieldtype = fi->type;
- disp = dseg_add_address(cd, &(fi->value));
+ disp = dseg_add_address(cd, fi->value);
if (!CLASS_IS_OR_ALMOST_INITIALIZED(fi->class))
- codegen_add_patch_ref(cd, PATCHER_clinit, fi->class, disp);
+ patcher_add_patch_ref(jd, PATCHER_initialize_class,
+ fi->class, disp);
}
M_ALD(REG_ITMP1, REG_PV, disp);
fieldtype = uf->fieldref->parseddesc.fd->type;
disp = dseg_add_unique_address(cd, uf);
- codegen_add_patch_ref(cd, PATCHER_get_putstatic, uf, disp);
+ patcher_add_patch_ref(jd, PATCHER_get_putstatic, uf, disp);
}
else {
fi = iptr->sx.s23.s3.fmiref->p.field;
fieldtype = fi->type;
- disp = dseg_add_address(cd, &(fi->value));
+ disp = dseg_add_address(cd, fi->value);
if (!CLASS_IS_OR_ALMOST_INITIALIZED(fi->class))
- codegen_add_patch_ref(cd, PATCHER_clinit, fi->class, disp);
+ patcher_add_patch_ref(jd, PATCHER_initialize_class,
+ fi->class, disp);
}
M_ALD(REG_ITMP1, REG_PV, disp);
break;
case ICMD_PUTSTATICCONST: /* ... ==> ... */
- /* val = value (in current instruction) */
- /* following NOP) */
if (INSTRUCTION_IS_UNRESOLVED(iptr)) {
uf = iptr->sx.s23.s3.uf;
fieldtype = uf->fieldref->parseddesc.fd->type;
disp = dseg_add_unique_address(cd, uf);
- codegen_add_patch_ref(cd, PATCHER_get_putstatic, uf, disp);
+ patcher_add_patch_ref(jd, PATCHER_get_putstatic, uf, disp);
}
else {
fi = iptr->sx.s23.s3.fmiref->p.field;
fieldtype = fi->type;
- disp = dseg_add_address(cd, &(fi->value));
+ disp = dseg_add_address(cd, fi->value);
if (!CLASS_IS_OR_ALMOST_INITIALIZED(fi->class))
- codegen_add_patch_ref(cd, PATCHER_clinit, fi->class, disp);
+ patcher_add_patch_ref(jd, PATCHER_initialize_class,
+ fi->class, disp);
}
M_ALD(REG_ITMP1, REG_PV, disp);
fieldtype = uf->fieldref->parseddesc.fd->type;
disp = 0;
- codegen_add_patch_ref(cd, PATCHER_get_putfield, uf, 0);
+ patcher_add_patch_ref(jd, PATCHER_get_putfield, uf, 0);
}
else {
fi = iptr->sx.s23.s3.fmiref->p.field;
#endif
if (INSTRUCTION_IS_UNRESOLVED(iptr))
- codegen_add_patch_ref(cd, PATCHER_get_putfield, uf, 0);
+ patcher_add_patch_ref(jd, PATCHER_get_putfield, uf, 0);
switch (fieldtype) {
case TYPE_INT:
emit_nullpointer_check(cd, iptr, s1);
if (INSTRUCTION_IS_UNRESOLVED(iptr)) {
- unresolved_field *uf = iptr->sx.s23.s3.uf;
-
+ uf = iptr->sx.s23.s3.uf;
fieldtype = uf->fieldref->parseddesc.fd->type;
disp = 0;
- codegen_add_patch_ref(cd, PATCHER_get_putfield, uf, 0);
+ patcher_add_patch_ref(jd, PATCHER_get_putfield, uf, 0);
}
else {
- fieldinfo *fi = iptr->sx.s23.s3.fmiref->p.field;
+ fi = iptr->sx.s23.s3.fmiref->p.field;
fieldtype = fi->type;
disp = fi->offset;
}
if (INSTRUCTION_IS_UNRESOLVED(iptr)) {
uc = iptr->sx.s23.s2.uc;
- codegen_add_patch_ref(cd, PATCHER_athrow_areturn, uc, 0);
+ patcher_add_patch_ref(jd, PATCHER_resolve_class, uc, 0);
}
#endif /* ENABLE_VERIFIER */
#if SIZEOF_VOID_P == 8
s1 = emit_load_s1(jd, iptr, REG_ITMP1);
if (iptr->sx.val.l == 0)
- M_BEQZ(s1, 0);
+ emit_beqz(cd, iptr->dst.block, s1);
else {
LCONST(REG_ITMP2, iptr->sx.val.l);
- M_BEQ(s1, REG_ITMP2, 0);
+ emit_beq(cd, iptr->dst.block, s1, REG_ITMP2);
}
#else
if (iptr->sx.val.l == 0) {
#if SIZEOF_VOID_P == 8
s1 = emit_load_s1(jd, iptr, REG_ITMP1);
- if (iptr->sx.val.l == 0) {
- M_BLTZ(s1, 0);
- } else {
- if ((iptr->sx.val.l >= -32768) && (iptr->sx.val.l <= 32767)) {
- M_CMPLT_IMM(s1, iptr->sx.val.l, REG_ITMP1);
- } else {
+ if (iptr->sx.val.l == 0)
+ emit_bltz(cd, iptr->dst.block, s1);
+ else {
+ if ((iptr->sx.val.l >= -32768) && (iptr->sx.val.l <= 32767))
+ M_CMPLT_IMM(s1, iptr->sx.val.l, REG_ITMP3);
+ else {
LCONST(REG_ITMP2, iptr->sx.val.l);
- M_CMPLT(s1, REG_ITMP2, REG_ITMP1);
+ M_CMPLT(s1, REG_ITMP2, REG_ITMP3);
}
- M_BNEZ(REG_ITMP1, 0);
+ emit_bnez(cd, iptr->dst.block, REG_ITMP3);
}
#else
if (iptr->sx.val.l == 0) {
#if SIZEOF_VOID_P == 8
s1 = emit_load_s1(jd, iptr, REG_ITMP1);
- if (iptr->sx.val.l == 0) {
- M_BLEZ(s1, 0);
- } else {
+ if (iptr->sx.val.l == 0)
+ emit_blez(cd, iptr->dst.block, s1);
+ else {
if ((iptr->sx.val.l >= -32769) && (iptr->sx.val.l <= 32766)) {
- M_CMPLT_IMM(s1, iptr->sx.val.l + 1, REG_ITMP1);
- M_BNEZ(REG_ITMP1, 0);
- } else {
+ M_CMPLT_IMM(s1, iptr->sx.val.l + 1, REG_ITMP2);
+ emit_bnez(cd, iptr->dst.block, REG_ITMP2);
+ }
+ else {
LCONST(REG_ITMP2, iptr->sx.val.l);
- M_CMPGT(s1, REG_ITMP2, REG_ITMP1);
- M_BEQZ(REG_ITMP1, 0);
+ M_CMPGT(s1, REG_ITMP2, REG_ITMP3);
+ emit_beqz(cd, iptr->dst.block, REG_ITMP3);
}
}
#else
#if SIZEOF_VOID_P == 8
s1 = emit_load_s1(jd, iptr, REG_ITMP1);
- if (iptr->sx.val.l == 0) {
- M_BNEZ(s1, 0);
- } else {
+ if (iptr->sx.val.l == 0)
+ emit_bnez(cd, iptr->dst.block, s1);
+ else {
LCONST(REG_ITMP2, iptr->sx.val.l);
- M_BNE(s1, REG_ITMP2, 0);
+ emit_bne(cd, iptr->dst.block, s1, REG_ITMP2);
}
#else
if (iptr->sx.val.l == 0) {
#if SIZEOF_VOID_P == 8
s1 = emit_load_s1(jd, iptr, REG_ITMP1);
- if (iptr->sx.val.l == 0) {
- M_BGTZ(s1, 0);
- } else {
+ if (iptr->sx.val.l == 0)
+ emit_bgtz(cd, iptr->dst.block, s1);
+ else {
if ((iptr->sx.val.l >= -32769) && (iptr->sx.val.l <= 32766)) {
- M_CMPLT_IMM(s1, iptr->sx.val.l + 1, REG_ITMP1);
- M_BEQZ(REG_ITMP1, 0);
- } else {
+ M_CMPLT_IMM(s1, iptr->sx.val.l + 1, REG_ITMP2);
+ emit_beqz(cd, iptr->dst.block, REG_ITMP2);
+ }
+ else {
LCONST(REG_ITMP2, iptr->sx.val.l);
- M_CMPGT(s1, REG_ITMP2, REG_ITMP1);
- M_BNEZ(REG_ITMP1, 0);
+ M_CMPGT(s1, REG_ITMP2, REG_ITMP3);
+ emit_bnez(cd, iptr->dst.block, REG_ITMP3);
}
}
#else
#if SIZEOF_VOID_P == 8
s1 = emit_load_s1(jd, iptr, REG_ITMP1);
- if (iptr->sx.val.l == 0) {
- M_BGEZ(s1, 0);
- } else {
+ if (iptr->sx.val.l == 0)
+ emit_bgez(cd, iptr->dst.block, s1);
+ else {
if ((iptr->sx.val.l >= -32768) && (iptr->sx.val.l <= 32767)) {
- M_CMPLT_IMM(s1, iptr->sx.val.l, REG_ITMP1);
- } else {
+ M_CMPLT_IMM(s1, iptr->sx.val.l, REG_ITMP3);
+ }
+ else {
LCONST(REG_ITMP2, iptr->sx.val.l);
- M_CMPLT(s1, REG_ITMP2, REG_ITMP1);
+ M_CMPLT(s1, REG_ITMP2, REG_ITMP3);
}
- M_BEQZ(REG_ITMP1, 0);
+ emit_beqz(cd, iptr->dst.block, REG_ITMP3);
}
#else
if (iptr->sx.val.l == 0) {
if (INSTRUCTION_IS_UNRESOLVED(iptr)) {
uc = iptr->sx.s23.s2.uc;
- codegen_add_patch_ref(cd, PATCHER_athrow_areturn, uc, 0);
+ patcher_add_patch_ref(jd, PATCHER_resolve_class, uc, 0);
}
#endif /* ENABLE_VERIFIER */
goto nowperformreturn;
for (s3 = s3 - 1; s3 >= 0; s3--) {
var = VAR(iptr->sx.s23.s2.args[s3]);
+ d = md->params[s3].regoff;
if (var->flags & PREALLOC)
continue;
if (IS_INT_LNG_TYPE(var->type)) {
#if SIZEOF_VOID_P == 8
if (!md->params[s3].inmemory) {
- s1 = rd->argintregs[md->params[s3].regoff];
- d = emit_load(jd, iptr, var, s1);
- M_INTMOVE(d, s1);
+ s1 = emit_load(jd, iptr, var, d);
+ M_INTMOVE(s1, d);
}
else {
- d = emit_load(jd, iptr, var, REG_ITMP1);
- M_LST(d, REG_SP, md->params[s3].regoff * 8);
+ s1 = emit_load(jd, iptr, var, REG_ITMP1);
+ M_LST(s1, REG_SP, d);
}
#else
if (!md->params[s3].inmemory) {
- if (IS_2_WORD_TYPE(var->type)) {
- s1 = md->params[s3].regoff;
- s1 = PACK_REGS(rd->argintregs[GET_LOW_REG(s1)],
- rd->argintregs[GET_HIGH_REG(s1)]);
- d = emit_load(jd, iptr, var, s1);
- M_LNGMOVE(d, s1);
- }
- else {
- s1 = rd->argintregs[md->params[s3].regoff];
- d = emit_load(jd, iptr, var, s1);
- M_INTMOVE(d, s1);
- }
+ s1 = emit_load(jd, iptr, var, d);
+
+ if (IS_2_WORD_TYPE(var->type))
+ M_LNGMOVE(s1, d);
+ else
+ M_INTMOVE(s1, d);
}
else {
if (IS_2_WORD_TYPE(var->type)) {
- d = emit_load(jd, iptr, var, REG_ITMP12_PACKED);
- M_LST(d, REG_SP, md->params[s3].regoff * 8);
+ s1 = emit_load(jd, iptr, var, REG_ITMP12_PACKED);
+ M_LST(s1, REG_SP, d);
}
else {
- d = emit_load(jd, iptr, var, REG_ITMP1);
- M_IST(d, REG_SP, md->params[s3].regoff * 8);
+ s1 = emit_load(jd, iptr, var, REG_ITMP1);
+ M_IST(s1, REG_SP, d);
}
}
#endif
}
else {
if (!md->params[s3].inmemory) {
-#if SIZEOF_VOID_P == 8
- s1 = rd->argfltregs[md->params[s3].regoff];
- d = emit_load(jd, iptr, var, s1);
+ s1 = emit_load(jd, iptr, var, d);
if (IS_2_WORD_TYPE(var->type))
- M_DMOV(d, s1);
+ M_DBLMOVE(s1, d);
else
- M_FMOV(d, s1);
-#else
- if ((s3 == 0) ||
- ((s3 == 1) && IS_FLT_DBL_TYPE(md->paramtypes[0].type))) {
- s1 = rd->argfltregs[md->params[s3].regoff];
- d = emit_load(jd, iptr, var, s1);
- if (IS_2_WORD_TYPE(var->type))
- M_DBLMOVE(d, s1);
- else
- M_FLTMOVE(d, s1);
- }
- else {
- if (IS_2_WORD_TYPE(var->type)) {
- s1 = md->params[s3].regoff;
- s2 = PACK_REGS(rd->argintregs[GET_LOW_REG(s1)],
- rd->argintregs[GET_HIGH_REG(s1)]);
- d = emit_load(jd, iptr, var, REG_FTMP1);
- M_MFC1(GET_LOW_REG(s2), d);
- M_MFC1(GET_HIGH_REG(s2), d + 1);
- M_NOP;
- }
- else {
- s1 = rd->argintregs[md->params[s3].regoff];
- d = emit_load(jd, iptr, var, s1);
- M_MFC1(s1, d);
- M_NOP;
- }
- }
-#endif
+ M_FLTMOVE(s1, d);
}
else {
- d = emit_load(jd, iptr, var, REG_FTMP1);
+ s1 = emit_load(jd, iptr, var, REG_FTMP1);
if (IS_2_WORD_TYPE(var->type))
- M_DST(d, REG_SP, md->params[s3].regoff * 8);
+ M_DST(s1, REG_SP, d);
else
- M_FST(d, REG_SP, md->params[s3].regoff * 8);
+ M_FST(s1, REG_SP, d);
}
}
}
if (lm == NULL) {
disp = dseg_add_unique_address(cd, um);
- codegen_add_patch_ref(cd, PATCHER_invokestatic_special, um,
+ patcher_add_patch_ref(jd, PATCHER_invokestatic_special, um,
disp);
}
else
emit_nullpointer_check(cd, iptr, REG_A0);
if (lm == NULL) {
- codegen_add_patch_ref(cd, PATCHER_invokevirtual, um, 0);
+ patcher_add_patch_ref(jd, PATCHER_invokevirtual, um, 0);
s1 = 0;
}
sizeof(methodptr) * lm->vftblindex;
/* implicit null-pointer check */
- M_ALD(REG_METHODPTR, REG_A0, OFFSET(java_objectheader, vftbl));
+ M_ALD(REG_METHODPTR, REG_A0, OFFSET(java_object_t, vftbl));
M_ALD(REG_PV, REG_METHODPTR, s1);
/* generate the actual call */
emit_nullpointer_check(cd, iptr, REG_A0);
if (lm == NULL) {
- codegen_add_patch_ref(cd, PATCHER_invokeinterface, um, 0);
+ patcher_add_patch_ref(jd, PATCHER_invokeinterface, um, 0);
s1 = 0;
s2 = 0;
}
/* implicit null-pointer check */
- M_ALD(REG_METHODPTR, REG_A0, OFFSET(java_objectheader, vftbl));
+ M_ALD(REG_METHODPTR, REG_A0, OFFSET(java_object_t, vftbl));
M_ALD(REG_METHODPTR, REG_METHODPTR, s1);
M_ALD(REG_PV, REG_METHODPTR, s2);
case ICMD_CHECKCAST: /* ..., objectref ==> ..., objectref */
- /* val.a: (classinfo*) superclass */
-
- /* superclass is an interface:
- *
- * OK if ((sub == NULL) ||
- * (sub->vftbl->interfacetablelength > super->index) &&
- * (sub->vftbl->interfacetable[-super->index] != NULL));
- *
- * superclass is a class:
- *
- * OK if ((sub == NULL) || (0
- * <= (sub->vftbl->baseval - super->vftbl->baseval) <=
- * super->vftbl->diffvall));
- */
if (!(iptr->flags.bits & INS_FLAG_ARRAY)) {
classinfo *super;
superindex = 0;
}
else {
- super = iptr->sx.s23.s3.c.cls;
+ super = iptr->sx.s23.s3.c.cls;
superindex = super->index;
}
-#if defined(ENABLE_THREADS)
- codegen_threadcritrestart(cd, cd->mcodeptr - cd->mcodebase);
-#endif
+ if ((super == NULL) || !(super->flags & ACC_INTERFACE))
+ CODEGEN_CRITICAL_SECTION_NEW;
s1 = emit_load_s1(jd, iptr, REG_ITMP1);
cr = iptr->sx.s23.s3.c.ref;
disp = dseg_add_unique_s4(cd, 0); /* super->flags */
- codegen_add_patch_ref(cd, PATCHER_checkcast_instanceof_flags,
+ patcher_add_patch_ref(jd, PATCHER_resolve_classref_to_flags,
cr, disp);
M_ILD(REG_ITMP2, REG_PV, disp);
if (super == NULL) {
cr = iptr->sx.s23.s3.c.ref;
- codegen_add_patch_ref(cd, PATCHER_checkcast_interface,
+ patcher_add_patch_ref(jd, PATCHER_checkcast_interface,
cr, 0);
}
else {
emit_label_beqz(cd, BRANCH_LABEL_3, s1);
}
- M_ALD(REG_ITMP2, s1, OFFSET(java_objectheader, vftbl));
+ M_ALD(REG_ITMP2, s1, OFFSET(java_object_t, vftbl));
M_ILD(REG_ITMP3, REG_ITMP2,
OFFSET(vftbl_t, interfacetablelength));
M_IADD_IMM(REG_ITMP3, -superindex, REG_ITMP3);
cr = iptr->sx.s23.s3.c.ref;
disp = dseg_add_unique_address(cd, NULL);
- codegen_add_patch_ref(cd,
- PATCHER_checkcast_instanceof_class,
+ patcher_add_patch_ref(jd,
+ PATCHER_resolve_classref_to_vftbl,
cr, disp);
}
else {
emit_label_beqz(cd, BRANCH_LABEL_5, s1);
}
- M_ALD(REG_ITMP2, s1, OFFSET(java_objectheader, vftbl));
+ M_ALD(REG_ITMP2, s1, OFFSET(java_object_t, vftbl));
M_ALD(REG_ITMP3, REG_PV, disp);
-#if defined(ENABLE_THREADS)
- codegen_threadcritstart(cd, cd->mcodeptr - cd->mcodebase);
-#endif
+
+ CODEGEN_CRITICAL_SECTION_START;
+
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_ISUB(REG_ITMP2, REG_ITMP3, REG_ITMP2);
M_ALD(REG_ITMP3, REG_PV, disp);
M_ILD(REG_ITMP3, REG_ITMP3, OFFSET(vftbl_t, diffval));
-#if defined(ENABLE_THREADS)
- codegen_threadcritstop(cd, cd->mcodeptr - cd->mcodebase);
-#endif
+
+ CODEGEN_CRITICAL_SECTION_END;
+
/* } */
M_CMPULT(REG_ITMP3, REG_ITMP2, REG_ITMP3);
emit_classcast_check(cd, iptr, ICMD_IFNE, REG_ITMP3, s1);
cr = iptr->sx.s23.s3.c.ref;
disp = dseg_add_unique_address(cd, NULL);
- codegen_add_patch_ref(cd, PATCHER_builtin_arraycheckcast,
+ patcher_add_patch_ref(jd,
+ PATCHER_resolve_classref_to_classinfo,
cr, disp);
}
- else
+ else {
disp = dseg_add_address(cd, iptr->sx.s23.s3.c.cls);
+ }
M_ALD(REG_A1, REG_PV, disp);
disp = dseg_add_functionptr(cd, BUILTIN_arraycheckcast);
break;
case ICMD_INSTANCEOF: /* ..., objectref ==> ..., intresult */
- /* val.a: (classinfo*) superclass */
-
- /* superclass is an interface:
- *
- * return (sub != NULL) &&
- * (sub->vftbl->interfacetablelength > super->index) &&
- * (sub->vftbl->interfacetable[-super->index] != NULL);
- *
- * superclass is a class:
- *
- * return ((sub != NULL) && (0
- * <= (sub->vftbl->baseval - super->vftbl->baseval) <=
- * super->vftbl->diffvall));
- */
{
classinfo *super;
superindex = super->index;
}
-#if defined(ENABLE_THREADS)
- codegen_threadcritrestart(cd, cd->mcodeptr - cd->mcodebase);
-#endif
+ if ((super == NULL) || !(super->flags & ACC_INTERFACE))
+ CODEGEN_CRITICAL_SECTION_NEW;
s1 = emit_load_s1(jd, iptr, REG_ITMP1);
d = codegen_reg_of_dst(jd, iptr, REG_ITMP2);
cr = iptr->sx.s23.s3.c.ref;
disp = dseg_add_unique_s4(cd, 0); /* super->flags */
- codegen_add_patch_ref(cd, PATCHER_checkcast_instanceof_flags,
+ patcher_add_patch_ref(jd, PATCHER_resolve_classref_to_flags,
cr, disp);
M_ILD(REG_ITMP3, REG_PV, disp);
if (super == NULL) {
cr = iptr->sx.s23.s3.c.ref;
- codegen_add_patch_ref(cd, PATCHER_instanceof_interface,
+ patcher_add_patch_ref(jd, PATCHER_instanceof_interface,
cr, 0);
}
else {
emit_label_beqz(cd, BRANCH_LABEL_3, s1);
}
- M_ALD(REG_ITMP1, s1, OFFSET(java_objectheader, vftbl));
+ M_ALD(REG_ITMP1, s1, OFFSET(java_object_t, vftbl));
M_ILD(REG_ITMP3, REG_ITMP1,
OFFSET(vftbl_t, interfacetablelength));
M_IADD_IMM(REG_ITMP3, -superindex, REG_ITMP3);
cr = iptr->sx.s23.s3.c.ref;
disp = dseg_add_unique_address(cd, NULL);
- codegen_add_patch_ref(cd, PATCHER_checkcast_instanceof_class,
+ patcher_add_patch_ref(jd, PATCHER_resolve_classref_to_vftbl,
cr, disp);
}
else {
emit_label_beqz(cd, BRANCH_LABEL_5, s1);
}
- M_ALD(REG_ITMP1, s1, OFFSET(java_objectheader, vftbl));
+ M_ALD(REG_ITMP1, s1, OFFSET(java_object_t, vftbl));
M_ALD(REG_ITMP2, REG_PV, disp);
-#if defined(ENABLE_THREADS)
- codegen_threadcritstart(cd, cd->mcodeptr - cd->mcodebase);
-#endif
+
+ CODEGEN_CRITICAL_SECTION_START;
+
M_ILD(REG_ITMP1, REG_ITMP1, OFFSET(vftbl_t, baseval));
M_ILD(REG_ITMP3, REG_ITMP2, OFFSET(vftbl_t, baseval));
M_ILD(REG_ITMP2, REG_ITMP2, OFFSET(vftbl_t, diffval));
-#if defined(ENABLE_THREADS)
- codegen_threadcritstop(cd, cd->mcodeptr - cd->mcodebase);
-#endif
+
+ CODEGEN_CRITICAL_SECTION_END;
+
M_ISUB(REG_ITMP1, REG_ITMP3, REG_ITMP1);
M_CMPULT(REG_ITMP2, REG_ITMP1, d);
M_XOR_IMM(d, 1, d);
cr = iptr->sx.s23.s3.c.ref;
disp = dseg_add_unique_address(cd, NULL);
- codegen_add_patch_ref(cd, PATCHER_builtin_multianewarray,
+ patcher_add_patch_ref(jd, PATCHER_resolve_classref_to_classinfo,
cr, disp);
}
- else
+ else {
disp = dseg_add_address(cd, iptr->sx.s23.s3.c.cls);
+ }
/* a1 = arraydescriptor */
dseg_createlinenumbertable(cd);
- /* generate stubs */
+ /* generate traps */
- emit_patcher_stubs(jd);
- REPLACEMENT_EMIT_STUBS(jd);
+ emit_patcher_traps(jd);
/* everything's ok */
}
-/* createcompilerstub **********************************************************
+/* codegen_emit_stub_compiler **************************************************
- Creates a stub routine which calls the compiler.
+ Emits a stub routine which calls the compiler.
*******************************************************************************/
-#define COMPILERSTUB_DATASIZE 3 * SIZEOF_VOID_P
-#define COMPILERSTUB_CODESIZE 4 * 4
-
-#define COMPILERSTUB_SIZE COMPILERSTUB_DATASIZE + COMPILERSTUB_CODESIZE
-
-
-u1 *createcompilerstub(methodinfo *m)
+void codegen_emit_stub_compiler(jitdata *jd)
{
- u1 *s; /* memory to hold the stub */
- ptrint *d;
+ methodinfo *m;
codegendata *cd;
- s4 dumpsize;
- s = CNEW(u1, COMPILERSTUB_SIZE);
-
- /* set data pointer and code pointer */
-
- d = (ptrint *) s;
- s = s + COMPILERSTUB_DATASIZE;
-
- /* mark start of dump memory area */
-
- dumpsize = dump_size();
-
- cd = DNEW(codegendata);
- cd->mcodeptr = s;
+ /* get required compiler data */
- /* The codeinfo pointer is actually a pointer to the
- methodinfo. This fakes a codeinfo structure. */
+ m = jd->m;
+ cd = jd->cd;
- d[0] = (ptrint) asm_call_jit_compiler;
- d[1] = (ptrint) m;
- d[2] = (ptrint) &d[1]; /* fake code->m */
+ /* code for the stub */
M_ALD_INTERN(REG_ITMP1, REG_PV, -2 * SIZEOF_VOID_P); /* codeinfo pointer */
M_ALD_INTERN(REG_PV, REG_PV, -3 * SIZEOF_VOID_P); /* pointer to compiler */
M_JMP(REG_PV);
M_NOP;
-
- md_cacheflush(s, (s4) (cd->mcodeptr - (u1 *) d));
-
-#if defined(ENABLE_STATISTICS)
- if (opt_stat)
- count_cstub_len += COMPILERSTUB_SIZE;
-#endif
-
- /* release dump area */
-
- dump_release(dumpsize);
-
- return s;
}
-/* createnativestub ************************************************************
+/* codegen_emit_stub_native ****************************************************
- Creates a stub routine which calls a native method.
+ Emits a stub routine which calls a native method.
*******************************************************************************/
-u1 *createnativestub(functionptr f, jitdata *jd, methoddesc *nmd)
+void codegen_emit_stub_native(jitdata *jd, methoddesc *nmd, functionptr f)
{
- methodinfo *m;
- codeinfo *code;
- codegendata *cd;
- registerdata *rd;
- methoddesc *md;
- s4 nativeparams;
- s4 i, j; /* count variables */
- s4 t;
- s4 s1, s2, disp;
- s4 funcdisp; /* displacement of the function */
+ methodinfo *m;
+ codeinfo *code;
+ codegendata *cd;
+ methoddesc *md;
+ s4 nativeparams;
+ s4 i, j;
+ s4 t;
+ s4 s1, s2, disp;
+ s4 funcdisp; /* displacement of the function */
/* get required compiler data */
m = jd->m;
code = jd->code;
cd = jd->cd;
- rd = jd->rd;
/* initialize variables */
#if !defined(WITH_STATIC_CLASSPATH)
if (f == NULL)
- codegen_add_patch_ref(cd, PATCHER_resolve_native, m, funcdisp);
+ patcher_add_patch_ref(jd, PATCHER_resolve_native_function, m, funcdisp);
#endif
/* save integer and float argument registers */
#if SIZEOF_VOID_P == 8
for (i = 0, j = 0; i < md->paramcount && i < INT_ARG_CNT; i++) {
if (IS_INT_LNG_TYPE(md->params[i].type)) {
- M_AST(rd->argintregs[i], REG_SP, j * 8);
+ s1 = md->params[i].regoff;
+ M_AST(s1, REG_SP, j * 8);
j++;
}
}
if (IS_INT_LNG_TYPE(md->params[i].type)) {
if (!md->params[i].inmemory) {
s1 = md->params[i].regoff;
- if (IS_2_WORD_TYPE(md->params[i].type)) {
- s1 = PACK_REGS(rd->argintregs[GET_LOW_REG(s1)],
- rd->argintregs[GET_HIGH_REG(s1)]);
+
+ if (IS_2_WORD_TYPE(md->params[i].type))
M_LST(s1, REG_SP, j * 8);
- }
- else {
- M_IST(rd->argintregs[s1], REG_SP, j * 8);
- }
+ else
+ M_IST(s1, REG_SP, j * 8);
+
j++;
}
}
for (i = 0; i < md->paramcount && i < FLT_ARG_CNT; i++) {
if (IS_FLT_DBL_TYPE(md->params[i].type)) {
+ s1 = md->params[i].regoff;
+
if (IS_2_WORD_TYPE(md->params[i].type))
- M_DST(rd->argfltregs[i], REG_SP, j * 8);
+ M_DST(s1, REG_SP, j * 8);
else
- M_FST(rd->argfltregs[i], REG_SP, j * 8);
+ M_FST(s1, REG_SP, j * 8);
+
j++;
}
}
#if SIZEOF_VOID_P == 8
for (i = 0, j = 0; i < md->paramcount && i < INT_ARG_CNT; i++) {
if (IS_INT_LNG_TYPE(md->params[i].type)) {
- M_LLD(rd->argintregs[i], REG_SP, j * 8);
+ s1 = md->params[i].regoff;
+ M_LLD(s1, REG_SP, j * 8);
j++;
}
}
if (IS_INT_LNG_TYPE(md->params[i].type)) {
if (!md->params[i].inmemory) {
s1 = md->params[i].regoff;
- if (IS_2_WORD_TYPE(md->params[i].type)) {
- s1 = PACK_REGS(rd->argintregs[GET_LOW_REG(s1)],
- rd->argintregs[GET_HIGH_REG(s1)]);
+
+ if (IS_2_WORD_TYPE(md->params[i].type))
M_LLD(s1, REG_SP, j * 8);
- }
- else {
- M_ILD(rd->argintregs[s1], REG_SP, j * 8);
- }
+ else
+ M_ILD(s1, REG_SP, j * 8);
+
j++;
}
}
for (i = 0; i < md->paramcount && i < FLT_ARG_CNT; i++) {
if (IS_FLT_DBL_TYPE(md->params[i].type)) {
+ s1 = md->params[i].regoff;
+
if (IS_2_WORD_TYPE(md->params[i].type))
- M_DLD(rd->argfltregs[i], REG_SP, j * 8);
+ M_DLD(s1, REG_SP, j * 8);
else
- M_FLD(rd->argfltregs[i], REG_SP, j * 8);
+ M_FLD(s1, REG_SP, j * 8);
+
j++;
}
}
if (IS_INT_LNG_TYPE(t)) {
if (!md->params[i].inmemory) {
s1 = md->params[i].regoff;
-#if SIZEOF_VOID_P == 8
- s1 = rd->argintregs[s1];
-#else
- if (IS_2_WORD_TYPE(t))
- s1 = PACK_REGS(rd->argintregs[GET_LOW_REG(s1)],
- rd->argintregs[GET_HIGH_REG(s1)]);
- else
- s1 = rd->argintregs[s1];
-#endif
+ s2 = nmd->params[j].regoff;
if (!nmd->params[j].inmemory) {
- s2 = nmd->params[j].regoff;
#if SIZEOF_VOID_P == 8
- s2 = rd->argintregs[s2];
M_INTMOVE(s1, s2);
#else
- if (IS_2_WORD_TYPE(t)) {
- s2 = PACK_REGS(rd->argintregs[GET_LOW_REG(s2)],
- rd->argintregs[GET_HIGH_REG(s2)]);
+ if (IS_2_WORD_TYPE(t))
M_LNGMOVE(s1, s2);
- }
- else {
- s2 = rd->argintregs[s2];
+ else
M_INTMOVE(s1, s2);
- }
#endif
}
else {
- s2 = nmd->params[j].regoff;
-
#if SIZEOF_VOID_P == 8
- M_LST(s1, REG_SP, s2 * 8);
+ M_LST(s1, REG_SP, s2);
#else
if (IS_2_WORD_TYPE(t))
- M_LST(s1, REG_SP, s2 * 4);
+ M_LST(s1, REG_SP, s2);
else
- M_IST(s1, REG_SP, s2 * 4);
+ M_IST(s1, REG_SP, s2);
#endif
}
}
else {
- s1 = md->params[i].regoff + cd->stackframesize;
+ s1 = md->params[i].regoff + cd->stackframesize * 8;
s2 = nmd->params[j].regoff;
#if SIZEOF_VOID_P == 8
- M_LLD(REG_ITMP1, REG_SP, s1 * 8);
- M_LST(REG_ITMP1, REG_SP, s2 * 8);
+ M_LLD(REG_ITMP1, REG_SP, s1);
+ M_LST(REG_ITMP1, REG_SP, s2);
#else
if (IS_2_WORD_TYPE(t)) {
- M_LLD(PACK_REGS(REG_ITMP1, REG_ITMP2), REG_SP, s1 * 8);
- M_LST(PACK_REGS(REG_ITMP1, REG_ITMP2), REG_SP, s2 * 4);
+ M_LLD(REG_ITMP12_PACKED, REG_SP, s1);
+ M_LST(REG_ITMP12_PACKED, REG_SP, s2);
}
else {
- M_ILD(REG_ITMP1, REG_SP, s1 * 8);
- M_IST(REG_ITMP1, REG_SP, s2 * 4);
+ M_ILD(REG_ITMP1, REG_SP, s1);
+ M_IST(REG_ITMP1, REG_SP, s2);
}
#endif
}
if (!nmd->params[j].inmemory) {
#if SIZEOF_VOID_P == 8
- s1 = rd->argfltregs[s1];
- s2 = rd->argfltregs[s2];
if (IS_2_WORD_TYPE(t))
M_DMOV(s1, s2);
else
/* On MIPS32 float arguments for native functions
can never be in float argument registers, since
the first argument is _always_ an integer
- argument (JNIenv) */
+ argument (JNIEnv) */
if (IS_2_WORD_TYPE(t)) {
- s1 = rd->argfltregs[s1];
- s2 = PACK_REGS(rd->argintregs[GET_LOW_REG(s2)],
- rd->argintregs[GET_HIGH_REG(s2)]);
-
/* double high/low order is endian
independent: even numbered holds low
32-bits, odd numbered high 32-bits */
M_MFC1(GET_LOW_REG(s2), s1); /* low 32-bits */
M_MFC1(GET_HIGH_REG(s2), s1 + 1); /* high 32-bits */
}
- else {
- s1 = rd->argfltregs[s1];
- s2 = rd->argintregs[s2];
+ else
M_MFC1(s2, s1);
- }
#endif
}
else {
#if SIZEOF_VOID_P == 8
- s1 = rd->argfltregs[s1];
-
if (IS_2_WORD_TYPE(t))
- M_DST(s1, REG_SP, s2 * 8);
+ M_DST(s1, REG_SP, s2);
else
- M_FST(s1, REG_SP, s2 * 8);
+ M_FST(s1, REG_SP, s2);
#else
/* s1 may have been originally in 2 int registers,
but was moved out by the native function
argument(s), just get low register */
- s1 = rd->argfltregs[GET_LOW_REG(s1)];
-
if (IS_2_WORD_TYPE(t))
- M_DST(s1, REG_SP, s2 * 4);
+ M_DST(GET_LOW_REG(s1), REG_SP, s2);
else
- M_FST(s1, REG_SP, s2 * 4);
+ M_FST(GET_LOW_REG(s1), REG_SP, s2);
#endif
}
}
else {
- s1 = md->params[i].regoff + cd->stackframesize;
+ s1 = md->params[i].regoff + cd->stackframesize * 8;
s2 = nmd->params[j].regoff;
+#if SIZEOF_VOID_P == 8
if (IS_2_WORD_TYPE(t)) {
- M_DLD(REG_FTMP1, REG_SP, s1 * 8);
- M_DST(REG_FTMP1, REG_SP, s2 * 8);
+ M_DLD(REG_FTMP1, REG_SP, s1);
+ M_DST(REG_FTMP1, REG_SP, s2);
}
else {
- M_FLD(REG_FTMP1, REG_SP, s1 * 8);
- M_FST(REG_FTMP1, REG_SP, s2 * 8);
+ M_FLD(REG_FTMP1, REG_SP, s1);
+ M_FST(REG_FTMP1, REG_SP, s2);
}
+#else
+ if (IS_2_WORD_TYPE(t)) {
+ M_DLD(REG_FTMP1, REG_SP, s1);
+ M_DST(REG_FTMP1, REG_SP, s2);
+ }
+ else {
+ M_FLD(REG_FTMP1, REG_SP, s1);
+ M_FST(REG_FTMP1, REG_SP, s2);
+ }
+#endif
}
}
}
/* save return value */
- if (md->returntype.type != TYPE_VOID) {
+ switch (md->returntype.type) {
#if SIZEOF_VOID_P == 8
- 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);
+ case TYPE_INT:
+ case TYPE_LNG:
+ case TYPE_ADR:
+ M_LST(REG_RESULT, REG_SP, 0 * 8);
+ break;
+ case TYPE_FLT:
+ case TYPE_DBL:
+ M_DST(REG_FRESULT, REG_SP, 0 * 8);
+ break;
#else
- if (IS_INT_LNG_TYPE(md->returntype.type)) {
- M_IST(REG_RESULT, REG_SP, 1*4 + 0 * 8);
- if (IS_2_WORD_TYPE(md->returntype.type))
- M_IST(REG_RESULT2, REG_SP, 1*4 + 0 * 8 + 4);
- }
- else
- M_DST(REG_FRESULT, REG_SP, 1*4 + 0 * 8);
-#endif
+ case TYPE_INT:
+ case TYPE_ADR:
+ M_IST(REG_RESULT, REG_SP, 1*4 + 0 * 8);
+ break;
+ case TYPE_LNG:
+ M_LST(REG_RESULT_PACKED, REG_SP, 1*4 + 0 * 8);
+ break;
+ case TYPE_FLT:
+ case TYPE_DBL:
+ M_DST(REG_FRESULT, REG_SP, 1*4 + 0 * 8);
+ break;
+#endif
+ case TYPE_VOID:
+ break;
}
#if !defined(NDEBUG)
/* restore return value */
- if (md->returntype.type != TYPE_VOID) {
+ switch (md->returntype.type) {
#if SIZEOF_VOID_P == 8
- 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);
+ case TYPE_INT:
+ case TYPE_LNG:
+ case TYPE_ADR:
+ M_LLD(REG_RESULT, REG_SP, 0 * 8);
+ break;
+ case TYPE_FLT:
+ case TYPE_DBL:
+ M_DLD(REG_FRESULT, REG_SP, 0 * 8);
+ break;
#else
- if (IS_INT_LNG_TYPE(md->returntype.type)) {
- M_ILD(REG_RESULT, REG_SP, 1*4 + 0 * 8);
- if (IS_2_WORD_TYPE(md->returntype.type))
- M_ILD(REG_RESULT2, REG_SP, 1*4 + 0 * 8 + 4);
- }
- else
- M_DLD(REG_FRESULT, REG_SP, 1*4 + 0 * 8);
-#endif
+ case TYPE_INT:
+ case TYPE_ADR:
+ M_ILD(REG_RESULT, REG_SP, 1*4 + 0 * 8);
+ break;
+ case TYPE_LNG:
+ M_LLD(REG_RESULT_PACKED, REG_SP, 1*4 + 0 * 8);
+ break;
+ case TYPE_FLT:
+ case TYPE_DBL:
+ M_DLD(REG_FRESULT, REG_SP, 1*4 + 0 * 8);
+ break;
+#endif
+ case TYPE_VOID:
+ break;
}
M_ALD(REG_RA, REG_SP, (cd->stackframesize - 1) * 8); /* load RA */
M_JMP(REG_ITMP3); /* jump to asm exception handler */
M_ASUB_IMM(REG_RA, 4, REG_ITMP2_XPC); /* get exception address (DELAY) */
- /* generate patcher stubs */
-
- emit_patcher_stubs(jd);
-
- codegen_finish(jd);
+ /* Generate patcher traps. */
- return code->entrypoint;
+ emit_patcher_traps(jd);
}
projects / cacao.git / blobdiff