* src/vm/jit/linenumbertable.c: New file.
[cacao.git] / src / vm / jit / powerpc / codegen.c
index 5269c281d125931fe54386793fdcd209d64aad5b..d164016bea0218f011434c8bf377a4eb217c2964 100644 (file)
@@ -58,6 +58,7 @@
 #include "vm/jit/dseg.h"
 #include "vm/jit/emit-common.h"
 #include "vm/jit/jit.h"
+#include "vm/jit/linenumbertable.h"
 #include "vm/jit/md.h"
 #include "vm/jit/methodheader.h"
 #include "vm/jit/parse.h"
@@ -91,7 +92,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;
@@ -137,7 +137,7 @@ bool codegen_emit(jitdata *jd)
           not be shared with place to save the return register on PPC,
           since both values reside in R3. */
 
-       if (checksync && (m->flags & ACC_SYNCHRONIZED))
+       if (checksync && code_is_synchronized(code))
                cd->stackframesize += 2;
 #endif
 
@@ -145,44 +145,26 @@ bool codegen_emit(jitdata *jd)
 
        /* align stack to 16-bytes */
 
-       if (!jd->isleafmethod || JITDATA_HAS_FLAG_VERBOSECALL(jd))
+       if (!code_is_leafmethod(code) || JITDATA_HAS_FLAG_VERBOSECALL(jd))
                ALIGN_2(cd->stackframesize);
 
-       else if (jd->isleafmethod && (cd->stackframesize == LA_SIZE_IN_POINTERS))
+       else if (code_is_leafmethod(code) && (cd->stackframesize == LA_SIZE_IN_POINTERS))
                cd->stackframesize = 0;
 
        (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         */
-       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, INT_SAV_CNT - rd->savintreguse); /* IntSave */
-       (void) dseg_add_unique_s4(cd, FLT_SAV_CNT - rd->savfltreguse); /* FltSave */
+       code->synchronizedoffset = rd->memuse * 8;
 
-       dseg_addlinenumbertablesize(cd);
+       /* REMOVEME: We still need it for exception handling in assembler. */
 
-       (void) dseg_add_unique_s4(cd, jd->exceptiontablelength); /* ExTableSize   */
-
-       /* create exception table */
+       if (code_is_leafmethod(code))
+               (void) dseg_add_unique_s4(cd, 1);
+       else
+               (void) dseg_add_unique_s4(cd, 0);
 
-       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);
-       }
+       (void) dseg_add_unique_s4(cd, INT_SAV_CNT - rd->savintreguse); /* IntSave */
+       (void) dseg_add_unique_s4(cd, FLT_SAV_CNT - rd->savfltreguse); /* FltSave */
 
 #if defined(ENABLE_PROFILING)
        /* generate method profiling code */
@@ -201,7 +183,7 @@ bool codegen_emit(jitdata *jd)
 
        /* create stack frame (if necessary) */
 
-       if (!jd->isleafmethod) {
+       if (!code_is_leafmethod(code)) {
                M_MFLR(REG_ZERO);
                M_AST(REG_ZERO, REG_SP, LA_LR_OFFSET);
        }
@@ -300,7 +282,7 @@ bool codegen_emit(jitdata *jd)
 #if defined(ENABLE_THREADS)
        /* call monitorenter function */
 
-       if (checksync && (m->flags & ACC_SYNCHRONIZED)) {
+       if (checksync && code_is_synchronized(code)) {
                /* stack offset for monitor argument */
 
                s1 = rd->memuse;
@@ -442,7 +424,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;
                        }
 
@@ -462,14 +444,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           */
@@ -1245,7 +1227,6 @@ bool codegen_emit(jitdata *jd)
                case ICMD_FCMPL:      /* ..., val1, val2  ==> ..., val1 fcmpg val2    */
                case ICMD_DCMPL:      /* == => 0, < => 1, > => -1                     */
 
-
                        s1 = emit_load_s1(jd, iptr, REG_FTMP1);
                        s2 = emit_load_s2(jd, iptr, REG_FTMP2);
                        d = codegen_reg_of_dst(jd, iptr, REG_ITMP1);
@@ -1275,107 +1256,6 @@ bool codegen_emit(jitdata *jd)
                        emit_store_dst(jd, iptr, d);
                        break;
                        
-               case ICMD_IF_FCMPEQ:    /* ..., value, value ==> ...                  */
-               case ICMD_IF_DCMPEQ:
-
-                       s1 = emit_load_s1(jd, iptr, REG_FTMP1);
-                       s2 = emit_load_s2(jd, iptr, REG_FTMP2);
-                       M_FCMPU(s1, s2);
-                       M_BNAN(1);
-                       emit_beq(cd, iptr->dst.block);
-                       break;
-
-               case ICMD_IF_FCMPNE:    /* ..., value, value ==> ...                  */
-               case ICMD_IF_DCMPNE:
-
-                       s1 = emit_load_s1(jd, iptr, REG_FTMP1);
-                       s2 = emit_load_s2(jd, iptr, REG_FTMP2);
-                       M_FCMPU(s1, s2);
-                       emit_bnan(cd, iptr->dst.block);
-                       emit_bne(cd, iptr->dst.block);
-                       break;
-
-
-               case ICMD_IF_FCMPL_LT:  /* ..., value, value ==> ...                  */
-               case ICMD_IF_DCMPL_LT:
-
-                       s1 = emit_load_s1(jd, iptr, REG_FTMP1);
-                       s2 = emit_load_s2(jd, iptr, REG_FTMP2);
-                       M_FCMPU(s1, s2);
-                       emit_bnan(cd, iptr->dst.block);
-                       emit_blt(cd, iptr->dst.block);
-                       break;
-
-               case ICMD_IF_FCMPL_GT:  /* ..., value, value ==> ...                  */
-               case ICMD_IF_DCMPL_GT:
-
-                       s1 = emit_load_s1(jd, iptr, REG_FTMP1);
-                       s2 = emit_load_s2(jd, iptr, REG_FTMP2);
-                       M_FCMPU(s1, s2);
-                       M_BNAN(1);
-                       emit_bgt(cd, iptr->dst.block);
-                       break;
-
-               case ICMD_IF_FCMPL_LE:  /* ..., value, value ==> ...                  */
-               case ICMD_IF_DCMPL_LE:
-
-                       s1 = emit_load_s1(jd, iptr, REG_FTMP1);
-                       s2 = emit_load_s2(jd, iptr, REG_FTMP2);
-                       M_FCMPU(s1, s2);
-                       emit_bnan(cd, iptr->dst.block);
-                       emit_ble(cd, iptr->dst.block);
-                       break;
-
-               case ICMD_IF_FCMPL_GE:  /* ..., value, value ==> ...                  */
-               case ICMD_IF_DCMPL_GE:
-
-                       s1 = emit_load_s1(jd, iptr, REG_FTMP1);
-                       s2 = emit_load_s2(jd, iptr, REG_FTMP2);
-                       M_FCMPU(s1, s2);
-                       M_BNAN(1);
-                       emit_bge(cd, iptr->dst.block);
-                       break;
-
-               case ICMD_IF_FCMPG_LT:  /* ..., value, value ==> ...                  */
-               case ICMD_IF_DCMPG_LT:
-
-                       s1 = emit_load_s1(jd, iptr, REG_FTMP1);
-                       s2 = emit_load_s2(jd, iptr, REG_FTMP2);
-                       M_FCMPU(s1, s2);
-                       M_BNAN(1);
-                       emit_blt(cd, iptr->dst.block);
-                       break;
-
-               case ICMD_IF_FCMPG_GT:  /* ..., value, value ==> ...                  */
-               case ICMD_IF_DCMPG_GT:
-
-                       s1 = emit_load_s1(jd, iptr, REG_FTMP1);
-                       s2 = emit_load_s2(jd, iptr, REG_FTMP2);
-                       M_FCMPU(s1, s2);
-                       emit_bnan(cd, iptr->dst.block);
-                       emit_bgt(cd, iptr->dst.block);
-                       break;
-
-               case ICMD_IF_FCMPG_LE:  /* ..., value, value ==> ...                  */
-               case ICMD_IF_DCMPG_LE:
-
-                       s1 = emit_load_s1(jd, iptr, REG_FTMP1);
-                       s2 = emit_load_s2(jd, iptr, REG_FTMP2);
-                       M_FCMPU(s1, s2);
-                       M_BNAN(1);
-                       emit_ble(cd, iptr->dst.block);
-                       break;
-
-               case ICMD_IF_FCMPG_GE:  /* ..., value, value ==> ...                  */
-               case ICMD_IF_DCMPG_GE:
-
-                       s1 = emit_load_s1(jd, iptr, REG_FTMP1);
-                       s2 = emit_load_s2(jd, iptr, REG_FTMP2);
-                       M_FCMPU(s1, s2);
-                       emit_bnan(cd, iptr->dst.block);
-                       emit_bge(cd, iptr->dst.block);
-                       break;
-
 
                /* memory operations **************************************************/
 
@@ -1816,13 +1696,13 @@ bool codegen_emit(jitdata *jd)
                        M_ALD(REG_ITMP2, REG_PV, disp);
                        M_MTCTR(REG_ITMP2);
 
-                       if (jd->isleafmethod)
+                       if (code_is_leafmethod(code))
                                M_MFLR(REG_ITMP3);                          /* save LR        */
 
                        M_BL(0);                                        /* get current PC */
                        M_MFLR(REG_ITMP2_XPC);
 
-                       if (jd->isleafmethod)
+                       if (code_is_leafmethod(code))
                                M_MTLR(REG_ITMP3);                          /* restore LR     */
 
                        M_RTS;                                          /* jump to CTR    */
@@ -2179,7 +2059,7 @@ nowperformreturn:
                        emit_verbosecall_exit(jd);
 
 #if defined(ENABLE_THREADS)
-                       if (checksync && (m->flags & ACC_SYNCHRONIZED)) {
+                       if (checksync && code_is_synchronized(code)) {
                                disp = dseg_add_functionptr(cd, LOCK_monitor_exit);
                                M_ALD(REG_ITMP3, REG_PV, disp);
                                M_MTCTR(REG_ITMP3);
@@ -2223,7 +2103,7 @@ nowperformreturn:
 
                        /* restore return address                                         */
 
-                       if (!jd->isleafmethod) {
+                       if (!code_is_leafmethod(code)) {
                                /* ATTENTION: Don't use REG_ZERO (r0) here, as M_ALD
                                   may have a displacement overflow. */
 
@@ -2424,8 +2304,6 @@ gen_method:
                                disp = (s4) (cd->mcodeptr - cd->mcodebase);
                                M_MFLR(REG_ITMP1);
                                M_LDA(REG_PV, REG_ITMP1, -disp);
-
-                               emit_exception_check(cd, iptr);
                                break;
 
                        case ICMD_INVOKESPECIAL:
@@ -2887,8 +2765,6 @@ gen_method:
        } /* if (bptr -> flags >= BBREACHED) */
        } /* for basic block */
 
-       dseg_createlinenumbertable(cd);
-
        /* generate traps */
 
        emit_patcher_traps(jd);
@@ -2899,236 +2775,22 @@ 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_INTERN(REG_ITMP1, REG_PV, -2 * SIZEOF_VOID_P);
-       M_ALD_INTERN(REG_PV, REG_PV, -3 * SIZEOF_VOID_P);
-       M_MTCTR(REG_PV);
-       M_RTS;
-}
-
-
-/* codegen_emit_stub_builtin ***************************************************
-
-   Creates a stub routine which calls a builtin function.
-
-*******************************************************************************/
-
-void codegen_emit_stub_builtin(jitdata *jd, builtintable_entry *bte)
-{
-       codeinfo    *code;
-       codegendata *cd;
-       methoddesc  *md;
-       int          i;
-       int          s1;
-       int          disp;
-
-       /* get required compiler data */
-
-       code = jd->code;
-       cd   = jd->cd;
-
-       md = bte->md;
-
-       /* calculate stackframe size */
-
-       cd->stackframesize =
-               sizeof(stackframeinfo) / SIZEOF_VOID_P +
-               2 +                             /* 4 stackframeinfo arguments (darwin)*/
-               md->paramcount;
-
-       /* Keep stack 16-byte aligned. */
-
-       ALIGN_2(cd->stackframesize);
-
-       /* create method header */
-
-       (void) dseg_add_unique_address(cd, code);              /* CodeinfoPointer */
-       (void) dseg_add_unique_s4(cd, cd->stackframesize * 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 code */
-
-       M_MFLR(REG_ZERO);
-       M_AST_INTERN(REG_ZERO, REG_SP, LA_LR_OFFSET);
-       M_STWU(REG_SP, REG_SP, -(cd->stackframesize * 8));
-
-#if defined(ENABLE_GC_CACAO)
-       /* Save callee saved integer registers in stackframeinfo (GC may
-          need to recover them during a collection). */
-
-       disp = cd->stackframesize * 8 - sizeof(stackframeinfo) +
-               OFFSET(stackframeinfo, intregs);
-
-       for (i = 0; i < INT_SAV_CNT; i++)
-               M_AST(abi_registers_integer_saved[i], REG_SP, disp + i * 4);
-#endif
-
-       /* Save integer and float argument registers. */
-
-       for (i = 0; i < md->paramcount; i++) {
-               if (!md->params[i].inmemory) {
-                       s1 = md->params[i].regoff;
-
-                       switch (md->paramtypes[i].type) {
-                       case TYPE_INT:
-                       case TYPE_ADR:
-                               M_IST(s1, REG_SP, LA_SIZE + 4*4 + i * 8);
-                               break;
-                       case TYPE_LNG:
-                               M_LST(s1, REG_SP, LA_SIZE + 4*4 + i * 8);
-                               break;
-                       case TYPE_FLT:
-                       case TYPE_DBL:
-                               M_DST(s1, REG_SP, LA_SIZE + 4*4 + i * 8);
-                               break;
-                       }
-               }
-       }
-
-       /* create dynamic stack info */
-
-       M_AADD_IMM(REG_SP, cd->stackframesize * 8, REG_A0);
-       M_MOV(REG_PV, REG_A1);
-       M_AADD_IMM(REG_SP, cd->stackframesize * 8, REG_A2);
-       M_ALD(REG_A3, REG_SP, cd->stackframesize * 8 + LA_LR_OFFSET);
-       disp = dseg_add_functionptr(cd, codegen_stub_builtin_enter);
-       M_ALD(REG_ITMP1, REG_PV, disp);
-       M_MTCTR(REG_ITMP1);
-       M_JSR;
-
-       /* Restore integer and float argument registers. */
-
-       for (i = 0; i < md->paramcount; i++) {
-               if (!md->params[i].inmemory) {
-                       s1 = md->params[i].regoff;
-
-                       switch (md->paramtypes[i].type) {
-                       case TYPE_INT:
-                       case TYPE_ADR:
-                               M_ILD(s1, REG_SP, LA_SIZE + 4*4 + i * 8);
-                               break;
-                       case TYPE_LNG:
-                               M_LLD(s1, REG_SP, LA_SIZE + 4*4 + i * 8);
-                               break;
-                       case TYPE_FLT:
-                       case TYPE_DBL:
-                               M_DLD(s1, REG_SP, LA_SIZE + 4*4 + i * 8);
-                               break;
-                       }
-               }
-       }
-
-       /* call the builtin function */
-
-       disp = dseg_add_functionptr(cd, bte->fp);
-       M_ALD(REG_ITMP3, REG_PV, disp);
-       M_MTCTR(REG_ITMP3);
-       M_JSR;
-
-       /* save return value */
-
-       switch (md->returntype.type) {
-       case TYPE_INT:
-       case TYPE_ADR:
-               M_IST(REG_RESULT, REG_SP, LA_SIZE + 1 * 8);
-               break;
-       case TYPE_LNG:
-               M_LST(REG_RESULT_PACKED, REG_SP, LA_SIZE + 1 * 8);
-               break;
-       case TYPE_FLT:
-       case TYPE_DBL:
-               M_DST(REG_FRESULT, REG_SP, LA_SIZE + 1 * 8);
-               break;
-       case TYPE_VOID:
-               break;
-       }
-
-       /* remove native stackframe info */
-
-       M_AADD_IMM(REG_SP, cd->stackframesize * 8, REG_A0);
-       disp = dseg_add_functionptr(cd, codegen_stub_builtin_exit);
-       M_ALD(REG_ITMP1, REG_PV, disp);
-       M_MTCTR(REG_ITMP1);
-       M_JSR;
-
-       /* restore return value */
-
-       switch (md->returntype.type) {
-       case TYPE_INT:
-       case TYPE_ADR:
-               M_ILD(REG_RESULT, REG_SP, LA_SIZE + 1 * 8);
-               break;
-       case TYPE_LNG:
-               M_LLD(REG_RESULT_PACKED, REG_SP, LA_SIZE + 1 * 8);
-               break;
-       case TYPE_FLT:
-       case TYPE_DBL:
-               M_DLD(REG_FRESULT, REG_SP, LA_SIZE + 1 * 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(stackframeinfo) +
-               OFFSET(stackframeinfo, intregs);
-
-       for (i = 0; i < INT_SAV_CNT; i++)
-               M_ALD(abi_registers_integer_saved[i], REG_SP, disp + i * 4);
-#endif
-
-       /* remove stackframe */
-
-       M_ALD(REG_ITMP2_XPC, REG_SP, cd->stackframesize * 8 + LA_LR_OFFSET);
-       M_MTLR(REG_ITMP2_XPC);
-       M_LDA(REG_SP, REG_SP, cd->stackframesize * 8);
-
-       M_RET;
-}
-
-
 /* 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;
        methoddesc  *md;
-       s4           nativeparams;
        s4           i, j;                 /* count variables                    */
        s4           t;
-       s4           s1, s2, disp;
-       s4           funcdisp;
+       s4           s1, s2;
+       int          disp;
 
        /* get required compiler data */
 
@@ -3139,14 +2801,13 @@ void codegen_emit_stub_native(jitdata *jd, methoddesc *nmd, functionptr f)
        /* set some variables */
 
        md = m->parseddesc;
-       nativeparams = (m->flags & ACC_STATIC) ? 2 : 1;
 
        /* calculate stackframe size */
 
        cd->stackframesize =
-               sizeof(stackframeinfo) / SIZEOF_VOID_P +
+               sizeof(stackframeinfo_t) / SIZEOF_VOID_P +
                sizeof(localref_table) / SIZEOF_VOID_P +
-               4 +                             /* 4 stackframeinfo arguments (darwin)*/
+               4 +                            /* 4 stackframeinfo arguments (darwin) */
                nmd->paramcount +
                nmd->memuse;
 
@@ -3162,8 +2823,6 @@ void codegen_emit_stub_native(jitdata *jd, methoddesc *nmd, functionptr f)
        (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 code */
 
@@ -3171,19 +2830,12 @@ void codegen_emit_stub_native(jitdata *jd, methoddesc *nmd, functionptr f)
        M_AST_INTERN(REG_ZERO, REG_SP, LA_LR_OFFSET);
        M_STWU(REG_SP, REG_SP, -(cd->stackframesize * 8));
 
-       /* 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);
-
 #if defined(ENABLE_GC_CACAO)
        /* Save callee saved integer 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);
@@ -3249,7 +2901,7 @@ void codegen_emit_stub_native(jitdata *jd, methoddesc *nmd, functionptr f)
 
        /* 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)) {
@@ -3301,19 +2953,24 @@ void codegen_emit_stub_native(jitdata *jd, methoddesc *nmd, functionptr f)
                }
        }
 
-       /* put class into second argument register */
+       /* Handle native Java methods. */
 
-       if (m->flags & ACC_STATIC)
-               M_MOV(REG_ITMP3, REG_A1);
+       if (m->flags & ACC_NATIVE) {
+               /* put class into second argument register */
 
-       /* put env into first argument register */
+               if (m->flags & ACC_STATIC)
+                       M_MOV(REG_ITMP3, REG_A1);
 
-       disp = dseg_add_address(cd, _Jv_env);
-       M_ALD(REG_A0, REG_PV, disp);
+               /* put env into first argument register */
+
+               disp = dseg_add_address(cd, _Jv_env);
+               M_ALD(REG_A0, REG_PV, disp);
+       }
 
-       /* generate the actual native call */
+       /* Call the native function. */
 
-       M_ALD(REG_ITMP3, REG_PV, funcdisp);
+       disp = dseg_add_functionptr(cd, f);
+       M_ALD(REG_ITMP3, REG_PV, disp);
        M_MTCTR(REG_ITMP3);
        M_JSR;
 
@@ -3367,8 +3024,8 @@ void codegen_emit_stub_native(jitdata *jd, methoddesc *nmd, functionptr f)
        /* Restore callee saved integer 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);
@@ -3393,10 +3050,6 @@ void codegen_emit_stub_native(jitdata *jd, methoddesc *nmd, functionptr f)
        M_ALD(REG_ITMP3, REG_PV, disp);
        M_MTCTR(REG_ITMP3);
        M_RTS;
-
-       /* generate patcher traps */
-
-       emit_patcher_traps(jd);
 }