From patchwork Mon Jul 22 10:27:08 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yoshinori Sato X-Patchwork-Id: 33764 Received: (qmail 4577 invoked by alias); 22 Jul 2019 10:27:14 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 4569 invoked by uid 89); 22 Jul 2019 10:27:13 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-19.7 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_LOW, SPF_SOFTFAIL autolearn=ham version=3.3.1 spammy=HX-Spam-Relays-External:ESMTPA X-HELO: mail01.asahi-net.or.jp Received: from mail01.asahi-net.or.jp (HELO mail01.asahi-net.or.jp) (202.224.55.13) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 22 Jul 2019 10:27:12 +0000 Received: from h61-195-96-97.vps.ablenet.jp (h61-195-96-97.ablenetvps.ne.jp [61.195.96.97]) (Authenticated sender: PQ4Y-STU) by mail01.asahi-net.or.jp (Postfix) with ESMTPA id B0F7D12BC05 for ; Mon, 22 Jul 2019 19:27:09 +0900 (JST) Received: from yo-satoh-debian.ysato.ml (ZM005235.ppp.dion.ne.jp [222.8.5.235]) by h61-195-96-97.vps.ablenet.jp (Postfix) with ESMTPSA id DB73E240085 for ; Mon, 22 Jul 2019 19:27:08 +0900 (JST) Date: Mon, 22 Jul 2019 19:27:08 +0900 Message-ID: <87tvbepdoj.wl-ysato@users.sourceforge.jp> From: Yoshinori Sato To: gdb-patches@sourceware.org Subject: [PATCH] gdb/h8300-tdep.c: Fix register name in h8300h machine. User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI-EPG/1.14.7 (Harue) FLIM/1.14.9 (=?ISO-8859-4?Q?Goj=F2?=) APEL/10.8 EasyPG/1.0.0 Emacs/25.1 (x86_64-pc-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") X-IsSubscribed: yes H8/300H general register name "ER0" - "ER7". But gdb using "R0" - "R7". This changes register name "ER0" - "ER7" in h8300h machine mode. --- gdb/ChangeLog | 9 +++++++++ gdb/h8300-tdep.c | 54 ++++++++++++++++++++++++++++++++---------------------- 2 files changed, 41 insertions(+), 22 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 63f6fa90d1..1ac285ff50 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,12 @@ +2019-07-22 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-21 Christian Biesinger * symtab.c (lookup_symbol_in_objfile_symtabs): Change int to block_enum. diff --git a/gdb/h8300-tdep.c b/gdb/h8300-tdep.c index b41a0b6c26..2a3d374085 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);