From ba2b1c567fe2be8e4287a7e59edd26da9943b0f7 Mon Sep 17 00:00:00 2001 From: Daniel Jacobowitz Date: Fri, 16 May 2008 00:27:24 +0000 Subject: [PATCH] * gdbarch.sh: Delete dwarf_reg_to_regnum. * gdbarch.c, gdbarch.h: Regenerated. * amd64-tdep.c, arm-tdep.c, h8300-tdep.c, hppa-linux-tdep.c, hppa-tdep.c, i386-tdep.c, m32c-tdep.c, m68k-tdep.c, mips-tdep.c, s390-tdep.c, xtensa-tdep.c: Do not set dwarf_reg_to_regnum. * gdbint.texinfo (Target Conditionals): Delete entry for gdbarch_dwarf_reg_to_regnum. --- gdb/ChangeLog | 8 ++++++++ gdb/amd64-tdep.c | 1 - gdb/arm-tdep.c | 1 - gdb/doc/ChangeLog | 5 +++++ gdb/doc/gdbint.texinfo | 5 ----- gdb/gdbarch.c | 24 ------------------------ gdb/gdbarch.h | 8 ++------ gdb/gdbarch.sh | 3 +-- gdb/h8300-tdep.c | 4 ---- gdb/hppa-linux-tdep.c | 1 - gdb/hppa-tdep.c | 1 - gdb/i386-tdep.c | 3 +-- gdb/m32c-tdep.c | 1 - gdb/m68k-tdep.c | 1 - gdb/mips-tdep.c | 2 -- gdb/s390-tdep.c | 1 - gdb/xtensa-tdep.c | 3 +-- 17 files changed, 18 insertions(+), 54 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index f2357a60b5..ab186a2f89 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,11 @@ +2008-05-15 Daniel Jacobowitz + + * gdbarch.sh: Delete dwarf_reg_to_regnum. + * gdbarch.c, gdbarch.h: Regenerated. + * amd64-tdep.c, arm-tdep.c, h8300-tdep.c, hppa-linux-tdep.c, + hppa-tdep.c, i386-tdep.c, m32c-tdep.c, m68k-tdep.c, mips-tdep.c, + s390-tdep.c, xtensa-tdep.c: Do not set dwarf_reg_to_regnum. + 2008-05-15 Pedro Alves * linux-nat.c (trap_ptid): Delete. diff --git a/gdb/amd64-tdep.c b/gdb/amd64-tdep.c index 61a488c35e..dd3453a65c 100644 --- a/gdb/amd64-tdep.c +++ b/gdb/amd64-tdep.c @@ -1136,7 +1136,6 @@ amd64_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) DWARF-1), but we provide the same mapping just in case. This mapping is also used for stabs, which GCC does support. */ set_gdbarch_stab_reg_to_regnum (gdbarch, amd64_dwarf_reg_to_regnum); - set_gdbarch_dwarf_reg_to_regnum (gdbarch, amd64_dwarf_reg_to_regnum); set_gdbarch_dwarf2_reg_to_regnum (gdbarch, amd64_dwarf_reg_to_regnum); /* We don't override SDB_REG_RO_REGNUM, since COFF doesn't seem to diff --git a/gdb/arm-tdep.c b/gdb/arm-tdep.c index 9fbd0fcb18..c4824db0a6 100644 --- a/gdb/arm-tdep.c +++ b/gdb/arm-tdep.c @@ -3267,7 +3267,6 @@ arm_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) set_gdbarch_print_float_info (gdbarch, arm_print_float_info); /* Internal <-> external register number maps. */ - set_gdbarch_dwarf_reg_to_regnum (gdbarch, arm_dwarf_reg_to_regnum); set_gdbarch_dwarf2_reg_to_regnum (gdbarch, arm_dwarf_reg_to_regnum); set_gdbarch_register_sim_regno (gdbarch, arm_register_sim_regno); diff --git a/gdb/doc/ChangeLog b/gdb/doc/ChangeLog index 00c077645a..a13c056eeb 100644 --- a/gdb/doc/ChangeLog +++ b/gdb/doc/ChangeLog @@ -1,3 +1,8 @@ +2008-05-15 Daniel Jacobowitz + + * gdbint.texinfo (Target Conditionals): Delete entry for + gdbarch_dwarf_reg_to_regnum. + 2008-05-09 Doug Evans * gdb.texinfo: Document "find" command, qSearch:memory packet. diff --git a/gdb/doc/gdbint.texinfo b/gdb/doc/gdbint.texinfo index d020f5b725..e94ebb32bb 100644 --- a/gdb/doc/gdbint.texinfo +++ b/gdb/doc/gdbint.texinfo @@ -3623,11 +3623,6 @@ to print information about the processor's vector unit. By default, the @samp{info vector} command will print all vector registers (the register's type having the vector attribute). -@item int gdbarch_dwarf_reg_to_regnum (@var{gdbarch}, @var{dwarf_regnr}) -@findex gdbarch_dwarf_reg_to_regnum -Convert DWARF register number @var{dwarf_regnr} into @value{GDBN} regnum. If -not defined, no conversion will be performed. - @item int gdbarch_dwarf2_reg_to_regnum (@var{gdbarch}, @var{dwarf2_regnr}) @findex gdbarch_dwarf2_reg_to_regnum Convert DWARF2 register number @var{dwarf2_regnr} into @value{GDBN} regnum. diff --git a/gdb/gdbarch.c b/gdb/gdbarch.c index 537da1861c..f7478c461e 100644 --- a/gdb/gdbarch.c +++ b/gdb/gdbarch.c @@ -157,7 +157,6 @@ struct gdbarch int fp0_regnum; gdbarch_stab_reg_to_regnum_ftype *stab_reg_to_regnum; gdbarch_ecoff_reg_to_regnum_ftype *ecoff_reg_to_regnum; - gdbarch_dwarf_reg_to_regnum_ftype *dwarf_reg_to_regnum; gdbarch_sdb_reg_to_regnum_ftype *sdb_reg_to_regnum; gdbarch_dwarf2_reg_to_regnum_ftype *dwarf2_reg_to_regnum; gdbarch_register_name_ftype *register_name; @@ -287,7 +286,6 @@ struct gdbarch startup_gdbarch = 0, /* fp0_regnum */ no_op_reg_to_regnum, /* stab_reg_to_regnum */ no_op_reg_to_regnum, /* ecoff_reg_to_regnum */ - no_op_reg_to_regnum, /* dwarf_reg_to_regnum */ no_op_reg_to_regnum, /* sdb_reg_to_regnum */ no_op_reg_to_regnum, /* dwarf2_reg_to_regnum */ 0, /* register_name */ @@ -418,7 +416,6 @@ gdbarch_alloc (const struct gdbarch_info *info, gdbarch->fp0_regnum = -1; gdbarch->stab_reg_to_regnum = no_op_reg_to_regnum; gdbarch->ecoff_reg_to_regnum = no_op_reg_to_regnum; - gdbarch->dwarf_reg_to_regnum = no_op_reg_to_regnum; gdbarch->sdb_reg_to_regnum = no_op_reg_to_regnum; gdbarch->dwarf2_reg_to_regnum = no_op_reg_to_regnum; gdbarch->deprecated_fp_regnum = -1; @@ -537,7 +534,6 @@ verify_gdbarch (struct gdbarch *gdbarch) /* Skip verify of fp0_regnum, invalid_p == 0 */ /* Skip verify of stab_reg_to_regnum, invalid_p == 0 */ /* Skip verify of ecoff_reg_to_regnum, invalid_p == 0 */ - /* Skip verify of dwarf_reg_to_regnum, invalid_p == 0 */ /* Skip verify of sdb_reg_to_regnum, invalid_p == 0 */ /* Skip verify of dwarf2_reg_to_regnum, invalid_p == 0 */ if (gdbarch->register_name == 0) @@ -772,9 +768,6 @@ gdbarch_dump (struct gdbarch *gdbarch, struct ui_file *file) fprintf_unfiltered (file, "gdbarch_dump: dwarf2_reg_to_regnum = <0x%lx>\n", (long) gdbarch->dwarf2_reg_to_regnum); - fprintf_unfiltered (file, - "gdbarch_dump: dwarf_reg_to_regnum = <0x%lx>\n", - (long) gdbarch->dwarf_reg_to_regnum); fprintf_unfiltered (file, "gdbarch_dump: ecoff_reg_to_regnum = <0x%lx>\n", (long) gdbarch->ecoff_reg_to_regnum); @@ -1620,23 +1613,6 @@ set_gdbarch_ecoff_reg_to_regnum (struct gdbarch *gdbarch, gdbarch->ecoff_reg_to_regnum = ecoff_reg_to_regnum; } -int -gdbarch_dwarf_reg_to_regnum (struct gdbarch *gdbarch, int dwarf_regnr) -{ - gdb_assert (gdbarch != NULL); - gdb_assert (gdbarch->dwarf_reg_to_regnum != NULL); - if (gdbarch_debug >= 2) - fprintf_unfiltered (gdb_stdlog, "gdbarch_dwarf_reg_to_regnum called\n"); - return gdbarch->dwarf_reg_to_regnum (gdbarch, dwarf_regnr); -} - -void -set_gdbarch_dwarf_reg_to_regnum (struct gdbarch *gdbarch, - gdbarch_dwarf_reg_to_regnum_ftype dwarf_reg_to_regnum) -{ - gdbarch->dwarf_reg_to_regnum = dwarf_reg_to_regnum; -} - int gdbarch_sdb_reg_to_regnum (struct gdbarch *gdbarch, int sdb_regnr) { diff --git a/gdb/gdbarch.h b/gdb/gdbarch.h index 560b2efccc..ca8f9d4f6c 100644 --- a/gdb/gdbarch.h +++ b/gdb/gdbarch.h @@ -223,18 +223,14 @@ typedef int (gdbarch_ecoff_reg_to_regnum_ftype) (struct gdbarch *gdbarch, int ec extern int gdbarch_ecoff_reg_to_regnum (struct gdbarch *gdbarch, int ecoff_regnr); extern void set_gdbarch_ecoff_reg_to_regnum (struct gdbarch *gdbarch, gdbarch_ecoff_reg_to_regnum_ftype *ecoff_reg_to_regnum); -/* Provide a default mapping from a DWARF register number to a gdb REGNUM. */ - -typedef int (gdbarch_dwarf_reg_to_regnum_ftype) (struct gdbarch *gdbarch, int dwarf_regnr); -extern int gdbarch_dwarf_reg_to_regnum (struct gdbarch *gdbarch, int dwarf_regnr); -extern void set_gdbarch_dwarf_reg_to_regnum (struct gdbarch *gdbarch, gdbarch_dwarf_reg_to_regnum_ftype *dwarf_reg_to_regnum); - /* Convert from an sdb register number to an internal gdb register number. */ typedef int (gdbarch_sdb_reg_to_regnum_ftype) (struct gdbarch *gdbarch, int sdb_regnr); extern int gdbarch_sdb_reg_to_regnum (struct gdbarch *gdbarch, int sdb_regnr); extern void set_gdbarch_sdb_reg_to_regnum (struct gdbarch *gdbarch, gdbarch_sdb_reg_to_regnum_ftype *sdb_reg_to_regnum); +/* Provide a default mapping from a DWARF2 register number to a gdb REGNUM. */ + typedef int (gdbarch_dwarf2_reg_to_regnum_ftype) (struct gdbarch *gdbarch, int dwarf2_regnr); extern int gdbarch_dwarf2_reg_to_regnum (struct gdbarch *gdbarch, int dwarf2_regnr); extern void set_gdbarch_dwarf2_reg_to_regnum (struct gdbarch *gdbarch, gdbarch_dwarf2_reg_to_regnum_ftype *dwarf2_reg_to_regnum); diff --git a/gdb/gdbarch.sh b/gdb/gdbarch.sh index aedd9e541b..294254876c 100755 --- a/gdb/gdbarch.sh +++ b/gdb/gdbarch.sh @@ -421,10 +421,9 @@ v:int:fp0_regnum:::0:-1::0 m:int:stab_reg_to_regnum:int stab_regnr:stab_regnr::no_op_reg_to_regnum::0 # Provide a default mapping from a ecoff register number to a gdb REGNUM. m:int:ecoff_reg_to_regnum:int ecoff_regnr:ecoff_regnr::no_op_reg_to_regnum::0 -# Provide a default mapping from a DWARF register number to a gdb REGNUM. -m:int:dwarf_reg_to_regnum:int dwarf_regnr:dwarf_regnr::no_op_reg_to_regnum::0 # Convert from an sdb register number to an internal gdb register number. m:int:sdb_reg_to_regnum:int sdb_regnr:sdb_regnr::no_op_reg_to_regnum::0 +# Provide a default mapping from a DWARF2 register number to a gdb REGNUM. m:int:dwarf2_reg_to_regnum:int dwarf2_regnr:dwarf2_regnr::no_op_reg_to_regnum::0 m:const char *:register_name:int regnr:regnr::0 diff --git a/gdb/h8300-tdep.c b/gdb/h8300-tdep.c index 77e0e93889..4b78d8d8a9 100644 --- a/gdb/h8300-tdep.c +++ b/gdb/h8300-tdep.c @@ -1243,7 +1243,6 @@ h8300_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) set_gdbarch_num_regs (gdbarch, 13); set_gdbarch_num_pseudo_regs (gdbarch, 1); set_gdbarch_ecoff_reg_to_regnum (gdbarch, h8300_dbg_reg_to_regnum); - set_gdbarch_dwarf_reg_to_regnum (gdbarch, h8300_dbg_reg_to_regnum); 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); @@ -1257,7 +1256,6 @@ h8300_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) set_gdbarch_num_regs (gdbarch, 13); set_gdbarch_num_pseudo_regs (gdbarch, 1); set_gdbarch_ecoff_reg_to_regnum (gdbarch, h8300_dbg_reg_to_regnum); - set_gdbarch_dwarf_reg_to_regnum (gdbarch, h8300_dbg_reg_to_regnum); 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); @@ -1279,7 +1277,6 @@ h8300_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) set_gdbarch_num_regs (gdbarch, 16); set_gdbarch_num_pseudo_regs (gdbarch, 2); set_gdbarch_ecoff_reg_to_regnum (gdbarch, h8300s_dbg_reg_to_regnum); - set_gdbarch_dwarf_reg_to_regnum (gdbarch, h8300s_dbg_reg_to_regnum); set_gdbarch_dwarf2_reg_to_regnum (gdbarch, h8300s_dbg_reg_to_regnum); set_gdbarch_stab_reg_to_regnum (gdbarch, h8300s_dbg_reg_to_regnum); set_gdbarch_register_name (gdbarch, h8300s_register_name); @@ -1301,7 +1298,6 @@ h8300_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) set_gdbarch_num_regs (gdbarch, 18); set_gdbarch_num_pseudo_regs (gdbarch, 2); set_gdbarch_ecoff_reg_to_regnum (gdbarch, h8300s_dbg_reg_to_regnum); - set_gdbarch_dwarf_reg_to_regnum (gdbarch, h8300s_dbg_reg_to_regnum); set_gdbarch_dwarf2_reg_to_regnum (gdbarch, h8300s_dbg_reg_to_regnum); set_gdbarch_stab_reg_to_regnum (gdbarch, h8300s_dbg_reg_to_regnum); set_gdbarch_register_name (gdbarch, h8300sx_register_name); diff --git a/gdb/hppa-linux-tdep.c b/gdb/hppa-linux-tdep.c index 1e0e5833eb..71bea33a30 100644 --- a/gdb/hppa-linux-tdep.c +++ b/gdb/hppa-linux-tdep.c @@ -544,7 +544,6 @@ hppa_linux_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) #if 0 /* Dwarf-2 unwinding support. Not yet working. */ - set_gdbarch_dwarf_reg_to_regnum (gdbarch, hppa_dwarf_reg_to_regnum); set_gdbarch_dwarf2_reg_to_regnum (gdbarch, hppa_dwarf_reg_to_regnum); frame_unwind_append_sniffer (gdbarch, dwarf2_frame_sniffer); frame_base_append_sniffer (gdbarch, dwarf2_frame_base_sniffer); diff --git a/gdb/hppa-tdep.c b/gdb/hppa-tdep.c index a4731acf27..676f680144 100644 --- a/gdb/hppa-tdep.c +++ b/gdb/hppa-tdep.c @@ -3035,7 +3035,6 @@ hppa_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) set_gdbarch_num_regs (gdbarch, hppa64_num_regs); set_gdbarch_register_name (gdbarch, hppa64_register_name); set_gdbarch_register_type (gdbarch, hppa64_register_type); - set_gdbarch_dwarf_reg_to_regnum (gdbarch, hppa64_dwarf_reg_to_regnum); set_gdbarch_dwarf2_reg_to_regnum (gdbarch, hppa64_dwarf_reg_to_regnum); set_gdbarch_cannot_store_register (gdbarch, hppa64_cannot_store_register); diff --git a/gdb/i386-tdep.c b/gdb/i386-tdep.c index 08484bac21..be4f4f38df 100644 --- a/gdb/i386-tdep.c +++ b/gdb/i386-tdep.c @@ -2567,8 +2567,7 @@ i386_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) set_gdbarch_stab_reg_to_regnum (gdbarch, i386_dbx_reg_to_regnum); set_gdbarch_sdb_reg_to_regnum (gdbarch, i386_dbx_reg_to_regnum); - /* Use the SVR4 register numbering scheme for DWARF and DWARF 2. */ - set_gdbarch_dwarf_reg_to_regnum (gdbarch, i386_svr4_reg_to_regnum); + /* Use the SVR4 register numbering scheme for DWARF 2. */ set_gdbarch_dwarf2_reg_to_regnum (gdbarch, i386_svr4_reg_to_regnum); /* We don't set gdbarch_stab_reg_to_regnum, since ECOFF doesn't seem to diff --git a/gdb/m32c-tdep.c b/gdb/m32c-tdep.c index fa7b465740..513da03da1 100644 --- a/gdb/m32c-tdep.c +++ b/gdb/m32c-tdep.c @@ -959,7 +959,6 @@ make_regs (struct gdbarch *arch) set_gdbarch_pseudo_register_write (arch, m32c_pseudo_register_write); set_gdbarch_register_sim_regno (arch, m32c_register_sim_regno); set_gdbarch_stab_reg_to_regnum (arch, m32c_debug_info_reg_to_regnum); - set_gdbarch_dwarf_reg_to_regnum (arch, m32c_debug_info_reg_to_regnum); set_gdbarch_dwarf2_reg_to_regnum (arch, m32c_debug_info_reg_to_regnum); set_gdbarch_register_reggroup_p (arch, m32c_register_reggroup_p); diff --git a/gdb/m68k-tdep.c b/gdb/m68k-tdep.c index 3aa4f7985c..7fb70e9755 100644 --- a/gdb/m68k-tdep.c +++ b/gdb/m68k-tdep.c @@ -1152,7 +1152,6 @@ m68k_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) set_gdbarch_decr_pc_after_break (gdbarch, 2); set_gdbarch_frame_args_skip (gdbarch, 8); - set_gdbarch_dwarf_reg_to_regnum (gdbarch, m68k_dwarf_reg_to_regnum); set_gdbarch_dwarf2_reg_to_regnum (gdbarch, m68k_dwarf_reg_to_regnum); set_gdbarch_register_type (gdbarch, m68k_register_type); diff --git a/gdb/mips-tdep.c b/gdb/mips-tdep.c index eb50a9d89d..6277407695 100644 --- a/gdb/mips-tdep.c +++ b/gdb/mips-tdep.c @@ -5781,8 +5781,6 @@ mips_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) set_gdbarch_stab_reg_to_regnum (gdbarch, mips_stab_reg_to_regnum); set_gdbarch_ecoff_reg_to_regnum (gdbarch, mips_dwarf_dwarf2_ecoff_reg_to_regnum); - set_gdbarch_dwarf_reg_to_regnum (gdbarch, - mips_dwarf_dwarf2_ecoff_reg_to_regnum); set_gdbarch_dwarf2_reg_to_regnum (gdbarch, mips_dwarf_dwarf2_ecoff_reg_to_regnum); set_gdbarch_register_sim_regno (gdbarch, mips_register_sim_regno); diff --git a/gdb/s390-tdep.c b/gdb/s390-tdep.c index 9239f0bba6..db1891fb5b 100644 --- a/gdb/s390-tdep.c +++ b/gdb/s390-tdep.c @@ -2353,7 +2353,6 @@ s390_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) set_gdbarch_register_name (gdbarch, s390_register_name); set_gdbarch_register_type (gdbarch, s390_register_type); set_gdbarch_stab_reg_to_regnum (gdbarch, s390_dwarf_reg_to_regnum); - set_gdbarch_dwarf_reg_to_regnum (gdbarch, s390_dwarf_reg_to_regnum); set_gdbarch_dwarf2_reg_to_regnum (gdbarch, s390_dwarf_reg_to_regnum); set_gdbarch_value_from_register (gdbarch, s390_value_from_register); set_gdbarch_register_reggroup_p (gdbarch, s390_register_reggroup_p); diff --git a/gdb/xtensa-tdep.c b/gdb/xtensa-tdep.c index a6181dad27..84c3d7c081 100644 --- a/gdb/xtensa-tdep.c +++ b/gdb/xtensa-tdep.c @@ -2650,9 +2650,8 @@ xtensa_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) set_gdbarch_pc_regnum (gdbarch, tdep->pc_regnum); set_gdbarch_ps_regnum (gdbarch, tdep->ps_regnum); - /* Renumber registers for known formats (stab, dwarf, and dwarf2). */ + /* Renumber registers for known formats (stabs and dwarf2). */ set_gdbarch_stab_reg_to_regnum (gdbarch, xtensa_reg_to_regnum); - set_gdbarch_dwarf_reg_to_regnum (gdbarch, xtensa_reg_to_regnum); set_gdbarch_dwarf2_reg_to_regnum (gdbarch, xtensa_reg_to_regnum); /* We provide our own function to get register information. */ -- 2.34.1