Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA.
- $Id: arch.h 5330 2006-09-05 18:43:12Z edwin $
-
*/
#include "codegen.h"
#include "md-os.h"
-/*
- * Loads an immededat operand into data register
- */
+/* emit_mov_imm_reg **************************************************************************
+ *
+ * Loads an immededat operand into an integer data register
+ *
+ ********************************************************************************************/
void emit_mov_imm_reg (codegendata *cd, s4 imm, s4 dreg)
{
/* FIXME: -1 can be used as byte form 0xff, but this ifs cascade is plain wrong it seems */
}
}
-
/* emit_copy *******************************************************************
Generates a register/memory to register/memory copy.
case TYPE_DBL:
#endif
case TYPE_LNG:
- M_LST(d, REG_SP, dst->vv.regoff * 4);
+ M_LST(d, REG_SP, dst->vv.regoff);
break;
#if defined(ENABLE_SOFTFLOAT)
case TYPE_FLT:
#endif
case TYPE_INT:
- M_IST(d, REG_SP, dst->vv.regoff * 4);
+ M_IST(d, REG_SP, dst->vv.regoff);
break;
case TYPE_ADR:
- M_AST(d, REG_SP, dst->vv.regoff * 4);
+ M_AST(d, REG_SP, dst->vv.regoff);
break;
#if !defined(ENABLE_SOFTFLOAT)
case TYPE_DBL:
- M_DST(d, REG_SP, dst->vv.regoff * 4);
+ M_DST(d, REG_SP, dst->vv.regoff);
break;
case TYPE_FLT:
- M_FST(d, REG_SP, dst->vv.regoff * 4);
+ M_FST(d, REG_SP, dst->vv.regoff);
break;
#endif
default:
if (IS_INMEMORY(src->flags)) {
COUNT_SPILLS;
- disp = src->vv.regoff * 4;
+ disp = src->vv.regoff;
switch (src->type) {
#if defined(ENABLE_SOFTFLOAT)
if (IS_INMEMORY(src->flags)) {
COUNT_SPILLS;
- disp = src->vv.regoff * 4;
+ disp = src->vv.regoff;
M_ILD(tempreg, REG_SP, disp + 4);
reg = tempreg;
} else {
if (IS_INMEMORY(src->flags)) {
COUNT_SPILLS;
- disp = src->vv.regoff * 4;
+ disp = src->vv.regoff;
M_ILD(tempreg, REG_SP, disp);
reg = tempreg;
} else {
/* mark trace code */
M_NOP;
- M_LINK(REG_FP, -16*4);
- M_PUSHALL;
+ M_IPUSH(REG_D0);
+ M_IPUSH(REG_D1);
+ M_APUSH(REG_A0);
+ M_APUSH(REG_A1);
+#if !defined(ENABLE_SOFTFLOAT)
+ M_AADD_IMM(-8*2, REG_SP);
+ M_FSTORE(REG_F0, REG_SP, 8);
+ M_FSTORE(REG_F1, REG_SP, 0);
+
+ disp = 4*4 + 8*2 + 4; /* points to old argument stack initially */
+#else
+ disp = 4*4 + 4;
+#endif
/* builtin_verbosecall_enter takes all args as s8 type */
/* TRACE_ARGS_NUM is the number of args the builtin_verbosecall_enter expects */
M_IPUSH_IMM(m);
- disp = 16*4 + 4 + 4; /* points to old argument stack initially */
/* travel up stack to the first argument of the function which needs to be copied */
for (i=0; (i < md->paramcount) && (i < TRACE_ARGS_NUM); i++) {
- disp += 4;
- if (IS_2_WORD_TYPE(md->paramtypes[i].type)) {
- disp += 4;
- }
+ disp += 8;
}
/* disp now points to the first arg which gets copied to the trace stack, relative to REG_SP! */
/* traced function has such an argument */
t = md->paramtypes[i].type;
- if (IS_2_WORD_TYPE(t)) {
- /* copy from original argument stack */
- M_ILD(REG_ITMP1, REG_SP, disp);
- M_IPUSH(REG_ITMP1);
- M_ILD(REG_ITMP1, REG_SP, disp);
- M_IPUSH(REG_ITMP1);
- } else {
- /* displacment is increased as 4 byte on original stack but 8 byte on trace stack */
- M_ILD(REG_ITMP1, REG_SP, disp);
- M_IPUSH(REG_ITMP1);
- M_IPUSH_IMM(0);
- disp += 4;
- }
+ /* copy from original argument stack */
+ M_ILD(REG_ITMP1, REG_SP, disp);
+ M_ILD(REG_ITMP2, REG_SP, disp-4);
+ M_IPUSH(REG_ITMP2);
+ M_IPUSH(REG_ITMP1);
} else {
/* function has no arg here, push nothing and adapt displacement */
M_IPUSH_IMM(0);
/* pop arguments off stack */
M_AADD_IMM(TRACE_ARGS_NUM*8+4, REG_SP);
- M_POPALL;
- M_UNLK(REG_FP);
+#if !defined(ENABLE_SOFTFLOAT)
+ M_FSTORE(REG_F1, REG_SP, 0);
+ M_FSTORE(REG_F0, REG_SP, 8);
+ M_AADD_IMM(8*2, REG_SP);
+#endif
+
+ M_APOP(REG_A1);
+ M_APOP(REG_A0);
+ M_IPOP(REG_D1);
+ M_IPOP(REG_D0);
+
M_NOP;
}
void emit_verbosecall_exit(jitdata* jd)
/* mark trace code */
M_NOP;
- M_LINK(REG_FP, 0);
+
+#if !defined(ENABLE_SOFTFLOAT)
+ M_AADD_IMM(-8, REG_SP);
+ M_FSTORE(REG_D1, REG_SP, 0);
+#endif
M_IPUSH_IMM(m); /* push methodinfo */
- M_IPUSH_IMM(0); /* TODO push float result */
+#if !defined(ENABLE_SOFTFLOAT)
+ M_AADD_IMM(-3*4, REG_SP);
+ M_FST(REG_D0, REG_SP, 8);
+ M_DST(REG_D0, REG_SP, 0);
+#else
+ M_IPUSH_IMM(0);
- M_IPUSH_IMM(0); /* TODO push double result */
- M_IPUSH_IMM(0); /* TODO push double result */
+ M_IPUSH_IMM(0);
+ M_IPUSH_IMM(0);
+#endif
M_IPUSH(GET_HIGH_REG(REG_RESULT_PACKED))
M_IPUSH(GET_LOW_REG(REG_RESULT_PACKED)) /* push long result */
-
M_JSR_IMM(builtin_verbosecall_exit);
/* poping result registers from stack */
M_IPOP(GET_LOW_REG(REG_RESULT_PACKED))
M_IPOP(GET_HIGH_REG(REG_RESULT_PACKED))
-#if 0
- /* that is wrong of course, overwrites registers and stuff */
- M_IPOP(0); /* TODO: pop double result */
- M_IPOP(0); /* TODO: pop double result */
+#if !defined(ENABLE_SOFTFLOAT)
+ M_DLD(REG_D0, REG_SP, 0)
+ M_FLD(REG_D0, REG_SP, 8)
+#endif
+ M_AADD_IMM(3*4 + 4, REG_SP);
- M_IPOP(0); /* TODO: pop float result */
-#else
- M_AADD_IMM(3*4, REG_SP);
+#if !defined(ENABLE_SOFTFLOAT)
+ M_FLOAD(REG_D1, REG_SP, 0)
+ M_AADD_IMM(8, REG_SP);
#endif
- M_AADD_IMM(4, REG_SP); /* remove rest of stack */
- M_UNLK(REG_FP);
+
M_NOP;
}
#endif
void emit_arrayindexoutofbounds_check(codegendata *cd, instruction *iptr, s4 s1, s4 s2)
{
if (INSTRUCTION_MUST_CHECK(iptr)) {
- M_ILD(REG_ITMP3, s1, OFFSET(java_arrayheader, size));
+ M_ILD(REG_ITMP3, s1, OFFSET(java_array_t, size));
M_ICMP(s2, REG_ITMP3);
M_BHI(4);
M_TRAP_SETREGISTER(s2);