/* src/vm/jit/s390/codegen.c - machine code generator for s390
- Copyright (C) 1996-2005, 2006, 2007 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, 2007, 2008
+ CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO
This file is part of CACAO.
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA.
- $Id: codegen.c 8115 2007-06-20 19:14:05Z michi $
-
*/
#include "config.h"
#include <assert.h>
+#include <stdint.h>
#include <stdio.h>
-#include "vm/types.h"
-
-#include "md-abi.h"
-
-#include "vm/jit/s390/arch.h"
-#include "vm/jit/s390/codegen.h"
-#include "vm/jit/s390/emit.h"
-
-#include "mm/memory.h"
#include "native/jni.h"
+#include "native/localref.h"
#include "native/native.h"
-#if defined(ENABLE_THREADS)
-# include "threads/native/lock.h"
-#endif
+#include "mm/memory.h"
+
+#include "threads/lock-common.h"
-#include "vm/builtin.h"
-#include "vm/exceptions.h"
-#include "vm/global.h"
#include "vmcore/loader.h"
#include "vmcore/options.h"
#include "vmcore/statistics.h"
-#include "vm/stringlocal.h"
-#include "vm/vm.h"
+#include "vm/builtin.h"
+#include "vm/exceptions.h"
+#include "vm/global.h"
+#include "vm/jit/abi.h"
+#if defined(ENABLE_LSRA)
+# include "vm/jit/allocator/lsra.h"
+#endif
#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/linenumbertable.h"
#include "vm/jit/methodheader.h"
#include "vm/jit/parse.h"
-#include "vm/jit/patcher.h"
+#include "vm/jit/patcher-common.h"
#include "vm/jit/reg.h"
#include "vm/jit/replace.h"
+#include "vm/jit/s390/arch.h"
+#include "vm/jit/s390/codegen.h"
+#include "vm/jit/s390/emit.h"
+#include "vm/jit/s390/md-abi.h"
#include "vm/jit/stacktrace.h"
-#include "vm/jit/abi.h"
-#include "vm/jit/emit-common.h"
+#include "vm/types.h"
+#include "vm/stringlocal.h"
+#include "vm/vm.h"
-#if defined(ENABLE_LSRA)
-# include "vm/jit/allocator/lsra.h"
-#endif
+/* DO__LOG generates a call to do__log. No registers are destroyed,
+ * so you may use it anywhere. regs is an array containing all general
+ * purpose registers.
+ */
+
+/*
+static void do__log(u4 *regs) {
+}
+*/
-#define OOPS() assert(0);
-#define SUPPORT_HERCULES 1
+#define DO__LOG \
+ N_AHI(REG_SP, -200); \
+ N_STM(R0, R15, 96, REG_SP); \
+ M_ALD_DSEG(R14, dseg_add_address(cd, &do__log)); \
+ N_LA(R2, 96, RN, REG_SP); \
+ N_BASR(R14, R14); \
+ N_LM(R0, R15, 96, REG_SP); \
+ N_AHI(REG_SP, 200);
+
+/* If the following macro is defined, workaround code for hercules quirks
+ * is generated
+ */
-void panic() { }
+/* #define SUPPORT_HERCULES 1 */
/* codegen *********************************************************************
*******************************************************************************/
+/*
+
+Layout of stackframe:
+
+Meaning Offset
+===============================================================================
+return_address (stackframesize - 1) * 8
+saved_int_reg[INT_SAV_CNT - 1] (stackframseize - 2) * 8
+...
+saved_int_reg[rd->savintreguse]
+saved_flt_reg[FLT_SAV_CNT - 1]
+...
+saved_flt_reg[rd->savfltreguse] (stackframesize - 1 - savedregs_num) * 8
+
+return_value_tmp (rd->memuse + 1) * 8
+monitorenter_argument (rd->memuse) * 8
+???
+local[rd->memuse - 1] (rd->memuse - 1) * 8
+....
+local[2] 2 * 8
+local[1] 1 * 8
+local[0] 0 * 8
+
+*/
bool codegen_emit(jitdata *jd)
{
registerdata *rd;
s4 len, s1, s2, s3, d, dd, disp;
u2 currentline;
- ptrint a;
- varinfo *var, *var1, *var2, *dst;
+ varinfo *var;
basicblock *bptr;
instruction *iptr;
- exception_entry *ex;
constant_classref *cr;
unresolved_class *uc;
methodinfo *lm; /* local methodinfo for ICMD_INVOKE* */
/* space to save used callee saved registers */
savedregs_num += (INT_SAV_CNT - rd->savintreguse);
- savedregs_num += (FLT_SAV_CNT - rd->savfltreguse) * 2;
+ savedregs_num += (FLT_SAV_CNT - rd->savfltreguse);
cd->stackframesize = rd->memuse + savedregs_num + 1 /* space to save RA */;
/* CAUTION:
- * As REG_ITMP3 == REG_RA, do not touch REG_ITMP3, until it has been saved.
+ * As REG_ITMP2 == REG_RA, do not touch REG_ITMP2, until it has been saved.
*/
#if defined(ENABLE_THREADS)
not be shared with place to save the return register
since both values reside in R2. */
- if (checksync && (m->flags & ACC_SYNCHRONIZED)) {
- /* reserve 2 slots for long/double return values for monitorexit */
-
- if (IS_2_WORD_TYPE(m->parseddesc->returntype.type))
- cd->stackframesize += 3;
- else
- cd->stackframesize += 2;
+ if (checksync && code_is_synchronized(code)) {
+ /* 1 slot space to save argument of monitor_enter */
+ /* 1 slot to temporary store return value before monitor_exit */
+ cd->stackframesize += 2;
}
#endif
native code e.g. libc or jni (alignment problems with
movaps). */
- if (!jd->isleafmethod || opt_verbosecall )
+ if (!code_is_leafmethod(code) || opt_verbosecall )
/* TODO really 16 bytes ? */
- cd->stackframesize = (cd->stackframesize + 3) & ~3;
+ cd->stackframesize = (cd->stackframesize + 2) & ~2;
/* create method header */
(void) dseg_add_unique_address(cd, code); /* CodeinfoPointer */
- (void) dseg_add_unique_s4(cd, cd->stackframesize * 4); /* FrameSize */
+ (void) dseg_add_unique_s4(cd, cd->stackframesize * 8); /* FrameSize */
-#if defined(ENABLE_THREADS)
- /* IsSync contains the offset relative to the stack pointer for the
- argument of monitor_exit used in the exception handler. Since the
- offset could be zero and give a wrong meaning of the flag it is
- offset by one.
- */
-
- if (checksync && (m->flags & ACC_SYNCHRONIZED))
- (void) dseg_add_unique_s4(cd, (rd->memuse + 1) * 4); /* IsSync */
- else
-#endif
+ code->synchronizedoffset = rd->memuse * 8;
- (void) dseg_add_unique_s4(cd, 0); /* IsSync */
+ /* REMOVEME: We still need it for exception handling in assembler. */
+
+ if (code_is_leafmethod(code))
+ (void) dseg_add_unique_s4(cd, 1);
+ else
+ (void) dseg_add_unique_s4(cd, 0);
- (void) dseg_add_unique_s4(cd, jd->isleafmethod); /* IsLeaf */
(void) dseg_add_unique_s4(cd, INT_SAV_CNT - rd->savintreguse); /* IntSave */
(void) dseg_add_unique_s4(cd, FLT_SAV_CNT - rd->savfltreguse); /* FltSave */
- (void) dseg_addlinenumbertablesize(cd);
+ /* Offset PV */
- (void) dseg_add_unique_s4(cd, jd->exceptiontablelength); /* ExTableSize */
+ M_AADD_IMM(N_PV_OFFSET, REG_PV);
- /* create exception table */
+ /* create stack frame (if necessary) */
- for (ex = jd->exceptiontable; ex != NULL; ex = ex->down) {
- dseg_add_target(cd, ex->start);
- dseg_add_target(cd, ex->end);
- dseg_add_target(cd, ex->handler);
- (void) dseg_add_unique_address(cd, ex->catchtype.any);
+ if (cd->stackframesize) {
+ M_ASUB_IMM(cd->stackframesize * 8, REG_SP);
}
- /* Offset PV */
+ /* store return address */
- M_AADD_IMM(N_PV_OFFSET, REG_PV);
+ M_AST(REG_RA, REG_SP, (cd->stackframesize - 1) * 8);
/* generate method profiling code */
#if defined(ENABLE_PROFILING)
if (JITDATA_HAS_FLAG_INSTRUMENT(jd)) {
/* count frequency */
-
- M_ALD(REG_ITMP1, REG_PV, CodeinfoPointer);
- M_ILD(REG_ITMP2, REG_ITMP1, OFFSET(codeinfo, frequency));
- M_IADD_IMM(1, REG_ITMP2);
+ M_ALD_DSEG(REG_ITMP1, CodeinfoPointer);
+ ICONST(REG_ITMP2, 1);
+ N_AL(REG_ITMP2, OFFSET(codeinfo, frequency), RN, REG_ITMP1);
M_IST(REG_ITMP2, REG_ITMP1, OFFSET(codeinfo, frequency));
-/* PROFILE_CYCLE_START; */
+ PROFILE_CYCLE_START;
}
#endif
- /* create stack frame (if necessary) */
-
- if (cd->stackframesize)
- M_ASUB_IMM(cd->stackframesize * 4, REG_SP);
-
/* save used callee saved registers and return address */
- p = cd->stackframesize;
- p--; M_AST(REG_RA, REG_SP, p * 4);
+ p = cd->stackframesize - 1;
for (i = INT_SAV_CNT - 1; i >= rd->savintreguse; i--) {
- p--; M_IST(rd->savintregs[i], REG_SP, p * 4);
+ p--; M_IST(rd->savintregs[i], REG_SP, p * 8);
}
for (i = FLT_SAV_CNT - 1; i >= rd->savfltreguse; i--) {
- p -= 2; M_DST(rd->savfltregs[i], REG_SP, p * 4);
+ p--; M_DST(rd->savfltregs[i], REG_SP, p * 8);
}
/* take arguments out of register or stack frame */
varindex = jd->local_map[l * 5 + t];
l++;
- if (IS_2_WORD_TYPE(t)) /* increment local counter for 2 word types */
- l++;
+
+ if (IS_2_WORD_TYPE(t))
+ l++;
if (varindex == UNUSED)
continue;
var = VAR(varindex);
s1 = md->params[p].regoff;
+
if (IS_INT_LNG_TYPE(t)) { /* integer args */
if (IS_2_WORD_TYPE(t)) {
s2 = PACK_REGS(
}
if (!md->params[p].inmemory) { /* register arguments */
if (!IS_INMEMORY(var->flags)) { /* reg arg -> register */
- if (IS_2_WORD_TYPE(t))
+ if (IS_2_WORD_TYPE(t)) {
M_LNGMOVE(s2, var->vv.regoff);
- else
+ } else {
M_INTMOVE(s2, var->vv.regoff);
-
+ }
} else { /* reg arg -> spilled */
- if (IS_2_WORD_TYPE(t))
+ if (IS_2_WORD_TYPE(t)) {
M_LST(s2, REG_SP, var->vv.regoff);
- else
+ } else {
M_IST(s2, REG_SP, var->vv.regoff);
+ }
}
} else { /* stack arguments */
if (!IS_INMEMORY(var->flags)) { /* stack arg -> register */
- if (IS_2_WORD_TYPE(t))
- M_LLD(var->vv.regoff, REG_SP, cd->stackframesize * 4 + s1);
- else
- M_ILD(var->vv.regoff, REG_SP, cd->stackframesize * 4 + s1);
-
- } else { /* stack arg -> spilled */
- M_ILD(REG_ITMP1, REG_SP, cd->stackframesize * 4 + s1);
- M_IST(REG_ITMP1, REG_SP, var->vv.regoff);
if (IS_2_WORD_TYPE(t)) {
- M_ILD(REG_ITMP1, REG_SP, cd->stackframesize * 4 + s1 + 4);
- M_IST(REG_ITMP1, REG_SP, var->vv.regoff + 4);
+ M_LLD(var->vv.regoff, REG_SP, cd->stackframesize * 8 + s1);
+ } else {
+ M_ILD(var->vv.regoff, REG_SP, cd->stackframesize * 8 + s1);
}
+ } else { /* stack arg -> spilled */
+ N_MVC(var->vv.regoff, 8, REG_SP, cd->stackframesize * 8 + s1, REG_SP);
}
}
} else { /* stack arguments */
if (!IS_INMEMORY(var->flags)) { /* stack-arg -> register */
if (IS_2_WORD_TYPE(t))
- M_DLD(var->vv.regoff, REG_SP, cd->stackframesize * 4 + s1);
+ M_DLD(var->vv.regoff, REG_SP, cd->stackframesize * 8 + s1);
else
- M_FLD(var->vv.regoff, REG_SP, cd->stackframesize * 4 + s1);
+ M_FLD(var->vv.regoff, REG_SP, cd->stackframesize * 8 + s1);
} else { /* stack-arg -> spilled */
- if (IS_2_WORD_TYPE(t)) {
- M_DLD(REG_FTMP1, REG_SP, cd->stackframesize * 4 + s1);
- M_DST(REG_FTMP1, REG_SP, var->vv.regoff);
- var->vv.regoff = cd->stackframesize * 4 + s1;
-
- } else {
- M_FLD(REG_FTMP1, REG_SP, cd->stackframesize * 4 + s1);
- M_FST(REG_FTMP1, REG_SP, var->vv.regoff);
- }
+ N_MVC(var->vv.regoff, 8, REG_SP, cd->stackframesize * 8 + s1, REG_SP);
+ var->vv.regoff = cd->stackframesize * 8 + s1;
}
}
}
/* save monitorenter argument */
#if defined(ENABLE_THREADS)
- if (checksync && (m->flags & ACC_SYNCHRONIZED)) {
+ if (checksync && code_is_synchronized(code)) {
/* stack offset for monitor argument */
s1 = rd->memuse;
M_IST(abi_registers_integer_argument[p], REG_SP, p * 8);
for (p = 0; p < FLT_ARG_CNT; p++)
- M_FST(abi_registers_float_argument[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) * 2);
+ s1 += ((INT_ARG_CNT + FLT_ARG_CNT));
}
#endif
/* decide which monitor enter function to call */
if (m->flags & ACC_STATIC) {
- disp = dseg_add_address(cd, &m->class->object.header);
+ disp = dseg_add_address(cd, &m->clazz->object.header);
M_ALD_DSEG(REG_A0, disp);
}
else {
}
disp = dseg_add_functionptr(cd, LOCK_monitor_enter);
- M_ALD_DSEG(REG_ITMP3, disp);
+ M_ALD_DSEG(REG_ITMP2, disp);
- M_AST(REG_A0, REG_SP, s1 * 4);
+ M_AST(REG_A0, REG_SP, s1 * 8);
M_ASUB_IMM(96, REG_SP);
- M_CALL(REG_ITMP3);
+ M_CALL(REG_ITMP2);
M_AADD_IMM(96, REG_SP);
#if !defined(NDEBUG)
M_ILD(abi_registers_integer_argument[p], REG_SP, p * 8);
for (p = 0; p < FLT_ARG_CNT; p++)
- M_FLD(abi_registers_float_argument[p], REG_SP, (INT_ARG_CNT + p) * 8);
+ M_DLD(abi_registers_float_argument[p], REG_SP, (INT_ARG_CNT + p) * 8);
M_AADD_IMM((INT_ARG_CNT + FLT_ARG_CNT) * 8, REG_SP);
}
}
/* end of header generation */
-#if 0
- replacementpoint = jd->code->rplpoints;
-#endif
+
+ /* create replacement points */
+
+ REPLACEMENT_POINTS_INIT(cd, jd);
/* walk through all basic blocks */
/* handle replacement points */
-#if 0
- if (bptr->bitflags & BBFLAG_REPLACEMENT) {
- replacementpoint->pc = (u1*)(ptrint)bptr->mpc; /* will be resolved later */
-
- replacementpoint++;
-
- assert(cd->lastmcodeptr <= cd->mcodeptr);
- cd->lastmcodeptr = cd->mcodeptr + 5; /* 5 byte jmp patch */
- }
-#endif
+ REPLACEMENT_POINT_BLOCK_START(cd, bptr);
/* copy interface registers to their destination */
len = bptr->indepth;
MCODECHECK(512);
+#if defined(ENABLE_PROFILING)
/* generate basicblock profiling code */
if (JITDATA_HAS_FLAG_INSTRUMENT(jd)) {
/* count frequency */
- M_MOV_IMM(code->bbfrequency, REG_ITMP3);
- M_IINC_MEMBASE(REG_ITMP3, bptr->nr * 4);
+ M_ALD_DSEG(REG_ITMP1, CodeinfoPointer);
+ M_ALD(REG_ITMP1, REG_ITMP1, OFFSET(codeinfo, bbfrequency));
+ ICONST(REG_ITMP2, 1);
+ N_AL(REG_ITMP2, bptr->nr * 4, RN, REG_ITMP1);
+ M_IST(REG_ITMP2, REG_ITMP1, bptr->nr * 4);
/* if this is an exception handler, start profiling again */
if (bptr->type == BBTYPE_EXH)
PROFILE_CYCLE_START;
}
+#endif
#if defined(ENABLE_LSRA)
if (opt_lsra) {
if (bptr->type == BBTYPE_EXH) {
/* d = reg_of_var(rd, src, REG_ITMP1); */
if (!IS_INMEMORY(src->flags))
- d= src->vv.regoff;
+ d = src->vv.regoff;
else
- d=REG_ITMP1;
- M_INTMOVE(REG_ITMP1, d);
+ d = REG_ITMP3_XPTR;
+ M_INTMOVE(REG_ITMP3_XPTR, d);
emit_store(jd, NULL, src, d);
}
}
var = VAR(bptr->invars[len]);
if ((len == bptr->indepth-1) && (bptr->type != BBTYPE_STD)) {
if (bptr->type == BBTYPE_EXH) {
- d = codegen_reg_of_var(0, var, REG_ITMP1);
- M_INTMOVE(REG_ITMP1, d);
+ d = codegen_reg_of_var(0, var, REG_ITMP3_XPTR);
+ M_INTMOVE(REG_ITMP3_XPTR, d);
emit_store(jd, NULL, var, d);
}
}
for (iptr = bptr->iinstr; len > 0; len--, iptr++) {
if (iptr->line != currentline) {
- dseg_addlinenumber(cd, iptr->line);
+ linenumbertable_list_entry_add(cd, iptr->line);
currentline = iptr->line;
}
case ICMD_NOP: /* ... ==> ... */
case ICMD_POP: /* ..., value ==> ... */
case ICMD_POP2: /* ..., value, value ==> ... */
- case ICMD_INLINE_START: /* internal ICMDs */
+ break;
+
+ case ICMD_INLINE_START:
+
+ REPLACEMENT_POINT_INLINE_START(cd, iptr);
+ break;
+
+ case ICMD_INLINE_BODY:
+
+ REPLACEMENT_POINT_INLINE_BODY(cd, iptr);
+ linenumbertable_list_entry_add_inline_start(cd, iptr);
+ linenumbertable_list_entry_add(cd, iptr->line);
+ break;
+
case ICMD_INLINE_END:
+
+ linenumbertable_list_entry_add_inline_end(cd, iptr);
+ linenumbertable_list_entry_add(cd, iptr->line);
break;
case ICMD_CHECKNULL: /* ..., objectref ==> ..., objectref */
/* PROFILE_CYCLE_STOP; */
- codegen_add_patch_ref(cd, PATCHER_resolve_classref_to_classinfo,
+ patcher_add_patch_ref(jd, PATCHER_resolve_classref_to_classinfo,
cr, disp);
/* PROFILE_CYCLE_START; */
} else {
disp = dseg_add_unique_address(cd, iptr->sx.val.anyptr);
M_ALD_DSEG(d, disp);
+ /*
+ if (((u4)(iptr->sx.val.anyptr) & 0x00008000) == 0) {
+ N_LHI(d, ((u4)(iptr->sx.val.anyptr) >> 16) & 0xFFFF);
+ M_SLL_IMM(16, d);
+ N_AHI(d, (u4)(iptr->sx.val.anyptr) & 0xFFFF);
+ } else {
+ disp = dseg_add_unique_address(cd, iptr->sx.val.anyptr);
+ M_ALD_DSEG(d, disp);
+ }
+ */
}
}
emit_store_dst(jd, iptr, d);
case ICMD_I2L: /* ..., value ==> ..., value */
- d = emit_alloc_dst_even_odd(jd, iptr, R0, REG_ITMP1, REG_ITMP2);
- s1 = emit_load_s1(jd, iptr, GET_HIGH_REG(d));
+ d = codegen_reg_of_dst(jd, iptr, REG_ITMP31_PACKED); /* even-odd */
+ if (! N_IS_EVEN_ODD(d)) {
+ d = REG_ITMP31_PACKED;
+ }
+ assert(N_IS_EVEN_ODD(d));
+
+ s1 = emit_load_s1(jd, iptr, REG_ITMP2);
M_INTMOVE(s1, GET_HIGH_REG(d));
- ICONST(GET_LOW_REG(d), 0);
M_SRDA_IMM(32, GET_HIGH_REG(d));
emit_copy_dst(jd, iptr, d);
emit_store_dst(jd, iptr, d);
- emit_restore_dst_even_odd(jd, iptr, R0, REG_ITMP1, REG_ITMP2);
-
break;
case ICMD_L2I: /* ..., value ==> ..., value */
case ICMD_INT2BYTE: /* ..., value ==> ..., value */
s1 = emit_load_s1(jd, iptr, REG_ITMP1);
- d = codegen_reg_of_dst(jd, iptr, REG_ITMP3);
+ d = codegen_reg_of_dst(jd, iptr, REG_ITMP2);
M_INTMOVE(s1, d);
M_SLL_IMM(24, d);
M_SRA_IMM(24, d);
case ICMD_INT2CHAR: /* ..., value ==> ..., value */
s1 = emit_load_s1(jd, iptr, REG_ITMP1);
- d = codegen_reg_of_dst(jd, iptr, REG_ITMP3);
+ d = codegen_reg_of_dst(jd, iptr, REG_ITMP2);
M_INTMOVE(s1, d);
M_SLL_IMM(16, d);
M_SRL_IMM(16, d);
case ICMD_INT2SHORT: /* ..., value ==> ..., value */
s1 = emit_load_s1(jd, iptr, REG_ITMP1);
- d = codegen_reg_of_dst(jd, iptr, REG_ITMP3);
+ d = codegen_reg_of_dst(jd, iptr, REG_ITMP2);
M_INTMOVE(s1, d);
M_SLL_IMM(16, d);
M_SRA_IMM(16, d);
case ICMD_IDIV: /* ..., val1, val2 ==> ..., val1 / val2 */
case ICMD_IREM: /* ..., val1, val2 ==> ..., val1 % val2 */
- s2 = emit_load_s2_notzero(jd, iptr, REG_ITMP2);
- emit_arithmetic_check(cd, iptr, s2);
+ /* load s1 into r0 */
- /* For this operation we need a register pair.
- * We will use r0 and itmp1 and will backup r0.
- */
+ s1 = emit_load_s1(jd, iptr, GET_HIGH_REG(REG_ITMP31_PACKED));
+ M_INTMOVE(s1, GET_HIGH_REG(REG_ITMP31_PACKED));
+ s1 = GET_HIGH_REG(REG_ITMP31_PACKED);
- M_INTMOVE(R0, REG_ITMP3);
+ s2 = emit_load_s2(jd, iptr, REG_ITMP2);
- /* We won't check for division by 0, we catch a SIGFPE instead
- * Special case 0x80000000 / 0xffffffff handled by signal handler too.
- */
+ /* extend s1 to long */
- s1 = emit_load_s1(jd, iptr, R0);
- M_INTMOVE(s1, R0);
- M_CLR(REG_ITMP1);
- M_SRDA_IMM(32, R0);
+ M_SRDA_IMM(32, GET_HIGH_REG(REG_ITMP31_PACKED));
- N_DR(R0, s2);
+ /* divide */
+
+ N_DR(GET_HIGH_REG(REG_ITMP31_PACKED), s2);
+
+ /* take result */
switch (iptr->opc) {
case ICMD_IREM:
- d = codegen_reg_of_dst(jd, iptr, R0);
- M_INTMOVE(R0, d);
+ d = codegen_reg_of_dst(jd, iptr, GET_HIGH_REG(REG_ITMP31_PACKED));
+ M_INTMOVE(GET_HIGH_REG(REG_ITMP31_PACKED), d);
break;
case ICMD_IDIV:
- d = codegen_reg_of_dst(jd, iptr, REG_ITMP1);
- M_INTMOVE(REG_ITMP1, d);
+ d = codegen_reg_of_dst(jd, iptr, GET_LOW_REG(REG_ITMP31_PACKED));
+ M_INTMOVE(GET_LOW_REG(REG_ITMP31_PACKED), d);
break;
}
emit_store_dst(jd, iptr, d);
- /* If destionation of operation was not register R0,
- * restore R0.
- */
-
- if (! ((d == R0) && !IS_INMEMORY(VAROP(iptr->dst)->flags))) {
- M_INTMOVE(REG_ITMP3, R0);
- }
-
break;
case ICMD_LDIV: /* ..., val1, val2 ==> ..., val1 / val2 */
/* call builtin */
M_ASUB_IMM(96, REG_SP);
- M_ALD_DSEG(REG_ITMP3, disp);
- M_JSR(REG_RA, REG_ITMP3);
+ M_ALD_DSEG(REG_ITMP2, disp);
+ M_JSR(REG_RA, REG_ITMP2);
M_AADD_IMM(96, REG_SP);
/* store result */
case ICMD_LUSHR: /* ..., val1, val2 ==> ..., val1 >>> val2 */
- s2 = emit_load_s2(jd, iptr, REG_ITMP3); /* d wont contain REG_ITMP3 */
+ s2 = emit_load_s2(jd, iptr, REG_ITMP2);
/* Use only 6 bits of second operand */
- M_INTMOVE(s2, REG_ITMP3);
- s2 = REG_ITMP3;
- ICONST(REG_ITMP2, 0x3F);
- M_IAND(REG_ITMP2, s2);
+ M_INTMOVE(s2, REG_ITMP2);
+ s2 = REG_ITMP2;
+ ICONST(REG_ITMP1, 0x3F);
+ M_IAND(REG_ITMP1, s2);
- d = emit_alloc_dst_even_odd(jd, iptr, R0, REG_ITMP1, REG_ITMP2);
+ s1 = emit_load_s1(jd, iptr, REG_ITMP31_PACKED); /* even-odd pair */
+ d = codegen_reg_of_dst(jd, iptr, REG_ITMP31_PACKED);
- if ((s2 == GET_LOW_REG(d)) || (s2 == GET_HIGH_REG(d))) {
- M_INTMOVE(s2, REG_ITMP3);
- s2 = REG_ITMP3;
+ /* Destination must be even-odd pair */
+
+ if (! N_IS_EVEN_ODD(d)) {
+ d = REG_ITMP31_PACKED;
}
- s1 = emit_load_s1(jd, iptr, d);
+ assert(N_IS_EVEN_ODD(d));
M_LNGMOVE(s1, d);
emit_copy_dst(jd, iptr, d);
emit_store_dst(jd, iptr, d);
- emit_restore_dst_even_odd(jd, iptr, R0, REG_ITMP1, REG_ITMP2);
break;
/* sx.val.l = constant */
case ICMD_LMULPOW2:
- d = emit_alloc_dst_even_odd(jd, iptr, R0, REG_ITMP1, REG_ITMP2); /* won't contain itmp3 */
+ d = codegen_reg_of_dst(jd, iptr, REG_ITMP31_PACKED); /* even-odd */
+ if (! N_IS_EVEN_ODD(d)) {
+ d = REG_ITMP31_PACKED;
+ }
+ assert(N_IS_EVEN_ODD(d));
+
s1 = emit_load_s1(jd, iptr, d);
M_LNGMOVE(s1, d);
emit_copy_dst(jd, iptr, d);
emit_store_dst(jd, iptr, d);
- emit_restore_dst_even_odd(jd, iptr, R0, REG_ITMP1, REG_ITMP2);
-
break;
case ICMD_IAND: /* ..., val1, val2 ==> ..., val1 & val2 */
break;
case ICMD_F2D: /* ..., value ==> ..., (double) value */
- s1 = emit_load_s1(jd, iptr, REG_FTMP1);
- d = codegen_reg_of_dst(jd, iptr, REG_FTMP2);
- M_CVTFD(s1, d);
- emit_store_dst(jd, iptr, d);
+ {
+#ifdef SUPPORT_HERCULES
+ u1 *ref;
+#endif
+ s1 = emit_load_s1(jd, iptr, REG_FTMP1);
+ d = codegen_reg_of_dst(jd, iptr, REG_FTMP2);
+#ifdef SUPPORT_HERCULES
+ N_LTEBR(s1, s1);
+ ref = cd->mcodeptr;
+ N_BRC(DD_0 | DD_1 | DD_2, 0); /* Non a NaN */
+ disp = dseg_add_double(cd, 0.0 / 0.0);
+ M_DLD_DSEG(d, disp, REG_ITMP1);
+ emit_label_br(cd, BRANCH_LABEL_1);
+ N_BRC_BACK_PATCH(ref);
+#endif
+ M_CVTFD(s1, d);
+#ifdef SUPPORT_HERCULES
+ emit_label(cd, BRANCH_LABEL_1);
+#endif
+ emit_store_dst(jd, iptr, d);
+ }
break;
case ICMD_D2F: /* ..., value ==> ..., (float) value */
case ICMD_ARRAYLENGTH: /* ..., arrayref ==> ..., (int) length */
- s1 = emit_load_s1_notzero(jd, iptr, REG_ITMP1);
+ s1 = emit_load_s1(jd, iptr, REG_ITMP1);
d = codegen_reg_of_dst(jd, iptr, REG_ITMP3);
/* TODO softnull */
/* 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;
case ICMD_BALOAD: /* ..., arrayref, index ==> ..., value */
- s1 = emit_load_s1_notzero(jd, iptr, REG_ITMP1);
- s2 = emit_load_s2_notzero(jd, iptr, REG_ITMP2);
+ s1 = emit_load_s1(jd, iptr, REG_ITMP1);
+ s2 = emit_load_s2(jd, iptr, REG_ITMP2);
d = codegen_reg_of_dst(jd, iptr, REG_ITMP2);
/* implicit null-pointer check */
emit_arrayindexoutofbounds_check(cd, iptr, s1, s2);
- N_IC(d, OFFSET(java_bytearray, data[0]), s2, s1);
+ N_IC(d, OFFSET(java_bytearray_t, data[0]), s2, s1);
M_SLL_IMM(24, d);
M_SRA_IMM(24, d);
case ICMD_CALOAD: /* ..., arrayref, index ==> ..., value */
- s1 = emit_load_s1_notzero(jd, iptr, REG_ITMP1);
+ s1 = emit_load_s1(jd, iptr, REG_ITMP1);
s2 = emit_load_s2(jd, iptr, REG_ITMP2);
d = codegen_reg_of_dst(jd, iptr, REG_ITMP2);
M_INTMOVE(s2, REG_ITMP2);
M_SLL_IMM(1, REG_ITMP2);
- N_LH(d, OFFSET(java_chararray, data[0]), REG_ITMP2, s1);
+ N_LH(d, OFFSET(java_chararray_t, data[0]), REG_ITMP2, s1);
/* N_LH does sign extends, undo ! */
break;
case ICMD_SALOAD: /* ..., arrayref, index ==> ..., value */
- s1 = emit_load_s1_notzero(jd, iptr, REG_ITMP1);
+ s1 = emit_load_s1(jd, iptr, REG_ITMP1);
s2 = emit_load_s2(jd, iptr, REG_ITMP2);
d = codegen_reg_of_dst(jd, iptr, REG_ITMP2);
M_INTMOVE(s2, REG_ITMP2);
M_SLL_IMM(1, REG_ITMP2);
- N_LH(d, OFFSET(java_shortarray, data[0]), REG_ITMP2, s1);
+ N_LH(d, OFFSET(java_shortarray_t, data[0]), REG_ITMP2, s1);
emit_store_dst(jd, iptr, d);
break;
case ICMD_IALOAD: /* ..., arrayref, index ==> ..., value */
- s1 = emit_load_s1_notzero(jd, iptr, REG_ITMP1);
+ s1 = emit_load_s1(jd, iptr, REG_ITMP1);
s2 = emit_load_s2(jd, iptr, REG_ITMP2);
d = codegen_reg_of_dst(jd, iptr, REG_ITMP2);
M_INTMOVE(s2, REG_ITMP2);
M_SLL_IMM(2, REG_ITMP2); /* scale index by 4 */
- N_L(d, OFFSET(java_intarray, data[0]), REG_ITMP2, s1);
+ N_L(d, OFFSET(java_intarray_t, data[0]), REG_ITMP2, s1);
emit_store_dst(jd, iptr, d);
break;
case ICMD_LALOAD: /* ..., arrayref, index ==> ..., value */
- s1 = emit_load_s1_notzero(jd, iptr, REG_ITMP3);
+ s1 = emit_load_s1(jd, iptr, REG_ITMP1);
s2 = emit_load_s2(jd, iptr, REG_ITMP2);
- d = codegen_reg_of_dst(jd, iptr, REG_ITMP12_PACKED);
+ d = codegen_reg_of_dst(jd, iptr, REG_ITMP13_PACKED);
/* implicit null-pointer check */
emit_arrayindexoutofbounds_check(cd, iptr, s1, s2);
M_INTMOVE(s2, REG_ITMP2);
M_SLL_IMM(3, REG_ITMP2); /* scale index by 8 */
- /* We need to preserve the array address after the first load */
+ N_L(
+ GET_LOW_REG(d) /* maybe itmp3 */,
+ OFFSET(java_intarray_t, data[0]) + 4,
+ REG_ITMP2, s1 /* maybe itmp1 */
+ );
- if (GET_HIGH_REG(d) == s1) {
- M_INTMOVE(s1, REG_ITMP3);
- s1 = REG_ITMP3;
- }
+ N_L(
+ GET_HIGH_REG(d) /* maybe itmp1 */,
+ OFFSET(java_intarray_t, data[0]),
+ REG_ITMP2, s1 /* maybe itmp1 */
+ );
- N_L(GET_HIGH_REG(d) /* evntl. itmp1 */, OFFSET(java_intarray, data[0]), REG_ITMP2, s1);
- N_L(GET_LOW_REG(d) /* evntl. itmp2 */, OFFSET(java_intarray, data[0]) + 4, REG_ITMP2, s1);
emit_store_dst(jd, iptr, d);
break;
case ICMD_FALOAD: /* ..., arrayref, index ==> ..., value */
- s1 = emit_load_s1_notzero(jd, iptr, REG_ITMP1);
+ s1 = emit_load_s1(jd, iptr, REG_ITMP1);
s2 = emit_load_s2(jd, iptr, REG_ITMP2);
d = codegen_reg_of_dst(jd, iptr, REG_FTMP1);
M_INTMOVE(s2, REG_ITMP2);
M_SLL_IMM(2, REG_ITMP2); /* scale index by 4 */
- N_LE(d, OFFSET(java_floatarray, data[0]), REG_ITMP2, s1);
+ N_LE(d, OFFSET(java_floatarray_t, data[0]), REG_ITMP2, s1);
emit_store_dst(jd, iptr, d);
break;
case ICMD_DALOAD: /* ..., arrayref, index ==> ..., value */
- s1 = emit_load_s1_notzero(jd, iptr, REG_ITMP1);
+ s1 = emit_load_s1(jd, iptr, REG_ITMP1);
s2 = emit_load_s2(jd, iptr, REG_ITMP2);
d = codegen_reg_of_dst(jd, iptr, REG_FTMP1);
M_INTMOVE(s2, REG_ITMP2);
M_SLL_IMM(3, REG_ITMP2); /* scale index by 8 */
- N_LD(d, OFFSET(java_floatarray, data[0]), REG_ITMP2, s1);
+ N_LD(d, OFFSET(java_floatarray_t, data[0]), REG_ITMP2, s1);
emit_store_dst(jd, iptr, d);
break;
case ICMD_AALOAD: /* ..., arrayref, index ==> ..., value */
- s1 = emit_load_s1_notzero(jd, iptr, REG_ITMP1);
+ s1 = emit_load_s1(jd, iptr, REG_ITMP1);
s2 = emit_load_s2(jd, iptr, REG_ITMP2);
d = codegen_reg_of_dst(jd, iptr, REG_ITMP2);
M_INTMOVE(s2, REG_ITMP2);
M_SLL_IMM(2, REG_ITMP2); /* scale index by 4 */
- N_L(d, OFFSET(java_objectarray, data[0]), REG_ITMP2, s1);
+ N_L(d, OFFSET(java_objectarray_t, data[0]), REG_ITMP2, s1);
emit_store_dst(jd, iptr, d);
break;
case ICMD_BASTORE: /* ..., arrayref, index, value ==> ... */
- s1 = emit_load_s1_notzero(jd, iptr, REG_ITMP1);
- s2 = emit_load_s2_notzero(jd, iptr, REG_ITMP2);
+ s1 = emit_load_s1(jd, iptr, REG_ITMP1);
+ s2 = emit_load_s2(jd, iptr, REG_ITMP2);
/* implicit null-pointer check */
emit_arrayindexoutofbounds_check(cd, iptr, s1, s2);
s3 = emit_load_s3(jd, iptr, REG_ITMP3);
- N_STC(s3, OFFSET(java_bytearray, data[0]), s2, s1);
+ N_STC(s3, OFFSET(java_bytearray_t, data[0]), s2, s1);
break;
case ICMD_CASTORE: /* ..., arrayref, index, value ==> ... */
- s1 = emit_load_s1_notzero(jd, iptr, REG_ITMP1);
+ s1 = emit_load_s1(jd, iptr, REG_ITMP1);
s2 = emit_load_s2(jd, iptr, REG_ITMP2);
/* implicit null-pointer check */
emit_arrayindexoutofbounds_check(cd, iptr, s1, s2);
M_INTMOVE(s2, REG_ITMP2);
M_SLL_IMM(1, REG_ITMP2);
- N_STH(s3, OFFSET(java_chararray, data[0]), REG_ITMP2, s1);
+ N_STH(s3, OFFSET(java_chararray_t, data[0]), REG_ITMP2, s1);
break;
case ICMD_SASTORE: /* ..., arrayref, index, value ==> ... */
- s1 = emit_load_s1_notzero(jd, iptr, REG_ITMP1);
+ s1 = emit_load_s1(jd, iptr, REG_ITMP1);
s2 = emit_load_s2(jd, iptr, REG_ITMP2);
/* implicit null-pointer check */
emit_arrayindexoutofbounds_check(cd, iptr, s1, s2);
M_INTMOVE(s2, REG_ITMP2);
M_SLL_IMM(1, REG_ITMP2);
- N_STH(s3, OFFSET(java_shortarray, data[0]), REG_ITMP2, s1);
+ N_STH(s3, OFFSET(java_shortarray_t, data[0]), REG_ITMP2, s1);
break;
case ICMD_IASTORE: /* ..., arrayref, index, value ==> ... */
- s1 = emit_load_s1_notzero(jd, iptr, REG_ITMP1);
+ s1 = emit_load_s1(jd, iptr, REG_ITMP1);
s2 = emit_load_s2(jd, iptr, REG_ITMP2);
/* implicit null-pointer check */
emit_arrayindexoutofbounds_check(cd, iptr, s1, s2);
M_INTMOVE(s2, REG_ITMP2);
M_SLL_IMM(2, REG_ITMP2);
- N_ST(s3, OFFSET(java_intarray, data[0]), REG_ITMP2, s1);
+ N_ST(s3, OFFSET(java_intarray_t, data[0]), REG_ITMP2, s1);
break;
case ICMD_LASTORE: /* ..., arrayref, index, value ==> ... */
- s1 = emit_load_s1_notzero(jd, iptr, REG_ITMP1);
+ s1 = emit_load_s1(jd, iptr, REG_ITMP1);
s2 = emit_load_s2(jd, iptr, REG_ITMP2);
/* implicit null-pointer check */
emit_arrayindexoutofbounds_check(cd, iptr, s1, s2);
M_SLL_IMM(3, REG_ITMP2);
s3 = emit_load_s3_high(jd, iptr, REG_ITMP3);
- N_ST(s3, OFFSET(java_intarray, data[0]), REG_ITMP2, s1);
+ N_ST(s3, OFFSET(java_intarray_t, data[0]), REG_ITMP2, s1);
s3 = emit_load_s3_low(jd, iptr, REG_ITMP3);
- N_ST(s3, OFFSET(java_intarray, data[0]) + 4, REG_ITMP2, s1);
+ N_ST(s3, OFFSET(java_intarray_t, data[0]) + 4, REG_ITMP2, s1);
break;
case ICMD_FASTORE: /* ..., arrayref, index, value ==> ... */
- s1 = emit_load_s1_notzero(jd, iptr, REG_ITMP1);
+ s1 = emit_load_s1(jd, iptr, REG_ITMP1);
s2 = emit_load_s2(jd, iptr, REG_ITMP2);
/* implicit null-pointer check */
emit_arrayindexoutofbounds_check(cd, iptr, s1, s2);
M_INTMOVE(s2, REG_ITMP2);
M_SLL_IMM(2, REG_ITMP2);
- N_STE(s3, OFFSET(java_floatarray, data[0]), REG_ITMP2, s1);
+ N_STE(s3, OFFSET(java_floatarray_t, data[0]), REG_ITMP2, s1);
break;
case ICMD_DASTORE: /* ..., arrayref, index, value ==> ... */
- s1 = emit_load_s1_notzero(jd, iptr, REG_ITMP1);
+ s1 = emit_load_s1(jd, iptr, REG_ITMP1);
s2 = emit_load_s2(jd, iptr, REG_ITMP2);
/* implicit null-pointer check */
emit_arrayindexoutofbounds_check(cd, iptr, s1, s2);
M_INTMOVE(s2, REG_ITMP2);
M_SLL_IMM(3, REG_ITMP2);
- N_STD(s3, OFFSET(java_doublearray, data[0]), REG_ITMP2, s1);
+ N_STD(s3, OFFSET(java_doublearray_t, data[0]), REG_ITMP2, s1);
break;
case ICMD_AASTORE: /* ..., arrayref, index, value ==> ... */
- s1 = emit_load_s1_notzero(jd, iptr, REG_A0);
+ s1 = emit_load_s1(jd, iptr, REG_A0);
s2 = emit_load_s2(jd, iptr, REG_ITMP2);
/* implicit null-pointer check */
emit_arrayindexoutofbounds_check(cd, iptr, s1, s2);
M_INTMOVE(s1, REG_A0);
M_INTMOVE(s3, REG_A1);
- disp = dseg_add_functionptr(cd, BUILTIN_canstore);
- M_ALD_DSEG(REG_ITMP3, disp);
+ disp = dseg_add_functionptr(cd, BUILTIN_FAST_canstore);
+ M_ALD_DSEG(REG_ITMP2, disp);
M_ASUB_IMM(96, REG_SP);
- M_JSR(REG_RA, REG_ITMP3);
+ M_JSR(REG_RA, REG_ITMP2);
M_AADD_IMM(96, REG_SP);
- emit_exception_check(cd, iptr);
+ emit_arraystore_check(cd, iptr);
s1 = emit_load_s1(jd, iptr, REG_ITMP1);
s2 = emit_load_s2(jd, iptr, REG_ITMP2);
M_INTMOVE(s2, REG_ITMP2);
M_SLL_IMM(2, REG_ITMP2);
- N_ST(s3, OFFSET(java_objectarray, data[0]), REG_ITMP2, s1);
+ N_ST(s3, OFFSET(java_objectarray_t, data[0]), REG_ITMP2, s1);
/*
M_SAADDQ(s2, s1, REG_ITMP1); itmp1 := 4 * s2 + s1
/* PROFILE_CYCLE_STOP; */
- codegen_add_patch_ref(cd, PATCHER_get_putstatic, uf, disp);
+ patcher_add_patch_ref(jd, PATCHER_get_putstatic, uf, disp);
/* PROFILE_CYCLE_START; */
}
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)) {
PROFILE_CYCLE_STOP;
- codegen_add_patch_ref(cd, PATCHER_clinit, fi->class, 0);
+ patcher_add_patch_ref(jd, PATCHER_initialize_class, fi->class, 0);
PROFILE_CYCLE_START;
}
fieldtype = uf->fieldref->parseddesc.fd->type;
disp = dseg_add_unique_address(cd, uf);
- codegen_addpatchref(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_addpatchref(cd, PATCHER_clinit,
- fi->class, disp);
+ if (!CLASS_IS_OR_ALMOST_INITIALIZED(fi->class)) {
+ PROFILE_CYCLE_STOP;
+ patcher_add_patch_ref(jd, PATCHER_initialize_class, fi->class, disp);
+ PROFILE_CYCLE_START;
+ }
}
M_ALD_DSEG(REG_ITMP1, disp);
case ICMD_GETFIELD: /* ... ==> ..., value */
- s1 = emit_load_s1_notzero(jd, iptr, REG_ITMP1);
+ s1 = emit_load_s1(jd, iptr, REG_ITMP1);
emit_nullpointer_check(cd, iptr, s1);
if (INSTRUCTION_IS_UNRESOLVED(iptr)) {
fieldtype = uf->fieldref->parseddesc.fd->type;
disp = 0;
- codegen_addpatchref(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;
{
u1 *ref;
- s1 = emit_load_s1_notzero(jd, iptr, REG_ITMP1);
+ s1 = emit_load_s1(jd, iptr, REG_ITMP1);
emit_nullpointer_check(cd, iptr, s1);
if (INSTRUCTION_IS_UNRESOLVED(iptr)) {
* We pass in the disp parameter, how many bytes
* to skip to the to the actual store.
*
- * XXX this relies on codegen_add_patch_ref internals
+ * XXX this relies on patcher_add_patch_ref internals
*/
if (INSTRUCTION_IS_UNRESOLVED(iptr)) {
- codegen_addpatchref(cd, PATCHER_get_putfield, uf, 0);
+ patcher_add_patch_ref(jd, PATCHER_get_putfield, uf, 0);
ref = cd->mcodeptr;
}
}
if (INSTRUCTION_IS_UNRESOLVED(iptr)) {
- cd->patchrefs->disp = (cd->mcodeptr - ref);
+ ((patchref_t *)list_first(jd->code->patchers))->disp = (cd->mcodeptr - ref);
}
switch (fieldtype) {
case ICMD_ATHROW: /* ..., objectref ==> ... (, objectref) */
- s1 = emit_load_s1(jd, iptr, REG_ITMP1);
- M_INTMOVE(s1, REG_ITMP1_XPTR);
-
- PROFILE_CYCLE_STOP;
+ /* PROFILE_CYCLE_STOP; */
+
+ s1 = emit_load_s1(jd, iptr, REG_ITMP3);
+ M_INTMOVE(s1, REG_ITMP3_XPTR);
#ifdef ENABLE_VERIFIER
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 */
disp = dseg_add_functionptr(cd, asm_handle_exception);
- M_ALD_DSEG(REG_ITMP2, disp);
- M_JMP(REG_ITMP2_XPC, REG_ITMP2);
+ M_ALD_DSEG(REG_ITMP1, disp);
+ M_JMP(REG_ITMP1_XPC, REG_ITMP1);
M_NOP;
break;
/* Compare addresses as 31 bit unsigned integers */
- s1 = emit_load_s1_notzero(jd, iptr, REG_ITMP1);
+ s1 = emit_load_s1(jd, iptr, REG_ITMP1);
M_LDA(REG_ITMP1, s1, 0);
- s2 = emit_load_s2_notzero(jd, iptr, REG_ITMP2);
+ s2 = emit_load_s2(jd, iptr, REG_ITMP2);
M_LDA(REG_ITMP2, s2, 0);
M_CMP(REG_ITMP1, REG_ITMP2);
assert(0);
}
-
if (out_ref != NULL) {
- *(u4 *)out_ref |= (u4)(cd->mcodeptr - out_ref) / 2;
+ N_BRC_BACK_PATCH(out_ref);
}
}
if (INSTRUCTION_IS_UNRESOLVED(iptr)) {
unresolved_class *uc = iptr->sx.s23.s2.uc;
- codegen_addpatchref(cd, PATCHER_athrow_areturn, uc, 0);
+ PROFILE_CYCLE_STOP;
+ patcher_add_patch_ref(jd, PATCHER_resolve_class, uc, 0);
+ PROFILE_CYCLE_START;
}
#endif /* ENABLE_VERIFIER */
goto nowperformreturn;
#endif /* !defined(NDEBUG) */
#if defined(ENABLE_THREADS)
- if (checksync && (m->flags & ACC_SYNCHRONIZED)) {
-
+ if (checksync && code_is_synchronized(code)) {
/* we need to save the proper return value */
switch (iptr->opc) {
case ICMD_LRETURN:
- M_IST(REG_RESULT2, REG_SP, rd->memuse * 4 + 8);
+ M_IST(REG_RESULT2, REG_SP, ((rd->memuse + 1) * 8) + 4);
/* fall through */
case ICMD_IRETURN:
case ICMD_ARETURN:
- M_IST(REG_RESULT , REG_SP, rd->memuse * 4 + 4);
+ M_IST(REG_RESULT , REG_SP, (rd->memuse + 1) * 8);
break;
case ICMD_FRETURN:
- M_FST(REG_FRESULT, REG_SP, rd->memuse * 4 + 4);
+ M_FST(REG_FRESULT, REG_SP, (rd->memuse + 1) * 8);
break;
case ICMD_DRETURN:
- M_DST(REG_FRESULT, REG_SP, rd->memuse * 4 + 4);
+ M_DST(REG_FRESULT, REG_SP, (rd->memuse + 1) * 8);
break;
}
- M_ALD(REG_A0, REG_SP, rd->memuse * 4);
+ M_ALD(REG_A0, REG_SP, rd->memuse * 8);
disp = dseg_add_functionptr(cd, LOCK_monitor_exit);
- M_ALD_DSEG(REG_ITMP3, disp);
+ M_ALD_DSEG(REG_ITMP2, disp);
M_ASUB_IMM(96, REG_SP);
- M_CALL(REG_ITMP3);
+ M_CALL(REG_ITMP2);
M_AADD_IMM(96, REG_SP);
/* and now restore the proper return value */
switch (iptr->opc) {
case ICMD_LRETURN:
- M_ILD(REG_RESULT2, REG_SP, rd->memuse * 4 + 8);
+ M_ILD(REG_RESULT2, REG_SP, ((rd->memuse + 1) * 8) + 4);
/* fall through */
case ICMD_IRETURN:
case ICMD_ARETURN:
- M_ILD(REG_RESULT , REG_SP, rd->memuse * 4 + 4);
+ M_ILD(REG_RESULT , REG_SP, (rd->memuse + 1) * 8);
break;
case ICMD_FRETURN:
- M_FLD(REG_FRESULT, REG_SP, rd->memuse * 4 + 4);
+ M_FLD(REG_FRESULT, REG_SP, (rd->memuse + 1) * 8);
break;
case ICMD_DRETURN:
- M_DLD(REG_FRESULT, REG_SP, rd->memuse * 4 + 4);
+ M_DLD(REG_FRESULT, REG_SP, (rd->memuse + 1) * 8);
break;
}
}
/* restore return address */
- p--; M_ALD(REG_RA, REG_SP, p * 4);
+ p--; M_ALD(REG_RA, REG_SP, p * 8);
/* restore saved registers */
for (i = INT_SAV_CNT - 1; i >= rd->savintreguse; i--) {
- p--; M_ILD(rd->savintregs[i], REG_SP, p * 4);
+ p--; M_ILD(rd->savintregs[i], REG_SP, p * 8);
}
for (i = FLT_SAV_CNT - 1; i >= rd->savfltreguse; i--) {
- p -= 2; M_DLD(rd->savfltregs[i], REG_SP, p * 4);
+ p--; M_DLD(rd->savfltregs[i], REG_SP, p * 8);
}
/* deallocate stack */
if (cd->stackframesize)
- M_AADD_IMM(cd->stackframesize * 4, REG_SP);
+ M_AADD_IMM(cd->stackframesize * 8, REG_SP);
+
+ /* generate method profiling code */
+
+ PROFILE_CYCLE_STOP;
M_RET;
- ALIGNCODENOP;
}
break;
}
}
+ /* generate method profiling code */
+
+ PROFILE_CYCLE_STOP;
+
switch (iptr->opc) {
case ICMD_BUILTIN:
- disp = dseg_add_functionptr(cd, bte->fp);
+ if (bte->stub == NULL) {
+ disp = dseg_add_functionptr(cd, bte->fp);
+ M_ASUB_IMM(96, REG_SP); /* register save area as required by C abi */
+ } else {
+ disp = dseg_add_functionptr(cd, bte->stub);
+ }
- M_ASUB_IMM(96, REG_SP); /* register save area as required by C abi */
if (N_VALID_DSEG_DISP(disp)) {
N_L(REG_PV, N_DSEG_DISP(disp), RN, REG_PV);
} else {
if (lm == NULL) {
disp = dseg_add_unique_address(cd, um);
- codegen_addpatchref(cd, PATCHER_invokestatic_special,
+ patcher_add_patch_ref(jd, PATCHER_invokestatic_special,
um, disp);
}
else
/* TODO softnull REG_A0 */
if (lm == NULL) {
- codegen_addpatchref(cd, PATCHER_invokevirtual, um, 0);
+ patcher_add_patch_ref(jd, PATCHER_invokevirtual, um, 0);
s1 = 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_PV, REG_METHODPTR, s1);
break;
* and -0xFFF in index register (itmp1)
*/
- N_LHI(REG_ITMP1, -N_DISP_MAX);
-
if (lm == NULL) {
- codegen_addpatchref(cd, PATCHER_invokeinterface, um, 0);
+ patcher_add_patch_ref(jd, PATCHER_invokeinterface, um, 0);
s1 = 0;
s2 = 0;
}
else {
s1 = OFFSET(vftbl_t, interfacetable[0]) -
- sizeof(methodptr*) * lm->class->index +
- N_DISP_MAX;
+ sizeof(methodptr*) * lm->clazz->index;
- s2 = sizeof(methodptr) * (lm - lm->class->methods);
+ s2 = sizeof(methodptr) * (lm - lm->clazz->methods);
}
/* Implicit null-pointer check */
- M_ALD(REG_METHODPTR, REG_A0, OFFSET(java_objectheader, vftbl));
- N_L(REG_METHODPTR, s1, REG_ITMP1, REG_METHODPTR);
+ M_ALD(REG_METHODPTR, REG_A0, OFFSET(java_object_t, vftbl));
+ N_LHI(REG_ITMP2, s1);
+ N_L(REG_METHODPTR, 0, REG_ITMP2, REG_METHODPTR);
M_ALD(REG_PV, REG_METHODPTR, s2);
break;
}
/* generate the actual call */
M_CALL(REG_PV);
- REPLACEMENT_POINT_INVOKE_RETURN(cd, iptr);
emit_restore_pv(cd);
-
+
/* post call finalization */
switch (iptr->opc) {
case ICMD_BUILTIN:
- M_AADD_IMM(96, REG_SP); /* remove C abi register save area */
- emit_exception_check(cd, iptr); /* check for exception */
+ if (bte->stub == NULL) {
+ M_AADD_IMM(96, REG_SP); /* remove C abi register save area */
+ }
break;
}
+ /* generate method profiling code */
+
+ PROFILE_CYCLE_START;
+
+ /* store size of call code in replacement point */
+
+ REPLACEMENT_POINT_INVOKE_RETURN(cd, iptr);
+
/* store return value */
d = md->returntype.type;
if ((super == NULL) || !(super->flags & ACC_INTERFACE))
CODEGEN_CRITICAL_SECTION_NEW;
- s1 = emit_load_s1_notzero(jd, iptr, REG_ITMP1);
+ s1 = emit_load_s1(jd, iptr, REG_ITMP1);
/* if class is not resolved, check which code to call */
disp = dseg_add_unique_s4(cd, 0); /* super->flags */
- codegen_add_patch_ref(cd, PATCHER_resolve_classref_to_flags,
+ patcher_add_patch_ref(jd, PATCHER_resolve_classref_to_flags,
iptr->sx.s23.s3.c.ref,
disp);
- ICONST(REG_ITMP2, ACC_INTERFACE);
+ ICONST(REG_ITMP3, ACC_INTERFACE);
+
if (N_VALID_DSEG_DISP(disp)) {
- N_N(REG_ITMP2, N_DSEG_DISP(disp), RN, REG_PV);
+ N_N(REG_ITMP3, N_DSEG_DISP(disp), RN, REG_PV);
} else {
- ICONST(REG_ITMP3, disp);
- N_N(REG_ITMP2, -N_PV_OFFSET, REG_ITMP3, REG_PV);
+ ICONST(REG_ITMP2, disp);
+ N_N(REG_ITMP3, -N_PV_OFFSET, REG_ITMP2, REG_PV);
}
emit_label_beq(cd, LABEL_CLASS);
}
if ((super == NULL) || (super->flags & ACC_INTERFACE)) {
if (super == NULL) {
- codegen_add_patch_ref(cd,
+ patcher_add_patch_ref(jd,
PATCHER_checkcast_instanceof_interface,
iptr->sx.s23.s3.c.ref,
0);
emit_label_beq(cd, LABEL_EXIT_INTERFACE_NULL);
}
- 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_ISUB_IMM(superindex, REG_ITMP3);
emit_classcast_check(cd, iptr, BRANCH_LE, RN, s1);
if (super == NULL) {
disp = dseg_add_unique_address(cd, NULL);
- codegen_add_patch_ref(cd,
+ patcher_add_patch_ref(jd,
PATCHER_resolve_classref_to_vftbl,
iptr->sx.s23.s3.c.ref,
disp);
emit_label_beq(cd, LABEL_EXIT_CLASS_NULL);
}
- M_ALD(REG_ITMP2, s1, OFFSET(java_objectheader, vftbl));
+#if 1
+ CODEGEN_CRITICAL_SECTION_START;
+
+ /* REG_ITMP3 := baseval(s1) */
+ M_ALD(REG_ITMP2, s1, OFFSET(java_object_t, vftbl));
+ M_ILD(REG_ITMP3, REG_ITMP2, OFFSET(vftbl_t, baseval));
+
+ /* REG_ITMP2 := baseval(class) */
+ M_ALD_DSEG(REG_ITMP2, disp);
+ M_ILD(REG_ITMP2, REG_ITMP2, OFFSET(vftbl_t, baseval));
+
+ /* REG_ITMP3 := REG_ITMP3 - REG_ITMP2 */
+ M_ISUB(REG_ITMP2, REG_ITMP3);
+
+ /* REG_ITMP2 := diffval(class) */
+ M_ALD_DSEG(REG_ITMP2, disp);
+ M_ILD(REG_ITMP2, REG_ITMP2, OFFSET(vftbl_t, diffval));
+
+ CODEGEN_CRITICAL_SECTION_END;
+
+ M_CMPU(REG_ITMP3, REG_ITMP2); /* Unsigned compare */
+
+ /* M_CMPULE(REG_ITMP2, REG_ITMP3, REG_ITMP3); itmp3 = (itmp2 <= itmp3) */
+ /* M_BEQZ(REG_ITMP3, 0); branch if (! itmp) -> branch if > */
+ /* Branch if greater then */
+#else
+ M_ALD(REG_ITMP2, s1, OFFSET(java_object_t, vftbl));
M_ALD_DSEG(REG_ITMP3, disp);
CODEGEN_CRITICAL_SECTION_START;
/* M_CMPULE(REG_ITMP2, REG_ITMP3, REG_ITMP3); itmp3 = (itmp2 <= itmp3) */
/* M_BEQZ(REG_ITMP3, 0); branch if (! itmp) -> branch if > */
/* Branch if greater then */
+#endif
emit_classcast_check(cd, iptr, BRANCH_GT, RN, s1);
}
if (INSTRUCTION_IS_UNRESOLVED(iptr)) {
disp = dseg_add_unique_address(cd, NULL);
- codegen_add_patch_ref(cd,
+ patcher_add_patch_ref(jd,
PATCHER_resolve_classref_to_classinfo,
iptr->sx.s23.s3.c.ref,
disp);
if ((super == NULL) || !(super->flags & ACC_INTERFACE))
CODEGEN_CRITICAL_SECTION_NEW;
- s1 = emit_load_s1_notzero(jd, iptr, REG_ITMP1);
+ s1 = emit_load_s1(jd, iptr, REG_ITMP1);
d = codegen_reg_of_dst(jd, iptr, REG_ITMP2);
if (s1 == d) {
M_MOV(s1, REG_ITMP1);
disp = dseg_add_unique_s4(cd, 0); /* super->flags */
- codegen_add_patch_ref(cd, PATCHER_resolve_classref_to_flags,
+ patcher_add_patch_ref(jd, PATCHER_resolve_classref_to_flags,
iptr->sx.s23.s3.c.ref, disp);
- ICONST(REG_ITMP2, ACC_INTERFACE);
+ ICONST(REG_ITMP3, ACC_INTERFACE);
if (N_VALID_DSEG_DISP(disp)) {
- N_N(REG_ITMP2, N_DSEG_DISP(disp), RN, REG_PV);
+ N_N(REG_ITMP3, N_DSEG_DISP(disp), RN, REG_PV);
} else {
- ICONST(REG_ITMP3, disp);
- N_N(REG_ITMP2, -N_PV_OFFSET, REG_ITMP3, REG_PV);
+ ICONST(REG_ITMP2, disp);
+ N_N(REG_ITMP3, -N_PV_OFFSET, REG_ITMP2, REG_PV);
}
emit_label_beq(cd, LABEL_CLASS);
if (d == REG_ITMP2)
M_CLR(d);
- codegen_add_patch_ref(cd,
+ patcher_add_patch_ref(jd,
PATCHER_checkcast_instanceof_interface,
iptr->sx.s23.s3.c.ref, 0);
}
emit_label_beq(cd, LABEL_EXIT_INTERFACE_NULL);
}
- 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_ISUB_IMM(superindex, REG_ITMP3);
if (super == NULL) {
disp = dseg_add_unique_address(cd, NULL);
- codegen_add_patch_ref(cd, PATCHER_resolve_classref_to_vftbl,
+ patcher_add_patch_ref(jd, PATCHER_resolve_classref_to_vftbl,
iptr->sx.s23.s3.c.ref,
disp);
}
emit_label_beq(cd, LABEL_EXIT_CLASS_NULL);
}
- M_ALD(REG_ITMP1, s1, OFFSET(java_objectheader, vftbl));
+ M_ALD(REG_ITMP1, s1, OFFSET(java_object_t, vftbl));
M_ALD_DSEG(REG_ITMP2, disp);
CODEGEN_CRITICAL_SECTION_START;
if (INSTRUCTION_IS_UNRESOLVED(iptr)) {
disp = dseg_add_unique_address(cd, 0);
- codegen_add_patch_ref(cd, PATCHER_resolve_classref_to_classinfo,
+ patcher_add_patch_ref(jd, PATCHER_resolve_classref_to_classinfo,
iptr->sx.s23.s3.c.ref,
disp);
}
} /* if (bptr -> flags >= BBREACHED) */
} /* for basic block */
- dseg_createlinenumbertable(cd);
-
/* generate stubs */
- emit_patcher_stubs(jd);
-#if 0
- emit_replacement_stubs(jd);
-#endif
+ emit_patcher_traps(jd);
/* everything's ok */
return true;
}
-
-/* codegen_emit_stub_compiler **************************************************
-
- Emits a stub routine which calls the compiler.
-
-*******************************************************************************/
-
-void codegen_emit_stub_compiler(jitdata *jd)
-{
- methodinfo *m;
- codegendata *cd;
-
- /* get required compiler data */
-
- m = jd->m;
- cd = jd->cd;
-
- /* code for the stub */
-
- /* don't touch ITMP3 as it cointains the return address */
-
- M_AADD_IMM(N_PV_OFFSET, REG_PV); /* suppress negative displacements */
-
- M_ILD_DSEG(REG_ITMP1, -2 * SIZEOF_VOID_P); /* methodinfo */
- /* TODO where is methodpointer loaded into itmp2? is it already inside? */
- M_ILD_DSEG(REG_PV, -3 * SIZEOF_VOID_P); /* compiler pointer */
- N_BR(REG_PV);
-}
-
-
/* codegen_emit_stub_native ****************************************************
Emits a stub routine which calls a native method.
SP after method entry
*/
-void codegen_emit_stub_native(jitdata *jd, methoddesc *nmd, functionptr f)
+void codegen_emit_stub_native(jitdata *jd, methoddesc *nmd, functionptr f, int skipparams)
{
- methodinfo *m;
- codeinfo *code;
- codegendata *cd;
- registerdata *rd;
- methoddesc *md;
- s4 nativeparams;
- s4 i, j; /* count variables */
- s4 t;
- s4 s1, s2;
- s4 disp;
+ methodinfo *m;
+ codeinfo *code;
+ codegendata *cd;
+ methoddesc *md;
+ int i, j;
+ int t;
+ int s1, s2;
+ int disp;
/* get required compiler data */
m = jd->m;
code = jd->code;
cd = jd->cd;
- rd = jd->rd;
- /* initialize variables */
+ /* set some variables */
md = m->parseddesc;
- nativeparams = (m->flags & ACC_STATIC) ? 2 : 1;
- /* calculate stack frame size */
+ /* calculate stackframe size */
- cd->stackframesize =
- 1 + /* r14 - return address */ +
- sizeof(stackframeinfo) / SIZEOF_VOID_P +
- sizeof(localref_table) / SIZEOF_VOID_P +
- 1 + /* itmp3 */
- (INT_ARG_CNT + FLT_ARG_CNT) * 2 +
- nmd->memuse + /* parameter passing */
- 96 / SIZEOF_VOID_P /* required by ABI */;
+ cd->stackframesize =
+ 1 + /* return address */
+ sizeof(stackframeinfo_t) / 8 +
+ sizeof(localref_table) / 8 +
+ nmd->paramcount +
+ nmd->memuse +
+ (96 / 8); /* linkage area */
- cd->stackframesize |= 0x1; /* keep stack 8-byte aligned */
+ /* keep stack 8-byte aligned */
+ /*ALIGN_2(cd->stackframesize);*/
/* create method header */
(void) dseg_add_unique_address(cd, code); /* CodeinfoPointer */
- (void) dseg_add_unique_s4(cd, cd->stackframesize * 4); /* FrameSize */
- (void) dseg_add_unique_s4(cd, 0); /* IsSync */
+ (void) dseg_add_unique_s4(cd, cd->stackframesize * 8); /* FrameSize */
(void) dseg_add_unique_s4(cd, 0); /* IsLeaf */
(void) dseg_add_unique_s4(cd, 0); /* IntSave */
(void) dseg_add_unique_s4(cd, 0); /* FltSave */
- (void) dseg_addlinenumbertablesize(cd);
- (void) dseg_add_unique_s4(cd, 0); /* ExTableSize */
-
- /* generate native method profiling code */
-#if 0
- if (JITDATA_HAS_FLAG_INSTRUMENT(jd)) {
- /* count frequency */
- M_MOV_IMM(code, REG_ITMP3);
- M_IINC_MEMBASE(REG_ITMP3, OFFSET(codeinfo, frequency));
- }
-#endif
-
- /* generate stub code */
+ /* generate code */
- N_AHI(REG_SP, -(cd->stackframesize * SIZEOF_VOID_P));
- N_AHI(REG_PV, N_PV_OFFSET);
-
- /* save return address */
+ M_ASUB_IMM(cd->stackframesize * 8, REG_SP);
+ M_AADD_IMM(N_PV_OFFSET, REG_PV);
- N_ST(R14, (cd->stackframesize - 1) * SIZEOF_VOID_P, RN, REG_SP);
+ /* store return address */
-#if !defined(NDEBUG)
- if (JITDATA_HAS_FLAG_VERBOSECALL(jd))
- emit_verbosecall_enter(jd);
-#endif
+ M_AST(REG_RA, REG_SP, (cd->stackframesize - 1) * 8);
- /* get function address (this must happen before the stackframeinfo) */
+#if defined(ENABLE_GC_CACAO)
+ /* Save callee saved integer registers in stackframeinfo (GC may
+ need to recover them during a collection). */
- disp = dseg_add_functionptr(cd, f);
+ disp = cd->stackframesize * 8 - sizeof(stackframeinfo_t) +
+ OFFSET(stackframeinfo_t, intregs);
-#if !defined(WITH_STATIC_CLASSPATH)
- if (f == NULL)
- codegen_add_patch_ref(cd, PATCHER_resolve_native, m, disp);
+ for (i = 0; i < INT_SAV_CNT; i++)
+ M_AST(abi_registers_integer_saved[i], REG_SP, disp + i * 4);
#endif
- M_ILD_DSEG(REG_ITMP1, disp);
-
- j = 96 + (nmd->memuse * 4);
-
- /* todo some arg registers are not volatile in C-abi terms */
-
/* save integer and float argument registers */
for (i = 0; i < md->paramcount; i++) {
- if (! md->params[i].inmemory) {
+ if (!md->params[i].inmemory) {
s1 = md->params[i].regoff;
- t = md->paramtypes[i].type;
- if (IS_INT_LNG_TYPE(t)) {
- if (IS_2_WORD_TYPE(t)) {
- /* todo store multiple */
- N_ST(GET_HIGH_REG(s1), j, RN, REG_SP);
- N_ST(GET_LOW_REG(s1), j + 4, RN, REG_SP);
- } else {
- N_ST(s1, j, RN, REG_SP);
- }
- } else {
- if (IS_2_WORD_TYPE(t)) {
- N_STD(s1, j, RN, REG_SP);
- } else {
- N_STE(s1, j, RN, REG_SP);
- }
+ switch (md->paramtypes[i].type) {
+ case TYPE_INT:
+ case TYPE_ADR:
+ M_IST(s1, REG_SP, 96 + i * 8);
+ break;
+ case TYPE_LNG:
+ M_LST(s1, REG_SP, 96 + i * 8);
+ break;
+ case TYPE_FLT:
+ case TYPE_DBL:
+ M_DST(s1, REG_SP, 96 + i * 8);
+ break;
}
-
- j += 8;
}
}
- N_ST(REG_ITMP1, j, RN, REG_SP);
-
- /* create dynamic stack info */
-
- N_LAE(REG_A0, (cd->stackframesize - 1) * 4, RN, REG_SP); /* datasp */
- N_LA(REG_A1, -N_PV_OFFSET, RN, REG_PV); /* pv */
- N_LAE(REG_A2, cd->stackframesize * 4, RN, REG_SP); /* old SP */
- N_L(REG_A3, (cd->stackframesize - 1) * 4, RN, REG_SP); /* return address */
+ /* create native stack info */
+ M_MOV(REG_SP, REG_A0);
+ M_LDA(REG_A1, REG_PV, -N_PV_OFFSET);
disp = dseg_add_functionptr(cd, codegen_start_native_call);
- M_ILD_DSEG(REG_ITMP1, disp);
+ M_ALD_DSEG(REG_ITMP2, disp);
+ M_CALL(REG_ITMP2);
- M_CALL(REG_ITMP1); /* call */
+ /* remember class argument */
- /* restore integer and float argument registers */
+ if (m->flags & ACC_STATIC)
+ M_MOV(REG_RESULT, REG_ITMP3);
- j = 96 + (nmd->memuse * 4);
+ /* restore integer and float argument registers */
for (i = 0; i < md->paramcount; i++) {
- if (! md->params[i].inmemory) {
+ if (!md->params[i].inmemory) {
s1 = md->params[i].regoff;
- t = md->paramtypes[i].type;
- if (IS_INT_LNG_TYPE(t)) {
- if (IS_2_WORD_TYPE(t)) {
- /* todo load multiple ! */
- N_L(GET_HIGH_REG(s1), j, RN, REG_SP);
- N_L(GET_LOW_REG(s1), j + 4, RN, REG_SP);
- } else {
- N_L(s1, j, RN, REG_SP);
- }
- } else {
- if (IS_2_WORD_TYPE(t)) {
- N_LD(s1, j, RN, REG_SP);
- } else {
- N_LE(s1, j, RN, REG_SP);
- }
+ switch (md->paramtypes[i].type) {
+ case TYPE_INT:
+ case TYPE_ADR:
+ M_ILD(s1, REG_SP, 96 + i * 8);
+ break;
+ case TYPE_LNG:
+ M_LLD(s1, REG_SP, 96 + i * 8);
+ break;
+ case TYPE_FLT:
+ case TYPE_DBL:
+ M_DLD(s1, REG_SP, 96 + i * 8);
+ break;
}
-
- j += 8;
}
}
- N_L(REG_ITMP1, j, RN, REG_SP);
-
/* copy or spill arguments to new locations */
- for (i = md->paramcount - 1, j = i + nativeparams; i >= 0; i--, j--) {
+ for (i = md->paramcount - 1, j = i + skipparams; i >= 0; i--, j--) {
t = md->paramtypes[i].type;
if (IS_INT_LNG_TYPE(t)) {
-
if (!md->params[i].inmemory) {
-
s1 = md->params[i].regoff;
+ s2 = nmd->params[j].regoff;
if (!nmd->params[j].inmemory) {
- s2 = nmd->params[j].regoff;
- if (IS_2_WORD_TYPE(t)) {
- N_LR(
- GET_LOW_REG(s2),
- GET_LOW_REG(s1)
- );
- N_LR(
- GET_HIGH_REG(s2),
- GET_HIGH_REG(s1)
- );
- } else {
- N_LR(
- s2,
- s1
- );
- }
- } else {
- s2 = nmd->params[j].regoff;
- if (IS_2_WORD_TYPE(t)) {
- N_STM(
- GET_HIGH_REG(s1),
- GET_LOW_REG(s1),
- 96 + s2, REG_SP
- );
- } else {
- N_ST(
- s1,
- 96 + s2, RN, REG_SP
- );
- }
+ if (IS_2_WORD_TYPE(t))
+ M_LNGMOVE(s1, s2);
+ else
+ M_INTMOVE(s1, s2);
}
-
- } else {
- s1 = cd->stackframesize * 4 + md->params[i].regoff;
+ else {
+ if (IS_2_WORD_TYPE(t))
+ M_LST(s1, REG_SP, s2);
+ else
+ M_IST(s1, REG_SP, s2);
+ }
+ }
+ else {
+ s1 = md->params[i].regoff + cd->stackframesize * 8;
s2 = nmd->params[j].regoff;
-
+
if (IS_2_WORD_TYPE(t)) {
- N_MVC(96 + s2, 8, REG_SP, s1, REG_SP);
+ N_MVC(s2, 8, REG_SP, s1, REG_SP);
} else {
- N_MVC(96 + s2, 4, REG_SP, s1, REG_SP);
+ N_MVC(s2, 4, REG_SP, s1, REG_SP);
}
}
-
- } else {
- /* We only copy spilled float arguments, as the float argument */
- /* registers keep unchanged. */
+ }
+ else {
+ /* We only copy spilled float arguments, as the float
+ argument registers keep unchanged. */
if (md->params[i].inmemory) {
- s1 = cd->stackframesize * 4 + md->params[i].regoff;
+ s1 = md->params[i].regoff + cd->stackframesize * 8;
s2 = nmd->params[j].regoff;
if (IS_2_WORD_TYPE(t)) {
- N_MVC(96 + s2, 8, REG_SP, s1, REG_SP);
+ N_MVC(s2, 8, REG_SP, s1, REG_SP);
} else {
- N_MVC(96 + s2, 4, REG_SP, s1, REG_SP);
+ N_MVC(s2, 4, REG_SP, s1, REG_SP);
}
}
}
}
- /* put class into second argument register */
+ /* Handle native Java methods. */
- if (m->flags & ACC_STATIC) {
- disp = dseg_add_address(cd, m->class);
- M_ILD_DSEG(REG_A1, disp);
- }
+ if (m->flags & ACC_NATIVE) {
+ /* put class into second argument register */
- /* put env into first argument register */
+ if (m->flags & ACC_STATIC)
+ M_MOV(REG_ITMP3, REG_A1);
- disp = dseg_add_address(cd, _Jv_env);
- M_ILD_DSEG(REG_A0, disp);
+ /* put env into first argument register */
- /* do the native function call */
+ disp = dseg_add_address(cd, _Jv_env);
+ M_ALD_DSEG(REG_A0, disp);
+ }
- M_CALL(REG_ITMP1); /* call */
+ /* Call native function. */
- /* save return value */
+ disp = dseg_add_functionptr(cd, f);
+ M_ALD_DSEG(REG_ITMP2, disp);
+ M_CALL(REG_ITMP2);
- t = md->returntype.type;
+ /* save return value */
- if (t != TYPE_VOID) {
- if (IS_INT_LNG_TYPE(t)) {
- if (IS_2_WORD_TYPE(t)) {
- N_STM(REG_RESULT, REG_RESULT2, 96, REG_SP);
- } else {
- N_ST(REG_RESULT, 96, RN, REG_SP);
- }
- } else {
- if (IS_2_WORD_TYPE(t)) {
- N_STD(REG_FRESULT, 96, RN, REG_SP);
- } else {
- N_STE(REG_FRESULT, 96, RN, REG_SP);
- }
- }
+ switch (md->returntype.type) {
+ case TYPE_INT:
+ case TYPE_ADR:
+ M_IST(REG_RESULT, REG_SP, 96);
+ break;
+ case TYPE_LNG:
+ M_LST(REG_RESULT_PACKED, REG_SP, 96);
+ break;
+ case TYPE_FLT:
+ case TYPE_DBL:
+ M_DST(REG_FRESULT, REG_SP, 96);
+ break;
+ case TYPE_VOID:
+ break;
}
-#if !defined(NDEBUG)
- if (JITDATA_HAS_FLAG_VERBOSECALL(jd))
- emit_verbosecall_exit(jd);
-#endif
-
/* remove native stackframe info */
- N_LAE(REG_A0, (cd->stackframesize - 1) * 4, RN, REG_SP); /* datasp */
+ M_MOV(REG_SP, REG_A0);
+ M_LDA(REG_A1, REG_PV, -N_PV_OFFSET);
disp = dseg_add_functionptr(cd, codegen_finish_native_call);
M_ALD_DSEG(REG_ITMP1, disp);
M_CALL(REG_ITMP1);
- N_LR(REG_ITMP3, REG_RESULT);
+
+ M_MOV(REG_RESULT, REG_ITMP3_XPTR);
/* restore return value */
- if (t != TYPE_VOID) {
- if (IS_INT_LNG_TYPE(t)) {
- if (IS_2_WORD_TYPE(t)) {
- N_LM(REG_RESULT, REG_RESULT2, 96, REG_SP);
- } else {
- N_L(REG_RESULT, 96, RN, REG_SP);
- }
- } else {
- if (IS_2_WORD_TYPE(t)) {
- N_LD(REG_FRESULT, 96, RN, REG_SP);
- } else {
- N_LE(REG_FRESULT, 96, RN, REG_SP);
- }
- }
+ switch (md->returntype.type) {
+ case TYPE_INT:
+ case TYPE_ADR:
+ M_ILD(REG_RESULT, REG_SP, 96);
+ break;
+ case TYPE_LNG:
+ M_LLD(REG_RESULT_PACKED, REG_SP, 96);
+ break;
+ case TYPE_FLT:
+ case TYPE_DBL:
+ M_DLD(REG_FRESULT, REG_SP, 96);
+ break;
+ case TYPE_VOID:
+ break;
}
+#if defined(ENABLE_GC_CACAO)
+ /* Restore callee saved integer registers from stackframeinfo (GC
+ might have modified them during a collection). */
+
+ disp = cd->stackframesize * 8 - sizeof(stackframeinfo_t) +
+ OFFSET(stackframeinfo_t, intregs);
+
+ for (i = 0; i < INT_SAV_CNT; i++)
+ M_ALD(abi_registers_integer_saved[i], REG_SP, disp + i * 4);
+#endif
+
/* load return address */
-
- N_L(REG_ITMP2, (cd->stackframesize - 1) * 4, RN, REG_SP);
- /* remove stackframe */
+ M_ALD(REG_RA, REG_SP, (cd->stackframesize - 1) * 8);
- N_AHI(REG_SP, cd->stackframesize * 4);
+ /* remove stackframe */
- /* test for exception */
+ M_AADD_IMM(cd->stackframesize * 8, REG_SP);
- N_LTR(REG_ITMP3, REG_ITMP3);
- N_BRC(DD_NE, SZ_BRC + SZ_BCR);
+ /* check for exception */
- /* return */
+ M_TEST(REG_ITMP3_XPTR);
+ M_BNE(SZ_BRC + SZ_BCR); /* if no exception then return */
- N_BCR(DD_ANY, REG_ITMP2);
+ M_RET;
/* handle exception */
- M_MOV(REG_ITMP3, REG_ITMP1_XPTR);
- M_MOV(REG_ITMP2, REG_ITMP2_XPC); /* get return address from stack */
-
-#if 0
- /* TODO */
- M_ASUB_IMM(3, REG_ITMP2_XPC); /* callq */
-#endif
+ M_MOV(REG_RA, REG_ITMP1_XPC);
+ M_ASUB_IMM(2, REG_ITMP1_XPC);
disp = dseg_add_functionptr(cd, asm_handle_nat_exception);
- M_ALD_DSEG(REG_ITMP3, disp);
- M_JMP(RN, REG_ITMP3);
-
- /* generate patcher stubs */
-
- emit_patcher_stubs(jd);
-}
-
-s4 codegen_reg_of_dst_notzero(jitdata *jd, instruction *iptr, s4 tempregnum) {
- codegendata *cd = jd->cd;
- s4 reg = codegen_reg_of_dst(jd, iptr, tempregnum);
- if (reg == 0) {
- M_MOV(reg, tempregnum);
- return tempregnum;
- } else {
- return reg;
- }
+ M_ALD_DSEG(REG_ITMP2, disp);
+ M_JMP(RN, REG_ITMP2);
}
/*