[SH] regs command
Thomas Schwinge
thomas@codesourcery.com
Wed Jun 6 18:10:00 GMT 2012
Hi!
On Wed, 16 May 2012 18:31:30 +0200, I wrote:
> On Wed, 16 May 2012 07:26:33 -0700, Joel Brobecker <brobecker@adacore.com> wrote:
> > > I therefore propose to remove sh_show_regs_command et al. from sh-tdep.c.
> > > If nobody objects, can it just go silently, or should invoking it then
> > > cause an error message, like »Please use the »info all-registers« command
> > > instead of »regs«.«?
> >
> > Make it an alias of "info reg" or "info all-registers", and make
> > the alias deprecated, so that users get a warning when they use it?
Below is the patch that I finally committed.
> > We can make that command deprecated for 7.5, and then remove it
> > from HEAD after 7.5 is branched, in a few weeks.
I'll prepare a patch for that.
gdb/
* NEWS: Document the deprecation of SH's 'regs' command.
* inferior.h (all_registers_info): Add function declaration.
* sh-tdep.c (sh_show_regs): Remove variable.
(sh_generic_show_regs, sh3_show_regs, sh2e_show_regs, sh2a_show_regs)
(sh2a_nofpu_show_regs, sh3e_show_regs, sh3_dsp_show_regs)
(sh4_show_regs, sh4_nofpu_show_regs, sh_dsp_show_regs)
(sh_show_regs_command): Remove functions.
(sh_gdbarch_init): Don't set sh_show_regs.
(_initialize_sh_tdep): Make the 'regs' command an deprecated alias to
'info all-registers'.
* sh64-tdep.c (sh64_show_media_regs, sh64_show_compact_regs)
(sh64_show_regs): Remove functions.
* sh64-tdep.h (sh64_show_regs): Remove function declaration.
gdb/doc/
* gdb.texinfo: Document the deprecation of SH's 'regs' command.
Index: gdb/NEWS
===================================================================
RCS file: /cvs/src/src/gdb/NEWS,v
retrieving revision 1.526
retrieving revision 1.527
diff -u -p -r1.526 -r1.527
--- gdb/NEWS 24 May 2012 00:33:45 -0000 1.526
+++ gdb/NEWS 6 Jun 2012 18:03:53 -0000 1.527
@@ -161,6 +161,11 @@
corresponding to addresses it prints. This defaults to "on", but
you can set it to "off" to restore GDB's previous behavior.
+* Deprecated commands
+
+ ** For the Renesas Super-H architecture, the "regs" command has been
+ deprecated, and "info all-registers" should be used instead.
+
* New targets
Renesas RL78 rl78-*-elf
Index: gdb/inferior.h
===================================================================
RCS file: /cvs/src/src/gdb/inferior.h,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -p -r1.175 -r1.176
--- gdb/inferior.h 24 May 2012 16:39:09 -0000 1.175
+++ gdb/inferior.h 6 Jun 2012 18:03:53 -0000 1.176
@@ -246,6 +246,8 @@ extern void set_inferior_args (char *);
extern void set_inferior_args_vector (int, char **);
+extern void all_registers_info (char *, int);
+
extern void registers_info (char *, int);
extern void nexti_command (char *, int);
Index: gdb/sh-tdep.c
===================================================================
RCS file: /cvs/src/src/gdb/sh-tdep.c,v
retrieving revision 1.243
retrieving revision 1.244
diff -u -p -r1.243 -r1.244
--- gdb/sh-tdep.c 16 May 2012 14:35:07 -0000 1.243
+++ gdb/sh-tdep.c 6 Jun 2012 18:03:53 -0000 1.244
@@ -69,8 +69,6 @@ static const char *const sh_cc_enum[] =
static const char *sh_active_calling_convention = sh_cc_gcc;
-static void (*sh_show_regs) (struct frame_info *);
-
#define SH_NUM_REGS 67
struct sh_frame_cache
@@ -1431,714 +1429,6 @@ sh_return_value_fpu (struct gdbarch *gdb
return RETURN_VALUE_REGISTER_CONVENTION;
}
-/* Print the registers in a form similar to the E7000. */
-
-static void
-sh_generic_show_regs (struct frame_info *frame)
-{
- printf_filtered
- (" PC %s SR %08lx PR %08lx MACH %08lx\n",
- phex (get_frame_register_unsigned (frame,
- gdbarch_pc_regnum
- (get_frame_arch (frame))), 4),
- (long) get_frame_register_unsigned (frame, SR_REGNUM),
- (long) get_frame_register_unsigned (frame, PR_REGNUM),
- (long) get_frame_register_unsigned (frame, MACH_REGNUM));
-
- printf_filtered
- (" GBR %08lx VBR %08lx MACL %08lx\n",
- (long) get_frame_register_unsigned (frame, GBR_REGNUM),
- (long) get_frame_register_unsigned (frame, VBR_REGNUM),
- (long) get_frame_register_unsigned (frame, MACL_REGNUM));
-
- printf_filtered
- ("R0-R7 %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
- (long) get_frame_register_unsigned (frame, 0),
- (long) get_frame_register_unsigned (frame, 1),
- (long) get_frame_register_unsigned (frame, 2),
- (long) get_frame_register_unsigned (frame, 3),
- (long) get_frame_register_unsigned (frame, 4),
- (long) get_frame_register_unsigned (frame, 5),
- (long) get_frame_register_unsigned (frame, 6),
- (long) get_frame_register_unsigned (frame, 7));
- printf_filtered
- ("R8-R15 %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
- (long) get_frame_register_unsigned (frame, 8),
- (long) get_frame_register_unsigned (frame, 9),
- (long) get_frame_register_unsigned (frame, 10),
- (long) get_frame_register_unsigned (frame, 11),
- (long) get_frame_register_unsigned (frame, 12),
- (long) get_frame_register_unsigned (frame, 13),
- (long) get_frame_register_unsigned (frame, 14),
- (long) get_frame_register_unsigned (frame, 15));
-}
-
-static void
-sh3_show_regs (struct frame_info *frame)
-{
- printf_filtered
- (" PC %s SR %08lx PR %08lx MACH %08lx\n",
- phex (get_frame_register_unsigned (frame,
- gdbarch_pc_regnum
- (get_frame_arch (frame))), 4),
- (long) get_frame_register_unsigned (frame, SR_REGNUM),
- (long) get_frame_register_unsigned (frame, PR_REGNUM),
- (long) get_frame_register_unsigned (frame, MACH_REGNUM));
-
- printf_filtered
- (" GBR %08lx VBR %08lx MACL %08lx\n",
- (long) get_frame_register_unsigned (frame, GBR_REGNUM),
- (long) get_frame_register_unsigned (frame, VBR_REGNUM),
- (long) get_frame_register_unsigned (frame, MACL_REGNUM));
- printf_filtered
- (" SSR %08lx SPC %08lx\n",
- (long) get_frame_register_unsigned (frame, SSR_REGNUM),
- (long) get_frame_register_unsigned (frame, SPC_REGNUM));
-
- printf_filtered
- ("R0-R7 %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
- (long) get_frame_register_unsigned (frame, 0),
- (long) get_frame_register_unsigned (frame, 1),
- (long) get_frame_register_unsigned (frame, 2),
- (long) get_frame_register_unsigned (frame, 3),
- (long) get_frame_register_unsigned (frame, 4),
- (long) get_frame_register_unsigned (frame, 5),
- (long) get_frame_register_unsigned (frame, 6),
- (long) get_frame_register_unsigned (frame, 7));
- printf_filtered
- ("R8-R15 %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
- (long) get_frame_register_unsigned (frame, 8),
- (long) get_frame_register_unsigned (frame, 9),
- (long) get_frame_register_unsigned (frame, 10),
- (long) get_frame_register_unsigned (frame, 11),
- (long) get_frame_register_unsigned (frame, 12),
- (long) get_frame_register_unsigned (frame, 13),
- (long) get_frame_register_unsigned (frame, 14),
- (long) get_frame_register_unsigned (frame, 15));
-}
-
-static void
-sh2e_show_regs (struct frame_info *frame)
-{
- struct gdbarch *gdbarch = get_frame_arch (frame);
- printf_filtered
- (" PC %s SR %08lx PR %08lx MACH %08lx\n",
- phex (get_frame_register_unsigned (frame,
- gdbarch_pc_regnum (gdbarch)), 4),
- (long) get_frame_register_unsigned (frame, SR_REGNUM),
- (long) get_frame_register_unsigned (frame, PR_REGNUM),
- (long) get_frame_register_unsigned (frame, MACH_REGNUM));
-
- printf_filtered
- (" GBR %08lx VBR %08lx MACL %08lx\n",
- (long) get_frame_register_unsigned (frame, GBR_REGNUM),
- (long) get_frame_register_unsigned (frame, VBR_REGNUM),
- (long) get_frame_register_unsigned (frame, MACL_REGNUM));
- printf_filtered
- (" SSR %08lx SPC %08lx FPUL %08lx FPSCR %08lx\n",
- (long) get_frame_register_unsigned (frame, SSR_REGNUM),
- (long) get_frame_register_unsigned (frame, SPC_REGNUM),
- (long) get_frame_register_unsigned (frame, FPUL_REGNUM),
- (long) get_frame_register_unsigned (frame, FPSCR_REGNUM));
-
- printf_filtered
- ("R0-R7 %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
- (long) get_frame_register_unsigned (frame, 0),
- (long) get_frame_register_unsigned (frame, 1),
- (long) get_frame_register_unsigned (frame, 2),
- (long) get_frame_register_unsigned (frame, 3),
- (long) get_frame_register_unsigned (frame, 4),
- (long) get_frame_register_unsigned (frame, 5),
- (long) get_frame_register_unsigned (frame, 6),
- (long) get_frame_register_unsigned (frame, 7));
- printf_filtered
- ("R8-R15 %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
- (long) get_frame_register_unsigned (frame, 8),
- (long) get_frame_register_unsigned (frame, 9),
- (long) get_frame_register_unsigned (frame, 10),
- (long) get_frame_register_unsigned (frame, 11),
- (long) get_frame_register_unsigned (frame, 12),
- (long) get_frame_register_unsigned (frame, 13),
- (long) get_frame_register_unsigned (frame, 14),
- (long) get_frame_register_unsigned (frame, 15));
-
- printf_filtered
- ("FP0-FP7 %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
- (long) get_frame_register_unsigned
- (frame, gdbarch_fp0_regnum (gdbarch) + 0),
- (long) get_frame_register_unsigned
- (frame, gdbarch_fp0_regnum (gdbarch) + 1),
- (long) get_frame_register_unsigned
- (frame, gdbarch_fp0_regnum (gdbarch) + 2),
- (long) get_frame_register_unsigned
- (frame, gdbarch_fp0_regnum (gdbarch) + 3),
- (long) get_frame_register_unsigned
- (frame, gdbarch_fp0_regnum (gdbarch) + 4),
- (long) get_frame_register_unsigned
- (frame, gdbarch_fp0_regnum (gdbarch) + 5),
- (long) get_frame_register_unsigned
- (frame, gdbarch_fp0_regnum (gdbarch) + 6),
- (long) get_frame_register_unsigned
- (frame, gdbarch_fp0_regnum (gdbarch) + 7));
- printf_filtered
- ("FP8-FP15 %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
- (long) get_frame_register_unsigned
- (frame, gdbarch_fp0_regnum (gdbarch) + 8),
- (long) get_frame_register_unsigned
- (frame, gdbarch_fp0_regnum (gdbarch) + 9),
- (long) get_frame_register_unsigned
- (frame, gdbarch_fp0_regnum (gdbarch) + 10),
- (long) get_frame_register_unsigned
- (frame, gdbarch_fp0_regnum (gdbarch) + 11),
- (long) get_frame_register_unsigned
- (frame, gdbarch_fp0_regnum (gdbarch) + 12),
- (long) get_frame_register_unsigned
- (frame, gdbarch_fp0_regnum (gdbarch) + 13),
- (long) get_frame_register_unsigned
- (frame, gdbarch_fp0_regnum (gdbarch) + 14),
- (long) get_frame_register_unsigned
- (frame, gdbarch_fp0_regnum (gdbarch) + 15));
-}
-
-static void
-sh2a_show_regs (struct frame_info *frame)
-{
- struct gdbarch *gdbarch = get_frame_arch (frame);
- int pr = get_frame_register_unsigned (frame, FPSCR_REGNUM) & 0x80000;
-
- printf_filtered
- (" PC %s SR %08lx PR %08lx MACH %08lx\n",
- phex (get_frame_register_unsigned (frame,
- gdbarch_pc_regnum (gdbarch)), 4),
- (long) get_frame_register_unsigned (frame, SR_REGNUM),
- (long) get_frame_register_unsigned (frame, PR_REGNUM),
- (long) get_frame_register_unsigned (frame, MACH_REGNUM));
-
- printf_filtered
- (" GBR %08lx VBR %08lx TBR %08lx MACL %08lx\n",
- (long) get_frame_register_unsigned (frame, GBR_REGNUM),
- (long) get_frame_register_unsigned (frame, VBR_REGNUM),
- (long) get_frame_register_unsigned (frame, TBR_REGNUM),
- (long) get_frame_register_unsigned (frame, MACL_REGNUM));
- printf_filtered
- (" SSR %08lx SPC %08lx FPUL %08lx FPSCR %08lx\n",
- (long) get_frame_register_unsigned (frame, SSR_REGNUM),
- (long) get_frame_register_unsigned (frame, SPC_REGNUM),
- (long) get_frame_register_unsigned (frame, FPUL_REGNUM),
- (long) get_frame_register_unsigned (frame, FPSCR_REGNUM));
-
- printf_filtered
- ("R0-R7 %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
- (long) get_frame_register_unsigned (frame, 0),
- (long) get_frame_register_unsigned (frame, 1),
- (long) get_frame_register_unsigned (frame, 2),
- (long) get_frame_register_unsigned (frame, 3),
- (long) get_frame_register_unsigned (frame, 4),
- (long) get_frame_register_unsigned (frame, 5),
- (long) get_frame_register_unsigned (frame, 6),
- (long) get_frame_register_unsigned (frame, 7));
- printf_filtered
- ("R8-R15 %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
- (long) get_frame_register_unsigned (frame, 8),
- (long) get_frame_register_unsigned (frame, 9),
- (long) get_frame_register_unsigned (frame, 10),
- (long) get_frame_register_unsigned (frame, 11),
- (long) get_frame_register_unsigned (frame, 12),
- (long) get_frame_register_unsigned (frame, 13),
- (long) get_frame_register_unsigned (frame, 14),
- (long) get_frame_register_unsigned (frame, 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",
- (long) get_frame_register_unsigned
- (frame, gdbarch_fp0_regnum (gdbarch) + 0),
- (long) get_frame_register_unsigned
- (frame, gdbarch_fp0_regnum (gdbarch) + 1),
- (long) get_frame_register_unsigned
- (frame, gdbarch_fp0_regnum (gdbarch) + 2),
- (long) get_frame_register_unsigned
- (frame, gdbarch_fp0_regnum (gdbarch) + 3),
- (long) get_frame_register_unsigned
- (frame, gdbarch_fp0_regnum (gdbarch) + 4),
- (long) get_frame_register_unsigned
- (frame, gdbarch_fp0_regnum (gdbarch) + 5),
- (long) get_frame_register_unsigned
- (frame, gdbarch_fp0_regnum (gdbarch) + 6),
- (long) get_frame_register_unsigned
- (frame, gdbarch_fp0_regnum (gdbarch) + 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",
- (long) get_frame_register_unsigned
- (frame, gdbarch_fp0_regnum (gdbarch) + 8),
- (long) get_frame_register_unsigned
- (frame, gdbarch_fp0_regnum (gdbarch) + 9),
- (long) get_frame_register_unsigned
- (frame, gdbarch_fp0_regnum (gdbarch) + 10),
- (long) get_frame_register_unsigned
- (frame, gdbarch_fp0_regnum (gdbarch) + 11),
- (long) get_frame_register_unsigned
- (frame, gdbarch_fp0_regnum (gdbarch) + 12),
- (long) get_frame_register_unsigned
- (frame, gdbarch_fp0_regnum (gdbarch) + 13),
- (long) get_frame_register_unsigned
- (frame, gdbarch_fp0_regnum (gdbarch) + 14),
- (long) get_frame_register_unsigned
- (frame, gdbarch_fp0_regnum (gdbarch) + 15));
- printf_filtered
- ("BANK=%-3d\n", (int) get_frame_register_unsigned (frame, BANK_REGNUM));
- printf_filtered
- ("R0b-R7b %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
- (long) get_frame_register_unsigned (frame, R0_BANK0_REGNUM + 0),
- (long) get_frame_register_unsigned (frame, R0_BANK0_REGNUM + 1),
- (long) get_frame_register_unsigned (frame, R0_BANK0_REGNUM + 2),
- (long) get_frame_register_unsigned (frame, R0_BANK0_REGNUM + 3),
- (long) get_frame_register_unsigned (frame, R0_BANK0_REGNUM + 4),
- (long) get_frame_register_unsigned (frame, R0_BANK0_REGNUM + 5),
- (long) get_frame_register_unsigned (frame, R0_BANK0_REGNUM + 6),
- (long) get_frame_register_unsigned (frame, R0_BANK0_REGNUM + 7));
- printf_filtered
- ("R8b-R14b %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
- (long) get_frame_register_unsigned (frame, R0_BANK0_REGNUM + 8),
- (long) get_frame_register_unsigned (frame, R0_BANK0_REGNUM + 9),
- (long) get_frame_register_unsigned (frame, R0_BANK0_REGNUM + 10),
- (long) get_frame_register_unsigned (frame, R0_BANK0_REGNUM + 11),
- (long) get_frame_register_unsigned (frame, R0_BANK0_REGNUM + 12),
- (long) get_frame_register_unsigned (frame, R0_BANK0_REGNUM + 13),
- (long) get_frame_register_unsigned (frame, R0_BANK0_REGNUM + 14));
- printf_filtered
- ("MACHb=%08lx IVNb=%08lx PRb=%08lx GBRb=%08lx MACLb=%08lx\n",
- (long) get_frame_register_unsigned (frame, R0_BANK0_REGNUM + 15),
- (long) get_frame_register_unsigned (frame, R0_BANK0_REGNUM + 16),
- (long) get_frame_register_unsigned (frame, R0_BANK0_REGNUM + 17),
- (long) get_frame_register_unsigned (frame, R0_BANK0_REGNUM + 18),
- (long) get_frame_register_unsigned (frame, R0_BANK0_REGNUM + 19));
-}
-
-static void
-sh2a_nofpu_show_regs (struct frame_info *frame)
-{
- int pr = get_frame_register_unsigned (frame, FPSCR_REGNUM) & 0x80000;
-
- printf_filtered
- (" PC %s SR %08lx PR %08lx MACH %08lx\n",
- phex (get_frame_register_unsigned (frame,
- gdbarch_pc_regnum
- (get_frame_arch (frame))), 4),
- (long) get_frame_register_unsigned (frame, SR_REGNUM),
- (long) get_frame_register_unsigned (frame, PR_REGNUM),
- (long) get_frame_register_unsigned (frame, MACH_REGNUM));
-
- printf_filtered
- (" GBR %08lx VBR %08lx TBR %08lx MACL %08lx\n",
- (long) get_frame_register_unsigned (frame, GBR_REGNUM),
- (long) get_frame_register_unsigned (frame, VBR_REGNUM),
- (long) get_frame_register_unsigned (frame, TBR_REGNUM),
- (long) get_frame_register_unsigned (frame, MACL_REGNUM));
- printf_filtered
- (" SSR %08lx SPC %08lx FPUL %08lx FPSCR %08lx\n",
- (long) get_frame_register_unsigned (frame, SSR_REGNUM),
- (long) get_frame_register_unsigned (frame, SPC_REGNUM),
- (long) get_frame_register_unsigned (frame, FPUL_REGNUM),
- (long) get_frame_register_unsigned (frame, FPSCR_REGNUM));
-
- printf_filtered
- ("R0-R7 %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
- (long) get_frame_register_unsigned (frame, 0),
- (long) get_frame_register_unsigned (frame, 1),
- (long) get_frame_register_unsigned (frame, 2),
- (long) get_frame_register_unsigned (frame, 3),
- (long) get_frame_register_unsigned (frame, 4),
- (long) get_frame_register_unsigned (frame, 5),
- (long) get_frame_register_unsigned (frame, 6),
- (long) get_frame_register_unsigned (frame, 7));
- printf_filtered
- ("R8-R15 %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
- (long) get_frame_register_unsigned (frame, 8),
- (long) get_frame_register_unsigned (frame, 9),
- (long) get_frame_register_unsigned (frame, 10),
- (long) get_frame_register_unsigned (frame, 11),
- (long) get_frame_register_unsigned (frame, 12),
- (long) get_frame_register_unsigned (frame, 13),
- (long) get_frame_register_unsigned (frame, 14),
- (long) get_frame_register_unsigned (frame, 15));
-
- printf_filtered
- ("BANK=%-3d\n", (int) get_frame_register_unsigned (frame, BANK_REGNUM));
- printf_filtered
- ("R0b-R7b %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
- (long) get_frame_register_unsigned (frame, R0_BANK0_REGNUM + 0),
- (long) get_frame_register_unsigned (frame, R0_BANK0_REGNUM + 1),
- (long) get_frame_register_unsigned (frame, R0_BANK0_REGNUM + 2),
- (long) get_frame_register_unsigned (frame, R0_BANK0_REGNUM + 3),
- (long) get_frame_register_unsigned (frame, R0_BANK0_REGNUM + 4),
- (long) get_frame_register_unsigned (frame, R0_BANK0_REGNUM + 5),
- (long) get_frame_register_unsigned (frame, R0_BANK0_REGNUM + 6),
- (long) get_frame_register_unsigned (frame, R0_BANK0_REGNUM + 7));
- printf_filtered
- ("R8b-R14b %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
- (long) get_frame_register_unsigned (frame, R0_BANK0_REGNUM + 8),
- (long) get_frame_register_unsigned (frame, R0_BANK0_REGNUM + 9),
- (long) get_frame_register_unsigned (frame, R0_BANK0_REGNUM + 10),
- (long) get_frame_register_unsigned (frame, R0_BANK0_REGNUM + 11),
- (long) get_frame_register_unsigned (frame, R0_BANK0_REGNUM + 12),
- (long) get_frame_register_unsigned (frame, R0_BANK0_REGNUM + 13),
- (long) get_frame_register_unsigned (frame, R0_BANK0_REGNUM + 14));
- printf_filtered
- ("MACHb=%08lx IVNb=%08lx PRb=%08lx GBRb=%08lx MACLb=%08lx\n",
- (long) get_frame_register_unsigned (frame, R0_BANK0_REGNUM + 15),
- (long) get_frame_register_unsigned (frame, R0_BANK0_REGNUM + 16),
- (long) get_frame_register_unsigned (frame, R0_BANK0_REGNUM + 17),
- (long) get_frame_register_unsigned (frame, R0_BANK0_REGNUM + 18),
- (long) get_frame_register_unsigned (frame, R0_BANK0_REGNUM + 19));
-}
-
-static void
-sh3e_show_regs (struct frame_info *frame)
-{
- struct gdbarch *gdbarch = get_frame_arch (frame);
- printf_filtered
- (" PC %s SR %08lx PR %08lx MACH %08lx\n",
- phex (get_frame_register_unsigned (frame,
- gdbarch_pc_regnum (gdbarch)), 4),
- (long) get_frame_register_unsigned (frame, SR_REGNUM),
- (long) get_frame_register_unsigned (frame, PR_REGNUM),
- (long) get_frame_register_unsigned (frame, MACH_REGNUM));
-
- printf_filtered
- (" GBR %08lx VBR %08lx MACL %08lx\n",
- (long) get_frame_register_unsigned (frame, GBR_REGNUM),
- (long) get_frame_register_unsigned (frame, VBR_REGNUM),
- (long) get_frame_register_unsigned (frame, MACL_REGNUM));
- printf_filtered
- (" SSR %08lx SPC %08lx FPUL %08lx FPSCR %08lx\n",
- (long) get_frame_register_unsigned (frame, SSR_REGNUM),
- (long) get_frame_register_unsigned (frame, SPC_REGNUM),
- (long) get_frame_register_unsigned (frame, FPUL_REGNUM),
- (long) get_frame_register_unsigned (frame, FPSCR_REGNUM));
-
- printf_filtered
- ("R0-R7 %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
- (long) get_frame_register_unsigned (frame, 0),
- (long) get_frame_register_unsigned (frame, 1),
- (long) get_frame_register_unsigned (frame, 2),
- (long) get_frame_register_unsigned (frame, 3),
- (long) get_frame_register_unsigned (frame, 4),
- (long) get_frame_register_unsigned (frame, 5),
- (long) get_frame_register_unsigned (frame, 6),
- (long) get_frame_register_unsigned (frame, 7));
- printf_filtered
- ("R8-R15 %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
- (long) get_frame_register_unsigned (frame, 8),
- (long) get_frame_register_unsigned (frame, 9),
- (long) get_frame_register_unsigned (frame, 10),
- (long) get_frame_register_unsigned (frame, 11),
- (long) get_frame_register_unsigned (frame, 12),
- (long) get_frame_register_unsigned (frame, 13),
- (long) get_frame_register_unsigned (frame, 14),
- (long) get_frame_register_unsigned (frame, 15));
-
- printf_filtered
- ("FP0-FP7 %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
- (long) get_frame_register_unsigned
- (frame, gdbarch_fp0_regnum (gdbarch) + 0),
- (long) get_frame_register_unsigned
- (frame, gdbarch_fp0_regnum (gdbarch) + 1),
- (long) get_frame_register_unsigned
- (frame, gdbarch_fp0_regnum (gdbarch) + 2),
- (long) get_frame_register_unsigned
- (frame, gdbarch_fp0_regnum (gdbarch) + 3),
- (long) get_frame_register_unsigned
- (frame, gdbarch_fp0_regnum (gdbarch) + 4),
- (long) get_frame_register_unsigned
- (frame, gdbarch_fp0_regnum (gdbarch) + 5),
- (long) get_frame_register_unsigned
- (frame, gdbarch_fp0_regnum (gdbarch) + 6),
- (long) get_frame_register_unsigned
- (frame, gdbarch_fp0_regnum (gdbarch) + 7));
- printf_filtered
- ("FP8-FP15 %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
- (long) get_frame_register_unsigned
- (frame, gdbarch_fp0_regnum (gdbarch) + 8),
- (long) get_frame_register_unsigned
- (frame, gdbarch_fp0_regnum (gdbarch) + 9),
- (long) get_frame_register_unsigned
- (frame, gdbarch_fp0_regnum (gdbarch) + 10),
- (long) get_frame_register_unsigned
- (frame, gdbarch_fp0_regnum (gdbarch) + 11),
- (long) get_frame_register_unsigned
- (frame, gdbarch_fp0_regnum (gdbarch) + 12),
- (long) get_frame_register_unsigned
- (frame, gdbarch_fp0_regnum (gdbarch) + 13),
- (long) get_frame_register_unsigned
- (frame, gdbarch_fp0_regnum (gdbarch) + 14),
- (long) get_frame_register_unsigned
- (frame, gdbarch_fp0_regnum (gdbarch) + 15));
-}
-
-static void
-sh3_dsp_show_regs (struct frame_info *frame)
-{
- printf_filtered
- (" PC %s SR %08lx PR %08lx MACH %08lx\n",
- phex (get_frame_register_unsigned (frame,
- gdbarch_pc_regnum
- (get_frame_arch (frame))), 4),
- (long) get_frame_register_unsigned (frame, SR_REGNUM),
- (long) get_frame_register_unsigned (frame, PR_REGNUM),
- (long) get_frame_register_unsigned (frame, MACH_REGNUM));
-
- printf_filtered
- (" GBR %08lx VBR %08lx MACL %08lx\n",
- (long) get_frame_register_unsigned (frame, GBR_REGNUM),
- (long) get_frame_register_unsigned (frame, VBR_REGNUM),
- (long) get_frame_register_unsigned (frame, MACL_REGNUM));
-
- printf_filtered
- (" SSR %08lx SPC %08lx DSR %08lx\n",
- (long) get_frame_register_unsigned (frame, SSR_REGNUM),
- (long) get_frame_register_unsigned (frame, SPC_REGNUM),
- (long) get_frame_register_unsigned (frame, DSR_REGNUM));
-
- printf_filtered
- ("R0-R7 %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
- (long) get_frame_register_unsigned (frame, 0),
- (long) get_frame_register_unsigned (frame, 1),
- (long) get_frame_register_unsigned (frame, 2),
- (long) get_frame_register_unsigned (frame, 3),
- (long) get_frame_register_unsigned (frame, 4),
- (long) get_frame_register_unsigned (frame, 5),
- (long) get_frame_register_unsigned (frame, 6),
- (long) get_frame_register_unsigned (frame, 7));
- printf_filtered
- ("R8-R15 %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
- (long) get_frame_register_unsigned (frame, 8),
- (long) get_frame_register_unsigned (frame, 9),
- (long) get_frame_register_unsigned (frame, 10),
- (long) get_frame_register_unsigned (frame, 11),
- (long) get_frame_register_unsigned (frame, 12),
- (long) get_frame_register_unsigned (frame, 13),
- (long) get_frame_register_unsigned (frame, 14),
- (long) get_frame_register_unsigned (frame, 15));
-
- printf_filtered
- ("A0G=%02lx A0=%08lx M0=%08lx X0=%08lx Y0=%08lx RS=%08lx MOD=%08lx\n",
- (long) get_frame_register_unsigned (frame, A0G_REGNUM) & 0xff,
- (long) get_frame_register_unsigned (frame, A0_REGNUM),
- (long) get_frame_register_unsigned (frame, M0_REGNUM),
- (long) get_frame_register_unsigned (frame, X0_REGNUM),
- (long) get_frame_register_unsigned (frame, Y0_REGNUM),
- (long) get_frame_register_unsigned (frame, RS_REGNUM),
- (long) get_frame_register_unsigned (frame, MOD_REGNUM));
- printf_filtered
- ("A1G=%02lx A1=%08lx M1=%08lx X1=%08lx Y1=%08lx RE=%08lx\n",
- (long) get_frame_register_unsigned (frame, A1G_REGNUM) & 0xff,
- (long) get_frame_register_unsigned (frame, A1_REGNUM),
- (long) get_frame_register_unsigned (frame, M1_REGNUM),
- (long) get_frame_register_unsigned (frame, X1_REGNUM),
- (long) get_frame_register_unsigned (frame, Y1_REGNUM),
- (long) get_frame_register_unsigned (frame, RE_REGNUM));
-}
-
-static void
-sh4_show_regs (struct frame_info *frame)
-{
- struct gdbarch *gdbarch = get_frame_arch (frame);
- int pr = get_frame_register_unsigned (frame, FPSCR_REGNUM) & 0x80000;
-
- printf_filtered
- (" PC %s SR %08lx PR %08lx MACH %08lx\n",
- phex (get_frame_register_unsigned (frame,
- gdbarch_pc_regnum (gdbarch)), 4),
- (long) get_frame_register_unsigned (frame, SR_REGNUM),
- (long) get_frame_register_unsigned (frame, PR_REGNUM),
- (long) get_frame_register_unsigned (frame, MACH_REGNUM));
-
- printf_filtered
- (" GBR %08lx VBR %08lx MACL %08lx\n",
- (long) get_frame_register_unsigned (frame, GBR_REGNUM),
- (long) get_frame_register_unsigned (frame, VBR_REGNUM),
- (long) get_frame_register_unsigned (frame, MACL_REGNUM));
- printf_filtered
- (" SSR %08lx SPC %08lx FPUL %08lx FPSCR %08lx\n",
- (long) get_frame_register_unsigned (frame, SSR_REGNUM),
- (long) get_frame_register_unsigned (frame, SPC_REGNUM),
- (long) get_frame_register_unsigned (frame, FPUL_REGNUM),
- (long) get_frame_register_unsigned (frame, FPSCR_REGNUM));
-
- printf_filtered
- ("R0-R7 %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
- (long) get_frame_register_unsigned (frame, 0),
- (long) get_frame_register_unsigned (frame, 1),
- (long) get_frame_register_unsigned (frame, 2),
- (long) get_frame_register_unsigned (frame, 3),
- (long) get_frame_register_unsigned (frame, 4),
- (long) get_frame_register_unsigned (frame, 5),
- (long) get_frame_register_unsigned (frame, 6),
- (long) get_frame_register_unsigned (frame, 7));
- printf_filtered
- ("R8-R15 %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
- (long) get_frame_register_unsigned (frame, 8),
- (long) get_frame_register_unsigned (frame, 9),
- (long) get_frame_register_unsigned (frame, 10),
- (long) get_frame_register_unsigned (frame, 11),
- (long) get_frame_register_unsigned (frame, 12),
- (long) get_frame_register_unsigned (frame, 13),
- (long) get_frame_register_unsigned (frame, 14),
- (long) get_frame_register_unsigned (frame, 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",
- (long) get_frame_register_unsigned
- (frame, gdbarch_fp0_regnum (gdbarch) + 0),
- (long) get_frame_register_unsigned
- (frame, gdbarch_fp0_regnum (gdbarch) + 1),
- (long) get_frame_register_unsigned
- (frame, gdbarch_fp0_regnum (gdbarch) + 2),
- (long) get_frame_register_unsigned
- (frame, gdbarch_fp0_regnum (gdbarch) + 3),
- (long) get_frame_register_unsigned
- (frame, gdbarch_fp0_regnum (gdbarch) + 4),
- (long) get_frame_register_unsigned
- (frame, gdbarch_fp0_regnum (gdbarch) + 5),
- (long) get_frame_register_unsigned
- (frame, gdbarch_fp0_regnum (gdbarch) + 6),
- (long) get_frame_register_unsigned
- (frame, gdbarch_fp0_regnum (gdbarch) + 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",
- (long) get_frame_register_unsigned
- (frame, gdbarch_fp0_regnum (gdbarch) + 8),
- (long) get_frame_register_unsigned
- (frame, gdbarch_fp0_regnum (gdbarch) + 9),
- (long) get_frame_register_unsigned
- (frame, gdbarch_fp0_regnum (gdbarch) + 10),
- (long) get_frame_register_unsigned
- (frame, gdbarch_fp0_regnum (gdbarch) + 11),
- (long) get_frame_register_unsigned
- (frame, gdbarch_fp0_regnum (gdbarch) + 12),
- (long) get_frame_register_unsigned
- (frame, gdbarch_fp0_regnum (gdbarch) + 13),
- (long) get_frame_register_unsigned
- (frame, gdbarch_fp0_regnum (gdbarch) + 14),
- (long) get_frame_register_unsigned
- (frame, gdbarch_fp0_regnum (gdbarch) + 15));
-}
-
-static void
-sh4_nofpu_show_regs (struct frame_info *frame)
-{
- printf_filtered
- (" PC %s SR %08lx PR %08lx MACH %08lx\n",
- phex (get_frame_register_unsigned (frame,
- gdbarch_pc_regnum
- (get_frame_arch (frame))), 4),
- (long) get_frame_register_unsigned (frame, SR_REGNUM),
- (long) get_frame_register_unsigned (frame, PR_REGNUM),
- (long) get_frame_register_unsigned (frame, MACH_REGNUM));
-
- printf_filtered
- (" GBR %08lx VBR %08lx MACL %08lx\n",
- (long) get_frame_register_unsigned (frame, GBR_REGNUM),
- (long) get_frame_register_unsigned (frame, VBR_REGNUM),
- (long) get_frame_register_unsigned (frame, MACL_REGNUM));
- printf_filtered
- (" SSR %08lx SPC %08lx FPUL %08lx FPSCR %08lx\n",
- (long) get_frame_register_unsigned (frame, SSR_REGNUM),
- (long) get_frame_register_unsigned (frame, SPC_REGNUM),
- (long) get_frame_register_unsigned (frame, FPUL_REGNUM),
- (long) get_frame_register_unsigned (frame, FPSCR_REGNUM));
-
- printf_filtered
- ("R0-R7 %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
- (long) get_frame_register_unsigned (frame, 0),
- (long) get_frame_register_unsigned (frame, 1),
- (long) get_frame_register_unsigned (frame, 2),
- (long) get_frame_register_unsigned (frame, 3),
- (long) get_frame_register_unsigned (frame, 4),
- (long) get_frame_register_unsigned (frame, 5),
- (long) get_frame_register_unsigned (frame, 6),
- (long) get_frame_register_unsigned (frame, 7));
- printf_filtered
- ("R8-R15 %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
- (long) get_frame_register_unsigned (frame, 8),
- (long) get_frame_register_unsigned (frame, 9),
- (long) get_frame_register_unsigned (frame, 10),
- (long) get_frame_register_unsigned (frame, 11),
- (long) get_frame_register_unsigned (frame, 12),
- (long) get_frame_register_unsigned (frame, 13),
- (long) get_frame_register_unsigned (frame, 14),
- (long) get_frame_register_unsigned (frame, 15));
-}
-
-static void
-sh_dsp_show_regs (struct frame_info *frame)
-{
- printf_filtered
- (" PC %s SR %08lx PR %08lx MACH %08lx\n",
- phex (get_frame_register_unsigned (frame,
- gdbarch_pc_regnum
- (get_frame_arch (frame))), 4),
- (long) get_frame_register_unsigned (frame, SR_REGNUM),
- (long) get_frame_register_unsigned (frame, PR_REGNUM),
- (long) get_frame_register_unsigned (frame, MACH_REGNUM));
-
- printf_filtered
- (" GBR %08lx VBR %08lx DSR %08lx MACL %08lx\n",
- (long) get_frame_register_unsigned (frame, GBR_REGNUM),
- (long) get_frame_register_unsigned (frame, VBR_REGNUM),
- (long) get_frame_register_unsigned (frame, DSR_REGNUM),
- (long) get_frame_register_unsigned (frame, MACL_REGNUM));
-
- printf_filtered
- ("R0-R7 %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
- (long) get_frame_register_unsigned (frame, 0),
- (long) get_frame_register_unsigned (frame, 1),
- (long) get_frame_register_unsigned (frame, 2),
- (long) get_frame_register_unsigned (frame, 3),
- (long) get_frame_register_unsigned (frame, 4),
- (long) get_frame_register_unsigned (frame, 5),
- (long) get_frame_register_unsigned (frame, 6),
- (long) get_frame_register_unsigned (frame, 7));
- printf_filtered
- ("R8-R15 %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
- (long) get_frame_register_unsigned (frame, 8),
- (long) get_frame_register_unsigned (frame, 9),
- (long) get_frame_register_unsigned (frame, 10),
- (long) get_frame_register_unsigned (frame, 11),
- (long) get_frame_register_unsigned (frame, 12),
- (long) get_frame_register_unsigned (frame, 13),
- (long) get_frame_register_unsigned (frame, 14),
- (long) get_frame_register_unsigned (frame, 15));
-
- printf_filtered
- ("A0G=%02lx A0=%08lx M0=%08lx X0=%08lx Y0=%08lx RS=%08lx MOD=%08lx\n",
- (long) get_frame_register_unsigned (frame, A0G_REGNUM) & 0xff,
- (long) get_frame_register_unsigned (frame, A0_REGNUM),
- (long) get_frame_register_unsigned (frame, M0_REGNUM),
- (long) get_frame_register_unsigned (frame, X0_REGNUM),
- (long) get_frame_register_unsigned (frame, Y0_REGNUM),
- (long) get_frame_register_unsigned (frame, RS_REGNUM),
- (long) get_frame_register_unsigned (frame, MOD_REGNUM));
- printf_filtered ("A1G=%02lx A1=%08lx M1=%08lx X1=%08lx Y1=%08lx RE=%08lx\n",
- (long) get_frame_register_unsigned (frame, A1G_REGNUM) & 0xff,
- (long) get_frame_register_unsigned (frame, A1_REGNUM),
- (long) get_frame_register_unsigned (frame, M1_REGNUM),
- (long) get_frame_register_unsigned (frame, X1_REGNUM),
- (long) get_frame_register_unsigned (frame, Y1_REGNUM),
- (long) get_frame_register_unsigned (frame, RE_REGNUM));
-}
-
-static void
-sh_show_regs_command (char *args, int from_tty)
-{
- if (sh_show_regs)
- (*sh_show_regs) (get_current_frame ());
-}
-
static struct type *
sh_sh2a_register_type (struct gdbarch *gdbarch, int reg_nr)
{
@@ -2927,56 +2217,9 @@ sh_gdbarch_init (struct gdbarch_info inf
struct gdbarch *gdbarch;
struct gdbarch_tdep *tdep;
- sh_show_regs = sh_generic_show_regs;
- switch (info.bfd_arch_info->mach)
- {
- case bfd_mach_sh2e:
- sh_show_regs = sh2e_show_regs;
- break;
- case bfd_mach_sh2a:
- sh_show_regs = sh2a_show_regs;
- break;
- case bfd_mach_sh2a_nofpu:
- sh_show_regs = sh2a_nofpu_show_regs;
- break;
- case bfd_mach_sh_dsp:
- sh_show_regs = sh_dsp_show_regs;
- break;
-
- case bfd_mach_sh3:
- case bfd_mach_sh3_nommu:
- case bfd_mach_sh2a_nofpu_or_sh3_nommu:
- sh_show_regs = sh3_show_regs;
- break;
-
- case bfd_mach_sh3e:
- case bfd_mach_sh2a_or_sh3e:
- sh_show_regs = sh3e_show_regs;
- break;
-
- case bfd_mach_sh3_dsp:
- case bfd_mach_sh4al_dsp:
- sh_show_regs = sh3_dsp_show_regs;
- break;
-
- case bfd_mach_sh4:
- case bfd_mach_sh4a:
- case bfd_mach_sh2a_or_sh4:
- sh_show_regs = sh4_show_regs;
- break;
-
- case bfd_mach_sh4_nofpu:
- case bfd_mach_sh4_nommu_nofpu:
- case bfd_mach_sh4a_nofpu:
- case bfd_mach_sh2a_nofpu_or_sh4_nommu_nofpu:
- sh_show_regs = sh4_nofpu_show_regs;
- break;
-
- case bfd_mach_sh5:
- sh_show_regs = sh64_show_regs;
- /* SH5 is handled entirely in sh64-tdep.c. */
- return sh64_gdbarch_init (info, arches);
- }
+ /* SH5 is handled entirely in sh64-tdep.c. */
+ if (info.bfd_arch_info->mach == bfd_mach_sh5)
+ return sh64_gdbarch_init (info, arches);
/* If there is already a candidate, use it. */
arches = gdbarch_list_lookup_by_info (arches, &info);
@@ -3166,8 +2409,12 @@ _initialize_sh_tdep (void)
gdbarch_register (bfd_arch_sh, sh_gdbarch_init, NULL);
- add_com ("regs", class_vars, sh_show_regs_command, _("Print all registers"));
-
+ /* We can't use an alias here because 'info registers' has not yet been
+ registered. */
+ c = add_com ("regs", class_vars, all_registers_info,
+ _("Print all registers"));
+ deprecate_cmd (c, "info all-registers");
+
add_prefix_cmd ("sh", no_class, set_sh_command, "SH specific commands.",
&setshcmdlist, "set sh ", 0, &setlist);
add_prefix_cmd ("sh", no_class, show_sh_command, "SH specific commands.",
Index: gdb/sh64-tdep.c
===================================================================
RCS file: /cvs/src/src/gdb/sh64-tdep.c,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -p -r1.84 -r1.85
--- gdb/sh64-tdep.c 18 May 2012 21:02:50 -0000 1.84
+++ gdb/sh64-tdep.c 6 Jun 2012 18:03:53 -0000 1.85
@@ -1339,125 +1339,6 @@ sh64_return_value (struct gdbarch *gdbar
return RETURN_VALUE_REGISTER_CONVENTION;
}
-static void
-sh64_show_media_regs (struct frame_info *frame)
-{
- struct gdbarch *gdbarch = get_frame_arch (frame);
- int i;
-
- printf_filtered
- ("PC=%s SR=%s\n",
- phex (get_frame_register_unsigned (frame,
- gdbarch_pc_regnum (gdbarch)), 8),
- phex (get_frame_register_unsigned (frame, SR_REGNUM), 8));
-
- printf_filtered
- ("SSR=%s SPC=%s\n",
- phex (get_frame_register_unsigned (frame, SSR_REGNUM), 8),
- phex (get_frame_register_unsigned (frame, SPC_REGNUM), 8));
- printf_filtered
- ("FPSCR=%s\n ",
- phex (get_frame_register_unsigned (frame, FPSCR_REGNUM), 8));
-
- for (i = 0; i < 64; i = i + 4)
- printf_filtered
- ("\nR%d-R%d %s %s %s %s\n",
- i, i + 3,
- phex (get_frame_register_unsigned (frame, i + 0), 8),
- phex (get_frame_register_unsigned (frame, i + 1), 8),
- phex (get_frame_register_unsigned (frame, i + 2), 8),
- phex (get_frame_register_unsigned (frame, i + 3), 8));
-
- printf_filtered ("\n");
-
- for (i = 0; i < 64; i = i + 8)
- printf_filtered
- ("FR%d-FR%d %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
- i, i + 7,
- (long) get_frame_register_unsigned
- (frame, gdbarch_fp0_regnum (gdbarch) + i + 0),
- (long) get_frame_register_unsigned
- (frame, gdbarch_fp0_regnum (gdbarch) + i + 1),
- (long) get_frame_register_unsigned
- (frame, gdbarch_fp0_regnum (gdbarch) + i + 2),
- (long) get_frame_register_unsigned
- (frame, gdbarch_fp0_regnum (gdbarch) + i + 3),
- (long) get_frame_register_unsigned
- (frame, gdbarch_fp0_regnum (gdbarch) + i + 4),
- (long) get_frame_register_unsigned
- (frame, gdbarch_fp0_regnum (gdbarch) + i + 5),
- (long) get_frame_register_unsigned
- (frame, gdbarch_fp0_regnum (gdbarch) + i + 6),
- (long) get_frame_register_unsigned
- (frame, gdbarch_fp0_regnum (gdbarch) + i + 7));
-}
-
-static void
-sh64_show_compact_regs (struct frame_info *frame)
-{
- struct gdbarch *gdbarch = get_frame_arch (frame);
- int i;
-
- printf_filtered
- ("PC=%s\n",
- phex (get_frame_register_unsigned (frame, PC_C_REGNUM), 8));
-
- printf_filtered
- ("GBR=%08lx MACH=%08lx MACL=%08lx PR=%08lx T=%08lx\n",
- (long) get_frame_register_unsigned (frame, GBR_C_REGNUM),
- (long) get_frame_register_unsigned (frame, MACH_C_REGNUM),
- (long) get_frame_register_unsigned (frame, MACL_C_REGNUM),
- (long) get_frame_register_unsigned (frame, PR_C_REGNUM),
- (long) get_frame_register_unsigned (frame, T_C_REGNUM));
- printf_filtered
- ("FPSCR=%08lx FPUL=%08lx\n",
- (long) get_frame_register_unsigned (frame, FPSCR_C_REGNUM),
- (long) get_frame_register_unsigned (frame, FPUL_C_REGNUM));
-
- for (i = 0; i < 16; i = i + 4)
- printf_filtered
- ("\nR%d-R%d %08lx %08lx %08lx %08lx\n",
- i, i + 3,
- (long) get_frame_register_unsigned (frame, i + 0),
- (long) get_frame_register_unsigned (frame, i + 1),
- (long) get_frame_register_unsigned (frame, i + 2),
- (long) get_frame_register_unsigned (frame, i + 3));
-
- printf_filtered ("\n");
-
- for (i = 0; i < 16; i = i + 8)
- printf_filtered
- ("FR%d-FR%d %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
- i, i + 7,
- (long) get_frame_register_unsigned
- (frame, gdbarch_fp0_regnum (gdbarch) + i + 0),
- (long) get_frame_register_unsigned
- (frame, gdbarch_fp0_regnum (gdbarch) + i + 1),
- (long) get_frame_register_unsigned
- (frame, gdbarch_fp0_regnum (gdbarch) + i + 2),
- (long) get_frame_register_unsigned
- (frame, gdbarch_fp0_regnum (gdbarch) + i + 3),
- (long) get_frame_register_unsigned
- (frame, gdbarch_fp0_regnum (gdbarch) + i + 4),
- (long) get_frame_register_unsigned
- (frame, gdbarch_fp0_regnum (gdbarch) + i + 5),
- (long) get_frame_register_unsigned
- (frame, gdbarch_fp0_regnum (gdbarch) + i + 6),
- (long) get_frame_register_unsigned
- (frame, gdbarch_fp0_regnum (gdbarch) + i + 7));
-}
-
-/* FIXME!!! This only shows the registers for shmedia, excluding the
- pseudo registers. */
-void
-sh64_show_regs (struct frame_info *frame)
-{
- if (pc_is_isa32 (get_frame_pc (frame)))
- sh64_show_media_regs (frame);
- else
- sh64_show_compact_regs (frame);
-}
-
/* *INDENT-OFF* */
/*
SH MEDIA MODE (ISA 32)
Index: gdb/sh64-tdep.h
===================================================================
RCS file: /cvs/src/src/gdb/sh64-tdep.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gdb/sh64-tdep.h 1 Mar 2012 23:55:40 -0000 1.1
+++ gdb/sh64-tdep.h 6 Jun 2012 18:03:53 -0000 1.2
@@ -20,6 +20,5 @@
#define SH64_TDEP_H
extern gdbarch_init_ftype sh64_gdbarch_init;
-extern void sh64_show_regs (struct frame_info *frame);
#endif /* SH64_TDEP_H */
Index: gdb/doc/gdb.texinfo
===================================================================
RCS file: /cvs/src/src/gdb/doc/gdb.texinfo,v
retrieving revision 1.972
retrieving revision 1.973
diff -u -p -r1.972 -r1.973
--- gdb/doc/gdb.texinfo 6 Jun 2012 08:20:12 -0000 1.972
+++ gdb/doc/gdb.texinfo 6 Jun 2012 18:03:54 -0000 1.973
@@ -20444,6 +20444,9 @@ commands:
@table @code
@item regs
@kindex regs@r{, Super-H}
+This command is deprecated, and @code{info all-registers} should be
+used instead.
+
Show the values of all Super-H registers.
@item set sh calling-convention @var{convention}
Grüße,
Thomas
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 489 bytes
Desc: not available
URL: <http://sourceware.org/pipermail/gdb-patches/attachments/20120606/04819d96/attachment.sig>
More information about the Gdb-patches
mailing list