Mirror of the gdb-patches mailing list
 help / color / mirror / Atom feed
* [PATCH][SH] reformat regs command
@ 2005-11-16 16:34 Andrew STUBBS
  2005-12-06 10:53 ` Andrew STUBBS
  2006-02-20 17:20 ` Daniel Jacobowitz
  0 siblings, 2 replies; 6+ messages in thread
From: Andrew STUBBS @ 2005-11-16 16:34 UTC (permalink / raw)
  To: gdb-patches

[-- Attachment #1: Type: text/plain, Size: 1685 bytes --]

Hi,

The attached patch does not change the behaviour of the debugger in any 
way, but merely improves the layout of (both the code and) output from 
the SH specific 'regs' command.

This is in response to a complaint (from a customer) that it was very 
hard to read.

E.g.

Before

PC=00000000 SR=00000000 PR=00000000 MACH=00000000 MACHL=00000000
GBR=00000000 VBR=00000000 SSR=00000000 SPC=00000000 FPUL=00000000 
FPSCR=00000000
R0-R7  00000000 00000000 00000000 00000000 00000000 00000000 00000000 
00000000
R8-R15 00000000 00000000 00000000 00000000 00000000 00000000 00000000 
00000000
FP0-FP7  00000000 00000000 00000000 00000000 00000000 00000000 00000000 
00000000
FP8-FP15 00000000 00000000 00000000 00000000 00000000 00000000 00000000 
00000000

After

       PC 00000000       SR 00000000       PR 00000000     MACH 00000000
      GBR 00000000      VBR 00000000                       MACL 00000000
      SSR 00000000      SPC 00000000     FPUL 00000000    FPSCR 00000000
R0-R7    00000000 00000000 00000000 00000000 00000000 00000000 00000000 
00000000
R8-R15   00000000 00000000 00000000 00000000 00000000 00000000 00000000 
00000000
FP0-FP7  00000000 00000000 00000000 00000000 00000000 00000000 00000000 
00000000
FP8-FP15 00000000 00000000 00000000 00000000 00000000 00000000 00000000 
00000000

If you don't have a format=flowed mail reader that probably got wrapped 
- it requires 80 columns (and always has) - but you get the idea.

BTW SH folks, while I was testing this I discovered that the sh2a 
support (in which I have no real interest) doesn't work - not with the 
simulator anyway - I get a segmentation fault when I try to read the 
registers.

Andrew Stubbs

[-- Attachment #2: sh_regs_command.patch --]
[-- Type: text/plain, Size: 26974 bytes --]

2005-11-16  Andrew Stubbs  <andrew.stubbs@st.com>

	* sh-tdep.c (sh_generic_show_regs): Reformat both code and output.
	(sh3_show_regs, sh2e_show_regs, sh2a_show_regs): Likewise.
	(sh2a_nofpu_show_regs, sh3e_show_regs, sh3_dsp_show_regs): Likewise.
	(sh4_show_regs, sh4_nofpu_show_regs, sh_dsp_show_regs): Likewise.


Index: src/gdb/sh-tdep.c
===================================================================
--- src.orig/gdb/sh-tdep.c	2005-11-04 11:50:40.000000000 +0000
+++ src/gdb/sh-tdep.c	2005-11-04 14:20:18.000000000 +0000
@@ -1316,24 +1316,25 @@ sh_return_value_fpu (struct gdbarch *gdb
 static void
 sh_generic_show_regs (void)
 {
-  printf_filtered ("PC=%s SR=%08lx PR=%08lx MACH=%08lx MACHL=%08lx\n",
+  printf_filtered ("      PC %s       SR %08lx       PR %08lx     MACH %08lx\n",
 		   paddr (read_register (PC_REGNUM)),
 		   (long) read_register (SR_REGNUM),
 		   (long) read_register (PR_REGNUM),
-		   (long) read_register (MACH_REGNUM),
-		   (long) read_register (MACL_REGNUM));
+		   (long) read_register (MACH_REGNUM));
 
-  printf_filtered ("GBR=%08lx VBR=%08lx",
+  printf_filtered (
+	"     GBR %08lx      VBR %08lx                       MACL %08lx\n",
 		   (long) read_register (GBR_REGNUM),
-		   (long) read_register (VBR_REGNUM));
+		   (long) read_register (VBR_REGNUM),
+		   (long) read_register (MACL_REGNUM));
 
   printf_filtered
-    ("\nR0-R7  %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
+    ("R0-R7    %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
      (long) read_register (0), (long) read_register (1),
      (long) read_register (2), (long) read_register (3),
      (long) read_register (4), (long) read_register (5),
      (long) read_register (6), (long) read_register (7));
-  printf_filtered ("R8-R15 %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
+  printf_filtered ("R8-R15   %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
 		   (long) read_register (8), (long) read_register (9),
 		   (long) read_register (10), (long) read_register (11),
 		   (long) read_register (12), (long) read_register (13),
@@ -1343,27 +1344,28 @@ sh_generic_show_regs (void)
 static void
 sh3_show_regs (void)
 {
-  printf_filtered ("PC=%s SR=%08lx PR=%08lx MACH=%08lx MACHL=%08lx\n",
+  printf_filtered ("      PC %s       SR %08lx       PR %08lx     MACH %08lx\n",
 		   paddr (read_register (PC_REGNUM)),
 		   (long) read_register (SR_REGNUM),
 		   (long) read_register (PR_REGNUM),
-		   (long) read_register (MACH_REGNUM),
-		   (long) read_register (MACL_REGNUM));
+		   (long) read_register (MACH_REGNUM));
 
-  printf_filtered ("GBR=%08lx VBR=%08lx",
+  printf_filtered (
+	"     GBR %08lx      VBR %08lx                       MACL %08lx\n",
 		   (long) read_register (GBR_REGNUM),
-		   (long) read_register (VBR_REGNUM));
-  printf_filtered (" SSR=%08lx SPC=%08lx",
+		   (long) read_register (VBR_REGNUM),
+		   (long) read_register (MACL_REGNUM));
+  printf_filtered ("     SSR %08lx      SPC %08lx\n",
 		   (long) read_register (SSR_REGNUM),
 		   (long) read_register (SPC_REGNUM));
 
   printf_filtered
-    ("\nR0-R7  %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
+    ("R0-R7    %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
      (long) read_register (0), (long) read_register (1),
      (long) read_register (2), (long) read_register (3),
      (long) read_register (4), (long) read_register (5),
      (long) read_register (6), (long) read_register (7));
-  printf_filtered ("R8-R15 %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
+  printf_filtered ("R8-R15   %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
 		   (long) read_register (8), (long) read_register (9),
 		   (long) read_register (10), (long) read_register (11),
 		   (long) read_register (12), (long) read_register (13),
@@ -1374,70 +1376,93 @@ sh3_show_regs (void)
 static void
 sh2e_show_regs (void)
 {
-  printf_filtered ("PC=%s SR=%08lx PR=%08lx MACH=%08lx MACHL=%08lx\n",
+  printf_filtered ("      PC %s       SR %08lx       PR %08lx     MACH %08lx\n",
 		   paddr (read_register (PC_REGNUM)),
 		   (long) read_register (SR_REGNUM),
 		   (long) read_register (PR_REGNUM),
-		   (long) read_register (MACH_REGNUM),
-		   (long) read_register (MACL_REGNUM));
+		   (long) read_register (MACH_REGNUM));
 
-  printf_filtered ("GBR=%08lx VBR=%08lx",
+  printf_filtered (
+	"     GBR %08lx      VBR %08lx                       MACL %08lx\n",
 		   (long) read_register (GBR_REGNUM),
-		   (long) read_register (VBR_REGNUM));
-  printf_filtered (" FPUL=%08lx FPSCR=%08lx",
+		   (long) read_register (VBR_REGNUM),
+		   (long) read_register (MACL_REGNUM));
+  printf_filtered (
+	"     SSR %08lx      SPC %08lx     FPUL %08lx    FPSCR %08lx\n",
+		   (long) read_register (SSR_REGNUM),
+		   (long) read_register (SPC_REGNUM),
 		   (long) read_register (FPUL_REGNUM),
 		   (long) read_register (FPSCR_REGNUM));
 
   printf_filtered
-    ("\nR0-R7  %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
+    ("R0-R7    %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
      (long) read_register (0), (long) read_register (1),
      (long) read_register (2), (long) read_register (3),
      (long) read_register (4), (long) read_register (5),
      (long) read_register (6), (long) read_register (7));
-  printf_filtered ("R8-R15 %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
+  printf_filtered ("R8-R15   %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
 		   (long) read_register (8), (long) read_register (9),
 		   (long) read_register (10), (long) read_register (11),
 		   (long) read_register (12), (long) read_register (13),
 		   (long) read_register (14), (long) read_register (15));
 
-  printf_filtered (("FP0-FP7  %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n"), (long) read_register (FP0_REGNUM + 0), (long) read_register (FP0_REGNUM + 1), (long) read_register (FP0_REGNUM + 2), (long) read_register (FP0_REGNUM + 3), (long) read_register (FP0_REGNUM + 4), (long) read_register (FP0_REGNUM + 5), (long) read_register (FP0_REGNUM + 6), (long) read_register (FP0_REGNUM + 7));
-  printf_filtered (("FP8-FP15 %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n"), (long) read_register (FP0_REGNUM + 8), (long) read_register (FP0_REGNUM + 9), (long) read_register (FP0_REGNUM + 10), (long) read_register (FP0_REGNUM + 11), (long) read_register (FP0_REGNUM + 12), (long) read_register (FP0_REGNUM + 13), (long) read_register (FP0_REGNUM + 14), (long) read_register (FP0_REGNUM + 15));
+  printf_filtered ("FP0-FP7  %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
+		   (long) read_register (FP0_REGNUM + 0),
+		   (long) read_register (FP0_REGNUM + 1),
+		   (long) read_register (FP0_REGNUM + 2),
+		   (long) read_register (FP0_REGNUM + 3),
+		   (long) read_register (FP0_REGNUM + 4),
+		   (long) read_register (FP0_REGNUM + 5),
+		   (long) read_register (FP0_REGNUM + 6),
+		   (long) read_register (FP0_REGNUM + 7));
+  printf_filtered ("FP8-FP15 %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
+		   (long) read_register (FP0_REGNUM + 8),
+		   (long) read_register (FP0_REGNUM + 9),
+		   (long) read_register (FP0_REGNUM + 10),
+		   (long) read_register (FP0_REGNUM + 11),
+		   (long) read_register (FP0_REGNUM + 12),
+		   (long) read_register (FP0_REGNUM + 13),
+		   (long) read_register (FP0_REGNUM + 14),
+		   (long) read_register (FP0_REGNUM + 15));
 }
 
 static void
 sh2a_show_regs (void)
 {
   int pr = read_register (FPSCR_REGNUM) & 0x80000;
-  printf_filtered ("PC=%s SR=%08lx PR=%08lx MACH=%08lx MACHL=%08lx\n",
+  printf_filtered ("      PC %s       SR %08lx       PR %08lx     MACH %08lx\n",
 		   paddr (read_register (PC_REGNUM)),
 		   (long) read_register (SR_REGNUM),
 		   (long) read_register (PR_REGNUM),
-		   (long) read_register (MACH_REGNUM),
-		   (long) read_register (MACL_REGNUM));
+		   (long) read_register (MACH_REGNUM));
 
-  printf_filtered ("GBR=%08lx VBR=%08lx TBR=%08lx",
+  printf_filtered (
+	"     GBR %08lx      VBR %08lx      TBR %08lx     MACL %08lx\n",
 		   (long) read_register (GBR_REGNUM),
 		   (long) read_register (VBR_REGNUM),
-		   (long) read_register (TBR_REGNUM));
-  printf_filtered (" FPUL=%08lx FPSCR=%08lx\n",
+		   (long) read_register (TBR_REGNUM),
+		   (long) read_register (MACL_REGNUM));
+  printf_filtered (
+	"     SSR %08lx      SPC %08lx     FPUL %08lx    FPSCR %08lx\n",
+		   (long) read_register (SSR_REGNUM),
+		   (long) read_register (SPC_REGNUM),
 		   (long) read_register (FPUL_REGNUM),
 		   (long) read_register (FPSCR_REGNUM));
 
-  printf_filtered ("R0-R7  %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
+  printf_filtered ("R0-R7    %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
 		   (long) read_register (0), (long) read_register (1),
 		   (long) read_register (2), (long) read_register (3),
 		   (long) read_register (4), (long) read_register (5),
 		   (long) read_register (6), (long) read_register (7));
-  printf_filtered ("R8-R15 %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
+  printf_filtered ("R8-R15   %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
 		   (long) read_register (8), (long) read_register (9),
 		   (long) read_register (10), (long) read_register (11),
 		   (long) read_register (12), (long) read_register (13),
 		   (long) read_register (14), (long) read_register (15));
 
-  printf_filtered ((pr
-		    ? "DR0-DR6  %08lx%08lx %08lx%08lx %08lx%08lx %08lx%08lx\n"
-		    :
-		    "FP0-FP7  %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n"),
+  printf_filtered (
+	(pr ? "DR0-DR6  %08lx%08lx  %08lx%08lx  %08lx%08lx  %08lx%08lx\n"
+	    : "FP0-FP7  %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n"),
 		   (long) read_register (FP0_REGNUM + 0),
 		   (long) read_register (FP0_REGNUM + 1),
 		   (long) read_register (FP0_REGNUM + 2),
@@ -1446,9 +1471,9 @@ sh2a_show_regs (void)
 		   (long) read_register (FP0_REGNUM + 5),
 		   (long) read_register (FP0_REGNUM + 6),
 		   (long) read_register (FP0_REGNUM + 7));
-  printf_filtered ((pr ?
-		    "DR8-DR14 %08lx%08lx %08lx%08lx %08lx%08lx %08lx%08lx\n" :
-		    "FP8-FP15 %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n"),
+  printf_filtered (
+	(pr ? "DR8-DR14 %08lx%08lx  %08lx%08lx  %08lx%08lx  %08lx%08lx\n"
+	    : "FP8-FP15 %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n"),
 		   (long) read_register (FP0_REGNUM + 8),
 		   (long) read_register (FP0_REGNUM + 9),
 		   (long) read_register (FP0_REGNUM + 10),
@@ -1458,7 +1483,8 @@ sh2a_show_regs (void)
 		   (long) read_register (FP0_REGNUM + 14),
 		   (long) read_register (FP0_REGNUM + 15));
   printf_filtered ("BANK=%-3d\n", (int) read_register (BANK_REGNUM));
-  printf_filtered ("R0b - R7b  %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
+  printf_filtered (
+	"R0b-R7b  %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
 		   (long) read_register (R0_BANK0_REGNUM + 0),
 		   (long) read_register (R0_BANK0_REGNUM + 1),
 		   (long) read_register (R0_BANK0_REGNUM + 2),
@@ -1467,7 +1493,7 @@ sh2a_show_regs (void)
 		   (long) read_register (R0_BANK0_REGNUM + 5),
 		   (long) read_register (R0_BANK0_REGNUM + 6),
 		   (long) read_register (R0_BANK0_REGNUM + 7));
-  printf_filtered ("R8b - R14b %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
+  printf_filtered ("R8b-R14b %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
 		   (long) read_register (R0_BANK0_REGNUM + 8),
 		   (long) read_register (R0_BANK0_REGNUM + 9),
 		   (long) read_register (R0_BANK0_REGNUM + 10),
@@ -1487,34 +1513,39 @@ static void
 sh2a_nofpu_show_regs (void)
 {
   int pr = read_register (FPSCR_REGNUM) & 0x80000;
-  printf_filtered ("PC=%s SR=%08lx PR=%08lx MACH=%08lx MACHL=%08lx\n",
+  printf_filtered ("      PC %s       SR %08lx       PR %08lx     MACH %08lx\n",
 		   paddr (read_register (PC_REGNUM)),
 		   (long) read_register (SR_REGNUM),
 		   (long) read_register (PR_REGNUM),
-		   (long) read_register (MACH_REGNUM),
-		   (long) read_register (MACL_REGNUM));
+		   (long) read_register (MACH_REGNUM));
 
-  printf_filtered ("GBR=%08lx VBR=%08lx TBR=%08lx",
+  printf_filtered (
+	"     GBR %08lx      VBR %08lx      TBR %08lx     MACL %08lx\n",
 		   (long) read_register (GBR_REGNUM),
 		   (long) read_register (VBR_REGNUM),
-		   (long) read_register (TBR_REGNUM));
-  printf_filtered (" FPUL=%08lx FPSCR=%08lx\n",
+		   (long) read_register (TBR_REGNUM),
+		   (long) read_register (MACL_REGNUM));
+  printf_filtered (
+	"     SSR %08lx      SPC %08lx     FPUL %08lx    FPSCR %08lx\n",
+		   (long) read_register (SSR_REGNUM),
+		   (long) read_register (SPC_REGNUM),
 		   (long) read_register (FPUL_REGNUM),
 		   (long) read_register (FPSCR_REGNUM));
 
-  printf_filtered ("R0-R7  %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
+  printf_filtered ("R0-R7    %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
 		   (long) read_register (0), (long) read_register (1),
 		   (long) read_register (2), (long) read_register (3),
 		   (long) read_register (4), (long) read_register (5),
 		   (long) read_register (6), (long) read_register (7));
-  printf_filtered ("R8-R15 %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
+  printf_filtered ("R8-R15   %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
 		   (long) read_register (8), (long) read_register (9),
 		   (long) read_register (10), (long) read_register (11),
 		   (long) read_register (12), (long) read_register (13),
 		   (long) read_register (14), (long) read_register (15));
 
   printf_filtered ("BANK=%-3d\n", (int) read_register (BANK_REGNUM));
-  printf_filtered ("R0b - R7b  %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
+  printf_filtered (
+	"R0b-R7b  %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
 		   (long) read_register (R0_BANK0_REGNUM + 0),
 		   (long) read_register (R0_BANK0_REGNUM + 1),
 		   (long) read_register (R0_BANK0_REGNUM + 2),
@@ -1523,7 +1554,7 @@ sh2a_nofpu_show_regs (void)
 		   (long) read_register (R0_BANK0_REGNUM + 5),
 		   (long) read_register (R0_BANK0_REGNUM + 6),
 		   (long) read_register (R0_BANK0_REGNUM + 7));
-  printf_filtered ("R8b - R14b %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
+  printf_filtered ("R8b-R14b %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
 		   (long) read_register (R0_BANK0_REGNUM + 8),
 		   (long) read_register (R0_BANK0_REGNUM + 9),
 		   (long) read_register (R0_BANK0_REGNUM + 10),
@@ -1542,66 +1573,83 @@ sh2a_nofpu_show_regs (void)
 static void
 sh3e_show_regs (void)
 {
-  printf_filtered ("PC=%s SR=%08lx PR=%08lx MACH=%08lx MACHL=%08lx\n",
+  printf_filtered ("      PC %s       SR %08lx       PR %08lx     MACH %08lx\n",
 		   paddr (read_register (PC_REGNUM)),
 		   (long) read_register (SR_REGNUM),
 		   (long) read_register (PR_REGNUM),
-		   (long) read_register (MACH_REGNUM),
-		   (long) read_register (MACL_REGNUM));
+		   (long) read_register (MACH_REGNUM));
 
-  printf_filtered ("GBR=%08lx VBR=%08lx",
+  printf_filtered (
+	"     GBR %08lx      VBR %08lx                       MACL %08lx\n",
 		   (long) read_register (GBR_REGNUM),
-		   (long) read_register (VBR_REGNUM));
-  printf_filtered (" SSR=%08lx SPC=%08lx",
+		   (long) read_register (VBR_REGNUM),
+		   (long) read_register (MACL_REGNUM));
+  printf_filtered (
+	"     SSR %08lx      SPC %08lx     FPUL %08lx    FPSCR %08lx\n",
 		   (long) read_register (SSR_REGNUM),
-		   (long) read_register (SPC_REGNUM));
-  printf_filtered (" FPUL=%08lx FPSCR=%08lx",
+		   (long) read_register (SPC_REGNUM),
 		   (long) read_register (FPUL_REGNUM),
 		   (long) read_register (FPSCR_REGNUM));
 
   printf_filtered
-    ("\nR0-R7  %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
+    ("R0-R7    %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
      (long) read_register (0), (long) read_register (1),
      (long) read_register (2), (long) read_register (3),
      (long) read_register (4), (long) read_register (5),
      (long) read_register (6), (long) read_register (7));
-  printf_filtered ("R8-R15 %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
+  printf_filtered ("R8-R15   %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
 		   (long) read_register (8), (long) read_register (9),
 		   (long) read_register (10), (long) read_register (11),
 		   (long) read_register (12), (long) read_register (13),
 		   (long) read_register (14), (long) read_register (15));
 
-  printf_filtered (("FP0-FP7  %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n"), (long) read_register (FP0_REGNUM + 0), (long) read_register (FP0_REGNUM + 1), (long) read_register (FP0_REGNUM + 2), (long) read_register (FP0_REGNUM + 3), (long) read_register (FP0_REGNUM + 4), (long) read_register (FP0_REGNUM + 5), (long) read_register (FP0_REGNUM + 6), (long) read_register (FP0_REGNUM + 7));
-  printf_filtered (("FP8-FP15 %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n"), (long) read_register (FP0_REGNUM + 8), (long) read_register (FP0_REGNUM + 9), (long) read_register (FP0_REGNUM + 10), (long) read_register (FP0_REGNUM + 11), (long) read_register (FP0_REGNUM + 12), (long) read_register (FP0_REGNUM + 13), (long) read_register (FP0_REGNUM + 14), (long) read_register (FP0_REGNUM + 15));
+  printf_filtered ("FP0-FP7  %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
+		   (long) read_register (FP0_REGNUM + 0),
+		   (long) read_register (FP0_REGNUM + 1),
+		   (long) read_register (FP0_REGNUM + 2),
+		   (long) read_register (FP0_REGNUM + 3),
+		   (long) read_register (FP0_REGNUM + 4),
+		   (long) read_register (FP0_REGNUM + 5),
+		   (long) read_register (FP0_REGNUM + 6),
+		   (long) read_register (FP0_REGNUM + 7));
+  printf_filtered ("FP8-FP15 %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
+		   (long) read_register (FP0_REGNUM + 8),
+		   (long) read_register (FP0_REGNUM + 9),
+		   (long) read_register (FP0_REGNUM + 10),
+		   (long) read_register (FP0_REGNUM + 11),
+		   (long) read_register (FP0_REGNUM + 12),
+		   (long) read_register (FP0_REGNUM + 13),
+		   (long) read_register (FP0_REGNUM + 14),
+		   (long) read_register (FP0_REGNUM + 15));
 }
 
 static void
 sh3_dsp_show_regs (void)
 {
-  printf_filtered ("PC=%s SR=%08lx PR=%08lx MACH=%08lx MACHL=%08lx\n",
+  printf_filtered ("      PC %s       SR %08lx       PR %08lx     MACH %08lx\n",
 		   paddr (read_register (PC_REGNUM)),
 		   (long) read_register (SR_REGNUM),
 		   (long) read_register (PR_REGNUM),
-		   (long) read_register (MACH_REGNUM),
-		   (long) read_register (MACL_REGNUM));
+		   (long) read_register (MACH_REGNUM));
 
-  printf_filtered ("GBR=%08lx VBR=%08lx",
+  printf_filtered (
+	"     GBR %08lx      VBR %08lx                       MACL %08lx\n",
 		   (long) read_register (GBR_REGNUM),
-		   (long) read_register (VBR_REGNUM));
+		   (long) read_register (VBR_REGNUM),
+		   (long) read_register (MACL_REGNUM));
 
-  printf_filtered (" SSR=%08lx SPC=%08lx",
+  printf_filtered ("     SSR %08lx      SPC %08lx      DSR %08lx\n",
 		   (long) read_register (SSR_REGNUM),
-		   (long) read_register (SPC_REGNUM));
-
-  printf_filtered (" DSR=%08lx", (long) read_register (DSR_REGNUM));
+		   (long) read_register (SPC_REGNUM),
+		   (long) read_register (DSR_REGNUM));
 
   printf_filtered
-    ("\nR0-R7  %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
+    ("R0-R7    %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
      (long) read_register (0), (long) read_register (1),
      (long) read_register (2), (long) read_register (3),
      (long) read_register (4), (long) read_register (5),
      (long) read_register (6), (long) read_register (7));
-  printf_filtered ("R8-R15 %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
+  printf_filtered ("R8-R15   %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
 		   (long) read_register (8), (long) read_register (9),
 		   (long) read_register (10), (long) read_register (11),
 		   (long) read_register (12), (long) read_register (13),
@@ -1626,39 +1674,38 @@ static void
 sh4_show_regs (void)
 {
   int pr = read_register (FPSCR_REGNUM) & 0x80000;
-  printf_filtered ("PC=%s SR=%08lx PR=%08lx MACH=%08lx MACHL=%08lx\n",
+  printf_filtered ("      PC %s       SR %08lx       PR %08lx     MACH %08lx\n",
 		   paddr (read_register (PC_REGNUM)),
 		   (long) read_register (SR_REGNUM),
 		   (long) read_register (PR_REGNUM),
-		   (long) read_register (MACH_REGNUM),
-		   (long) read_register (MACL_REGNUM));
+		   (long) read_register (MACH_REGNUM));
 
-  printf_filtered ("GBR=%08lx VBR=%08lx",
+  printf_filtered (
+	"     GBR %08lx      VBR %08lx                       MACL %08lx\n",
 		   (long) read_register (GBR_REGNUM),
-		   (long) read_register (VBR_REGNUM));
-  printf_filtered (" SSR=%08lx SPC=%08lx",
+		   (long) read_register (VBR_REGNUM),
+		   (long) read_register (MACL_REGNUM));
+  printf_filtered (
+	"     SSR %08lx      SPC %08lx     FPUL %08lx    FPSCR %08lx\n",
 		   (long) read_register (SSR_REGNUM),
-		   (long) read_register (SPC_REGNUM));
-  printf_filtered (" FPUL=%08lx FPSCR=%08lx",
+		   (long) read_register (SPC_REGNUM),
 		   (long) read_register (FPUL_REGNUM),
 		   (long) read_register (FPSCR_REGNUM));
 
-  printf_filtered
-    ("\nR0-R7  %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
-     (long) read_register (0), (long) read_register (1),
-     (long) read_register (2), (long) read_register (3),
-     (long) read_register (4), (long) read_register (5),
-     (long) read_register (6), (long) read_register (7));
-  printf_filtered ("R8-R15 %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
+  printf_filtered ("R0-R7    %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
+     		   (long) read_register (0), (long) read_register (1),
+     		   (long) read_register (2), (long) read_register (3),
+     		   (long) read_register (4), (long) read_register (5),
+     		   (long) read_register (6), (long) read_register (7));
+  printf_filtered ("R8-R15   %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
 		   (long) read_register (8), (long) read_register (9),
 		   (long) read_register (10), (long) read_register (11),
 		   (long) read_register (12), (long) read_register (13),
 		   (long) read_register (14), (long) read_register (15));
 
-  printf_filtered ((pr
-		    ? "DR0-DR6  %08lx%08lx %08lx%08lx %08lx%08lx %08lx%08lx\n"
-		    :
-		    "FP0-FP7  %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n"),
+  printf_filtered (
+	(pr ? "DR0-DR6  %08lx%08lx  %08lx%08lx  %08lx%08lx  %08lx%08lx\n"
+	    : "FP0-FP7  %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n"),
 		   (long) read_register (FP0_REGNUM + 0),
 		   (long) read_register (FP0_REGNUM + 1),
 		   (long) read_register (FP0_REGNUM + 2),
@@ -1667,9 +1714,9 @@ sh4_show_regs (void)
 		   (long) read_register (FP0_REGNUM + 5),
 		   (long) read_register (FP0_REGNUM + 6),
 		   (long) read_register (FP0_REGNUM + 7));
-  printf_filtered ((pr ?
-		    "DR8-DR14 %08lx%08lx %08lx%08lx %08lx%08lx %08lx%08lx\n" :
-		    "FP8-FP15 %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n"),
+  printf_filtered (
+	(pr ? "DR8-DR14 %08lx%08lx  %08lx%08lx  %08lx%08lx  %08lx%08lx\n"
+	    : "FP8-FP15 %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n"),
 		   (long) read_register (FP0_REGNUM + 8),
 		   (long) read_register (FP0_REGNUM + 9),
 		   (long) read_register (FP0_REGNUM + 10),
@@ -1683,27 +1730,30 @@ sh4_show_regs (void)
 static void
 sh4_nofpu_show_regs (void)
 {
-  printf_filtered ("PC=%s SR=%08lx PR=%08lx MACH=%08lx MACHL=%08lx\n",
+  printf_filtered ("      PC %s       SR %08lx       PR %08lx     MACH %08lx\n",
 		   paddr (read_register (PC_REGNUM)),
 		   (long) read_register (SR_REGNUM),
 		   (long) read_register (PR_REGNUM),
-		   (long) read_register (MACH_REGNUM),
-		   (long) read_register (MACL_REGNUM));
+		   (long) read_register (MACH_REGNUM));
 
-  printf_filtered ("GBR=%08lx VBR=%08lx",
+  printf_filtered (
+	"     GBR %08lx      VBR %08lx                       MACL %08lx\n",
 		   (long) read_register (GBR_REGNUM),
-		   (long) read_register (VBR_REGNUM));
-  printf_filtered (" SSR=%08lx SPC=%08lx",
+		   (long) read_register (VBR_REGNUM),
+		   (long) read_register (MACL_REGNUM));
+  printf_filtered (
+	"     SSR %08lx      SPC %08lx     FPUL %08lx    FPSCR %08lx\n",
 		   (long) read_register (SSR_REGNUM),
-		   (long) read_register (SPC_REGNUM));
+		   (long) read_register (SPC_REGNUM),
+		   (long) read_register (FPUL_REGNUM),
+		   (long) read_register (FPSCR_REGNUM));
 
-  printf_filtered
-    ("\nR0-R7  %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
-     (long) read_register (0), (long) read_register (1),
-     (long) read_register (2), (long) read_register (3),
-     (long) read_register (4), (long) read_register (5),
-     (long) read_register (6), (long) read_register (7));
-  printf_filtered ("R8-R15 %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
+  printf_filtered ("R0-R7    %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
+     		   (long) read_register (0), (long) read_register (1),
+     		   (long) read_register (2), (long) read_register (3),
+     		   (long) read_register (4), (long) read_register (5),
+     		   (long) read_register (6), (long) read_register (7));
+  printf_filtered ("R8-R15   %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
 		   (long) read_register (8), (long) read_register (9),
 		   (long) read_register (10), (long) read_register (11),
 		   (long) read_register (12), (long) read_register (13),
@@ -1713,26 +1763,27 @@ sh4_nofpu_show_regs (void)
 static void
 sh_dsp_show_regs (void)
 {
-  printf_filtered ("PC=%s SR=%08lx PR=%08lx MACH=%08lx MACHL=%08lx\n",
+
+  printf_filtered ("      PC %s       SR %08lx       PR %08lx     MACH %08lx\n",
 		   paddr (read_register (PC_REGNUM)),
 		   (long) read_register (SR_REGNUM),
 		   (long) read_register (PR_REGNUM),
-		   (long) read_register (MACH_REGNUM),
-		   (long) read_register (MACL_REGNUM));
+		   (long) read_register (MACH_REGNUM));
 
-  printf_filtered ("GBR=%08lx VBR=%08lx",
+  printf_filtered (
+	"     GBR %08lx      VBR %08lx      DSR %08lx     MACL %08lx\n",
 		   (long) read_register (GBR_REGNUM),
-		   (long) read_register (VBR_REGNUM));
-
-  printf_filtered (" DSR=%08lx", (long) read_register (DSR_REGNUM));
+		   (long) read_register (VBR_REGNUM),
+		   (long) read_register (DSR_REGNUM),
+		   (long) read_register (MACL_REGNUM));
 
   printf_filtered
-    ("\nR0-R7  %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
+    ("R0-R7    %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
      (long) read_register (0), (long) read_register (1),
      (long) read_register (2), (long) read_register (3),
      (long) read_register (4), (long) read_register (5),
      (long) read_register (6), (long) read_register (7));
-  printf_filtered ("R8-R15 %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
+  printf_filtered ("R8-R15   %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
 		   (long) read_register (8), (long) read_register (9),
 		   (long) read_register (10), (long) read_register (11),
 		   (long) read_register (12), (long) read_register (13),

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH][SH] reformat regs command
  2005-11-16 16:34 [PATCH][SH] reformat regs command Andrew STUBBS
@ 2005-12-06 10:53 ` Andrew STUBBS
  2005-12-06 18:10   ` Mark Kettenis
  2006-02-20 17:20 ` Daniel Jacobowitz
  1 sibling, 1 reply; 6+ messages in thread
From: Andrew STUBBS @ 2005-12-06 10:53 UTC (permalink / raw)
  To: Andrew Stubbs; +Cc: gdb-patches

Andrew Stubbs wrote:
> Hi,
> 
> The attached patch does not change the behaviour of the debugger in any 
> way, but merely improves the layout of (both the code and) output from 
> the SH specific 'regs' command.

This patch does nothing but tidy up the code and output.

May I commit?

Andrew Stubbs


^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH][SH] reformat regs command
  2005-12-06 10:53 ` Andrew STUBBS
@ 2005-12-06 18:10   ` Mark Kettenis
  2005-12-06 20:25     ` Andrew STUBBS
  0 siblings, 1 reply; 6+ messages in thread
From: Mark Kettenis @ 2005-12-06 18:10 UTC (permalink / raw)
  To: andrew.stubbs; +Cc: andrew.stubbs, gdb-patches

> Date: Mon, 05 Dec 2005 16:54:21 +0000
> From: Andrew STUBBS <andrew.stubbs@st.com>
> 
> Andrew Stubbs wrote:
> > Hi,
> > 
> > The attached patch does not change the behaviour of the debugger in any 
> > way, but merely improves the layout of (both the code and) output from 
> > the SH specific 'regs' command.
> 
> This patch does nothing but tidy up the code and output.
> 
> May I commit?
> 

Huh?  I thought you removed the SH-specific regs command a some days
ago.

Mark


^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH][SH] reformat regs command
  2005-12-06 18:10   ` Mark Kettenis
@ 2005-12-06 20:25     ` Andrew STUBBS
  0 siblings, 0 replies; 6+ messages in thread
From: Andrew STUBBS @ 2005-12-06 20:25 UTC (permalink / raw)
  To: Mark Kettenis; +Cc: gdb-patches

Mark Kettenis wrote:
> Huh?  I thought you removed the SH-specific regs command a some days
> ago.

No, I removed the SH specific implementation of 'info registers' command.

This is the really SH specific 'regs' command (no info).

It does the same sort of thing but much more compact and entirely in hex.

I can see why you were confused.


^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH][SH] reformat regs command
  2005-11-16 16:34 [PATCH][SH] reformat regs command Andrew STUBBS
  2005-12-06 10:53 ` Andrew STUBBS
@ 2006-02-20 17:20 ` Daniel Jacobowitz
  2006-02-21 18:23   ` Andrew STUBBS
  1 sibling, 1 reply; 6+ messages in thread
From: Daniel Jacobowitz @ 2006-02-20 17:20 UTC (permalink / raw)
  To: Andrew STUBBS; +Cc: gdb-patches

On Wed, Nov 16, 2005 at 03:10:13PM +0000, Andrew STUBBS wrote:
> 2005-11-16  Andrew Stubbs  <andrew.stubbs@st.com>
> 
> 	* sh-tdep.c (sh_generic_show_regs): Reformat both code and output.
> 	(sh3_show_regs, sh2e_show_regs, sh2a_show_regs): Likewise.
> 	(sh2a_nofpu_show_regs, sh3e_show_regs, sh3_dsp_show_regs): Likewise.
> 	(sh4_show_regs, sh4_nofpu_show_regs, sh_dsp_show_regs): Likewise.

OK.  I'm not entirely sure how useful this code is, but what the heck.

-- 
Daniel Jacobowitz
CodeSourcery


^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH][SH] reformat regs command
  2006-02-20 17:20 ` Daniel Jacobowitz
@ 2006-02-21 18:23   ` Andrew STUBBS
  0 siblings, 0 replies; 6+ messages in thread
From: Andrew STUBBS @ 2006-02-21 18:23 UTC (permalink / raw)
  To: gdb-patches

Daniel Jacobowitz wrote:
> On Wed, Nov 16, 2005 at 03:10:13PM +0000, Andrew STUBBS wrote:
>> 2005-11-16  Andrew Stubbs  <andrew.stubbs@st.com>
>>
>> 	* sh-tdep.c (sh_generic_show_regs): Reformat both code and output.
>> 	(sh3_show_regs, sh2e_show_regs, sh2a_show_regs): Likewise.
>> 	(sh2a_nofpu_show_regs, sh3e_show_regs, sh3_dsp_show_regs): Likewise.
>> 	(sh4_show_regs, sh4_nofpu_show_regs, sh_dsp_show_regs): Likewise.
> 
> OK.  I'm not entirely sure how useful this code is, but what the heck.
> 

It's a little more compact than the alternative. Whatever, customers use 
it and complain about the format.

Thanks, committed.

Andrew


^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2006-02-21 16:10 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2005-11-16 16:34 [PATCH][SH] reformat regs command Andrew STUBBS
2005-12-06 10:53 ` Andrew STUBBS
2005-12-06 18:10   ` Mark Kettenis
2005-12-06 20:25     ` Andrew STUBBS
2006-02-20 17:20 ` Daniel Jacobowitz
2006-02-21 18:23   ` Andrew STUBBS

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox