From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 5728 invoked by alias); 16 Nov 2005 15:13:47 -0000 Received: (qmail 5522 invoked by uid 22791); 16 Nov 2005 15:13:11 -0000 Received: from lon-del-03.spheriq.net (HELO lon-del-03.spheriq.net) (195.46.50.99) by sourceware.org (qpsmtpd/0.30-dev) with ESMTP; Wed, 16 Nov 2005 15:13:11 +0000 Received: from lon-out-03.spheriq.net ([195.46.50.131]) by lon-del-03.spheriq.net with ESMTP id jAGFD86W005204 for ; Wed, 16 Nov 2005 15:13:08 GMT Received: from lon-cus-02.spheriq.net (lon-cus-02.spheriq.net [195.46.50.38]) by lon-out-03.spheriq.net with ESMTP id jAGFD7X7022809 for ; Wed, 16 Nov 2005 15:13:07 GMT Received: from beta.dmz-eu.st.com (beta.dmz-eu.st.com [164.129.1.35]) by lon-cus-02.spheriq.net with ESMTP id jAGFD5Id027525 (version=TLSv1/SSLv3 cipher=EDH-RSA-DES-CBC3-SHA bits=168 verify=OK) for ; Wed, 16 Nov 2005 15:13:07 GMT Received: from zeta.dmz-eu.st.com (ns2.st.com [164.129.230.9]) by beta.dmz-eu.st.com (STMicroelectronics) with ESMTP id 6ADD7DA47 for ; Wed, 16 Nov 2005 15:13:00 +0000 (GMT) Received: by zeta.dmz-eu.st.com (STMicroelectronics, from userid 60012) id C5B0E4756D; Wed, 16 Nov 2005 15:15:48 +0000 (GMT) Received: from zeta.dmz-eu.st.com (localhost [127.0.0.1]) by zeta.dmz-eu.st.com (STMicroelectronics) with ESMTP id E201475969 for ; Wed, 16 Nov 2005 15:15:47 +0000 (UTC) Received: from mail1.bri.st.com (mail1.bri.st.com [164.129.8.218]) by zeta.dmz-eu.st.com (STMicroelectronics) with ESMTP id 1630047560 for ; Wed, 16 Nov 2005 15:15:47 +0000 (GMT) Received: from [164.129.15.13] (terrorhawk.bri.st.com [164.129.15.13]) by mail1.bri.st.com (MOS 3.5.8-GR) with ESMTP id CGZ37812 (AUTH "andrew stubbs"); Wed, 16 Nov 2005 15:12:46 GMT Message-ID: <437B4BD5.3040807@st.com> Date: Wed, 16 Nov 2005 16:34:00 -0000 From: Andrew STUBBS User-Agent: Mozilla Thunderbird 1.0.2 (Windows/20050317) MIME-Version: 1.0 To: gdb-patches@sources.redhat.com Subject: [PATCH][SH] reformat regs command Content-Type: multipart/mixed; boundary="------------070201090002040305060100" X-O-Spoofed: Not Scanned X-O-General-Status: No X-O-Spam1-Status: Not Scanned X-O-Spam2-Status: Not Scanned X-O-URL-Status: Not Scanned X-O-Virus1-Status: No X-O-Virus2-Status: Not Scanned X-O-Virus3-Status: No X-O-Virus4-Status: No X-O-Virus5-Status: Not Scanned X-O-Image-Status: Not Scanned X-O-Attach-Status: Not Scanned X-SpheriQ-Ver: 4.1.07 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2005-11/txt/msg00233.txt.bz2 This is a multi-part message in MIME format. --------------070201090002040305060100 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Content-length: 1685 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 --------------070201090002040305060100 Content-Type: text/plain; name="sh_regs_command.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="sh_regs_command.patch" Content-length: 26974 2005-11-16 Andrew Stubbs * 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), --------------070201090002040305060100--