[src/trunk]: src/sys/arch/powerpc/ibm4xx Apply suggested changes from PR port...

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

details:   https://anonhg.NetBSD.org/src/rev/4370972e5826
branches:  trunk
changeset: 569733:4370972e5826
user:      scw <scw%NetBSD.org@localhost>
date:      Thu Sep 02 08:22:58 2004 +0000

description:
Apply suggested changes from PR port-powerpc/24830 arch/powerpc/ibm4xx:
Bad register constraints in copyin(), copyout(), copyinstr(), copyoutstr(),
and delay().

diffstat:

 sys/arch/powerpc/ibm4xx/clock.c      |  6 +++---
 sys/arch/powerpc/ibm4xx/copyinstr.c  |  8 ++++----
 sys/arch/powerpc/ibm4xx/copyoutstr.c |  8 ++++----
 sys/arch/powerpc/ibm4xx/trap.c       |  8 ++++----
 4 files changed, 15 insertions(+), 15 deletions(-)

diffs (121 lines):

diff -r 2a8a4f236a78 -r 4370972e5826 sys/arch/powerpc/ibm4xx/clock.c
--- a/sys/arch/powerpc/ibm4xx/clock.c   Thu Sep 02 02:18:38 2004 +0000
+++ b/sys/arch/powerpc/ibm4xx/clock.c   Thu Sep 02 08:22:58 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: clock.c,v 1.9 2003/07/15 02:54:43 lukem Exp $  */
+/*     $NetBSD: clock.c,v 1.10 2004/09/02 08:22:58 scw Exp $   */
 /*      $OpenBSD: clock.c,v 1.3 1997/10/13 13:42:53 pefo Exp $  */
 
 /*
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.9 2003/07/15 02:54:43 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.10 2004/09/02 08:22:58 scw Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
@@ -209,7 +209,7 @@
            "   cmplw %0,%2     \n"
            "   blt 1b          \n"
            "2:                 \n"
-           : "=r"(scratch) : "r"(tbh), "r"(tbl) : "cr0");
+           : "=&r"(scratch) : "r"(tbh), "r"(tbl) : "cr0");
 }
 
 /*
diff -r 2a8a4f236a78 -r 4370972e5826 sys/arch/powerpc/ibm4xx/copyinstr.c
--- a/sys/arch/powerpc/ibm4xx/copyinstr.c       Thu Sep 02 02:18:38 2004 +0000
+++ b/sys/arch/powerpc/ibm4xx/copyinstr.c       Thu Sep 02 08:22:58 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: copyinstr.c,v 1.5 2003/10/20 05:52:55 simonb Exp $     */
+/*     $NetBSD: copyinstr.c,v 1.6 2004/09/02 08:22:58 scw Exp $        */
 
 /*
  * Copyright 2001 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: copyinstr.c,v 1.5 2003/10/20 05:52:55 simonb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: copyinstr.c,v 1.6 2004/09/02 08:22:58 scw Exp $");
 
 #include <sys/param.h>
 #include <uvm/uvm_extern.h>
@@ -88,8 +88,8 @@
 
                        "mtpid %1; mtmsr %0;"           /* Restore PID, MSR */
                        "sync; isync;"
-                       : "=&r" (msr), "=&r" (pid), "=&r" (tmp), "+r" (len)
-                       : "r" (ctx), "r" (udaddr), "r" (kaddr));
+                       : "=&r" (msr), "=&r" (pid), "=&r" (tmp), "+b" (len)
+                       : "r" (ctx), "b" (udaddr), "b" (kaddr));
        }
        curpcb->pcb_onfault = 0;
        if (done)
diff -r 2a8a4f236a78 -r 4370972e5826 sys/arch/powerpc/ibm4xx/copyoutstr.c
--- a/sys/arch/powerpc/ibm4xx/copyoutstr.c      Thu Sep 02 02:18:38 2004 +0000
+++ b/sys/arch/powerpc/ibm4xx/copyoutstr.c      Thu Sep 02 08:22:58 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: copyoutstr.c,v 1.5 2003/10/20 05:52:55 simonb Exp $    */
+/*     $NetBSD: copyoutstr.c,v 1.6 2004/09/02 08:22:58 scw Exp $       */
 
 /*
  * Copyright 2001 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: copyoutstr.c,v 1.5 2003/10/20 05:52:55 simonb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: copyoutstr.c,v 1.6 2004/09/02 08:22:58 scw Exp $");
 
 #include <sys/param.h>
 #include <uvm/uvm_extern.h>
@@ -88,8 +88,8 @@
 
                        "mtpid %1; mtmsr %0;"           /* Restore PID, MSR */
                        "sync; isync;"
-                       : "=&r" (msr), "=&r" (pid), "=&r" (tmp), "+r" (len)
-                       : "r" (ctx), "r" (udaddr), "r" (kaddr));
+                       : "=&r" (msr), "=&r" (pid), "=&r" (tmp), "+b" (len)
+                       : "r" (ctx), "b" (udaddr), "b" (kaddr));
        }
        curpcb->pcb_onfault = 0;
        if (done)
diff -r 2a8a4f236a78 -r 4370972e5826 sys/arch/powerpc/ibm4xx/trap.c
--- a/sys/arch/powerpc/ibm4xx/trap.c    Thu Sep 02 02:18:38 2004 +0000
+++ b/sys/arch/powerpc/ibm4xx/trap.c    Thu Sep 02 08:22:58 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: trap.c,v 1.22 2004/03/14 01:08:48 cl Exp $     */
+/*     $NetBSD: trap.c,v 1.23 2004/09/02 08:22:58 scw Exp $    */
 
 /*
  * Copyright 2001 Wasabi Systems, Inc.
@@ -67,7 +67,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.22 2004/03/14 01:08:48 cl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.23 2004/09/02 08:22:58 scw Exp $");
 
 #include "opt_altivec.h"
 #include "opt_ddb.h"
@@ -470,7 +470,7 @@
                "2: mtpid %1; mtmsr %0;"        /* Restore PID and MSR */
                "sync; isync;"
                : "=&r" (msr), "=&r" (pid), "=&r" (tmp)
-               : "r" (ctx), "r" (udaddr), "r" (kaddr), "r" (len));
+               : "r" (ctx), "b" (udaddr), "b" (kaddr), "b" (len));
 
        curpcb->pcb_onfault = 0;
        return 0;
@@ -550,7 +550,7 @@
                "2: mtpid %1; mtmsr %0;"        /* Restore PID and MSR */
                "sync; isync;"
                : "=&r" (msr), "=&r" (pid), "=&r" (tmp)
-               : "r" (ctx), "r" (udaddr), "r" (kaddr), "r" (len));
+               : "r" (ctx), "b" (udaddr), "b" (kaddr), "b" (len));
 
        curpcb->pcb_onfault = 0;
        return 0;