2003-02-20 Till Straumann <strauman@slac.stanford.edu>

	PR 349/bsps
	* mpc6xx/exceptions/raw_exception.c, mpc6xx/mmu/bat.c,
	mpc6xx/mmu/pte121.c, shared/include/cpuIdent.c,
	shared/include/cpuIdent.h, shared/src/Makefile.am, shared/src/stack.c,
	shared/src/stackTrace.h, powerpc/registers.h:
	  - undo improper 'fix' who broke mpc604r identification
	  - fix: 7400 identification PVR value was wrong
	  - enhance 'setdbat()' to switch OFF a given BAT if called with 0 size
	  - fix: page table support bugfix
	  - enhancement: provide routines to take and print stack trace
	    snapshots
	  - add definitions for HID1 and DABR SPRs

5 files changed, 54 insertions, 4 deletions

diff --git a/c/src/lib/libcpu/powerpc/shared/include/cpuIdent.c b/c/src/lib/libcpu/powerpc/shared/include/cpuIdent.c
index 7144b1864f..bf2df226a9 100644
--- a/c/src/lib/libcpu/powerpc/shared/include/cpuIdent.c
+++ b/c/src/lib/libcpu/powerpc/shared/include/cpuIdent.c
@@ -33,10 +33,10 @@ char *get_ppc_cpu_type_name(ppc_cpu_id_t cpu)
     case PPC_603:		return "MPC603";
     case PPC_603ev:		return "MPC603ev";
     case PPC_604:		return "MPC604";
-    /* case PPC_604r:		return "MPC604r"; same value as 750 */
     case PPC_750:		return "MPC750";
     case PPC_7400:		return "MPC7400";
     case PPC_604e:		return "MPC604e";
+    case PPC_604r:		return "MPC604r";
     case PPC_620:		return "MPC620";
     case PPC_860:		return "MPC860";
     case PPC_8260:		return "MPC8260";
diff --git a/c/src/lib/libcpu/powerpc/shared/include/cpuIdent.h b/c/src/lib/libcpu/powerpc/shared/include/cpuIdent.h
index e61749067e..f7b9a88399 100644
--- a/c/src/lib/libcpu/powerpc/shared/include/cpuIdent.h
+++ b/c/src/lib/libcpu/powerpc/shared/include/cpuIdent.h
@@ -27,7 +27,7 @@ typedef enum
   PPC_750 = 0x8,
   PPC_604e = 0x9,
   PPC_604r = 0xA,
-  PPC_7400 = 0xA,
+  PPC_7400 = 0xC,
   PPC_620 = 0x16,
   PPC_860 = 0x50,
   PPC_821 = PPC_860,
diff --git a/c/src/lib/libcpu/powerpc/shared/src/Makefile.am b/c/src/lib/libcpu/powerpc/shared/src/Makefile.am
index 784cedd4a9..623a6fad80 100644
--- a/c/src/lib/libcpu/powerpc/shared/src/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/shared/src/Makefile.am
@@ -5,12 +5,12 @@
 
 VPATH = @srcdir@:@srcdir@/../../../shared/src
 
-C_FILES = cache.c cache_aligned_malloc.c cache_manager.c
+C_FILES = cache.c cache_aligned_malloc.c cache_manager.c stack.c
 C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
 
 include_libcpudir = $(includedir)/libcpu
 
-include_libcpu_HEADERS = cache_.h cache.h
+include_libcpu_HEADERS = cache_.h cache.h stackTrace.h
 
 OBJS = $(C_O_FILES)
 
diff --git a/c/src/lib/libcpu/powerpc/shared/src/stack.c b/c/src/lib/libcpu/powerpc/shared/src/stack.c
new file mode 100644
index 0000000000..bf97cb53db
--- /dev/null
+++ b/c/src/lib/libcpu/powerpc/shared/src/stack.c
@@ -0,0 +1,42 @@
+#include "stackTrace.h"
+#include <rtems/bspIo.h>
+#include <libcpu/spr.h>
+
+SPR_RO(LR)
+
+typedef struct FrameRec_ {
+	struct FrameRec_ *up;
+	void		 *lr;
+} FrameRec, *Frame;
+
+#define CPU_STACK_TRACE_DEPTH 40
+
+void CPU_stack_take_snapshot(void **stack, int size, void *pc, void *lr, void *r1)
+{
+register Frame	p = (Frame)lr;
+register int	i=0;
+	if (pc) stack[i++]=pc;
+	if (!p)
+		p = (Frame)_read_LR();
+	stack[i++]=p;
+	p = r1;
+	if (!p) /* no macro for reading user regs */
+		__asm__ __volatile__("mr %0, %%r1":"=r"(p));
+	for (; i<size-1 && p->up; p=p->up, i++) {
+		stack[i]=p->up->lr;
+	}
+	stack[i]=0;
+}
+
+void CPU_print_stack(void)
+{
+	void *stck[CPU_STACK_TRACE_DEPTH];
+	int i;
+	CPU_stack_take_snapshot(stck,CPU_STACK_TRACE_DEPTH,0,0,0);
+        for (i=0; stck[i]; i++) {
+                if (i%5) printk("--> ");
+                else     printk("\n");
+                printk("0x%08x",stck[i]);
+	}
+	printk("\n");
+}
diff --git a/c/src/lib/libcpu/powerpc/shared/src/stackTrace.h b/c/src/lib/libcpu/powerpc/shared/src/stackTrace.h
new file mode 100644
index 0000000000..b85b333876
--- /dev/null
+++ b/c/src/lib/libcpu/powerpc/shared/src/stackTrace.h
@@ -0,0 +1,8 @@
+#ifndef CPU_STACK_UTIL_H
+#define CPU_STACK_UTIL_H
+
+void CPU_stack_take_snapshot(void **stack, int size, void *pc, void *lr, void *r1);
+
+void CPU_print_stack(void);
+
+#endif