* Again, new and simpler stacktraces
[cacao.git] / src / vm / jit / alpha / asmpart.S
index aa43be2522fa4e53da04046d59e4e3b9f8f4df46..8c0d58f0bbafab44438b0f3cb0b2b7e72321270c 100644 (file)
@@ -1,80 +1,45 @@
-/* -*- mode: asm; tab-width: 4 -*- */
-/****************************** asmpart.S **************************************
-*                                                                              *
-*   It contains the Java-C interface functions for Alpha processors.           *
-*                                                                              *
-*   Copyright (c) 1997 A. Krall, R. Grafl, M. Gschwind, M. Probst              *
-*                                                                              *
-*   See file COPYRIGHT for information on usage and disclaimer of warranties   *
-*                                                                              *
-*   Authors: Andreas  Krall      EMAIL: cacao@complang.tuwien.ac.at            *
-*            Reinhard Grafl      EMAIL: cacao@complang.tuwien.ac.at            *
-*                                                                              *
-*   Last Change: 2003/02/17                                                    *
-*                                                                              *
-*******************************************************************************/
+/* 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
+
+   This file is part of CACAO.
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public License as
+   published by the Free Software Foundation; either version 2, or (at
+   your option) any later version.
+
+   This program is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   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 2992 2005-07-11 21:52:07Z twisti $
+
+*/
+
+
+#include "config.h"        
+#include "vm/jit/alpha/offsets.h"
+#include "vm/jit/alpha/asmoffsets.h"
+#include "vm/jit/alpha/md-asm.h"
 
-#include "offsets.h"
-
-#define v0      $0
-
-#define t0      $1
-#define t1      $2
-#define t2      $3
-#define t3      $4
-#define t4      $5
-#define t5      $6
-#define t6      $7
-#define t7      $8
-
-#define        s0      $9
-#define        s1      $10
-#define        s2      $11
-#define        s3      $12
-#define        s4      $13
-#define        s5      $14
-#define        s6      $15
-
-#define a0      $16
-#define a1      $17
-#define a2      $18
-#define a3      $19
-#define a4      $20
-#define a5      $21
-
-#define t8      $22
-#define t9      $23
-#define t10     $24
-#define t11     $25
-#define ra      $26
-#define t12     $27
-
-#define pv      t12
-#define AT      $at
-#define gp      $29
-#define sp      $30
-#define zero    $31
-
-#define itmp1   $25
-#define itmp2   $28
-#define itmp3   $29
-
-#define xptr    itmp1
-#define xpc     itmp2
-
-#define sf0     $f2
-#define sf1     $f3
-#define sf2     $f4
-#define sf3     $f5
-#define sf4     $f6
-#define sf5     $f7
-#define sf6     $f8
-#define sf7     $f9
-
-#define fzero   $f31
-
-
-#define PAL_imb 134
 
        .text
        .set    noat
 
 /********************* exported functions and variables ***********************/
 
+       .globl asm_sync_instruction_cache
        .globl has_no_x_instr_set
-       .globl synchronize_caches
-       .globl asm_calljavamethod
+
        .globl asm_calljavafunction
+       .globl asm_calljavafunction_int
+
        .globl asm_calljavafunction2
-       .globl asm_calljavafunction2double
+       .globl asm_calljavafunction2int
        .globl asm_calljavafunction2long
+       .globl asm_calljavafunction2float
+       .globl asm_calljavafunction2double
+
        .globl asm_call_jit_compiler
-       .globl asm_dumpregistersandcall
        .globl asm_handle_exception
        .globl asm_handle_nat_exception
-       .globl asm_builtin_checkcast    
-       .globl asm_builtin_checkarraycast
-       .globl asm_builtin_aastore
-       .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_wrapper_patcher
+
        .globl asm_perform_threadswitch
        .globl asm_initialize_thread_stack
        .globl asm_switchstackandcall
-       .globl asm_getcallingmethod
-       .globl asm_builtin_trace
-       .globl asm_builtin_exittrace
+       .globl asm_criticalsections
+       .globl asm_getclassvalues_atomic
+
 
-/*************************** imported functions *******************************/
+/* asm_sync_instruction_cache **************************************************
 
-       .globl jit_compile
-       .globl builtin_monitorexit
-       .globl builtin_throw_exception
-       .globl builtin_trace_exception
-       .globl class_java_lang_Object
+   XXX
 
+*******************************************************************************/
+
+       .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 ***************************
 *                                                                              *
@@ -135,71 +103,44 @@ has_no_x_instr_set:
        .end    has_no_x_instr_set
 
 
-/********************* function synchronize_caches ****************************/
-
-       .ent    synchronize_caches
-synchronize_caches:
-
-       call_pal PAL_imb                  /* synchronise instruction cache        */
-       jmp     zero,(ra)                 /* return                               */
-
-       .end    synchronize_caches
-
-
-/********************* function asm_calljavamethod *****************************
+/********************* function asm_calljavafunction ***************************
 *                                                                              *
 *   This function calls a Java-method (which possibly needs compilation)       *
-*   with up to 4 parameters.                                                   *
+*   with up to 4 address parameters.                                           *
 *                                                                              *
 *   This functions calls the JIT-compiler which eventually translates the      *
 *   method into machine code.                                                  *
 *                                                                              *
-*   An possibly throwed exception will be returned to the caller as function   *
-*   return value, so the java method cannot return a fucntion value (this      *
-*   function usually calls 'main' and '<clinit>' which do not return a         *
-*   function value).                                                           *
-*                                                                              *
 *   C-prototype:                                                               *
-*    javaobject_header *asm_calljavamethod (methodinfo *m,                     *
+*    javaobject_header *asm_calljavafunction (methodinfo *m,                   *
 *         void *arg1, void *arg2, void *arg3, void *arg4);                     *
 *                                                                              *
 *******************************************************************************/
 
-#define        MethodPointer   -8
-#define        FrameSize       -12
-#define     IsSync          -16
-#define     IsLeaf          -20
-#define     IntSave         -24
-#define     FltSave         -28
-#define     ExTableSize     -32
-#define     ExTableStart    -32
-
-#define     ExEntrySize     -32
-#define     ExStartPC       -8
-#define     ExEndPC         -16
-#define     ExHandlerPC     -24
-#define     ExCatchType     -32
-
-       .ent    asm_calljavamethod
+       .ent    asm_calljavafunction
 
 call_name:
-       .ascii  "calljavamethod\0\0"
+       .ascii  "calljavafunction\0\0"
 
-       .align  3
+       .align  2 /*3*/
        .quad   0                         /* catch type all                       */
        .quad   calljava_xhandler         /* handler pc                           */
        .quad   calljava_xhandler         /* end pc                               */
-       .quad   asm_calljavamethod        /* start pc                             */
+       .quad   asm_calljavafunction      /* start pc                             */
        .long   1                         /* extable size                         */
-       .long   0                         /* fltsave                              */
+       .long   0                         /* PADDING */
+       .quad   0                         /* line number table start             */
+       .quad   0                         /* line number table size             */
+       .long   0                         /* 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_calljavamethod:
-
+asm_calljavafunction:
+asm_calljavafunction_int:
        ldgp    gp,0(pv)
        lda     sp,-32(sp)                /* allocate stack space                 */
        stq     gp,24(sp)                 /* save global pointer                  */
@@ -213,108 +154,30 @@ asm_calljavamethod:
        mov     a3,a2
        mov     a4,a3
 
-       lda     $28,asm_call_jit_compiler /* fake virtual function call (2 instr) */
-       stq     $28,8(sp)                 /* store function address               */
-       mov     sp,$28                    /* set method pointer                   */
+       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                   */
 
-       ldq     pv,8($28)                 /* method call as in Java               */
+       ldq     pv,8(itmp2)               /* method call as in Java               */
        jmp     ra,(pv)                   /* call JIT compiler                    */
 calljava_jit:
-       lda     pv,-64(ra)                /* asm_calljavamethod-calljava_jit !!!!!*/
+       lda     pv,(asm_calljavafunction - calljava_jit)(ra)
 
 calljava_return:
-
        ldq     ra,0(sp)                  /* restore return address               */
        ldq     gp,24(sp)                 /* restore global pointer               */
        lda     sp,32(sp)                 /* free stack space                     */
-    clr     v0
 
 calljava_ret:
        jmp     zero,(ra)
 
 calljava_xhandler:
-
        ldq     gp,24(sp)                 /* restore global pointer               */
-       mov     itmp1,a0
-       jsr     ra,builtin_throw_exception
-       ldq     ra,0(sp)                  /* restore return address               */
-       lda     sp,32(sp)                 /* free stack space                     */
-       jmp     zero,(ra)
-       .end    asm_calljavamethod
-
-
-/********************* function asm_calljavafunction ***************************
-*                                                                              *
-*   This function calls a Java-method (which possibly needs compilation)       *
-*   with up to 4 address parameters.                                           *
-*                                                                              *
-*   This functions calls the JIT-compiler which eventually translates the      *
-*   method into machine code.                                                  *
-*                                                                              *
-*   C-prototype:                                                               *
-*    javaobject_header *asm_calljavamethod (methodinfo *m,                     *
-*         void *arg1, void *arg2, void *arg3, void *arg4);                     *
-*                                                                              *
-*******************************************************************************/
-
-       .ent    asm_calljavafunction
-
-call_name2:
-       .ascii  "calljavafunction\0\0"
-
-       .align  3
-       .quad   0                         /* catch type all                       */
-       .quad   calljava_xhandler2        /* handler pc                           */
-       .quad   calljava_xhandler2        /* end pc                               */
-       .quad   asm_calljavafunction      /* start pc                             */
-       .long   1                         /* extable size                         */
-       .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:
-
-       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                  */
-
-       stq     a0,16(sp)                 /* save method pointer for compiler     */
-       lda     v0,16(sp)                 /* pass pointer to method pointer via v0*/
-
-       mov     a1,a0                     /* pass the remaining parameters        */
-       mov     a2,a1
-       mov     a3,a2
-       mov     a4,a3
-
-       lda     $28,asm_call_jit_compiler /* fake virtual function call (2 instr) */
-       stq     $28,8(sp)                 /* store function address               */
-       mov     sp,$28                    /* set method pointer                   */
-
-       ldq     pv,8($28)                 /* method call as in Java               */
-       jmp     ra,(pv)                   /* call JIT compiler                    */
-calljava_jit2:
-       lda     pv,-64(ra)                /* asm_calljavafunction-calljava_jit !!!!!*/
-
-calljava_return2:
-
-       ldq     ra,0(sp)                  /* restore return address               */
-       ldq     gp,24(sp)                 /* restore global pointer               */
-       lda     sp,32(sp)                 /* free stack space                     */
-
-calljava_ret2:
-       jmp     zero,(ra)
-
-calljava_xhandler2:
-
-       ldq     gp,24(sp)                 /* restore global pointer               */
-       mov     itmp1,a0
+       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
 
@@ -323,15 +186,18 @@ calljava_xhandler2:
 
        .ent    asm_calljavafunction2
 
-call_name3:
-       .ascii  "calljavafunction2\0\0"
-
+call_name2:
        .align  3
+
        .quad   0                         /* catch type all                       */
-       .quad   calljava_xhandler3        /* handler pc                           */
-       .quad   calljava_xhandler3        /* end pc                               */
+       .quad   calljava_xhandler2        /* handler pc                           */
+       .quad   calljava_xhandler2        /* end pc                               */
        .quad   asm_calljavafunction2     /* start pc                             */
        .long   1                         /* extable size                         */
+       .long   0                         /* PADDING                              */
+       .quad   0                         /* line number table start              */
+       .quad   0                         /* line number table size               */
+       .long   0                         /* PADDING                              */
        .long   0                         /* fltsave                              */
        .long   1                         /* intsave                              */
        .long   0                         /* isleaf                               */
@@ -340,16 +206,17 @@ call_name3:
        .quad   0                         /* method pointer (pointer to name)     */
 
 asm_calljavafunction2:
-asm_calljavafunction2double:
+asm_calljavafunction2int:
 asm_calljavafunction2long:
-
+asm_calljavafunction2float:
+asm_calljavafunction2double:
        ldgp    gp,0(pv)
-       lda     sp,-40(sp)                /* allocate stack space                 */
-       stq     ra,0(sp)                  /* save return address                  */
-       stq     s6,24(sp)
-       stq     gp,8(sp)                  /* save global pointer                  */
+       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,32(sp)                 /* save method pointer for compiler     */
+       stq     a0,4*8(sp)                /* save method pointer for compiler     */
        mov     a3,t0                     /* pointer to arg block                 */
        mov     a1,s6                     /* arg count                            */
 
@@ -358,22 +225,27 @@ asm_calljavafunction2long:
        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)
@@ -393,40 +265,40 @@ calljava_copyloop:
        bne     t1,calljava_copyloop
 
 calljava_nocopy:
-       lda     v0,32(t4)                 /* pass pointer to method pointer via v0*/
+       lda     v0,4*8(t4)                /* pass pointer to method pointer via v0*/
 
-       lda     $28,asm_call_jit_compiler /* fake virtual function call (2 instr) */
-       stq     $28,16(t4)                /* store function address               */
-       lda     $28,8(t4)                 /* set method pointer                   */
+       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($28)                 /* method call as in Java               */
+       ldq     pv,8(itmp2)               /* method call as in Java               */
        jmp     ra,(pv)                   /* call JIT compiler                    */
-calljava_jit3:
-       lda     pv,-200(ra)               /* asm_calljavafunction-calljava_jit !!!*/
+calljava_jit2:
+       lda     pv,(asm_calljavafunction2 - calljava_jit2)(ra)
 
        s8addq  s6,sp,sp
-calljava_return3:
-
-       ldq     ra,0(sp)                  /* restore return address               */
-       ldq     gp,8(sp)                  /* restore global pointer               */
-       ldq     s6,24(sp)
-       lda     sp,40(sp)                 /* free stack space                     */
+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_ret3:
+calljava_ret2:
        jmp     zero,(ra)
 
-calljava_xhandler3:
-
+calljava_xhandler2:
        s8addq  s6,sp,sp
-       ldq     gp,8(sp)                  /* restore global pointer               */
+       ldq     gp,1*8(sp)                /* restore global pointer               */
        mov     itmp1,a0
        jsr     ra,builtin_throw_exception
-       ldq     ra,0(sp)                  /* restore return address               */
-       ldq     s6,24(sp)
-       lda     sp,40(sp)                 /* free stack space                     */
+       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)
+
        .end    asm_calljavafunction2
-                                               
+
 
 /****************** function asm_call_jit_compiler *****************************
 *                                                                              *
@@ -448,10 +320,9 @@ calljava_xhandler3:
 *                                                                              *
 *******************************************************************************/
 
-
        .ent    asm_call_jit_compiler
-asm_call_jit_compiler:
 
+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          */
@@ -472,18 +343,9 @@ asm_call_jit_compiler:
        addq    t8,$28,$28            /* compute update address                   */
 noregchange:
        lda     sp,-14*8(sp)          /* reserve stack space                      */
-       stq     a0,0*8(sp)            /* save all argument registers              */
-       stq     a1,1*8(sp)            /* they could be used by method             */
-       stq     a2,2*8(sp)
-       stq     a3,3*8(sp)
-       stq     a4,4*8(sp)
-       stq     a5,5*8(sp)
-       stt     $f16,6*8(sp)
-       stt     $f17,7*8(sp)
-       stt     $f18,8*8(sp)
-       stt     $f19,9*8(sp)
-       stt     $f20,10*8(sp)
-       stt     $f21,11*8(sp)
+
+       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                      */
 
@@ -491,24 +353,14 @@ noregchange:
        jsr     ra,jit_compile        /* jit compiler                             */
        ldgp    gp,0(ra)
 
-       call_pal PAL_imb              /* synchronise instruction cache            */
+       RESTORE_ARGUMENT_REGISTERS(0) /* restore 6 int/6 float argument registers */
 
-       ldq     a0,0*8(sp)            /* load argument registers                  */
-       ldq     a1,1*8(sp)
-       ldq     a2,2*8(sp)
-       ldq     a3,3*8(sp)
-       ldq     a4,4*8(sp)
-       ldq     a5,5*8(sp)
-       ldt     $f16,6*8(sp)
-       ldt     $f17,7*8(sp)
-       ldt     $f18,8*8(sp)
-       ldt     $f19,9*8(sp)
-       ldt     $f20,10*8(sp)
-       ldt     $f21,11*8(sp)
        ldq     $28,12*8(sp)          /* load method pointer                      */
        ldq     ra,13*8(sp)           /* load return address                      */
        lda     sp,14*8(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                           */
@@ -516,101 +368,30 @@ noregchange:
        addq    t8,$28,t8             /* compute update address via method pointer*/
        stq     v0,0(t8)              /* save new method address there            */
 
-       mov     v0,pv                 /* load method address into pv              */
+       call_pal PAL_imb              /* synchronise instruction cache            */
 
+       mov     v0,pv                 /* load method address into pv              */
        jmp     zero,(pv)             /* and call method. The method returns      */
                                      /* directly to the caller (ra).             */
 
-       .end    asm_call_jit_compiler
+L_asm_call_jit_compiler_exception:
+       subq    sp,1*8,sp
+       stq     ra,0*8(sp)
 
+       mov     zero,a0               /* fill in the correct stacktrace           */
+       lda     a1,1*8(sp)            /* pass sp of parent Java function          */
+       mov     ra,a2                 /* pass ra to parent Java function          */
+       mov     ra,a3                 /* xpc is the same as ra                    */
+       jsr     ra,stacktrace_extern_fillInStackTrace
+       mov     v0,xptr
 
-/****************** function asm_dumpregistersandcall **************************
-*                                                                              *
-*   This funtion saves all callee saved registers and calls the function       *
-*   which is passed as parameter.                                              *
-*                                                                              *
-*   This function is needed by the garbage collector, which needs to access    *
-*   all registers which are stored on the stack. Unused registers are          *
-*   cleared to avoid interferances with the GC.                                *
-*                                                                              *
-*   void asm_dumpregistersandcall (functionptr f);                             *
-*                                                                              *
-*******************************************************************************/
+       ldq     ra,0*8(sp)
+       addq    sp,1*8,sp
 
-       .ent    asm_dumpregistersandcall
-asm_dumpregistersandcall:
-       lda     sp,-16*8(sp)          /* allocate stack                           */
-       stq     ra,0(sp)              /* save return address                      */
-
-       stq     s0,1*8(sp)            /* save all callee saved registers          */
-       stq     s1,2*8(sp)            /* intialize the remaining registers        */
-       stq     s2,3*8(sp)
-       stq     s3,4*8(sp)
-       stq     s4,5*8(sp)
-       stq     s5,6*8(sp)
-       stq     s6,7*8(sp)
-       stt     $f2,8*8(sp)
-       stt     $f3,9*8(sp)
-       stt     $f4,10*8(sp)
-       stt     $f5,11*8(sp)
-       stt     $f6,12*8(sp)
-       stt     $f7,13*8(sp)
-       stt     $f8,14*8(sp)
-       stt     $f9,15*8(sp)
-
-       clr     v0                   /* intialize the remaining registers         */
-       clr     t0
-       clr     t1
-       clr     t2
-       clr     t3
-       clr     t4
-       clr     t5
-       clr     t6
-       clr     t7
-       clr     a1
-       clr     a2
-       clr     a3
-       clr     a4
-       clr     a5
-       clr     t8
-       clr     t9
-       clr     t10
-       clr     t11
-       clr     t12
-       clr     $28
-       clr     $29
-       cpys    $f31,$f31,$f0
-       cpys    $f31,$f31,$f1
-       cpys    $f31,$f31,$f10
-       cpys    $f31,$f31,$f11
-       cpys    $f31,$f31,$f12
-       cpys    $f31,$f31,$f13
-       cpys    $f31,$f31,$f14
-       cpys    $f31,$f31,$f15
-       cpys    $f31,$f31,$f16
-       cpys    $f31,$f31,$f17
-       cpys    $f31,$f31,$f18
-       cpys    $f31,$f31,$f19
-       cpys    $f31,$f31,$f20
-       cpys    $f31,$f31,$f21
-       cpys    $f31,$f31,$f22
-       cpys    $f31,$f31,$f23
-       cpys    $f31,$f31,$f24
-       cpys    $f31,$f31,$f25
-       cpys    $f31,$f31,$f26
-       cpys    $f31,$f31,$f27
-       cpys    $f31,$f31,$f28
-       cpys    $f31,$f31,$f29
-       cpys    $f31,$f31,$f30
-
-       mov     a0,pv                 /* load function pointer                    */
-       jmp     ra,(pv)               /* and call function                        */
-
-       ldq     ra,0(sp)              /* load return address                      */
-       lda     sp,16*8(sp)           /* deallocate stack                         */
-       jmp     zero,(ra)             /* return                                   */
-
-       .end    asm_dumpregistersandcall
+       subq    ra,4,xpc
+       br      asm_handle_nat_exception
+
+       .end    asm_call_jit_compiler
 
 
 /********************* function asm_handle_exception ***************************
@@ -626,8 +407,8 @@ asm_dumpregistersandcall:
 *******************************************************************************/
 
        .ent    asm_handle_nat_exception
-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                           */
@@ -635,15 +416,15 @@ asm_handle_nat_exception:
        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       
+       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                   */
 
        .aent    asm_handle_exception
-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   */
@@ -676,7 +457,9 @@ ex_stack_loop:
        mov     xptr,a0
        ldq     a1,MethodPointer(pv)
        mov     xpc,a2
-       mov     t3,a3
+/*     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                                  */
@@ -691,6 +474,7 @@ ex_trace:
        
        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:
@@ -703,17 +487,81 @@ ex_table_loop:
        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) */
+       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           */
@@ -753,6 +601,8 @@ empty_table:
 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                 */
 
@@ -778,6 +628,7 @@ ex_mon_load:
        ldq     pv,5*8(sp)
        ldq     ra,6*8(sp)
        lda     sp,7*8(sp)            /* deallocate stack                         */
+#endif
 
 no_monitor_exit:
        ldl     t0,FrameSize(pv)      /* t0 = frame size                          */
@@ -813,14 +664,14 @@ ex_flt1:
        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     $f2,-64(t0)
-       ldt     $f3,-56(t0)
-       ldt     $f4,-48(t0)
-       ldt     $f5,-40(t0)
-       ldt     $f6,-32(t0)
-       ldt     $f7,-24(t0)
-       ldt     $f8,-16(t0)
-       ldt     $f9,-8(t0)
+       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)
 ex_flt2:
        ldl     t0,0(ra)              /* load instruction LDA PV,xxx(RA)          */
        sll     t0,48,t0
@@ -839,241 +690,99 @@ ex_flt2:
        .end    asm_handle_nat_exception
 
 
-/********************* function asm_builtin_monitorenter ***********************
-*                                                                              *
-*   Does null check and calls monitorenter or throws an exception              *
-*                                                                              *
-*******************************************************************************/
-
-       .ent    asm_builtin_monitorenter
-asm_builtin_monitorenter:
-
-       ldgp    gp,0(pv)
-       lda     pv,builtin_monitorenter
-       beq     a0,nb_monitorenter        /* if (null) throw exception            */
-       jmp     zero,(pv)                 /* else call builtin_monitorenter       */
-
-nb_monitorenter:
-       ldq     xptr,proto_java_lang_NullPointerException
-       lda     xpc,-4(ra)                /* faulting address is return adress - 4*/
-       br      asm_handle_nat_exception
-       .end    asm_builtin_monitorenter
-
-
-/********************* function asm_builtin_monitorexit ************************
-*                                                                              *
-*   Does null check and calls monitorexit or throws an exception               *
-*                                                                              *
-*******************************************************************************/
-
-       .ent    asm_builtin_monitorexit
-asm_builtin_monitorexit:
-
-       ldgp    gp,0(pv)
-       lda     pv,builtin_monitorexit
-       beq     a0,nb_monitorexit         /* if (null) throw exception            */
-       jmp     zero,(pv)                 /* else call builtin_monitorexit        */
-
-nb_monitorexit:
-       ldq     xptr,proto_java_lang_NullPointerException
-       lda     xpc,-4(ra)                /* faulting address is return adress - 4*/
-       br      asm_handle_nat_exception
-       .end    asm_builtin_monitorexit
-
+/* asm_wrapper_patcher *********************************************************
 
-/************************ function asm_builtin_idiv ****************************
-*                                                                              *
-*   Does null check and calls idiv or throws an exception                      *
-*                                                                              *
-*******************************************************************************/
-
-       .ent    asm_builtin_idiv
-asm_builtin_idiv:
-
-       ldgp    gp,0(pv)
-       lda     pv,builtin_idiv
-       beq     a1,nb_idiv                /* if (null) throw exception            */
-       jmp     zero,(pv)                 /* else call builtin_idiv               */
+   XXX
 
-nb_idiv:
-       ldq     xptr,proto_java_lang_ArithmeticException
-       lda     xpc,-4(ra)                /* faulting address is return adress - 4*/
-       br      asm_handle_nat_exception
-       .end    asm_builtin_idiv
-
-
-/************************ function asm_builtin_ldiv ****************************
-*                                                                              *
-*   Does null check and calls ldiv or throws an exception                      *
-*                                                                              *
-*******************************************************************************/
-
-       .ent    asm_builtin_ldiv
-asm_builtin_ldiv:
-
-       ldgp    gp,0(pv)
-       lda     pv,builtin_ldiv
-       beq     a1,nb_ldiv                /* if (null) throw exception            */
-       jmp     zero,(pv)                 /* else call builtin_ldiv               */
-
-nb_ldiv:
-       ldq     xptr,proto_java_lang_ArithmeticException
-       lda     xpc,-4(ra)                /* faulting address is return adress - 4*/
-       br      asm_handle_nat_exception
-       .end    asm_builtin_ldiv
-
-
-/************************ function asm_builtin_irem ****************************
-*                                                                              *
-*   Does null check and calls irem or throws an exception                      *
-*                                                                              *
-*******************************************************************************/
-
-       .ent    asm_builtin_irem
-asm_builtin_irem:
-
-       ldgp    gp,0(pv)
-       lda     pv,builtin_irem
-       beq     a1,nb_irem                /* if (null) throw exception            */
-       jmp     zero,(pv)                 /* else call builtin_irem               */
-
-nb_irem:
-       ldq     xptr,proto_java_lang_ArithmeticException
-       lda     xpc,-4(ra)                /* faulting address is return adress - 4*/
-       br      asm_handle_nat_exception
-       .end    asm_builtin_irem
+   Stack layout:
+        32   return address into JIT code (patch position)
+     24   pointer to virtual java_objectheader
+     16   machine code (which is patched back later)
+      8   unresolved class/method/field reference
+      0   patcher function pointer to call (pv afterwards)
 
+   ATTENTION: itmp3 == gp! But we don't need gp do call the patcher function.
 
-/************************ function asm_builtin_lrem ****************************
-*                                                                              *
-*   Does null check and calls lrem or throws an exception                      *
-*                                                                              *
 *******************************************************************************/
+               
+       .ent    asm_wrapper_patcher
 
-       .ent    asm_builtin_lrem
-asm_builtin_lrem:
+asm_wrapper_patcher:
+       lda     sp,-((12+27+4)*8+sizestackframeinfo)(sp) /* create stack frame    */
 
-       ldgp    gp,0(pv)
-       lda     pv,builtin_lrem
-       beq     a1,nb_lrem                /* if (null) throw exception            */
-       jmp     zero,(pv)                 /* else call builtin_lrem               */
+       SAVE_ARGUMENT_REGISTERS(0)    /* save 6 int/6 float argument registers    */
+       SAVE_TEMPORARY_REGISTERS(12)  /* save 11 int/16 float temporary registers */
 
-nb_lrem:
-       ldq     xptr,proto_java_lang_ArithmeticException
-       lda     xpc,-4(ra)                /* faulting address is return adress - 4*/
-       br      asm_handle_nat_exception
-       .end    asm_builtin_lrem
-
-
- /*********************** function new_builtin_checkcast ************************
- *                                                                              *
- *   Does the cast check and eventually throws an exception                     *
- *                                                                              *
- *******************************************************************************/
-
-    .ent    asm_builtin_checkcast
-asm_builtin_checkcast:
-
-    ldgp    gp,0(pv)
-    lda     sp,-16(sp)                  # allocate stack space
-    stq     ra,0(sp)                    # save return address
-    stq     a0,8(sp)                    # save object pointer
-    jsr     ra,builtin_checkcast        # builtin_checkcast
-    ldgp    gp,0(ra)
-    beq     v0,nb_ccast_throw           # if (false) throw exception
-    ldq     ra,0(sp)                    # restore return address
-    ldq     v0,8(sp)                    # return object pointer
-    lda     sp,16(sp)                   # free stack space
-    jmp     zero,(ra)
-
-nb_ccast_throw:
-    ldq     xptr,proto_java_lang_ClassCastException
-    ldq     ra,0(sp)                    # restore return address
-    lda     sp,16(sp)                   # free stack space
-    lda     xpc,-4(ra)                  # faulting address is return adress - 4
-    br      asm_handle_nat_exception
-    .end    asm_builtin_checkcast
+       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         */
 
-               
-/******************* function asm_builtin_checkarraycast ***********************
-*                                                                              *
-*   Does the cast check and eventually throws an exception                     *
-*                                                                              *
-*******************************************************************************/
+       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)  */
 
-       .ent    asm_builtin_checkarraycast
-asm_builtin_checkarraycast:
+       lda     a0,(12+27+4)*8(sp)    /* create stackframe info                   */
+       mov     pv,a1                 /* pass java pv                             */
+       lda     a2,((5+12+27+4)*8+sizestackframeinfo)(sp) /* pass java sp         */
+       ldq     a3,(12+27+2)*8(sp)    /* this is correct for leafs                */
+       ldq     a4,((4+12+27+4)*8+sizestackframeinfo)(sp) /* pass xpc             */
+       jsr     ra,stacktrace_create_extern_stackframeinfo
+       ldgp    gp,0(ra)
 
-       ldgp    gp,0(pv)
-       lda     sp,-16(sp)                /* allocate stack space                 */
-       stq     ra,0(sp)                  /* save return address                  */
-       stq     a0,8(sp)                  /* save object pointer                  */
-       jsr     ra,builtin_checkarraycast /* builtin_checkarraycast               */
+       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)
-       beq     v0,nb_carray_throw        /* if (false) throw exception           */
-       ldq     ra,0(sp)                  /* restore return address               */
-       ldq     v0,8(sp)                  /* return object pointer                */
-       lda     sp,16(sp)                 /* free stack space                     */
-       jmp     zero,(ra)
 
-nb_carray_throw:
-       ldq     xptr,proto_java_lang_ClassCastException
-       ldq     ra,0(sp)                  /* restore return address               */
-       lda     sp,16(sp)                 /* free stack space                     */
-       lda     xpc,-4(ra)                /* faulting address is return adress - 4*/
-       br      asm_handle_nat_exception
-       .end    asm_builtin_checkarraycast
+       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  */
 
-/******************* function asm_builtin_aastore ******************************
-*                                                                              *
-*   Does the cast check and eventually throws an exception                     *
-*                                                                              *
-*******************************************************************************/
+       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      */
 
-       .ent    asm_builtin_aastore
-asm_builtin_aastore:
+       ldq     itmp3,((4+12+27+4)*8+sizestackframeinfo)(sp)/* get RA to jit code */
+       lda     sp,((5+12+27+4)*8+sizestackframeinfo)(sp)  /* remove stack frame  */
 
-       ldgp    gp,0(pv)
-       beq     a0,nb_aastore_null        /* if null pointer throw exception      */
-       ldl     t0,offarraysize(a0)       /* load size                            */
-       lda     sp,-24(sp)                /* allocate stack space                 */
-       stq     ra,0(sp)                  /* save return address                  */
-       s8addq  a1,a0,t1                  /* add index*8 to arrayref              */
-       cmpult  a1,t0,t0                  /* do bound check                       */
-       beq     t0,nb_aastore_bound       /* if out of bounds throw exception     */
-       mov     a2,a1                     /* object is second argument            */
-       stq     t1,8(sp)                  /* save store position                  */
-       stq     a1,16(sp)                 /* save object                          */
-       jsr     ra,builtin_canstore       /* builtin_canstore(arrayref,object)    */
-       ldgp    gp,0(ra)
-       ldq     ra,0(sp)                  /* restore return address               */
-       ldq     a0,8(sp)                  /* restore store position               */
-       ldq     a1,16(sp)                 /* restore object                       */
-       lda     sp,24(sp)                 /* free stack space                     */
-       beq     v0,nb_aastore_throw       /* if (false) throw exception           */
-       stq     a1,offobjarrdata(a0)      /* store objectptr in array             */
-       jmp     zero,(ra)
+       beq     v0,L_asm_wrapper_patcher_exception
 
-nb_aastore_null:
-       ldq     xptr,proto_java_lang_NullPointerException
-       mov     ra,xpc                    /* faulting address is return adress    */
-       br      asm_handle_nat_exception
+       jmp     zero,(itmp3)          /* jump to new patched code                 */
 
-nb_aastore_bound:
-       ldq     xptr,proto_java_lang_ArrayIndexOutOfBoundsException
-       lda     sp,24(sp)                 /* free stack space                     */
-       mov     ra,xpc                    /* faulting address is return adress    */
-       br      asm_handle_nat_exception
+L_asm_wrapper_patcher_exception:
+       mov     itmp3,xpc             /* return address into JIT code is xpc      */
 
-nb_aastore_throw:
-       ldq     xptr,proto_java_lang_ArrayStoreException
-       mov     ra,xpc                    /* faulting address is return adress    */
-       br      asm_handle_nat_exception
+       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         */
 
-       .end    asm_builtin_aastore
+#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
 
+               
 /******************* function asm_initialize_thread_stack **********************
 *                                                                              *
 *   initialized a thread stack                                                 *
@@ -1081,8 +790,8 @@ nb_aastore_throw:
 *******************************************************************************/
 
        .ent    asm_initialize_thread_stack
-asm_initialize_thread_stack:
 
+asm_initialize_thread_stack:
        lda     a1,-128(a1)
        stq     zero, 0(a1)
        stq     zero, 8(a1)
@@ -1102,6 +811,7 @@ asm_initialize_thread_stack:
        stq     a0, 120(a1)
        mov     a1, v0
        jmp     zero,(ra)
+
        .end    asm_initialize_thread_stack
 
 
@@ -1114,8 +824,8 @@ asm_initialize_thread_stack:
 *******************************************************************************/
 
        .ent    asm_perform_threadswitch
-asm_perform_threadswitch:
 
+asm_perform_threadswitch:
        subq    sp,128,sp
        stq     s0, 0(sp)
        stq     s1, 8(sp)
@@ -1124,14 +834,14 @@ asm_perform_threadswitch:
        stq     s4, 32(sp)
        stq     s5, 40(sp)
        stq     s6, 48(sp)
-       stt     sf0, 56(sp)
-       stt     sf1, 64(sp)
-       stt     sf2, 72(sp)
-       stt     sf3, 80(sp)
-       stt     sf4, 88(sp)
-       stt     sf5, 96(sp)
-       stt     sf6, 104(sp)
-       stt     sf7, 112(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)
@@ -1143,18 +853,19 @@ asm_perform_threadswitch:
        ldq     s4, 32(sp)
        ldq     s5, 40(sp)
        ldq     s6, 48(sp)
-       ldt     sf0, 56(sp)
-       ldt     sf1, 64(sp)
-       ldt     sf2, 72(sp)
-       ldt     sf3, 80(sp)
-       ldt     sf4, 88(sp)
-       ldt     sf5, 96(sp)
-       ldt     sf6, 104(sp)
-       ldt     sf7, 112(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
 
 
@@ -1173,6 +884,7 @@ asm_perform_threadswitch:
 
 
        .ent    asm_switchstackandcall
+
 asm_switchstackandcall:
        lda     a0,-2*8(a0)     /* allocate new stack                                 */
        stq     ra,0(a0)        /* save return address on new stack                   */
@@ -1191,144 +903,45 @@ asm_switchstackandcall:
 
        .end    asm_switchstackandcall
 
-               
-/********************* function asm_getcallingmethod ***************************
-*                                                                              *
-*   classinfo *asm_getcallingmethodclass ();                                                              *
-*                                                                                                                                                         *    
-*   goes back stack frames to get the calling method                                              *       
-*                                                                                                                                                         *    
-*                              t2 .. sp                                                                                                       *
-*                              t3 .. ra                                                                                                       *
-*                              t4 .. pv                                                                                                       *
-*                                                                              *
-*******************************************************************************/
-
-
-       .ent    asm_getcallingmethod
-asm_getcallingmethod:
-
-       ldq             t3,16(sp)             /* load return address of native function   */                            
-       addq    sp,24,t2                          /* skip frames of C-Function and nativestub */        
-               
-    /* determine pv (t3) of java-function from ra */
-
-       ldl     t0,0(t3)              /* load instruction LDA PV,xxx(RA)          */
-       sll     t0,48,t0
-       sra     t0,48,t0              /* isolate offset                           */
-       addq    t0,t3,t4              /* compute update address                   */
-       ldl     t0,4(t3)              /* load instruction LDAH PV,xxx(PV)         */
-       srl     t0,16,t0              /* isolate instruction code                 */
-       lda     t0,-0x177b(t0)        /* test for LDAH                            */
-       bne     t0,pv_ok1       
-       ldl     t0,0(t3)              /* load instruction LDA PV,xxx(RA)          */
-       sll     t0,16,t0              /* compute high offset                      */
-       addl    t0,0,t0               /* sign extend high offset                  */
-       addq    t0,t4,t4              /* compute update address                   */
-
-pv_ok1:                        
-       ldl     t0,FrameSize(t4)      /* t0 = frame size                          */            
-       addq    t2,t0,t2                          /* skip frame of java function                          */
-       ldq             t3,-8(t2)                         /* load new ra                              */                                                                
-
-    /* determine pv (t3) of java-function from ra */
-
-       ldl     t0,0(t3)              /* load instruction LDA PV,xxx(RA)          */
-       sll     t0,48,t0
-       sra     t0,48,t0              /* isolate offset                           */
-       addq    t0,t3,t4              /* compute update address                   */
-       ldl     t0,4(t3)              /* load instruction LDAH PV,xxx(PV)         */
-       srl     t0,16,t0              /* isolate instruction code                 */
-       lda     t0,-0x177b(t0)        /* test for LDAH                            */
-       bne     t0,pv_ok2
-       ldl     t0,0(t3)              /* load instruction LDA PV,xxx(RA)          */
-       sll     t0,16,t0              /* compute high offset                      */
-       addl    t0,0,t0               /* sign extend high offset                  */
-       addq    t0,t4,t4              /* compute update address                   */
-
-pv_ok2:                
-       ldq     v0,MethodPointer(t4)  /*                                                                                  */
-
-                                                                               
-       jmp     zero,(ra)                                 /* return                                   */
-
-       .end    asm_getcallingmethod
-
-
-
-
-
-
-
-
-/*********************** function asm_builtin_trace ****************************
-*                                                                              *
-*   Intended to be called from the native stub. Saves all argument registers   *
-*   and calls builtin_trace_args.                                              *
-*                                                                              *
-*******************************************************************************/
-
-       .ent asm_builtin_trace
-asm_builtin_trace:
-       ldgp gp,0(pv)
-       lda sp,-112(sp)
-       stq itmp1,0(sp)
-       stq ra,8(sp)
-       stq a0,16(sp)
-       stq a1,24(sp)
-       stq a2,32(sp)
-       stq a3,40(sp)
-       stq a4,48(sp)
-       stq a5,56(sp)
-       stt $f16,64(sp)
-       stt $f17,72(sp)
-       stt $f18,80(sp)
-       stt $f19,88(sp)
-       stt $f20,96(sp)
-       stt $f21,104(sp)
-       
-       jsr ra,builtin_trace_args
-       
-       ldq ra,8(sp)
-       ldq a0,16(sp)
-       ldq a1,24(sp)
-       ldq a2,32(sp)
-       ldq a3,40(sp)
-       ldq a4,48(sp)
-       ldq a5,56(sp)
-       ldt $f16,64(sp)
-       ldt $f17,72(sp)
-       ldt $f18,80(sp)
-       ldt $f19,88(sp)
-       ldt $f20,96(sp)
-       ldt $f21,104(sp)
-       lda sp,112(sp)
-       jmp zero,(ra)
-
-       .end asm_builtin_trace
-
-
-/********************* function asm_builtin_exittrace **************************
-*                                                                              *
-*   Intended to be called from the native stub. Saves return value and calls   *
-*   builtin_displaymethodstop.                                                 *
-*                                                                              *
-*******************************************************************************/
-
-       .ent asm_builtin_exittrace
-asm_builtin_exittrace:
-       ldgp gp,0(pv)
-       lda sp,-24(sp)
-       stq ra,0(sp)
-       stq v0,8(sp)
-       stt $f0,16(sp)
-       
-       jsr ra,builtin_displaymethodstop
-       
-       ldq ra,0(sp)
-       ldq v0,8(sp)
-       ldt $f0,16(sp)
-       lda sp,24(sp)
-       jmp zero,(ra)
-
-       .end asm_builtin_exittrace
+       .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
+#endif
+    .quad   0
+
+
+/*
+ * These are local overrides for various environment variables in Emacs.
+ * Please do not remove this and leave it at the end of the file, where
+ * Emacs will automagically detect them.
+ * ---------------------------------------------------------------------
+ * Local variables:
+ * mode: asm
+ * indent-tabs-mode: t
+ * c-basic-offset: 4
+ * tab-width: 4
+ * End:
+ */