[src/trunk]: src/sys/lib/libkern/arch/arm NetBSD/acorn26 has used APCS-32 for...

[bjh21 <bjh21%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/11a13e84b738
branches:  trunk
changeset: 545271:11a13e84b738
user:      bjh21 <bjh21%NetBSD.org@localhost>
date:      Sat Apr 05 23:27:14 2003 +0000

description:
NetBSD/acorn26 has used APCS-32 for years, so unifdef -U__APCS_26__.

diffstat:

 sys/lib/libkern/arch/arm/byte_swap_2.S |   6 +-----
 sys/lib/libkern/arch/arm/byte_swap_4.S |   6 +-----
 sys/lib/libkern/arch/arm/divsi3.S      |  26 +-------------------------
 sys/lib/libkern/arch/arm/ffs.S         |   8 ++------
 sys/lib/libkern/arch/arm/memcmp.S      |  12 ++----------
 sys/lib/libkern/arch/arm/memcpy.S      |  18 +-----------------
 sys/lib/libkern/arch/arm/memset.S      |  10 +---------
 sys/lib/libkern/arch/arm/strcmp.S      |   8 ++------
 sys/lib/libkern/arch/arm/strncmp.S     |  12 ++----------
 9 files changed, 13 insertions(+), 93 deletions(-)

diffs (truncated from 332 to 300 lines):

diff -r 996f81cdaf4e -r 11a13e84b738 sys/lib/libkern/arch/arm/byte_swap_2.S
--- a/sys/lib/libkern/arch/arm/byte_swap_2.S    Sat Apr 05 23:15:10 2003 +0000
+++ b/sys/lib/libkern/arch/arm/byte_swap_2.S    Sat Apr 05 23:27:14 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: byte_swap_2.S,v 1.2 2002/07/01 19:07:19 bjh21 Exp $    */
+/*     $NetBSD: byte_swap_2.S,v 1.3 2003/04/05 23:27:14 bjh21 Exp $    */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -45,8 +45,4 @@
        and             r1, r0, #0xff
        mov             r0, r0, lsr #8
        orr             r0, r0, r1, lsl #8
-#ifdef __APCS_26__
-       movs            pc, lr
-#else
        mov             pc, lr  
-#endif
diff -r 996f81cdaf4e -r 11a13e84b738 sys/lib/libkern/arch/arm/byte_swap_4.S
--- a/sys/lib/libkern/arch/arm/byte_swap_4.S    Sat Apr 05 23:15:10 2003 +0000
+++ b/sys/lib/libkern/arch/arm/byte_swap_4.S    Sat Apr 05 23:27:14 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: byte_swap_4.S,v 1.1 2000/12/29 20:51:57 bjh21 Exp $    */
+/*     $NetBSD: byte_swap_4.S,v 1.2 2003/04/05 23:27:14 bjh21 Exp $    */
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -46,8 +46,4 @@
        bic             r1, r1, #0x00FF0000
        mov             r0, r0, ror #8
        eor             r0, r0, r1, lsr #8
-#ifdef __APCS_26__
-       movs            pc,lr
-#else
        mov             pc, lr
-#endif
diff -r 996f81cdaf4e -r 11a13e84b738 sys/lib/libkern/arch/arm/divsi3.S
--- a/sys/lib/libkern/arch/arm/divsi3.S Sat Apr 05 23:15:10 2003 +0000
+++ b/sys/lib/libkern/arch/arm/divsi3.S Sat Apr 05 23:27:14 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: divsi3.S,v 1.3 2002/08/15 18:30:36 briggs Exp $        */
+/*     $NetBSD: divsi3.S,v 1.4 2003/04/05 23:27:15 bjh21 Exp $ */
 
 /*
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
@@ -27,11 +27,7 @@
        bl      .L_udivide
        add     sp, sp, #4      /* unalign stack */
        mov     r0, r1
-#ifdef __APCS_26__
-       ldmfd   sp!, {pc}^
-#else /* APCS-32 */
        ldmfd   sp!, {pc}
-#endif
 
 ENTRY(__modsi3)
        stmfd   sp!, {lr}
@@ -39,11 +35,7 @@
        bl      .L_divide
        add     sp, sp, #4      /* unalign stack */
        mov     r0, r1
-#ifdef __APCS_26__
-       ldmfd   sp!, {pc}^
-#else
        ldmfd   sp!, {pc}
-#endif
 
 .L_overflow:
 #if !defined(_KERNEL) && !defined(_STANDALONE)
@@ -54,11 +46,7 @@
        /* XXX should cause a fatal error */
        mvn     r0, #0
 #endif
-#ifdef __APCS_26__
-       movs    pc, lr
-#else
        mov     pc, lr
-#endif
 
 ENTRY(__udivsi3)
 .L_udivide:                            /* r0 = r0 / r1; r1 = r0 % r1 */
@@ -80,11 +68,7 @@
 .L_divide_l0:                          /* r0 == 1 */
        mov     r0, r1
        mov     r1, #0
-#ifdef __APCS_26__
-       movs    pc, lr
-#else
        mov     pc, lr
-#endif
 
 ENTRY(__divsi3)
 .L_divide:                             /* r0 = r0 / r1; r1 = r0 % r1 */
@@ -388,11 +372,7 @@
        movs    ip, ip, lsl #1
        bicmi   r0, r0, #0x80000000     /* Fix incase we divided 0x80000000 */
        rsbmi   r0, r0, #0
-#ifdef __APCS_26__
-       movs    pc, lr
-#else
        mov     pc, lr
-#endif
 
 .L_udivide_l1:
        tst     ip, #0x10000000
@@ -403,8 +383,4 @@
        subhs   r1, r1, r0
        addhs   r3, r3, r2
        mov     r0, r3
-#ifdef __APCS_26__
-       movs    pc, lr
-#else
        mov     pc, lr
-#endif
diff -r 996f81cdaf4e -r 11a13e84b738 sys/lib/libkern/arch/arm/ffs.S
--- a/sys/lib/libkern/arch/arm/ffs.S    Sat Apr 05 23:15:10 2003 +0000
+++ b/sys/lib/libkern/arch/arm/ffs.S    Sat Apr 05 23:27:14 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ffs.S,v 1.2 2002/08/17 19:00:26 thorpej Exp $  */
+/*     $NetBSD: ffs.S,v 1.3 2003/04/05 23:27:15 bjh21 Exp $    */
 /*
  * Copyright (c) 2001 Christopher Gilbert
  * All rights reserved.
@@ -30,7 +30,7 @@
 
 #include <machine/asm.h>
 
-RCSID("$NetBSD: ffs.S,v 1.2 2002/08/17 19:00:26 thorpej Exp $")
+RCSID("$NetBSD: ffs.S,v 1.3 2003/04/05 23:27:15 bjh21 Exp $")
 
 /*
  * ffs - find first set bit, this algorithm isolates the first set
@@ -61,11 +61,7 @@
        /* now lookup in table indexed on top 6 bits of r0 */
        ldrneb  r0, [ r2, r0, lsr #26 ]
 
-#ifdef __APCS_26__
-        movs  pc, lr
-#else
         mov   pc, lr
-#endif
 .text;
 .type .L_ffs_table, _ASM_TYPE_OBJECT;
 .L_ffs_table:
diff -r 996f81cdaf4e -r 11a13e84b738 sys/lib/libkern/arch/arm/memcmp.S
--- a/sys/lib/libkern/arch/arm/memcmp.S Sat Apr 05 23:15:10 2003 +0000
+++ b/sys/lib/libkern/arch/arm/memcmp.S Sat Apr 05 23:27:14 2003 +0000
@@ -1,4 +1,4 @@
-/*      $NetBSD: memcmp.S,v 1.1 2002/11/23 14:29:30 chris Exp $ */
+/*      $NetBSD: memcmp.S,v 1.2 2003/04/05 23:27:15 bjh21 Exp $ */
 
 /*
  * Copyright (c) 2002 ARM Ltd
@@ -30,17 +30,13 @@
 
 #include <machine/asm.h>
 
-RCSID("$NetBSD: memcmp.S,v 1.1 2002/11/23 14:29:30 chris Exp $")
+RCSID("$NetBSD: memcmp.S,v 1.2 2003/04/05 23:27:15 bjh21 Exp $")
 
 ENTRY(memcmp)
 /* if ((len - 1) < 0) return 0 */
        subs    r2, r2, #1
        movmi   r0, #0
-#ifdef __APCS_26__
-       movmis  pc, lr
-#else
        movmi   pc, lr
-#endif
 
 /* ip == last src address to compare */
        add     ip, r0, r2
@@ -51,8 +47,4 @@
        cmpcs   r2, r3
        beq     1b
        sub     r0, r2, r3
-#ifdef __APCS_26__
-        movs   pc, lr
-#else
        mov     pc, lr
-#endif
diff -r 996f81cdaf4e -r 11a13e84b738 sys/lib/libkern/arch/arm/memcpy.S
--- a/sys/lib/libkern/arch/arm/memcpy.S Sat Apr 05 23:15:10 2003 +0000
+++ b/sys/lib/libkern/arch/arm/memcpy.S Sat Apr 05 23:27:14 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: memcpy.S,v 1.3 2002/08/15 18:30:36 briggs Exp $        */
+/*     $NetBSD: memcpy.S,v 1.4 2003/04/05 23:27:15 bjh21 Exp $ */
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -75,11 +75,7 @@
        cmp     r1, r0
 
        moveq   r0, #0                  /* Quick abort for len=0 */
-#ifdef __APCS_26__
-       moveqs  pc, lr
-#else
        moveq   pc, lr
-#endif
 
        /* save leaf functions having to store this away */
        stmdb   sp!, {r0, lr}           /* memcpy() returns dest addr */
@@ -155,11 +151,7 @@
        strgeb  r3, [r0], #1
        ldrgtb  r3, [r1], #1
        strgtb  r3, [r0], #1
-#ifdef __APCS_26__
-       ldmia   sp!, {r0, pc}^
-#else
        ldmia   sp!, {r0, pc}
-#endif
 
        /* erg - unaligned destination */
 .Lmemcpy_fdestul:
@@ -343,11 +335,7 @@
 .Lmemcpy_bl4:
        /* less than 4 bytes to go */
        adds    r2, r2, #4
-#ifdef __APCS_26__
-       ldmeqia sp!, {r0, pc}^
-#else
        ldmeqia sp!, {r0, pc}
-#endif
 
        /* copy the crud byte at a time */
        cmp     r2, #2
@@ -357,11 +345,7 @@
        strgeb  r3, [r0, #-1]!
        ldrgtb  r3, [r1, #-1]!
        strgtb  r3, [r0, #-1]!
-#ifdef __APCS_26__
-       ldmia   sp!, {r0, pc}^
-#else
        ldmia   sp!, {r0, pc}
-#endif
 
        /* erg - unaligned destination */
 .Lmemcpy_bdestul:
diff -r 996f81cdaf4e -r 11a13e84b738 sys/lib/libkern/arch/arm/memset.S
--- a/sys/lib/libkern/arch/arm/memset.S Sat Apr 05 23:15:10 2003 +0000
+++ b/sys/lib/libkern/arch/arm/memset.S Sat Apr 05 23:27:14 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: memset.S,v 1.2 2002/08/15 18:30:36 briggs Exp $        */
+/*     $NetBSD: memset.S,v 1.3 2003/04/05 23:27:15 bjh21 Exp $ */
 
 /*
  * Copyright (c) 1995 Mark Brinicombe.
@@ -115,11 +115,7 @@
 .Lmemset_lessthanfour:
        cmp     r2, #0x00000000
        ldmeqfd sp!, {r0}
-#ifdef __APCS_26__
-       moveqs  pc, lr                  /* Zero length so exit */
-#else
        moveq   pc, lr                  /* Zero length so exit */
-#endif
 
        cmp     r2, #0x00000002
        strb    r1, [r0], #0x0001       /* Set 1 byte */
@@ -127,8 +123,4 @@
        strgtb  r1, [r0], #0x0001       /* and a third */
 
        ldmfd   sp!, {r0}
-#ifdef __APCS_26__
-       movs    pc, lr                  /* Exit */
-#else
        mov     pc, lr                  /* Exit */
-#endif
diff -r 996f81cdaf4e -r 11a13e84b738 sys/lib/libkern/arch/arm/strcmp.S
--- a/sys/lib/libkern/arch/arm/strcmp.S Sat Apr 05 23:15:10 2003 +0000
+++ b/sys/lib/libkern/arch/arm/strcmp.S Sat Apr 05 23:27:14 2003 +0000
@@ -1,4 +1,4 @@
-/*      $NetBSD: strcmp.S,v 1.2 2002/11/23 14:29:30 chris Exp $ */
+/*      $NetBSD: strcmp.S,v 1.3 2003/04/05 23:27:15 bjh21 Exp $ */
 
 /*
  * Copyright (c) 2002 ARM Ltd
@@ -30,7 +30,7 @@
 
 #include <machine/asm.h>
 
-RCSID("$NetBSD: strcmp.S,v 1.2 2002/11/23 14:29:30 chris Exp $")
+RCSID("$NetBSD: strcmp.S,v 1.3 2003/04/05 23:27:15 bjh21 Exp $")
 
 ENTRY(strcmp)
 1:
@@ -40,8 +40,4 @@
        cmpcs   r2, r3
        beq     1b
        sub     r0, r2, r3
-#ifdef __APCS_26__
-        movs   pc, lr
-#else
        mov     pc, lr
-#endif
diff -r 996f81cdaf4e -r 11a13e84b738 sys/lib/libkern/arch/arm/strncmp.S
--- a/sys/lib/libkern/arch/arm/strncmp.S        Sat Apr 05 23:15:10 2003 +0000
+++ b/sys/lib/libkern/arch/arm/strncmp.S        Sat Apr 05 23:27:14 2003 +0000
@@ -1,4 +1,4 @@
-/*      $NetBSD: strncmp.S,v 1.1 2002/11/23 14:29:30 chris Exp $ */