Renamed *_checkarraycast to *_arraycheckcast.

diff --git a/src/vm/jit/x86_64/asmpart.S b/src/vm/jit/x86_64/asmpart.S
index 88e056d27b4126af9ca121ef91ecdea77b03757b..d69c3955d4eb31b183a09012d55d0aedc4dc1a1a 100644 (file)
--- a/src/vm/jit/x86_64/asmpart.S
+++ b/src/vm/jit/x86_64/asmpart.S
@@ -28,7 +28,7 @@
             Reinhard Grafl
             Christian Thalinger
 
-   $Id: asmpart.S 2424 2005-04-30 13:45:06Z jowenn $
+   $Id: asmpart.S 2448 2005-05-11 13:03:20Z twisti $
 
 */
 
@@ -140,7 +140,7 @@
 
        .globl asm_wrapper_patcher
 
-       .globl asm_builtin_checkarraycast
+       .globl asm_builtin_arraycheckcast
        .globl asm_builtin_aastore
 
        .globl asm_builtin_f2i
@@ -971,16 +971,16 @@ asm_builtin_d2l:
        ret
 
 
-/* asm_builtin_checkarraycast **************************************************
+/* asm_builtin_arraycheckcast **************************************************
 
    Does the cast check and eventually throws an exception.
 
 *******************************************************************************/
 
-asm_builtin_checkarraycast:
+asm_builtin_arraycheckcast:
        sub     $24,%rsp                    /* keep stack 16-byte aligned         */
        mov     %rdi,(%rsp)                 /* save object pointer                */
-       call    builtin_checkarraycast      /* builtin_checkarraycast             */
+       call    builtin_arraycheckcast
        test    %rax,%rax                   /* if (false) throw exception         */
        je      nb_carray_throw
        mov     (%rsp),%rax                 /* return object pointer              */

diff --git a/src/vm/jit/x86_64/patcher.c b/src/vm/jit/x86_64/patcher.c
index b5356be9860c52b74f5acd38a544e3e39ef68345..9e1d82b0e168a5bb4602eb143ebbb9f1ec3b9a84 100644 (file)
--- a/src/vm/jit/x86_64/patcher.c
+++ b/src/vm/jit/x86_64/patcher.c
@@ -28,7 +28,7 @@
 
    Changes:
 
-   $Id: patcher.c 2426 2005-04-30 20:12:59Z twisti $
+   $Id: patcher.c 2448 2005-05-11 13:03:20Z twisti $
 
 */
 
@@ -631,7 +631,7 @@ bool patcher_builtin_multianewarray(u1 *sp)
 }
 
 
-/* patcher_builtin_checkarraycast **********************************************
+/* patcher_builtin_arraycheckcast **********************************************
 
    Machine code:
 
@@ -642,7 +642,7 @@ bool patcher_builtin_multianewarray(u1 *sp)
 
 *******************************************************************************/
 
-bool patcher_builtin_checkarraycast(u1 *sp)
+bool patcher_builtin_arraycheckcast(u1 *sp)
 {
        u1                *ra;
        java_objectheader *o;
@@ -700,7 +700,7 @@ bool patcher_builtin_checkarraycast(u1 *sp)
 
        /* patch new function address */
 
-       *((ptrint *) (ra + 10 + 2)) = (ptrint) BUILTIN_checkarraycast;
+       *((ptrint *) (ra + 10 + 2)) = (ptrint) BUILTIN_arraycheckcast;
 
 
 #if defined(USE_THREADS)