[src/trunk]: src/sys/arch/arm/arm Use explicit register pairs as arguments fo...

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

details:   https://anonhg.NetBSD.org/src/rev/9673d2b7d009
branches:  trunk
changeset: 325353:9673d2b7d009
user:      joerg <joerg%NetBSD.org@localhost>
date:      Thu Dec 19 23:48:44 2013 +0000

description:
Use explicit register pairs as arguments for ldrd.

diffstat:

 sys/arch/arm/arm/cpu_in_cksum.S |  30 +++++++++++++++---------------
 1 files changed, 15 insertions(+), 15 deletions(-)

diffs (86 lines):

diff -r d4cabd010cb8 -r 9673d2b7d009 sys/arch/arm/arm/cpu_in_cksum.S
--- a/sys/arch/arm/arm/cpu_in_cksum.S   Thu Dec 19 23:36:07 2013 +0000
+++ b/sys/arch/arm/arm/cpu_in_cksum.S   Thu Dec 19 23:48:44 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpu_in_cksum.S,v 1.6 2013/08/18 15:58:19 matt Exp $    */
+/*     $NetBSD: cpu_in_cksum.S,v 1.7 2013/12/19 23:48:44 joerg Exp $   */
 
 /*
  * Copyright 2003 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
  */
 
 #include <machine/asm.h>
-RCSID("$NetBSD: cpu_in_cksum.S,v 1.6 2013/08/18 15:58:19 matt Exp $")
+RCSID("$NetBSD: cpu_in_cksum.S,v 1.7 2013/12/19 23:48:44 joerg Exp $")
        
 #include "assym.h"
 
@@ -227,37 +227,37 @@
         * setting r6 to zero to avoid stalling for results in the
         * loop. (r7 is live, from above).
         */
-       ldrd    r4, [r0], #0x08
+       ldrd    r4, r5, [r0], #0x08
        mov     r6, #0x00
 .Lcksumdata_bigloop:
        pld     [r0, #0x18]
        adds    r2, r2, r6
        adcs    r2, r2, r7
-       ldrd    r6, [r0], #0x08
+       ldrd    r6, r7, [r0], #0x08
        adcs    r2, r2, r4
        adcs    r2, r2, r5
-       ldrd    r4, [r0], #0x08
+       ldrd    r4, r5, [r0], #0x08
        adcs    r2, r2, r6
        adcs    r2, r2, r7
-       ldrd    r6, [r0], #0x08
+       ldrd    r6, r7, [r0], #0x08
        adcs    r2, r2, r4
        adcs    r2, r2, r5
-       ldrd    r4, [r0], #0x08
+       ldrd    r4, r5, [r0], #0x08
        adcs    r2, r2, r6
        adcs    r2, r2, r7
        pld     [r0, #0x18]
-       ldrd    r6, [r0], #0x08
+       ldrd    r6, r7, [r0], #0x08
        adcs    r2, r2, r4
        adcs    r2, r2, r5
-       ldrd    r4, [r0], #0x08
+       ldrd    r4, r5, [r0], #0x08
        adcs    r2, r2, r6
        adcs    r2, r2, r7
-       ldrd    r6, [r0], #0x08
+       ldrd    r6, r7, [r0], #0x08
        adcs    r2, r2, r4
        adcs    r2, r2, r5
        adcs    r2, r2, #0x00
        subs    r1, r1, #0x40
-       ldrdge  r4, [r0], #0x08
+       ldrdge  r4, r5, [r0], #0x08
        bge     .Lcksumdata_bigloop
 
        adds    r2, r2, r6              /* r6/r7 still need summing */
@@ -306,16 +306,16 @@
        cmp     r1, #0x20
 
 #ifdef __XSCALE__
-       ldrdge  r4, [r0], #0x08         /* Avoid stalling pld and result */
+       ldrdge  r4, r5, [r0], #0x08     /* Avoid stalling pld and result */
        blt     .Lcksumdata_less_than_32
        pld     [r0, #0x18]
-       ldrd    r6, [r0], #0x08
+       ldrd    r6, r7, [r0], #0x08
        adds    r2, r2, r4
        adcs    r2, r2, r5
-       ldrd    r4, [r0], #0x08
+       ldrd    r4, r5, [r0], #0x08
        adcs    r2, r2, r6
        adcs    r2, r2, r7
-       ldrd    r6, [r0], #0x08
+       ldrd    r6, r7, [r0], #0x08
        adcs    r2, r2, r4
        adcs    r2, r2, r5
        adcs    r2, r2, r6              /* XXX: Unavoidable result stall */