X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=src%2Fvm%2Fjit%2Fi386%2Fcodegen.c;h=7d64347c3844b519b1f46b5d949d8867680fdc6a;hb=7659949229c634784f7d27aa8b679fdd4c8351ab;hp=b8701b93552b88f420dd5b6a95f882af67579a9e;hpb=8f85eef8cedb0474125fcb45a0bc52ef67840dcb;p=cacao.git diff --git a/src/vm/jit/i386/codegen.c b/src/vm/jit/i386/codegen.c index b8701b935..7d64347c3 100644 --- a/src/vm/jit/i386/codegen.c +++ b/src/vm/jit/i386/codegen.c @@ -1,9 +1,7 @@ /* src/vm/jit/i386/codegen.c - machine code generator for i386 - 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. @@ -48,6 +46,7 @@ #include "vm/builtin.h" #include "vm/exceptions.h" #include "vm/global.h" +#include "vm/primitive.hpp" #include "vm/stringlocal.h" #include "vm/vm.h" @@ -57,11 +56,13 @@ #include "vm/jit/dseg.h" #include "vm/jit/emit-common.h" #include "vm/jit/jit.h" +#include "vm/jit/linenumbertable.h" #include "vm/jit/parse.h" #include "vm/jit/patcher-common.h" #include "vm/jit/reg.h" #include "vm/jit/replace.h" #include "vm/jit/stacktrace.h" +#include "vm/jit/trap.h" #if defined(ENABLE_SSA) # include "vm/jit/optimizing/lsra.h" @@ -88,10 +89,10 @@ bool codegen_emit(jitdata *jd) codegendata *cd; registerdata *rd; s4 len, s1, s2, s3, d, disp; + int align_off; /* offset for alignment compensation */ varinfo *var, *var1; basicblock *bptr; instruction *iptr; - exception_entry *ex; u2 currentline; methodinfo *lm; /* local methodinfo for ICMD_INVOKE* */ builtintable_entry *bte; @@ -140,7 +141,7 @@ bool codegen_emit(jitdata *jd) #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 @@ -148,48 +149,28 @@ bool codegen_emit(jitdata *jd) /* Keep stack of non-leaf functions 16-byte aligned. */ - if (!jd->isleafmethod) { - ALIGN_ODD(cd->stackframesize); /* XXX this is wrong, +4 is missing */ + if (!code_is_leafmethod(code)) { + ALIGN_ODD(cd->stackframesize); } + align_off = cd->stackframesize ? 4 : 0; + (void) dseg_add_unique_address(cd, code); /* CodeinfoPointer */ - (void) dseg_add_unique_s4(cd, cd->stackframesize * 8); /* FrameSize */ + (void) dseg_add_unique_s4( + cd, cd->stackframesize * 8 + align_off); /* 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); /* IsLeaf */ else -#endif - (void) dseg_add_unique_s4(cd, 0); /* IsSync */ - - (void) dseg_add_unique_s4(cd, jd->isleafmethod); /* IsLeaf */ + (void) dseg_add_unique_s4(cd, 0); /* 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 */ - /* adds a reference for the length of the line number counter. We don't - know the size yet, since we evaluate the information during code - generation, to save one additional iteration over the whole - instructions. During code optimization the position could have changed - to the information gotten from the class file */ - (void) 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); - } - #if defined(ENABLE_PROFILING) /* generate method profiling code */ @@ -204,7 +185,8 @@ bool codegen_emit(jitdata *jd) /* create stack frame (if necessary) */ if (cd->stackframesize) - M_ASUB_IMM(cd->stackframesize * 8, REG_SP); + /* align_off == 4 */ + M_ASUB_IMM(cd->stackframesize * 8 + 4, REG_SP); /* save return address and used callee saved registers */ @@ -257,7 +239,8 @@ bool codegen_emit(jitdata *jd) } else { if (!(var->flags & INMEMORY)) { - M_ILD(d, REG_SP, cd->stackframesize * 8 + 4 + s1); + M_ILD(d, REG_SP, + cd->stackframesize * 8 + 4 + align_off + s1); } else { if (!IS_2_WORD_TYPE(t)) { @@ -265,15 +248,17 @@ bool codegen_emit(jitdata *jd) /* no copy avoiding by now possible with SSA */ if (ls != NULL) { emit_mov_membase_reg( /* + 4 for return address */ - cd, REG_SP, cd->stackframesize * 8 + s1 + 4, - REG_ITMP1); + cd, REG_SP, + cd->stackframesize * 8 + s1 + 4 + align_off, + REG_ITMP1); emit_mov_reg_membase( - cd, REG_ITMP1, REG_SP, var->vv.regoff); + cd, REG_ITMP1, REG_SP, var->vv.regoff); } else #endif /*defined(ENABLE_SSA)*/ /* reuse stackslot */ - var->vv.regoff = cd->stackframesize * 8 + 4 + s1; + var->vv.regoff = cd->stackframesize * 8 + 4 + + align_off + s1; } else { @@ -281,20 +266,22 @@ bool codegen_emit(jitdata *jd) /* no copy avoiding by now possible with SSA */ if (ls != NULL) { emit_mov_membase_reg( /* + 4 for return address */ - cd, REG_SP, cd->stackframesize * 8 + s1 + 4, - REG_ITMP1); + cd, REG_SP, + cd->stackframesize * 8 + s1 + 4 + align_off, + REG_ITMP1); emit_mov_reg_membase( - cd, REG_ITMP1, REG_SP, var->vv.regoff); + cd, REG_ITMP1, REG_SP, var->vv.regoff); emit_mov_membase_reg( /* + 4 for return address */ - cd, REG_SP, cd->stackframesize * 8 + s1 + 4 + 4, - REG_ITMP1); + cd, REG_SP, + cd->stackframesize * 8 + s1 + 4 + 4 + align_off, + REG_ITMP1); emit_mov_reg_membase( - cd, REG_ITMP1, REG_SP, var->vv.regoff + 4); + cd, REG_ITMP1, REG_SP, var->vv.regoff + 4); } else #endif /*defined(ENABLE_SSA)*/ /* reuse stackslot */ - var->vv.regoff = cd->stackframesize * 8 + 4 + s1; + var->vv.regoff = cd->stackframesize * 8 + 8 + s1; } } } @@ -314,14 +301,16 @@ bool codegen_emit(jitdata *jd) if (!(var->flags & INMEMORY)) { /* stack-arg -> register */ if (t == TYPE_FLT) { emit_flds_membase( - cd, REG_SP, cd->stackframesize * 8 + s1 + 4); + cd, REG_SP, + cd->stackframesize * 8 + s1 + 4 + align_off); assert(0); /* emit_fstp_reg(cd, var->vv.regoff + fpu_st_offset); */ } else { emit_fldl_membase( - cd, REG_SP, cd->stackframesize * 8 + s1 + 4); + cd, REG_SP, + cd->stackframesize * 8 + s1 + 4 + align_off); assert(0); /* emit_fstp_reg(cd, var->vv.regoff + fpu_st_offset); */ } @@ -331,24 +320,29 @@ bool codegen_emit(jitdata *jd) /* no copy avoiding by now possible with SSA */ if (ls != NULL) { emit_mov_membase_reg( - cd, REG_SP, cd->stackframesize * 8 + s1 + 4, REG_ITMP1); + cd, REG_SP, + cd->stackframesize * 8 + s1 + 4 + align_off, + REG_ITMP1); emit_mov_reg_membase( - cd, REG_ITMP1, REG_SP, var->vv.regoff); + cd, REG_ITMP1, REG_SP, var->vv.regoff); if (t == TYPE_FLT) { emit_flds_membase( - cd, REG_SP, cd->stackframesize * 8 + s1 + 4); + cd, REG_SP, + cd->stackframesize * 8 + s1 + 4 + align_off); emit_fstps_membase(cd, REG_SP, var->vv.regoff); } else { emit_fldl_membase( - cd, REG_SP, cd->stackframesize * 8 + s1 + 4); + cd, REG_SP, + cd->stackframesize * 8 + s1 + 4 + align_off); emit_fstpl_membase(cd, REG_SP, var->vv.regoff); } } else #endif /*defined(ENABLE_SSA)*/ /* reuse stackslot */ - var->vv.regoff = cd->stackframesize * 8 + 4 + s1; + var->vv.regoff = cd->stackframesize * 8 + 4 + + align_off + s1; } } } @@ -357,17 +351,17 @@ bool codegen_emit(jitdata *jd) /* call monitorenter function */ #if defined(ENABLE_THREADS) - if (checksync && (m->flags & ACC_SYNCHRONIZED)) { + if (checksync && code_is_synchronized(code)) { s1 = rd->memuse; if (m->flags & ACC_STATIC) { - M_MOV_IMM(&m->class->object.header, REG_ITMP1); + M_MOV_IMM(&m->clazz->object.header, REG_ITMP1); } else { - M_ALD(REG_ITMP1, REG_SP, cd->stackframesize * 8 + 4); + M_ALD(REG_ITMP1, REG_SP, cd->stackframesize * 8 + 4 + align_off); M_TEST(REG_ITMP1); M_BNE(6); - M_ALD_MEM(REG_ITMP1, EXCEPTION_HARDWARE_NULLPOINTER); + M_ALD_MEM(REG_ITMP1, TRAP_NullPointerException); } M_AST(REG_ITMP1, REG_SP, s1 * 8); @@ -414,9 +408,7 @@ bool codegen_emit(jitdata *jd) if (bptr->bitflags & BBFLAG_REPLACEMENT) { if (cd->replacementpoint[-1].flags & RPLPOINT_FLAG_COUNTDOWN) { MCODECHECK(32); - disp = (s4) &(m->hitcountdown); - M_ISUB_IMM_MEMABS(1, disp); - M_BS(0); + emit_trap_countdown(cd, &(m->hitcountdown)); } } #endif @@ -450,11 +442,13 @@ bool codegen_emit(jitdata *jd) var = VAR(bptr->invars[len]); if (bptr->type != BBTYPE_STD) { if (!IS_2_WORD_TYPE(var->type)) { +#if !defined(ENABLE_SSA) if (bptr->type == BBTYPE_EXH) { d = codegen_reg_of_var(0, var, REG_ITMP1); M_INTMOVE(REG_ITMP1, d); emit_store(jd, NULL, var, d); } +#endif } else { log_text("copy interface registers(EXH, SBR): longs \ @@ -499,7 +493,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; } @@ -519,14 +513,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 */ @@ -2201,8 +2195,8 @@ bool codegen_emit(jitdata *jd) fieldtype = fi->type; disp = (intptr_t) fi->value; - if (!CLASS_IS_OR_ALMOST_INITIALIZED(fi->class)) - patcher_add_patch_ref(jd, PATCHER_initialize_class, fi->class, 0); + if (!CLASS_IS_OR_ALMOST_INITIALIZED(fi->clazz)) + patcher_add_patch_ref(jd, PATCHER_initialize_class, fi->clazz, 0); } M_MOV_IMM(disp, REG_ITMP1); @@ -2229,7 +2223,7 @@ bool codegen_emit(jitdata *jd) break; case ICMD_PUTSTATIC: /* ..., value ==> ... */ - + if (INSTRUCTION_IS_UNRESOLVED(iptr)) { uf = iptr->sx.s23.s3.uf; fieldtype = uf->fieldref->parseddesc.fd->type; @@ -2242,8 +2236,8 @@ bool codegen_emit(jitdata *jd) fieldtype = fi->type; disp = (intptr_t) fi->value; - if (!CLASS_IS_OR_ALMOST_INITIALIZED(fi->class)) - patcher_add_patch_ref(jd, PATCHER_initialize_class, fi->class, 0); + if (!CLASS_IS_OR_ALMOST_INITIALIZED(fi->clazz)) + patcher_add_patch_ref(jd, PATCHER_initialize_class, fi->clazz, 0); } M_MOV_IMM(disp, REG_ITMP1); @@ -2284,8 +2278,8 @@ bool codegen_emit(jitdata *jd) fieldtype = fi->type; disp = (intptr_t) fi->value; - if (!CLASS_IS_OR_ALMOST_INITIALIZED(fi->class)) - patcher_add_patch_ref(jd, PATCHER_initialize_class, fi->class, 0); + if (!CLASS_IS_OR_ALMOST_INITIALIZED(fi->clazz)) + patcher_add_patch_ref(jd, PATCHER_initialize_class, fi->clazz, 0); } M_MOV_IMM(disp, REG_ITMP1); @@ -2308,6 +2302,10 @@ bool codegen_emit(jitdata *jd) s1 = emit_load_s1(jd, iptr, REG_ITMP1); emit_nullpointer_check(cd, iptr, s1); +#if defined(ENABLE_ESCAPE_CHECK) + /*emit_escape_check(cd, s1);*/ +#endif + if (INSTRUCTION_IS_UNRESOLVED(iptr)) { uf = iptr->sx.s23.s3.uf; fieldtype = uf->fieldref->parseddesc.fd->type; @@ -2742,7 +2740,7 @@ nowperformreturn: #endif #if defined(ENABLE_THREADS) - if (checksync && (m->flags & ACC_SYNCHRONIZED)) { + if (checksync && code_is_synchronized(code)) { M_ALD(REG_ITMP2, REG_SP, rd->memuse * 8); /* we need to save the proper return value */ @@ -2812,7 +2810,7 @@ nowperformreturn: /* deallocate stack */ if (cd->stackframesize) - M_AADD_IMM(cd->stackframesize * 8, REG_SP); + M_AADD_IMM(cd->stackframesize * 8 + 4, REG_SP); M_RET; } @@ -2891,6 +2889,21 @@ nowperformreturn: bte = iptr->sx.s23.s3.bte; md = bte->md; + +#if defined(ENABLE_ESCAPE_REASON) + if (bte->fp == BUILTIN_escape_reason_new) { + void set_escape_reasons(void *); + M_ASUB_IMM(8, REG_SP); + M_MOV_IMM(iptr->escape_reasons, REG_ITMP1); + M_AST(EDX, REG_SP, 4); + M_AST(REG_ITMP1, REG_SP, 0); + M_MOV_IMM(set_escape_reasons, REG_ITMP1); + M_CALL(REG_ITMP1); + M_ALD(EDX, REG_SP, 4); + M_AADD_IMM(8, REG_SP); + } +#endif + goto gen_method; case ICMD_INVOKESTATIC: /* ..., [arg1, [arg2 ...]] ==> ... */ @@ -2965,6 +2978,12 @@ gen_method: M_MOV_IMM(bte->stub, REG_ITMP1); } M_CALL(REG_ITMP1); + +#if defined(ENABLE_ESCAPE_CHECK) + if (bte->opcode == ICMD_NEW || bte->opcode == ICMD_NEWARRAY) { + /*emit_escape_annotate_object(cd, m);*/ + } +#endif break; case ICMD_INVOKESPECIAL: @@ -3030,9 +3049,9 @@ gen_method: } 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); d = md->returntype.type; } @@ -3098,9 +3117,6 @@ gen_method: supervftbl = super->vftbl; } - if ((super == NULL) || !(super->flags & ACC_INTERFACE)) - CODEGEN_CRITICAL_SECTION_NEW; - s1 = emit_load_s1(jd, iptr, REG_ITMP1); /* if class is not resolved, check which code to call */ @@ -3173,8 +3189,6 @@ gen_method: M_MOV_IMM(supervftbl, REG_ITMP3); - CODEGEN_CRITICAL_SECTION_START; - M_ILD32(REG_ITMP2, REG_ITMP2, OFFSET(vftbl_t, baseval)); /* if (s1 != REG_ITMP1) { */ @@ -3191,8 +3205,6 @@ gen_method: M_MOV_IMM(supervftbl, REG_ITMP3); M_ILD(REG_ITMP3, REG_ITMP3, OFFSET(vftbl_t, diffval)); - CODEGEN_CRITICAL_SECTION_END; - /* } */ M_CMP(REG_ITMP3, REG_ITMP2); @@ -3253,9 +3265,6 @@ gen_method: supervftbl = super->vftbl; } - if ((super == NULL) || !(super->flags & ACC_INTERFACE)) - CODEGEN_CRITICAL_SECTION_NEW; - s1 = emit_load_s1(jd, iptr, REG_ITMP1); d = codegen_reg_of_dst(jd, iptr, REG_ITMP2); @@ -3339,14 +3348,10 @@ gen_method: M_MOV_IMM(supervftbl, REG_ITMP2); - CODEGEN_CRITICAL_SECTION_START; - M_ILD(REG_ITMP1, REG_ITMP1, OFFSET(vftbl_t, baseval)); M_ILD(REG_ITMP3, REG_ITMP2, OFFSET(vftbl_t, diffval)); M_ILD(REG_ITMP2, REG_ITMP2, OFFSET(vftbl_t, baseval)); - CODEGEN_CRITICAL_SECTION_END; - M_ISUB(REG_ITMP2, REG_ITMP1); M_CLR(d); /* may be REG_ITMP2 */ M_CMP(REG_ITMP3, REG_ITMP1); @@ -3425,6 +3430,13 @@ gen_method: emit_store_dst(jd, iptr, s1); break; +#if defined(ENABLE_SSA) + case ICMD_GETEXCEPTION: + d = codegen_reg_of_dst(jd, iptr, REG_ITMP1); + M_INTMOVE(REG_ITMP1, d); + emit_store_dst(jd, iptr, d); + break; +#endif default: exceptions_throw_internalerror("Unknown ICMD %d during code generation", iptr->opc); @@ -3464,8 +3476,6 @@ gen_method: } /* if (bptr -> flags >= BBREACHED) */ } /* for basic block */ - dseg_createlinenumbertable(cd); - /* generate stubs */ emit_patcher_traps(jd); @@ -3490,10 +3500,7 @@ void codegen_emit_stub_native(jitdata *jd, methoddesc *nmd, functionptr f, int s methoddesc *md; int i, j; /* count variables */ int s1, s2; - int funcdisp; -#if defined(ENABLE_GC_CACAO) int disp; -#endif /* get required compiler data */ @@ -3508,25 +3515,22 @@ void codegen_emit_stub_native(jitdata *jd, methoddesc *nmd, functionptr f, int s /* calculate stackframe size */ cd->stackframesize = - sizeof(stackframeinfo) / SIZEOF_VOID_P + + sizeof(stackframeinfo_t) / SIZEOF_VOID_P + sizeof(localref_table) / SIZEOF_VOID_P + 4 + /* 4 arguments (start_native_call) */ nmd->memuse; /* keep stack 16-byte aligned */ - ALIGN_ODD(cd->stackframesize); /* XXX this is wrong, +4 is missing */ + ALIGN_ODD(cd->stackframesize); /* 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, cd->stackframesize * 8 + 4); /* 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 */ #if defined(ENABLE_PROFILING) /* generate native method profiling code */ @@ -3541,14 +3545,7 @@ void codegen_emit_stub_native(jitdata *jd, methoddesc *nmd, functionptr f, int s /* calculate stackframe size for native function */ - M_ASUB_IMM(cd->stackframesize * 8, REG_SP); - - /* get function address (this must happen before the stackframeinfo) */ - - funcdisp = dseg_add_functionptr(cd, f); - - if (f == NULL) - patcher_add_patch_ref(jd, PATCHER_resolve_native_function, m, funcdisp); + M_ASUB_IMM(cd->stackframesize * 8 + 4, REG_SP); /* Mark the whole fpu stack as free for native functions (only for saved */ /* register count == 0). */ @@ -3566,8 +3563,8 @@ void codegen_emit_stub_native(jitdata *jd, methoddesc *nmd, functionptr f, int s /* remember callee saved int registers in stackframeinfo (GC may need to */ /* recover them during a collection). */ - disp = cd->stackframesize * 8 - sizeof(stackframeinfo) + - OFFSET(stackframeinfo, intregs); + disp = cd->stackframesize * 8 - sizeof(stackframeinfo_t) + + OFFSET(stackframeinfo_t, intregs); for (i = 0; i < INT_SAV_CNT; i++) M_AST(abi_registers_integer_saved[i], REG_SP, disp + i * 4); @@ -3594,7 +3591,7 @@ void codegen_emit_stub_native(jitdata *jd, methoddesc *nmd, functionptr f, int s if (!md->params[i].inmemory) assert(0); - s1 = md->params[i].regoff + cd->stackframesize * 8 + 4; + s1 = md->params[i].regoff + cd->stackframesize * 8 + 8; s2 = nmd->params[j].regoff; /* float/double in memory can be copied like int/longs */ @@ -3627,11 +3624,12 @@ void codegen_emit_stub_native(jitdata *jd, methoddesc *nmd, functionptr f, int s M_AST_IMM(_Jv_env, REG_SP, 0 * 4); } - /* call the native function */ + /* Call the native function. */ + disp = dseg_add_functionptr(cd, f); emit_mov_imm_reg(cd, 0, REG_ITMP3); dseg_adddata(cd); - M_ALD(REG_ITMP1, REG_ITMP3, funcdisp); + M_ALD(REG_ITMP1, REG_ITMP3, disp); M_CALL(REG_ITMP1); /* save return value */ @@ -3639,6 +3637,20 @@ void codegen_emit_stub_native(jitdata *jd, methoddesc *nmd, functionptr f, int s switch (md->returntype.type) { case TYPE_INT: case TYPE_ADR: + switch (md->returntype.decltype) { + case PRIMITIVETYPE_BOOLEAN: + M_BZEXT(REG_RESULT, REG_RESULT); + break; + case PRIMITIVETYPE_BYTE: + M_BSEXT(REG_RESULT, REG_RESULT); + break; + case PRIMITIVETYPE_CHAR: + M_CZEXT(REG_RESULT, REG_RESULT); + break; + case PRIMITIVETYPE_SHORT: + M_SSEXT(REG_RESULT, REG_RESULT); + break; + } M_IST(REG_RESULT, REG_SP, 1 * 8); break; case TYPE_LNG: @@ -3689,14 +3701,14 @@ void codegen_emit_stub_native(jitdata *jd, methoddesc *nmd, functionptr f, int s /* restore callee saved int registers from stackframeinfo (GC might have */ /* modified them during a collection). */ - disp = cd->stackframesize * 8 - sizeof(stackframeinfo) + - OFFSET(stackframeinfo, intregs); + 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 - M_AADD_IMM(cd->stackframesize * 8, REG_SP); + M_AADD_IMM(cd->stackframesize * 8 + 4, REG_SP); /* check for exception */ @@ -3713,10 +3725,6 @@ void codegen_emit_stub_native(jitdata *jd, methoddesc *nmd, functionptr f, int s M_MOV_IMM(asm_handle_nat_exception, REG_ITMP3); M_JMP(REG_ITMP3); - - /* generate patcher stubs */ - - emit_patcher_traps(jd); }