patch-2.3.9 linux/arch/ppc/xmon/xmon.c

• Lines: 37
• Date: Mon Jun 28 13:40:39 1999
• Orig file: v2.3.8/linux/arch/ppc/xmon/xmon.c
• Orig date: Mon Jun 7 12:11:51 1999

diff -u --recursive --new-file v2.3.8/linux/arch/ppc/xmon/xmon.c linux/arch/ppc/xmon/xmon.c
@@ -91,7 +91,6 @@
 static char *help_string = "\
 Commands:\n\
   d	dump bytes\n\
-  dc	dump characters\n\
   di	dump instructions\n\
   df	dump float values\n\
   dd	dump double values\n\
@@ -518,7 +517,7 @@
 {
 	printf("vector: %x at pc = %x, msr = %x, sp = %x [%x]\n",
 	       fp->trap, fp->nip, fp->msr, fp->gpr[1], fp);
-	if ((fp->trap == 0x300) || (fp->trap == 0x600) || (fp->trap == 0x200))
+	if (fp->trap == 0x300 || fp->trap == 0x600)
 		printf("dar = %x, dsisr = %x\n", fp->dar, fp->dsisr);
 	if (current)
 		printf("current = %x, pid = %d, comm = %s\n",
@@ -991,15 +990,16 @@
 	return c;
 }
 
-#define isxdigit(c)	('0' <= (c) && (c) <= '9' || 'a' <= (c) && (c) <= 'f' \
-			 || 'A' <= (c) && (c) <= 'F')
+#define isxdigit(c)	(('0' <= (c) && (c) <= '9') \
+			 || ('a' <= (c) && (c) <= 'f') \
+			 || ('A' <= (c) && (c) <= 'F'))
 void
 dump()
 {
 	int c;
 
 	c = inchar();
-	if ((isxdigit(c) && (c != 'f') && (c != 'd')) || (c == '\n'))
+	if ((isxdigit(c) && c != 'f' && c != 'd') || c == '\n')
 		termch = c;
 	scanhex(&adrs);
 	if( termch != '\n')