* Updated header: Added 2006. Changed address of FSF. Changed email
[cacao.git] / src / vm / jit / powerpc / asmpart.S
index 41f6c071c29989f057692ecaec93256f4ae7ec2e..520845b7701f3d0d2b5eeb2db6769e82d081ee2a 100644 (file)
@@ -1,10 +1,9 @@
-/* vm/jit/powerpc/asmpart.S - Java-C interface functions for powerpc
+/* src/vm/jit/powerpc/asmpart.S - Java-C interface functions for PowerPC
                
-   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-   Institut f. Computersprachen, TU Wien
-   R. Grafl, A. Krall, C. Kruegel, C. Oates, R. Obermaisser, M. Probst,
-   S. Ring, E. Steiner, C. Thalinger, D. Thuernbeck, P. Tomsich,
-   J. Wenninger
+   Copyright (C) 1996-2005, 2006 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
 
    This file is part of CACAO.
 
 
    You should have received a copy of the GNU General Public License
    along with this program;  if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, USA.
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA.
 
-   Contact: cacao@complang.tuwien.ac.at
+   Contact: cacao@cacaojvm.org
 
    Authors: Andreas Krall
             Reinhard Grafl
+            Stefan Ring
 
-   $Id: asmpart.S 1709 2004-12-06 15:36:50Z twisti $
+   Changes: Christian Thalinger
 
-*/
+   $Id: asmpart.S 4357 2006-01-22 23:33:38Z twisti $
 
-#include "config.h"
-#include "vm/jit/powerpc/offsets.h"
-#include "vm/jit/powerpc/asmoffsets.h"
+*/
 
 
-#define itmp1 r11
-#define itmp2 r12
-#define itmp3 r0
+#include "config.h"
 
-#define xptr itmp1
-#define xpc itmp2
+#include "md-abi.h"
+#include "md-asm.h"
 
-#define pv r13
-#define mptr r12
-#define mptrn 12
+#include "vm/jit/abi.h"
+#include "vm/jit/methodheader.h"
+#include "vm/jit/powerpc/offsets.h"
 
 
        .text
 
        .align 2
 
-       .globl _asm_calljavafunction
-       .globl _asm_calljavafunction2
-       .globl _asm_calljavafunction2long
-       .globl _asm_calljavafunction2double
-       .globl _asm_call_jit_compiler
-
-       .globl _jit_compile
-       .globl _asm_handle_nat_exception
-       .globl _asm_handle_exception
-       .globl _asm_check_clinit
-       .globl _asm_builtin_checkarraycast
-       .globl _asm_builtin_aastore
-       .globl _builtin_canstore
-       .globl _builtin_trace_exception
-       .globl _builtin_monitorenter
-       .globl _builtin_monitorexit
-       .globl _builtin_ldiv
-       .globl _builtin_lrem
-       .globl _builtin_checkarraycast
-       .globl _asm_builtin_monitorenter
-       .globl _asm_builtin_monitorexit
-       .globl _asm_builtin_idiv
-       .globl _asm_builtin_irem
-       .globl _asm_builtin_ldiv
-       .globl _asm_builtin_lrem
-       .globl _asm_cacheflush
-       .globl _asm_initialize_thread_stack
-       .globl _asm_perform_threadswitch
-       .globl _asm_switchstackandcall
-       .globl _asm_criticalsections
-       .globl _asm_getclassvalues_atomic
-
-       .globl _string_java_lang_NullPointerException
-       .globl _string_java_lang_ArrayIndexOutOfBoundsException
-       .globl _string_java_lang_ArrayStoreException
-       .globl _string_java_lang_ArithmeticException
-       .globl _string_java_lang_ArithmeticException_message
-       .globl _string_java_lang_ClassCastException
+       .globl asm_calljavafunction
+       .globl asm_calljavafunction_int
 
-#if defined(USE_THREADS) && defined(NATIVE_THREADS)
-       .globl _builtin_asm_get_exceptionptrptr
-#endif
-#if !defined(USE_THREADS) || !defined(NATIVE_THREADS)
-       .globl __exceptionptr
-#endif
+       .globl asm_calljavafunction2
+       .globl asm_calljavafunction2int
+       .globl asm_calljavafunction2long
+       .globl asm_calljavafunction2float
+       .globl asm_calljavafunction2double
 
-       .globl _builtin_throw_exception
-       .globl _class_load
-       .globl _class_link
-       .globl _class_init
-
-       .globl _new_classcastexception
-       .globl _new_nullpointerexception
-       .globl _new_arrayindexoutofboundsexception
-       .globl _new_arraystoreexception
-       .globl _new_arithmeticexception
-
-jitcompile:
-       .long _jit_compile
-
-class_load:
-       .long _class_load
-class_link:
-       .long _class_link
-class_init:
-       .long _class_init
-               
-builtinthrow:
-       .long _builtin_throw_exception
-
-builtin_traceexception:
-       .long _builtin_trace_exception
-builtin_monitorenter:
-       .long _builtin_monitorenter
-builtin_monitorexit:
-       .long _builtin_monitorexit
-builtin_ldiv:
-       .long _builtin_ldiv
-builtin_lrem:
-       .long _builtin_lrem
-
-builtincanstore:
-       .long _builtin_canstore
-builtincheckarraycast:
-       .long _builtin_checkarraycast
-       
-new_classcastexception:
-       .long _new_classcastexception
-new_nullpointerexception:
-       .long _new_nullpointerexception
-new_arrayindexoutofboundsexception:
-       .long _new_arrayindexoutofboundsexception
-new_arraystoreexception:
-       .long _new_arraystoreexception
-new_arithmeticexception:
-       .long _new_arithmeticexception
+       .globl asm_call_jit_compiler
 
+       .globl asm_handle_nat_exception
+       .globl asm_handle_exception
+
+       .globl asm_wrapper_patcher
+
+       .globl asm_cacheflush
+       .globl asm_initialize_thread_stack
+       .globl asm_perform_threadswitch
+       .globl asm_switchstackandcall
+       .globl asm_criticalsections
+       .globl asm_getclassvalues_atomic
 
-#if defined(USE_THREADS) && defined(NATIVE_THREADS)
-builtin_asm_get_exceptionptrptr:
-       .long _builtin_asm_get_exceptionptrptr
-#endif
-#if !defined(USE_THREADS) || !defined(NATIVE_THREADS)
-_exceptionptr:
-       .long __exceptionptr
-#endif
 
-               
 /********************* function asm_calljavafunction ***************************
 *                                                                              *
 *   This function calls a Java-method (which possibly needs compilation)       *
@@ -169,188 +81,257 @@ _exceptionptr:
 *   This functions calls the JIT-compiler which eventually translates the      *
 *   method into machine code.                                                  *
 *                                                                              *
-*   C-prototype:                                                                              *
+*   C-prototype:                                                               *
 *    javaobject_header *asm_calljavamethod (methodinfo *m,                     *
-*         void *arg1, void *arg2, void *arg3, void *arg4);                      *
+*         void *arg1, void *arg2, void *arg3, void *arg4);                     *
 *                                                                              *
 *******************************************************************************/
                
        .align 2
-    .long   0                         /* catch type all                       */
-    .long   calljava_xhandler         /* handler pc                           */
-    .long   calljava_xhandler         /* end pc                               */
-    .long   _asm_calljavafunction     /* start pc                             */
-    .long   1                         /* extable size                         */
-    .long   0                         /* fltsave                              */
-    .long   0                         /* intsave                              */
-    .long   0                         /* isleaf                               */
-    .long   0                         /* IsSync                               */
-    .long   24                        /* frame size                           */
-    .long   0                         /* method pointer (pointer to name)     */
-       .long   0                         /* padding                              */
-
-_asm_calljavafunction:
+
+       .long   0                         /* catch type all                       */
+       .long   calljava_xhandler         /* handler pc                           */
+       .long   calljava_xhandler         /* end pc                               */
+       .long   asm_calljavafunction      /* start pc                             */
+       .long   1                         /* extable size                         */
+       .long   0                         /* line number table start              */
+       .long   0                         /* line number table size               */
+       .long   0                         /* fltsave                              */
+       .long   0                         /* intsave                              */
+       .long   0                         /* isleaf                               */
+       .long   0                         /* IsSync                               */
+       .long   0                         /* frame size                           */
+       .long   0                         /* method pointer (pointer to name)     */
+
+asm_calljavafunction:
+asm_calljavafunction_int:
        mflr    r0
-       stw     r31,-4(r1)
-//     stw     r30,-8(r1)
-       stw     pv,-12(r1)
-       stw     r0,8(r1)
-       stwu    r1,-148(r1)
-       bl      0f
-0:
-       mflr    r31
-
-       stw             r16,40(r1)
-       stw             r17,44(r1)
-       stw             r18,48(r1)
-       stw             r19,52(r1)
-       stw             r20,56(r1)
-       stw             r21,60(r1)
-       stw             r22,64(r1)
-       stw             r23,68(r1)
-       stfd    f16,72(r1)
-       stfd    f17,80(r1)
-       stfd    f18,88(r1)
-       stfd    f19,96(r1)
-       stfd    f20,104(r1)
-       stfd    f21,112(r1)
-       stfd    f22,120(r1)
-       stfd    f23,128(r1)
-
-       stw     r3,36(r1)
-       addi    r2,r1,36
-       mr      r3,r4
-       mr      r4,r5
-       mr      r5,r6
-       mr      r6,r7
-
-//     addis   mptr,r31,ha16(_asm_call_jit_compiler-0b)
-       addi    mptr,r31,lo16(_asm_call_jit_compiler-0b)
+       stw     r0,LA_LR_OFFSET(r1)
+       stwu    r1,-40*4(r1)
+
+#if defined(__DARWIN__)
+       stw     itmp1,10*4(sp)            /* register r11 is callee saved         */
+#endif
+       stw     pv,11*4(sp)               /* save PV register                     */
+
+       stw     itmp3,12*4(sp)            /* registers r14-r31 are callee saved   */
+       stfd    ftmp1,14*4(sp)            /* registers f14-f31 are callee saved   */
+       stfd    ftmp2,16*4(sp)
+
+#if defined(__DARWIN__)
+       stw     t1,18*4(r1)
+       stw     t2,19*4(r1)
+       stw     t3,20*4(r1)
+       stw     t4,21*4(r1)
+       stw     t5,22*4(r1)
+       stw     t6,23*4(r1)
+       stw     t7,24*4(r1)
+
+       stfd    ft0,26*4(r1)
+       stfd    ft1,28*4(r1)
+       stfd    ft2,30*4(r1)
+       stfd    ft3,32*4(r1)
+       stfd    ft4,34*4(r1)
+       stfd    ft5,36*4(r1)
+#else
+       SAVE_TEMPORARY_REGISTERS(18)      /* the offset has to be even            */
+#endif
+
+       stw     a0,36(r1)
+       addi    itmp1,r1,36
+       mr      a0,a1
+       mr      a1,a2
+       mr      a2,a3
+       mr      a3,a4
+
+#if defined(__DARWIN__)
+       lis     mptr,ha16(asm_call_jit_compiler)
+       addi    mptr,mptr,lo16(asm_call_jit_compiler)
+#else
+       lis     mptr,asm_call_jit_compiler@ha
+       addi    mptr,mptr,asm_call_jit_compiler@l
+#endif
        stw     mptr,32(r1)
        addi    mptr,r1,28
 
        lwz     pv,4(mptr)
        mtctr   pv
        bctrl
+
 1:
        mflr    itmp1
-       addi    pv,itmp1,lo16(_asm_calljavafunction-1b)
-
-calljava_regrestore:
-       lwz     r16,40(r1)
-       lwz             r17,44(r1)
-       lwz             r18,48(r1)
-       lwz             r19,52(r1)
-       lwz             r20,56(r1)
-       lwz             r21,60(r1)
-       lwz             r22,64(r1)
-       lwz             r23,68(r1)
-       lfd             f16,72(r1)
-       lfd             f17,80(r1)
-       lfd             f18,88(r1)
-       lfd             f19,96(r1)
-       lfd             f20,104(r1)
-       lfd             f21,112(r1)
-       lfd             f22,120(r1)
-       lfd             f23,128(r1)
-
-       lwz     r0,148+8(r1)
+#if defined(__DARWIN__)
+       addi    pv,itmp1,lo16(asm_calljavafunction-1b)
+#else
+       addi    pv,itmp1,(asm_calljavafunction-1b)@l
+#endif
+
+L_asm_calljavafunction_return:
+#if defined(__DARWIN__)
+       lwz     itmp1,10*4(sp)            /* register r11 is callee saved         */
+#endif
+       lwz     pv,11*4(sp)               /* save PV register                     */
+
+       lwz     itmp3,12*4(sp)
+       lfd     ftmp1,14*4(sp)            /* registers f14-f31 are callee saved   */
+       lfd     ftmp2,16*4(sp)
+
+#if defined(__DARWIN__)
+       lwz     t1,18*4(r1)
+       lwz     t2,19*4(r1)
+       lwz     t3,20*4(r1)
+       lwz     t4,21*4(r1)
+       lwz     t5,22*4(r1)
+       lwz     t6,23*4(r1)
+       lwz     t7,24*4(r1)
+
+       lfd     ft0,26*4(r1)
+       lfd     ft1,28*4(r1)
+       lfd     ft2,30*4(r1)
+       lfd     ft3,32*4(r1)
+       lfd     ft4,34*4(r1)
+       lfd     ft5,36*4(r1)
+#else
+       RESTORE_TEMPORARY_REGISTERS(18)   /* the offset has to be even            */
+#endif
+
+       lwz     r0,40*4+LA_LR_OFFSET(r1)
        mtlr    r0
-       addi    r1,r1,148
-       lwz     pv,-12(r1)
-//     lwz     r30,-8(r1)
-       lwz     r31,-4(r1)
+       addi    r1,r1,40*4
        blr
 
 calljava_xhandler:
-       mr      r3,itmp1
-//     addis   pv,r31,ha16(builtinthrow-0b)
-       lwz     itmp1,lo16(builtinthrow-0b)(r31)
-       mtctr   itmp1
-       bctrl
-       b       calljava_regrestore
+       mr      a0,itmp1
+       bl      builtin_throw_exception
+       li      v0,0                      /* return NULL                          */
+       b       L_asm_calljavafunction_return
 
 
 
 
        .align 2
-    .long   0                         /* catch type all                       */
-    .long   calljava_xhandler2        /* handler pc                           */
-    .long   calljava_xhandler2        /* end pc                               */
-    .long   _asm_calljavafunction2    /* start pc                             */
-    .long   1                         /* extable size                         */
-    .long   0                         /* fltsave                              */
-    .long   0                         /* intsave                              */
-    .long   0                         /* isleaf                               */
-    .long   0                         /* IsSync                               */
-    .long   24                        /* frame size                           */
-    .long   0                         /* method pointer (pointer to name)     */
-       .long   0                         /* padding                              */
-
-_asm_calljavafunction2:
-_asm_calljavafunction2long:
-_asm_calljavafunction2double:
+
+       .long   0                         /* catch type all                       */
+       .long   calljava_xhandler2        /* handler pc                           */
+       .long   calljava_xhandler2        /* end pc                               */
+       .long   asm_calljavafunction2     /* start pc                             */
+       .long   1                         /* extable size                         */
+       .long   0                         /* line number table start              */
+       .long   0                         /* line number table size               */
+       .long   0                         /* fltsave                              */
+       .long   0                         /* intsave                              */
+       .long   0                         /* isleaf                               */
+       .long   0                         /* IsSync                               */
+       .long   0                         /* frame size                           */
+       .long   0                         /* method pointer (pointer to name)     */
+
+asm_calljavafunction2:
+asm_calljavafunction2int:
+asm_calljavafunction2long:
+asm_calljavafunction2float:
+asm_calljavafunction2double:
        mflr    r0
-       stw     r31,-4(r1)
-//     stw     r30,-8(r1)
-       stw     pv,-12(r1)
-       stw     r0,8(r1)
-       addi    r1,r1,-148
-       bl      0f
-0:
-       mflr    r31
-
-       stw     r16,40(r1)
-       stw         r17,44(r1)
-       stw     r18,48(r1)
-       stw         r19,52(r1)
-       stw     r20,56(r1)
-       stw     r21,60(r1)
-       stw     r22,64(r1)
-       stw     r23,68(r1)
-       stfd    f16,72(r1)
-       stfd    f17,80(r1)
-       stfd    f18,88(r1)
-       stfd    f19,96(r1)
-       stfd    f20,104(r1)
-       stfd    f21,112(r1)
-       stfd    f22,120(r1)
-       stfd    f23,128(r1)
+       stw     r0,LA_LR_OFFSET(r1)
+       stwu    r1,-40*4(r1)
+
+#if defined(__DARWIN__)
+       stw     itmp1,10*4(sp)            /* register r11 is callee saved         */
+#endif
+       stw     pv,11*4(sp)               /* save PV register                     */
+
+       stw     itmp3,12*4(sp)            /* registers r14-r31 are callee saved   */
+       stfd    ftmp1,14*4(sp)            /* registers f14-f31 are callee saved   */
+       stfd    ftmp2,16*4(sp)
+
+#if defined(__DARWIN__)
+       stw     t1,18*4(r1)
+       stw     t2,19*4(r1)
+       stw     t3,20*4(r1)
+       stw     t4,21*4(r1)
+       stw     t5,22*4(r1)
+       stw     t6,23*4(r1)
+       stw     t7,24*4(r1)
+
+       stfd    ft0,26*4(r1)
+       stfd    ft1,28*4(r1)
+       stfd    ft2,30*4(r1)
+       stfd    ft3,32*4(r1)
+       stfd    ft4,34*4(r1)
+       stfd    ft5,36*4(r1)
+#else
+       SAVE_TEMPORARY_REGISTERS(18)      /* the offset has to be even            */
+#endif
 
        stw     r3,36(r1)                 /* save method pointer for compiler     */
-       addi    r2,r1,36
        mr      itmp1,r6                  /* pointer to arg block                 */
        mr      itmp2,r4                  /* arg count                            */
 
-       mr.     itmp2,itmp2
-       ble     calljava_argsloaded
+       addi    itmp1,itmp1,-sizejniblock /* initialize pointer (smaller code)    */
+       addi    itmp2,itmp2,1             /* initialize argument count            */
+       li      r17,0                     /* initialize integer argument counter  */
+       li      r18,0                     /* initialize float argument counter    */
 
-       addi    itmp2,itmp2,-1
-       lwz     r3,offjniitem+4(itmp1)
+L_register_copy:
+       addi    itmp1,itmp1,sizejniblock  /* goto next argument block             */
+       addi    itmp2,itmp2,-1            /* argument count - 1                   */
        mr.     itmp2,itmp2
-       ble     calljava_argsloaded
+       beq     L_register_copy_done
 
-       addi    itmp2,itmp2,-1
-       lwz     r4,offjniitem+sizejniblock*1+4(itmp1)
-       mr.     itmp2,itmp2
-       ble     calljava_argsloaded
-    addi    itmp2,itmp2,-1
-
-    addi    itmp2,itmp2,-1
-    lwz     r5,offjniitem+sizejniblock*2+4(itmp1)
-    mr.     itmp2,itmp2
-    ble     calljava_argsloaded
-    addi    itmp2,itmp2,-1
-
-    addi    itmp2,itmp2,-1
-    lwz     r6,offjniitem+sizejniblock*3+4(itmp1)
-    mr.     itmp2,itmp2
-    ble     calljava_argsloaded
-    addi    itmp2,itmp2,-1
-
-calljava_argsloaded:
-//     addis   mptr,r31,ha16(_asm_call_jit_compiler-0b)
-       addi    mptr,r31,lo16(_asm_call_jit_compiler-0b)
+       lwz     itmp3,offjniitemtype+4(itmp1)
+       andi.   r0,itmp3,0x0002           /* is this a float/double type?         */
+       bne     L_register_handle_float
+
+       cmpwi   r17,INT_ARG_CNT           /* are we out of integer argument       */
+       beq     L_register_copy           /* registers? yes, next loop            */
+
+       andi.   r0,itmp3,0x0001           /* is this a long type?                 */
+       bne     L_register_handle_long
+
+L_register_handle_int:
+#if defined(__DARWIN__)
+       lis     itmp3,ha16(jumptable_int)
+       addi    itmp3,itmp3,lo16(jumptable_int)
+#else
+       lis     itmp3,jumptable_int@ha
+       addi    itmp3,itmp3,jumptable_int@l
+#endif
+       slwi    r19,r17,2                 /* multiple of 4-bytes                  */
+       add     itmp3,itmp3,r19           /* calculate address of jumptable       */
+       lwz     itmp3,0(itmp3)            /* load function address                */
+       addi    r17,r17,1                 /* integer argument counter + 1         */
+       mtctr   itmp3
+       bctr
+
+L_register_handle_long:
+#if defined(__DARWIN__)
+       lis     itmp3,ha16(jumptable_long)
+       addi    itmp3,itmp3,lo16(jumptable_long)
+#else
+       lis     itmp3,jumptable_long@ha
+       addi    itmp3,itmp3,jumptable_long@l
+#endif
+       addi    r19,r17,1                 /* align to even numbers                */
+       srwi    r19,r19,1
+       slwi    r19,r19,1
+       slwi    r19,r19,2                 /* multiple of 4-bytes                  */
+       add     itmp3,itmp3,r19           /* calculate address of jumptable       */
+       lwz     itmp3,0(itmp3)            /* load function address                */
+       addi    r17,r17,1                 /* integer argument counter + 1         */
+       mtctr   itmp3
+       bctr
+
+L_register_handle_float:
+L_register_copy_done:
+
+L_stack_copy_done:
+       addi    itmp1,r1,36
+#if defined(__DARWIN__)
+       lis     mptr,ha16(asm_call_jit_compiler)
+       addi    mptr,mptr,lo16(asm_call_jit_compiler)
+#else
+       lis     mptr,asm_call_jit_compiler@ha
+       addi    mptr,mptr,asm_call_jit_compiler@l
+#endif
        stw     mptr,32(r1)
        addi    mptr,r1,28
 
@@ -359,53 +340,136 @@ calljava_argsloaded:
        bctrl
 1:
        mflr    itmp1
-       addi    pv,itmp1,lo16(_asm_calljavafunction2-1b)
-       
-calljava_regrestore2:
-       lwz             r16,40(r1)
-       lwz             r17,44(r1)
-       lwz             r18,48(r1)
-       lwz             r19,52(r1)
-       lwz             r20,56(r1)
-       lwz             r21,60(r1)
-       lwz             r22,64(r1)
-       lwz             r23,68(r1)
-       lfd             f16,72(r1)
-       lfd             f17,80(r1)
-       lfd             f18,88(r1)
-       lfd             f19,96(r1)
-       lfd             f20,104(r1)
-       lfd             f21,112(r1)
-       lfd             f22,120(r1)
-       lfd             f23,128(r1)
-
-       lwz     r0,148+8(r1)
+#if defined(__DARWIN__)
+       addi    pv,itmp1,lo16(asm_calljavafunction2-1b)
+#else
+       addi    pv,itmp1,(asm_calljavafunction2-1b)@l
+#endif
+
+L_asm_calljavafunction2_return:
+#if defined(__DARWIN__)
+       lwz     itmp1,10*4(sp)            /* register r11 is callee saved         */
+#endif
+       lwz     pv,11*4(sp)               /* save PV register                     */
+
+       lwz     itmp3,12*4(sp)
+       lfd     ftmp1,14*4(sp)            /* registers f14-f31 are callee saved   */
+       lfd     ftmp2,16*4(sp)
+
+#if defined(__DARWIN__)
+       lwz     t1,18*4(r1)
+       lwz     t2,19*4(r1)
+       lwz     t3,20*4(r1)
+       lwz     t4,21*4(r1)
+       lwz     t5,22*4(r1)
+       lwz     t6,23*4(r1)
+       lwz     t7,24*4(r1)
+
+       lfd     ft0,26*4(r1)
+       lfd     ft1,28*4(r1)
+       lfd     ft2,30*4(r1)
+       lfd     ft3,32*4(r1)
+       lfd     ft4,34*4(r1)
+       lfd     ft5,36*4(r1)
+#else
+       RESTORE_TEMPORARY_REGISTERS(18)   /* the offset has to be even            */
+#endif
+
+       lwz     r0,40*4+LA_LR_OFFSET(r1)
        mtlr    r0
-       addi    r1,r1,148
-       lwz     pv,-12(r1)
-//     lwz     r30,-8(r1)
-       lwz     r31,-4(r1)
+       addi    r1,r1,40*4
        blr
 
 calljava_xhandler2:
        mr      r3,itmp1
-//     addis   pv,r31,ha16(builtinthrow-0b)
-       lwz     itmp1,lo16(builtinthrow-0b)(r31)
-       mtctr   itmp1
-       bctrl
-       b       calljava_regrestore2
+       bl      builtin_throw_exception
+       li      v0,0                      /* return NULL                          */
+       b       L_asm_calljavafunction2_return
+
+
+jumptable_int:
+       .long   L_handle_a0
+       .long   L_handle_a1
+       .long   L_handle_a2
+       .long   L_handle_a3
+       .long   L_handle_a4
+       .long   L_handle_a5
+       .long   L_handle_a6
+       .long   L_handle_a7
+
+L_handle_a0:
+       lwz     a0,offjniitem+4(itmp1)
+       b       L_register_copy
+L_handle_a1:
+       lwz     a1,offjniitem+4(itmp1)
+       b       L_register_copy
+L_handle_a2:
+       lwz     a2,offjniitem+4(itmp1)
+       b       L_register_copy
+L_handle_a3:
+       lwz     a3,offjniitem+4(itmp1)
+       b       L_register_copy
+L_handle_a4:
+       lwz     a4,offjniitem+4(itmp1)
+       b       L_register_copy
+L_handle_a5:
+       lwz     a5,offjniitem+4(itmp1)
+       b       L_register_copy
+L_handle_a6:
+       lwz     a6,offjniitem+4(itmp1)
+       b       L_register_copy
+L_handle_a7:
+       lwz     a7,offjniitem+4(itmp1)
+       b       L_register_copy
+
+
+jumptable_long:
+#if defined(__DARWIN__)
+#else
+       /* we have two entries here, so we get the even argument register
+       alignment for linux */
+
+       .long   L_handle_a0_a1
+       .long   0
+       .long   L_handle_a2_a3
+       .long   0
+       .long   L_handle_a4_a5
+       .long   0
+       .long   L_handle_a6_a7
+       .long   0
+#endif
 
+L_handle_a0_a1:
+       lwz     a0,offjniitem+0(itmp1)
+       lwz     a1,offjniitem+4(itmp1)
+       b       L_register_copy
+L_handle_a2_a3:
+       lwz     a2,offjniitem+0(itmp1)
+       lwz     a3,offjniitem+4(itmp1)
+       b       L_register_copy
+L_handle_a4_a5:
+       lwz     a4,offjniitem+0(itmp1)
+       lwz     a5,offjniitem+4(itmp1)
+       b       L_register_copy
+L_handle_a6_a7:
+       lwz     a6,offjniitem+0(itmp1)
+       lwz     a7,offjniitem+4(itmp1)
+       b       L_register_copy
 
-_asm_call_jit_compiler:
-0:
-       mflr    itmp1
-       stw     r31,-4(r1)
-//     stw     pv,-8(r1)
-       stw     r29,-12(r1)
-       stw     itmp1,8(r1)
-       addi    r1,r1,-176
-       mr      r31,pv
 
+/* asm_call_jit_compiler *******************************************************
+
+   Invokes the compiler for untranslated JavaVM methods.
+
+*******************************************************************************/
+
+asm_call_jit_compiler:
+       mflr    r0
+       stw     r0,LA_LR_OFFSET(r1)         /* save return address                */
+       stwu    r1,-((LA_SIZE + 5*4 + INT_ARG_CNT*4 + FLT_ARG_CNT*8 + 3*4)+sizestackframeinfo)(r1)
+       stw     itmp1,(LA_SIZE + 5*4 + INT_ARG_CNT*4 + FLT_ARG_CNT*8 + 1*4)(r1)
+
+       mr      itmp1,r0                    /* save return address to other reg.  */
        lwz     itmp3,-12(itmp1)
        srwi    itmp3,itmp3,16
        andi.   itmp3,itmp3,31
@@ -423,75 +487,118 @@ _asm_call_jit_compiler:
        add     mptr,mptr,itmp3
                
 noregchange:
-       mr      r29,mptr
-       stw     r3,28(r1)
-       stw     r4,32(r1)
-       stw     r5,36(r1)
-       stw     r6,40(r1)
-       stw     r7,44(r1)
-       stw     r8,48(r1)
-       stw     r9,52(r1)
-       stfd    f1,56(r1)
-       stfd    f2,64(r1)
-       stfd    f3,72(r1)
-       stfd    f4,80(r1)
-       stfd    f5,88(r1)
-       stfd    f6,96(r1)
-       stfd    f7,104(r1)
-       stfd    f8,112(r1)
-       stfd    f9,120(r1)
-       stfd    f10,128(r1)
-       stfd    f11,136(r1)
-       stfd    f12,144(r1)
-       stfd    f13,152(r1)
-       stw     r10,160(r1)
-
-       lwz     r3,0(r2)
-//     addis   pv,r31,ha16(jitcompile-0b)
-       lwz     itmp1,lo16(jitcompile-0b)(r31)
-       mtctr   itmp1
-       bctrl
+       stw     mptr,(LA_SIZE + 5*4 + INT_ARG_CNT*4 + FLT_ARG_CNT*8 + 2*4)(r1)
+
+#if defined(__DARWIN__)
+       stw     a0,(LA_WORD_SIZE+5+0)*4(r1)
+       stw     a1,(LA_WORD_SIZE+5+1)*4(r1)
+       stw     a2,(LA_WORD_SIZE+5+2)*4(r1)
+       stw     a3,(LA_WORD_SIZE+5+3)*4(r1)
+       stw     a4,(LA_WORD_SIZE+5+4)*4(r1)
+       stw     a5,(LA_WORD_SIZE+5+5)*4(r1)
+       stw     a6,(LA_WORD_SIZE+5+6)*4(r1)
+       stw     a7,(LA_WORD_SIZE+5+7)*4(r1)
+
+       stfd    fa0,(LA_WORD_SIZE+5+8)*4(r1)
+       stfd    fa1,(LA_WORD_SIZE+5+10)*4(r1)
+       stfd    fa2,(LA_WORD_SIZE+5+12)*4(r1)
+       stfd    fa3,(LA_WORD_SIZE+5+14)*4(r1)
+       stfd    fa4,(LA_WORD_SIZE+5+16)*4(r1)
+       stfd    fa5,(LA_WORD_SIZE+5+18)*4(r1)
+       stfd    fa6,(LA_WORD_SIZE+5+20)*4(r1)
+       stfd    fa7,(LA_WORD_SIZE+5+22)*4(r1)
+       stfd    fa8,(LA_WORD_SIZE+5+24)*4(r1)
+       stfd    fa9,(LA_WORD_SIZE+5+26)*4(r1)
+       stfd    fa10,(LA_WORD_SIZE+5+28)*4(r1)
+       stfd    fa11,(LA_WORD_SIZE+5+30)*4(r1)
+       stfd    fa12,(LA_WORD_SIZE+5+32)*4(r1)
+#else
+       SAVE_ARGUMENT_REGISTERS(LA_WORD_SIZE+1)
+#endif
+
+       addi    a0,sp,(LA_SIZE + 5*4 + INT_ARG_CNT*4 + FLT_ARG_CNT*8 + 3*4)
+       li      a1,0                        /* we don't have pv handy             */
+       addi    a2,sp,(LA_SIZE + 5*4 + INT_ARG_CNT*4 + FLT_ARG_CNT*8 + 3*4)+sizestackframeinfo
+       lwz     a3,(LA_SIZE + 5*4 + INT_ARG_CNT*4 + FLT_ARG_CNT*8 + 3*4)+sizestackframeinfo+LA_LR_OFFSET(sp)
+       mr      a4,a3                       /* xpc is equal to ra                 */
+       bl      stacktrace_create_extern_stackframeinfo
+
+       lwz     itmp1,(LA_SIZE + 5*4 + INT_ARG_CNT*4 + FLT_ARG_CNT*8 + 1*4)(r1)
+       lwz     a0,0(itmp1)
+       bl      jit_compile                 /* compile the Java method            */
+       mr      pv,r3                       /* move address to pv register        */
+
+       addi    a0,sp,(LA_SIZE + 5*4 + INT_ARG_CNT*4 + FLT_ARG_CNT*8 + 3*4)
+       bl      stacktrace_remove_stackframeinfo
+
+#if defined(__DARWIN__)
+       lwz     a0,(LA_WORD_SIZE+5+0)*4(r1)
+       lwz     a1,(LA_WORD_SIZE+5+1)*4(r1)
+       lwz     a2,(LA_WORD_SIZE+5+2)*4(r1)
+       lwz     a3,(LA_WORD_SIZE+5+3)*4(r1)
+       lwz     a4,(LA_WORD_SIZE+5+4)*4(r1)
+       lwz     a5,(LA_WORD_SIZE+5+5)*4(r1)
+       lwz     a6,(LA_WORD_SIZE+5+6)*4(r1)
+       lwz     a7,(LA_WORD_SIZE+5+7)*4(r1)
+
+       lfd     fa0,(LA_WORD_SIZE+5+8)*4(r1)
+       lfd     fa1,(LA_WORD_SIZE+5+10)*4(r1)
+       lfd     fa2,(LA_WORD_SIZE+5+12)*4(r1)
+       lfd     fa3,(LA_WORD_SIZE+5+14)*4(r1)
+       lfd     fa4,(LA_WORD_SIZE+5+16)*4(r1)
+       lfd     fa5,(LA_WORD_SIZE+5+18)*4(r1)
+       lfd     fa6,(LA_WORD_SIZE+5+20)*4(r1)
+       lfd     fa7,(LA_WORD_SIZE+5+22)*4(r1)
+       lfd     fa8,(LA_WORD_SIZE+5+24)*4(r1)
+       lfd     fa9,(LA_WORD_SIZE+5+26)*4(r1)
+       lfd     fa10,(LA_WORD_SIZE+5+28)*4(r1)
+       lfd     fa11,(LA_WORD_SIZE+5+30)*4(r1)
+       lfd     fa12,(LA_WORD_SIZE+5+32)*4(r1)
+#else
+       RESTORE_ARGUMENT_REGISTERS(LA_WORD_SIZE+1)
+#endif
+
+       lwz     mptr,(LA_SIZE + 5*4 + INT_ARG_CNT*4 + FLT_ARG_CNT*8 + 2*4)(r1)
+
+       lwz     itmp1,(LA_SIZE + 5*4 + INT_ARG_CNT*4 + FLT_ARG_CNT*8 + 3*4)+sizestackframeinfo+LA_LR_OFFSET(r1)
+       mtlr    itmp1
+       addi    r1,r1,(LA_SIZE + 5*4 + INT_ARG_CNT*4 + FLT_ARG_CNT*8 + 3*4)+sizestackframeinfo
+
+       mr.     pv,pv                       /* test for exception                 */
+       beq     L_asm_call_jit_compiler_exception
 
-       mr      pv,r3
-       mr      mptr,r29
-       lwz     r3,28(r1)
-       lwz             r4,32(r1)
-       lwz             r5,36(r1)
-       lwz             r6,40(r1)
-       lwz             r7,44(r1)
-       lwz             r8,48(r1)
-       lwz             r9,52(r1)
-       lfd             f1,56(r1)
-       lfd             f2,64(r1)
-       lfd             f3,72(r1)
-       lfd             f4,80(r1)
-       lfd             f5,88(r1)
-       lfd             f6,96(r1)
-       lfd             f7,104(r1)
-       lfd             f8,112(r1)
-       lfd             f9,120(r1)
-       lfd             f10,128(r1)
-       lfd             f11,136(r1)
-       lfd             f12,144(r1)
-       lfd             f13,152(r1)
-       lwz             r10,160(r1)
-
-       lwz     itmp1,176+8(r1)
        lwz     itmp3,-12(itmp1)
        extsh   itmp3,itmp3
        add     mptr,mptr,itmp3
-       stw     pv,0(mptr)
+       stw     pv,0(mptr)                  /* store method address               */
 
-       mtctr   pv
+       mtctr   pv                          /* move method address to control reg */
+       bctr                                /* and call the Java method           */
 
-       lwz     r0,176+8(r1)
-       mtlr    r0
-       addi    r1,r1,176
-       lwz     r29,-12(r1)
-//     lwz     pv,-8(r1)
-       lwz     r31,-4(r1)
-       bctr
+L_asm_call_jit_compiler_exception:
+#if defined(USE_THREADS) && defined(NATIVE_THREADS)
+       mflr    r0
+       stw     r0,LA_LR_OFFSET(sp)
+       stwu    sp,-LA_SIZE_ALIGNED(sp)     /* preserve linkage area              */
+       bl      builtin_asm_get_exceptionptrptr
+       lwz     r0,LA_SIZE_ALIGNED+LA_LR_OFFSET(sp)
+       mtlr    r0      
+       addi    sp,sp,LA_SIZE_ALIGNED
+#else
+# if defined(__DARWIN__)
+       lwz     v0,lo16(_no_threads_exceptionptr-0b)(pv)
+# else
+       lis     v0,_no_threads_exceptionptr@ha
+       addi    v0,v0,_no_threads_exceptionptr@l
+# endif
+#endif
+       lwz     xptr,0(v0)                  /* get the exception pointer          */
+       li      itmp3,0
+       stw     itmp3,0(v0)                 /* clear the exception pointer        */
 
+       mflr    xpc
+       addi    xpc,xpc,-4
+       b       asm_handle_nat_exception
 
 
 /********************* function asm_handle_exception ***************************
@@ -506,295 +613,159 @@ noregchange:
 *                                                                              *
 *******************************************************************************/
                
-_asm_handle_nat_exception:
-       mflr    r2
-       lwz     itmp3,4(r2)
+asm_handle_nat_exception:
+       mflr    r9
+       lwz     itmp3,4(r9)
        extsh   itmp3,itmp3
-       add     pv,itmp3,r2
-       lwz     itmp3,8(r2)
+       add     pv,itmp3,r9
+       lwz     itmp3,8(r9)
        srwi    itmp3,itmp3,16
        cmpwi   itmp3,0x3dad
-       bne     _asm_handle_exception
-       lwz     itmp3,8(r2)
+       bne     asm_handle_exception
+       lwz     itmp3,8(r9)
        slwi    itmp3,itmp3,16
        add     pv,pv,itmp3
 
-_asm_handle_exception:
-       addi    r1,r1,-18*4
-       stw     r0,0*4(r1)
-       stw     r2,1*4(r1)
-       stw     r3,2*4(r1)
-       stw     r4,3*4(r1)
-       stw     r5,4*4(r1)
-       stw     r6,5*4(r1)
-       stw     r7,6*4(r1)
-       stw     r8,7*4(r1)
-       stw     r9,8*4(r1)
-       stw     r10,9*4(r1)
-       stw     r16,10*4(r1)
-       stw     r17,11*4(r1)
-       stw     r18,12*4(r1)
-       stw     r19,13*4(r1)
-       stw     r20,14*4(r1)
-       stw     r21,15*4(r1)
-       stw     r22,16*4(r1)
-       stw     r23,17*4(r1)
-
-       li      r2,1
-ex_stack_loop:
-       addi    r1,r1,-4*4
-       stw     xptr,0*4(r1)
-       stw     xpc,1*4(r1)
-       mflr    xptr
-       stw     xptr,2*4(r1)
-       stw     r2,3*4(r1)
-
-       lwz     r3,0*4(r1)            /* exception pointer                        */
-       lwz     r4,MethodPointer(pv)  /* method pointer                           */
-       mr      r5,xpc                /* exception pc                             */
-/*     mr      r6,r2 */
-       li      r6,0                  /* line number                              */
-       li      r7,4                  /* set no unwind flag                       */
-
-       bl      0f
-0:
-       mflr    itmp1
-       lwz     itmp1,lo16(builtin_traceexception-0b)(itmp1)
-       mtctr   itmp1
-       addi    r1,r1,-(24+5*4)       /* 24 linkage area + 5 argument * 4         */
-       bctrl
-       addi    r1,r1,(24+5*4)
-
-       lwz     xptr,2*4(r1)
-       mtlr    xptr
-       lwz     xptr,0*4(r1)          /* restore xptr                             */
-       lwz     xpc,1*4(r1)
-       lwz     r2,3*4(r1)
-       addi    r1,r1,4*4
-
-       lwz     r3,ExTableSize(pv)    /* r3 = exception table size                */
-       mr.     r3,r3                 /* if empty table skip                      */
-       beq     empty_table
-
-       addi    r4,pv,ExTableStart    /* r4 = start of exception table            */
-
-ex_table_loop:
-       lwz     r5,ExStartPC(r4)      /* r5 = exception start pc                  */
-       cmplw   r5,xpc                /* (startpc <= xpc)                         */
-       bgt     ex_table_cont
-       lwz     r5,ExEndPC(r4)        /* r5 = exception end pc                    */
-       cmplw   xpc,r5                /* (xpc < endpc)                            */
-       bge     ex_table_cont
-       lwz     r7,ExCatchType(r4)    /* r7 = exception catch type                */
-       mr.     r7,r7
-       beq     ex_handle_it
-
-       lwz     itmp3,offclassloaded(r7)
-       mr.     itmp3,itmp3
-       bne     L_class_loaded
-
-       addi    r1,r1,-16*4           /* allocate stack                           */
-       stw     r3,7*4(r1)            /* save used registers                      */
-       stw     r4,8*4(r1)            /* 6*4 (linkage) + 1*4 (arg1) + 7*4 (save)  */
-       stw     r2,9*4(r1)
-       stw     xptr,10*4(r1)
-       stw     xpc,11*4(r1)
-       mflr    xptr
-       stw     xptr,12*4(r1)
-       stw     r7,13*4(r1)
-
-       mr      r3,r7                 /* arg1 = exceptionclass                    */
-       bl      0f
-0:
-       mflr    itmp1
-       lwz     itmp1,lo16(class_load-0b)(itmp1)
-       mtctr   itmp1
-       bctrl
+asm_handle_exception:
+       addi    sp,sp,-(ARG_CNT+TMP_CNT)*8  /* create maybe-leaf stackframe       */
 
-       lwz     r3,7*4(r1)
-       lwz     r4,8*4(r1)
-       lwz     r2,9*4(r1)
-       lwz     xptr,10*4(r1)
-       lwz     xpc,11*4(r1)
-       lwz     itmp3,12*4(r1)
-       mtlr    itmp3
-       lwz     r7,13*4(r1)     
-       addi    r1,r1,16*4
-
-L_class_loaded:
-       lwz     itmp3,offclasslinked(r7)
-       mr.     itmp3,itmp3
-       addi    r1,r1,-16*4           /* allocate stack                           */
-       stw     r7,13*4(r1)
-       bne     L_class_linked
-
-       stw     r3,7*4(r1)            /* save used registers                      */
-       stw     r4,8*4(r1)            /* 6*4 (linkage) + 1*4 (arg1) + 7*4 (save)  */
-       stw     r2,9*4(r1)
-       stw     xptr,10*4(r1)
-       stw     xpc,11*4(r1)
-       mflr    xptr
-       stw     xptr,12*4(r1)
-
-       mr      r3,r7                 /* arg1 = exceptionclass                    */
-       bl      0f
-0:
-       mflr    itmp1
-       lwz     itmp1,lo16(class_link-0b)(itmp1)
-       mtctr   itmp1
-       bctrl
+#if defined(__DARWIN__)
+#else
+       SAVE_ARGUMENT_REGISTERS(0)          /* we save arg and temp registers in  */
+       SAVE_TEMPORARY_REGISTERS(ARG_CNT)   /* case this is a leaf method         */
+#endif
+
+       li      a3,(ARG_CNT+TMP_CNT)*8      /* prepare a3 for handle_exception    */
+       li      a4,1                        /* set maybe-leaf flag                */
+
+L_asm_handle_exception_stack_loop:
+       addi    sp,sp,-(LA_WORD_SIZE+4+5)*4 /* allocate stack                     */
+       stw     xptr,LA_SIZE+4*4(sp)        /* save exception pointer             */
+       stw     xpc,LA_SIZE+5*4(sp)         /* save exception pc                  */
+       stw     pv,LA_SIZE+6*4(sp)          /* save data segment pointer          */
+       mflr    r0                          /* save return address                */
+       stw     r0,LA_SIZE+5*4(sp)
+       add     a3,a3,sp                    /* calculate Java sp into a3...       */
+       addi    a3,a3,(LA_WORD_SIZE+4+5)*4
+       stw     a4,LA_SIZE+8*4(sp)          /* save maybe-leaf flag               */
+
+       mr      a0,xptr                     /* pass exception pointer             */
+       mr      a1,xpc                      /* pass exception pc                  */
+       mr      a2,pv                       /* pass data segment pointer          */
+                                           /* a3 is still set                    */
+       bl      exceptions_handle_exception
+
+       mr.     v0,v0
+       beq     L_asm_handle_exception_not_catched
+
+       mr      xpc,v0                      /* move handlerpc into xpc            */
+       lwz     xptr,LA_SIZE+4*4(sp)        /* restore exception pointer          */
+       lwz     pv,LA_SIZE+6*4(sp)          /* restore data segment pointer       */
+       lwz     r0,LA_SIZE+5*4(sp)          /* restore return address             */
+       mtlr    r0
+       lwz     a4,LA_SIZE+8*4(sp)          /* get maybe-leaf flag                */
+       addi    sp,sp,(LA_WORD_SIZE+4+5)*4  /* free stack frame                   */
+
+       mr.     a4,a4
+       beq     L_asm_handle_exception_no_leaf
+
+#if defined(__DARWIN__)
+#else
+       RESTORE_ARGUMENT_REGISTERS(0)       /* if this is a leaf method, we have  */
+       RESTORE_TEMPORARY_REGISTERS(ARG_CNT)/* to restore arg and temp registers  */
+#endif
+
+       addi    sp,sp,(ARG_CNT+TMP_CNT)*8   /* remove maybe-leaf stackframe       */
 
-       lwz     r3,7*4(r1)
-       lwz     r4,8*4(r1)
-       lwz     r2,9*4(r1)
-       lwz     xptr,10*4(r1)
-       lwz     xpc,11*4(r1)
-       lwz     itmp3,12*4(r1)
-       mtlr    itmp3
-
-L_class_linked:
-_crit_restart1:
-       lwz     r7,13*4(r1)     
-_crit_begin1:
-       lwz     r6,offobjvftbl(xptr)  /* r6 = vftblptr(xptr)                      */
-       lwz     r7,offclassvftbl(r7)  /* r7 = vftblptr(catchtype) class (not obj) */
-       lwz     r6,offbaseval(r6)     /* r6 = baseval(xptr)                       */
-       lwz     r8,offbaseval(r7)     /* r8 = baseval(catchtype)                  */
-       lwz     r7,offdiffval(r7)     /* r7 = diffval(catchtype)                  */
-_crit_end1:
-       subf    r6,r8,r6              /* r6 = baseval(xptr) - baseval(catchtype)  */
-       cmplw   r6,r7                 /* xptr is instanceof catchtype             */
-       addi    r1,r1,16*4
-       bgt     ex_table_cont         /* if (false) continue                      */
-
-ex_handle_it:
-       lwz     xpc,ExHandlerPC(r4)   /* xpc = exception handler pc               */
-       mr.     r2,r2
-       beq     ex_jump
-
-       lwz     r0,0*4(r1)
-       lwz     r2,1*4(r1)
-       lwz     r3,2*4(r1)
-       lwz     r4,3*4(r1)
-       lwz     r5,4*4(r1)
-       lwz     r6,5*4(r1)
-       lwz     r7,6*4(r1)
-       lwz     r8,7*4(r1)
-       lwz     r9,8*4(r1)
-       lwz     r10,9*4(r1)
-       lwz     r16,10*4(r1)
-       lwz     r17,11*4(r1)
-       lwz     r18,12*4(r1)
-       lwz     r19,13*4(r1)
-       lwz     r20,14*4(r1)
-       lwz     r21,15*4(r1)
-       lwz     r22,16*4(r1)
-       lwz     r23,17*4(r1)
-       addi    r1,r1,18*4
-
-ex_jump:
-       mtctr   xpc
+L_asm_handle_exception_no_leaf:
+       mtctr   xpc                         /* jump to the handler                */
        bctr
 
-ex_table_cont:
-       addi    r4,r4,ExEntrySize
-       addic.  r3,r3,-1
-       bgt     ex_table_loop
-
-empty_table:
-       mr.     r2,r2                 /* if here the first time, then             */
-       beq     ex_already_cleared
-       addi    r1,r1,18*4            /* deallocate stack and                     */
-       li      r2,0                  /* clear the no unwind flag                 */
-ex_already_cleared:
-       lwz     r3,IsSync(pv)
-       mr.     r3,r3
-       beq     no_monitor_exit
-       add     r3,r1,r3
-       lwz     r6,-4(r3)
-
-       addi    r1,r1,-6*4
-       stw     r3,0*4(r1)
-       stw     r4,1*4(r1)
-       stw     r2,2*4(r1)
-       stw     xptr,3*4(r1)
-       stw     xpc,4*4(r1)
-       mflr    xptr
-       stw     xptr,5*4(r1)
-
-       mr      r3,r6
-       bl      0f
-0:
-       mflr    itmp1
-       lwz     itmp1,lo16(builtin_monitorexit-0b)(itmp1)
-       mtctr   itmp1
-       addi    r1,r1,-40
-       bctrl
-       addi    r1,r1,40
-
-       lwz     xptr,5*4(r1)
-       mtlr    xptr
-       lwz     r3,0*4(r1)
-       lwz     r4,1*4(r1)
-       lwz     r2,2*4(r1)
-       lwz     xptr,3*4(r1)
-       lwz     xpc,4*4(r1)
-       addi    r1,r1,6*4
-
-no_monitor_exit:
-       lwz     r3,FrameSize(pv)      /* r3 = frame size                          */
-       add     r1,r1,r3              /* unwind stack                             */
-       mr      r3,r1                 /* r3 = pointer to save area                */
-       lwz     r4,IsLeaf(pv)         /* r4 = is leaf procedure                   */
-       mr.     r4,r4
-       bne     ex_no_restore         /* if (leaf) skip                           */
-       lwz     r4,8(r3)              /* restore ra                               */
-       mtlr    r4                    /* t0--                                     */
-ex_no_restore:
-       mflr    r4                    /* the new xpc is ra                        */
-       mr      xpc,r4
-       lwz     r4,IntSave(pv)        /* r4 = saved int register count            */
+L_asm_handle_exception_not_catched:
+       lwz     xptr,LA_SIZE+4*4(sp)        /* restore exception pointer          */
+       lwz     pv,LA_SIZE+6*4(sp)          /* restore data segment pointer       */
+       lwz     r0,LA_SIZE+5*4(sp)          /* restore return address             */
+       mtlr    r0
+       lwz     a4,LA_SIZE+8*4(sp)          /* get maybe-leaf flag                */
+       addi    sp,sp,(LA_WORD_SIZE+4+5)*4  /* free stack frame                   */
+
+       mr.     a4,a4
+       beq     L_asm_handle_exception_no_leaf_stack
+
+       addi    sp,sp,(ARG_CNT+TMP_CNT)*8   /* remove maybe-leaf stackframe       */
+       li      a4,0                        /* clear the maybe-leaf flag          */
+
+L_asm_handle_exception_no_leaf_stack:
+       lwz     t0,FrameSize(pv)            /* get frame size                     */
+       add     t0,sp,t0                    /* pointer to save area               */
+
+       lwz     t1,IsLeaf(pv)               /* is leaf procedure                  */
+       mr.     t1,t1
+       bne     L_asm_handle_exception_no_ra_restore
+
+       lwz     r0,LA_LR_OFFSET(t0)         /* restore ra                         */
+       mtlr    r0
+
+L_asm_handle_exception_no_ra_restore:
+       mflr    xpc                         /* the new xpc is ra                  */
+       lwz     t1,IntSave(pv)              /* t1 = saved int register count      */
        bl      ex_int1
 ex_int1:
-       mflr    r5
-       addi    r5,r5,lo16(ex_int2-ex_int1)
-       slwi    r4,r4,2
-       subf    r5,r4,r5
-       mtctr   r5
+       mflr    t2                          /* t2 = current pc                    */
+#if defined(__DARWIN__)
+       addi    t2,t2,lo16(ex_int2-ex_int1)
+#else
+       addi    t2,t2,(ex_int2-ex_int1)@l
+#endif
+       slwi    t1,t1,2                     /* t1 = register count * 4            */
+       subf    t2,t1,t2                    /* t2 = IntSave - t1                  */
+       mtctr   t2
        bctr
-       lwz     r14,-40(r3)
-       lwz     r15,-36(r3)
-       lwz     r24,-32(r3)
-       lwz     r25,-28(r3)
-       lwz     r26,-24(r3)
-       lwz     r27,-20(r3)
-       lwz     r28,-16(r3)
-       lwz     r29,-12(r3)
-       lwz     r30,-8(r3)
-       lwz     r31,-4(r3)
+
+       lwz     s0,-10*4(t0)
+       lwz     s1,-9*4(t0)
+       lwz     s2,-8*4(t0)
+       lwz     s3,-7*4(t0)
+       lwz     s4,-6*4(t0)
+       lwz     s5,-5*4(t0)
+       lwz     s6,-4*4(t0)
+       lwz     s7,-3*4(t0)
+       lwz     s8,-2*4(t0)
+       lwz     s9,-1*4(t0)
+
 ex_int2:
-       subf    r3,r4,r3
+       subf    t0,t1,t0                    /* t0 = t0 - register count * 4       */
 
-       lwz     r4,FltSave(pv)
+       lwz     t1,FltSave(pv)
        bl      ex_flt1
 ex_flt1:
-       mflr    r5
-       addi    r5,r5,lo16(ex_flt2-ex_flt1)
-       slwi    r4,r4,2
-       subf    r5,r4,r5
-       mtctr   r5
+       mflr    t2
+#if defined(__DARWIN__)
+       addi    t2,t2,lo16(ex_flt2-ex_flt1)
+#else
+       addi    t2,t2,(ex_flt2-ex_flt1)@l
+#endif
+       slwi    t1,t1,2                     /* t1 = register count * 4            */
+       subf    t2,t1,t2                    /* t2 = FltSave - t1                  */
+       mtctr   t2
        bctr
-       lfd     f14,-80(r3)
-       lfd     f15,-72(r3)
-       lfd     f24,-64(r3)
-       lfd     f25,-56(r3)
-       lfd     f26,-48(r3)
-       lfd     f27,-40(r3)
-       lfd     f28,-32(r3)
-       lfd     f29,-24(r3)
-       lfd     f30,-16(r3)
-       lfd     f31,-8(r3)
+
+       lfd     fs0,-10*8(t0)
+       lfd     fs1,-9*8(t0)
+       lfd     fs2,-8*8(t0)
+       lfd     fs3,-7*8(t0)
+       lfd     fs4,-6*8(t0)
+       lfd     fs5,-5*8(t0)
+       lfd     fs6,-4*8(t0)
+       lfd     fs7,-3*8(t0)
+       lfd     fs8,-2*8(t0)
+       lfd     fs9,-1*8(t0)
+
 ex_flt2:
+       lwz     t0,FrameSize(pv)            /* get frame size                     */
+       add     sp,sp,t0                    /* unwind stack                       */
+       li      a3,0                        /* prepare a3 for handle_exception    */
+
        mtlr    xpc
        lwz     itmp3,4(xpc)
        extsh   itmp3,itmp3
@@ -802,403 +773,199 @@ ex_flt2:
        lwz     itmp3,8(xpc)
        srwi    itmp3,itmp3,16
        cmpwi   itmp3,0x3dad
-       bne     ex_stack_loop
+       bne     L_asm_handle_exception_stack_loop
        lwz     itmp3,8(xpc)
        slwi    itmp3,itmp3,16
        add     pv,pv,itmp3
-       b       ex_stack_loop
 
+       b       L_asm_handle_exception_stack_loop
 
-/********************* asm_check_clinit ****************************************
-*                                                                              *
-*   call static class initializer for PUT/GETSTATIC instructions               *
-*                                                                              *
-*******************************************************************************/
 
-_asm_check_clinit:
-0:
-       lwz     itmp2,offclassinit(itmp1)
-       mr.     itmp2,itmp2
-       bne     L_is_initialized
+/* asm_wrapper_patcher *********************************************************
 
-       mflr    r0
-       stw     r0,8(r1)
-       addi    r1,r1,-(26*8)         /* keep stack 16-bytes aligned              */
-
-    stw     r3,4*8(r1)            /* save argument registers                  */
-    stw     r4,5*8(r1)            /* preserve linkage area (24 bytes)         */
-    stw     r5,6*8(r1)            /* and 4 bytes (better 8) for 1 argument    */
-    stw     r6,7*8(r1)
-    stw     r7,8*8(r1)
-    stw     r8,9*8(r1)
-    stw     r9,10*8(r1)
-       stw     r10,11*8(r1)
-
-       stfd    f1,12*8(r1)
-    stfd    f2,13*8(r1)
-    stfd    f3,14*8(r1)
-    stfd    f4,15*8(r1)
-    stfd    f5,16*8(r1)
-    stfd    f6,17*8(r1)
-    stfd    f7,18*8(r1)
-    stfd    f8,19*8(r1)
-    stfd    f9,20*8(r1)
-    stfd    f10,21*8(r1)
-    stfd    f11,22*8(r1)
-    stfd    f12,23*8(r1)
-    stfd    f13,24*8(r1)
-               
-       mr      r3,itmp1
-       lwz     itmp1,lo16(class_init-0b)(pv)
-       mtctr   itmp1
-       bctrl
-       mr      itmp1,r3              /* save return value in temp register       */
-
-       lwz     r3,4*8(r1)
-       lwz     r4,5*8(r1)
-       lwz     r5,6*8(r1)
-       lwz     r6,7*8(r1)
-       lwz     r7,8*8(r1)
-       lwz     r8,9*8(r1)
-       lwz     r9,10*8(r1)
-       lwz     r10,11*8(r1)
-
-    lfd     f1,12*8(r1)
-    lfd     f2,13*8(r1)
-    lfd     f3,14*8(r1)
-    lfd        f4,15*8(r1)
-    lfd        f5,16*8(r1)
-    lfd        f6,17*8(r1)
-    lfd        f7,18*8(r1)
-    lfd        f8,19*8(r1)
-    lfd        f9,20*8(r1)
-    lfd        f10,21*8(r1)
-    lfd        f11,22*8(r1)
-    lfd        f12,23*8(r1)
-    lfd        f13,24*8(r1)
-               
-       lwz     r0,(26*8)+8(r1)
-       mtlr    r0
-       addi    r1,r1,(26*8)
+   XXX
 
-       mr.         itmp1,itmp1           /* check for an exception                   */
-       beq     L_initializererror
+   Stack layout:
+     20   return address into JIT code (patch position)
+     16   pointer to virtual java_objectheader
+     12   machine code (which is patched back later)
+      8   unresolved class/method/field reference
+      4   data segment displacement from load instructions
+      0   patcher function pointer to call (pv is saved here afterwards)
 
-L_is_initialized:
-       blr
+*******************************************************************************/
 
-L_initializererror:
-#if defined(USE_THREADS) && defined(NATIVE_THREADS)
-       mflr    r0
-       stw     r0,8(r1)
-       addi    r1,r1,-4*8            /* preserve linkage area (24 bytes)         */
-       lwz     itmp1,lo16(builtin_asm_get_exceptionptrptr-0b)(pv)
-       mtctr   itmp1
-       bctrl
-       lwz     r0,(4*8)+8(r1)
-       mtlr    r0      
-       addi    r1,r1,4*8
+asm_wrapper_patcher:
+       mflr    r0                    /* get Java return address (leaf)           */
+       stw     r0,6*4(sp)            /* store it in the stub stackframe          */
+                                     /* keep stack 16-bytes aligned: 6+1+37 = 44 */
+       stwu    sp,-(LA_SIZE+(5+58)*4+sizestackframeinfo)(sp)
+
+#if defined(__DARWIN__)
+       stw     a0,LA_SIZE+(5+0)*4(r1)      /* save argument registers            */
+       stw     a1,LA_SIZE+(5+1)*4(r1)      /* preserve linkage area (24 bytes)   */
+       stw     a2,LA_SIZE+(5+2)*4(r1)      /* and 4 bytes for 4 argument         */
+       stw     a3,LA_SIZE+(5+3)*4(r1)
+       stw     a4,LA_SIZE+(5+4)*4(r1)
+       stw     a5,LA_SIZE+(5+5)*4(r1)
+       stw     a6,LA_SIZE+(5+6)*4(r1)
+       stw     a7,LA_SIZE+(5+7)*4(r1)
+
+       stfd    fa0,LA_SIZE+(5+8)*4(sp)
+       stfd    fa1,LA_SIZE+(5+10)*4(sp)
+       stfd    fa2,LA_SIZE+(5+12)*4(sp)
+       stfd    fa3,LA_SIZE+(5+14)*4(sp)
+       stfd    fa4,LA_SIZE+(5+16)*4(sp)
+       stfd    fa5,LA_SIZE+(5+18)*4(sp)
+       stfd    fa6,LA_SIZE+(5+20)*4(sp)
+       stfd    fa7,LA_SIZE+(5+22)*4(sp)
+       stfd    fa8,LA_SIZE+(5+24)*4(sp)
+       stfd    fa9,LA_SIZE+(5+26)*4(sp)
+       stfd    fa10,LA_SIZE+(5+28)*4(sp)
+       stfd    fa11,LA_SIZE+(5+30)*4(sp)
+       stfd    fa12,LA_SIZE+(5+32)*4(sp)
+
+       stw     t0,(LA_WORD_SIZE+5+33)*4(r1)
+       stw     t1,(LA_WORD_SIZE+5+34)*4(r1)
+       stw     t2,(LA_WORD_SIZE+5+35)*4(r1)
+       stw     t3,(LA_WORD_SIZE+5+36)*4(r1)
+       stw     t4,(LA_WORD_SIZE+5+37)*4(r1)
+       stw     t5,(LA_WORD_SIZE+5+38)*4(r1)
+       stw     t6,(LA_WORD_SIZE+5+39)*4(r1)
+       stw     t7,(LA_WORD_SIZE+5+40)*4(r1)
+
+       stfd    ft0,(LA_WORD_SIZE+5+42)*4(r1)
+       stfd    ft1,(LA_WORD_SIZE+5+44)*4(r1)
+       stfd    ft2,(LA_WORD_SIZE+5+46)*4(r1)
+       stfd    ft3,(LA_WORD_SIZE+5+48)*4(r1)
+       stfd    ft4,(LA_WORD_SIZE+5+50)*4(r1)
+       stfd    ft5,(LA_WORD_SIZE+5+52)*4(r1)
 #else
-       lwz     r3,lo16(_exceptionptr-0b)(pv)
+       SAVE_ARGUMENT_REGISTERS(LA_WORD_SIZE+1) /* save 8 int/8 float arguments   */
+       SAVE_TEMPORARY_REGISTERS(LA_WORD_SIZE+1+24)
 #endif
 
-       lwz     xptr,0(r3)            /* get the exception pointer                */
-       li      r0,0
-       stw     r0,0(r3)              /* clear the exception pointer              */
-
-       mflr    xpc
-       b       _asm_handle_nat_exception
-
-
-/******************* function asm_builtin_checkarraycast ***********************
-*                                                                              *
-*   Does the cast check and eventually throws an exception                     *
-*                                                                              *
-*******************************************************************************/
-               
-_asm_builtin_checkarraycast:
-0:
-       mflr    r0
-       stw     r0,8(r1)
-       stwu    r1,-48(r1)
-
-       stw     r3,32(r1)
-       lwz     itmp1,lo16(builtincheckarraycast-0b)(pv)
-       mtctr   itmp1
-       bctrl
-
-       lwz     r0,48+8(r1)
-       mtlr    r0
-       mr.     r3,r3
-       beq     nb_carray_throw
-       lwz     r3,32(r1)
-       addi    r1,r1,48
-       blr
-
-nb_carray_throw:
-       addi    r1,r1,48
-       mflr    r0
-       stw     r0,8(r1)
-       addi    r1,r1,-(24+4)
-       lwz     itmp1,lo16(new_classcastexception-0b)(pv)
-       mtctr   itmp1
-       bctrl
-       mr      xptr,r3
-       addi    r1,r1,24+4
-       lwz     r0,8(r1)
-       mr      xpc,r0
-       mtlr    r0
-       b       _asm_handle_nat_exception
-
-
-/******************* function asm_builtin_aastore ******************************
-*                                                                              *
-*   Does the cast check and eventually throws an exception                     *
-*                                                                              *
-*******************************************************************************/
-       
-_asm_builtin_aastore:
-0:
-       mr.     r3,r3
-       beq     nb_aastore_null
-       mflr    r0
-       stw     r0,8(r1)
-       addi    r1,r1,-48
-
-       lwz     itmp1,offarraysize(r3)
-       slwi    itmp3,r4,2
-       add     itmp2,r3,itmp3
-       cmplw   r4,itmp1
-       bge     nb_aastore_bound
-       mr      r4,r5
-       stw     itmp2,32(r1)
-       stw     r4,36(r1)
-//     addis   pv,r31,ha16(builtincanstore-0b)
-       lwz     itmp1,lo16(builtincanstore-0b)(pv)
-       mtctr   itmp1
-       bctrl
-
-       lwz     r0,48+8(r1)
-       mtlr    r0
-       lwz     itmp1,32(r1)
-       lwz     itmp2,36(r1)
-       addi    r1,r1,48
-       mr.     r3,r3
-       beq     nb_aastore_store
-       stw     itmp2,offobjarrdata(itmp1)
-       blr
-
-nb_aastore_null:
-       mflr    r0
-       stw     r0,8(r1)
-       addi    r1,r1,-(24+4)
-       lwz     itmp1,lo16(new_nullpointerexception-0b)(pv)
-       mtctr   itmp1
-       bctrl
-       mr      xptr,r3
-       addi    r1,r1,(24+4)
-       lwz     r0,8(r1)
-       mr      xpc,r0
-       mtlr    r0
-       b       _asm_handle_nat_exception
-
-nb_aastore_bound:
-       addi    r1,r1,48
-       mflr    r0
-       stw     r0,8(r1)
-       addi    r1,r1,-(24+2*4)
-       lwz     itmp1,lo16(new_arrayindexoutofboundsexception-0b)(pv)
-       mtctr   itmp1
-       mr      r3,r4                 /* move index into a0                       */
-       bctrl
-       mr      xptr,r3
-       addi    r1,r1,(24+2*4)
-       lwz     r0,8(r1)
-       mr      xpc,r0
-       mtlr    r0
-       b       _asm_handle_nat_exception
-
-nb_aastore_store:
-       mflr    r0
-       stw     r0,8(r1)
-       addi    r1,r1,-(24+4)
-       lwz     itmp1,lo16(new_arraystoreexception-0b)(pv)
-       mtctr   itmp1
-       bctrl
-       mr      xptr,r3
-       addi    r1,r1,(24+4)
-       lwz     r0,8(r1)
-       mr      xpc,r0
-       mtlr    r0
-       b       _asm_handle_nat_exception
-
-
-_asm_builtin_monitorenter:
-0:
-       lwz     itmp2,lo16(builtin_monitorenter-0b)(pv)
-       mr.     r3,r3
-       beq     nb_monitorenter
-       mtctr   itmp2
-       bctr
-
-nb_monitorenter:
-       mflr    r0
-       stw     r0,8(r1)
-       addi    r1,r1,-(24+4)
-       lwz     itmp1,lo16(new_nullpointerexception-0b)(pv)
-       mtctr   itmp1
+       stw     itmp1,LA_SIZE+(5+54)*4(sp)
+       stw     itmp2,LA_SIZE+(5+55)*4(sp)
+       stw     pv,LA_SIZE+(5+56)*4(sp)
+
+       addi    a0,sp,LA_SIZE+(5+58)*4      /* create stackframe info             */
+       mr      a1,pv
+       addi    a2,sp,(8+LA_WORD_SIZE+5+58)*4+sizestackframeinfo
+       mr      a3,r0                       /* this is correct for leafs          */
+       lwz     a4,((5+LA_WORD_SIZE+5+58)*4+sizestackframeinfo)(sp) /* pass xpc   */
+       bl      stacktrace_create_extern_stackframeinfo
+
+       addi    a0,sp,(0+LA_WORD_SIZE+5+58)*4+sizestackframeinfo  /* pass sp      */
+       lwz     pv,(0+LA_WORD_SIZE+5+58)*4+sizestackframeinfo(sp) /* get function */
+       lwz     itmp1,LA_SIZE+(5+56)*4(sp)  /* move pv to position of fp          */
+       stw     itmp1,(0+LA_WORD_SIZE+5+58)*4+sizestackframeinfo(sp)
+       mtctr   pv                          /* call the patcher function          */
        bctrl
-       mr      xptr,r3
-       addi    r1,r1,24+4
-       lwz     r0,8(r1)
-/*     addi    xpc,r0,-4 */
-       mr      xpc,r0
-       addi    xpc,xpc,-4
-
-       mtlr    r0
-       b       _asm_handle_nat_exception
-
-
-_asm_builtin_monitorexit:
-0:
-       lwz     itmp2,lo16(builtin_monitorexit-0b)(pv)
-       mr.     r3,r3
-       beq     nb_monitorexit
-       mtctr   itmp2
-       bctr
-
-nb_monitorexit:
-       mflr    r0
-       stw     r0,8(r1)
-       addi    r1,r1,-(24+4)
-       lwz     itmp1,lo16(new_nullpointerexception-0b)(pv)
-       mtctr   itmp1
-       bctrl
-       mr      xptr,r3
-       addi    r1,r1,24+4
-       lwz     r0,8(r1)
-/*     addi    xpc,r0,-4 */
-       mr      xpc,r0
-       addi    xpc,xpc,-4
-
-       mtlr    r0
-       b       _asm_handle_nat_exception
-       
-       
-_asm_builtin_idiv:
-0:
-       mr.     r4,r4
-       beq     nb_idiv
-       lis     itmp3,0x8000
-       cmpw    r3,itmp3
-       bne     normal_idiv
-       cmpwi   r4,-1
-       bne     normal_idiv
-       blr
+       stw     v0,LA_SIZE+(5+57)*4(sp)     /* save return value                  */
+
+       addi    a0,sp,LA_SIZE+(5+58)*4
+       bl      stacktrace_remove_stackframeinfo /* remove stackframe info        */
+
+#if defined(__DARWIN__)
+       lwz     a0,LA_SIZE+(5+0)*4(r1)
+       lwz     a1,LA_SIZE+(5+1)*4(r1)
+       lwz     a2,LA_SIZE+(5+2)*4(r1)
+       lwz     a3,LA_SIZE+(5+3)*4(r1)
+       lwz     a4,LA_SIZE+(5+4)*4(r1)
+       lwz     a5,LA_SIZE+(5+5)*4(r1)
+       lwz     a6,LA_SIZE+(5+6)*4(r1)
+       lwz     a7,LA_SIZE+(5+7)*4(r1)
+
+       lfd     fa0,LA_SIZE+(5+8)*4(sp)
+       lfd     fa1,LA_SIZE+(5+10)*4(sp)
+       lfd     fa2,LA_SIZE+(5+12)*4(sp)
+       lfd     fa3,LA_SIZE+(5+14)*4(sp)
+       lfd     fa4,LA_SIZE+(5+16)*4(sp)
+       lfd     fa5,LA_SIZE+(5+18)*4(sp)
+       lfd     fa6,LA_SIZE+(5+20)*4(sp)
+       lfd     fa7,LA_SIZE+(5+22)*4(sp)
+       lfd     fa8,LA_SIZE+(5+24)*4(sp)
+       lfd     fa9,LA_SIZE+(5+26)*4(sp)
+       lfd     fa10,LA_SIZE+(5+28)*4(sp)
+       lfd     fa11,LA_SIZE+(5+30)*4(sp)
+       lfd     fa12,LA_SIZE+(5+32)*4(sp)
+
+       lwz     t0,(LA_WORD_SIZE+5+33)*4(r1)
+       lwz     t1,(LA_WORD_SIZE+5+34)*4(r1)
+       lwz     t2,(LA_WORD_SIZE+5+35)*4(r1)
+       lwz     t3,(LA_WORD_SIZE+5+36)*4(r1)
+       lwz     t4,(LA_WORD_SIZE+5+37)*4(r1)
+       lwz     t5,(LA_WORD_SIZE+5+38)*4(r1)
+       lwz     t6,(LA_WORD_SIZE+5+39)*4(r1)
+       lwz     t7,(LA_WORD_SIZE+5+40)*4(r1)
+
+       lfd     ft0,(LA_WORD_SIZE+5+42)*4(r1)
+       lfd     ft1,(LA_WORD_SIZE+5+44)*4(r1)
+       lfd     ft2,(LA_WORD_SIZE+5+46)*4(r1)
+       lfd     ft3,(LA_WORD_SIZE+5+48)*4(r1)
+       lfd     ft4,(LA_WORD_SIZE+5+50)*4(r1)
+       lfd     ft5,(LA_WORD_SIZE+5+52)*4(r1)
+#else
+       RESTORE_ARGUMENT_REGISTERS(LA_WORD_SIZE+1) /* restore 8 int/8 float args  */
+       RESTORE_TEMPORARY_REGISTERS(LA_WORD_SIZE+1+24)
+#endif
 
-normal_idiv:
-       divw    r3,r3,r4
-       blr
+       lwz     itmp1,LA_SIZE+(5+54)*4(sp)
+       lwz     itmp2,LA_SIZE+(5+55)*4(sp)
+       lwz     pv,LA_SIZE+(5+56)*4(sp)
+       lwz     itmp3,LA_SIZE+(5+57)*4(sp)  /* restore return value into temp reg.*/
 
-nb_idiv:
-       mflr    r0
-       stw     r0,8(r1)
-       addi    r1,r1,-(24+2*4)
-       lwz     itmp1,lo16(new_arithmeticexception-0b)(pv)
-       mtctr   itmp1
-       bctrl
-       mr      xptr,r3
-       addi    r1,r1,(24+2*4)
-       lwz     r0,8(r1)
-       mr      xpc,r0
-       mtlr    r0
-       b       _asm_handle_nat_exception
+       lwz     r0,(6+LA_WORD_SIZE+5+58)*4+sizestackframeinfo(sp) /* restore RA   */
+       mtlr    r0
 
+       mr.     itmp3,itmp3           /* check for an exception                   */
+       beq     L_asm_wrapper_patcher_exception
 
-_asm_builtin_irem:
-0:
-       mr      itmp2,r3
-       mr.     r4,r4
-       beq     nb_irem
-       lis     itmp3,0x8000
-       cmpw    itmp2,itmp3
-       bne     normal_irem
-       cmpwi   r4,-1
-       bne     normal_irem
-       li      r3,0
-       beqlr
-
-normal_irem:
-       divw    itmp3,itmp2,r4
-       mullw   itmp3,itmp3,r4
-       subf    r3,itmp3,itmp2
-       blr
+                                     /* get return address (into JIT code)       */
+       lwz     itmp3,(5+LA_WORD_SIZE+5+58)*4+sizestackframeinfo(sp)
 
-nb_irem:
-       mflr    r0
-       stw     r0,8(r1)
-       addi    r1,r1,-(24+2*4)
-       lwz     itmp1,lo16(new_arithmeticexception-0b)(pv)
-       mtctr   itmp1
-       bctrl
-       mr      xptr,r3
-       addi    r1,r1,(24+2*4)
-       lwz     r0,8(r1)
-       mr      xpc,r0
-       mtlr    r0
-       b       _asm_handle_nat_exception
+                                     /* remove stack frame + patcher stub stack  */
+       addi    sp,sp,(8+LA_WORD_SIZE+5+58)*4+sizestackframeinfo
 
+       mtctr   itmp3
+       bctr                          /* jump to new patched code                 */
 
-_asm_builtin_ldiv:
-0:
-       or.     r0,r5,r6
-       beq     nb_ldiv
-       lwz     itmp1,lo16(builtin_ldiv-0b)(pv)
-       mtctr   itmp1
-       bctr
+L_asm_wrapper_patcher_exception:
+       lwz     xpc,(5+LA_WORD_SIZE+5+58)*4+sizestackframeinfo(sp)
+       addi    sp,sp,(8+LA_WORD_SIZE+5+58)*4+sizestackframeinfo
 
-nb_ldiv:
-       mflr    r0
-       stw     r0,8(r1)
-       addi    r1,r1,-(24+2*4)
-       lwz     itmp1,lo16(new_arithmeticexception-0b)(pv)
-       mtctr   itmp1
-       bctrl
-       mr      xptr,r3
-       addi    r1,r1,(24+2*4)
-       lwz     r0,8(r1)
-       mr      xpc,r0
+#if defined(USE_THREADS) && defined(NATIVE_THREADS)
+       mflr    r0
+       stw     r0,LA_LR_OFFSET(sp)
+       stwu    sp,-(LA_SIZE+1*4)(sp) /* preserve linkage area                    */
+       stw     xpc,LA_SIZE+0*4(sp)
+       bl      builtin_asm_get_exceptionptrptr
+       lwz     xpc,LA_SIZE+0*4(sp)
+       lwz     r0,LA_SIZE+1*4+LA_LR_OFFSET(sp)
        mtlr    r0
-       b       _asm_handle_nat_exception
+       addi    sp,sp,LA_SIZE+1*4
+#else
+# if defined(__DARWIN__)
+       lwz     v0,lo16(_no_threads_exceptionptr-0b)(pv)
+# else
+       lis     v0,_no_threads_exceptionptr@ha
+       addi    v0,v0,_no_threads_exceptionptr@l
+# endif
+#endif
 
+       lwz     xptr,0(v0)            /* get the exception pointer                */
+       li      itmp3,0
+       stw     itmp3,0(v0)           /* clear the exception pointer              */
+       b       asm_handle_exception
 
- _asm_builtin_lrem:
-0:
-       or.     r0,r5,r6
-       beq     nb_lrem
-       lwz     itmp1,lo16(builtin_lrem-0b)(pv)
-       mtctr   itmp1
-       bctr
 
-nb_lrem:
-       mflr    r0
-       stw     r0,8(r1)
-       addi    r1,r1,-(24+2*4)
-       lwz     itmp1,lo16(new_arithmeticexception-0b)(pv)
-       mtctr   itmp1
-       bctrl
-       mr      xptr,r3
-       addi    r1,r1,(24+2*4)
-       lwz     r0,8(r1)
-       mr      xpc,r0
-       mtlr    r0
-       b       _asm_handle_nat_exception
-
-
-_asm_cacheflush:
+asm_cacheflush:
+       add     r4,r3,r4
+       rlwinm  r3,r3,0,0,26
        addi    r4,r4,31
+       rlwinm  r4,r4,0,0,26
        mr      r5,r3
-       add     r4,r3,r4
 1:
        cmplw   r3,r4
        bge     0f
@@ -1223,7 +990,7 @@ _asm_cacheflush:
 doublezero:
        .double 0.0
 
-_asm_initialize_thread_stack:
+asm_initialize_thread_stack:
        addi r4,r4,-256
        stw r3,120(r4)
        li r3,0
@@ -1253,33 +1020,37 @@ _asm_initialize_thread_stack:
 0:
        mflr r3
        mtlr r0
-       lfd f0,lo16(doublezero-0b)(r3)
-
-       stfd f0,40(r4)
-       stfd f0,48(r4)
-       stfd f0,56(r4)
-       stfd f0,64(r4)
-       stfd f0,72(r4)
-       stfd f0,80(r4)
-       stfd f0,88(r4)
-       stfd f0,96(r4)
-       stfd f0,104(r4)
-       stfd f0,112(r4)
-
-       stfd f0,160(r4)
-       stfd f0,168(r4)
-       stfd f0,176(r4)
-       stfd f0,184(r4)
-       stfd f0,192(r4)
-       stfd f0,200(r4)
-       stfd f0,208(r4)
-       stfd f0,216(r4)
+#if defined(__DARWIN__)
+       lfd fr0,lo16(doublezero-0b)(r3)
+#else
+       lfd fr0,(doublezero-0b)@l(r3)
+#endif
+
+       stfd fr0,40(r4)
+       stfd fr0,48(r4)
+       stfd fr0,56(r4)
+       stfd fr0,64(r4)
+       stfd fr0,72(r4)
+       stfd fr0,80(r4)
+       stfd fr0,88(r4)
+       stfd fr0,96(r4)
+       stfd fr0,104(r4)
+       stfd fr0,112(r4)
+
+       stfd fr0,160(r4)
+       stfd fr0,168(r4)
+       stfd fr0,176(r4)
+       stfd fr0,184(r4)
+       stfd fr0,192(r4)
+       stfd fr0,200(r4)
+       stfd fr0,208(r4)
+       stfd fr0,216(r4)
 
        mr r3,r4
        blr
 
 
-_asm_perform_threadswitch:
+asm_perform_threadswitch:
        mflr r0
        addi r1,r1,-224
        stw r0,120(r1)
@@ -1294,16 +1065,16 @@ _asm_perform_threadswitch:
        stw r29,28(r1)
        stw r30,32(r1)
        stw r31,36(r1)
-       stfd f14,40(r1)
-       stfd f15,48(r1)
-       stfd f24,56(r1)
-       stfd f25,64(r1)
-       stfd f26,72(r1)
-       stfd f27,80(r1)
-       stfd f28,88(r1)
-       stfd f29,96(r1)
-       stfd f30,104(r1)
-       stfd f31,112(r1)
+       stfd fr14,40(r1)
+       stfd fr15,48(r1)
+       stfd fr24,56(r1)
+       stfd fr25,64(r1)
+       stfd fr26,72(r1)
+       stfd fr27,80(r1)
+       stfd fr28,88(r1)
+       stfd fr29,96(r1)
+       stfd fr30,104(r1)
+       stfd fr31,112(r1)
 
        stw r16,128(r1)
        stw r17,132(r1)
@@ -1313,14 +1084,14 @@ _asm_perform_threadswitch:
        stw r21,148(r1)
        stw r22,152(r1)
        stw r23,156(r1)
-       stfd f16,160(r1)
-       stfd f17,168(r1)
-       stfd f18,176(r1)
-       stfd f19,184(r1)
-       stfd f20,192(r1)
-       stfd f21,200(r1)
-       stfd f22,208(r1)
-       stfd f23,216(r1)
+       stfd fr16,160(r1)
+       stfd fr17,168(r1)
+       stfd fr18,176(r1)
+       stfd fr19,184(r1)
+       stfd fr20,192(r1)
+       stfd fr21,200(r1)
+       stfd fr22,208(r1)
+       stfd fr23,216(r1)
 
        stw r1,0(r3)
        stw r1,0(r5)
@@ -1338,16 +1109,16 @@ _asm_perform_threadswitch:
        lwz r29,28(r1)
        lwz r30,32(r1)
        lwz r31,36(r1)
-       lfd f14,40(r1)
-       lfd f15,48(r1)
-       lfd f24,56(r1)
-       lfd f25,64(r1)
-       lfd f26,72(r1)
-       lfd f27,80(r1)
-       lfd f28,88(r1)
-       lfd f29,96(r1)
-       lfd f30,104(r1)
-       lfd f31,112(r1)
+       lfd fr14,40(r1)
+       lfd fr15,48(r1)
+       lfd fr24,56(r1)
+       lfd fr25,64(r1)
+       lfd fr26,72(r1)
+       lfd fr27,80(r1)
+       lfd fr28,88(r1)
+       lfd fr29,96(r1)
+       lfd fr30,104(r1)
+       lfd fr31,112(r1)
 
        lwz r16,128(r1)
        lwz r17,132(r1)
@@ -1357,23 +1128,23 @@ _asm_perform_threadswitch:
        lwz r21,148(r1)
        lwz r22,152(r1)
        lwz r23,156(r1)
-       lfd f16,160(r1)
-       lfd f17,168(r1)
-       lfd f18,176(r1)
-       lfd f19,184(r1)
-       lfd f20,192(r1)
-       lfd f21,200(r1)
-       lfd f22,208(r1)
-       lfd f23,216(r1)
+       lfd fr16,160(r1)
+       lfd fr17,168(r1)
+       lfd fr18,176(r1)
+       lfd fr19,184(r1)
+       lfd fr20,192(r1)
+       lfd fr21,200(r1)
+       lfd fr22,208(r1)
+       lfd fr23,216(r1)
 
        mtlr r0
        addi r1,r1,224
        blr
 
 
-_asm_switchstackandcall:
+asm_switchstackandcall:
        mflr r0
-       addi r3,r3,-48
+       stwu r3,-48(r3)
        stw r0,40(r3)
        stw r1,44(r3)
        stw r1,0(r5)
@@ -1389,13 +1160,13 @@ _asm_switchstackandcall:
        blr
 
 
-_asm_getclassvalues_atomic:
-_crit_restart2:
-_crit_begin2:
+asm_getclassvalues_atomic:
+_crit_restart:
+_crit_begin:
        lwz     r6,offbaseval(r3)
        lwz     r7,offdiffval(r3)
        lwz     r8,offbaseval(r4)
-_crit_end2:
+_crit_end:
        stw     r6,offcast_super_baseval(r5)
        stw     r7,offcast_super_diffval(r5)
        stw     r8,offcast_sub_baseval(r5)
@@ -1403,14 +1174,11 @@ _crit_end2:
 
        .data
 
-_asm_criticalsections:
+asm_criticalsections:
 #if defined(USE_THREADS) && defined(NATIVE_THREADS)
-       .long   _crit_begin1
-       .long   _crit_end1
-       .long   _crit_restart1
-       .long   _crit_begin2
-       .long   _crit_end2
-       .long   _crit_restart2
+       .long   _crit_begin
+       .long   _crit_end
+       .long   _crit_restart
 #endif
        .long 0