* Updated header: Added 2006. Changed address of FSF. Changed email
[cacao.git] / src / vm / jit / x86_64 / asmpart.S
index f79c905cb5b266e90e4638e8898f05c943501331..6264a65d2ca994f6e0cf4f0a8d2540b732d1fc67 100644 (file)
-/* -*- mode: asm; tab-width: 4 -*- */
-/****************************** asmpart.c **************************************
-*                                                                              *
-*   It contains the Java-C interface functions for x86_64 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            *
-*            Christian Thalinger EMAIL: cacao@complang.tuwien.ac.at            *
-*                                                                              *
-*   Last Change: $Id: asmpart.S 559 2003-11-02 23:20:06Z twisti $        *
-*                                                                              *
-*******************************************************************************/
+/* src/vm/jit/x86_64/asmpart.S - Java-C interface functions for x86_64
+
+   Copyright (C) 1996-2005, 2006 R. Grafl, A. Krall, C. Kruegel,
+   C. Oates, R. Obermaisser, M. Platter, M. Probst, S. Ring,
+   E. Steiner, C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich,
+   J. Wenninger, Institut f. Computersprachen - TU Wien
+
+   This file is part of CACAO.
+
+   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., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA.
+
+   Contact: cacao@cacaojvm.org
+
+   Authors: Andreas Krall
+            Reinhard Grafl
+            Christian Thalinger
+
+   Changes:
+
+   $Id: asmpart.S 4357 2006-01-22 23:33:38Z twisti $
+
+*/
+
+
+#include "config.h"
+
+#include "md-abi.h"
+#include "md-asm.h"
+
+#include "vm/jit/abi.h"
+#include "vm/jit/x86_64/arch.h"
+#include "vm/jit/x86_64/offsets.h"
+
+#include "vm/jit/methodheader.h"
 
-#include "offsets.h"
 
        .text
 
 
 /********************* exported functions and variables ***********************/
 
-       .globl has_no_x_instr_set
-       .globl asm_calljavamethod
        .globl asm_calljavafunction
+       .globl asm_calljavafunction_int
+
+       .globl asm_calljavafunction2
+       .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_anewarray
-       .globl asm_builtin_newarray_array
-       .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_builtin_frem
-       .globl asm_builtin_arrayinstanceof
+
+       .globl asm_wrapper_patcher
+
+       .globl asm_builtin_f2i
+       .globl asm_builtin_f2l
+       .globl asm_builtin_d2i
+       .globl asm_builtin_d2l
+
        .globl asm_perform_threadswitch
        .globl asm_initialize_thread_stack
        .globl asm_switchstackandcall
-       .globl asm_getcallingmethod
-    .globl asm_builtin_trace
-    .globl asm_builtin_exittrace
-    
-/*************************** imported functions *******************************/
-
-       .globl jit_compile
-       .globl builtin_monitorexit
-       .globl builtin_throw_exception
-       .globl builtin_trace_exception
-       .globl class_java_lang_Object
-       .globl findmethod
-
-/*********************** function has_no_x_instr_set ***************************
-*                                                                              *
-*   determines if the byte support instruction set (21164a and higher)         *
-*   is available.                                                              *
-*                                                                              *
-*   Use it on i386 architecture to init the fpu.                               *
-*                                                                              *
-*******************************************************************************/
+       .globl asm_criticalsections
+       .globl asm_getclassvalues_atomic
 
-has_no_x_instr_set:
-               finit                         /* intitialize the fpu                  */
 
-               pushl   $0x027f   /* Round to nearest, 53-bit mode, exceptions masked */
-               fldcw   (%esp)
-               addl    $4,%esp
-               
-               xor             %eax,%eax                               /* result code 0 (not used for i386)  */
-               ret
-
-
-/********************* 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,                     *
 *         void *arg1, void *arg2, void *arg3, void *arg4);                     *
 *                                                                              *
 *******************************************************************************/
 
-#define        MethodPointer   -4
-#define        FrameSize       -8
-#define     IsSync          -12
-#define     IsLeaf          -16
-#define     IntSave         -20
-#define     FltSave         -24
-#define     ExTableSize     -28
-#define     ExTableStart    -28
-
-#define     ExEntrySize     -16
-#define     ExStartPC       -4
-#define     ExEndPC         -8
-#define     ExHandlerPC     -12
-#define     ExCatchType     -16
-
-call_name:
-       .ascii  "calljavamethod\0\0"
-
-/*     .align  3 */
        .align  8
-       .long   0                         /* catch type all                       */
-       .long   calljava_xhandler         /* handler pc                           */
-       .long   calljava_xhandler         /* end pc                               */
-       .long   asm_calljavamethod        /* start pc                             */
-       .long   1                         /* extable size                         */
-       .long   0                         /* fltsave                              */
-       .long   0                         /* intsave                              */
-       .long   0                         /* isleaf                               */
-       .long   0                         /* IsSync                               */
-       .long   32                        /* frame size                           */
-       .long   0                         /* method pointer (pointer to name)     */
-
-asm_calljavamethod:
-               pushl   %ebp                  /* allocate stack space                 */
-               movl    %esp, %ebp
-
-               subl    $32,%esp              /* pass the remaining parameters        */
-               xorl    %edx,%edx
-
-               movl    %edx,28(%esp)         /* convert parms to 8 byte              */
-               movl    24(%ebp),%eax
-               movl    %eax,24(%esp)
-               
-               movl    %edx,20(%esp)
-               movl    20(%ebp),%eax
-               movl    %eax,16(%esp)
-
-               movl    %edx,12(%esp)
-               movl    16(%ebp),%eax
-               movl    %eax,8(%esp)
 
-               movl    %edx,4(%esp)
-               movl    12(%ebp),%eax
-               movl    %eax,(%esp)
+       .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                                                                                                                         
+       .quad   0                           /* line number table start            */
+       .quad   0                           /* line number table size             */
+       .long   0                                                                                                                         
+       .long   0                           /* fltsave                            */
+       .long   0                           /* intsave                            */
+       .long   0                           /* isleaf                             */
+       .long   0                           /* IsSync                             */
+       .long   8                           /* frame size                         */
+       .quad   0                           /* method pointer (pointer to name)   */
 
-               movl    8(%ebp),%eax          /* move function pointer to %eax        */
-
-               lea             asm_call_jit_compiler,%ecx
-               call    *%ecx                 /* call JIT compiler                    */
-               
-calljava_jit:
-calljava_return:
-calljava_ret:
-               xorl    %eax,%eax
-               leave                                             /* free stack space                     */
-               ret
+asm_calljavafunction:
+asm_calljavafunction_int:
+       sub     $(3*8),sp                   /* keep stack 16-byte aligned         */
+       mov     bp,0*8(sp)
+       mov     %rbx,1*8(sp)                /* %rbx is not a callee saved in CACAO*/
+       mov     a0,itmp1                    /* move function pointer to itmp1     */
+                                                                           /* compilerstub uses this             */
+
+       mov     a1,a0                       /* pass remaining parameters          */
+       mov     a2,a1                                                                                                                   
+       mov     a3,a2
+       mov     a4,a3
+
+       lea     asm_call_jit_compiler,itmp3
+       call    *itmp3                      /* call JIT compiler                  */
+
+L_asm_calljavafunction_return:
+       mov     0*8(sp),bp
+       mov             1*8(sp),%rbx                /* %rbx is not a callee saved in CACAO*/
+       add     $(3*8),sp                   /* free stack space                   */
+       ret
 
 calljava_xhandler:
-               pushl   %eax                              /* pass exception pointer               */
-               call    builtin_throw_exception
-               addl    $4,%esp
-               addl    $32,%esp
-               popl    %ebp
-               ret
+       mov     xptr,a0                     /* pass exception pointer             */
+       call    builtin_throw_exception
+       xor     v0,v0                       /* return NULL                        */
+       jmp     L_asm_calljavafunction_return
 
 
 /********************* function asm_calljavafunction ***************************
@@ -187,65 +154,199 @@ calljava_xhandler:
 *                                                                              *
 *******************************************************************************/
 
-call_name2:
-       .ascii  "calljavafunction\0\0"
-
-/*     .align  3 */
        .align  8
-       .long   0                         /* catch type all                       */
-       .long   calljava_xhandler2        /* handler pc                           */
-       .long   calljava_xhandler2        /* end pc                               */
-       .long   asm_calljavafunction      /* start pc                             */
-       .long   1                         /* extable size                         */
-       .long   0                         /* fltsave                              */
-       .long   0                         /* intsave                              */
-       .long   0                         /* isleaf                               */
-       .long   0                         /* IsSync                               */
-       .long   32                        /* frame size                           */
-       .long   0                         /* method pointer (pointer to name)     */
-
-asm_calljavafunction:
-               pushl   %ebp                  /* allocate stack space                 */
-               movl    %esp, %ebp
-
-               subl    $32,%esp              /* pass the remaining parameters        */
-               xorl    %edx,%edx
 
-               movl    %edx,28(%esp)         /* convert parms to 8 byte              */
-               movl    24(%ebp),%eax
-               movl    %eax,24(%esp)
-               
-               movl    %edx,20(%esp)
-               movl    20(%ebp),%eax
-               movl    %eax,16(%esp)
-
-               movl    %edx,12(%esp)
-               movl    16(%ebp),%eax
-               movl    %eax,8(%esp)
-
-               movl    %edx,4(%esp)
-               movl    12(%ebp),%eax
-               movl    %eax,(%esp)
-
-               movl    8(%ebp),%eax          /* move function pointer to %eax        */
-
-               lea             asm_call_jit_compiler,%ecx 
-               call    *%ecx                 /* call JIT compiler                    */
+       .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                                                                                                                        
+       .quad   0                           /* line number table  start           */
+       .quad   0                           /* line number table  size            */
+       .long   0                                                                                                                        
+       .long   0                           /* fltsave                            */
+       .long   0                           /* intsave                            */
+       .long   0                           /* isleaf                             */
+       .long   0                           /* IsSync                             */
+       .long   24                          /* frame size                         */
+       .quad   0                           /* method pointer (pointer to name)   */
+
+asm_calljavafunction2:
+asm_calljavafunction2int:
+asm_calljavafunction2long:
+asm_calljavafunction2float:
+asm_calljavafunction2double:
+       sub     $(7*8),sp                   /* keep stack 16-byte aligned         */
+       mov     %rbx,0*8(sp)                /* %rbx is not a callee saved in cacao*/
+       mov     s0,1*8(sp)
+       mov     s1,2*8(sp)
+       mov     s2,3*8(sp)
+       mov     s3,4*8(sp)
+       mov     s4,5*8(sp)
+
+       mov     a0,itmp1                    /* move method pointer for compiler   */
+       xor     %rbp,%rbp                   /* set argument stack frame to zero   */
+
+       test    a1,a1                       /* maybe we have no args...           */
+       jle     L_copy_done
+
+       mov     a1,itmp3                    /* arg count                          */
+       mov     a3,itmp2                    /* pointer to arg block               */
+
+       mov     itmp2,%r14                  /* save argument block pointer        */
+       mov     itmp3,%r15                  /* save argument count                */
+
+       sub     $sizejniblock,itmp2         /* initialize pointer (smaller code)  */
+       add     $1,itmp3                    /* initialize argument count          */
+       xor     %r12,%r12                   /* initialize integer argument counter*/
+       xor     %r13,%r13                   /* initialize float argument counter  */
+
+L_register_copy:
+       add     $sizejniblock,itmp2       /* goto next argument block             */
+       dec     itmp3                     /* argument count - 1                   */
+       jz      L_register_copy_done
+       andb    $0x02,offjniitemtype(itmp2) /* is this a float/double type?       */
+       jnz     L_register_handle_float   /* yes, handle it                       */
+
+       cmp     $INT_ARG_CNT,%r12         /* are we out of integer argument       */
+       je      L_register_copy           /* register? yes, next loop             */
+
+       lea     jumptable_integer,%rbp
+       mov     0(%rbp,%r12,8),%rbx
+       inc     %r12                      /* integer argument counter + 1         */
+       jmp     *%rbx
+
+L_register_handle_float:
+       cmp     $FLT_ARG_CNT,%r13         /* are we out of float argument         */
+       je      L_register_copy           /* register? yes, next loop             */
+
+       lea     jumptable_float,%rbp
+       mov     0(%rbp,%r13,8),%rbx
+       inc     %r13                      /* float argument counter + 1           */
+       jmp     *%rbx
        
-calljava_jit2:
-calljava_return2:
-calljava_ret2:
-               leave
-               ret
-
+L_register_copy_done:
+       mov     %r15,%rbp                 /* calculate remaining arguments        */
+       sub     %r12,%rbp                 /* - integer arguments in registers     */
+       sub     %r13,%rbp                 /* - float arguments in registers       */
+       jle     L_copy_done               /* are all assigned to registers?       */
+
+       and     $0xfffffffffffffffe,%rbp  /* keep stack 16-byte aligned           */
+       shl     $3,%rbp                   /* calculate stack size                 */
+       sub     %rbp,sp                 /* stack frame for arguments            */
+       mov     sp,%rbx                 /* use %rbx as temp sp                  */
+
+       sub     $sizejniblock,%r14        /* initialize pointer (smaller code)    */
+       add     $1,%r15                   /* initialize argument count            */
+               
+L_stack_copy_loop:
+       add     $sizejniblock,%r14        /* goto next argument block             */
+       dec     %r15                      /* are there any arguments left?        */
+       jz      L_copy_done               /* no test needed after dec             */
+
+       andb    $0x02,offjniitemtype(%r14) /* is this a float/double type?        */
+       jnz     L_stack_handle_float
+       dec     %r12                      /* arguments assigned to registers      */
+       jge     L_stack_copy_loop
+       jmp     L_stack_copy
+
+L_stack_handle_float:
+       dec     %r13                      /* arguments assigned to registers      */
+       jge     L_stack_copy_loop
+
+L_stack_copy:
+    mov     offjniitem(%r14),itmp3    /* copy s8 argument onto stack          */
+    mov     itmp3,0(%rbx)
+    add     $8,%rbx                   /* increase sp to next argument         */
+       jmp     L_stack_copy_loop
+
+L_copy_done:
+       lea     asm_call_jit_compiler,itmp3 /* %rax still contains method pointer */
+       call    *itmp3                    /* call JIT compiler                    */
+
+       add     bp,sp                     /* remove argument stack frame if any   */
+
+L_asm_calljavafunction2_return:
+       mov     0*8(sp),%rbx                /* restore callee saved registers     */
+       mov     1*8(sp),s0
+       mov     2*8(sp),s1
+       mov     3*8(sp),s2
+       mov     4*8(sp),s3
+       mov     5*8(sp),s4
+       add     $(7*8),sp                   /* free stack space                   */
+       ret
+               
 calljava_xhandler2:
-               pushl   %eax                              /* pass exception pointer               */
-               call    builtin_throw_exception
-               addl    $4,%esp
-               addl    $32,%esp
-               popl    %ebp
-               ret
-                                               
+       mov     xptr,a0                     /* pass exception pointer             */
+       call    builtin_throw_exception
+       xor     v0,v0                       /* return NULL                        */
+       jmp     L_asm_calljavafunction2_return
+
+
+jumptable_integer:
+       .quad   handle_a0
+       .quad   handle_a1
+       .quad   handle_a2
+       .quad   handle_a3
+       .quad   handle_a4
+       .quad   handle_a5
+
+handle_a0:
+       mov     offjniitem(itmp2),a0
+       jmp     L_register_copy
+handle_a1:
+       mov     offjniitem(itmp2),a1
+       jmp     L_register_copy
+handle_a2:
+       mov     offjniitem(itmp2),a2
+       jmp     L_register_copy
+handle_a3:
+       mov     offjniitem(itmp2),a3
+       jmp     L_register_copy
+handle_a4:
+       mov     offjniitem(itmp2),a4
+       jmp     L_register_copy
+handle_a5:
+       mov     offjniitem(itmp2),a5
+       jmp     L_register_copy
+
+
+jumptable_float:
+       .quad   handle_fa0
+       .quad   handle_fa1
+       .quad   handle_fa2
+       .quad   handle_fa3
+       .quad   handle_fa4
+       .quad   handle_fa5
+       .quad   handle_fa6
+       .quad   handle_fa7
+
+handle_fa0:
+       movq    offjniitem(itmp2),fa0
+       jmp     L_register_copy
+handle_fa1:
+       movq    offjniitem(itmp2),fa1
+       jmp     L_register_copy
+handle_fa2:
+       movq    offjniitem(itmp2),fa2
+       jmp     L_register_copy
+handle_fa3:
+       movq    offjniitem(itmp2),fa3
+       jmp     L_register_copy
+handle_fa4:
+       movq    offjniitem(itmp2),fa4
+       jmp     L_register_copy
+handle_fa5:
+       movq    offjniitem(itmp2),fa5
+       jmp     L_register_copy
+handle_fa6:
+       movq    offjniitem(itmp2),fa6
+       jmp     L_register_copy
+handle_fa7:
+       movq    offjniitem(itmp2),fa7
+       jmp     L_register_copy
+
 
 /****************** function asm_call_jit_compiler *****************************
 *                                                                              *
@@ -274,89 +375,91 @@ calljava_xhandler2:
 *                                                                              *
 *******************************************************************************/
 
-
 asm_call_jit_compiler:
-               pushl   %ebp
-               movl    %esp, %ebp
-
-               pushl   %ebx            /* save register                              */
-/*             pushl   %esi*/
-/*             pushl   %edi*/
-                               
-               movl    4(%ebp),%edx    /* get return address                         */
-               movb    -1(%edx),%bl    /* get function code                          */
-               cmpb    $0xd2,%bl               /* called with `call *REG_ITMP2' (%edx)?      */
-               jne             L_not_static_special
-
-               subl    $6,%edx                 /* calculate address of immediate             */
-               jmp             L_call_jit_compile
+                                           /* keep stack 16-byte aligned         */
+       sub     $((3+ARG_CNT)*8+sizestackframeinfo),sp
+
+       mov     t0,0*8(sp)                  /* save register                      */
+
+       mov     (3+ARG_CNT)*8+sizestackframeinfo(sp),itmp3 /* get return address  */
+       mov     -1(itmp3),%bl               /* get function code                  */
+       cmp     $0xd2,%bl                   /* called with `call *REG_ITMP2'?     */
+       jne     L_not_static_special
+
+       sub     $11,itmp3                   /* calculate address of immediate     */
+       jmp     L_call_jit_compile
                
 L_not_static_special:
-               cmpb    $0xd0,%bl               /* called with `call *REG_ITMP1' (%eax)       */
-               jne             L_not_virtual_interface
+       cmp     $0xd0,%bl                   /* called with `call *REG_ITMP1'      */
+       jne     L_not_virtual_interface
                
-               subl    $6,%edx         /* calculate address of offset                */
-               movl    (%edx),%edx     /* get offset                                 */
-               addl    %ecx,%edx       /* add base address to get method address     */
-               jmp             L_call_jit_compile
+       sub     $7,itmp3                    /* calculate address of offset        */
+       mov     (itmp3),itmp3l              /* get offset (32-bit)                */
+       add     itmp2,itmp3                 /* add base address to get method addr*/
+       jmp     L_call_jit_compile
 
-L_not_virtual_interface:        /* a call from asm_calljavamethod             */
-               xorl    %edx,%edx
+L_not_virtual_interface:                /* a call from asm_calljavamethod     */
+       xor     itmp3,itmp3
                
 L_call_jit_compile:
-               pushl   %edx            /* save address for method pointer            */
+       mov     0*8(sp),t0                  /* restore register                   */
+       mov     itmp3,0*8(sp)               /* save address for method pointer    */
+       mov     itmp1,1*8(sp)               /* save method pointer                */
 
-               pushl   %eax                    /* push methodpointer on stack                */
-               call    jit_compile
-               addl    $4,%esp
+       SAVE_ARGUMENT_REGISTERS(3)
 
-               popl    %edx            /* restore address for method pointer         */
-               testl   %edx,%edx               /* is address == 0 (asm_calljavamethod)       */
-               je              L_call_method
-               
-               movl    %eax,(%edx)             /* and now save the new pointer               */
+       mov     sp,a0                       /* create stackframe info             */
+       add     $((3+ARG_CNT)*8),a0         /* pass sfi                           */
+       xor     a1,a1                       /* if pv is NULL, use findmethod      */
+       mov     sp,a2                       /* pass java sp                       */
+       add     $((1+3+ARG_CNT)*8+sizestackframeinfo),a2
+                                           /* pass ra to java function           */
+       mov     ((3+ARG_CNT)*8+sizestackframeinfo)(sp),a3
+       mov     a3,a4                       /* xpc is equal to ra                 */
+       call    stacktrace_create_extern_stackframeinfo
 
-L_call_method:
-/*             popl    %edi            /* restore registers                          */
-/*             popl    %esi*/
-               popl    %ebx
-               
-               leave
-               jmp             *%eax                   /* ...and now call the new method             */
+       mov     1*8(sp),a0                  /* pass method pointer                */
+       call    jit_compile
+       mov     v0,1*8(sp)                  /* save return value                  */
 
+       mov     sp,a0                       /* remove stackframe info             */
+       add     $((3+ARG_CNT)*8),a0         /* pass sfi                           */
+       call    stacktrace_remove_stackframeinfo
 
+       mov     0*8(sp),itmp3               /* restore address for method pointer */
+       mov     1*8(sp),v0                  /* restore return value               */
 
-/****************** 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);                             *
-*                                                                              *
-*******************************************************************************/
+       RESTORE_ARGUMENT_REGISTERS(3)
 
-asm_dumpregistersandcall:
-               push    %ebx
-               push    %ebp
-               push    %esi
-               push    %edi
-                               
-               movl    8(%ebp),%eax            /* load function pointer */
-               call    *%eax                           /* call function */
-
-               pop             %edi
-               pop             %esi
-               pop             %ebp
-               pop             %ebx
-               
-               ret
+       add     $((3+ARG_CNT)*8+sizestackframeinfo),sp /* remove stack frame      */
+
+       test    v0,v0                       /* check for exception                */
+       je      L_asm_call_jit_compiler_exception
+
+       test    itmp3,itmp3                 /* is address == 0 (asm_calljavamethod*/
+       je      L_call_method
 
+       mov     v0,(itmp3)                  /* and now save the new pointer       */
 
-/********************* function asm_handle_exception ***************************
+L_call_method:
+       jmp     *v0                         /* ...and now call the new method     */
+
+L_asm_call_jit_compiler_exception:
+#if defined(USE_THREADS) && defined(NATIVE_THREADS)
+       call    builtin_asm_get_exceptionptrptr
+       mov     v0,itmp2                    /* v0 == xptr                         */
+#else
+       lea     _no_threads_exceptionptr,itmp2
+#endif
+       mov     (itmp2),xptr                /* get the exception pointer          */
+       movl    $0,(itmp2)                  /* clear exception pointer            */
+
+       pop     xpc                         /* delete return address              */
+       sub     $5,xpc                      /* faulting address is ra - 5         */
+       jmp     asm_handle_exception
+
+
+/* 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          *
@@ -364,507 +467,277 @@ asm_dumpregistersandcall:
 *   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_nat_exception:
-               addl    $4,%esp                                         /* clear return address of native stub */
+       add     $8,sp                       /* clear return address of native stub*/
                
 asm_handle_exception:
-               pushl   %eax
-               pushl   %edx                                            /* get the data segment ptr       */
-               call    findmethod
-               movl    %eax,%ecx
-               popl    %edx
-               popl    %eax
-
-               pushl   %ebp
-               movl    %esp,%ebp
-
-               pushl   %eax                                            /* save exception pointer         */
-/*             subl    $2,%edx */
-               pushl   %edx                                            /* save exception pc              */
-               pushl   %ecx                                            /* save data segment pointer      */
+       sub     $((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         */
+
+       mov     $((ARG_CNT+TMP_CNT)*8),a3   /* prepare a3 for handle_exception    */
+       mov     $1,t0                       /* set maybe-leaf flag                */
+
+L_asm_handle_exception_stack_loop:
+       sub     $(6*8),sp
+       mov     xptr,0*8(sp)                /* save exception pointer             */
+       mov     xpc,1*8(sp)                 /* save exception pc                  */
+       add     sp,a3                       /* calculate Java sp into a3...       */
+       add     $(6*8),a3
+       mov     a3,3*8(sp)                  /* ...and save it                     */
+       mov     t0,4*8(sp)                  /* save maybe-leaf flag               */
+
+       mov     xpc,a0                      /* exception pc                       */
+       call    codegen_findmethod
+       mov     v0,2*8(sp)                  /* save data segment pointer          */
         
-               pushl   %ebx
-               pushl   %esi
-               pushl   %edi
-               
-ex_stack_loop:
-               subl    $16,%esp
+       mov     0*8(sp),a0                  /* pass exception pointer             */
+       mov     1*8(sp),a1                  /* pass exception pc                  */
+       mov     v0,a2                       /* pass data segment pointer          */
+       mov     3*8(sp),a3                  /* pass Java stack pointer            */
+       call    exceptions_handle_exception
 
-               movl    %eax,(%esp)                                     /* exception pointer */
+       test    v0,v0
+       jz      L_asm_handle_exception_not_catched
 
-               movl    MethodPointer(%ecx),%eax        /* method pointer */
-               movl    %eax,4(%esp)
-               
-               movl    %edx,8(%esp)                            /* exception pc */
-               movl    $1,12(%esp)                                     /* set no unwind flag */
-               call    builtin_trace_exception
+       mov     v0,xpc                      /* move handlerpc into xpc            */
+       mov     0*8(sp),xptr                /* restore exception pointer          */
+       mov     4*8(sp),t0                  /* get maybe-leaf flag                */
+       add     $(6*8),sp                   /* free stack frame                   */
 
-               addl    $16,%esp
+       test    t0,t0                       /* test for maybe-leaf flag           */
+       jz      L_asm_handle_exception_no_leaf
 
-               movl    -12(%ebp),%esi                          /* %esi = data segment pointer */
-               movl    ExTableSize(%esi),%ecx          /* %ecx = exception table size */
-               test    %ecx,%ecx                                       /* if empty table skip */
-               je              empty_table
+       RESTORE_ARGUMENT_REGISTERS(0)       /* if this is a leaf method, we have  */
+       RESTORE_TEMPORARY_REGISTERS(ARG_CNT)/* to restore arg and temp registers  */
 
-               lea             ExTableStart(%esi),%edi         /* %edi = start of exception table */
-               movl    -4(%ebp),%eax                           /* get xptr */
-               
-ex_table_loop:
-               movl    -8(%ebp),%edx                           /* get xpc */
-               
-               movl    ExStartPC(%edi),%ebx            /* %ebx = exception start pc */
-               cmpl    %edx,%ebx                                       /* %ebx = (startpc <= xpc) */
-               jg              ex_table_cont                           /* if (false) continue */
-               movl    ExEndPC(%edi),%ebx                      /* %ebx = exception end pc */
-               cmpl    %ebx,%edx                                       /* %ebx = (xpc < endpc) */
-               jge             ex_table_cont                           /* if (false) continue */
-               movl    ExCatchType(%edi),%ebx          /* arg1 = exception catch type */
-               test    %ebx,%ebx                                       /* NULL catches everything */
-               je              ex_handle_it
-
-               movl    offobjvftbl(%eax),%esi          /* %esi = vftblptr(xptr) */
-               movl    offobjvftbl(%ebx),%ebx          /* %ebx = vftblptr(catchtype) class (not obj) */
-               movl    offbaseval(%esi),%esi           /* %esi = baseval(xptr) */
-               movl    offbaseval(%ebx),%edx           /* %edx = baseval(catchtype) */
-               movl    offdiffval(%ebx),%ebx           /* %ebx = diffval(catchtype) */
-               subl    %edx,%esi                                       /* %esi = baseval(xptr) - baseval(catchtype) */
-               cmpl    %ebx,%esi                                       /* xptr is instanceof catchtype */
-               ja              ex_table_cont
-               
-ex_handle_it:
-               movl    ExHandlerPC(%edi),%edx
-               
-               popl    %edi
-               popl    %esi
-               popl    %ebx
-        
-        popl    %eax                        /* pop %ecx (dummy) */
-        popl    %eax                        /* pop %edx (dummy) */
-        popl    %eax                        /* pop %eax */
-        
-               leave
+       add     $((ARG_CNT+TMP_CNT)*8),sp   /* remove maybe-leaf stackframe       */
 
-               jmp             *%edx
+L_asm_handle_exception_no_leaf:
+       jmp     *xpc                        /* jump to the handler                */
 
-ex_table_cont:
-               lea             ExEntrySize(%edi),%edi
-               decl    %ecx
-               test    %ecx,%ecx
-               jg              ex_table_loop
-               
-empty_table:
-               popl    %edi
-               popl    %esi
-               popl    %ebx
-               popl    %ecx                                            /* restore data segment pointer   */
-               popl    %edx
-               popl    %eax                                            /* restore exception pointer      */
-               popl    %ebp
-
-               movl    %eax,%edi                                       /* save exception pointer         */
-                               
-ex_already_cleared:            
-               movl    IsSync(%ecx),%eax                       /* %eax = SyncOffset              */
-               test    %eax,%eax                                       /* if zero no monitorexit         */
-               je              no_monitor_exit
-               
-               addl    %esp,%eax
-               movl    -8(%eax),%eax
-               pushl   %eax
-               call    builtin_monitorexit
-               addl    $4,%esp
-        
-no_monitor_exit:
-               movl    FrameSize(%ecx),%eax            /* %eax = frame size              */
-               addl    %eax,%esp                                       /* unwind stack                   */
-               movl    %esp,%eax                                       /* %eax = pointer to save area    */
-
-               movl    IntSave(%ecx),%edx                      /* %edx = saved int register count */
-               test    %edx,%edx
-               je              noint
-               cmpl    $1,%edx
-               je              int1
-               
-int2:  
-               movl    -16(%eax),%ebx
+L_asm_handle_exception_not_catched:
+       mov     0*8(sp),xptr                /* restore exception pointer          */
+       mov     2*8(sp),itmp3               /* restore data segment pointer       */
+       mov     4*8(sp),t0                  /* get maybe-leaf flag                */
+       add     $(6*8),sp
 
-int1:  
-               movl    -8(%eax),%ebp
+       test    t0,t0
+       jz      L_asm_handle_exception_no_leaf_stack
 
-               shll    $3,%edx                                         /* multiply by 8 bytes             */
-               subl    %edx,%eax
+       add     $((ARG_CNT+TMP_CNT)*8),sp   /* remove maybe-leaf stackframe       */
+       xor     t0,t0                       /* clear the isleaf flags             */
+
+L_asm_handle_exception_no_leaf_stack:
+       mov     FrameSize(itmp3),itmp2l     /* get frame size                     */
+       add     sp,itmp2                    /* pointer to save area               */
+       
+       mov     IntSave(itmp3),a0l          /* a0l = saved int register count     */
+       test    a0l,a0l
+       je      noint
+       
+       cmp     $1,a0l
+       je      int1
+       cmp     $2,a0l
+       je      int2
+       cmp     $3,a0l
+       je      int3
+       cmp     $4,a0l
+       je      int4
+       
+       mov     -5*8(itmp2),s0
+int4:   
+       mov     -4*8(itmp2),s1
+int3:   
+       mov     -3*8(itmp2),s2
+int2:   
+       mov     -2*8(itmp2),s3
+int1:   
+       mov     -1*8(itmp2),s4
+
+       shl     $3,a0l                      /* multiply by 8 bytes                */
+       sub     a0,itmp2
                
 noint:
-               movl    FltSave(%ecx),%edx                      /* %edx = saved flt register count */
-               test    %edx,%edx
-               je              noflt
-               cmpl    $1,%edx
-               je              flt1
-               cmpl    $2,%edx
-               je              flt2
-               cmpl    $3,%edx
-               je              flt3
-               
-flt4:  
-               fldl    -32(%eax)
-               fstp    %st(1)
+#if 0
+       mov     FltSave(itmp3),a0l          /* a0l = saved flt register count     */
+       test    a0l,a0l
+       je      noflt
+       
+       cmpl    $1,a0l
+       je      flt1
+       cmpl    $2,a0l
+       je      flt2
+       cmpl    $3,a0l
+       je      flt3
+       cmpl    $4,a0l
+       je      flt4
+
+       movq    -5*8(itmp2),%xmm11
+flt4:   
+       movq    -4*8(itmp2),%xmm12
+flt3:   
+       movq    -3*8(itmp2),%xmm13
+flt2:   
+       movq    -2*8(itmp2),%xmm14
+flt1:   
+       movq    -1*8(itmp2),%xmm15
+                
+noflt:
+#endif
+       mov     FrameSize(itmp3),itmp2l     /* get frame size                     */
+       add     itmp2,sp                    /* unwind stack                       */
+
+                                           /* exception pointer is still set     */
+       pop     xpc                         /* the new xpc is return address      */
+       sub     $3,xpc                      /* subtract 3 bytes for call          */
+
+       xor     a3,a3                       /* prepare a3 for handle_exception    */
+       
+       jmp             L_asm_handle_exception_stack_loop
 
-flt3:  
-               fldl    -24(%eax)
-               fstp    %st(2)
-               
-flt2:  
-               fldl    -16(%eax)
-               fstp    %st(3)
-               
-flt1:  
-               fldl    -8(%eax)
-               fstp    %st(4)
-               
-noflt:                                 
-               popl    %edx                                            /* the new xpc is return address  */
-               subl    $2,%edx
-               
-               pushl   %edx
-               pushl   %ebx
-               pushl   %ebp
-               pushl   %esi
-               pushl   %edi
-                                                               
-               pushl   %edx                                            /* get the new data segment ptr   */
-               call    findmethod
-               movl    %eax,%ecx
-               addl    $4,%esp
-
-               popl    %edi
-               popl    %esi
-               popl    %ebp
-               popl    %ebx
-               popl    %edx
-               
-               movl    %edi,%eax                                       /* restore saved exception pointer */
-                               
-               pushl   %ebp
-               movl    %esp,%ebp
-
-               pushl   %eax                                            /* save exception pointer         */
-               pushl   %edx                                            /* save exception pc              */
-               pushl   %ecx                                            /* save data segment pointer      */
-               pushl   %ebx
-               pushl   %esi
-               pushl   %edi
-               
-               jmp             ex_stack_loop
-               
 
-/********************* function asm_builtin_monitorenter ***********************
-*                                                                              *
-*   Does null check and calls monitorenter or throws an exception              *
-*                                                                              *
-*******************************************************************************/
+/* asm_wrapper_patcher *********************************************************
 
-asm_builtin_monitorenter:
-               cmpl    $0,4(%esp)
-               je              nb_monitorenter                 /* if (null) throw exception          */
-               jmp             builtin_monitorenter    /* else call builtin_monitorenter     */
+   XXX
 
-nb_monitorenter:
-               popl    %edx                                    /* delete return address */
-               subl    $2,%edx                                 /* faulting address is return adress - 2 */
-               movl    proto_java_lang_NullPointerException,%eax
-               jmp             asm_handle_exception
-               
+   Stack layout:
+     40   return address
+     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   pointer to patcher function
+     -8   bp
 
-/********************* function asm_builtin_monitorexit ************************
-*                                                                              *
-*   Does null check and calls monitorexit or throws an exception               *
-*                                                                              *
 *******************************************************************************/
 
-asm_builtin_monitorexit:
-               cmpl    $0,4(%esp)
-               je              nb_monitorexit                  /* if (null) throw exception          */
-               jmp             builtin_monitorexit             /* else call builtin_monitorenter     */
+asm_wrapper_patcher:
+       push    bp                          /* save base pointer                  */
+       mov     sp,bp                       /* move actual sp to bp               */
+       sub     $((3+ARG_CNT+TMP_CNT)*8+sizestackframeinfo),sp
+       and     $0xfffffffffffffff0,sp      /* align sp to 16-byte (this is for   */
+                                           /* leaf functions)                    */
 
-nb_monitorexit:
-               popl    %edx                                    /* delete return address */
-               subl    $2,%edx                                 /* faulting address is return adress - 2 */
-               movl    proto_java_lang_NullPointerException,%eax
-               jmp             asm_handle_exception
+       SAVE_ARGUMENT_REGISTERS(3)
+       SAVE_TEMPORARY_REGISTERS(3+ARG_CNT)
 
+       mov     itmp1,0*8(sp)               /* save itmp1 and itmp2               */
+       mov     itmp2,1*8(sp)               /* can be used by some instructions   */
 
-/************************ function asm_builtin_idiv ****************************
-*                                                                              *
-*   Does null check and calls idiv or throws an exception                      *
-*                                                                              *
-*******************************************************************************/
+       mov     sp,a0                       /* create stackframe info             */
+       add     $((3+ARG_CNT+TMP_CNT)*8),a0
+       xor     a1,a1                       /* if pv is NULL, use findmethod      */
+       mov     bp,a2                       /* pass java sp                       */
+       add     $((6+1)*8),a2
+       mov     ((5+1)*8)(bp),a3            /* pass ra to java function           */
+       mov     a3,a4                       /* xpc is equal to ra                 */
+       call    stacktrace_create_extern_stackframeinfo
 
-asm_builtin_idiv:
-               cmpl    $0,12(%esp)             /* if (null) throw exception */
-               je              nb_idiv
+       mov     bp,a0                       /* pass stack pointer                 */
+       add     $((1+1)*8),a0               /* skip function pointer              */
+       mov     1*8(bp),itmp3               /* get function pointer               */
+       call    *itmp3                      /* call the patcher function          */
+       mov     v0,2*8(sp)                  /* save return value                  */
 
-               movl    4(%esp),%eax            /* 4 (return) = 4 */
-               cltd
-               idivl   12(%esp)
+       mov     sp,a0                       /* remove stackframe info             */
+       add     $((3+ARG_CNT+TMP_CNT)*8),a0
+       call    stacktrace_remove_stackframeinfo
 
-               ret
+       RESTORE_ARGUMENT_REGISTERS(3)
+       RESTORE_TEMPORARY_REGISTERS(3+ARG_CNT)
 
-nb_idiv:
-               popl    %edx                                    /* delete return address */
-               subl    $2,%edx                                 /* faulting address is return adress - 2 */
-               
-               movl    proto_java_lang_ArithmeticException,%eax
-               jmp             asm_handle_exception
-               
+       mov     0*8(sp),itmp1               /* restore itmp1 and itmp2            */
+       mov     1*8(sp),itmp2               /* can be used by some instructions   */
+       mov     2*8(sp),itmp3               /* restore return value               */
 
-/************************ function asm_builtin_ldiv ****************************
-*                                                                              *
-*   Does null check and calls ldiv or throws an exception                      *
-*                                                                              *
-*******************************************************************************/
+       mov     bp,sp                       /* restore original sp                */
+       pop     bp                          /* restore bp                         */
+       add     $(5*8),sp                   /* remove patcher stackframe, keep ra */
 
-asm_builtin_ldiv:
-               movl    12(%esp),%eax
-               orl             16(%esp),%eax
-               test    %eax,%eax                               /* if (null) throw exception */
-               je              nb_ldiv
+       test    itmp3,itmp3                 /* exception thrown?                  */
+       jz      L_asm_wrapper_patcher_exception
+       ret                                 /* call new patched code              */
 
-               jmp             builtin_ldiv
+L_asm_wrapper_patcher_exception:
+#if defined(USE_THREADS) && defined(NATIVE_THREADS)
+       call    builtin_asm_get_exceptionptrptr
+       mov     v0,itmp2                    /* v0 == xptr                         */
+#else
+       lea     _no_threads_exceptionptr,itmp2
+#endif
+       mov     (itmp2),xptr                /* get the exception pointer          */
+       movl    $0,(itmp2)                  /* clear exception pointer            */
 
-nb_ldiv:
-               popl    %edx                                    /* delete return address */
-               subl    $2,%edx                                 /* faulting address is return adress - 2 */
-               
-               movl    proto_java_lang_ArithmeticException,%eax
-               jmp             asm_handle_exception
-                               
+       pop     xpc                         /* get and remove return address      */
+       jmp     asm_handle_exception
 
-/************************ function asm_builtin_irem ****************************
-*                                                                              *
-*   Does null check and calls irem or throws an exception                      *
-*                                                                              *
-*******************************************************************************/
-
-asm_builtin_irem:
-               cmpl    $0,12(%esp)             /* if (null) throw exception */
-               je              nb_irem
-
-               movl    4(%esp),%eax            /* 4 (return) = 4 */
-               cltd
-               idivl   12(%esp)
-               
-               movl    %edx,%eax
-               ret
 
-nb_irem:
-               popl    %edx                                    /* delete return address */
-               subl    $2,%edx                                 /* faulting address is return adress - 2 */
-               
-               movl    proto_java_lang_ArithmeticException,%eax
-               jmp             asm_handle_exception
-
-
-/************************ function asm_builtin_lrem ****************************
-*                                                                              *
-*   Does null check and calls lrem or throws an exception                      *
-*                                                                              *
-*******************************************************************************/
-
-asm_builtin_lrem:
-               movl    12(%esp),%eax
-               orl             16(%esp),%eax
-               test    %eax,%eax                               /* if (null) throw exception */
-               je              nb_lrem
-
-               jmp             builtin_lrem
-
-nb_lrem:
-               popl    %edx                                    /* delete return address */
-               subl    $2,%edx                                 /* faulting address is return adress - 2 */
-               
-               movl    proto_java_lang_ArithmeticException,%eax
-               jmp             asm_handle_exception
-               
-
-/*********************** function new_builtin_checkcast ************************
+/* asm_builtin_x2x *************************************************************
 *                                                                              *
-*   Does the cast check and eventually throws an exception                     *
+*   Wrapper functions for float to int corner cases                            *
 *                                                                              *
 *******************************************************************************/
 
-asm_builtin_checkcast:
-               xorl    %eax,%eax
-               movl    $0,(%eax)
-               ret
-
-               
-/******************* function asm_builtin_checkarraycast ***********************
-*                                                                              *
-*   Does the cast check and eventually throws an exception                     *
-*                                                                              *
-*******************************************************************************/
-
-asm_builtin_checkarraycast:
-               subl    $8,%esp                                 /* build stack frame (2 * 4 bytes)    */
-
-               movl    12(%esp),%eax           /* 8 (frame) + 4 (return)             */
-               movl    %eax,(%esp)                             /* save object pointer                */
-
-               movl    20(%esp),%eax
-               movl    %eax,4(%esp)
-
-               call    builtin_checkarraycast  /* builtin_checkarraycast             */
+asm_builtin_f2i:
+       sub     $(ARG_CNT*8),sp
        
-               test    %eax,%eax               /* if (false) throw exception         */
-               je              nb_carray_throw
-
-               movl    12(%esp),%eax                   /* return object pointer              */
-               addl    $8,%esp
-               ret
-
-nb_carray_throw:
-               addl    $8,%esp
-               
-               popl    %edx                                    /* delete return address              */
-               subl    $2,%edx                                 /* faulting address is return adress - 2 */
-               
-               movl    proto_java_lang_ClassCastException,%eax
-               jmp             asm_handle_exception
-
-               
-/******************* function asm_builtin_anewarray ****************************
-*                                                                              *
-*   Does the cast check and eventually throws an exception                     *
-*                                                                              *
-*******************************************************************************/
-
-asm_builtin_anewarray:
-               subl    $8,%esp                                 /* build stack frame (2 * 4 bytes) */
-
-               movl    12(%esp),%eax
-               movl    %eax,(%esp)
-
-               movl    20(%esp),%eax
-               movl    %eax,4(%esp)
-
-               call    builtin_anewarray
+       SAVE_ARGUMENT_REGISTERS(0)
        
-               addl    $8,%esp
-               ret
-
-               
-/******************* function asm_builtin_newarray_array ***********************
-*                                                                              *
-*   Does the cast check and eventually throws an exception                     *
-*                                                                              *
-*******************************************************************************/
-
-asm_builtin_newarray_array:
-               subl    $8,%esp                                 /* build stack frame (2 * 4 bytes) */
-
-               movl    12(%esp),%eax
-               movl    %eax,(%esp)
-
-               movl    20(%esp),%eax
-               movl    %eax,4(%esp)
-
-               call    builtin_newarray_array
+       movq    ftmp1,fa0
+       call    builtin_f2i
        
-               addl    $8,%esp
-               ret
-
-               
-/******************* function asm_builtin_aastore ******************************
-*                                                                              *
-*   Does the cast check and eventually throws an exception                     *
-*                                                                              *
-*******************************************************************************/
-
-asm_builtin_aastore:
-               subl    $12,%esp                                /* build stack frame (3 * 4 bytes)    */
-
-               movl    16(%esp),%eax           /* 12 (frame) + 4 (return)            */
-               test    %eax,%eax                               /* if null pointer throw exception    */
-               je              nb_aastore_null
-
-               movl    offarraysize(%eax),%edx /* load size                          */
-               movl    24(%esp),%ecx                   /* index                              */
-               cmpl    %edx,%ecx                               /* do bound check                     */
-               ja              nb_aastore_bound                /* if out of bounds throw exception   */
-
-               shll    $2,%ecx                                 /* index * 4                          */
-               addl    %eax,%ecx                               /* add index * 4 to arrayref          */
-               
-               movl    %ecx,8(%esp)                    /* save store position                */
-               
-               movl    16(%esp),%eax           /* 12 (frame) + 4 (return)            */
-               movl    %eax,(%esp)
-
-               movl    32(%esp),%eax                   /* object is second argument          */
-               movl    %eax,4(%esp)
-               
-               call    builtin_canstore                /* builtin_canstore(arrayref,object)  */
-
-               test    %eax,%eax                               /* if (false) throw exception         */
-               je              nb_aastore_throw
-
-               movl    32(%esp),%eax
-               movl    8(%esp),%ecx
-               movl    %eax,offobjarrdata(%ecx)/* store objectptr in array           */
-               
-               addl    $12,%esp
-               ret
-
-nb_aastore_null:
-               addl    $12,%esp
-               popl    %edx                                    /* delete return address */
-               subl    $2,%edx                                 /* faulting address is return adress - 2 */
-               
-               movl    proto_java_lang_NullPointerException,%eax
-               jmp             asm_handle_exception
+       RESTORE_ARGUMENT_REGISTERS(0)
+       
+       add     $(ARG_CNT*8),sp
+       ret
 
-nb_aastore_bound:
-               addl    $12,%esp
-               popl    %edx                                    /* delete return address */
-               subl    $2,%edx                                 /* faulting address is return adress - 2 */
-               
-               movl    proto_java_lang_ArrayIndexOutOfBoundsException,%eax
-               jmp             asm_handle_exception
-               
-nb_aastore_throw:
-               addl    $12,%esp
-               popl    %edx                                    /* delete return address */
-               subl    $2,%edx                                 /* faulting address is return adress - 2 */
-               
-               movl    proto_java_lang_ArrayStoreException,%eax
-               jmp             asm_handle_exception
 
-               
-/******************* function asm_builtin_arrayinstanceof **********************
-*                                                                              *
-*   Does the instanceof check of arrays                                        *
-*                                                                              *
-*******************************************************************************/
+asm_builtin_f2l:
+       sub     $(ARG_CNT*8),sp
+       
+       SAVE_ARGUMENT_REGISTERS(0)
+       
+       movq    ftmp1,fa0
+       call    builtin_f2l
+       
+       RESTORE_ARGUMENT_REGISTERS(0)
+       
+       add     $(ARG_CNT*8),sp
+       ret
 
-asm_builtin_arrayinstanceof:
-               subl    $8,%esp                                 /* build stack frame (2 * 4 bytes) */
 
-               movl    12(%esp),%eax
-               movl    %eax,(%esp)
+asm_builtin_d2i:
+       sub     $(ARG_CNT*8),sp
+       
+       SAVE_ARGUMENT_REGISTERS(0)
+       
+       movq    ftmp1,fa0
+       call    builtin_d2i
+       
+       RESTORE_ARGUMENT_REGISTERS(0)
+       
+       add     $(ARG_CNT*8),sp
+       ret
 
-               movl    20(%esp),%eax
-               movl    %eax,4(%esp)
 
-               call    builtin_arrayinstanceof
+asm_builtin_d2l:
+       sub     $(ARG_CNT*8),sp
+       
+       SAVE_ARGUMENT_REGISTERS(0)
+       
+       movq    ftmp1,fa0
+       call    builtin_d2l
+       
+       RESTORE_ARGUMENT_REGISTERS(0)
        
-               addl    $8,%esp
-               ret
+       add     $(ARG_CNT*8),sp
+       ret
+
 
-               
 /******************* function asm_initialize_thread_stack **********************
 *                                                                              *
 * initialized a thread stack                                                   *
@@ -873,23 +746,19 @@ asm_builtin_arrayinstanceof:
 *******************************************************************************/
 
 asm_initialize_thread_stack:
-               movl    8(%esp),%eax            /* (to)->stackEnd                     */
-               subl    $36,%eax                                /* 4 bytes * 8 regs + 4 bytes func    */
-
-               xorl    %edx,%edx
-               movl    %edx,0(%eax)
-               movl    %edx,4(%eax)
-               movl    %edx,8(%eax)
-               movl    %edx,12(%eax)
-               movl    %edx,16(%eax)
-               movl    %edx,20(%eax)
-               movl    %edx,24(%eax)
-               movl    %edx,28(%eax)
-
-               movl    4(%esp),%edx            /* save (u1*) (func)                  */
-               movl    %edx,32(%eax)
-
-               ret                             /* return restorepoint in %eax        */
+        sub     $(7*8),%rsi
+
+        xor     %r10,%r10
+        mov     %r10,0*8(%rsi)
+        mov     %r10,1*8(%rsi)
+        mov     %r10,2*8(%rsi)
+        mov     %r10,3*8(%rsi)
+        mov     %r10,4*8(%rsi)
+        mov     %r10,5*8(%rsi)
+
+        mov     %rdi,6*8(%rsi)          /* save (u1*) (func)                  */
+        mov     %rsi,%rax               /* return restorepoint in %rax        */
+        ret
 
 
 /******************* function asm_perform_threadswitch *************************
@@ -901,192 +770,102 @@ asm_initialize_thread_stack:
 *******************************************************************************/
 
 asm_perform_threadswitch:
-               subl    $36,%esp
-
-               movl    %eax,0(%esp)
-               movl    %edx,4(%esp)
-               movl    %ecx,8(%esp)
-               movl    %ebx,12(%esp)
-               movl    %esp,16(%esp)
-               movl    %ebp,20(%esp)
-               movl    %esi,24(%esp)
-               movl    %edi,28(%esp)
-
-               movl    36(%esp),%eax                   /* save current return address */
-               movl    %eax,32(%esp)
-
-               movl    40(%esp),%eax                   /* first argument **from */
-               movl    %esp,0(%eax)
-
-               movl    48(%esp),%eax                   /* third argument **stackTop */
-               movl    %esp,0(%eax)
-
-               movl    44(%esp),%eax                   /* second argument **to */
-               movl    0(%eax),%esp                    /* load new stack pointer */
-
-               movl    0(%esp),%eax
-               movl    4(%esp),%edx
-               movl    8(%esp),%ecx
-               movl    12(%esp),%ebx
-                                                                               /* skip stack pointer */
-               movl    20(%esp),%ebp
-               movl    24(%esp),%esi
-               movl    28(%esp),%edi
-
-               addl    $32,%esp                /* leave return address on stack      */
-               ret
-               
+        sub     $(7*8),%rsp             /* allocate stack frame               */
 
-/********************* function asm_switchstackandcall *************************
-*                                                                              *
-*  int 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                *
-*                                                                              *
-*******************************************************************************/
+        mov     %rbx,0*8(%rsp)
+        mov     %rbp,1*8(%rsp)
+        mov     %r12,2*8(%rsp)
+        mov     %r13,3*8(%rsp)
+        mov     %r14,4*8(%rsp)
+        mov     %r15,5*8(%rsp)
 
-asm_switchstackandcall:
-               movl    4(%esp),%edx                    /* first argument *stack */
-               subl    $8,%edx                                 /* allocate new stack */
+        mov     7*8(%rsp),%rax                 /* save current return address        */
+        mov     %rax,6*8(%rsp)
 
-               movl    (%esp),%eax                             /* save return address on new stack */
-               movl    %eax,(%edx)
+        mov     %rsp,(%rdi)                    /* first argument **from              */
+        mov     %rsp,(%rdx)                    /* third argument **stackTop          */
 
-               movl    %esp,4(%edx)                    /* save old stack pointer on new stack */
+        mov     (%rsi),%rsp                    /* load new stack pointer             */
 
-               movl    12(%esp),%eax                   /* third argument **stacktopsave */
-               movl    %esp,(%eax)                             /* save old stack pointer to variable */
+        mov     0*8(%rsp),%rbx
+        mov     1*8(%rsp),%rbp
+        mov     2*8(%rsp),%r12
+        mov     3*8(%rsp),%r13
+        mov     4*8(%rsp),%r14
+        mov     5*8(%rsp),%r15
 
-               movl    8(%esp),%eax                    /* load function pointer */
-               movl    16(%esp),%ecx                   /* fourth argument *p */
+        mov     6*8(%rsp),%rax          /* restore return address             */
+        add     $(7*8),%rsp             /* free stack frame                   */
+        mov     %rax,(%rsp)
+        ret
                
-               movl    %edx,%esp                               /* switch to new stack */
-
-               subl    $4,%esp
-               movl    %ecx,0(%esp)                    /* pass pointer */
-               call    *%eax                                   /* and call function */
-               addl    $4,%esp
-
-               movl    (%esp),%edx                             /* load return address */
-               movl    4(%esp),%esp                    /* switch to old stack */
-               movl    %edx,(%esp)
-               ret
 
-               
-/********************* function asm_getcallingmethod ***************************
-*                                                                              *
-*   classinfo *asm_getcallingmethod ();                                                                   *
-*                                                                                                                                                         *    
-*   goes back stack frames to get the calling method                                              *       
-*                                                                                                                                                         *    
-*                              t2 .. sp                                                                                                       *
-*                              t3 .. ra                                                                                                       *
-*                              t4 .. pv                                                                                                       *
+/********************* function asm_switchstackandcall *************************
 *                                                                              *
-*******************************************************************************/
-
-asm_getcallingmethod:
-               xorl    %eax,%eax
-/*             movl    $0,(%eax) */
-               ret
-
-
-/*********************** function asm_builtin_trace ****************************
+*  int asm_switchstackandcall (void *stack, void *func, void **stacktopsave,   *
+*                                     void *p);                                       *
 *                                                                              *
-*   Intended to be called from the native stub. Saves all argument registers   *
-*   and calls builtin_trace_args.                                              *
+*   Switches to a new stack, calls a function and switches back.               *
+*       a0 (%rdi)     new stack pointer                                        *
+*       a1 (%rsi)     function pointer                                         *
+*              a2 (%rdx)     pointer to variable where stack top should be stored     *
+*       a3 (%rcx)     pointer to user data, is passed to the function          *
 *                                                                              *
 *******************************************************************************/
 
-asm_builtin_trace:
-        pusha
-        subl    $68,%esp                /* 4 + 8 * 4 + 68 = 104 */
-
-        movl    104(%esp),%eax
-        movl    108(%esp),%edx
-        movl    %eax,(%esp)
-        movl    %edx,4(%esp)
-
-        movl    112(%esp),%eax
-        movl    116(%esp),%edx
-        movl    %eax,8(%esp)
-        movl    %edx,12(%esp)
-
-        movl    120(%esp),%eax
-        movl    124(%esp),%edx
-        movl    %eax,16(%esp)
-        movl    %edx,20(%esp)
-
-        movl    128(%esp),%eax
-        movl    132(%esp),%edx
-        movl    %eax,24(%esp)
-        movl    %edx,28(%esp)
-
-        movl    136(%esp),%eax
-        movl    140(%esp),%edx
-        movl    %eax,32(%esp)
-        movl    %edx,36(%esp)
-
-        movl    144(%esp),%eax
-        movl    148(%esp),%edx
-        movl    %eax,40(%esp)
-        movl    %edx,44(%esp)
-
-        movl    152(%esp),%eax
-        movl    156(%esp),%edx
-        movl    %eax,48(%esp)
-        movl    %edx,52(%esp)
-
-        movl    160(%esp),%eax
-        movl    164(%esp),%edx
-        movl    %eax,56(%esp)
-        movl    %edx,60(%esp)
-
-        movl    168(%esp),%eax
-        movl    %eax,64(%esp)
-        
-        call    builtin_trace_args
-        addl    $68,%esp
-
-        popa
-        ret
-
-
-/********************* function asm_builtin_exittrace **************************
-*                                                                              *
-*   Intended to be called from the native stub. Saves return value and calls   *
-*   builtin_displaymethodstop.                                                 *
-*                                                                              *
-*******************************************************************************/
+asm_switchstackandcall:
+        sub     $(1*8),%rsp             /* keep stack 16-byte aligned         */
+        sub     $16,%rdi                               /* allocate new stack                 */
 
-asm_builtin_exittrace:
-        pusha
-        subl    $24,%esp
-        
-        movl    60(%esp),%eax           /* 4 + 8 * 4 + 24 = 60 */
-        movl    %eax,(%esp)
+        mov     8(%rsp),%rax                   /* save return address on new stack   */
+        mov     %rax,(%rdi)
+        mov     %rsp,8(%rdi)                   /* save old stack pointer on new stack*/
+        mov     %rsp,(%rdx)                            /* save old stack pointer to variable */
 
-        movl    64(%esp),%eax
-        movl    68(%esp),%edx
-        movl    %eax,4(%esp)
-        movl    %edx,8(%esp)
+        mov     %rdi,%rsp                              /* switch to new stack                */
 
-        movl    72(%esp),%eax
-        movl    76(%esp),%edx
-        movl    %eax,12(%esp)
-        movl    %edx,16(%esp)
+        mov     %rcx,%rdi                      /* pass pointer                       */
+        call   *%rsi                                   /* and call function                  */
 
-        movl    80(%esp),%eax
-        movl    %eax,20(%esp)
+        mov     (%rsp),%r10                            /* load return address                */
+        mov     8(%rsp),%rsp                   /* switch to old stack                */
+        add     $(1*8),%rsp             /* free stack space                   */
+        mov     %r10,(%rsp)             /* write return adress                */
+        ret
 
-        call    builtin_displaymethodstop
-        addl    $24,%esp
 
-        popa
-        ret
-        
\ No newline at end of file
+asm_getclassvalues_atomic:
+_crit_restart:
+_crit_begin:
+       movl    offbaseval(a0),itmp1l
+       movl    offdiffval(a0),itmp2l
+       movl    offbaseval(a1),itmp3l
+_crit_end:
+       movl    itmp1l,offcast_super_baseval(a2)
+       movl    itmp2l,offcast_super_diffval(a2)
+       movl    itmp3l,offcast_sub_baseval(a2)
+       ret
+
+       .data
+               
+asm_criticalsections:
+#if defined(USE_THREADS) && defined(NATIVE_THREADS)
+       .quad   _crit_begin
+       .quad   _crit_end
+       .quad   _crit_restart
+#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:
+ */