X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=arch%2Fparisc%2Fkernel%2Ftraps.c;h=ff200608c851d5ef948908ff8b1b38f6fe2e56f2;hb=9464c7cf61b9433057924c36e6e02f303a00e768;hp=77b28cb8aca6f1cecab831f219308c787869e729;hpb=41689045f6a3cbe0550e1d34e9cc20d2e8c432ba;p=linux-2.6.git

diff --git a/arch/parisc/kernel/traps.c b/arch/parisc/kernel/traps.c
index 77b28cb8a..ff200608c 100644
--- a/arch/parisc/kernel/traps.c
+++ b/arch/parisc/kernel/traps.c
@@ -10,6 +10,7 @@
  * state in 'asm.s'.
  */
 
+#include <linux/config.h>
 #include <linux/sched.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
@@ -65,42 +66,57 @@ int printbinary(char *buf, unsigned long x, int nbits)
 #else
 #define RFMT "%08lx"
 #endif
-#define FFMT "%016llx"	/* fpregs are 64-bit always */
 
-#define PRINTREGS(lvl,r,f,fmt,x)	\
-	printk("%s%s%02d-%02d  " fmt " " fmt " " fmt " " fmt "\n",	\
-		lvl, f, (x), (x+3), (r)[(x)+0], (r)[(x)+1],		\
-		(r)[(x)+2], (r)[(x)+3])
-
-static void print_gr(char *level, struct pt_regs *regs)
+void show_regs(struct pt_regs *regs)
 {
 	int i;
-	char buf[64];
+	char buf[128], *p;
+	char *level;
+	unsigned long cr30;
+	unsigned long cr31;
+	/* carlos says that gcc understands better memory in a struct,
+	 * and it makes our life easier with fpregs -- T-Bone */
+	struct { u32 sw[2]; } s;
+	
+	level = user_mode(regs) ? KERN_DEBUG : KERN_CRIT;
+
+	printk("%s\n", level); /* don't want to have that pretty register dump messed up */
 
-	printk("%s\n", level);
 	printk("%s     YZrvWESTHLNXBCVMcbcbcbcbOGFRQPDI\n", level);
 	printbinary(buf, regs->gr[0], 32);
 	printk("%sPSW: %s %s\n", level, buf, print_tainted());
 
-	for (i = 0; i < 32; i += 4)
-		PRINTREGS(level, regs->gr, "r", RFMT, i);
-}
+	for (i = 0; i < 32; i += 4) {
+		int j;
+		p = buf;
+		p += sprintf(p, "%sr%02d-%02d ", level, i, i + 3);
+		for (j = 0; j < 4; j++) {
+			p += sprintf(p, " " RFMT, (i+j) == 0 ? 0 : regs->gr[i + j]);
+		}
+		printk("%s\n", buf);
+	}
 
-static void print_fr(char *level, struct pt_regs *regs)
-{
-	int i;
-	char buf[64];
-	struct { u32 sw[2]; } s;
+	for (i = 0; i < 8; i += 4) {
+		int j;
+		p = buf;
+		p += sprintf(p, "%ssr%d-%d  ", level, i, i + 3);
+		for (j = 0; j < 4; j++) {
+			p += sprintf(p, " " RFMT, regs->sr[i + j]);
+		}
+		printk("%s\n", buf);
+	}
 
 	/* FR are 64bit everywhere. Need to use asm to get the content
 	 * of fpsr/fper1, and we assume that we won't have a FP Identify
 	 * in our way, otherwise we're screwed.
 	 * The fldd is used to restore the T-bit if there was one, as the
 	 * store clears it anyway.
-	 * PA2.0 book says "thou shall not use fstw on FPSR/FPERs" - T-Bone */
-	asm volatile ("fstd %%fr0,0(%1)	\n\t"
-		      "fldd 0(%1),%%fr0	\n\t"
-		      : "=m" (s) : "r" (&s) : "r0");
+	 * BTW, PA2.0 book says "thou shall not use fstw on FPSR/FPERs". */ 
+	__asm__ (
+		"fstd %%fr0,0(%1)	\n\t"
+		"fldd 0(%1),%%fr0	\n\t"
+		: "=m" (s) : "r" (&s) : "%r0"
+		);
 
 	printk("%s\n", level);
 	printk("%s      VZOUICununcqcqcqcqcqcrmunTDVZOUI\n", level);
@@ -109,25 +125,14 @@ static void print_fr(char *level, struct pt_regs *regs)
 	printk("%sFPER1: %08x\n", level, s.sw[1]);
 
 	/* here we'll print fr0 again, tho it'll be meaningless */
-	for (i = 0; i < 32; i += 4)
-		PRINTREGS(level, regs->fr, "fr", FFMT, i);
-}
-
-void show_regs(struct pt_regs *regs)
-{
-	int i;
-	char *level;
-	unsigned long cr30, cr31;
-
-	level = user_mode(regs) ? KERN_DEBUG : KERN_CRIT;
-
-	print_gr(level, regs);
-
-	for (i = 0; i < 8; i += 4)
-		PRINTREGS(level, regs->sr, "sr", RFMT, i);
-
-	if (user_mode(regs))
-		print_fr(level, regs);
+	for (i = 0; i < 32; i += 4) {
+		int j;
+		p = buf;
+		p += sprintf(p, "%sfr%02d-%02d ", level, i, i + 3);
+		for (j = 0; j < 4; j++)
+			p += sprintf(p, " %016llx", (i+j) == 0 ? 0 : regs->fr[i+j]);
+		printk("%s\n", buf);
+	}
 
 	cr30 = mfctl(30);
 	cr31 = mfctl(31);