[src/trunk]: src/sys/arch/powerpc/ibm4xx Misc non-critical fixes.

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

details:   https://anonhg.NetBSD.org/src/rev/f5d80fc0bdd4
branches:  trunk
changeset: 969899:f5d80fc0bdd4
user:      rin <rin%NetBSD.org@localhost>
date:      Thu Mar 05 01:31:27 2020 +0000

description:
Misc non-critical fixes.

- __asm --> __asm volatile for sure
- turn DEBUG code in __asm into DIAGNOSTIC code in C
- style

diffstat:

 sys/arch/powerpc/ibm4xx/pmap.c |  17 +++++++----------
 1 files changed, 7 insertions(+), 10 deletions(-)

diffs (66 lines):

diff -r 48304649d516 -r f5d80fc0bdd4 sys/arch/powerpc/ibm4xx/pmap.c
--- a/sys/arch/powerpc/ibm4xx/pmap.c    Thu Mar 05 01:21:09 2020 +0000
+++ b/sys/arch/powerpc/ibm4xx/pmap.c    Thu Mar 05 01:31:27 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pmap.c,v 1.80 2020/02/21 13:16:16 rin Exp $    */
+/*     $NetBSD: pmap.c,v 1.81 2020/03/05 01:31:27 rin Exp $    */
 
 /*
  * Copyright 2001 Wasabi Systems, Inc.
@@ -67,7 +67,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.80 2020/02/21 13:16:16 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.81 2020/03/05 01:31:27 rin Exp $");
 
 #include <sys/param.h>
 #include <sys/cpu.h>
@@ -1173,7 +1173,8 @@
                ctx_alloc(pm);
                ctx = pm->pm_ctx;
        }
-       __asm volatile("mfmsr %0;"
+       __asm volatile(
+               "mfmsr %0;"
                "li %1, %7;"
                "andc %1,%0,%1;"
                "mtmsr %1;"
@@ -1207,7 +1208,8 @@
        if (!pid)
                return;
 
-       __asm(  "mfpid %1;"             /* Save PID */
+       __asm volatile(
+               "mfpid %1;"             /* Save PID */
                "mfmsr %2;"             /* Save MSR */
                "li %0,0;"              /* Now clear MSR */
                "mtmsr %0;"
@@ -1225,7 +1227,6 @@
                : "=&r" (i), "=&r" (found), "=&r" (msr)
                : "r" (va), "r" (pid));
        if (found && !TLB_LOCKED(i)) {
-
                /* Now flush translation */
                __asm volatile(
                        "tlbwe %0,%1,0;"
@@ -1308,7 +1309,7 @@
        idx = ppc4xx_tlb_find_victim();
 
 #ifdef DIAGNOSTIC
-       if ((idx < tlb_nreserved) || (idx >= NTLB)) {
+       if ((idx < tlb_nreserved) || (idx >= NTLB) || (idx & 63) == 0) {
                panic("ppc4xx_tlb_enter: replacing entry %ld", idx);
        }
 #endif
@@ -1325,10 +1326,6 @@
                "mfpid %1;"                     /* Save old PID */
                "mtpid %2;"                     /* Load translation ctx */
                "sync; isync;"
-#ifdef DEBUG
-               "andi. %3,%3,63;"
-               "tweqi %3,0;"                   /* XXXXX DEBUG trap on index 0 */
-#endif
                "tlbwe %4,%3,1; tlbwe %5,%3,0;" /* Set TLB */
                "sync; isync;"
                "mtpid %1; mtmsr %0;"           /* Restore PID and MSR */