FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* osabi.c: Include "gdb_assert.h" and "gdb_string.h".

Browse source 
(struct gdb_osabi_handler): Remove member `arch'.  Add member
`arch_info'.
(gdbarch_register_osabi): Add new argument `machine'.  Use ot to
construct a `struct bfd_arch_info' and store it in the `struct
gdb_osabi_handler' that is created.
(gdbarch_init_osabi): Check for compatibility based on machine
type and architecture.
* osabi.h (gdbarch_register_osabi): Adjust prototype and update
comment.
* alpha-linux-tdep.c (_initialize_alpha_linux_tdep): Add 0 as
second argument in call to gdbarch_register_osabi.
* alpha-osf1-tdep.c (_initialize_alpha_osf1_tdep): Likewise.
* alphafbsd-tdep.c (_initialize_alphafbsd_tdep): Likewise.
* alphanbsd-tdep.c (_initialize_alphanbsd_tdep): Likewise.
* arm-linux-tdep.c (_initialize_arm_linux_tdep): Likewise.
* arm-tdep.c (_initialize_arm_tdep): Likewise.
* armnbsd-tdep.c (_initialize_armnbsd_tdep): Likewise.
* hppa-hpux-tdep.c (_initialize_hppa_hpux_tdep): Likewise.
* i386-interix-tdep.c (_initialize_i386_interix_tdep): Likewise.
* i386-linux-tdep.c (_initialize_i386_linux_tdep): Likewise.
* i386-sol2-tdep.c (_initialize_i386_sol2_tdep): Likewise.
* i386-tdep.c (_initialize_i386_tdep): Likewise.
* i386bsd-tdep.c (_initialize_i386bsd_tdep): Likewise.
* i386gnu-tdep.c (_initialize_i386gnu_tdep): Likewise.
* i386ly-tdep.c (_initialize_i386lynx_tdep): Renamed from
_initialize_i386bsd_tdep and updated likewise.
* i386nbsd-tdep.c (_initialize_i386nbsd_tdep): Likewise.
* i386obsd-tdep.c (_initialize_i386obsd_tdep): Likewise.
* mips-irix-tdep.c (_initialize_mips_irix_tdep): Likewise.
* mips-linux-tdep.c (_initialize_mips_linux_tdep): Likewise.
* mipsnbsd-tdep.c (_initialize_mipsnbsd__tdep): Likewise.
* ns32knbsd-tdep.c (_initialize_ns32kmnsd_tdep): Likewise.
* ppc-linux-tdep.c (_initialize_ppc_linux_tdep): Likewise.
* ppcnbsd-tdep.c (_initialize_ppcnbsd_tdep): Likewise.
* shnbsd-tdep.c (_initialize_shnbsd_tdep): Likewise.
* sparcnbsd-tdep.c (_initialize_sparcnbsd_tdep): Likewise.
This commit is contained in:
Mark Kettenis 2002-12-21 19:58:07 +00:00
parent 743b930b59
commit 05816f706e
28 changed files with 111 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

40
gdb/ChangeLog
View file

@ -1,3 +1,43 @@
2002-12-14 Mark Kettenis <kettenis@gnu.org>
* osabi.c: Include "gdb_assert.h" and "gdb_string.h".
(struct gdb_osabi_handler): Remove member `arch'. Add member
`arch_info'.
(gdbarch_register_osabi): Add new argument `machine'. Use ot to
construct a `struct bfd_arch_info' and store it in the `struct
gdb_osabi_handler' that is created.
(gdbarch_init_osabi): Check for compatibility based on machine
type and architecture.
* osabi.h (gdbarch_register_osabi): Adjust prototype and update
comment.
* alpha-linux-tdep.c (_initialize_alpha_linux_tdep): Add 0 as
second argument in call to gdbarch_register_osabi.
* alpha-osf1-tdep.c (_initialize_alpha_osf1_tdep): Likewise.
* alphafbsd-tdep.c (_initialize_alphafbsd_tdep): Likewise.
* alphanbsd-tdep.c (_initialize_alphanbsd_tdep): Likewise.
* arm-linux-tdep.c (_initialize_arm_linux_tdep): Likewise.
* arm-tdep.c (_initialize_arm_tdep): Likewise.
* armnbsd-tdep.c (_initialize_armnbsd_tdep): Likewise.
* hppa-hpux-tdep.c (_initialize_hppa_hpux_tdep): Likewise.
* i386-interix-tdep.c (_initialize_i386_interix_tdep): Likewise.
* i386-linux-tdep.c (_initialize_i386_linux_tdep): Likewise.
* i386-sol2-tdep.c (_initialize_i386_sol2_tdep): Likewise.
* i386-tdep.c (_initialize_i386_tdep): Likewise.
* i386bsd-tdep.c (_initialize_i386bsd_tdep): Likewise.
* i386gnu-tdep.c (_initialize_i386gnu_tdep): Likewise.
* i386ly-tdep.c (_initialize_i386lynx_tdep): Renamed from
_initialize_i386bsd_tdep and updated likewise.
* i386nbsd-tdep.c (_initialize_i386nbsd_tdep): Likewise.
* i386obsd-tdep.c (_initialize_i386obsd_tdep): Likewise.
* mips-irix-tdep.c (_initialize_mips_irix_tdep): Likewise.
* mips-linux-tdep.c (_initialize_mips_linux_tdep): Likewise.
* mipsnbsd-tdep.c (_initialize_mipsnbsd__tdep): Likewise.
* ns32knbsd-tdep.c (_initialize_ns32kmnsd_tdep): Likewise.
* ppc-linux-tdep.c (_initialize_ppc_linux_tdep): Likewise.
* ppcnbsd-tdep.c (_initialize_ppcnbsd_tdep): Likewise.
* shnbsd-tdep.c (_initialize_shnbsd_tdep): Likewise.
* sparcnbsd-tdep.c (_initialize_sparcnbsd_tdep): Likewise.
2002-12-20 Kevin Buettner <kevinb@redhat.com> 2002-12-20 Kevin Buettner <kevinb@redhat.com>
* solib-svr4.c (elf_locate_base): Fix sizeof() related bug. Add * solib-svr4.c (elf_locate_base): Fix sizeof() related bug. Add

2
gdb/alpha-linux-tdep.c
View file

@ -116,6 +116,6 @@ alpha_linux_init_abi (struct gdbarch_info info,
void void
_initialize_alpha_linux_tdep (void) _initialize_alpha_linux_tdep (void)
{ {
gdbarch_register_osabi (bfd_arch_alpha, GDB_OSABI_LINUX, gdbarch_register_osabi (bfd_arch_alpha, 0, GDB_OSABI_LINUX,
alpha_linux_init_abi); alpha_linux_init_abi);
} }

3
gdb/alpha-osf1-tdep.c
View file

@ -73,5 +73,6 @@ alpha_osf1_init_abi (struct gdbarch_info info,
void void
_initialize_alpha_osf1_tdep (void) _initialize_alpha_osf1_tdep (void)
{ {
gdbarch_register_osabi (bfd_arch_alpha, GDB_OSABI_OSF1, alpha_osf1_init_abi); gdbarch_register_osabi (bfd_arch_alpha, 0, GDB_OSABI_OSF1,
alpha_osf1_init_abi);
} }

2
gdb/alphafbsd-tdep.c
View file

@ -78,6 +78,6 @@ alphafbsd_init_abi (struct gdbarch_info info,
void void
_initialize_alphafbsd_tdep (void) _initialize_alphafbsd_tdep (void)
{ {
gdbarch_register_osabi (bfd_arch_alpha, GDB_OSABI_FREEBSD_ELF, gdbarch_register_osabi (bfd_arch_alpha, 0, GDB_OSABI_FREEBSD_ELF,
alphafbsd_init_abi); alphafbsd_init_abi);
} }

2
gdb/alphanbsd-tdep.c
View file

@ -232,7 +232,7 @@ alphanbsd_init_abi (struct gdbarch_info info,
void void
_initialize_alphanbsd_tdep (void) _initialize_alphanbsd_tdep (void)
{ {
gdbarch_register_osabi (bfd_arch_alpha, GDB_OSABI_NETBSD_ELF, gdbarch_register_osabi (bfd_arch_alpha, 0, GDB_OSABI_NETBSD_ELF,
alphanbsd_init_abi); alphanbsd_init_abi);
add_core_fns (&alphanbsd_core_fns); add_core_fns (&alphanbsd_core_fns);

3
gdb/arm-linux-tdep.c
View file

@ -543,5 +543,6 @@ arm_linux_init_abi (struct gdbarch_info info,
void void
_initialize_arm_linux_tdep (void) _initialize_arm_linux_tdep (void)
{ {
gdbarch_register_osabi (bfd_arch_arm, GDB_OSABI_LINUX, arm_linux_init_abi); gdbarch_register_osabi (bfd_arch_arm, 0, GDB_OSABI_LINUX,
arm_linux_init_abi);
} }

6
gdb/arm-tdep.c
View file

@ -3110,11 +3110,11 @@ _initialize_arm_tdep (void)
arm_elf_osabi_sniffer); arm_elf_osabi_sniffer);
/* Register some ABI variants for embedded systems. */ /* Register some ABI variants for embedded systems. */
gdbarch_register_osabi (bfd_arch_arm, GDB_OSABI_ARM_EABI_V1, gdbarch_register_osabi (bfd_arch_arm, 0, GDB_OSABI_ARM_EABI_V1,
arm_init_abi_eabi_v1); arm_init_abi_eabi_v1);
gdbarch_register_osabi (bfd_arch_arm, GDB_OSABI_ARM_EABI_V2, gdbarch_register_osabi (bfd_arch_arm, 0, GDB_OSABI_ARM_EABI_V2,
arm_init_abi_eabi_v2); arm_init_abi_eabi_v2);
gdbarch_register_osabi (bfd_arch_arm, GDB_OSABI_ARM_APCS, gdbarch_register_osabi (bfd_arch_arm, 0, GDB_OSABI_ARM_APCS,
arm_init_abi_apcs); arm_init_abi_apcs);
tm_print_insn = gdb_print_insn_arm; tm_print_insn = gdb_print_insn_arm;

4
gdb/armnbsd-tdep.c
View file

@ -97,8 +97,8 @@ _initialize_arm_netbsd_tdep (void)
gdbarch_register_osabi_sniffer (bfd_arch_arm, bfd_target_aout_flavour, gdbarch_register_osabi_sniffer (bfd_arch_arm, bfd_target_aout_flavour,
arm_netbsd_aout_osabi_sniffer); arm_netbsd_aout_osabi_sniffer);
gdbarch_register_osabi (bfd_arch_arm, GDB_OSABI_NETBSD_AOUT, gdbarch_register_osabi (bfd_arch_arm, 0, GDB_OSABI_NETBSD_AOUT,
arm_netbsd_aout_init_abi); arm_netbsd_aout_init_abi);
gdbarch_register_osabi (bfd_arch_arm, GDB_OSABI_NETBSD_ELF, gdbarch_register_osabi (bfd_arch_arm, 0, GDB_OSABI_NETBSD_ELF,
arm_netbsd_elf_init_abi); arm_netbsd_elf_init_abi);
} }

5
gdb/hppa-hpux-tdep.c
View file

@ -38,9 +38,8 @@ hppa_hpux_elf_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
void void
_initialize_hppa_hpux_tdep (void) _initialize_hppa_hpux_tdep (void)
{ {
gdbarch_register_osabi (bfd_arch_hppa, GDB_OSABI_HPUX_SOM, gdbarch_register_osabi (bfd_arch_hppa, 0, GDB_OSABI_HPUX_SOM,
hppa_hpux_som_init_abi); hppa_hpux_som_init_abi);
gdbarch_register_osabi (bfd_arch_hppa, GDB_OSABI_HPUX_ELF, gdbarch_register_osabi (bfd_arch_hppa, 0, GDB_OSABI_HPUX_ELF,
hppa_hpux_elf_init_abi); hppa_hpux_elf_init_abi);
} }

2
gdb/i386-interix-tdep.c
View file

@ -354,6 +354,6 @@ _initialize_i386_interix_tdep (void)
gdbarch_register_osabi_sniffer (bfd_arch_i386, bfd_target_coff_flavour, gdbarch_register_osabi_sniffer (bfd_arch_i386, bfd_target_coff_flavour,
i386_interix_osabi_sniffer); i386_interix_osabi_sniffer);
gdbarch_register_osabi (bfd_arch_i386, GDB_OSABI_INTERIX, gdbarch_register_osabi (bfd_arch_i386, 0, GDB_OSABI_INTERIX,
i386_interix_init_abi); i386_interix_init_abi);
} }

2
gdb/i386-linux-tdep.c
View file

@ -482,6 +482,6 @@ extern void _initialize_i386_linux_tdep (void);
void void
_initialize_i386_linux_tdep (void) _initialize_i386_linux_tdep (void)
{ {
gdbarch_register_osabi (bfd_arch_i386, GDB_OSABI_LINUX, gdbarch_register_osabi (bfd_arch_i386, 0, GDB_OSABI_LINUX,
i386_linux_init_abi); i386_linux_init_abi);
} }

2
gdb/i386-sol2-tdep.c
View file

@ -75,6 +75,6 @@ _initialize_i386_sol2_tdep (void)
gdbarch_register_osabi_sniffer (bfd_arch_i386, bfd_target_elf_flavour, gdbarch_register_osabi_sniffer (bfd_arch_i386, bfd_target_elf_flavour,
i386_sol2_osabi_sniffer); i386_sol2_osabi_sniffer);
gdbarch_register_osabi (bfd_arch_i386, GDB_OSABI_SOLARIS, gdbarch_register_osabi (bfd_arch_i386, 0, GDB_OSABI_SOLARIS,
i386_sol2_init_abi); i386_sol2_init_abi);
} }

6
gdb/i386-tdep.c
View file

@ -1715,11 +1715,11 @@ are \"default\", \"pcc\" and \"reg\", and the default value is \"default\".",
gdbarch_register_osabi_sniffer (bfd_arch_i386, bfd_target_nlm_flavour, gdbarch_register_osabi_sniffer (bfd_arch_i386, bfd_target_nlm_flavour,
i386_nlm_osabi_sniffer); i386_nlm_osabi_sniffer);
gdbarch_register_osabi (bfd_arch_i386, GDB_OSABI_SVR4, gdbarch_register_osabi (bfd_arch_i386, 0, GDB_OSABI_SVR4,
i386_svr4_init_abi); i386_svr4_init_abi);
gdbarch_register_osabi (bfd_arch_i386, GDB_OSABI_GO32, gdbarch_register_osabi (bfd_arch_i386, 0, GDB_OSABI_GO32,
i386_go32_init_abi); i386_go32_init_abi);
gdbarch_register_osabi (bfd_arch_i386, GDB_OSABI_NETWARE, gdbarch_register_osabi (bfd_arch_i386, 0, GDB_OSABI_NETWARE,
i386_nw_init_abi); i386_nw_init_abi);
/* Initialize the i386 specific register groups. */ /* Initialize the i386 specific register groups. */

4
gdb/i386bsd-tdep.c
View file

@ -195,8 +195,8 @@ _initialize_i386bsd_tdep (void)
gdbarch_register_osabi_sniffer (bfd_arch_i386, bfd_target_aout_flavour, gdbarch_register_osabi_sniffer (bfd_arch_i386, bfd_target_aout_flavour,
i386bsd_aout_osabi_sniffer); i386bsd_aout_osabi_sniffer);
gdbarch_register_osabi (bfd_arch_i386, GDB_OSABI_FREEBSD_AOUT, gdbarch_register_osabi (bfd_arch_i386, 0, GDB_OSABI_FREEBSD_AOUT,
i386fbsdaout_init_abi); i386fbsdaout_init_abi);
gdbarch_register_osabi (bfd_arch_i386, GDB_OSABI_FREEBSD_ELF, gdbarch_register_osabi (bfd_arch_i386, 0, GDB_OSABI_FREEBSD_ELF,
i386fbsd4_init_abi); i386fbsd4_init_abi);
} }

2
gdb/i386gnu-tdep.c
View file

@ -39,5 +39,5 @@ extern void _initialize_i386gnu_tdep (void);
void void
_initialize_i386gnu_tdep (void) _initialize_i386gnu_tdep (void)
{ {
gdbarch_register_osabi (bfd_arch_i386, GDB_OSABI_HURD, i386gnu_init_abi); gdbarch_register_osabi (bfd_arch_i386, 0, GDB_OSABI_HURD, i386gnu_init_abi);
} }

4
gdb/i386ly-tdep.c
View file

@ -70,11 +70,11 @@ i386lynx_coff_osabi_sniffer (bfd *abfd)
void _initialize_i386lynx_tdep (void); void _initialize_i386lynx_tdep (void);
void void
_initialize_i386bsd_tdep (void) _initialize_i386lynx_tdep (void)
{ {
gdbarch_register_osabi_sniffer (bfd_arch_i386, bfd_target_coff_flavour, gdbarch_register_osabi_sniffer (bfd_arch_i386, bfd_target_coff_flavour,
i386lynx_coff_osabi_sniffer); i386lynx_coff_osabi_sniffer);
gdbarch_register_osabi (bfd_arch_i386, GDB_OSABI_LYNXOS, gdbarch_register_osabi (bfd_arch_i386, 0, GDB_OSABI_LYNXOS,
i386lynx_init_abi); i386lynx_init_abi);
} }

4
gdb/i386nbsd-tdep.c
View file

@ -299,8 +299,8 @@ _initialize_i386nbsd_tdep (void)
add_core_fns (&i386nbsd_core_fns); add_core_fns (&i386nbsd_core_fns);
add_core_fns (&i386nbsd_elfcore_fns); add_core_fns (&i386nbsd_elfcore_fns);
gdbarch_register_osabi (bfd_arch_i386, GDB_OSABI_NETBSD_AOUT, gdbarch_register_osabi (bfd_arch_i386, 0, GDB_OSABI_NETBSD_AOUT,
i386nbsd_init_abi); i386nbsd_init_abi);
gdbarch_register_osabi (bfd_arch_i386, GDB_OSABI_NETBSD_ELF, gdbarch_register_osabi (bfd_arch_i386, 0, GDB_OSABI_NETBSD_ELF,
i386nbsdelf_init_abi); i386nbsdelf_init_abi);
} }

2
gdb/i386obsd-tdep.c
View file

@ -117,6 +117,6 @@ _initialize_i386obsd_tdep (void)
expected. */ expected. */
#define GDB_OSABI_OPENBSD_AOUT GDB_OSABI_NETBSD_AOUT #define GDB_OSABI_OPENBSD_AOUT GDB_OSABI_NETBSD_AOUT
gdbarch_register_osabi (bfd_arch_i386, GDB_OSABI_OPENBSD_AOUT, gdbarch_register_osabi (bfd_arch_i386, 0, GDB_OSABI_OPENBSD_AOUT,
i386obsd_init_abi); i386obsd_init_abi);
} }

2
gdb/mips-irix-tdep.c
View file

@ -90,6 +90,6 @@ _initialize_mips_irix_tdep (void)
bfd_target_elf_flavour, bfd_target_elf_flavour,
mips_irix_elf_osabi_sniffer); mips_irix_elf_osabi_sniffer);
gdbarch_register_osabi (bfd_arch_mips, GDB_OSABI_IRIX, gdbarch_register_osabi (bfd_arch_mips, 0, GDB_OSABI_IRIX,
mips_irix_init_abi); mips_irix_init_abi);
} }

2
gdb/mips-linux-tdep.c
View file

@ -358,7 +358,7 @@ mips_linux_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
void void
_initialize_mips_linux_tdep (void) _initialize_mips_linux_tdep (void)
{ {
gdbarch_register_osabi (bfd_arch_mips, GDB_OSABI_LINUX, gdbarch_register_osabi (bfd_arch_mips, 0, GDB_OSABI_LINUX,
mips_linux_init_abi); mips_linux_init_abi);
add_core_fns (&regset_core_fns); add_core_fns (&regset_core_fns);
} }

2
gdb/mipsnbsd-tdep.c
View file

@ -359,7 +359,7 @@ mipsnbsd_init_abi (struct gdbarch_info info,
void void
_initialize_mipsnbsd_tdep (void) _initialize_mipsnbsd_tdep (void)
{ {
gdbarch_register_osabi (bfd_arch_mips, GDB_OSABI_NETBSD_ELF, gdbarch_register_osabi (bfd_arch_mips, 0, GDB_OSABI_NETBSD_ELF,
mipsnbsd_init_abi); mipsnbsd_init_abi);
add_core_fns (&mipsnbsd_core_fns); add_core_fns (&mipsnbsd_core_fns);

2
gdb/ns32knbsd-tdep.c
View file

@ -66,6 +66,6 @@ _initialize_ns32knbsd_tdep (void)
gdbarch_register_osabi_sniffer (bfd_arch_ns32k, bfd_target_aout_flavour, gdbarch_register_osabi_sniffer (bfd_arch_ns32k, bfd_target_aout_flavour,
ns32knbsd_aout_osabi_sniffer); ns32knbsd_aout_osabi_sniffer);
gdbarch_register_osabi (bfd_arch_ns32k, GDB_OSABI_NETBSD_AOUT, gdbarch_register_osabi (bfd_arch_ns32k, 0, GDB_OSABI_NETBSD_AOUT,
ns32knbsd_init_abi_aout); ns32knbsd_init_abi_aout);
} }

38
gdb/osabi.c
View file

@ -19,7 +19,10 @@
Boston, MA 02111-1307, USA. */ Boston, MA 02111-1307, USA. */
#include "defs.h" #include "defs.h"
#include "gdb_assert.h"
#include "gdb_string.h" #include "gdb_string.h"
#include "osabi.h" #include "osabi.h"
#include "elf-bfd.h" #include "elf-bfd.h"
@ -70,7 +73,7 @@ gdbarch_osabi_name (enum gdb_osabi osabi)
struct gdb_osabi_handler struct gdb_osabi_handler
{ {
struct gdb_osabi_handler *next; struct gdb_osabi_handler *next;
enum bfd_architecture arch; const struct bfd_arch_info *arch_info;
enum gdb_osabi osabi; enum gdb_osabi osabi;
void (*init_osabi)(struct gdbarch_info, struct gdbarch *); void (*init_osabi)(struct gdbarch_info, struct gdbarch *);
}; };
@ -78,11 +81,13 @@ struct gdb_osabi_handler
static struct gdb_osabi_handler *gdb_osabi_handler_list; static struct gdb_osabi_handler *gdb_osabi_handler_list;
void void
gdbarch_register_osabi (enum bfd_architecture arch, enum gdb_osabi osabi, gdbarch_register_osabi (enum bfd_architecture arch, unsigned long machine,
enum gdb_osabi osabi,
void (*init_osabi)(struct gdbarch_info, void (*init_osabi)(struct gdbarch_info,
struct gdbarch *)) struct gdbarch *))
{ {
struct gdb_osabi_handler **handler_p; struct gdb_osabi_handler **handler_p;
const struct bfd_arch_info *arch_info = bfd_lookup_arch (arch, machine);
/* Registering an OS ABI handler for "unknown" is not allowed. */ /* Registering an OS ABI handler for "unknown" is not allowed. */
if (osabi == GDB_OSABI_UNKNOWN) if (osabi == GDB_OSABI_UNKNOWN)
@ -93,14 +98,16 @@ gdbarch_register_osabi (enum bfd_architecture arch, enum gdb_osabi osabi,
"OS ABI \"%s\" for architecture %s was made. The handler will " "OS ABI \"%s\" for architecture %s was made. The handler will "
"not be registered", "not be registered",
gdbarch_osabi_name (osabi), gdbarch_osabi_name (osabi),
bfd_printable_arch_mach (arch, 0)); bfd_printable_arch_mach (arch, machine));
return; return;
} }
gdb_assert (arch_info);
for (handler_p = &gdb_osabi_handler_list; *handler_p != NULL; for (handler_p = &gdb_osabi_handler_list; *handler_p != NULL;
handler_p = &(*handler_p)->next) handler_p = &(*handler_p)->next)
{ {
if ((*handler_p)->arch == arch if ((*handler_p)->arch_info == arch_info
&& (*handler_p)->osabi == osabi) && (*handler_p)->osabi == osabi)
{ {
internal_error internal_error
@ -108,7 +115,7 @@ gdbarch_register_osabi (enum bfd_architecture arch, enum gdb_osabi osabi,
"gdbarch_register_osabi: A handler for OS ABI \"%s\" " "gdbarch_register_osabi: A handler for OS ABI \"%s\" "
"has already been registered for architecture %s", "has already been registered for architecture %s",
gdbarch_osabi_name (osabi), gdbarch_osabi_name (osabi),
bfd_printable_arch_mach (arch, 0)); arch_info->printable_name);
/* If user wants to continue, override previous definition. */ /* If user wants to continue, override previous definition. */
(*handler_p)->init_osabi = init_osabi; (*handler_p)->init_osabi = init_osabi;
return; return;
@ -118,7 +125,7 @@ gdbarch_register_osabi (enum bfd_architecture arch, enum gdb_osabi osabi,
(*handler_p) (*handler_p)
= (struct gdb_osabi_handler *) xmalloc (sizeof (struct gdb_osabi_handler)); = (struct gdb_osabi_handler *) xmalloc (sizeof (struct gdb_osabi_handler));
(*handler_p)->next = NULL; (*handler_p)->next = NULL;
(*handler_p)->arch = arch; (*handler_p)->arch_info = arch_info;
(*handler_p)->osabi = osabi; (*handler_p)->osabi = osabi;
(*handler_p)->init_osabi = init_osabi; (*handler_p)->init_osabi = init_osabi;
} }
@ -230,9 +237,9 @@ void
gdbarch_init_osabi (struct gdbarch_info info, struct gdbarch *gdbarch, gdbarch_init_osabi (struct gdbarch_info info, struct gdbarch *gdbarch,
enum gdb_osabi osabi) enum gdb_osabi osabi)
{ {
struct gdb_osabi_handler *handler;
bfd *abfd = info.abfd;
const struct bfd_arch_info *arch_info = gdbarch_bfd_arch_info (gdbarch); const struct bfd_arch_info *arch_info = gdbarch_bfd_arch_info (gdbarch);
const struct bfd_arch_info *compatible;
struct gdb_osabi_handler *handler;
if (osabi == GDB_OSABI_UNKNOWN) if (osabi == GDB_OSABI_UNKNOWN)
{ {
@ -244,8 +251,19 @@ gdbarch_init_osabi (struct gdbarch_info info, struct gdbarch *gdbarch,
for (handler = gdb_osabi_handler_list; handler != NULL; for (handler = gdb_osabi_handler_list; handler != NULL;
handler = handler->next) handler = handler->next)
{ {
if (handler->arch == bfd_get_arch (abfd) if (handler->osabi != osabi)
&& handler->osabi == osabi) continue;
/* Check whether the machine type and architecture of the
handler are compatible with the desired machine type and
architecture.
NOTE: kettenis/20021027: There may be more than one machine
type that is compatible with the desired machine type. Right
now we simply return the first match, which is fine for now.
However, we might want to do something smarter in the future. */
compatible = arch_info->compatible (arch_info, handler->arch_info);
if (compatible == handler->arch_info)
{ {
(*handler->init_osabi) (info, gdbarch); (*handler->init_osabi) (info, gdbarch);
return; return;

8
gdb/osabi.h
View file

@ -61,9 +61,11 @@ void gdbarch_register_osabi_sniffer (enum bfd_architecture,
enum bfd_flavour, enum bfd_flavour,
enum gdb_osabi (*)(bfd *)); enum gdb_osabi (*)(bfd *));
/* Register a handler for an OS ABI variant for a given architecture. There /* Register a handler for an OS ABI variant for a given architecture
should be only one handler for a given OS ABI each architecture family. */ and machine type. There should be only one handler for a given OS
void gdbarch_register_osabi (enum bfd_architecture, enum gdb_osabi, ABI for each architecture and machine type combination. */
void gdbarch_register_osabi (enum bfd_architecture, unsigned long,
enum gdb_osabi,
void (*)(struct gdbarch_info, void (*)(struct gdbarch_info,
struct gdbarch *)); struct gdbarch *));

2
gdb/ppc-linux-tdep.c
View file

@ -726,7 +726,7 @@ ppc_linux_init_abi (struct gdbarch_info info,
void void
_initialize_ppc_linux_tdep (void) _initialize_ppc_linux_tdep (void)
{ {
gdbarch_register_osabi (bfd_arch_powerpc, GDB_OSABI_LINUX, gdbarch_register_osabi (bfd_arch_powerpc, 0, GDB_OSABI_LINUX,
ppc_linux_init_abi); ppc_linux_init_abi);
add_core_fns (&ppc_linux_regset_core_fns); add_core_fns (&ppc_linux_regset_core_fns);
} }

2
gdb/ppcnbsd-tdep.c
View file

@ -219,7 +219,7 @@ ppcnbsd_init_abi (struct gdbarch_info info,
void void
_initialize_ppcnbsd_tdep (void) _initialize_ppcnbsd_tdep (void)
{ {
gdbarch_register_osabi (bfd_arch_powerpc, GDB_OSABI_NETBSD_ELF, gdbarch_register_osabi (bfd_arch_powerpc, 0, GDB_OSABI_NETBSD_ELF,
ppcnbsd_init_abi); ppcnbsd_init_abi);
add_core_fns (&ppcnbsd_core_fns); add_core_fns (&ppcnbsd_core_fns);

3
gdb/shnbsd-tdep.c
View file

@ -188,5 +188,6 @@ _initialize_shnbsd_tdep (void)
add_core_fns (&shnbsd_core_fns); add_core_fns (&shnbsd_core_fns);
add_core_fns (&shnbsd_elfcore_fns); add_core_fns (&shnbsd_elfcore_fns);
gdbarch_register_osabi (bfd_arch_sh, GDB_OSABI_NETBSD_ELF, shnbsd_init_abi); gdbarch_register_osabi (bfd_arch_sh, 0, GDB_OSABI_NETBSD_ELF,
shnbsd_init_abi);
} }

4
gdb/sparcnbsd-tdep.c
View file

@ -523,9 +523,9 @@ _initialize_sparnbsd_tdep (void)
gdbarch_register_osabi_sniffer (bfd_arch_sparc, bfd_target_aout_flavour, gdbarch_register_osabi_sniffer (bfd_arch_sparc, bfd_target_aout_flavour,
sparcnbsd_aout_osabi_sniffer); sparcnbsd_aout_osabi_sniffer);
gdbarch_register_osabi (bfd_arch_sparc, GDB_OSABI_NETBSD_AOUT, gdbarch_register_osabi (bfd_arch_sparc, 0, GDB_OSABI_NETBSD_AOUT,
sparcnbsd_init_abi_aout); sparcnbsd_init_abi_aout);
gdbarch_register_osabi (bfd_arch_sparc, GDB_OSABI_NETBSD_ELF, gdbarch_register_osabi (bfd_arch_sparc, 0, GDB_OSABI_NETBSD_ELF,
sparcnbsd_init_abi_elf); sparcnbsd_init_abi_elf);
add_core_fns (&sparcnbsd_core_fns); add_core_fns (&sparcnbsd_core_fns);