Module Name: src
Committed By: matt
Date: Tue Mar 9 22:41:03 UTC 2010
Modified Files:
src/sys/arch/powerpc/include: cpu.h
Log Message:
Add BookE modifications to cpu_info
To generate a diff of this commit:
cvs rdiff -u -r1.67 -r1.68 src/sys/arch/powerpc/include/cpu.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/powerpc/include/cpu.h
diff -u src/sys/arch/powerpc/include/cpu.h:1.67 src/sys/arch/powerpc/include/cpu.h:1.68
--- src/sys/arch/powerpc/include/cpu.h:1.67 Sat Oct 24 20:03:56 2009
+++ src/sys/arch/powerpc/include/cpu.h Tue Mar 9 22:41:03 2010
@@ -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);
