X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=src%2Fvm%2Fjit%2Fmips%2Femit.c;h=924b09b230c386b30659d913a9e2f40a5f671f1c;hb=9f859ad50d3d5d98c185d40b86b2179bc4dc9aeb;hp=b60a361d67b074c38f7fd1ebdc8fbc2c52632741;hpb=7d483434b34b05f978a914628476d0c4f879b3e0;p=cacao.git diff --git a/src/vm/jit/mips/emit.c b/src/vm/jit/mips/emit.c index b60a361d6..924b09b23 100644 --- a/src/vm/jit/mips/emit.c +++ b/src/vm/jit/mips/emit.c @@ -22,8 +22,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - $Id: emit.c 4398 2006-01-31 23:43:08Z twisti $ - */ @@ -38,19 +36,19 @@ #include "mm/memory.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/stringlocal.h" /* XXX for gen_resolvebranch */ +#include "vm/jit/abi.h" #include "vm/jit/abi-asm.h" #include "vm/jit/asmpart.h" #include "vm/jit/dseg.h" #include "vm/jit/emit-common.h" #include "vm/jit/jit.h" +#include "vm/jit/patcher-common.h" #include "vm/jit/replace.h" #include "vmcore/options.h" @@ -75,23 +73,32 @@ s4 emit_load(jitdata *jd, instruction *iptr, varinfo *src, s4 tempreg) if (src->flags & INMEMORY) { COUNT_SPILLS; - disp = src->vv.regoff * 8; + disp = src->vv.regoff; - if (IS_FLT_DBL_TYPE(src->type)) { - if (IS_2_WORD_TYPE(src->type)) - M_DLD(tempreg, REG_SP, disp); - else - M_FLD(tempreg, REG_SP, disp); - } - else { + switch (src->type) { #if SIZEOF_VOID_P == 8 + case TYPE_INT: + case TYPE_LNG: + case TYPE_ADR: M_LLD(tempreg, REG_SP, disp); + break; #else - if (IS_2_WORD_TYPE(src->type)) - M_LLD(tempreg, REG_SP, disp); - else - M_ILD(tempreg, REG_SP, disp); + case TYPE_INT: + case TYPE_ADR: + M_ILD(tempreg, REG_SP, disp); + break; + case TYPE_LNG: + M_LLD(tempreg, REG_SP, disp); + break; #endif + case TYPE_FLT: + M_FLD(tempreg, REG_SP, disp); + break; + case TYPE_DBL: + M_DLD(tempreg, REG_SP, disp); + break; + default: + vm_abort("emit_load: unknown type %d", src->type); } reg = tempreg; @@ -125,7 +132,7 @@ s4 emit_load_low(jitdata *jd, instruction *iptr, varinfo *src, s4 tempreg) if (src->flags & INMEMORY) { COUNT_SPILLS; - disp = src->vv.regoff * 8; + disp = src->vv.regoff; #if WORDS_BIGENDIAN == 1 M_ILD(tempreg, REG_SP, disp + 4); @@ -165,7 +172,7 @@ s4 emit_load_high(jitdata *jd, instruction *iptr, varinfo *src, s4 tempreg) if (src->flags & INMEMORY) { COUNT_SPILLS; - disp = src->vv.regoff * 8; + disp = src->vv.regoff; #if WORDS_BIGENDIAN == 1 M_ILD(tempreg, REG_SP, disp); @@ -201,23 +208,32 @@ void emit_store(jitdata *jd, instruction *iptr, varinfo *dst, s4 d) if (dst->flags & INMEMORY) { COUNT_SPILLS; - disp = dst->vv.regoff * 8; + disp = dst->vv.regoff; - if (IS_FLT_DBL_TYPE(dst->type)) { - if (IS_2_WORD_TYPE(dst->type)) - M_DST(d, REG_SP, disp); - else - M_FST(d, REG_SP, disp); - } - else { + switch (dst->type) { #if SIZEOF_VOID_P == 8 + case TYPE_INT: + case TYPE_LNG: + case TYPE_ADR: M_LST(d, REG_SP, disp); + break; #else - if (IS_2_WORD_TYPE(dst->type)) - M_LST(d, REG_SP, disp); - else - M_IST(d, REG_SP, disp); + case TYPE_INT: + case TYPE_ADR: + M_IST(d, REG_SP, disp); + break; + case TYPE_LNG: + M_LST(d, REG_SP, disp); + break; #endif + case TYPE_FLT: + M_FST(d, REG_SP, disp); + break; + case TYPE_DBL: + M_DST(d, REG_SP, disp); + break; + default: + vm_abort("emit_store: unknown type %d", dst->type); } } } @@ -229,17 +245,30 @@ void emit_store(jitdata *jd, instruction *iptr, varinfo *dst, s4 d) *******************************************************************************/ -void emit_copy(jitdata *jd, instruction *iptr, varinfo *src, varinfo *dst) +void emit_copy(jitdata *jd, instruction *iptr) { - codegendata *cd; - s4 s1, d; + codegendata *cd; + varinfo *src; + varinfo *dst; + s4 s1, d; /* get required compiler data */ cd = jd->cd; + /* get source and destination variables */ + + src = VAROP(iptr->s1); + dst = VAROP(iptr->dst); + if ((src->vv.regoff != dst->vv.regoff) || ((src->flags ^ dst->flags) & INMEMORY)) { + + if ((src->type == TYPE_RET) || (dst->type == TYPE_RET)) { + /* emit nothing, as the value won't be used anyway */ + return; + } + /* If one of the variables resides in memory, we can eliminate the register move from/to the temporary register with the order of getting the destination register and the load. */ @@ -264,21 +293,30 @@ void emit_copy(jitdata *jd, instruction *iptr, varinfo *src, varinfo *dst) } if (s1 != d) { - if (IS_FLT_DBL_TYPE(src->type)) { - if (IS_2_WORD_TYPE(src->type)) - M_DMOV(s1, d); - else - M_FMOV(s1, d); - } - else { + switch (dst->type) { #if SIZEOF_VOID_P == 8 + case TYPE_INT: + case TYPE_LNG: + case TYPE_ADR: M_MOV(s1, d); + break; #else - if (IS_2_WORD_TYPE(src->type)) - M_LNGMOVE(s1, d); - else - M_MOV(s1, d); + case TYPE_INT: + case TYPE_ADR: + M_MOV(s1, d); + break; + case TYPE_LNG: + M_LNGMOVE(s1, d); + break; #endif + case TYPE_FLT: + M_FMOV(s1, d); + break; + case TYPE_DBL: + M_DMOV(s1, d); + break; + default: + vm_abort("emit_copy: unknown type %d", dst->type); } } @@ -334,89 +372,149 @@ void emit_lconst(codegendata *cd, s4 d, s8 value) } -/* emit_arithmetic_check ******************************************************* +/* emit_branch ***************************************************************** - Emit an ArithmeticException check. + Emits the code for conditional and unconditional branchs. + + NOTE: The reg argument may contain two packed registers. *******************************************************************************/ -void emit_arithmetic_check(codegendata *cd, instruction *iptr, s4 reg) +void emit_branch(codegendata *cd, s4 disp, s4 condition, s4 reg, u4 opt) { - if (INSTRUCTION_MUST_CHECK(iptr)) { -#if 0 - M_BEQZ(reg, 0); - codegen_add_arithmeticexception_ref(cd); - M_NOP; -#else - M_BNEZ(reg, 6); - M_NOP; + s4 checkdisp; + s4 branchdisp; - M_LUI(REG_ITMP3, 0); - M_OR_IMM(REG_ITMP3, 0, REG_ITMP3); - codegen_add_arithmeticexception_ref(cd); - M_AADD(REG_PV, REG_ITMP3, REG_ITMP3); - M_JMP(REG_ITMP3); - M_NOP; -#endif + /* calculate the different displacements */ + + checkdisp = (disp - 4); + branchdisp = (disp - 4) >> 2; + + /* check which branch to generate */ + + if (condition == BRANCH_UNCONDITIONAL) { + /* check displacement for overflow */ + + if ((checkdisp < (s4) 0xffff8000) || (checkdisp > (s4) 0x00007fff)) { + /* if the long-branches flag isn't set yet, do it */ + + if (!CODEGENDATA_HAS_FLAG_LONGBRANCHES(cd)) { + cd->flags |= (CODEGENDATA_FLAG_ERROR | + CODEGENDATA_FLAG_LONGBRANCHES); + } + + vm_abort("emit_branch: emit unconditional long-branch code"); + } + else { + M_BR(branchdisp); + M_NOP; + } + } + else { + /* and displacement for overflow */ + + if ((checkdisp < (s4) 0xffff8000) || (checkdisp > (s4) 0x00007fff)) { + /* if the long-branches flag isn't set yet, do it */ + + if (!CODEGENDATA_HAS_FLAG_LONGBRANCHES(cd)) { + cd->flags |= (CODEGENDATA_FLAG_ERROR | + CODEGENDATA_FLAG_LONGBRANCHES); + } + + switch (condition) { + case BRANCH_EQ: + M_BNE(GET_HIGH_REG(reg), GET_LOW_REG(reg), 5); + break; + case BRANCH_NE: + M_BEQ(GET_HIGH_REG(reg), GET_LOW_REG(reg), 5); + break; + case BRANCH_LT: + M_BGEZ(reg, 5); + break; + case BRANCH_GE: + M_BLTZ(reg, 5); + break; + case BRANCH_GT: + M_BLEZ(reg, 5); + break; + case BRANCH_LE: + M_BGTZ(reg, 5); + break; + default: + vm_abort("emit_branch: unknown condition %d", condition); + } + + /* The actual branch code which is over-jumped (NOTE: we + don't use a branch delay slot here). */ + + M_LUI(REG_ITMP3, branchdisp >> 16); + M_OR_IMM(REG_ITMP3, branchdisp, REG_ITMP3); + M_AADD(REG_PV, REG_ITMP3, REG_ITMP3); + M_JMP(REG_ITMP3); + M_NOP; + + } + else { + switch (condition) { + case BRANCH_EQ: + M_BEQ(GET_HIGH_REG(reg), GET_LOW_REG(reg), branchdisp); + break; + case BRANCH_NE: + M_BNE(GET_HIGH_REG(reg), GET_LOW_REG(reg), branchdisp); + break; + case BRANCH_LT: + M_BLTZ(reg, branchdisp); + break; + case BRANCH_GE: + M_BGEZ(reg, branchdisp); + break; + case BRANCH_GT: + M_BGTZ(reg, branchdisp); + break; + case BRANCH_LE: + M_BLEZ(reg, branchdisp); + break; + default: + vm_abort("emit_branch: unknown condition %d", condition); + } + + /* branch delay */ + M_NOP; + } } } -/* emit_arrayindexoutofbounds_check ******************************************** +/* emit_arithmetic_check ******************************************************* - Emit an ArrayIndexOutOfBoundsException check. + Emit an ArithmeticException check. *******************************************************************************/ -void emit_arrayindexoutofbounds_check(codegendata *cd, instruction *iptr, s4 s1, s4 s2) +void emit_arithmetic_check(codegendata *cd, instruction *iptr, s4 reg) { if (INSTRUCTION_MUST_CHECK(iptr)) { - M_ILD(REG_ITMP3, s1, OFFSET(java_arrayheader, size)); - M_CMPULT(s2, REG_ITMP3, REG_ITMP3); - -#if 0 - M_BEQZ(REG_ITMP3, 0); - codegen_add_arrayindexoutofboundsexception_ref(cd, s2); - M_NOP; -#else - M_BNEZ(REG_ITMP3, 6); - M_NOP; - - M_LUI(REG_ITMP3, 0); - M_OR_IMM(REG_ITMP3, 0, REG_ITMP3); - codegen_add_arrayindexoutofboundsexception_ref(cd, s2); - M_AADD(REG_PV, REG_ITMP3, REG_ITMP3); - M_JMP(REG_ITMP3); + M_BNEZ(reg, 2); M_NOP; -#endif + M_ALD_INTERN(REG_ZERO, REG_ZERO, EXCEPTION_HARDWARE_ARITHMETIC); } } -/* emit_arraystore_check ******************************************************* +/* emit_arrayindexoutofbounds_check ******************************************** - Emit an ArrayStoreException check. + Emit an ArrayIndexOutOfBoundsException check. *******************************************************************************/ -void emit_arraystore_check(codegendata *cd, instruction *iptr, s4 reg) +void emit_arrayindexoutofbounds_check(codegendata *cd, instruction *iptr, s4 s1, s4 s2) { if (INSTRUCTION_MUST_CHECK(iptr)) { -#if 0 - M_BEQZ(reg, 0); - codegen_add_arraystoreexception_ref(cd); - M_NOP; -#else - M_BNEZ(reg, 6); - M_NOP; - - M_LUI(REG_ITMP3, 0); - M_OR_IMM(REG_ITMP3, 0, REG_ITMP3); - codegen_add_arraystoreexception_ref(cd); - M_AADD(REG_PV, REG_ITMP3, REG_ITMP3); - M_JMP(REG_ITMP3); + M_ILD_INTERN(REG_ITMP3, s1, OFFSET(java_array_t, size)); + M_CMPULT(s2, REG_ITMP3, REG_ITMP3); + M_BNEZ(REG_ITMP3, 2); M_NOP; -#endif + M_ALD_INTERN(s2, REG_ZERO, EXCEPTION_HARDWARE_ARRAYINDEXOUTOFBOUNDS); } } @@ -430,37 +528,25 @@ void emit_arraystore_check(codegendata *cd, instruction *iptr, s4 reg) void emit_classcast_check(codegendata *cd, instruction *iptr, s4 condition, s4 reg, s4 s1) { if (INSTRUCTION_MUST_CHECK(iptr)) { -#if 0 - M_BNEZ(reg, 0); - codegen_add_classcastexception_ref(cd, s1); - M_NOP; -#else switch (condition) { case ICMD_IFEQ: - M_BNEZ(reg, 6); + M_BNEZ(reg, 2); break; case ICMD_IFNE: - M_BEQZ(reg, 6); + M_BEQZ(reg, 2); break; case ICMD_IFLE: - M_BGTZ(reg, 6); + M_BGTZ(reg, 2); break; default: - vm_abort("emit_classcast_check: condition %d not found", condition); + vm_abort("emit_classcast_check: unknown condition %d", condition); } M_NOP; - - M_LUI(REG_ITMP3, 0); - M_OR_IMM(REG_ITMP3, 0, REG_ITMP3); - codegen_add_classcastexception_ref(cd, s1); - M_AADD(REG_PV, REG_ITMP3, REG_ITMP3); - M_JMP(REG_ITMP3); - M_NOP; -#endif + M_ALD_INTERN(s1, REG_ZERO, EXCEPTION_HARDWARE_CLASSCAST); } } @@ -474,21 +560,9 @@ void emit_classcast_check(codegendata *cd, instruction *iptr, s4 condition, s4 r void emit_nullpointer_check(codegendata *cd, instruction *iptr, s4 reg) { if (INSTRUCTION_MUST_CHECK(iptr)) { -#if 0 - M_BEQZ(reg, 0); - codegen_add_nullpointerexception_ref(cd); - M_NOP; -#else - M_BNEZ(reg, 6); - M_NOP; - - M_LUI(REG_ITMP3, 0); - M_OR_IMM(REG_ITMP3, 0, REG_ITMP3); - codegen_add_nullpointerexception_ref(cd); - M_AADD(REG_PV, REG_ITMP3, REG_ITMP3); - M_JMP(REG_ITMP3); + M_BNEZ(reg, 2); M_NOP; -#endif + M_ALD_INTERN(REG_ZERO, REG_ZERO, EXCEPTION_HARDWARE_NULLPOINTER); } } @@ -502,365 +576,32 @@ void emit_nullpointer_check(codegendata *cd, instruction *iptr, s4 reg) void emit_exception_check(codegendata *cd, instruction *iptr) { if (INSTRUCTION_MUST_CHECK(iptr)) { -#if 0 - M_BEQZ(REG_RESULT, 0); - codegen_add_fillinstacktrace_ref(cd); - M_NOP; -#else - M_BNEZ(REG_RESULT, 6); - M_NOP; - - M_LUI(REG_ITMP3, 0); - M_OR_IMM(REG_ITMP3, 0, REG_ITMP3); - codegen_add_fillinstacktrace_ref(cd); - M_AADD(REG_PV, REG_ITMP3, REG_ITMP3); - M_JMP(REG_ITMP3); + M_BNEZ(REG_RESULT, 2); M_NOP; -#endif + M_ALD_INTERN(REG_RESULT, REG_ZERO, EXCEPTION_HARDWARE_EXCEPTION); } } -/* emit_exception_stubs ******************************************************** +/* emit_trap ******************************************************************* - Generates the code for the exception stubs. + Emit a trap instruction and return the original machine code. *******************************************************************************/ -void emit_exception_stubs(jitdata *jd) +uint32_t emit_trap(codegendata *cd) { - codegendata *cd; - registerdata *rd; - exceptionref *er; - s4 branchmpc; - s4 targetmpc; - s4 targetdisp; - s4 disp; - - /* get required compiler data */ - - cd = jd->cd; - rd = jd->rd; - - /* generate exception stubs */ - - targetdisp = 0; - - for (er = cd->exceptionrefs; er != NULL; er = er->next) { - /* back-patch the branch to this exception code */ - - branchmpc = er->branchpos; - targetmpc = cd->mcodeptr - cd->mcodebase; - - md_codegen_patch_branch(cd, branchmpc, targetmpc); - - MCODECHECK(100); - - /* Check if the exception is an - ArrayIndexOutOfBoundsException. If so, move index register - into REG_ITMP1. */ + uint32_t mcode; - if (er->reg != -1) - M_MOV(er->reg, REG_ITMP1); + /* Get machine code which is patched back in later. The + trap is 1 instruction word long. */ - /* calcuate exception address */ + mcode = *((u4 *) cd->mcodeptr); - M_LDA(REG_ITMP2_XPC, REG_PV, er->branchpos - 4); + M_ALD_INTERN(REG_ZERO, REG_ZERO, EXCEPTION_HARDWARE_PATCHER); - /* move function to call into REG_ITMP3 */ - - disp = dseg_add_functionptr(cd, er->function); - M_ALD(REG_ITMP3, REG_PV, disp); - - if (targetdisp == 0) { - targetdisp = ((u4 *) cd->mcodeptr) - ((u4 *) cd->mcodebase); - - M_MOV(REG_PV, REG_A0); - M_MOV(REG_SP, REG_A1); - - if (jd->isleafmethod) - M_MOV(REG_RA, REG_A2); - else - M_ALD(REG_A2, REG_SP, (cd->stackframesize - 1) * 8); - - M_MOV(REG_ITMP2_XPC, REG_A3); - -#if SIZEOF_VOID_P == 8 - /* XXX */ - M_MOV(REG_ITMP1, REG_A4); - - M_ASUB_IMM(REG_SP, 2 * 8, REG_SP); - M_AST(REG_ITMP2_XPC, REG_SP, 0 * 8); - - if (jd->isleafmethod) - M_AST(REG_RA, REG_SP, 1 * 8); -#else - M_ASUB_IMM(REG_SP, 5*4 + 2 * 8, REG_SP); - M_AST(REG_ITMP2_XPC, REG_SP, 5*4 + 0 * 8); - - if (jd->isleafmethod) - M_AST(REG_RA, REG_SP, 5*4 + 1 * 8); - - M_AST(REG_ITMP1, REG_SP, 4 * 4); -#endif - - M_JSR(REG_RA, REG_ITMP3); - M_NOP; - M_MOV(REG_RESULT, REG_ITMP1_XPTR); - -#if SIZEOF_VOID_P == 8 - if (jd->isleafmethod) - M_ALD(REG_RA, REG_SP, 1 * 8); - - M_ALD(REG_ITMP2_XPC, REG_SP, 0 * 8); - M_AADD_IMM(REG_SP, 2 * 8, REG_SP); -#else - if (jd->isleafmethod) - M_ALD(REG_RA, REG_SP, 5*4 + 1 * 8); - - M_ALD(REG_ITMP2_XPC, REG_SP, 5*4 + 0 * 8); - M_AADD_IMM(REG_SP, 5*4 + 2 * 8, REG_SP); -#endif - - disp = dseg_add_functionptr(cd, asm_handle_exception); - M_ALD(REG_ITMP3, REG_PV, disp); - M_JMP(REG_ITMP3); - M_NOP; - } - else { - disp = (((u4 *) cd->mcodebase) + targetdisp) - - (((u4 *) cd->mcodeptr) + 1); - - M_BR(disp); - M_NOP; - } - } -} - - -/* emit_patcher_stubs ********************************************************** - - Generates the code for the patcher stubs. - -*******************************************************************************/ - -void emit_patcher_stubs(jitdata *jd) -{ - codegendata *cd; - patchref *pr; - u4 mcode[5]; - u1 *savedmcodeptr; - u1 *tmpmcodeptr; - s4 targetdisp; - s4 disp; - - /* get required compiler data */ - - cd = jd->cd; - - /* generate code patching stub call code */ - - targetdisp = 0; - -/* for (pr = list_first_unsynced(cd->patchrefs); pr != NULL; */ -/* pr = list_next_unsynced(cd->patchrefs, pr)) { */ - for (pr = cd->patchrefs; pr != NULL; pr = pr->next) { - /* check code segment size */ - - MCODECHECK(100); - - /* Get machine code which is patched back in later. The - call is 2 instruction words long. */ - - tmpmcodeptr = (u1 *) (cd->mcodebase + pr->branchpos); - - /* We use 2 loads here as an unaligned 8-byte read on 64-bit - MIPS causes a SIGSEGV and using the same code for both - architectures is much better. */ - - mcode[0] = ((u4 *) tmpmcodeptr)[0]; - mcode[1] = ((u4 *) tmpmcodeptr)[1]; - - mcode[2] = ((u4 *) tmpmcodeptr)[2]; - mcode[3] = ((u4 *) tmpmcodeptr)[3]; - mcode[4] = ((u4 *) tmpmcodeptr)[4]; - - /* Patch in the call to call the following code (done at - compile time). */ - - savedmcodeptr = cd->mcodeptr; /* save current mcodeptr */ - cd->mcodeptr = tmpmcodeptr; /* set mcodeptr to patch position */ - - disp = ((u4 *) savedmcodeptr) - (((u4 *) tmpmcodeptr) + 1); - -/* if ((disp < (s4) 0xffff8000) || (disp > (s4) 0x00007fff)) { */ - /* Recalculate the displacement to be relative to PV. */ - - disp = savedmcodeptr - cd->mcodebase; - - M_LUI(REG_ITMP3, disp >> 16); - M_OR_IMM(REG_ITMP3, disp, REG_ITMP3); - M_AADD(REG_PV, REG_ITMP3, REG_ITMP3); - M_JMP(REG_ITMP3); - M_NOP; -/* } */ -/* else { */ -/* M_BR(disp); */ -/* M_NOP; */ -/* M_NOP; */ -/* M_NOP; */ -/* M_NOP; */ -/* } */ - - cd->mcodeptr = savedmcodeptr; /* restore the current mcodeptr */ - - /* create stack frame */ - - M_ASUB_IMM(REG_SP, 8 * 8, REG_SP); - - /* calculate return address and move it onto the stack */ - - M_LDA(REG_ITMP3, REG_PV, pr->branchpos); - M_AST(REG_ITMP3, REG_SP, 7 * 8); - - /* move pointer to java_objectheader onto stack */ - -#if defined(ENABLE_THREADS) - /* create a virtual java_objectheader */ - - (void) dseg_add_unique_address(cd, NULL); /* flcword */ - (void) dseg_add_unique_address(cd, lock_get_initial_lock_word()); - disp = dseg_add_unique_address(cd, NULL); /* vftbl */ - - M_LDA(REG_ITMP3, REG_PV, disp); - M_AST(REG_ITMP3, REG_SP, 6 * 8); -#else - /* do nothing */ -#endif - - /* move machine code onto stack */ - - disp = dseg_add_s4(cd, mcode[0]); - M_ILD(REG_ITMP3, REG_PV, disp); - M_IST(REG_ITMP3, REG_SP, 3 * 8 + 0); - - disp = dseg_add_s4(cd, mcode[1]); - M_ILD(REG_ITMP3, REG_PV, disp); - M_IST(REG_ITMP3, REG_SP, 3 * 8 + 4); - - disp = dseg_add_s4(cd, mcode[2]); - M_ILD(REG_ITMP3, REG_PV, disp); - M_IST(REG_ITMP3, REG_SP, 4 * 8 + 0); - - disp = dseg_add_s4(cd, mcode[3]); - M_ILD(REG_ITMP3, REG_PV, disp); - M_IST(REG_ITMP3, REG_SP, 4 * 8 + 4); - - disp = dseg_add_s4(cd, mcode[4]); - M_ILD(REG_ITMP3, REG_PV, disp); - M_IST(REG_ITMP3, REG_SP, 5 * 8 + 0); - - /* move class/method/field reference onto stack */ - - disp = dseg_add_address(cd, pr->ref); - M_ALD(REG_ITMP3, REG_PV, disp); - M_AST(REG_ITMP3, REG_SP, 2 * 8); - - /* move data segment displacement onto stack */ - - disp = dseg_add_s4(cd, pr->disp); - M_ILD(REG_ITMP3, REG_PV, disp); - M_IST(REG_ITMP3, REG_SP, 1 * 8); - - /* move patcher function pointer onto stack */ - - disp = dseg_add_functionptr(cd, pr->patcher); - M_ALD(REG_ITMP3, REG_PV, disp); - M_AST(REG_ITMP3, REG_SP, 0 * 8); - - if (targetdisp == 0) { - targetdisp = ((u4 *) cd->mcodeptr) - ((u4 *) cd->mcodebase); - - disp = dseg_add_functionptr(cd, asm_patcher_wrapper); - M_ALD(REG_ITMP3, REG_PV, disp); - M_JMP(REG_ITMP3); - M_NOP; - } - else { - disp = (((u4 *) cd->mcodebase) + targetdisp) - - (((u4 *) cd->mcodeptr) + 1); - - M_BR(disp); - M_NOP; - } - } -} - - -/* emit_replacement_stubs ****************************************************** - - Generates the code for the replacement stubs. - -*******************************************************************************/ - -#if defined(ENABLE_REPLACEMENT) -void emit_replacement_stubs(jitdata *jd) -{ - codegendata *cd; - codeinfo *code; - rplpoint *rplp; - s4 disp; - s4 i; -#if !defined(NDEBUG) - u1 *savedmcodeptr; -#endif - - /* get required compiler data */ - - cd = jd->cd; - code = jd->code; - - rplp = code->rplpoints; - - /* store beginning of replacement stubs */ - - code->replacementstubs = (u1*) (cd->mcodeptr - cd->mcodebase); - - for (i = 0; i < code->rplpointcount; ++i, ++rplp) { - /* do not generate stubs for non-trappable points */ - - if (rplp->flags & RPLPOINT_FLAG_NOTRAP) - continue; - - /* check code segment size */ - - MCODECHECK(100); - -#if !defined(NDEBUG) - savedmcodeptr = cd->mcodeptr; -#endif - - /* create stack frame - 16-byte aligned */ - - M_ASUB_IMM(REG_SP, 2 * 8, REG_SP); - - /* push address of `rplpoint` struct */ - - disp = dseg_add_address(cd, rplp); - M_ALD(REG_ITMP3, REG_PV, disp); - M_AST(REG_ITMP3, REG_SP, 0 * 8); - - /* jump to replacement function */ - - disp = dseg_add_functionptr(cd, asm_replacement_out); - M_ALD(REG_ITMP3, REG_PV, disp); - M_JMP(REG_ITMP3); - M_NOP; /* delay slot */ - - assert((cd->mcodeptr - savedmcodeptr) == 4*REPLACEMENT_STUB_SIZE); - } + return mcode; } -#endif /* defined(ENABLE_REPLACEMENT) */ /* emit_verbosecall_enter ****************************************************** @@ -898,10 +639,10 @@ void emit_verbosecall_enter(jitdata *jd) types, so it's correct for MIPS32 too) */ for (i = 0; i < INT_ARG_CNT; i++) - M_AST(rd->argintregs[i], REG_SP, PA_SIZE + (2 + i) * 8); + M_AST(abi_registers_integer_argument[i], REG_SP, PA_SIZE + (2 + i) * 8); for (i = 0; i < FLT_ARG_CNT; i++) - M_DST(rd->argfltregs[i], REG_SP, PA_SIZE + (2 + INT_ARG_CNT + i) * 8); + M_DST(abi_registers_float_argument[i], REG_SP, PA_SIZE + (2 + INT_ARG_CNT + i) * 8); /* save temporary registers for leaf methods */ @@ -922,12 +663,12 @@ void emit_verbosecall_enter(jitdata *jd) if (IS_FLT_DBL_TYPE(t)) { if (IS_2_WORD_TYPE(t)) { - M_DST(rd->argfltregs[i], REG_SP, 0 * 8); - M_LLD(rd->argintregs[i], REG_SP, 0 * 8); + M_DST(abi_registers_float_argument[i], REG_SP, 0 * 8); + M_LLD(abi_registers_integer_argument[i], REG_SP, 0 * 8); } else { - M_FST(rd->argfltregs[i], REG_SP, 0 * 8); - M_ILD(rd->argintregs[i], REG_SP, 0 * 8); + M_FST(abi_registers_float_argument[i], REG_SP, 0 * 8); + M_ILD(abi_registers_integer_argument[i], REG_SP, 0 * 8); } } } @@ -938,16 +679,16 @@ void emit_verbosecall_enter(jitdata *jd) if (IS_INT_LNG_TYPE(t)) { if (IS_2_WORD_TYPE(t)) { - M_ILD(rd->argintregs[j], REG_SP, PA_SIZE + (2 + i) * 8); - M_ILD(rd->argintregs[j + 1], REG_SP, PA_SIZE + (2 + i) * 8 + 4); + M_ILD(abi_registers_integer_argument[j], REG_SP, PA_SIZE + (2 + i) * 8); + M_ILD(abi_registers_integer_argument[j + 1], REG_SP, PA_SIZE + (2 + i) * 8 + 4); } else { # if WORDS_BIGENDIAN == 1 - M_MOV(REG_ZERO, rd->argintregs[j]); - M_ILD(rd->argintregs[j + 1], REG_SP, PA_SIZE + (2 + i) * 8); + M_MOV(REG_ZERO, abi_registers_integer_argument[j]); + M_ILD(abi_registers_integer_argument[j + 1], REG_SP, PA_SIZE + (2 + i) * 8); # else - M_ILD(rd->argintregs[j], REG_SP, PA_SIZE + (2 + i) * 8); - M_MOV(REG_ZERO, rd->argintregs[j + 1]); + M_ILD(abi_registers_integer_argument[j], REG_SP, PA_SIZE + (2 + i) * 8); + M_MOV(REG_ZERO, abi_registers_integer_argument[j + 1]); # endif } j += 2; @@ -966,10 +707,10 @@ void emit_verbosecall_enter(jitdata *jd) /* restore argument registers */ for (i = 0; i < INT_ARG_CNT; i++) - M_ALD(rd->argintregs[i], REG_SP, PA_SIZE + (2 + i) * 8); + M_ALD(abi_registers_integer_argument[i], REG_SP, PA_SIZE + (2 + i) * 8); for (i = 0; i < FLT_ARG_CNT; i++) - M_DLD(rd->argfltregs[i], REG_SP, PA_SIZE + (2 + INT_ARG_CNT + i) * 8); + M_DLD(abi_registers_float_argument[i], REG_SP, PA_SIZE + (2 + INT_ARG_CNT + i) * 8); /* restore temporary registers for leaf methods */ @@ -1055,11 +796,12 @@ void emit_verbosecall_exit(jitdata *jd) # endif } - M_DST(REG_FRESULT, REG_SP, 4*4); - M_FST(REG_FRESULT, REG_SP, 4*4 + 2 * 4); + M_LLD(REG_A2_A3_PACKED, REG_SP, 8*4 + 2 * 8); + M_FST(REG_FRESULT, REG_SP, 4*4 + 0 * 4); disp = dseg_add_address(cd, m); M_ALD(REG_ITMP1, REG_PV, disp); + M_AST(REG_ITMP1, REG_SP, 4*4 + 1 * 4); #endif disp = dseg_add_functionptr(cd, builtin_verbosecall_exit);