[src/trunk]: src/sys/arch/powerpc Move the DSISR SPR bit definitions from <po...

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

details:   https://anonhg.NetBSD.org/src/rev/161fe18b2260
branches:  trunk
changeset: 511401:161fe18b2260
user:      simonb <simonb%NetBSD.org@localhost>
date:      Tue Jun 19 07:14:23 2001 +0000

description:
Move the DSISR SPR bit definitions from <powerpc/mpc6xx/pte.h> to
<powerpc/spr.h>.  Remove unused ISI/SRR1 bit definitions.

diffstat:

 sys/arch/powerpc/include/mpc6xx/pte.h |  27 +--------------------------
 sys/arch/powerpc/include/spr.h        |   8 ++++++++
 sys/arch/powerpc/powerpc/trap.c       |   3 ++-
 3 files changed, 11 insertions(+), 27 deletions(-)

diffs (74 lines):

diff -r ca24aba2634f -r 161fe18b2260 sys/arch/powerpc/include/mpc6xx/pte.h
--- a/sys/arch/powerpc/include/mpc6xx/pte.h     Tue Jun 19 03:25:16 2001 +0000
+++ b/sys/arch/powerpc/include/mpc6xx/pte.h     Tue Jun 19 07:14:23 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pte.h,v 1.2 2001/06/15 18:26:06 matt Exp $     */
+/*     $NetBSD: pte.h,v 1.3 2001/06/19 07:14:24 simonb Exp $   */
 
 /*-
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -77,29 +77,4 @@
 #define        ADDR_API_SHFT   22
 #define        ADDR_POFF       0x00000fff
 
-/*
- * Bits in DSISR:
- */
-#define        DSISR_DIRECT    0x80000000
-#define        DSISR_NOTFOUND  0x40000000
-#define        DSISR_PROTECT   0x08000000
-#define        DSISR_INVRX     0x04000000
-#define        DSISR_STORE     0x02000000
-#define        DSISR_DABR      0x00400000
-#define        DSISR_SEGMENT   0x00200000
-#define        DSISR_EAR       0x00100000
-
-/*
- * Bits in SRR1 on ISI:
- */
-#define        ISSRR1_NOTFOUND 0x40000000
-#define        ISSRR1_DIRECT   0x10000000
-#define        ISSRR1_PROTECT  0x08000000
-#define        ISSRR1_SEGMENT  0x00200000
-
-#ifdef _KERNEL
-#ifndef        _LOCORE
-extern u_int dsisr __P((void));
-#endif /* _KERNEL */
-#endif /* _LOCORE */
 #endif /* _MPC6XX_PTE_H_ */
diff -r ca24aba2634f -r 161fe18b2260 sys/arch/powerpc/include/spr.h
--- a/sys/arch/powerpc/include/spr.h    Tue Jun 19 03:25:16 2001 +0000
+++ b/sys/arch/powerpc/include/spr.h    Tue Jun 19 07:14:23 2001 +0000
@@ -22,6 +22,14 @@
 #define        SPR_LR                  0x008   /* 468 Link Register */
 #define        SPR_CTR                 0x009   /* 468 Count Register */
 #define        SPR_DSISR               0x012   /* .68 DSI exception source */
+#define          DSISR_DIRECT            0x80000000 /* Direct-store error exception */
+#define          DSISR_NOTFOUND          0x40000000 /* Translation not found */
+#define          DSISR_PROTECT           0x08000000 /* Memory access not permitted */
+#define          DSISR_INVRX             0x04000000 /* Reserve-indexed insn direct-store access */
+#define          DSISR_STORE             0x02000000 /* Store operation */
+#define          DSISR_DABR              0x00400000 /* DABR match */
+#define          DSISR_SEGMENT           0x00200000 /* XXX; not in 6xx PEM */
+#define          DSISR_EAR               0x00100000 /* eciwx/ecowx && EAR[E] == 0 */
 #define        SPR_DAR                 0x013   /* .68 Data Address Register */
 #define        SPR_DEC                 0x016   /* .68 DECrementer register */
 #define        SPR_SDR1                0x019   /* .68 Page table base address register */
diff -r ca24aba2634f -r 161fe18b2260 sys/arch/powerpc/powerpc/trap.c
--- a/sys/arch/powerpc/powerpc/trap.c   Tue Jun 19 03:25:16 2001 +0000
+++ b/sys/arch/powerpc/powerpc/trap.c   Tue Jun 19 07:14:23 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: trap.c,v 1.46 2001/06/10 16:31:59 tsubai Exp $ */
+/*     $NetBSD: trap.c,v 1.47 2001/06/19 07:14:24 simonb Exp $ */
 
 /*
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -56,6 +56,7 @@
 #include <machine/pmap.h>
 #include <machine/psl.h>
 #include <machine/trap.h>
+#include <powerpc/spr.h>
 
 /* These definitions should probably be somewhere else                 XXX */
 #define        FIRSTARG        3               /* first argument is in reg 3 */