Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/powerpc/powerpc cmpl wants four operands, so use th...



details:   https://anonhg.NetBSD.org/src/rev/96a0503e429e
branches:  trunk
changeset: 797819:96a0503e429e
user:      joerg <joerg%NetBSD.org@localhost>
date:      Tue Jul 29 16:19:45 2014 +0000

description:
cmpl wants four operands, so use the shorter cmplw instead.

diffstat:

 sys/arch/powerpc/powerpc/pio_subr.S  |  44 ++++++++++++++++++------------------
 sys/arch/powerpc/powerpc/trap_subr.S |   8 +++---
 2 files changed, 26 insertions(+), 26 deletions(-)

diffs (234 lines):

diff -r 2e54a61bd134 -r 96a0503e429e sys/arch/powerpc/powerpc/pio_subr.S
--- a/sys/arch/powerpc/powerpc/pio_subr.S       Tue Jul 29 15:48:22 2014 +0000
+++ b/sys/arch/powerpc/powerpc/pio_subr.S       Tue Jul 29 16:19:45 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pio_subr.S,v 1.15 2014/02/28 05:39:49 matt Exp $       */
+/*     $NetBSD: pio_subr.S,v 1.16 2014/07/29 16:19:45 joerg Exp $      */
 
 /*
  * Copyright (c) 2003 Matt Thomas
@@ -331,7 +331,7 @@
        addi    %r4,%r4,-1      /* pre-decrement */
 1:     lbzu    %r0,1(%r4)      /* load and increment */
        stb     %r0,0(%r3)      /* store */
-       cmpl    0,%r4,%r5       /* at the end? */
+       cmplw   %r4,%r5         /* at the end? */
        bne+    1b              /*   nope, do another pass */
        eieio                   /* memory barrier (reorder protection) */
        DBGSYNC                 /* force exceptions */
@@ -357,7 +357,7 @@
        addi    %r4,%r4,-2      /* pre-decrement */
 1:     lhzu    %r0,2(%r4)      /* load and increment */
        sth     %r0,0(%r3)      /* store */
-       cmpl    0,%r4,%r5       /* at the end? */
+       cmplw   %r4,%r5         /* at the end? */
        bne+    1b              /*   nope, do another pass */
        eieio                   /* memory barrier (reorder protection) */
        DBGSYNC                 /* force exceptions */
@@ -383,7 +383,7 @@
        addi    %r4,%r4,-4      /* pre-decrement */
 1:     lwzu    %r0,4(%r4)      /* load and increment */
        stw     %r0,0(%r3)      /* store */
-       cmpl    0,%r4,%r5       /* at the end? */
+       cmplw   %r4,%r5         /* at the end? */
        bne+    1b              /*   nope, do another pass */
        eieio                   /* memory barrier (reorder protection) */
        DBGSYNC                 /* force exceptions */
@@ -409,7 +409,7 @@
        addi    %r4,%r4,-4      /* pre-decrement */
 1:     ldu     %r0,4(%r4)      /* load and increment */
        std     %r0,0(%r3)      /* store */
-       cmpl    0,%r4,%r5       /* at the end? */
+       cmplw   %r4,%r5         /* at the end? */
        bne+    1b              /*   nope, do another pass */
        eieio                   /* memory barrier (reorder protection) */
        DBGSYNC                 /* force exceptions */
@@ -440,7 +440,7 @@
        addi    %r4,%r4,-2      /* pre-decrement */
 1:     lwzu    %r0,2(%r4)      /* load and increment */
        sthbrx  %r0,0,%r3       /* store (byte-reversed) */
-       cmpl    0,%r4,%r5       /* at the end? */
+       cmplw   %r4,%r5         /* at the end? */
        bne+    1b              /*   nope, do another pass */
        eieio                   /* memory barrier (reorder protection) */
        DBGSYNC                 /* force exceptions */
@@ -466,7 +466,7 @@
        addi    %r4,%r4,-4      /* pre-decrement */
 1:     lwzu    %r0,4(%r4)      /* load and increment */
        stwbrx  %r0,0,%r3       /* store (byte-reversed) */
-       cmpl    0,%r4,%r5       /* at the end? */
+       cmplw   %r4,%r5         /* at the end? */
        bne+    1b              /*   nope, do another pass */
        eieio                   /* memory barrier (reorder protection) */
        DBGSYNC                 /* force exceptions */
@@ -497,7 +497,7 @@
        addi    %r4,%r4,-1      /* pre-decrement */
 1:     lbz     %r0,0(%r3)      /* load value */
        stbu    %r0,1(%r4)      /* store and increment */
-       cmpl    0,%r4,%r5       /* at the end? */
+       cmplw   %r4,%r5         /* at the end? */
        bne+    1b              /*   nope, do another pass */
        eieio                   /* memory barrier (reorder protection) */
        DBGSYNC                 /* force exceptions */
@@ -523,7 +523,7 @@
        addi    %r4,%r4,-2      /* pre-decrement */
 1:     lhz     %r0,0(%r3)      /* load value */
        sthu    %r0,2(%r4)      /* store and increment */
-       cmpl    0,%r4,%r5       /* at the end? */
+       cmplw   %r4,%r5         /* at the end? */
        bne+    1b              /*   nope, do another pass */
        eieio                   /* memory barrier (reorder protection) */
        DBGSYNC                 /* force exceptions */
@@ -549,7 +549,7 @@
        addi    %r4,%r4,-4      /* pre-decrement */
 1:     lwz     %r0,0(%r3)      /* load value */
        stwu    %r0,4(%r4)      /* store and increment */
-       cmpl    0,%r4,%r5       /* at the end? */
+       cmplw   %r4,%r5         /* at the end? */
        bne+    1b              /*   nope, do another pass */
        eieio                   /* memory barrier (reorder protection) */
        DBGSYNC                 /* force exceptions */
@@ -580,7 +580,7 @@
        addi    %r4,%r4,-2      /* pre-decrement */
 1:     lhbrx   %r0,0,%r3       /* load value (byte reversed) */
        sthu    %r0,2(%r4)      /* store and increment */
-       cmpl    0,%r4,%r5       /* at the end? */
+       cmplw   %r4,%r5         /* at the end? */
        bne+    1b              /*   nope, do another pass */
        eieio                   /* memory barrier (reorder protection) */
        DBGSYNC                 /* force exceptions */
@@ -605,7 +605,7 @@
        addi    %r4,%r4,-4      /* pre-decrement */
 1:     lwbrx   %r0,0,%r3       /* load value (byte reversed) */
        stwu    %r0,4(%r4)      /* store and increment */
-       cmpl    0,%r4,%r5       /* at the end? */
+       cmplw   %r4,%r5         /* at the end? */
        bne+    1b              /*   nope, do another pass */
        eieio                   /* memory barrier (reorder protection) */
        DBGSYNC                 /* force exceptions */
@@ -637,7 +637,7 @@
        sub     %r3,%r3,%r8
 1:     lbzu    %r0,1(%r6)      /* load and increment */
        stbux   %r0,%r3,%r8     /* store and add distance */
-       cmpl    0,%r6,%r7       /* at the end? */
+       cmplw   %r6,%r7         /* at the end? */
        bne+    1b              /*   nope, do another pass */
        eieio                   /* memory barrier (reorder protection) */
        DBGSYNC                 /* force exceptions */
@@ -664,7 +664,7 @@
        sub     %r3,%r3,%r8
 1:     lhzu    %r0,2(%r6)      /* load and increment */
        sthux   %r0,%r3,%r8     /* store and add distance */
-       cmpl    0,%r6,%r7       /* at the end? */
+       cmplw   %r6,%r7         /* at the end? */
        bne+    1b              /*   nope, do another pass */
        eieio                   /* memory barrier (reorder protection) */
        DBGSYNC                 /* force exceptions */
@@ -691,7 +691,7 @@
 1:     lhzu    %r0,2(%r6)      /* load and increment */
        sthbrx  %r0,0,%r3       /* store (reversed) */
        add     %r3,%r3,%r8     /* dst += distance */
-       cmpl    0,%r6,%r7       /* at the end? */
+       cmplw   %r6,%r7         /* at the end? */
        bne+    1b              /*   nope, do another pass */
        eieio                   /* memory barrier (reorder protection) */
        DBGSYNC                 /* force exceptions */
@@ -718,7 +718,7 @@
        sub     %r3,%r3,%r8
 1:     lwzu    %r0,4(%r6)      /* load and increment */
        stwux   %r0,%r3,%r8     /* store and add distance */
-       cmpl    0,%r6,%r7       /* at the end? */
+       cmplw   %r6,%r7         /* at the end? */
        bne+    1b              /*   nope, do another pass */
        eieio                   /* memory barrier (reorder protection) */
        DBGSYNC                 /* force exceptions */
@@ -745,7 +745,7 @@
 1:     lwzu    %r0,4(%r6)      /* load and increment */
        stwbrx  %r0,0,%r3       /* store (reversed) */
        add     %r3,%r3,%r8     /* dst += distance */
-       cmpl    0,%r6,%r7       /* at the end? */
+       cmplw   %r6,%r7         /* at the end? */
        bne+    1b              /*   nope, do another pass */
        eieio                   /* memory barrier (reorder protection) */
        DBGSYNC                 /* force exceptions */
@@ -783,7 +783,7 @@
        sub     %r3,%r3,%r8
 1:     lbzux   %r0,%r3,%r8     /* load value and add distance */
        stbu    %r0,1(%r6)      /* store and increment */
-       cmpl    0,%r6,%r7       /* at the end? */
+       cmplw   %r6,%r7         /* at the end? */
        bne+    1b              /*   nope, do another pass */
        eieio                   /* memory barrier (reorder protection) */
        DBGSYNC                 /* force exceptions */
@@ -810,7 +810,7 @@
        sub     %r3,%r3,%r8
 1:     lhzux   %r0,%r3,%r8     /* load value and add distance */
        sthu    %r0,2(%r6)      /* store and increment */
-       cmpl    0,%r6,%r7       /* at the end? */
+       cmplw   %r6,%r7         /* at the end? */
        bne+    1b              /*   nope, do another pass */
        eieio                   /* memory barrier (reorder protection) */
        DBGSYNC                 /* force exceptions */
@@ -837,7 +837,7 @@
 1:     lhbrx   %r0,0,%r3       /* load value (reversed) */
        add     %r3,%r3,%r8     /* src += distance */
        sthu    %r0,2(%r6)      /* store and increment */
-       cmpl    0,%r6,%r7       /* at the end? */
+       cmplw   %r6,%r7         /* at the end? */
        bne+    1b              /*   nope, do another pass */
        eieio                   /* memory barrier (reorder protection) */
        DBGSYNC                 /* force exceptions */
@@ -864,7 +864,7 @@
        sub     %r3,%r3,%r8
 1:     lwzux   %r0,%r3,%r8     /* load value and add distance */
        stwu    %r0,4(%r6)      /* store and increment */
-       cmpl    0,%r6,%r7       /* at the end? */
+       cmplw   %r6,%r7         /* at the end? */
        bne+    1b              /*   nope, do another pass */
        eieio                   /* memory barrier (reorder protection) */
        DBGSYNC                 /* force exceptions */
@@ -892,7 +892,7 @@
 1:     lwbrx   %r0,0,%r3       /* load value (reversed) */
        add     %r3,%r3,%r8     /* src += distance */
        sthu    %r0,4(%r6)      /* store and increment */
-       cmpl    0,%r6,%r7       /* at the end? */
+       cmplw   %r6,%r7         /* at the end? */
        bne+    1b              /*   nope, do another pass */
        eieio                   /* memory barrier (reorder protection) */
        DBGSYNC                 /* force exceptions */
diff -r 2e54a61bd134 -r 96a0503e429e sys/arch/powerpc/powerpc/trap_subr.S
--- a/sys/arch/powerpc/powerpc/trap_subr.S      Tue Jul 29 15:48:22 2014 +0000
+++ b/sys/arch/powerpc/powerpc/trap_subr.S      Tue Jul 29 16:19:45 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: trap_subr.S,v 1.77 2013/08/23 06:24:21 matt Exp $      */
+/*     $NetBSD: trap_subr.S,v 1.78 2014/07/29 16:19:45 joerg Exp $     */
 
 /*
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -489,7 +489,7 @@
        mtctr   %r1                     /* load counter */
 2:
        ldregu  %r1,8(%r2)              /* get next pte */
-       cmpl    %cr0,%r1,%r3            /* see if found pte */
+       cmplw   %r1,%r3                 /* see if found pte */
        bdneq   2b                      /* loop if not eq */
        bne     3f                      /* not found */
        ldreg   %r1,4(%r2)              /* load tlb entry lower word */
@@ -550,7 +550,7 @@
        mtctr   %r1                     /* load counter */
 2:
        ldregu  %r1,8(%r2)              /* get next pte */
-       cmpl    %cr0,%r1,%r3            /* see if found pte */
+       cmplw   %r1,%r3                 /* see if found pte */
        bdneq   2b                      /* loop if not eq */
        bne     3f                      /* not found */
        ldreg   %r1,4(%r2)              /* load tlb entry lower word */
@@ -606,7 +606,7 @@
        mtctr   %r1                     /* load counter */
 2:
        ldregu  %r1,8(%r2)              /* get next pte */
-       cmpl    %cr0,%r1,%r3            /* see if found pte */
+       cmplw   %r1,%r3                 /* see if found pte */
        bdneq   2b                      /* loop if not eq */
        bne     3f                      /* not found */
        ldreg   %r1,4(%r2)              /* load tlb entry lower word */



Home | Main Index | Thread Index | Old Index