* Removed all Id tags.
[cacao.git] / src / vm / jit / alpha / asmpart.S
index 5573e4a476946cb9f510e1d9bed873fbaa625e02..c19d61f3a99671a69f45c5bb6e94c248edb65ccc 100644 (file)
@@ -1,9 +1,9 @@
 /* src/vm/jit/alpha/asmpart.S - Java-C interface functions for alpha
 
-   Copyright (C) 1996-2005 R. Grafl, A. Krall, C. Kruegel, C. Oates,
-   R. Obermaisser, M. Platter, M. Probst, S. Ring, E. Steiner,
-   C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich, J. Wenninger,
-   Institut f. Computersprachen - TU Wien
+   Copyright (C) 1996-2005, 2006, 2007 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.
-
-   Contact: cacao@complang.tuwien.ac.at
-
-   Authors: Andreas Krall
-            Reinhard Grafl
-
-   Changes: Joseph Wenninger
-            Christian Thalinger
-
-   $Id: asmpart.S 3285 2005-09-27 14:12:36Z twisti $
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA.
 
 */
 
 
 #include "config.h"
 
-#include "vm/jit/methodheader.h"
-#include "vm/jit/alpha/offsets.h"
+#include "vm/jit/alpha/md-abi.h"
 #include "vm/jit/alpha/md-asm.h"
 
+#include "vm/jit/abi-asm.h"
+#include "vm/jit/methodheader.h"
+
 
        .text
        .set    noat
        .set    noreorder
 
 
-/********************* exported functions and variables ***********************/
-
-       .globl asm_sync_instruction_cache
-       .globl has_no_x_instr_set
-
-       .globl asm_calljavafunction
-       .globl asm_calljavafunction_int
+/* export functions ***********************************************************/
 
-       .globl asm_calljavafunction2
-       .globl asm_calljavafunction2int
-       .globl asm_calljavafunction2long
-       .globl asm_calljavafunction2float
-       .globl asm_calljavafunction2double
+       .globl asm_vm_call_method
+       .globl asm_vm_call_method_int
+       .globl asm_vm_call_method_long
+       .globl asm_vm_call_method_float
+       .globl asm_vm_call_method_double
+       .globl asm_vm_call_method_exception_handler
+       .globl asm_vm_call_method_end
 
        .globl asm_call_jit_compiler
+
        .globl asm_handle_exception
        .globl asm_handle_nat_exception
 
-       .globl asm_wrapper_patcher
-
-       .globl asm_perform_threadswitch
-       .globl asm_initialize_thread_stack
-       .globl asm_switchstackandcall
-       .globl asm_criticalsections
-       .globl asm_getclassvalues_atomic
-
-
-/* asm_sync_instruction_cache **************************************************
+       .globl asm_abstractmethoderror
 
-   XXX
+       .globl asm_compare_and_swap
+       .globl asm_memory_barrier
 
-*******************************************************************************/
+       .globl asm_md_init
+       .globl asm_cacheflush
 
-       .ent    asm_sync_instruction_cache
 
-asm_sync_instruction_cache:
-       call_pal PAL_imb              /* synchronize instruction cache            */
-       jmp     zero,(ra)
-
-       .end    asm_sync_instruction_cache
-
-/*********************** function has_no_x_instr_set ***************************
-*                                                                              *
-*   determines if the byte support instruction set (21164a and higher)         *
-*   is available.                                                              *
-*                                                                              *
-*******************************************************************************/
-
-       .ent    has_no_x_instr_set
-has_no_x_instr_set:
-
-       .long   0x47e03c20                /* amask   1,v0                         */
-       jmp     zero,(ra)                 /* return                               */
-
-       .end    has_no_x_instr_set
-
-
-/********************* function asm_calljavafunction ***************************
+/* asm_vm_call_method **********************************************************
 *                                                                              *
 *   This function calls a Java-method (which possibly needs compilation)       *
 *   with up to 4 address parameters.                                           *
@@ -118,836 +77,412 @@ has_no_x_instr_set:
 *                                                                              *
 *******************************************************************************/
 
-       .ent    asm_calljavafunction
-
-call_name:
-       .ascii  "calljavafunction\0\0"
-
-       .align  2 /*3*/
-       .quad   0                         /* catch type all                       */
-       .quad   calljava_xhandler         /* handler pc                           */
-       .quad   calljava_xhandler         /* end pc                               */
-       .quad   asm_calljavafunction      /* start pc                             */
-       .long   1                         /* extable size                         */
-       .long   0                         /* ALIGNMENT PADDING                    */
-       .quad   0                         /* line number table start              */
-       .quad   0                         /* line number table size               */
-       .long   0                         /* ALIGNMENT PADDING                    */
-       .long   0                         /* fltsave                              */
-       .long   0                         /* intsave                              */
-       .long   0                         /* isleaf                               */
-       .long   0                         /* IsSync                               */
-       .long   32                        /* frame size                           */
-       .quad   0                         /* method pointer (pointer to name)     */
-
-asm_calljavafunction:
-asm_calljavafunction_int:
-       ldgp    gp,0(pv)
-       lda     sp,-32(sp)                /* allocate stack space                 */
-       stq     gp,24(sp)                 /* save global pointer                  */
-       stq     ra,0(sp)                  /* save return address                  */
+       .ent    asm_vm_call_method
 
-       stq     a0,16(sp)                 /* save method pointer for compiler     */
-       lda     v0,16(sp)                 /* pass pointer to method pointer via v0*/
+       .align  3
 
-       mov     a1,a0                     /* pass the remaining parameters        */
-       mov     a2,a1
-       mov     a3,a2
-       mov     a4,a3
+       .quad   0                           /* catch type all                     */
+       .quad   0                           /* handler pc                         */
+       .quad   0                           /* end pc                             */
+       .quad   0                           /* start pc                           */
+       .long   1                           /* extable size                       */
+       .long   0                           /* ALIGNMENT PADDING                  */
+       .quad   0                           /* line number table start            */
+       .quad   0                           /* line number table size             */
+       .long   0                           /* ALIGNMENT PADDING                  */
+       .long   0                           /* fltsave                            */
+       .long   1                           /* intsave                            */
+       .long   0                           /* isleaf                             */
+       .long   0                           /* IsSync                             */
+       .long   0                           /* frame size                         */
+       .quad   0                           /* codeinfo pointer                   */
+
+asm_vm_call_method:
+asm_vm_call_method_int:
+asm_vm_call_method_long:
+asm_vm_call_method_float:
+asm_vm_call_method_double:
+       ldgp    gp,0(pv)
+       lda     sp,-5*8(sp)                 /* allocate stack space               */
+       stq     ra,0*8(sp)                  /* save return address                */
+       stq     gp,1*8(sp)                  /* save global pointer                */
+
+       stq     s0,3*8(sp)
+       stq     a0,4*8(sp)                  /* save method PV                     */
+
+       mov     a1,t0                       /* address of argument array          */
+       mov     a2,t1                       /* stack argument count               */
+       mov     sp,s0                       /* save stack pointer                 */
+
+       ldq     a0,0*8(t0)
+       ldq     a1,1*8(t0)
+       ldq     a2,2*8(t0)
+       ldq     a3,3*8(t0)
+       ldq     a4,4*8(t0)
+       ldq     a5,5*8(t0)
+
+       ldt     fa0,6*8(t0)
+       ldt     fa1,7*8(t0)
+       ldt     fa2,8*8(t0)
+       ldt     fa3,9*8(t0)
+       ldt     fa4,10*8(t0)
+       ldt     fa5,11*8(t0)
+
+       beq     t1,L_asm_vm_call_method_stack_copy_done
+
+       negq    t1,t2                       /* calculate stackframe size (* 8)    */
+       s8addq  t2,sp,sp                    /* create stackframe                  */
+       mov     sp,t2                       /* temporary stack pointer            */
+
+L_asm_vm_call_method_stack_copy_loop:
+       ldq     t3,12*8(t0)                 /* load argument                      */
+       stq     t3,0(t2)                    /* store argument on stack            */
+
+       subq    t1,1,t1                     /* subtract 1 argument                */
+       addq    t0,8,t0                     /* load address of next argument      */
+       addq    t2,8,t2                     /* increase stack pointer             */
+
+       bgt     t1,L_asm_vm_call_method_stack_copy_loop
+
+L_asm_vm_call_method_stack_copy_done:
+       lda     mptr,4*8(s0)                /* get address of PV                  */
+       ldq     pv,0*8(mptr)                /* load PV                            */
+       jmp     ra,(pv)
+L_asm_vm_call_method_recompute_pv:
+       lda     pv,(asm_vm_call_method - L_asm_vm_call_method_recompute_pv)(ra)
+
+       mov     s0,sp                       /* restore stack pointer              */
+
+L_asm_vm_call_method_recompute_return:
+       ldq     ra,0*8(sp)                  /* restore RA                         */
+       ldq     gp,1*8(sp)                  /* restore global pointer             */
+       ldq     s0,3*8(sp)
+
+       lda     sp,5*8(sp)                  /* free stack space                   */
+       jmp     zero,(ra)
 
-       lda     itmp2,asm_call_jit_compiler/* fake virtual function call (2 instr)*/
-       stq     itmp2,8(sp)               /* store function address               */
-       mov     sp,itmp2                  /* set method pointer                   */
+asm_vm_call_method_exception_handler:
+       mov     s0,sp                       /* restore stack pointer              */
+       ldq     gp,1*8(sp)                  /* restore global pointer             */
+       mov     itmp1,a0
+       jsr     ra,builtin_throw_exception
 
-       ldq     pv,8(itmp2)               /* method call as in Java               */
-       jmp     ra,(pv)                   /* call JIT compiler                    */
-calljava_jit:
-       lda     pv,(asm_calljavafunction - calljava_jit)(ra)
+asm_vm_call_method_end:                                        
+       br      L_asm_vm_call_method_recompute_return
 
-calljava_return:
-       ldq     ra,0(sp)                  /* restore return address               */
-       ldq     gp,24(sp)                 /* restore global pointer               */
-       lda     sp,32(sp)                 /* free stack space                     */
+       .end    asm_vm_call_method
 
-calljava_ret:
-       jmp     zero,(ra)
 
-calljava_xhandler:
-       ldq     gp,24(sp)                 /* restore global pointer               */
-       mov     xptr,a0
-       jsr     ra,builtin_throw_exception
-       ldq     ra,0(sp)                  /* restore return address               */
-       lda     sp,32(sp)                 /* free stack space                     */
-       mov     zero,v0                   /* return NULL                          */
-       jmp     zero,(ra)
-       .end    asm_calljavafunction
+/* asm_call_jit_compiler *******************************************************
 
+   Invokes the compiler for untranslated Java methods.
 
+*******************************************************************************/
 
+       .ent    asm_call_jit_compiler
 
-       .ent    asm_calljavafunction2
+asm_call_jit_compiler:
+       ldgp    gp,0(pv)
+       lda     sp,-(ARG_CNT+2)*8(sp) /* +2: keep stack 16-byte aligned           */
 
-call_name2:
-       .align  3
+       stq     ra,0*8(sp)            /* save return address                      */
 
-       .quad   0                         /* catch type all                       */
-       .quad   calljava_xhandler2        /* handler pc                           */
-       .quad   calljava_xhandler2        /* end pc                               */
-       .quad   asm_calljavafunction2     /* start pc                             */
-       .long   1                         /* extable size                         */
-       .long   0                         /* ALIGNMENT PADDING                    */
-       .quad   0                         /* line number table start              */
-       .quad   0                         /* line number table size               */
-       .long   0                         /* ALIGNMENT PADDING                    */
-       .long   0                         /* fltsave                              */
-       .long   1                         /* intsave                              */
-       .long   0                         /* isleaf                               */
-       .long   0                         /* IsSync                               */
-       .long   40                        /* frame size                           */
-       .quad   0                         /* method pointer (pointer to name)     */
-
-asm_calljavafunction2:
-asm_calljavafunction2int:
-asm_calljavafunction2long:
-asm_calljavafunction2float:
-asm_calljavafunction2double:
-       ldgp    gp,0(pv)
-       lda     sp,-5*8(sp)               /* allocate stack space                 */
-       stq     ra,0*8(sp)                /* save return address                  */
-       stq     gp,1*8(sp)                /* save global pointer                  */
-       stq     s6,3*8(sp)
-
-       stq     a0,4*8(sp)                /* save method pointer for compiler     */
-       mov     a3,t0                     /* pointer to arg block                 */
-       mov     a1,s6                     /* arg count                            */
-
-       ble     s6,calljava_argsloaded
-       lda     s6,-1(s6)
-       ldq     a0,offjniitem(t0)
-       ldt     $f16,offjniitem(t0)
-       ble     s6,calljava_argsloaded
-
-       lda     s6,-1(s6)
-       ldq     a1,offjniitem+sizejniblock*1(t0)
-       ldt     $f17,offjniitem+sizejniblock*1(t0)
-       ble     s6,calljava_argsloaded
-
-       lda     s6,-1(s6)
-       ldq     a2,offjniitem+sizejniblock*2(t0)
-       ldt     $f18,offjniitem+sizejniblock*2(t0)
-       ble     s6,calljava_argsloaded
-
-       lda     s6,-1(s6)
-       ldq     a3,offjniitem+sizejniblock*3(t0)
-       ldt     $f19,offjniitem+sizejniblock*3(t0)
-       ble     s6,calljava_argsloaded
-
-       lda     s6,-1(s6)
-       ldq     a4,offjniitem+sizejniblock*4(t0)
-       ldt     $f20,offjniitem+sizejniblock*4(t0)
-       ble     s6,calljava_argsloaded
-
-       lda     s6,-1(s6)
-       ldq     a5,offjniitem+sizejniblock*5(t0)
-       ldt     $f21,offjniitem+sizejniblock*5(t0)
-calljava_argsloaded:
-       mov     sp,t4
-       ble     s6,calljava_nocopy
-       negq    s6,t1
-       s8addq  t1,sp,sp
-       s8addq  t1,t4,t2
-
-calljava_copyloop:
-       ldq     t3,offjniitem+sizejniblock*6(t0)
-       stq     t3,0(t2)
-       lda     t1,1(t1)
-       lda     t0,sizejniblock(t0)
-       lda     t2,8(t2)
-       bne     t1,calljava_copyloop
-
-calljava_nocopy:
-       lda     v0,4*8(t4)                /* pass pointer to method pointer via v0*/
-
-       lda     itmp2,asm_call_jit_compiler/* fake virtual function call (2 instr)*/
-       stq     itmp2,16(t4)              /* store function address               */
-       lda     itmp2,8(t4)               /* set method pointer                   */
-
-       ldq     pv,8(itmp2)               /* method call as in Java               */
-       jmp     ra,(pv)                   /* call JIT compiler                    */
-calljava_jit2:
-       lda     pv,(asm_calljavafunction2 - calljava_jit2)(ra)
-
-       s8addq  s6,sp,sp
-calljava_return2:
-       ldq     ra,0*8(sp)                /* restore return address               */
-       ldq     gp,1*8(sp)                /* restore global pointer               */
-       ldq     s6,3*8(sp)
-       lda     sp,5*8(sp)                /* free stack space                     */
-
-calljava_ret2:
-       jmp     zero,(ra)
+       SAVE_ARGUMENT_REGISTERS(1)    /* save 6 int/6 float argument registers    */
 
-calljava_xhandler2:
-       s8addq  s6,sp,sp
-       ldq     gp,1*8(sp)                /* restore global pointer               */
-       mov     itmp1,a0
-       jsr     ra,builtin_throw_exception
-       ldq     ra,0*8(sp)                /* restore return address               */
-       ldq     s6,3*8(sp)
-       lda     sp,5*8(sp)                /* free stack space                     */
-       mov     zero,v0                   /* return NULL                          */
-       jmp     zero,(ra)
+       mov     itmp1,a0              /* pass methodinfo pointer                  */
+       mov     mptr,a1               /* pass method pointer                      */
+       lda     a2,(ARG_CNT+2)*8(sp)  /* pass java sp                             */
+       mov     ra,a3
+       jsr     ra,jit_asm_compile    /* call jit compiler                        */
+       mov     v0,pv
 
-       .end    asm_calljavafunction2
+       ldq     ra,0*8(sp)            /* load return address                      */
 
+       RESTORE_ARGUMENT_REGISTERS(1) /* restore 6 int/6 float argument registers */
 
-/****************** function asm_call_jit_compiler *****************************
-*                                                                              *
-*   invokes the compiler for untranslated JavaVM methods.                      *
-*                                                                              *
-*   Register R0 contains a pointer to the method info structure (prepared      *
-*   by createcompilerstub). Using the return address in R26 and the            *
-*   offset in the LDA instruction or using the value in methodptr R28 the      *
-*   patching address for storing the method address can be computed:           *
-*                                                                              *
-*   method address was either loaded using                                     *
-*   M_LDQ (REG_PV, REG_PV, a)        ; invokestatic/special    ($27)           *
-*   M_LDA (REG_PV, REG_RA, low)                                                *
-*   M_LDAH(REG_PV, REG_RA, high)     ; optional                                *
-*   or                                                                         *
-*   M_LDQ (REG_PV, REG_METHODPTR, m) ; invokevirtual/interface ($28)           *
-*   in the static case the method pointer can be computed using the            *
-*   return address and the lda function following the jmp instruction          *
-*                                                                              *
-*******************************************************************************/
+       lda     sp,(ARG_CNT+2)*8(sp)  /* remove stack frame                       */
 
-       .ent    asm_call_jit_compiler
+       beq     pv,L_asm_call_jit_compiler_exception
 
-asm_call_jit_compiler:
-       ldgp    gp,0(pv)
-       ldl     t8,-8(ra)             /* load instruction LDQ PV,xxx($yy)         */
-       srl     t8,16,t8              /* shift right register number $yy          */
-       and     t8,31,t8              /* isolate register number                  */
-       subl    t8,28,t8              /* test for REG_METHODPTR                   */
-       beq     t8,noregchange       
-       ldl     t8,0(ra)              /* load instruction LDA PV,xxx(RA)          */
-       sll     t8,48,t8
-       sra     t8,48,t8              /* isolate offset                           */
-       addq    t8,ra,$28             /* compute update address                   */
-       ldl     t8,4(ra)              /* load instruction LDAH PV,xxx(PV)         */
-       srl     t8,16,t8              /* isolate instruction code                 */
-       lda     t8,-0x177b(t8)        /* test for LDAH                            */
-       bne     t8,noregchange       
-       ldl     t8,4(ra)              /* load instruction LDAH PV,xxx(PV)         */
-       sll     t8,16,t8              /* compute high offset                      */
-       addl    t8,0,t8               /* sign extend high offset                  */
-       addq    t8,$28,$28            /* compute update address                   */
-noregchange:
-       lda     sp,-(15*8+sizestackframeinfo)(sp) /* reserve stack space          */
-
-       SAVE_ARGUMENT_REGISTERS(0)    /* save 6 int/6 float argument registers    */
-
-       stq     $28,12*8(sp)          /* save method pointer                      */
-       stq     ra,13*8(sp)           /* save return address                      */
-       stq     v0,14*8(sp)           /* save methodinfo pointer                  */
-
-       lda     a0,15*8(sp)           /* create stackframe info                   */
-       mov     zero,a1               /* we don't have pv handy                   */
-       lda     a2,15*8+sizestackframeinfo(sp) /* pass java sp                    */
-       mov     ra,a3                 /* pass Java ra                             */
-       mov     a3,a4                 /* xpc is equal to ra                       */
-       jsr     ra,stacktrace_create_extern_stackframeinfo
-       ldgp    gp,0(ra)
-
-       ldq     v0,14*8(sp)           /* restore methodinfo pointer               */
-       ldq     a0,0(v0)              /* pass methodinfo pointer                  */
-       jsr     ra,jit_compile        /* call jit compiler                        */
-       ldgp    gp,0(ra)
-       stq     v0,14*8(sp)           /* save return value                        */
-
-       lda     a0,15*8(sp)           /* remove stackframe info                   */
-       jsr     ra,stacktrace_remove_stackframeinfo
-       ldgp    gp,0(ra)
-
-       RESTORE_ARGUMENT_REGISTERS(0) /* restore 6 int/6 float argument registers */
-
-       ldq     $28,12*8(sp)          /* load method pointer                      */
-       ldq     ra,13*8(sp)           /* load return address                      */
-       ldq     v0,14*8(sp)           /* restore return value                     */
-       lda     sp,15*8+sizestackframeinfo(sp) /* deallocate stack area           */
-
-       beq     v0,L_asm_call_jit_compiler_exception
-
-       ldl     t8,-8(ra)             /* load instruction LDQ PV,xxx($yy)         */
-       sll     t8,48,t8
-       sra     t8,48,t8              /* isolate offset                           */
-
-       addq    t8,$28,t8             /* compute update address via method pointer*/
-       stq     v0,0(t8)              /* save new method address there            */
-
-       call_pal PAL_imb              /* synchronise instruction cache            */
-
-       mov     v0,pv                 /* load method address into pv              */
-       jmp     zero,(pv)             /* and call method. The method returns      */
+       jmp     zero,(pv)             /* and call method, the method returns      */
                                      /* directly to the caller (ra).             */
 
 L_asm_call_jit_compiler_exception:
-#if defined(USE_THREADS) && defined(NATIVE_THREADS)
-       subq    sp,1*8,sp
+       subq    sp,2*8,sp
        stq     ra,0*8(sp)            /* save return address (xpc)                */
-       jsr     ra,builtin_asm_get_exceptionptrptr
-       ldq     ra,0*8(sp)           /* restore return address (xpc)             */
-       addq    sp,1*8,sp
-#else
-       lda     v0,_exceptionptr
-#endif
-       ldq     xptr,0(v0)            /* get the exception pointer                */
-       stq     zero,0(v0)            /* clear the exception pointer              */
+       jsr     ra,exceptions_get_and_clear_exception
+       ldq     ra,0*8(sp)            /* restore return address (xpc)             */
+       addq    sp,2*8,sp
 
-       subq    ra,4,xpc
-       br      asm_handle_nat_exception
+       mov     v0,xptr               /* get exception                            */
+       subq    ra,4,xpc              /* exception address is ra - 4              */
+       br      L_asm_handle_nat_exception
 
        .end    asm_call_jit_compiler
 
 
-/********************* function asm_handle_exception ***************************
-*                                                                              *
-*   This function handles an exception. It does not use the usual calling      *
-*   conventions. The exception pointer is passed in REG_ITMP1 and the          *
-*   pc from the exception raising position is passed in REG_ITMP2. It searches *
-*   the local exception table for a handler. If no one is found, it unwinds    *
-*   stacks and continues searching the callers.                                *
-*                                                                              *
-*   void asm_handle_exception (exceptionptr, exceptionpc);                     *
-*                                                                              *
+/* asm_handle_exception ********************************************************
+
+   This function handles an exception. It does not use the usual calling
+   conventions. The exception pointer is passed in REG_ITMP1 and the
+   pc from the exception raising position is passed in REG_ITMP2. It searches
+   the local exception table for a handler. If no one is found, it unwinds
+   stacks and continues searching the callers.
+
+   ATTENTION: itmp3 == gp!
+
 *******************************************************************************/
 
        .ent    asm_handle_nat_exception
 
 asm_handle_nat_exception:
-       ldl     t0,0(ra)              /* load instruction LDA PV,xxx(RA)          */
-       sll     t0,48,t0
-       sra     t0,48,t0              /* isolate offset                           */
-       addq    t0,ra,pv              /* compute update address                   */
-       ldl     t0,4(ra)              /* load instruction LDAH PV,xxx(PV)         */
-       srl     t0,16,t0              /* isolate instruction code                 */
-       lda     t0,-0x177b(t0)        /* test for LDAH                            */
-       bne     t0,asm_handle_exception
-       ldl     t0,4(ra)              /* load instruction LDAH PV,xxx(PV)         */
-       sll     t0,16,t0              /* compute high offset                      */
-       addl    t0,0,t0               /* sign extend high offset                  */
-       addq    t0,pv,pv              /* compute update address                   */
+L_asm_handle_nat_exception:       /* required for PIC code                    */
+L_asm_handle_exception_stack_loop:
+       lda     sp,-6*8(sp)                 /* keep stack 16-byte aligned         */
+       stq     xptr,0*8(sp)                /* save xptr                          */
+       stq     xpc,1*8(sp)                 /* save xpc                           */
+       stq     ra,3*8(sp)                  /* save RA                            */
+       stq     zero,4*8(sp)                /* save maybe-leaf flag (cleared)     */
+
+       mov     ra,a0                       /* pass RA                            */
+
+       br      ra,L_asm_handle_exception_load_gp
+L_asm_handle_exception_load_gp:
+       ldgp    gp,0(ra)                    /* load gp                            */
+
+       jsr     ra,md_codegen_get_pv_from_pc/* get PV from RA                     */
+       stq     v0,2*8(sp)                  /* save PV                            */
+
+       ldq     a0,0*8(sp)                  /* pass xptr                          */
+       ldq     a1,1*8(sp)                  /* pass xpc                           */
+       mov     v0,a2                       /* pass PV                            */
+       addq    sp,6*8,a3                   /* pass Java SP                       */
+
+       br      L_asm_handle_exception_continue
 
        .aent    asm_handle_exception
 
 asm_handle_exception:
-       lda     sp,-18*8(sp)          /* allocate stack                           */
-       stq     t0,0*8(sp)            /* save possible used registers             */
-       stq     t1,1*8(sp)            /* also registers used by trace_exception   */
-       stq     t2,2*8(sp)
-       stq     t3,3*8(sp)
-       stq     t4,4*8(sp)
-       stq     t5,5*8(sp)
-       stq     t6,6*8(sp)
-       stq     t7,7*8(sp)
-       stq     t8,8*8(sp)
-       stq     t9,9*8(sp)
-       stq     t10,10*8(sp)
-       stq     v0,11*8(sp)
-       stq     a0,12*8(sp)
-       stq     a1,13*8(sp)
-       stq     a2,14*8(sp)
-       stq     a3,15*8(sp)
-       stq     a4,16*8(sp)
-       stq     a5,17*8(sp)
-
-       lda     t3,1(zero)            /* set no unwind flag                       */
-ex_stack_loop:
-       lda     sp,-5*8(sp)           /* allocate stack                           */
-       stq     xptr,0*8(sp)          /* save used register                       */
-       stq     xpc,1*8(sp)
-       stq     pv,2*8(sp)
-       stq     ra,3*8(sp)
-       stq     t3,4*8(sp)
-
-       mov     xptr,a0
-       ldq     a1,MethodPointer(pv)
-       mov     xpc,a2
-/*     mov     t3,a3 */
-       lda             a3,0(zero)
-       lda             a4,1(zero)
-       br      ra,ex_trace           /* set ra for gp loading                    */
-ex_trace:
-       ldgp    gp,0(ra)              /* load gp                                  */
-       jsr     ra,builtin_trace_exception /* trace_exception(xptr,methodptr)     */
-       
-       ldq     xptr,0*8(sp)          /* restore used register                    */
-       ldq     xpc,1*8(sp)
-       ldq     pv,2*8(sp)
-       ldq     ra,3*8(sp)
-       ldq     t3,4*8(sp)
-       lda     sp,5*8(sp)            /* deallocate stack                         */
-       
-       ldl     t0,ExTableSize(pv)    /* t0 = exception table size                */
-       beq     t0,empty_table        /* if empty table skip                      */
-
-       lda     t1,ExTableStart(pv)   /* t1 = start of exception table            */
-
-ex_table_loop:
-       ldq     t2,ExStartPC(t1)      /* t2 = exception start pc                  */
-       cmple   t2,xpc,t2             /* t2 = (startpc <= xpc)                    */
-       beq     t2,ex_table_cont      /* if (false) continue                      */
-       ldq     t2,ExEndPC(t1)        /* t2 = exception end pc                    */
-       cmplt   xpc,t2,t2             /* t2 = (xpc < endpc)                       */
-       beq     t2,ex_table_cont      /* if (false) continue                      */
-       ldq     a1,ExCatchType(t1)    /* arg1 = exception catch type              */
-       beq     a1,ex_handle_it       /* NULL catches everything                  */
-
-       ldl     itmp3,offclassloaded(a1)
-       bne     itmp3,L_class_loaded
-
-       subq    sp,8*8,sp             /* allocate stack                           */
-       stq     t0,0*8(sp)            /* save used register                       */
-       stq     t1,1*8(sp)
-       stq     t3,2*8(sp)
-       stq     xptr,3*8(sp)
-       stq     xpc,4*8(sp)
-       stq     pv,5*8(sp)
-       stq     ra,6*8(sp)
-       stq     a1,7*8(sp)
-
-       mov     a1,a0
-
-       br      ra,L_class_load_ra    /* set ra for gp loading                    */
-L_class_load_ra:
-       ldgp    gp,0(ra)              /* load gp                                  */
-       jsr     ra,load_class_bootstrap
-
-       ldq     t0,0*8(sp)            /* restore used register                    */
-       ldq     t1,1*8(sp)
-       ldq     t3,2*8(sp)
-       ldq     xptr,3*8(sp)
-       ldq     xpc,4*8(sp)
-       ldq     pv,5*8(sp)
-       ldq     ra,6*8(sp)
-       ldq     a1,7*8(sp)
-       addq    sp,8*8,sp             /* deallocate stack                         */
-
-L_class_loaded:
-       ldl     itmp3,offclasslinked(a1)
-       subq    sp,8*8,sp             /* allocate stack                           */
-       stq     a1,7*8(sp)
-       bne     itmp3,L_class_linked
-
-       stq     t0,0*8(sp)            /* save used register                       */
-       stq     t1,1*8(sp)
-       stq     t3,2*8(sp)
-       stq     xptr,3*8(sp)
-       stq     xpc,4*8(sp)
-       stq     pv,5*8(sp)
-       stq     ra,6*8(sp)
-
-       mov     a1,a0
-
-       br      ra,L_class_link_ra    /* set ra for gp loading                    */
-L_class_link_ra:
-       ldgp    gp,0(ra)              /* load gp                                  */
-       jsr     ra,link_class
-
-       ldq     t0,0*8(sp)            /* restore used register                    */
-       ldq     t1,1*8(sp)
-       ldq     t3,2*8(sp)
-       ldq     xptr,3*8(sp)
-       ldq     xpc,4*8(sp)
-       ldq     pv,5*8(sp)
-       ldq     ra,6*8(sp)
-
-L_class_linked:
-_crit_restart1:
-       ldq     a1,7*8(sp)
-_crit_begin1:
-       ldq     a0,offobjvftbl(xptr)  /* a0 = vftblptr(xptr)                      */
-       ldq     a1,offclassvftbl(a1)  /* a1 = vftblptr(catchtype) class (not obj) */
-       ldl     a0,offbaseval(a0)     /* a0 = baseval(xptr)                       */
-       ldl     v0,offbaseval(a1)     /* a2 = baseval(catchtype)                  */
-       ldl     a1,offdiffval(a1)     /* a1 = diffval(catchtype)                  */
-_crit_end1:
-       subl    a0,v0,a0              /* a0 = baseval(xptr) - baseval(catchtype)  */
-       cmpule  a0,a1,v0              /* v0 = xptr is instanceof catchtype        */
-       addq    sp,8*8,sp             /* deallocate stack                         */
-       beq     v0,ex_table_cont      /* if (false) continue                      */
-
-ex_handle_it:
-       ldq     xpc,ExHandlerPC(t1)   /* xpc = exception handler pc               */
-
-       beq     t3,ex_jump            /* if (!(no stack unwinding) skip           */
-
-       ldq     t0,0*8(sp)            /* restore possible used registers          */
-       ldq     t1,1*8(sp)            /* also registers used by trace_exception   */
-       ldq     t2,2*8(sp)
-       ldq     t3,3*8(sp)
-       ldq     t4,4*8(sp)
-       ldq     t5,5*8(sp)
-       ldq     t6,6*8(sp)
-       ldq     t7,7*8(sp)
-       ldq     t8,8*8(sp)
-       ldq     t9,9*8(sp)
-       ldq     t10,10*8(sp)
-       ldq     v0,11*8(sp)
-       ldq     a0,12*8(sp)
-       ldq     a1,13*8(sp)
-       ldq     a2,14*8(sp)
-       ldq     a3,15*8(sp)
-       ldq     a4,16*8(sp)
-       ldq     a5,17*8(sp)
-       lda     sp,18*8(sp)           /* deallocate stack                         */
-
-ex_jump:
-       jmp     zero,(xpc)            /* jump to the handler                      */
-
-ex_table_cont:
-       lda     t1,ExEntrySize(t1)    /* next exception table entry               */
-       subl    t0,1,t0               /* decrement entry counter                  */
-       bgt     t0,ex_table_loop      /* if (t0 > 0) next entry                   */
-
-empty_table:
-       beq     t3,ex_already_cleared /* if here the first time, then             */
-       lda     sp,18*8(sp)           /* deallocate stack and                     */
-       clr     t3                    /* clear the no unwind flag                 */
-ex_already_cleared:
-       ldl     t0,IsSync(pv)         /* t0 = SyncOffset                          */
-       beq     t0,no_monitor_exit    /* if zero no monitorexit                   */
-
-#if defined(USE_THREADS)
-       addq    sp,t0,t0              /* add stackptr to Offset                   */
-       ldq     a0,-8(t0)             /* load monitorexit pointer                 */
-
-       lda     sp,-7*8(sp)           /* allocate stack                           */
-       stq     t0,0*8(sp)            /* save used register                       */
-       stq     t1,1*8(sp)
-       stq     t3,2*8(sp)
-       stq     xptr,3*8(sp)
-       stq     xpc,4*8(sp)
-       stq     pv,5*8(sp)
-       stq     ra,6*8(sp)
-
-       br      ra,ex_mon_load        /* set ra for gp loading                    */
-ex_mon_load:
-       ldgp    gp,0(ra)              /* load gp                                  */
-       jsr     ra,builtin_monitorexit/* builtin_monitorexit(objectptr)           */
+L_asm_handle_exception:                 /* required for PIC code              */
+       lda     sp,-(ARG_CNT+TMP_CNT)*8(sp) /* create maybe-leaf stackframe       */
+
+       SAVE_ARGUMENT_REGISTERS(0)          /* we save arg and temp registers in  */
+       SAVE_TEMPORARY_REGISTERS(ARG_CNT)   /* case this is a leaf method         */
+
+       lda     sp,-6*8(sp)                 /* keep stack 16-byte aligned         */
+       stq     xptr,0*8(sp)                /* save xptr                          */
+       stq     pv,2*8(sp)                  /* save PV                            */
+       stq     ra,3*8(sp)                  /* save RA                            */
+       lda     t0,1(zero)                  /* set maybe-leaf flag                */
+       stq     t0,4*8(sp)                  /* save maybe-leaf flag               */
+
+       br      ra,L_asm_handle_exception_load_gp_2
+L_asm_handle_exception_load_gp_2:
+       ldgp    gp,0(ra)                    /* load gp                            */
+
+       mov     xptr,a0                     /* pass xptr                          */
+       mov     xpc,a1                      /* pass xpc                           */
+       mov     pv,a2                       /* pass PV                            */
+       lda     a3,(ARG_CNT+TMP_CNT+6)*8(sp)/* pass Java SP                       */
+
+L_asm_handle_exception_continue:
+       jsr     ra,exceptions_handle_exception
+
+       beq     v0,L_asm_handle_exception_not_catched
+
+       mov     v0,xpc                      /* move handlerpc into xpc            */
+       ldq     xptr,0*8(sp)                /* restore xptr                       */
+       ldq     pv,2*8(sp)                  /* restore PV                         */
+       ldq     ra,3*8(sp)                  /* restore RA                         */
+       ldq     t0,4*8(sp)                  /* get maybe-leaf flag                */
+       lda     sp,6*8(sp)                  /* free stack frame                   */
+
+       beq     t0,L_asm_handle_exception_no_leaf
+
+       RESTORE_ARGUMENT_REGISTERS(0)       /* if this is a leaf method, we have  */
+       RESTORE_TEMPORARY_REGISTERS(ARG_CNT)/* to restore arg and temp registers  */
        
-       ldq     t0,0*8(sp)            /* restore used register                    */
-       ldq     t1,1*8(sp)
-       ldq     t3,2*8(sp)
-       ldq     xptr,3*8(sp)
-       ldq     xpc,4*8(sp)
-       ldq     pv,5*8(sp)
-       ldq     ra,6*8(sp)
-       lda     sp,7*8(sp)            /* deallocate stack                         */
-#endif
+       lda     sp,(ARG_CNT+TMP_CNT)*8(sp)  /* remove maybe-leaf stackframe       */
+
+L_asm_handle_exception_no_leaf:
+       jmp     zero,(xpc)                  /* jump to the handler                */
+
+L_asm_handle_exception_not_catched:
+       ldq     xptr,0*8(sp)                /* restore xptr                       */
+       ldq     pv,2*8(sp)                  /* restore PV                         */
+       ldq     ra,3*8(sp)                  /* restore RA                         */
+       ldq     t0,4*8(sp)                  /* get maybe-leaf flag                */
+       lda     sp,6*8(sp)
+
+       beq     t0,L_asm_handle_exception_no_leaf_stack
 
-no_monitor_exit:
-       ldl     t0,FrameSize(pv)      /* t0 = frame size                          */
-       addq    sp,t0,sp              /* unwind stack                             */
-       mov     sp,t0                 /* t0 = pointer to save area                */
-       ldl     t1,IsLeaf(pv)         /* t1 = is leaf procedure                   */
-       bne     t1,ex_no_restore      /* if (leaf) skip                           */
-       ldq     ra,-8(t0)             /* restore ra                               */
-       lda     t0,-8(t0)             /* t0--                                     */
-ex_no_restore:
-       mov     ra,xpc                /* the new xpc is ra                        */
-       ldl     t1,IntSave(pv)        /* t1 = saved int register count            */
-       br      t2,ex_int1            /* t2 = current pc                          */
+       lda     sp,(ARG_CNT+TMP_CNT)*8(sp)  /* remove maybe-leaf stackframe       */
+       mov     zero,t0                     /* clear the maybe-leaf flag          */
+
+L_asm_handle_exception_no_leaf_stack:
+       ldl     t1,FrameSize(pv)            /* get frame size                     */
+       addq    t1,sp,t1                    /* pointer to save area               */
+
+       ldl     t2,IsLeaf(pv)               /* is leaf procedure                  */
+       bne     t2,L_asm_handle_exception_no_ra_restore
+
+       ldq     ra,-1*8(t1)                 /* restore ra                         */
+       subq    t1,8,t1                     /* t1--                               */
+
+L_asm_handle_exception_no_ra_restore:
+       mov     ra,xpc                      /* the new xpc is ra                  */
+       ldl     t2,IntSave(pv)              /* t2 = saved int register count      */
+       br      t3,ex_int1                  /* t3 = current pc                    */
 ex_int1:
-       lda     t2,44(t2)             /* lda t2,ex_int2-ex_int1(t2) !!!!!!!!!!!!! */
-       negl    t1,t1                 /* negate register count                    */
-       s4addq  t1,t2,t2              /* t2 = ex_int_sav - 4 * register count     */
-       jmp     zero,(t2)             /* jump to save position                    */
-       ldq     s0,-56(t0)
-       ldq     s1,-48(t0)
-       ldq     s2,-40(t0)
-       ldq     s3,-32(t0)
-       ldq     s4,-24(t0)
-       ldq     s5,-16(t0)
-       ldq     s6,-8(t0)
+       lda     t3,(ex_int2 - ex_int1)(t3)
+       negl    t2,t2                       /* negate register count              */
+       s4addq  t2,t3,t3                    /* t2 = IntSave - register count * 4  */
+       jmp     zero,(t3)                   /* jump to save position              */
+
+       ldq     s0,-7*8(t1)
+       ldq     s1,-6*8(t1)
+       ldq     s2,-5*8(t1)
+       ldq     s3,-4*8(t1)
+       ldq     s4,-3*8(t1)
+       ldq     s5,-2*8(t1)
+       ldq     s6,-1*8(t1)
+
 ex_int2:
-       s8addq  t1,t0,t0              /* t0 = t0 - 8 * register count             */
+       s8addq  t2,t1,t1                    /* t1 = t1 - 8 * register count       */
 
-       ldl     t1,FltSave(pv)        /* t1 = saved flt register count            */
-       br      t2,ex_flt1            /* t2 = current pc                          */
+       ldl     t2,FltSave(pv)              /* t2 = saved flt register count      */
+       br      t3,ex_flt1                  /* t3 = current pc                    */
 ex_flt1:
-       lda     t2,48(t2)             /* lda t2,ex_flt2-ex_flt1(t2) !!!!!!!!!!!!! */
-       negl    t1,t1                 /* negate register count                    */
-       s4addq  t1,t2,t2              /* t2 = ex_flt_sav - 4 * register count     */
-       jmp     zero,(t2)             /* jump to save position                    */
-       ldt     fs0,-64(t0)
-       ldt     fs1,-56(t0)
-       ldt     fs2,-48(t0)
-       ldt     fs3,-40(t0)
-       ldt     fs4,-32(t0)
-       ldt     fs5,-24(t0)
-       ldt     fs6,-16(t0)
-       ldt     fs7,-8(t0)
+       lda     t3,(ex_flt2 - ex_flt1)(t3)
+       negl    t2,t2                       /* negate register count              */
+       s4addq  t2,t3,t3                    /* t2 = FltSave - 4 * register count  */
+       jmp     zero,(t3)                   /* jump to save position              */
+
+       ldt     fs0,-8*8(t1)
+       ldt     fs1,-7*8(t1)
+       ldt     fs2,-6*8(t1)
+       ldt     fs3,-5*8(t1)
+       ldt     fs4,-4*8(t1)
+       ldt     fs5,-3*8(t1)
+       ldt     fs6,-2*8(t1)
+       ldt     fs7,-1*8(t1)
+
 ex_flt2:
-       ldl     t0,0(ra)              /* load instruction LDA PV,xxx(RA)          */
-       sll     t0,48,t0
-       sra     t0,48,t0              /* isolate offset                           */
-       addq    t0,ra,pv              /* compute update address                   */
-       ldl     t0,4(ra)              /* load instruction LDAH PV,xxx(PV)         */
-       srl     t0,16,t0              /* isolate instruction code                 */
-       lda     t0,-0x177b(t0)        /* test for LDAH                            */
-       bne     t0,ex_stack_loop       
-       ldl     t0,4(ra)              /* load instruction LDAH PV,xxx(RA)         */
-       sll     t0,16,t0              /* compute high offset                      */
-       addl    t0,0,t0               /* sign extend high offset                  */
-       addq    t0,pv,pv              /* compute update address                   */
-       br      ex_stack_loop
+       ldl     t1,FrameSize(pv)            /* get frame size                     */
+       addq    sp,t1,sp                    /* unwind stack                       */
+       br      L_asm_handle_exception_stack_loop
 
        .end    asm_handle_nat_exception
 
 
-/* asm_wrapper_patcher *********************************************************
+/* asm_abstractmethoderror *****************************************************
 
-   XXX
+   Creates and throws an AbstractMethodError.
+
+*******************************************************************************/
+
+       .ent    asm_abstractmethoderror
+
+asm_abstractmethoderror:
+       subq    sp,2*8,sp                   /* create stackframe                  */
+       stq     ra,0*8(sp)                  /* save return address                */
+       addq    sp,2*8,a0                   /* pass java sp                       */
+       mov     ra,a1                       /* pass exception address             */
+       jsr     ra,exceptions_asm_new_abstractmethoderror
+       ldq     ra,0*8(sp)                  /* restore return address             */
+       addq    sp,2*8,sp                   /* remove stackframe                  */
+
+       mov     v0,xptr                     /* get exception pointer              */
+       subq    ra,4,xpc                    /* exception address is ra - 4        */
+       br      L_asm_handle_nat_exception
+
+       .end    asm_abstractmethoderror
+
+
+/* asm_compare_and_swap ********************************************************
+
+   Does an atomic compare and swap.  Required for the lock
+   implementation.
 
-   Stack layout:
-     40   return address into JIT code (patch position)
-     32   pointer to virtual java_objectheader
-     24   machine code (which is patched back later)
-     16   unresolved class/method/field reference
-      8   data segment displacement from load instructions
-      0   patcher function pointer to call (pv afterwards)
+   Atomically do the following: Check if the location still contains
+   `oldval`. If so, replace it by `newval` and return `oldval`.
 
-   ATTENTION: itmp3 == gp! But we don't need gp do call the patcher function.
+   RETURN VALUE:
+       the old value at *p
+
+   long compare_and_swap(volatile long *p, long oldval, long newval);
 
 *******************************************************************************/
-               
-       .ent    asm_wrapper_patcher
-
-asm_wrapper_patcher:
-       lda     sp,-((12+27+4)*8+sizestackframeinfo)(sp) /* create stack frame    */
-
-       SAVE_ARGUMENT_REGISTERS(0)    /* save 6 int/6 float argument registers    */
-       SAVE_TEMPORARY_REGISTERS(12)  /* save 11 int/16 float temporary registers */
-
-       stq     itmp1,(12+27+0)*8(sp) /* save itmp1                               */
-       stq     itmp2,(12+27+1)*8(sp) /* save itmp2                               */
-       stq     ra,(12+27+2)*8(sp)    /* save method return address (for leafs)   */
-       stq     pv,(12+27+3)*8(sp)    /* save pv of calling java function         */
-
-       br      ra,L_asm_wrapper_patcher_load_gp
-L_asm_wrapper_patcher_load_gp:
-       ldgp    gp,0(ra)              /* load gp (it's not set correctly in jit)  */
-
-       lda     a0,(12+27+4)*8(sp)    /* create stackframe info                   */
-       mov     pv,a1                 /* pass java pv                             */
-       lda     a2,((6+12+27+4)*8+sizestackframeinfo)(sp) /* pass java sp         */
-       ldq     a3,(12+27+2)*8(sp)    /* this is correct for leafs                */
-       ldq     a4,((5+12+27+4)*8+sizestackframeinfo)(sp) /* pass xpc             */
-       jsr     ra,stacktrace_create_extern_stackframeinfo
-       ldgp    gp,0(ra)
-
-       lda     a0,((0+12+27+4)*8+sizestackframeinfo)(sp) /* pass sp              */
-       ldq     pv,((0+12+27+4)*8+sizestackframeinfo)(sp) /* get function pointer */
-       ldq     itmp1,(12+27+3)*8(sp) /* save pv to the position of fp            */
-       stq     itmp1,((0+12+27+4)*8+sizestackframeinfo)(sp)
-       jmp     ra,(pv)               /* call the patcher function                */
-       ldgp    gp,0(ra)
-
-       lda     a0,(12+27+4)*8(sp)    /* remove stackframe info                   */
-       jsr     ra,stacktrace_remove_stackframeinfo
-       ldgp    gp,0(ra)
-
-       RESTORE_ARGUMENT_REGISTERS(0) /* restore 6 int/6 float argument registers */
-       RESTORE_TEMPORARY_REGISTERS(12)/* restore 11 integer temporary registers  */
-
-       ldq     itmp1,(12+27+0)*8(sp) /* restore itmp1                            */
-       ldq     itmp2,(12+27+1)*8(sp) /* restore itmp2                            */
-       ldq     ra,(12+27+2)*8(sp)    /* restore method return address (for leafs)*/
-       ldq     pv,(12+27+3)*8(sp)    /* restore pv of calling java function      */
-
-       ldq     itmp3,((5+12+27+4)*8+sizestackframeinfo)(sp)/* get RA to jit code */
-       lda     sp,((6+12+27+4)*8+sizestackframeinfo)(sp)  /* remove stack frame  */
-
-       beq     v0,L_asm_wrapper_patcher_exception
-
-       jmp     zero,(itmp3)          /* jump to new patched code                 */
-
-L_asm_wrapper_patcher_exception:
-       mov     itmp3,xpc             /* return address into JIT code is xpc      */
-
-       br      itmp1,L_asm_wrapper_patcher_exception_load_gp
-L_asm_wrapper_patcher_exception_load_gp:
-       ldgp    gp,0(itmp1)           /* itmp3 == gp, load the current gp         */
-
-#if defined(USE_THREADS) && defined(NATIVE_THREADS)
-       subq    sp,3*8,sp
-       stq     xpc,0*8(sp)           /* save return address (xpc)                */
-       stq     ra,1*8(sp)
-       stq     pv,2*8(sp)
-       jsr     ra,builtin_asm_get_exceptionptrptr
-       ldq     xpc,0*8(sp)           /* restore return address (xpc)             */
-       ldq     ra,1*8(sp)
-       ldq     pv,2*8(sp)
-       addq    sp,3*8,sp
-#else
-       lda     v0,_exceptionptr
-#endif
-       ldq     xptr,0(v0)            /* get the exception pointer                */
-       stq     zero,0(v0)            /* clear the exception pointer              */
-       br      asm_handle_exception  /* we have the pv of the calling java func. */
 
-       .end    asm_wrapper_patcher
+       .ent    asm_compare_and_swap
+
+asm_compare_and_swap:
+1:
+       ldq_l   v0,0(a0)
+       cmpeq   v0,a1,t0
+       beq     t0,2f
+       mov     a2,t0
+       stq_c   t0,0(a0)
+       beq     t0,1b
+2:
+       jmp     zero,(ra)
+
+       .end    asm_compare_and_swap
+
+
+/* asm_memory_barrier **********************************************************
+
+   A memory barrier for the Java Memory Model.
 
-               
-/******************* function asm_initialize_thread_stack **********************
-*                                                                              *
-*   initialized a thread stack                                                 *
-*                                                                              *
 *******************************************************************************/
 
-       .ent    asm_initialize_thread_stack
-
-asm_initialize_thread_stack:
-       lda     a1,-128(a1)
-       stq     zero, 0(a1)
-       stq     zero, 8(a1)
-       stq     zero, 16(a1)
-       stq     zero, 24(a1)
-       stq     zero, 32(a1)
-       stq     zero, 40(a1)
-       stq     zero, 48(a1)
-       stt     fzero, 56(a1)
-       stt     fzero, 64(a1)
-       stt     fzero, 72(a1)
-       stt     fzero, 80(a1)
-       stt     fzero, 88(a1)
-       stt     fzero, 96(a1)
-       stt     fzero, 104(a1)
-       stt     fzero, 112(a1)
-       stq     a0, 120(a1)
-       mov     a1, v0
+       .ent    asm_memory_barrier
+
+asm_memory_barrier:
+       mb
        jmp     zero,(ra)
 
-       .end    asm_initialize_thread_stack
+       .end    asm_memory_barrier
 
 
-/******************* function asm_perform_threadswitch *************************
-*                                                                              *
-*   void asm_perform_threadswitch (u1 **from, u1 **to, u1 **stackTop);         *
-*                                                                              *
-*   performs a threadswitch                                                    *
-*                                                                              *
+/* asm_md_init *****************************************************************
+
+   Initialize machine dependent stuff.
+
+   Determines if the byte support instruction set (21164a and higher)
+   is available.
+
 *******************************************************************************/
 
-       .ent    asm_perform_threadswitch
-
-asm_perform_threadswitch:
-       subq    sp,128,sp
-       stq     s0, 0(sp)
-       stq     s1, 8(sp)
-       stq     s2, 16(sp)
-       stq     s3, 24(sp)
-       stq     s4, 32(sp)
-       stq     s5, 40(sp)
-       stq     s6, 48(sp)
-       stt     fs0, 56(sp)
-       stt     fs1, 64(sp)
-       stt     fs2, 72(sp)
-       stt     fs3, 80(sp)
-       stt     fs4, 88(sp)
-       stt     fs5, 96(sp)
-       stt     fs6, 104(sp)
-       stt     fs7, 112(sp)
-       stq     ra, 120(sp)
-       stq     sp, 0(a0)
-       stq     sp, 0(a2)
-       ldq     sp, 0(a1)
-       ldq     s0, 0(sp)
-       ldq     s1, 8(sp)
-       ldq     s2, 16(sp)
-       ldq     s3, 24(sp)
-       ldq     s4, 32(sp)
-       ldq     s5, 40(sp)
-       ldq     s6, 48(sp)
-       ldt     fs0, 56(sp)
-       ldt     fs1, 64(sp)
-       ldt     fs2, 72(sp)
-       ldt     fs3, 80(sp)
-       ldt     fs4, 88(sp)
-       ldt     fs5, 96(sp)
-       ldt     fs6, 104(sp)
-       ldt     fs7, 112(sp)
-       ldq     ra, 120(sp)
-       mov     ra, pv
-       addq    sp, 128, sp
-       jmp     zero,(ra)
-
-       .end    asm_perform_threadswitch
-
-
-/********************* function asm_switchstackandcall *************************
-*                                                                              *
-*  void *asm_switchstackandcall (void *stack, void *func, void **stacktopsave, *
-*                               void *p);                                      *
-*                                                                              *
-*   Switches to a new stack, calls a function and switches back.               *
-*       a0      new stack pointer                                              *
-*       a1      function pointer                                               *
-*              a2              pointer to variable where stack top should be stored           *
-*              a3      pointer to user data, is passed to the function                *
-*                                                                              *
+       .ent    asm_md_init
+
+asm_md_init:
+       .long   0x47e03c20                  /* amask   1,v0                       */
+       jmp     zero,(ra)                   /* return                             */
+
+       .end    asm_md_init
+
+
+/* asm_cacheflush **************************************************************
+
+   XXX
+
 *******************************************************************************/
 
+       .ent    asm_cacheflush
+
+asm_cacheflush:
+       call_pal PAL_imb              /* synchronize instruction cache            */
+       jmp     zero,(ra)
+
+       .end    asm_cacheflush
 
-       .ent    asm_switchstackandcall
 
-asm_switchstackandcall:
-       lda     a0,-2*8(a0)     /* allocate new stack                                 */
-       stq     ra,0(a0)        /* save return address on new stack                   */
-       stq     sp,1*8(a0)      /* save old stack pointer on new stack                */
-       stq sp,0(a2)        /* save old stack pointer to variable                 */
-       mov     a0,sp           /* switch to new stack                                */
-       
-       mov     a1,pv           /* load function pointer                              */
-       mov a3,a0           /* pass pointer */
-       jmp     ra,(pv)         /* and call function                                  */
-
-       ldq     ra,0(sp)        /* load return address                                */
-       ldq     sp,1*8(sp)      /* switch to old stack                                */
-
-       jmp     zero,(ra)       /* return                                             */
-
-       .end    asm_switchstackandcall
-
-       .ent    asm_getclassvalues_atomic
-
-asm_getclassvalues_atomic:
-_crit_restart2:
-_crit_begin2:
-       ldl     t0,offbaseval(a0)
-       ldl     t1,offdiffval(a0)
-       ldl     t2,offbaseval(a1)
-_crit_end2:
-       stl     t0,offcast_super_baseval(a2)
-       stl     t1,offcast_super_diffval(a2)
-       stl     t2,offcast_sub_baseval(a2)
-       jmp      zero,(ra)
-
-       .end    asm_getclassvalues_atomic
-
-    .data
-
-asm_criticalsections:
-#if defined(USE_THREADS) && defined(NATIVE_THREADS)
-    .quad   _crit_begin1
-    .quad   _crit_end1
-    .quad   _crit_restart1
-    .quad   _crit_begin2
-    .quad   _crit_end2
-    .quad   _crit_restart2
+/* disable exec-stacks ********************************************************/
+
+#if defined(__linux__) && defined(__ELF__)
+       .section .note.GNU-stack,"",%progbits
 #endif
-    .quad   0
 
 
 /*
@@ -961,4 +496,5 @@ asm_criticalsections:
  * c-basic-offset: 4
  * tab-width: 4
  * End:
+ * vim:noexpandtab:sw=4:ts=4:
  */