From c54e42531adb7bf8d58bd4c3c8e0c710305959e1 Mon Sep 17 00:00:00 2001 From: Yoshinori Sato Date: Wed, 24 Jul 2019 20:51:52 +0900 Subject: [PATCH] gdb/h8300-tdep.c: Fix register name in h8300h machine. H8/300H general register name "ER0" - "ER7". But gdb using "R0" - "R7". This changes register name "ER0" - "ER7" in h8300h machine mode. gdb/ChangeLog: * h8300-tdep.c (h8300_register_name_common): New. h8300_register_name): Use h8300_register_name_common. (h8300s_register_name): Likewise. (h8300sx_register_name): Likewise. (h8300h_register_nam): New. (h8300_gdbarch_init): Use h8300h_register_name in h8300h machine. --- gdb/ChangeLog | 10 ++++++++++ gdb/h8300-tdep.c | 54 ++++++++++++++++++++++++++++++++---------------------- 2 files changed, 42 insertions(+), 22 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 9441e7e..2ed8f65 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,13 @@ +2019-07-24 Yoshinori Sato + + * h8300-tdep.c (h8300_register_name_common): New. + h8300_register_name): Use h8300_register_name_common. + (h8300s_register_name): Likewise. + (h8300sx_register_name): Likewise. + (h8300h_register_nam): New. + (h8300_gdbarch_init): Use h8300h_register_name in h8300h machine. + + 2019-07-23 Srinath Parvathaneni * arm-tdep.c (arm_skip_cmse_entry): New function. diff --git a/gdb/h8300-tdep.c b/gdb/h8300-tdep.c index b41a0b6..2a3d374 100644 --- a/gdb/h8300-tdep.c +++ b/gdb/h8300-tdep.c @@ -929,6 +929,19 @@ h8300_register_sim_regno (struct gdbarch *gdbarch, int regnum) } static const char * +h8300_register_name_common (const char *regnames[], int numregs, + struct gdbarch *gdbarch, int regno) +{ + if (regno < 0 + || regno >= numregs) + internal_error (__FILE__, __LINE__, + _("h8300_register_name_common: illegal register number %d"), + regno); + else + return regnames[regno]; +} + +static const char * h8300_register_name (struct gdbarch *gdbarch, int regno) { /* The register names change depending on which h8300 processor @@ -938,13 +951,20 @@ h8300_register_name (struct gdbarch *gdbarch, int regno) "sp", "", "pc", "cycles", "tick", "inst", "ccr", /* pseudo register */ }; - if (regno < 0 - || regno >= (sizeof (register_names) / sizeof (*register_names))) - internal_error (__FILE__, __LINE__, - _("h8300_register_name: illegal register number %d"), - regno); - else - return register_names[regno]; + return h8300_register_name_common(register_names, ARRAY_SIZE(register_names), + gdbarch, regno); +} + +static const char * +h8300h_register_name (struct gdbarch *gdbarch, int regno) +{ + static const char *register_names[] = { + "er0", "er1", "er2", "er3", "er4", "er5", "er6", + "sp", "", "pc", "cycles", "tick", "inst", + "ccr", /* pseudo register */ + }; + return h8300_register_name_common(register_names, ARRAY_SIZE(register_names), + gdbarch, regno); } static const char * @@ -956,13 +976,8 @@ h8300s_register_name (struct gdbarch *gdbarch, int regno) "mach", "macl", "ccr", "exr" /* pseudo registers */ }; - if (regno < 0 - || regno >= (sizeof (register_names) / sizeof (*register_names))) - internal_error (__FILE__, __LINE__, - _("h8300s_register_name: illegal register number %d"), - regno); - else - return register_names[regno]; + return h8300_register_name_common(register_names, ARRAY_SIZE(register_names), + gdbarch, regno); } static const char * @@ -974,13 +989,8 @@ h8300sx_register_name (struct gdbarch *gdbarch, int regno) "mach", "macl", "sbr", "vbr", "ccr", "exr" /* pseudo registers */ }; - if (regno < 0 - || regno >= (sizeof (register_names) / sizeof (*register_names))) - internal_error (__FILE__, __LINE__, - _("h8300sx_register_name: illegal register number %d"), - regno); - else - return register_names[regno]; + return h8300_register_name_common(register_names, ARRAY_SIZE(register_names), + gdbarch, regno); } static void @@ -1259,7 +1269,7 @@ h8300_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) set_gdbarch_num_pseudo_regs (gdbarch, 1); set_gdbarch_dwarf2_reg_to_regnum (gdbarch, h8300_dbg_reg_to_regnum); set_gdbarch_stab_reg_to_regnum (gdbarch, h8300_dbg_reg_to_regnum); - set_gdbarch_register_name (gdbarch, h8300_register_name); + set_gdbarch_register_name (gdbarch, h8300h_register_name); if (info.bfd_arch_info->mach != bfd_mach_h8300hn) { set_gdbarch_ptr_bit (gdbarch, 4 * TARGET_CHAR_BIT); -- 2.7.4