[src/trunk]: src/lib/libc/arch/powerpc/string Use pcrel access and avoid GOT ...

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

details:   https://anonhg.NetBSD.org/src/rev/1a2e1e980030
branches:  trunk
changeset: 788689:1a2e1e980030
user:      matt <matt%NetBSD.org@localhost>
date:      Thu Jul 18 12:20:41 2013 +0000

description:
Use pcrel access and avoid GOT entries.  Restructure a little to be more
efficient.

diffstat:

 lib/libc/arch/powerpc/string/bzero.S |  49 ++++++++++++++++-------------------
 1 files changed, 23 insertions(+), 26 deletions(-)

diffs (98 lines):

diff -r c44b7c2bf15b -r 1a2e1e980030 lib/libc/arch/powerpc/string/bzero.S
--- a/lib/libc/arch/powerpc/string/bzero.S      Thu Jul 18 12:16:40 2013 +0000
+++ b/lib/libc/arch/powerpc/string/bzero.S      Thu Jul 18 12:20:41 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bzero.S,v 1.11 2011/01/29 02:21:20 matt Exp $ */
+/*     $NetBSD: bzero.S,v 1.12 2013/07/18 12:20:41 matt Exp $ */
 
 /*-
  * Copyright (C) 2001  Martin J. Laubach <mjl%NetBSD.org@localhost>
@@ -32,7 +32,7 @@
 
 
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: bzero.S,v 1.11 2011/01/29 02:21:20 matt Exp $")
+__RCSID("$NetBSD: bzero.S,v 1.12 2013/07/18 12:20:41 matt Exp $")
 #endif /* LIBC_SCCS && !lint */
 
 #ifdef _KERNEL
@@ -76,17 +76,21 @@
                /* First find out cache line size */
                mflr    %r9
 #ifdef PIC
-               PIC_GOTSETUP(%r10)
+               bcl     20,31,1f
+1:             mflr    %r5
                mtlr    %r9
-               lwz     %r5,cache_info@got(%r10)
+               addis   %r5,%r5,cache_info+4-1b@ha
+               lwzu    %r9,cache_info+4-1b@l(%r5)
 #else
-               lis     %r5,cache_info@h
-               ori     %r5,%r5,cache_info@l
+               lis     %r5,cache_info+4@ha
+               lwzu    %r9,cache_info+4@l(%r5)
 #endif
-               lwz     %r6, 4(%r5)
-               cmpwi   %r6, -1
+               lwz     %r10,cache_sh-(cache_info+4)(%r5)
+               cmpwi   %r9, -1
                bne+    cb_cacheline_known
 
+               addi    %r5, %r5, -4    /* point r5 @ beginning of cache_info */
+
 /*----------------------------------------------------------------------*/
 #define CTL_MACHDEP    7
 #define CPU_CACHELINE  1
@@ -172,33 +176,25 @@
 
                cntlzw  %r6, %r9                        /* compute shift value */
                li      %r5, 31
-               subf    %r5, %r6, %r5
+               subf    %r10, %r6, %r5
 
 #ifdef PIC
                mflr    %r9
-               PIC_GOTSETUP(%r10)
+               bcl     20,31,1f
+1:             mflr    %r5
                mtlr    %r9
-               lwz     %r6, cache_sh@got(%r10)
-               stw     %r5, 0(%r6)
+
+               addis   %r5, %r5, cache_info+4-1b@ha
+               lwzu    %r9, cache_info+4-1b@l(%r5)
 #else
-               lis     %r6, cache_sh@ha
-               stw     %r5, cache_sh@l(%r6)
+               lis     %r5, cache_info+4@ha
+               lwzu    %r9, cache_info+4@l(%r5)
 #endif
+               stw     %r10, cache_sh-(cache_info+4)(%r5)
+
 /*----------------------------------------------------------------------*/
 /* Okay, we know the cache line size (%r9) and shift value (%r10) */
 cb_cacheline_known:
-#ifdef PIC
-               lwz     %r5, cache_info@got(%r10)
-               lwz     %r9, 4(%r5)
-               lwz     %r5, cache_sh@got(%r10)
-               lwz     %r10, 0(%r5)
-#else
-               lis     %r9, cache_info+4@ha
-               lwz     %r9, cache_info+4@l(%r9)
-               lis     %r10, cache_sh@ha
-               lwz     %r10, cache_sh@l(%r10)
-#endif
-
 #else /* _KERNEL */
 #ifdef MULTIPROCESSOR
                mfsprg  %r10, 0                 /* Get cpu_info pointer */
@@ -371,6 +367,7 @@
 /*----------------------------------------------------------------------*/
 #ifndef _KERNEL
                .data
+               .p2align 2
 cache_info:    .long   -1, -1, -1, -1
 cache_sh:      .long   0