[src/trunk]: src/sys/arch/powerpc/include Add BookE modifications to cpu_info

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

details:   https://anonhg.NetBSD.org/src/rev/d8d8c533dffd
branches:  trunk
changeset: 752881:d8d8c533dffd
user:      matt <matt%NetBSD.org@localhost>
date:      Tue Mar 09 22:41:03 2010 +0000

description:
Add BookE modifications to cpu_info

diffstat:

 sys/arch/powerpc/include/cpu.h |  17 ++++++++++++++++-
 1 files changed, 16 insertions(+), 1 deletions(-)

diffs (43 lines):

diff -r c61e4800a36c -r d8d8c533dffd sys/arch/powerpc/include/cpu.h
--- a/sys/arch/powerpc/include/cpu.h    Tue Mar 09 22:40:06 2010 +0000
+++ b/sys/arch/powerpc/include/cpu.h    Tue Mar 09 22:41:03 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpu.h,v 1.67 2009/10/24 20:03:56 rmind Exp $   */
+/*     $NetBSD: cpu.h,v 1.68 2010/03/09 22:41:03 matt Exp $    */
 
 /*
  * Copyright (C) 1999 Wolfgang Solfrank.
@@ -78,11 +78,14 @@
        int ci_intrdepth;
        int ci_mtx_oldspl;
        int ci_mtx_count;
+#ifndef PPC_BOOKE
        char *ci_intstk;
+#endif
 #define        CPUSAVE_LEN     8
        register_t ci_tempsave[CPUSAVE_LEN];
        register_t ci_ddbsave[CPUSAVE_LEN];
        register_t ci_ipkdbsave[CPUSAVE_LEN];
+#ifndef PPC_BOOKE
 #define        CPUSAVE_R28     0               /* where r28 gets saved */
 #define        CPUSAVE_R29     1               /* where r29 gets saved */
 #define        CPUSAVE_R30     2               /* where r30 gets saved */
@@ -93,6 +96,18 @@
 #define        CPUSAVE_SRR1    7               /* where SRR1 gets saved */
 #define        DISISAVE_LEN    4
        register_t ci_disisave[DISISAVE_LEN];
+#else
+#define        CPUSAVE_R26     0               /* where r26 gets saved */
+#define        CPUSAVE_R27     1               /* where r27 gets saved */
+#define        CPUSAVE_R28     2               /* where r28 gets saved */
+#define        CPUSAVE_R29     3               /* where r29 gets saved */
+#define        CPUSAVE_R30     4               /* where r30 gets saved */
+#define        CPUSAVE_R31     5               /* where r31 gets saved */
+       register_t ci_critsave[CPUSAVE_LEN];
+       register_t ci_mchksave[CPUSAVE_LEN];
+       struct pmap_segtab *ci_pmap_kern_segtab;
+       struct pmap_segtab *ci_pmap_user_segtab;
+#endif
        struct cache_info ci_ci;                
        void *ci_sysmon_cookie;
        void (*ci_idlespin)(void);