X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fvm%2Fjit%2Falpha%2Fcodegen.c;h=e52bb2c97d91664324b3c689917e4b3f0cdd3a63;hb=219e4a46e3d127d3c0883ee2e8635b4fe3c94d60;hp=8bad88babb74b2b259c394725687dd550bc53828;hpb=c3d788c69921791e47d443dfc7d0d66a871598c0;p=cacao.git diff --git a/src/vm/jit/alpha/codegen.c b/src/vm/jit/alpha/codegen.c index 8bad88bab..e52bb2c97 100644 --- a/src/vm/jit/alpha/codegen.c +++ b/src/vm/jit/alpha/codegen.c @@ -1,9 +1,7 @@ /* src/vm/jit/alpha/codegen.c - machine code generator for Alpha - 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. @@ -22,8 +20,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - $Id: codegen.c 7692 2007-04-12 14:47:24Z twisti $ - */ @@ -42,36 +38,39 @@ #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 "threads/lock-common.h" -#include "vm/builtin.h" -#include "vm/exceptions.h" +#include "vm/jit/builtin.hpp" +#include "vm/exceptions.hpp" #include "vm/global.h" -#include "vm/vm.h" +#include "vm/loader.hpp" +#include "vm/options.h" +#include "vm/vm.hpp" +#include "vm/jit/abi.h" #include "vm/jit/asmpart.h" -#include "vm/jit/codegen-common.h" +#include "vm/jit/codegen-common.hpp" #include "vm/jit/dseg.h" -#include "vm/jit/emit-common.h" -#include "vm/jit/jit.h" +#include "vm/jit/emit-common.hpp" +#include "vm/jit/jit.hpp" +#include "vm/jit/linenumbertable.h" #include "vm/jit/parse.h" -#include "vm/jit/patcher.h" +#include "vm/jit/patcher-common.hpp" #include "vm/jit/reg.h" -#include "vm/jit/replace.h" -#include "vm/jit/stacktrace.h" - -#if defined(ENABLE_LSRA) +#include "vm/jit/replace.hpp" +#include "vm/jit/stacktrace.hpp" +#include "vm/jit/trap.h" + +#if defined(ENABLE_SSA) +# include "vm/jit/optimizing/lsra.h" +# include "vm/jit/optimizing/ssa.h" +#elif defined(ENABLE_LSRA) # include "vm/jit/allocator/lsra.h" #endif -#include "vmcore/loader.h" -#include "vmcore/options.h" - /* codegen_emit **************************************************************** @@ -89,7 +88,6 @@ bool codegen_emit(jitdata *jd) varinfo *var; basicblock *bptr; instruction *iptr; - exception_entry *ex; u2 currentline; methodinfo *lm; /* local methodinfo for ICMD_INVOKE* */ unresolved_method *um; @@ -120,7 +118,7 @@ bool codegen_emit(jitdata *jd) s4 i, p, t, l; s4 savedregs_num; - savedregs_num = (jd->isleafmethod) ? 0 : 1; /* space to save the RA */ + savedregs_num = code_is_leafmethod(code) ? 0 : 1; /* space to save the RA */ /* space to save used callee saved registers */ @@ -130,7 +128,7 @@ bool codegen_emit(jitdata *jd) cd->stackframesize = rd->memuse + savedregs_num; #if defined(ENABLE_THREADS) /* space to save argument of monitor_enter */ - if (checksync && (m->flags & ACC_SYNCHRONIZED)) + if (checksync && code_is_synchronized(code)) cd->stackframesize++; #endif @@ -143,36 +141,18 @@ bool codegen_emit(jitdata *jd) (void) dseg_add_unique_address(cd, code); /* CodeinfoPointer */ (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) * 8); /* IsSync */ + code->synchronizedoffset = rd->memuse * 8; + + /* REMOVEME: We still need it for exception handling in assembler. */ + + if (code_is_leafmethod(code)) + (void) dseg_add_unique_s4(cd, 1); else -#endif - (void) dseg_add_unique_s4(cd, 0); /* IsSync */ + (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 */ - dseg_addlinenumbertablesize(cd); - - (void) dseg_add_unique_s4(cd, jd->exceptiontablelength); /* ExTableSize */ - - /* create exception table */ - - 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); - } - /* create stack frame (if necessary) */ if (cd->stackframesize) @@ -181,7 +161,7 @@ bool codegen_emit(jitdata *jd) /* save return address and used callee saved registers */ p = cd->stackframesize; - if (!jd->isleafmethod) { + if (!code_is_leafmethod(code)) { p--; M_AST(REG_RA, REG_SP, p * 8); } for (i = INT_SAV_CNT - 1; i >= rd->savintreguse; i--) { @@ -213,48 +193,38 @@ bool codegen_emit(jitdata *jd) if (IS_INT_LNG_TYPE(t)) { /* integer args */ if (!md->params[p].inmemory) { /* register arguments */ - s2 = rd->argintregs[s1]; - if (!IS_INMEMORY(var->flags)) { /* reg arg -> register */ - M_INTMOVE(s2, var->vv.regoff); - - } else { /* reg arg -> spilled */ - M_LST(s2, REG_SP, var->vv.regoff * 8); - } - - } else { /* stack arguments */ - if (!IS_INMEMORY(var->flags)) { /* stack arg -> register */ - M_LLD(var->vv.regoff, REG_SP, (cd->stackframesize + s1) *8); - - } else { /* stack arg -> spilled */ - var->vv.regoff = cd->stackframesize + s1; - } + if (!IS_INMEMORY(var->flags)) + M_INTMOVE(s1, var->vv.regoff); + else + M_LST(s1, REG_SP, var->vv.regoff); } - - } else { /* floating args */ + else { /* stack arguments */ + if (!IS_INMEMORY(var->flags)) + M_LLD(var->vv.regoff, REG_SP, cd->stackframesize * 8 + s1); + else + var->vv.regoff = cd->stackframesize * 8 + s1; + } + } + else { /* floating args */ if (!md->params[p].inmemory) { /* register arguments */ - s2 = rd->argfltregs[s1]; - if (!IS_INMEMORY(var->flags)) { /* reg arg -> register */ - M_FLTMOVE(s2, var->vv.regoff); - - } else { /* reg arg -> spilled */ - M_DST(s2, REG_SP, var->vv.regoff * 8); - } - - } else { /* stack arguments */ - if (!(var->flags & INMEMORY)) { /* stack-arg -> register */ - M_DLD(var->vv.regoff, REG_SP, (cd->stackframesize + s1) * 8); - - } else { /* stack-arg -> spilled */ - var->vv.regoff = cd->stackframesize + s1; - } + if (!IS_INMEMORY(var->flags)) + M_FLTMOVE(s1, var->vv.regoff); + else + M_DST(s1, REG_SP, var->vv.regoff * 8); + } + else { /* stack arguments */ + if (!(var->flags & INMEMORY)) + M_DLD(var->vv.regoff, REG_SP, cd->stackframesize * 8 + s1); + else + var->vv.regoff = cd->stackframesize * 8 + s1; } } - } /* end for */ + } /* call monitorenter function */ #if defined(ENABLE_THREADS) - if (checksync && (m->flags & ACC_SYNCHRONIZED)) { + if (checksync && code_is_synchronized(code)) { /* stack offset for monitor argument */ s1 = rd->memuse; @@ -264,10 +234,10 @@ bool codegen_emit(jitdata *jd) M_LDA(REG_SP, REG_SP, -(INT_ARG_CNT + FLT_ARG_CNT) * 8); for (p = 0; p < INT_ARG_CNT; p++) - M_LST(rd->argintregs[p], REG_SP, p * 8); + M_LST(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; } @@ -276,12 +246,12 @@ bool codegen_emit(jitdata *jd) /* 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(REG_A0, REG_PV, disp); } else { M_BNEZ(REG_A0, 1); - M_ALD_INTERN(REG_ZERO, REG_ZERO, EXCEPTION_HARDWARE_NULLPOINTER); + M_ALD_INTERN(REG_ZERO, REG_ZERO, TRAP_NullPointerException); } M_AST(REG_A0, REG_SP, s1 * 8); @@ -294,10 +264,10 @@ bool codegen_emit(jitdata *jd) #if !defined(NDEBUG) if (opt_verbosecall) { for (p = 0; p < INT_ARG_CNT; p++) - M_LLD(rd->argintregs[p], REG_SP, p * 8); + M_LLD(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); } @@ -379,7 +349,7 @@ bool codegen_emit(jitdata *jd) 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; } @@ -399,14 +369,14 @@ bool codegen_emit(jitdata *jd) case ICMD_INLINE_BODY: REPLACEMENT_POINT_INLINE_BODY(cd, iptr); - dseg_addlinenumber_inline_start(cd, iptr); - dseg_addlinenumber(cd, iptr->line); + linenumbertable_list_entry_add_inline_start(cd, iptr); + linenumbertable_list_entry_add(cd, iptr->line); break; case ICMD_INLINE_END: - dseg_addlinenumber_inline_end(cd, iptr); - dseg_addlinenumber(cd, iptr->line); + linenumbertable_list_entry_add_inline_end(cd, iptr); + linenumbertable_list_entry_add(cd, iptr->line); break; case ICMD_CHECKNULL: /* ..., objectref ==> ..., objectref */ @@ -461,7 +431,7 @@ bool codegen_emit(jitdata *jd) resolved the same class, the returned displacement of dseg_add_address is ok to use. */ - codegen_add_patch_ref(cd, PATCHER_resolve_classref_to_classinfo, + patcher_add_patch_ref(jd, PATCHER_resolve_classref_to_classinfo, cr, disp); M_ALD(d, REG_PV, disp); @@ -492,13 +462,13 @@ bool codegen_emit(jitdata *jd) 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; @@ -1304,7 +1274,7 @@ bool codegen_emit(jitdata *jd) case ICMD_L2F: s1 = emit_load_s1(jd, iptr, REG_ITMP1); d = codegen_reg_of_dst(jd, iptr, REG_FTMP3); - disp = dseg_add_unique_double(cd, 0.0); + disp = dseg_add_unique_double(cd, 0.0); /* FIXME Not thread safe! */ M_LST(s1, REG_PV, disp); M_DLD(d, REG_PV, disp); M_CVTLF(d, d); @@ -1315,7 +1285,7 @@ bool codegen_emit(jitdata *jd) case ICMD_L2D: s1 = emit_load_s1(jd, iptr, REG_ITMP1); d = codegen_reg_of_dst(jd, iptr, REG_FTMP3); - disp = dseg_add_unique_double(cd, 0.0); + disp = dseg_add_unique_double(cd, 0.0); /* FIXME Not thread safe! */ M_LST(s1, REG_PV, disp); M_DLD(d, REG_PV, disp); M_CVTLD(d, d); @@ -1326,7 +1296,7 @@ bool codegen_emit(jitdata *jd) case ICMD_D2I: s1 = emit_load_s1(jd, iptr, REG_FTMP1); d = codegen_reg_of_dst(jd, iptr, REG_ITMP3); - disp = dseg_add_unique_double(cd, 0.0); + disp = dseg_add_unique_double(cd, 0.0); /* FIXME Not thread safe! */ M_CVTDL_C(s1, REG_FTMP2); M_CVTLI(REG_FTMP2, REG_FTMP3); M_DST(REG_FTMP3, REG_PV, disp); @@ -1338,7 +1308,7 @@ bool codegen_emit(jitdata *jd) case ICMD_D2L: s1 = emit_load_s1(jd, iptr, REG_FTMP1); d = codegen_reg_of_dst(jd, iptr, REG_ITMP3); - disp = dseg_add_unique_double(cd, 0.0); + disp = dseg_add_unique_double(cd, 0.0); /* FIXME Not thread safe! */ M_CVTDL_C(s1, REG_FTMP2); M_DST(REG_FTMP2, REG_PV, disp); M_LLD(d, REG_PV, disp); @@ -1429,7 +1399,7 @@ bool codegen_emit(jitdata *jd) 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; @@ -1442,13 +1412,13 @@ bool codegen_emit(jitdata *jd) emit_arrayindexoutofbounds_check(cd, iptr, s1, s2); if (has_ext_instr_set) { M_LADD(s2, s1, REG_ITMP1); - M_BLDU(d, REG_ITMP1, OFFSET (java_bytearray, data[0])); + M_BLDU(d, REG_ITMP1, OFFSET (java_bytearray_t, data[0])); M_BSEXT(d, d); } else { M_LADD(s2, s1, REG_ITMP1); - M_LLD_U(REG_ITMP2, REG_ITMP1, OFFSET(java_bytearray, data[0])); - M_LDA(REG_ITMP1, REG_ITMP1, OFFSET(java_bytearray, data[0])+1); + M_LLD_U(REG_ITMP2, REG_ITMP1, OFFSET(java_bytearray_t, data[0])); + M_LDA(REG_ITMP1, REG_ITMP1, OFFSET(java_bytearray_t, data[0])+1); M_EXTQH(REG_ITMP2, REG_ITMP1, d); M_SRA_IMM(d, 56, d); } @@ -1465,13 +1435,13 @@ bool codegen_emit(jitdata *jd) if (has_ext_instr_set) { M_LADD(s2, s1, REG_ITMP1); M_LADD(s2, REG_ITMP1, REG_ITMP1); - M_SLDU(d, REG_ITMP1, OFFSET(java_chararray, data[0])); + M_SLDU(d, REG_ITMP1, OFFSET(java_chararray_t, data[0])); } else { M_LADD (s2, s1, REG_ITMP1); M_LADD (s2, REG_ITMP1, REG_ITMP1); - M_LLD_U(REG_ITMP2, REG_ITMP1, OFFSET(java_chararray, data[0])); - M_LDA (REG_ITMP1, REG_ITMP1, OFFSET(java_chararray, data[0])); + M_LLD_U(REG_ITMP2, REG_ITMP1, OFFSET(java_chararray_t, data[0])); + M_LDA (REG_ITMP1, REG_ITMP1, OFFSET(java_chararray_t, data[0])); M_EXTWL(REG_ITMP2, REG_ITMP1, d); } emit_store_dst(jd, iptr, d); @@ -1487,13 +1457,13 @@ bool codegen_emit(jitdata *jd) if (has_ext_instr_set) { M_LADD(s2, s1, REG_ITMP1); M_LADD(s2, REG_ITMP1, REG_ITMP1); - M_SLDU( d, REG_ITMP1, OFFSET (java_shortarray, data[0])); + M_SLDU( d, REG_ITMP1, OFFSET (java_shortarray_t, data[0])); M_SSEXT(d, d); } else { M_LADD(s2, s1, REG_ITMP1); M_LADD(s2, REG_ITMP1, REG_ITMP1); - M_LLD_U(REG_ITMP2, REG_ITMP1, OFFSET(java_shortarray, data[0])); - M_LDA(REG_ITMP1, REG_ITMP1, OFFSET(java_shortarray, data[0])+2); + M_LLD_U(REG_ITMP2, REG_ITMP1, OFFSET(java_shortarray_t, data[0])); + M_LDA(REG_ITMP1, REG_ITMP1, OFFSET(java_shortarray_t, data[0])+2); M_EXTQH(REG_ITMP2, REG_ITMP1, d); M_SRA_IMM(d, 48, d); } @@ -1508,7 +1478,7 @@ bool codegen_emit(jitdata *jd) /* implicit null-pointer check */ emit_arrayindexoutofbounds_check(cd, iptr, s1, s2); M_S4ADDQ(s2, s1, REG_ITMP1); - M_ILD(d, REG_ITMP1, OFFSET(java_intarray, data[0])); + M_ILD(d, REG_ITMP1, OFFSET(java_intarray_t, data[0])); emit_store_dst(jd, iptr, d); break; @@ -1520,7 +1490,7 @@ bool codegen_emit(jitdata *jd) /* implicit null-pointer check */ emit_arrayindexoutofbounds_check(cd, iptr, s1, s2); M_S8ADDQ(s2, s1, REG_ITMP1); - M_LLD(d, REG_ITMP1, OFFSET(java_longarray, data[0])); + M_LLD(d, REG_ITMP1, OFFSET(java_longarray_t, data[0])); emit_store_dst(jd, iptr, d); break; @@ -1532,7 +1502,7 @@ bool codegen_emit(jitdata *jd) /* implicit null-pointer check */ emit_arrayindexoutofbounds_check(cd, iptr, s1, s2); M_S4ADDQ(s2, s1, REG_ITMP1); - M_FLD(d, REG_ITMP1, OFFSET(java_floatarray, data[0])); + M_FLD(d, REG_ITMP1, OFFSET(java_floatarray_t, data[0])); emit_store_dst(jd, iptr, d); break; @@ -1544,7 +1514,7 @@ bool codegen_emit(jitdata *jd) /* implicit null-pointer check */ emit_arrayindexoutofbounds_check(cd, iptr, s1, s2); M_S8ADDQ(s2, s1, REG_ITMP1); - M_DLD(d, REG_ITMP1, OFFSET(java_doublearray, data[0])); + M_DLD(d, REG_ITMP1, OFFSET(java_doublearray_t, data[0])); emit_store_dst(jd, iptr, d); break; @@ -1556,7 +1526,7 @@ bool codegen_emit(jitdata *jd) /* implicit null-pointer check */ emit_arrayindexoutofbounds_check(cd, iptr, s1, s2); M_SAADDQ(s2, s1, REG_ITMP1); - M_ALD(d, REG_ITMP1, OFFSET(java_objectarray, data[0])); + M_ALD(d, REG_ITMP1, OFFSET(java_objectarray_t, data[0])); emit_store_dst(jd, iptr, d); break; @@ -1570,12 +1540,12 @@ bool codegen_emit(jitdata *jd) s3 = emit_load_s3(jd, iptr, REG_ITMP3); if (has_ext_instr_set) { M_LADD(s2, s1, REG_ITMP1); - M_BST(s3, REG_ITMP1, OFFSET(java_bytearray, data[0])); + M_BST(s3, REG_ITMP1, OFFSET(java_bytearray_t, data[0])); } else { M_LADD(s2, s1, REG_ITMP1); - M_LLD_U(REG_ITMP2, REG_ITMP1, OFFSET(java_bytearray, data[0])); - M_LDA(REG_ITMP1, REG_ITMP1, OFFSET(java_bytearray, data[0])); + M_LLD_U(REG_ITMP2, REG_ITMP1, OFFSET(java_bytearray_t, data[0])); + M_LDA(REG_ITMP1, REG_ITMP1, OFFSET(java_bytearray_t, data[0])); M_INSBL(s3, REG_ITMP1, REG_ITMP3); M_MSKBL(REG_ITMP2, REG_ITMP1, REG_ITMP2); M_OR(REG_ITMP2, REG_ITMP3, REG_ITMP2); @@ -1593,13 +1563,13 @@ bool codegen_emit(jitdata *jd) if (has_ext_instr_set) { M_LADD(s2, s1, REG_ITMP1); M_LADD(s2, REG_ITMP1, REG_ITMP1); - M_SST(s3, REG_ITMP1, OFFSET(java_chararray, data[0])); + M_SST(s3, REG_ITMP1, OFFSET(java_chararray_t, data[0])); } else { M_LADD(s2, s1, REG_ITMP1); M_LADD(s2, REG_ITMP1, REG_ITMP1); - M_LLD_U(REG_ITMP2, REG_ITMP1, OFFSET(java_chararray, data[0])); - M_LDA(REG_ITMP1, REG_ITMP1, OFFSET(java_chararray, data[0])); + M_LLD_U(REG_ITMP2, REG_ITMP1, OFFSET(java_chararray_t, data[0])); + M_LDA(REG_ITMP1, REG_ITMP1, OFFSET(java_chararray_t, data[0])); M_INSWL(s3, REG_ITMP1, REG_ITMP3); M_MSKWL(REG_ITMP2, REG_ITMP1, REG_ITMP2); M_OR(REG_ITMP2, REG_ITMP3, REG_ITMP2); @@ -1617,13 +1587,13 @@ bool codegen_emit(jitdata *jd) if (has_ext_instr_set) { M_LADD(s2, s1, REG_ITMP1); M_LADD(s2, REG_ITMP1, REG_ITMP1); - M_SST(s3, REG_ITMP1, OFFSET(java_shortarray, data[0])); + M_SST(s3, REG_ITMP1, OFFSET(java_shortarray_t, data[0])); } else { M_LADD(s2, s1, REG_ITMP1); M_LADD(s2, REG_ITMP1, REG_ITMP1); - M_LLD_U(REG_ITMP2, REG_ITMP1, OFFSET(java_shortarray, data[0])); - M_LDA(REG_ITMP1, REG_ITMP1, OFFSET(java_shortarray, data[0])); + M_LLD_U(REG_ITMP2, REG_ITMP1, OFFSET(java_shortarray_t, data[0])); + M_LDA(REG_ITMP1, REG_ITMP1, OFFSET(java_shortarray_t, data[0])); M_INSWL(s3, REG_ITMP1, REG_ITMP3); M_MSKWL(REG_ITMP2, REG_ITMP1, REG_ITMP2); M_OR(REG_ITMP2, REG_ITMP3, REG_ITMP2); @@ -1639,7 +1609,7 @@ bool codegen_emit(jitdata *jd) emit_arrayindexoutofbounds_check(cd, iptr, s1, s2); s3 = emit_load_s3(jd, iptr, REG_ITMP3); M_S4ADDQ(s2, s1, REG_ITMP1); - M_IST(s3, REG_ITMP1, OFFSET(java_intarray, data[0])); + M_IST(s3, REG_ITMP1, OFFSET(java_intarray_t, data[0])); break; case ICMD_LASTORE: /* ..., arrayref, index, value ==> ... */ @@ -1650,7 +1620,7 @@ bool codegen_emit(jitdata *jd) emit_arrayindexoutofbounds_check(cd, iptr, s1, s2); s3 = emit_load_s3(jd, iptr, REG_ITMP3); M_S8ADDQ(s2, s1, REG_ITMP1); - M_LST(s3, REG_ITMP1, OFFSET(java_longarray, data[0])); + M_LST(s3, REG_ITMP1, OFFSET(java_longarray_t, data[0])); break; case ICMD_FASTORE: /* ..., arrayref, index, value ==> ... */ @@ -1661,7 +1631,7 @@ bool codegen_emit(jitdata *jd) emit_arrayindexoutofbounds_check(cd, iptr, s1, s2); s3 = emit_load_s3(jd, iptr, REG_FTMP3); M_S4ADDQ(s2, s1, REG_ITMP1); - M_FST(s3, REG_ITMP1, OFFSET(java_floatarray, data[0])); + M_FST(s3, REG_ITMP1, OFFSET(java_floatarray_t, data[0])); break; case ICMD_DASTORE: /* ..., arrayref, index, value ==> ... */ @@ -1672,7 +1642,7 @@ bool codegen_emit(jitdata *jd) emit_arrayindexoutofbounds_check(cd, iptr, s1, s2); s3 = emit_load_s3(jd, iptr, REG_FTMP3); M_S8ADDQ(s2, s1, REG_ITMP1); - M_DST(s3, REG_ITMP1, OFFSET(java_doublearray, data[0])); + M_DST(s3, REG_ITMP1, OFFSET(java_doublearray_t, data[0])); break; case ICMD_AASTORE: /* ..., arrayref, index, value ==> ... */ @@ -1686,18 +1656,18 @@ bool codegen_emit(jitdata *jd) M_INTMOVE(s1, REG_A0); M_INTMOVE(s3, REG_A1); - disp = dseg_add_functionptr(cd, BUILTIN_canstore); + disp = dseg_add_functionptr(cd, BUILTIN_FAST_canstore); M_ALD(REG_PV, REG_PV, disp); M_JSR(REG_RA, REG_PV); disp = (s4) (cd->mcodeptr - cd->mcodebase); M_LDA(REG_PV, REG_RA, -disp); - 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); s3 = emit_load_s3(jd, iptr, REG_ITMP3); M_SAADDQ(s2, s1, REG_ITMP1); - M_AST(s3, REG_ITMP1, OFFSET(java_objectarray, data[0])); + M_AST(s3, REG_ITMP1, OFFSET(java_objectarray_t, data[0])); break; @@ -1709,12 +1679,12 @@ bool codegen_emit(jitdata *jd) emit_arrayindexoutofbounds_check(cd, iptr, s1, s2); if (has_ext_instr_set) { M_LADD(s2, s1, REG_ITMP1); - M_BST(REG_ZERO, REG_ITMP1, OFFSET(java_bytearray, data[0])); + M_BST(REG_ZERO, REG_ITMP1, OFFSET(java_bytearray_t, data[0])); } else { M_LADD(s2, s1, REG_ITMP1); - M_LLD_U(REG_ITMP2, REG_ITMP1, OFFSET(java_bytearray, data[0])); - M_LDA(REG_ITMP1, REG_ITMP1, OFFSET(java_bytearray, data[0])); + M_LLD_U(REG_ITMP2, REG_ITMP1, OFFSET(java_bytearray_t, data[0])); + M_LDA(REG_ITMP1, REG_ITMP1, OFFSET(java_bytearray_t, data[0])); M_INSBL(REG_ZERO, REG_ITMP1, REG_ITMP3); M_MSKBL(REG_ITMP2, REG_ITMP1, REG_ITMP2); M_OR(REG_ITMP2, REG_ITMP3, REG_ITMP2); @@ -1731,13 +1701,13 @@ bool codegen_emit(jitdata *jd) if (has_ext_instr_set) { M_LADD(s2, s1, REG_ITMP1); M_LADD(s2, REG_ITMP1, REG_ITMP1); - M_SST(REG_ZERO, REG_ITMP1, OFFSET(java_chararray, data[0])); + M_SST(REG_ZERO, REG_ITMP1, OFFSET(java_chararray_t, data[0])); } else { M_LADD(s2, s1, REG_ITMP1); M_LADD(s2, REG_ITMP1, REG_ITMP1); - M_LLD_U(REG_ITMP2, REG_ITMP1, OFFSET(java_chararray, data[0])); - M_LDA(REG_ITMP1, REG_ITMP1, OFFSET(java_chararray, data[0])); + M_LLD_U(REG_ITMP2, REG_ITMP1, OFFSET(java_chararray_t, data[0])); + M_LDA(REG_ITMP1, REG_ITMP1, OFFSET(java_chararray_t, data[0])); M_INSWL(REG_ZERO, REG_ITMP1, REG_ITMP3); M_MSKWL(REG_ITMP2, REG_ITMP1, REG_ITMP2); M_OR(REG_ITMP2, REG_ITMP3, REG_ITMP2); @@ -1754,13 +1724,13 @@ bool codegen_emit(jitdata *jd) if (has_ext_instr_set) { M_LADD(s2, s1, REG_ITMP1); M_LADD(s2, REG_ITMP1, REG_ITMP1); - M_SST(REG_ZERO, REG_ITMP1, OFFSET(java_shortarray, data[0])); + M_SST(REG_ZERO, REG_ITMP1, OFFSET(java_shortarray_t, data[0])); } else { M_LADD(s2, s1, REG_ITMP1); M_LADD(s2, REG_ITMP1, REG_ITMP1); - M_LLD_U(REG_ITMP2, REG_ITMP1, OFFSET(java_shortarray, data[0])); - M_LDA(REG_ITMP1, REG_ITMP1, OFFSET(java_shortarray, data[0])); + M_LLD_U(REG_ITMP2, REG_ITMP1, OFFSET(java_shortarray_t, data[0])); + M_LDA(REG_ITMP1, REG_ITMP1, OFFSET(java_shortarray_t, data[0])); M_INSWL(REG_ZERO, REG_ITMP1, REG_ITMP3); M_MSKWL(REG_ITMP2, REG_ITMP1, REG_ITMP2); M_OR(REG_ITMP2, REG_ITMP3, REG_ITMP2); @@ -1775,7 +1745,7 @@ bool codegen_emit(jitdata *jd) /* implicit null-pointer check */ emit_arrayindexoutofbounds_check(cd, iptr, s1, s2); M_S4ADDQ(s2, s1, REG_ITMP1); - M_IST(REG_ZERO, REG_ITMP1, OFFSET(java_intarray, data[0])); + M_IST(REG_ZERO, REG_ITMP1, OFFSET(java_intarray_t, data[0])); break; case ICMD_LASTORECONST: /* ..., arrayref, index ==> ... */ @@ -1785,7 +1755,7 @@ bool codegen_emit(jitdata *jd) /* implicit null-pointer check */ emit_arrayindexoutofbounds_check(cd, iptr, s1, s2); M_S8ADDQ(s2, s1, REG_ITMP1); - M_LST(REG_ZERO, REG_ITMP1, OFFSET(java_longarray, data[0])); + M_LST(REG_ZERO, REG_ITMP1, OFFSET(java_longarray_t, data[0])); break; case ICMD_AASTORECONST: /* ..., arrayref, index ==> ... */ @@ -1795,7 +1765,7 @@ bool codegen_emit(jitdata *jd) /* implicit null-pointer check */ emit_arrayindexoutofbounds_check(cd, iptr, s1, s2); M_SAADDQ(s2, s1, REG_ITMP1); - M_AST(REG_ZERO, REG_ITMP1, OFFSET(java_objectarray, data[0])); + M_AST(REG_ZERO, REG_ITMP1, OFFSET(java_objectarray_t, data[0])); break; @@ -1806,15 +1776,15 @@ bool codegen_emit(jitdata *jd) 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_initialize_class, fi->class, + if (!CLASS_IS_OR_ALMOST_INITIALIZED(fi->clazz)) + patcher_add_patch_ref(jd, PATCHER_initialize_class, fi->clazz, 0); } @@ -1851,15 +1821,15 @@ bool codegen_emit(jitdata *jd) 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_initialize_class, fi->class, + if (!CLASS_IS_OR_ALMOST_INITIALIZED(fi->clazz)) + patcher_add_patch_ref(jd, PATCHER_initialize_class, fi->clazz, 0); } @@ -1897,15 +1867,15 @@ bool codegen_emit(jitdata *jd) 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_initialize_class, fi->class, + if (!CLASS_IS_OR_ALMOST_INITIALIZED(fi->clazz)) + patcher_add_patch_ref(jd, PATCHER_initialize_class, fi->clazz, 0); } @@ -1939,7 +1909,7 @@ bool codegen_emit(jitdata *jd) 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; @@ -1995,7 +1965,7 @@ bool codegen_emit(jitdata *jd) s2 = emit_load_s2(jd, iptr, REG_FTMP2); 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); /* implicit null-pointer check */ switch (fieldtype) { @@ -2028,7 +1998,7 @@ bool codegen_emit(jitdata *jd) 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; @@ -2068,7 +2038,7 @@ bool codegen_emit(jitdata *jd) if (INSTRUCTION_IS_UNRESOLVED(iptr)) { unresolved_class *uc = iptr->sx.s23.s2.uc; - codegen_add_patch_ref(cd, PATCHER_resolve_class, uc, 0); + patcher_add_patch_ref(jd, PATCHER_resolve_class, uc, 0); } #endif /* ENABLE_VERIFIER */ @@ -2367,7 +2337,7 @@ bool codegen_emit(jitdata *jd) if (INSTRUCTION_IS_UNRESOLVED(iptr)) { unresolved_class *uc = iptr->sx.s23.s2.uc; - codegen_add_patch_ref(cd, PATCHER_resolve_class, uc, 0); + patcher_add_patch_ref(jd, PATCHER_resolve_class, uc, 0); } #endif /* ENABLE_VERIFIER */ goto nowperformreturn; @@ -2398,7 +2368,7 @@ nowperformreturn: #endif #if defined(ENABLE_THREADS) - if (checksync && (m->flags & ACC_SYNCHRONIZED)) { + if (checksync && code_is_synchronized(code)) { M_ALD(REG_A0, REG_SP, rd->memuse * 8); switch (iptr->opc) { @@ -2435,7 +2405,7 @@ nowperformreturn: /* restore return address */ - if (!jd->isleafmethod) { + if (!code_is_leafmethod(code)) { p--; M_LLD(REG_RA, REG_SP, p * 8); } @@ -2548,6 +2518,8 @@ nowperformreturn: case ICMD_BUILTIN: /* ..., arg1, arg2, arg3 ==> ... */ + REPLACEMENT_POINT_FORGC_BUILTIN(cd, iptr); + bte = iptr->sx.s23.s3.bte; md = bte->md; goto gen_method; @@ -2580,49 +2552,50 @@ gen_method: for (s3 = s3 - 1; s3 >= 0; s3--) { var = VAR(iptr->sx.s23.s2.args[s3]); + d = md->params[s3].regoff; + + /* already preallocated (ARGVAR)? */ - /* Already Preallocated (ARGVAR) ? */ if (var->flags & PREALLOC) continue; if (IS_INT_LNG_TYPE(var->type)) { 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) { - s1 = rd->argfltregs[md->params[s3].regoff]; - d = emit_load(jd, iptr, var, s1); - M_FLTMOVE(d, s1); + s1 = emit_load(jd, iptr, var, d); + M_FLTMOVE(s1, d); } else { - d = emit_load(jd, iptr, var, REG_FTMP1); - M_DST(d, REG_SP, md->params[s3].regoff * 8); + s1 = emit_load(jd, iptr, var, REG_FTMP1); + M_DST(s1, REG_SP, d); } } } switch (iptr->opc) { case ICMD_BUILTIN: - disp = dseg_add_functionptr(cd, bte->fp); + if (bte->stub == NULL) + disp = dseg_add_functionptr(cd, bte->fp); + else + disp = dseg_add_functionptr(cd, bte->stub); M_ALD(REG_PV, REG_PV, disp); /* Pointer to built-in-function */ /* generate the actual call */ M_JSR(REG_RA, REG_PV); - REPLACEMENT_POINT_INVOKE_RETURN(cd, iptr); + REPLACEMENT_POINT_FORGC_BUILTIN_RETURN(cd, iptr); disp = (s4) (cd->mcodeptr - cd->mcodebase); M_LDA(REG_PV, REG_RA, -disp); - - emit_exception_check(cd, iptr); break; case ICMD_INVOKESPECIAL: @@ -2633,7 +2606,7 @@ gen_method: if (lm == NULL) { disp = dseg_add_unique_address(cd, um); - codegen_add_patch_ref(cd, PATCHER_invokestatic_special, + patcher_add_patch_ref(jd, PATCHER_invokestatic_special, um, disp); } else @@ -2651,7 +2624,7 @@ gen_method: case ICMD_INVOKEVIRTUAL: if (lm == NULL) { - codegen_add_patch_ref(cd, PATCHER_invokevirtual, um, 0); + patcher_add_patch_ref(jd, PATCHER_invokevirtual, um, 0); s1 = 0; } @@ -2660,7 +2633,7 @@ gen_method: 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 */ @@ -2673,20 +2646,20 @@ gen_method: case ICMD_INVOKEINTERFACE: 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; } else { s1 = OFFSET(vftbl_t, interfacetable[0]) - - sizeof(methodptr*) * lm->class->index; + 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)); + 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); @@ -2719,42 +2692,21 @@ gen_method: 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->diffval)); - */ - if (!(iptr->flags.bits & INS_FLAG_ARRAY)) { /* object type cast-check */ classinfo *super; - vftbl_t *supervftbl; s4 superindex; if (INSTRUCTION_IS_UNRESOLVED(iptr)) { - super = NULL; + super = NULL; superindex = 0; - supervftbl = NULL; } else { - super = iptr->sx.s23.s3.c.cls; + super = iptr->sx.s23.s3.c.cls; superindex = super->index; - supervftbl = super->vftbl; } -#if defined(ENABLE_THREADS) - codegen_threadcritrestart(cd, cd->mcodeptr - cd->mcodebase); -#endif s1 = emit_load_s1(jd, iptr, REG_ITMP1); /* if class is not resolved, check which code to call */ @@ -2764,7 +2716,7 @@ gen_method: 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); @@ -2779,7 +2731,7 @@ gen_method: if ((super == NULL) || (super->flags & ACC_INTERFACE)) { if (super == NULL) { - codegen_add_patch_ref(cd, + patcher_add_patch_ref(jd, PATCHER_checkcast_interface, iptr->sx.s23.s3.c.ref, 0); @@ -2787,7 +2739,7 @@ gen_method: 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_LDA(REG_ITMP3, REG_ITMP3, -superindex); @@ -2812,42 +2764,63 @@ gen_method: 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); } else { - disp = dseg_add_address(cd, supervftbl); + disp = dseg_add_address(cd, super->vftbl); emit_label_beqz(cd, BRANCH_LABEL_5, s1); } - M_ALD(REG_ITMP2, s1, OFFSET(java_objectheader, vftbl)); - M_ALD(REG_ITMP3, REG_PV, disp); -#if defined(ENABLE_THREADS) - codegen_threadcritstart(cd, cd->mcodeptr - cd->mcodebase); -#endif - M_ILD(REG_ITMP2, REG_ITMP2, OFFSET(vftbl_t, baseval)); - /* if (s1 != REG_ITMP1) { */ - /* M_ILD(REG_ITMP1, REG_ITMP3, OFFSET(vftbl_t, baseval)); */ - /* M_ILD(REG_ITMP3, REG_ITMP3, OFFSET(vftbl_t, diffval)); */ - /* #if defined(ENABLE_THREADS) */ - /* codegen_threadcritstop(cd, (u1 *) mcodeptr - cd->mcodebase); */ - /* #endif */ - /* M_ISUB(REG_ITMP2, REG_ITMP1, REG_ITMP2); */ - - /* } else { */ - M_ILD(REG_ITMP3, REG_ITMP3, OFFSET(vftbl_t, baseval)); - M_ISUB(REG_ITMP2, REG_ITMP3, REG_ITMP2); + M_ALD(REG_ITMP2, s1, OFFSET(java_object_t, vftbl)); 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 - /* } */ - M_CMPULE(REG_ITMP2, REG_ITMP3, REG_ITMP3); - emit_classcast_check(cd, iptr, BRANCH_EQ, REG_ITMP3, s1); + + if (super == NULL || super->vftbl->subtype_depth >= DISPLAY_SIZE) { + M_ILD(REG_ITMP1, REG_ITMP3, OFFSET(vftbl_t, subtype_offset)); + M_LADD(REG_ITMP1, REG_ITMP2, REG_ITMP1); + M_ALD(REG_ITMP1, REG_ITMP1, 0); + M_CMPEQ(REG_ITMP1, REG_ITMP3, REG_ITMP1); + emit_label_bnez(cd, BRANCH_LABEL_6, REG_ITMP1); /* good */ + + if (super == NULL) { + M_ILD(REG_ITMP1, REG_ITMP3, OFFSET(vftbl_t, subtype_offset)); + M_CMPEQ_IMM(REG_ITMP1, OFFSET(vftbl_t, subtype_display[DISPLAY_SIZE]), REG_ITMP1); + emit_label_beqz(cd, BRANCH_LABEL_10, REG_ITMP1); /* throw */ + } + + M_ILD(REG_ITMP1, REG_ITMP3, OFFSET(vftbl_t, subtype_depth)); + M_ILD(REG_ITMP3, REG_ITMP2, OFFSET(vftbl_t, subtype_depth)); + M_CMPLE(REG_ITMP1, REG_ITMP3, REG_ITMP3); + emit_label_beqz(cd, BRANCH_LABEL_9, REG_ITMP3); /* throw */ + /* reload */ + M_ALD(REG_ITMP3, REG_PV, disp); + M_ALD(REG_ITMP2, REG_ITMP2, OFFSET(vftbl_t, subtype_overflow)); + M_S8ADDQ(REG_ITMP1, REG_ITMP2, REG_ITMP2); + M_ALD(REG_ITMP1, REG_ITMP2, -DISPLAY_SIZE*8); + M_CMPEQ(REG_ITMP1, REG_ITMP3, REG_ITMP1); + emit_label_bnez(cd, BRANCH_LABEL_7, REG_ITMP1); /* good */ + + emit_label(cd, BRANCH_LABEL_9); + if (super == NULL) + emit_label(cd, BRANCH_LABEL_10); + + /* reload s1, might have been destroyed */ + emit_load_s1(jd, iptr, REG_ITMP1); + M_ALD_INTERN(s1, REG_ZERO, TRAP_ClassCastException); + + emit_label(cd, BRANCH_LABEL_7); + emit_label(cd, BRANCH_LABEL_6); + /* reload s1, might have been destroyed */ + emit_load_s1(jd, iptr, REG_ITMP1); + } + else { + M_ALD(REG_ITMP2, REG_ITMP2, super->vftbl->subtype_offset); + M_CMPEQ(REG_ITMP2, REG_ITMP3, REG_ITMP2); + emit_classcast_check(cd, iptr, BRANCH_EQ, REG_ITMP2, s1); + } if (super != NULL) emit_label(cd, BRANCH_LABEL_5); @@ -2869,7 +2842,7 @@ gen_method: 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); @@ -2896,21 +2869,6 @@ gen_method: 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; vftbl_t *supervftbl; @@ -2927,9 +2885,6 @@ gen_method: supervftbl = super->vftbl; } -#if defined(ENABLE_THREADS) - codegen_threadcritrestart(cd, cd->mcodeptr - cd->mcodebase); -#endif s1 = emit_load_s1(jd, iptr, REG_ITMP1); d = codegen_reg_of_dst(jd, iptr, REG_ITMP2); @@ -2946,7 +2901,7 @@ gen_method: 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); M_ILD(REG_ITMP3, REG_PV, disp); @@ -2966,7 +2921,7 @@ gen_method: if (d == REG_ITMP2) M_CLR(d); - codegen_add_patch_ref(cd, + patcher_add_patch_ref(jd, PATCHER_instanceof_interface, iptr->sx.s23.s3.c.ref, 0); } @@ -2975,7 +2930,7 @@ gen_method: 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_LDA(REG_ITMP3, REG_ITMP3, -superindex); M_BLEZ(REG_ITMP3, 2); @@ -2998,7 +2953,7 @@ gen_method: 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); } @@ -3009,19 +2964,53 @@ gen_method: emit_label_beqz(cd, BRANCH_LABEL_5, s1); } - M_ALD(REG_ITMP1, s1, OFFSET(java_objectheader, vftbl)); - M_ALD(REG_ITMP2, REG_PV, disp); -#if defined(ENABLE_THREADS) - codegen_threadcritstart(cd, cd->mcodeptr - cd->mcodebase); -#endif - 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 - M_ISUB(REG_ITMP1, REG_ITMP3, REG_ITMP1); - M_CMPULE(REG_ITMP1, REG_ITMP2, d); + M_ALD(REG_ITMP2, s1, OFFSET(java_object_t, vftbl)); + M_ALD(REG_ITMP3, REG_PV, disp); + + if (super == NULL || super->vftbl->subtype_depth >= DISPLAY_SIZE) { + M_ILD(REG_ITMP1, REG_ITMP3, OFFSET(vftbl_t, subtype_offset)); + M_LADD(REG_ITMP1, REG_ITMP2, REG_ITMP1); + M_ALD(REG_ITMP1, REG_ITMP1, 0); + M_CMPEQ(REG_ITMP1, REG_ITMP3, REG_ITMP1); + emit_label_beqz(cd, BRANCH_LABEL_8, REG_ITMP1); + ICONST(d, 1); + emit_label_br(cd, BRANCH_LABEL_6); /* true */ + emit_label(cd, BRANCH_LABEL_8); + + if (super == NULL) { + M_ILD(REG_ITMP1, REG_ITMP3, OFFSET(vftbl_t, subtype_offset)); + M_CMPEQ_IMM(REG_ITMP1, OFFSET(vftbl_t, subtype_display[DISPLAY_SIZE]), REG_ITMP1); + emit_label_beqz(cd, BRANCH_LABEL_10, REG_ITMP1); /* false */ + } + + M_ILD(REG_ITMP1, REG_ITMP3, OFFSET(vftbl_t, subtype_depth)); + + M_ILD(REG_ITMP3, REG_ITMP2, OFFSET(vftbl_t, subtype_depth)); + M_CMPLE(REG_ITMP1, REG_ITMP3, REG_ITMP3); + emit_label_beqz(cd, BRANCH_LABEL_9, REG_ITMP3); /* false */ + /* reload */ + M_ALD(REG_ITMP3, REG_PV, disp); + M_ALD(REG_ITMP2, REG_ITMP2, OFFSET(vftbl_t, subtype_overflow)); + M_S8ADDQ(REG_ITMP1, REG_ITMP2, REG_ITMP2); + M_ALD(REG_ITMP1, REG_ITMP2, -DISPLAY_SIZE*8); + M_CMPEQ(REG_ITMP1, REG_ITMP3, d); + + if (d == REG_ITMP2) + emit_label_br(cd, BRANCH_LABEL_7); + emit_label(cd, BRANCH_LABEL_9); + if (super == NULL) + emit_label(cd, BRANCH_LABEL_10); + if (d == REG_ITMP2) { + M_CLR(d); + + emit_label(cd, BRANCH_LABEL_7); + } + emit_label(cd, BRANCH_LABEL_6); + } + else { + M_ALD(REG_ITMP2, REG_ITMP2, super->vftbl->subtype_offset); + M_CMPEQ(REG_ITMP2, REG_ITMP3, d); + } if (super != NULL) emit_label(cd, BRANCH_LABEL_5); @@ -3065,7 +3054,7 @@ gen_method: 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); } @@ -3106,12 +3095,9 @@ gen_method: } /* if (bptr -> flags >= BBREACHED) */ } /* for basic block */ - dseg_createlinenumbertable(cd); - - /* generate stubs */ + /* generate traps */ - emit_patcher_stubs(jd); - REPLACEMENT_EMIT_STUBS(jd); + emit_patcher_traps(jd); /* everything's ok */ @@ -3119,238 +3105,218 @@ gen_method: } -/* 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 */ - - M_ALD(REG_ITMP1, REG_PV, -2 * 8); /* load codeinfo pointer */ - M_ALD(REG_PV, REG_PV, -3 * 8); /* load pointer to the compiler */ - M_JMP(REG_ZERO, REG_PV); /* jump to the compiler */ -} - - /* codegen_emit_stub_native **************************************************** Emits a stub routine which calls a native method. *******************************************************************************/ -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, disp; - s4 funcdisp; /* displacement of the function */ + 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 */ md = m->parseddesc; - nativeparams = (m->flags & ACC_STATIC) ? 2 : 1; /* calculate stack frame size */ cd->stackframesize = 1 + /* return address */ - sizeof(stackframeinfo) / SIZEOF_VOID_P + + sizeof(stackframeinfo_t) / SIZEOF_VOID_P + sizeof(localref_table) / SIZEOF_VOID_P + 1 + /* methodinfo for call trace */ - (md->paramcount > INT_ARG_CNT ? INT_ARG_CNT : md->paramcount) + + md->paramcount + nmd->memuse; /* create method header */ (void) dseg_add_unique_address(cd, code); /* CodeinfoPointer */ (void) dseg_add_unique_s4(cd, cd->stackframesize * 8); /* FrameSize */ - (void) dseg_add_unique_s4(cd, 0); /* IsSync */ (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 stub code */ M_LDA(REG_SP, REG_SP, -(cd->stackframesize * 8)); M_AST(REG_RA, REG_SP, cd->stackframesize * 8 - SIZEOF_VOID_P); - /* call trace function */ - -#if !defined(NDEBUG) - if (JITDATA_HAS_FLAG_VERBOSECALL(jd)) - emit_verbosecall_enter(jd); -#endif - - /* 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). */ - funcdisp = dseg_add_functionptr(cd, f); + disp = cd->stackframesize * 8 - SIZEOF_VOID_P - sizeof(stackframeinfo_t) + + OFFSET(stackframeinfo_t, intregs); -#if !defined(WITH_STATIC_CLASSPATH) - if (f == NULL) - codegen_add_patch_ref(cd, PATCHER_resolve_native_function, m, funcdisp); + for (i = 0; i < INT_SAV_CNT; i++) + M_AST(abi_registers_integer_saved[i], REG_SP, disp + i * 8); #endif /* save integer and float argument registers */ - for (i = 0, j = 0; i < md->paramcount && i < INT_ARG_CNT; i++) { - if (IS_INT_LNG_TYPE(md->paramtypes[i].type)) { - M_LST(rd->argintregs[i], REG_SP, j * 8); - j++; - } - } + for (i = 0; i < md->paramcount; i++) { + if (!md->params[i].inmemory) { + s1 = md->params[i].regoff; - for (i = 0; i < md->paramcount && i < FLT_ARG_CNT; i++) { - if (IS_FLT_DBL_TYPE(md->paramtypes[i].type)) { - M_DST(rd->argfltregs[i], REG_SP, j * 8); - j++; + switch (md->paramtypes[i].type) { + case TYPE_INT: + case TYPE_LNG: + case TYPE_ADR: + M_LST(s1, REG_SP, i * 8); + break; + case TYPE_FLT: + M_FST(s1, REG_SP, i * 8); + break; + case TYPE_DBL: + M_DST(s1, REG_SP, i * 8); + break; + } } } /* prepare data structures for native function call */ - M_LDA(REG_A0, REG_SP, cd->stackframesize * 8 - SIZEOF_VOID_P); + M_MOV(REG_SP, REG_A0); M_MOV(REG_PV, REG_A1); - M_LDA(REG_A2, REG_SP, cd->stackframesize * 8); - M_ALD(REG_A3, REG_SP, cd->stackframesize * 8 - SIZEOF_VOID_P); disp = dseg_add_functionptr(cd, codegen_start_native_call); M_ALD(REG_PV, REG_PV, disp); M_JSR(REG_RA, REG_PV); disp = (s4) (cd->mcodeptr - cd->mcodebase); M_LDA(REG_PV, REG_RA, -disp); + /* remember class argument */ + + if (m->flags & ACC_STATIC) + M_MOV(REG_RESULT, REG_ITMP3); + /* restore integer and float argument registers */ - for (i = 0, j = 0; i < md->paramcount && i < INT_ARG_CNT; i++) { - if (IS_INT_LNG_TYPE(md->paramtypes[i].type)) { - M_LLD(rd->argintregs[i], REG_SP, j * 8); - j++; - } - } + for (i = 0; i < md->paramcount; i++) { + if (!md->params[i].inmemory) { + s1 = md->params[i].regoff; - for (i = 0; i < md->paramcount && i < FLT_ARG_CNT; i++) { - if (IS_FLT_DBL_TYPE(md->paramtypes[i].type)) { - M_DLD(rd->argfltregs[i], REG_SP, j * 8); - j++; + switch (md->paramtypes[i].type) { + case TYPE_INT: + case TYPE_LNG: + case TYPE_ADR: + M_LLD(s1, REG_SP, i * 8); + break; + case TYPE_FLT: + M_FLD(s1, REG_SP, i * 8); + break; + case TYPE_DBL: + M_DLD(s1, REG_SP, i * 8); + break; + } } } /* 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 = rd->argintregs[md->params[i].regoff]; + s1 = md->params[i].regoff; + s2 = nmd->params[j].regoff; - if (!nmd->params[j].inmemory) { - s2 = rd->argintregs[nmd->params[j].regoff]; + if (!nmd->params[j].inmemory) M_INTMOVE(s1, s2); - - } else { - s2 = nmd->params[j].regoff; - M_LST(s1, REG_SP, s2 * 8); - } - - } else { - s1 = md->params[i].regoff + cd->stackframesize; + else + M_LST(s1, REG_SP, s2); + } + else { + s1 = md->params[i].regoff + cd->stackframesize * 8; s2 = nmd->params[j].regoff; - 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 { + } + else { if (!md->params[i].inmemory) { - s1 = rd->argfltregs[md->params[i].regoff]; + s1 = md->params[i].regoff; + s2 = nmd->params[j].regoff; - if (!nmd->params[j].inmemory) { - s2 = rd->argfltregs[nmd->params[j].regoff]; + if (!nmd->params[j].inmemory) M_FLTMOVE(s1, s2); - - } else { - s2 = nmd->params[j].regoff; + else { 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 = md->params[i].regoff + cd->stackframesize; + } + else { + s1 = md->params[i].regoff + cd->stackframesize * 8; s2 = nmd->params[j].regoff; - M_DLD(REG_FTMP1, REG_SP, s1 * 8); + M_DLD(REG_FTMP1, REG_SP, s1); if (IS_2_WORD_TYPE(t)) - M_DST(REG_FTMP1, REG_SP, s2 * 8); + M_DST(REG_FTMP1, REG_SP, s2); else - M_FST(REG_FTMP1, REG_SP, s2 * 8); + M_FST(REG_FTMP1, REG_SP, s2); } } } - /* put class into second argument register */ + /* Handle native Java methods. */ - if (m->flags & ACC_STATIC) { - disp = dseg_add_address(cd, m->class); - M_ALD(REG_A1, REG_PV, disp); - } + if (m->flags & ACC_NATIVE) { + /* put class into second argument register */ + + if (m->flags & ACC_STATIC) + M_MOV(REG_ITMP3, REG_A1); - /* put env into first argument register */ + /* put env into first argument register */ - disp = dseg_add_address(cd, _Jv_env); - M_ALD(REG_A0, REG_PV, disp); + disp = dseg_add_address(cd, VM_get_jnienv()); + M_ALD(REG_A0, REG_PV, disp); + } - /* do the native function call */ + /* Call the native function. */ - M_ALD(REG_PV, REG_PV, funcdisp); + disp = dseg_add_functionptr(cd, f); + M_ALD(REG_PV, REG_PV, disp); M_JSR(REG_RA, REG_PV); /* call native method */ disp = (s4) (cd->mcodeptr - cd->mcodebase); M_LDA(REG_PV, REG_RA, -disp); /* recompute pv from ra */ /* save return value */ - if (md->returntype.type != TYPE_VOID) { - 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); + switch (md->returntype.type) { + case TYPE_INT: + case TYPE_LNG: + case TYPE_ADR: + M_LST(REG_RESULT, REG_SP, 0 * 8); + break; + case TYPE_FLT: + M_FST(REG_FRESULT, REG_SP, 0 * 8); + break; + case TYPE_DBL: + M_DST(REG_FRESULT, REG_SP, 0 * 8); + break; + case TYPE_VOID: + break; } - /* call finished trace */ - -#if !defined(NDEBUG) - if (JITDATA_HAS_FLAG_VERBOSECALL(jd)) - emit_verbosecall_exit(jd); -#endif - /* remove native stackframe info */ - M_LDA(REG_A0, REG_SP, cd->stackframesize * 8 - SIZEOF_VOID_P); + M_MOV(REG_SP, REG_A0); + M_MOV(REG_PV, REG_A1); disp = dseg_add_functionptr(cd, codegen_finish_native_call); M_ALD(REG_PV, REG_PV, disp); M_JSR(REG_RA, REG_PV); @@ -3360,13 +3326,33 @@ void codegen_emit_stub_native(jitdata *jd, methoddesc *nmd, functionptr f) /* restore return value */ - if (md->returntype.type != TYPE_VOID) { - 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); + switch (md->returntype.type) { + case TYPE_INT: + case TYPE_LNG: + case TYPE_ADR: + M_LLD(REG_RESULT, REG_SP, 0 * 8); + break; + case TYPE_FLT: + M_FLD(REG_FRESULT, REG_SP, 0 * 8); + break; + case TYPE_DBL: + M_DLD(REG_FRESULT, REG_SP, 0 * 8); + 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_VOID_P - 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 * 8); +#endif + M_ALD(REG_RA, REG_SP, (cd->stackframesize - 1) * 8); /* get RA */ M_LDA(REG_SP, REG_SP, cd->stackframesize * 8); @@ -3382,11 +3368,6 @@ void codegen_emit_stub_native(jitdata *jd, methoddesc *nmd, functionptr f) disp = dseg_add_functionptr(cd, asm_handle_nat_exception); M_ALD(REG_ITMP3, REG_PV, disp); /* load asm exception handler address */ M_JMP(REG_ZERO, REG_ITMP3); /* jump to asm exception handler */ - - - /* generate patcher stubs */ - - emit_patcher_stubs(jd); }