* Removed all Id tags.
[cacao.git] / src / vm / jit / x86_64 / asmpart.S
index f79c905cb5b266e90e4638e8898f05c943501331..58ab38124a894b21f02c4bb48d912dfc5a899660 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
 
-#include "offsets.h"
+   Copyright (C) 1996-2005, 2006, 2007 R. Grafl, A. Krall, C. Kruegel,
+   C. Oates, R. Obermaisser, M. Platter, M. Probst, S. Ring,
+   E. Steiner, C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich,
+   J. Wenninger, Institut f. Computersprachen - TU Wien
 
-       .text
+   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.
 
-/********************* exported functions and variables ***********************/
+   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.
 
-       .globl has_no_x_instr_set
-       .globl asm_calljavamethod
-       .globl asm_calljavafunction
-       .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_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.                               *
-*                                                                              *
-*******************************************************************************/
+   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.
 
-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
 
+#include "config.h"
 
-/********************* function asm_calljavamethod *****************************
-*                                                                              *
-*   This function calls a Java-method (which possibly needs compilation)       *
-*   with up to 4 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);                     *
-*                                                                              *
-*******************************************************************************/
+#include "vm/jit/x86_64/arch.h"
+#include "vm/jit/x86_64/md-abi.h"
+#include "vm/jit/x86_64/md-asm.h"
 
-#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)
+#include "vm/jit/abi-asm.h"
+#include "vm/jit/methodheader.h"
 
-               movl    %edx,12(%esp)
-               movl    16(%ebp),%eax
-               movl    %eax,8(%esp)
 
-               movl    %edx,4(%esp)
-               movl    12(%ebp),%eax
-               movl    %eax,(%esp)
+       .text
 
-               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
-
-calljava_xhandler:
-               pushl   %eax                              /* pass exception pointer               */
-               call    builtin_throw_exception
-               addl    $4,%esp
-               addl    $32,%esp
-               popl    %ebp
-               ret
+/* export functions ***********************************************************/
+
+       .globl asm_vm_call_method
+       .globl asm_vm_call_method_int
+       .globl asm_vm_call_method_long
+       .globl asm_vm_call_method_float
+       .globl asm_vm_call_method_double
+       .globl asm_vm_call_method_exception_handler
+       .globl asm_vm_call_method_end
+
+       .globl asm_call_jit_compiler
+
+       .globl asm_handle_exception
+       .globl asm_handle_nat_exception
+
+       .globl asm_abstractmethoderror
+
+       .globl asm_patcher_wrapper
+
+#if defined(ENABLE_REPLACEMENT)
+       .globl asm_replacement_out
+       .globl asm_replacement_in
+#endif
+
+       .globl asm_builtin_f2i
+       .globl asm_builtin_f2l
+       .globl asm_builtin_d2i
+       .globl asm_builtin_d2l
+
+       .globl asm_compare_and_swap
+       .globl asm_memory_barrier
 
 
 /********************* function asm_calljavafunction ***************************
@@ -187,65 +85,109 @@ 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)
+       .quad   0                           /* catch type all                     */
+       .quad   0                           /* handler pc                         */
+       .quad   0                           /* end pc                             */
+       .quad   0                           /* start pc                           */
+       .long   1                           /* extable size                       */
+       .long   0                           /* ALIGNMENT PADDING                  */
+       .quad   0                           /* line number table  start           */
+       .quad   0                           /* line number table  size            */
+       .long   0                           /* ALIGNMENT PADDING                  */
+       .long   0                           /* fltsave                            */
+       .long   0                           /* intsave                            */
+       .long   0                           /* isleaf                             */
+       .long   0                           /* IsSync                             */
+       .long   0                           /* frame size                         */
+       .quad   0                           /* codeinfo pointer                   */
+
+asm_vm_call_method:
+asm_vm_call_method_int:
+asm_vm_call_method_long:
+asm_vm_call_method_float:
+asm_vm_call_method_double:
+       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,6*8(sp)                  /* store method PV                    */
+
+       mov     sp,s0                       /* save stack pointer                 */
+
+       mov     a1,t0                       /* address of data structure          */
+       mov     a2,itmp1                    /* number of stack arguments          */
+
+       mov     0*8(t0),a0
+       mov     1*8(t0),a1
+       mov     2*8(t0),a2
+       mov     3*8(t0),a3
+       mov     4*8(t0),a4
+       mov     5*8(t0),a5
+
+       movq    6*8(t0),fa0
+       movq    7*8(t0),fa1
+       movq    8*8(t0),fa2
+       movq    9*8(t0),fa3
+       movq    10*8(t0),fa4
+       movq    11*8(t0),fa5
+       movq    12*8(t0),fa6
+       movq    13*8(t0),fa7
+
+       cmp     $0,itmp1l
+       je      L_asm_vm_call_method_stack_copy_done
+
+       mov     itmp1,itmp2
+       add     $1,itmp2                    /* keep stack 16-byte aligned         */
+       and     $0xfffffffffffffffe,itmp2
+       shl     $3,itmp2                    /* calculate stack size               */
+       sub     itmp2,sp                    /* create stack frame                 */
+       mov     sp,itmp2                    /* temporary stack pointer            */
+
+L_asm_vm_call_method_stack_copy_loop:
+       mov     14*8(t0),itmp3              /* load argument                      */
+       mov     itmp3,0(itmp2)              /* store argument on stack            */
+
+       sub     $1,itmp1l                   /* subtract 1 argument                */
+       add     $8,t0                       /* set address of next argument       */
+       add     $8,itmp2                    /* increase SP                        */
+
+       cmp     $0,itmp1l
+       jg      L_asm_vm_call_method_stack_copy_loop
+
+L_asm_vm_call_method_stack_copy_done:
+       lea     (6*8-256)(s0),mptr          /* We subtract 256 to force the next  */
+                                           /* move instruction to have a 32-bit  */
+                                           /* offset.                            */
+
+       mov     (0*8+256)(mptr),itmp3       /* load PV                            */
+       call    *itmp3
+
+       mov     s0,sp                       /* restore SP                         */
+
+L_asm_vm_call_method_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
+               
+asm_vm_call_method_exception_handler:
+       mov     xptr,a0                     /* pass exception pointer             */
+       call    builtin_throw_exception@PLT
+       jmp     L_asm_vm_call_method_return
+
+asm_vm_call_method_end:
+       nop
 
-               movl    8(%ebp),%eax          /* move function pointer to %eax        */
-
-               lea             asm_call_jit_compiler,%ecx 
-               call    *%ecx                 /* call JIT compiler                    */
-       
-calljava_jit2:
-calljava_return2:
-calljava_ret2:
-               leave
-               ret
-
-calljava_xhandler2:
-               pushl   %eax                              /* pass exception pointer               */
-               call    builtin_throw_exception
-               addl    $4,%esp
-               addl    $32,%esp
-               popl    %ebp
-               ret
-                                               
 
 /****************** function asm_call_jit_compiler *****************************
 *                                                                              *
@@ -274,89 +216,36 @@ 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
-               
-L_not_static_special:
-               cmpb    $0xd0,%bl               /* called with `call *REG_ITMP1' (%eax)       */
-               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
+L_asm_call_jit_compiler:                /* required for PIC code              */
+       sub     $(ARG_CNT+1)*8,sp           /* +1: keep stack 16-byte aligned     */
 
-L_not_virtual_interface:        /* a call from asm_calljavamethod             */
-               xorl    %edx,%edx
-               
-L_call_jit_compile:
-               pushl   %edx            /* save address for method pointer            */
+       SAVE_ARGUMENT_REGISTERS(0)
 
-               pushl   %eax                    /* push methodpointer on stack                */
-               call    jit_compile
-               addl    $4,%esp
+       mov     itmp1,a0                    /* pass methodinfo pointer            */
+       mov     mptr,a1                     /* pass method pointer                */
+       mov     sp,a2                       /* pass java sp                       */
+       add     $(1+ARG_CNT+1)*8,a2
+       mov     (ARG_CNT+1)*8(sp),a3        /* pass ra to java function           */
+       call    jit_asm_compile@PLT
 
-               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               */
+       RESTORE_ARGUMENT_REGISTERS(0)
 
-L_call_method:
-/*             popl    %edi            /* restore registers                          */
-/*             popl    %esi*/
-               popl    %ebx
-               
-               leave
-               jmp             *%eax                   /* ...and now call the new method             */
+       add     $(ARG_CNT+1)*8,sp           /* remove stack frame                 */
 
+       test    v0,v0                       /* check for exception                */
+       je      L_asm_call_jit_compiler_exception
 
+       jmp     *v0                         /* ...and now call the new method     */
 
-/****************** 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);                             *
-*                                                                              *
-*******************************************************************************/
+L_asm_call_jit_compiler_exception:
+       call    exceptions_get_and_clear_exception@PLT
+       pop     xpc                         /* delete return address              */
+       sub     $3,xpc                      /* faulting address is ra - 3         */
+       jmp     L_asm_handle_exception
 
-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
 
-
-/********************* function 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,729 +253,471 @@ 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      */
+L_asm_handle_exception:                 /* required for PIC code              */
+       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_get_pv_from_pc@PLT
+       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@PLT
 
-               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
-               
-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)
+       add     $((ARG_CNT+TMP_CNT)*8),sp   /* remove maybe-leaf stackframe       */
+       xor     t0,t0                       /* clear the isleaf flags             */
 
-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
+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:
+#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
 
-/********************* function asm_builtin_monitorenter ***********************
-*                                                                              *
-*   Does null check and calls monitorenter or throws an exception              *
-*                                                                              *
-*******************************************************************************/
 
-asm_builtin_monitorenter:
-               cmpl    $0,4(%esp)
-               je              nb_monitorenter                 /* if (null) throw exception          */
-               jmp             builtin_monitorenter    /* else call builtin_monitorenter     */
+/* asm_abstractmethoderror *****************************************************
 
-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
-               
+   Creates and throws an AbstractMethodError.
 
-/********************* 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_abstractmethoderror:
+       mov     sp,a0                       /* pass java sp                       */
+       add     $1*8,a0
+       mov     0*8(sp),a1                  /* pass exception address             */
+       sub     $3,a1
+       call    exceptions_asm_new_abstractmethoderror@PLT
+                                           /* exception pointer is return value  */
+       pop     xpc                         /* get exception address              */
+       sub     $3,xpc                      /* exception address is ra - 3        */
+       jmp     L_asm_handle_exception
 
-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
 
+/* asm_patcher_wrapper *********************************************************
 
-/************************ function asm_builtin_idiv ****************************
-*                                                                              *
-*   Does null check and calls idiv or throws an exception                      *
-*                                                                              *
-*******************************************************************************/
+   XXX
 
-asm_builtin_idiv:
-               cmpl    $0,12(%esp)             /* if (null) throw exception */
-               je              nb_idiv
+   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
 
-               movl    4(%esp),%eax            /* 4 (return) = 4 */
-               cltd
-               idivl   12(%esp)
-
-               ret
-
-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
-               
-
-/************************ function asm_builtin_ldiv ****************************
-*                                                                              *
-*   Does null check and calls ldiv or throws an exception                      *
-*                                                                              *
 *******************************************************************************/
 
-asm_builtin_ldiv:
-               movl    12(%esp),%eax
-               orl             16(%esp),%eax
-               test    %eax,%eax                               /* if (null) throw exception */
-               je              nb_ldiv
+asm_patcher_wrapper:
+       push    bp                          /* save base pointer                  */
+       mov     sp,bp                       /* move actual sp to bp               */
+       sub     $(3+ARG_CNT+TMP_CNT)*8,sp
+       and     $0xfffffffffffffff0,sp      /* align sp to 16-byte (this is for   */
+                                           /* leaf functions)                    */
 
-               jmp             builtin_ldiv
+       SAVE_ARGUMENT_REGISTERS(3)
+       SAVE_TEMPORARY_REGISTERS(3+ARG_CNT)
 
-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
-                               
+       mov     itmp1,0*8(sp)               /* save itmp1 and itmp2               */
+       mov     itmp2,1*8(sp)               /* can be used by some instructions   */
 
-/************************ function asm_builtin_irem ****************************
-*                                                                              *
-*   Does null check and calls irem or throws an exception                      *
-*                                                                              *
-*******************************************************************************/
+       mov     bp,a0                       /* pass SP of patcher stub            */
+       add     $(1*8),a0
+       mov     $0,a1                       /* pass PV (if NULL, use findmethod)  */
+       mov     $0,a2                       /* pass RA (it's on the stack)        */
+       call    patcher_wrapper@PLT
+       mov     v0,2*8(sp)                  /* save return value                  */
 
-asm_builtin_irem:
-               cmpl    $0,12(%esp)             /* if (null) throw exception */
-               je              nb_irem
+       RESTORE_ARGUMENT_REGISTERS(3)
+       RESTORE_TEMPORARY_REGISTERS(3+ARG_CNT)
 
-               movl    4(%esp),%eax            /* 4 (return) = 4 */
-               cltd
-               idivl   12(%esp)
-               
-               movl    %edx,%eax
-               ret
+       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               */
 
-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
+       mov     bp,sp                       /* restore original sp                */
+       pop     bp                          /* restore bp                         */
+       add     $(5*8),sp                   /* remove patcher stackframe, keep RA */
 
+       test    itmp3,itmp3                 /* exception thrown?                  */
+       jne     L_asm_patcher_wrapper_exception
+       ret                                 /* call new patched code              */
 
-/************************ function asm_builtin_lrem ****************************
-*                                                                              *
-*   Does null check and calls lrem or throws an exception                      *
-*                                                                              *
-*******************************************************************************/
+L_asm_patcher_wrapper_exception:
+       mov     itmp3,xptr                  /* get exception                      */
+       pop     xpc                         /* get and remove return address      */
+       jmp     L_asm_handle_exception
 
-asm_builtin_lrem:
-               movl    12(%esp),%eax
-               orl             16(%esp),%eax
-               test    %eax,%eax                               /* if (null) throw exception */
-               je              nb_lrem
+#if defined(ENABLE_REPLACEMENT)
 
-               jmp             builtin_lrem
+/* asm_replacement_out *********************************************************
 
-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
-               
+   This code is jumped to from the replacement-out stubs that are executed
+   when a thread reaches an activated replacement point.
 
-/*********************** function new_builtin_checkcast ************************
-*                                                                              *
-*   Does the cast check and eventually throws an exception                     *
-*                                                                              *
-*******************************************************************************/
+   The purpose of asm_replacement_out is to read out the parts of the
+   execution state that cannot be accessed from C code, store this state,
+   and then call the C function replace_me.
 
-asm_builtin_checkcast:
-               xorl    %eax,%eax
-               movl    $0,(%eax)
-               ret
+   Stack layout:
+      8                 start of stack inside method to replace
+      0   rplpoint *    info on the replacement point that was reached
 
-               
-/******************* 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             */
-       
-               test    %eax,%eax               /* if (false) throw exception         */
-               je              nb_carray_throw
-
-               movl    12(%esp),%eax                   /* return object pointer              */
-               addl    $8,%esp
-               ret
+/* some room to accomodate changes of the stack frame size during replacement */
+       /* XXX we should find a cleaner solution here */
+#define REPLACEMENT_ROOM  512
+
+asm_replacement_out:
+    /* create stack frame */
+       sub     $(sizeexecutionstate + REPLACEMENT_ROOM),sp
+
+       /* save registers in execution state */
+       mov     %rax,(RAX*8+offes_intregs)(sp)
+       mov     %rbx,(RBX*8+offes_intregs)(sp)
+       mov     %rcx,(RCX*8+offes_intregs)(sp)
+       mov     %rdx,(RDX*8+offes_intregs)(sp)
+       mov     %rsi,(RSI*8+offes_intregs)(sp)
+       mov     %rdi,(RDI*8+offes_intregs)(sp)
+       mov     %rbp,(RBP*8+offes_intregs)(sp)
+       movq    $0  ,(RSP*8+offes_intregs)(sp) /* not used */
+       mov     %r8 ,(R8 *8+offes_intregs)(sp)
+       mov     %r9 ,(R9 *8+offes_intregs)(sp)
+       mov     %r10,(R10*8+offes_intregs)(sp)
+       mov     %r11,(R11*8+offes_intregs)(sp)
+       mov     %r12,(R12*8+offes_intregs)(sp)
+       mov     %r13,(R13*8+offes_intregs)(sp)
+       mov     %r14,(R14*8+offes_intregs)(sp)
+       mov     %r15,(R15*8+offes_intregs)(sp)
+
+       movq    %xmm0 ,(XMM0 *8+offes_fltregs)(sp)
+       movq    %xmm1 ,(XMM1 *8+offes_fltregs)(sp)
+       movq    %xmm2 ,(XMM2 *8+offes_fltregs)(sp)
+       movq    %xmm3 ,(XMM3 *8+offes_fltregs)(sp)
+       movq    %xmm4 ,(XMM4 *8+offes_fltregs)(sp)
+       movq    %xmm5 ,(XMM5 *8+offes_fltregs)(sp)
+       movq    %xmm6 ,(XMM6 *8+offes_fltregs)(sp)
+       movq    %xmm7 ,(XMM7 *8+offes_fltregs)(sp)
+       movq    %xmm8 ,(XMM8 *8+offes_fltregs)(sp)
+       movq    %xmm9 ,(XMM9 *8+offes_fltregs)(sp)
+       movq    %xmm10,(XMM10*8+offes_fltregs)(sp)
+       movq    %xmm11,(XMM11*8+offes_fltregs)(sp)
+       movq    %xmm12,(XMM12*8+offes_fltregs)(sp)
+       movq    %xmm13,(XMM13*8+offes_fltregs)(sp)
+       movq    %xmm14,(XMM14*8+offes_fltregs)(sp)
+       movq    %xmm15,(XMM15*8+offes_fltregs)(sp)
+
+       /* calculate sp of method */
+       mov     sp,itmp1
+       add     $(sizeexecutionstate + REPLACEMENT_ROOM + 8),itmp1
+       mov     itmp1,(offes_sp)(sp)
+
+       /* pv must be looked up via AVL tree */
+       movq    $0,(offes_pv)(sp)
+
+       /* call replace_me */
+       mov     -8(itmp1),a0                /* rplpoint *                         */
+    mov     sp,a1                       /* arg1: execution state              */
+    call    replace_me@PLT              /* call C function replace_me         */
+    call    abort@PLT                   /* NEVER REACHED                      */
+
+/* asm_replacement_in **********************************************************
+
+   This code writes the given execution state and jumps to the replacement
+   code.
+
+   This function never returns!
+
+   C prototype:
+      void asm_replacement_in(executionstate *es, replace_safestack_t *st);
 
-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
-       
-               addl    $8,%esp
-               ret
-
-               
-/******************* function asm_builtin_newarray_array ***********************
-*                                                                              *
-*   Does the cast check and eventually throws an exception                     *
+asm_replacement_in:
+       /* get arguments */
+       mov     a1,s1                       /* replace_safestack_t *st            */
+       mov     a0,%rbp                     /* executionstate *es == safe stack   */
+
+       /* switch to the safe stack */
+       mov     %rbp,sp
+
+       /* call replace_build_execution_state(st) */
+       mov             s1,a0
+       call    replace_build_execution_state@PLT
+
+       /* set new sp */
+       mov     (offes_sp)(%rbp),sp
+
+       /* push address of new code */
+       pushq   (offes_pc)(%rbp)
+
+       /* allocate an executionstate_t on the stack */
+       sub             $(sizeexecutionstate),sp
+
+       /* call replace_free_safestack(st,& of allocated executionstate_t) */
+       mov             sp,a1
+       mov             s1,a0
+       call    replace_free_safestack@PLT
+
+       /* copy registers from execution state */
+       movq    (XMM0 *8+offes_fltregs)(sp),%xmm0
+       movq    (XMM1 *8+offes_fltregs)(sp),%xmm1
+       movq    (XMM2 *8+offes_fltregs)(sp),%xmm2
+       movq    (XMM3 *8+offes_fltregs)(sp),%xmm3
+       movq    (XMM4 *8+offes_fltregs)(sp),%xmm4
+       movq    (XMM5 *8+offes_fltregs)(sp),%xmm5
+       movq    (XMM6 *8+offes_fltregs)(sp),%xmm6
+       movq    (XMM7 *8+offes_fltregs)(sp),%xmm7
+       movq    (XMM8 *8+offes_fltregs)(sp),%xmm8
+       movq    (XMM9 *8+offes_fltregs)(sp),%xmm9
+       movq    (XMM10*8+offes_fltregs)(sp),%xmm10
+       movq    (XMM11*8+offes_fltregs)(sp),%xmm11
+       movq    (XMM12*8+offes_fltregs)(sp),%xmm12
+       movq    (XMM13*8+offes_fltregs)(sp),%xmm13
+       movq    (XMM14*8+offes_fltregs)(sp),%xmm14
+       movq    (XMM15*8+offes_fltregs)(sp),%xmm15
+
+       mov     (RAX*8+offes_intregs)(sp),%rax
+       mov     (RBX*8+offes_intregs)(sp),%rbx
+       mov     (RCX*8+offes_intregs)(sp),%rcx
+       mov     (RDX*8+offes_intregs)(sp),%rdx
+       mov     (RSI*8+offes_intregs)(sp),%rsi
+       mov     (RDI*8+offes_intregs)(sp),%rdi
+       mov     (RBP*8+offes_intregs)(sp),%rbp
+       mov     (R8 *8+offes_intregs)(sp),%r8
+       mov     (R9 *8+offes_intregs)(sp),%r9
+       mov     (R10*8+offes_intregs)(sp),%r10
+       mov     (R11*8+offes_intregs)(sp),%r11
+       mov     (R12*8+offes_intregs)(sp),%r12
+       mov     (R13*8+offes_intregs)(sp),%r13
+       mov     (R14*8+offes_intregs)(sp),%r14
+       mov     (R15*8+offes_intregs)(sp),%r15
+
+       /* pop the execution state off the stack */
+       add             $(sizeexecutionstate),sp
+
+       /* jump to new code */
+       ret
+
+#endif /* defined(ENABLE_REPLACEMENT) */
+
+
+/* asm_builtin_x2x *************************************************************
+*                                                                              *
+*   Wrapper functions for float to int corner cases                            *
 *                                                                              *
 *******************************************************************************/
 
-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
+asm_builtin_f2i:
+       sub     $(ARG_CNT*8),sp
        
-               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
-
-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_arrayinstanceof:
-               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_arrayinstanceof
+       SAVE_ARGUMENT_REGISTERS(0)
        
-               addl    $8,%esp
-               ret
-
-               
-/******************* function asm_initialize_thread_stack **********************
-*                                                                              *
-* initialized a thread stack                                                   *
-* (to)->restorePoint = asm_initialize_thread_stack((u1*)(func), (to)->stackEnd)*
-*                                                                              *
-*******************************************************************************/
-
-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        */
-
-
-/******************* function asm_perform_threadswitch *************************
-*                                                                              *
-*   void asm_perform_threadswitch (u1 **from, u1 **to, u1 **stackTop);         *
-*                                                                              *
-*   performs a threadswitch                                                    *
-*                                                                              *
-*******************************************************************************/
+       movq    ftmp1,fa0
+       call    builtin_f2i@PLT
+       
+       RESTORE_ARGUMENT_REGISTERS(0)
+       
+       add     $(ARG_CNT*8),sp
+       ret
 
-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
-               
 
-/********************* 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                *
-*                                                                              *
-*******************************************************************************/
+asm_builtin_f2l:
+       sub     $(ARG_CNT*8),sp
+       
+       SAVE_ARGUMENT_REGISTERS(0)
+       
+       movq    ftmp1,fa0
+       call    builtin_f2l@PLT
+       
+       RESTORE_ARGUMENT_REGISTERS(0)
+       
+       add     $(ARG_CNT*8),sp
+       ret
 
-asm_switchstackandcall:
-               movl    4(%esp),%edx                    /* first argument *stack */
-               subl    $8,%edx                                 /* allocate new stack */
 
-               movl    (%esp),%eax                             /* save return address on new stack */
-               movl    %eax,(%edx)
+asm_builtin_d2i:
+       sub     $(ARG_CNT*8),sp
+       
+       SAVE_ARGUMENT_REGISTERS(0)
+       
+       movq    ftmp1,fa0
+       call    builtin_d2i@PLT
+       
+       RESTORE_ARGUMENT_REGISTERS(0)
+       
+       add     $(ARG_CNT*8),sp
+       ret
 
-               movl    %esp,4(%edx)                    /* save old stack pointer on new stack */
 
-               movl    12(%esp),%eax                   /* third argument **stacktopsave */
-               movl    %esp,(%eax)                             /* save old stack pointer to variable */
+asm_builtin_d2l:
+       sub     $(ARG_CNT*8),sp
+       
+       SAVE_ARGUMENT_REGISTERS(0)
+       
+       movq    ftmp1,fa0
+       call    builtin_d2l@PLT
+       
+       RESTORE_ARGUMENT_REGISTERS(0)
+       
+       add     $(ARG_CNT*8),sp
+       ret
 
-               movl    8(%esp),%eax                    /* load function pointer */
-               movl    16(%esp),%ecx                   /* fourth argument *p */
-               
-               movl    %edx,%esp                               /* switch to new stack */
 
-               subl    $4,%esp
-               movl    %ecx,0(%esp)                    /* pass pointer */
-               call    *%eax                                   /* and call function */
-               addl    $4,%esp
+/* asm_compare_and_swap ********************************************************
 
-               movl    (%esp),%edx                             /* load return address */
-               movl    4(%esp),%esp                    /* switch to old stack */
-               movl    %edx,(%esp)
-               ret
+   Does an atomic compare and swap.  Required for the lock
+   implementation.
 
-               
-/********************* function asm_getcallingmethod ***************************
-*                                                                              *
-*   classinfo *asm_getcallingmethod ();                                                                   *
-*                                                                                                                                                         *    
-*   goes back stack frames to get the calling method                                              *       
-*                                                                                                                                                         *    
-*                              t2 .. sp                                                                                                       *
-*                              t3 .. ra                                                                                                       *
-*                              t4 .. pv                                                                                                       *
-*                                                                              *
 *******************************************************************************/
 
-asm_getcallingmethod:
-               xorl    %eax,%eax
-/*             movl    $0,(%eax) */
-               ret
+asm_compare_and_swap:
+       mov     a1,v0                       /* v0 is %rax                         */
+       lock cmpxchg a2,(a0)
+       ret
 
 
-/*********************** function asm_builtin_trace ****************************
-*                                                                              *
-*   Intended to be called from the native stub. Saves all argument registers   *
-*   and calls builtin_trace_args.                                              *
-*                                                                              *
-*******************************************************************************/
-
-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
+/* asm_memory_barrier **********************************************************
 
+   A memory barrier for the Java Memory Model.
 
-/********************* function asm_builtin_exittrace **************************
-*                                                                              *
-*   Intended to be called from the native stub. Saves return value and calls   *
-*   builtin_displaymethodstop.                                                 *
-*                                                                              *
 *******************************************************************************/
 
-asm_builtin_exittrace:
-        pusha
-        subl    $24,%esp
-        
-        movl    60(%esp),%eax           /* 4 + 8 * 4 + 24 = 60 */
-        movl    %eax,(%esp)
+asm_memory_barrier:
+       mfence
+       ret
 
-        movl    64(%esp),%eax
-        movl    68(%esp),%edx
-        movl    %eax,4(%esp)
-        movl    %edx,8(%esp)
 
-        movl    72(%esp),%eax
-        movl    76(%esp),%edx
-        movl    %eax,12(%esp)
-        movl    %edx,16(%esp)
+/* disable exec-stacks ********************************************************/
 
-        movl    80(%esp),%eax
-        movl    %eax,20(%esp)
+#if defined(__linux__) && defined(__ELF__)
+       .section .note.GNU-stack,"",%progbits
+#endif
 
-        call    builtin_displaymethodstop
-        addl    $24,%esp
 
-        popa
-        ret
-        
\ No newline at end of file
+/*
+ * 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:
+ * vim:noexpandtab:sw=4:ts=4:
+ */