Fix problems pointed out by Andrew Cagney,

These didn't seem to have adverse effects, but were wrong.

diff --git a/sys/arch/powerpc/powerpc/locore.S b/sys/arch/powerpc/powerpc/locore.S
index 801cad1..a37b872 100644 (file)
--- a/sys/arch/powerpc/powerpc/locore.S
+++ b/sys/arch/powerpc/powerpc/locore.S
@@ -1,4 +1,4 @@
-/*     $OpenBSD: locore.S,v 1.2 1996/12/28 06:22:03 rahnds Exp $       */
+/*     $OpenBSD: locore.S,v 1.3 1997/01/21 17:00:09 rahnds Exp $       */
 /*     $NetBSD: locore.S,v 1.2 1996/10/16 19:33:09 ws Exp $    */
 
 /*
@@ -1003,7 +1003,7 @@ s_isitrap:
        stw     30,32(1);               /* saved XER */                 \
        lmw     28,tempsave(0);         /* restore r28-r31 */           \
        mfctr   6;                                                      \
-       li      5,_C_LABEL(intr_depth)@ha;                              \
+       lis     5,_C_LABEL(intr_depth)@ha;                              \
        lwz     5,_C_LABEL(intr_depth)@l(5);                            \
        mfsrr0  4;                                                      \
        mfsrr1  3;                                                      \

diff --git a/sys/arch/powerpc/powerpc/pmap.c b/sys/arch/powerpc/powerpc/pmap.c
index 68ff3c2..9818cf0 100644 (file)
--- a/sys/arch/powerpc/powerpc/pmap.c
+++ b/sys/arch/powerpc/powerpc/pmap.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: pmap.c,v 1.4 1997/01/09 21:19:02 rahnds Exp $ */
+/*     $OpenBSD: pmap.c,v 1.5 1997/01/21 17:00:10 rahnds Exp $ */
 /*     $NetBSD: pmap.c,v 1.1 1996/09/30 16:34:52 ws Exp $      */
 
 /*
@@ -431,7 +431,7 @@ avail_end = npgs * NBPG;
        for (i = 0; i < 16; i++) {
                pmap_kernel()->pm_sr[i] = EMPTY_SEGMENT;
                asm volatile ("mtsrin %0,%1"
-                             :: "r"(i << ADDR_SR_SHFT), "r"(EMPTY_SEGMENT));
+                             :: "r"(EMPTY_SEGMENT), "r"(i << ADDR_SR_SHFT) );
        }
        pmap_kernel()->pm_sr[KERNEL_SR] = KERNEL_SEGMENT;
        asm volatile ("mtsr %0,%1"