This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
[commit] Simplify NetBSD/alpha core file handling a bit
- From: Mark Kettenis <mark dot kettenis at xs4all dot nl>
- To: gdb-patches at sourceware dot org
- Date: Mon, 10 Jul 2006 00:02:03 +0200 (CEST)
- Subject: [commit] Simplify NetBSD/alpha core file handling a bit
This makes it easier for me to support OpenBSD/alpha in an upcoming
patch. It's less code too!
Committed,
Mark
Index: ChangeLog
from Mark Kettenis <kettenis@gnu.org>
* alphabsd-tdep.h (alphanbsd_regset_from_core_section): New
prototype.
* alphanbsd-tdep.c (alphanbsd_regset_from_core_section): Handle
a.out-style core file format here. Make global.
(alphanbsd_regset_from_core_section): Remove.
(alphanbsd_sigtramp_offset): Make static.
(alphanbsd_aout_init_abi): Remove.
(alphanbsd_core_osabi_sniffer): Return GDB_OSABI_NETBSD_ELF for
a.out style core files.
(_initialize_alphanbsd_tdep): Do not register a handler for
GDB_OSABI_NETBSD_AOUT.
Index: alphabsd-tdep.h
===================================================================
RCS file: /cvs/src/src/gdb/alphabsd-tdep.h,v
retrieving revision 1.3
diff -u -p -r1.3 alphabsd-tdep.h
--- alphabsd-tdep.h 9 Jul 2006 16:12:11 -0000 1.3
+++ alphabsd-tdep.h 9 Jul 2006 22:00:19 -0000
@@ -27,5 +27,14 @@ void alphabsd_fill_reg (char *, int);
void alphabsd_supply_fpreg (char *, int);
void alphabsd_fill_fpreg (char *, int);
+
+
+/* Functions exported from alphanbsd-tdep.c. */
+
+/* Return the appropriate register set for the core section identified
+ by SECT_NAME and SECT_SIZE. */
+extern const struct regset *
+ alphanbsd_regset_from_core_section (struct gdbarch *gdbarch,
+ const char *sect_name, size_t len);
#endif /* alphabsd-tdep.h */
Index: alphanbsd-tdep.c
===================================================================
RCS file: /cvs/src/src/gdb/alphanbsd-tdep.c,v
retrieving revision 1.30
diff -u -p -r1.30 alphanbsd-tdep.c
--- alphanbsd-tdep.c 9 Jul 2006 16:12:11 -0000 1.30
+++ alphanbsd-tdep.c 9 Jul 2006 22:00:19 -0000
@@ -163,29 +163,23 @@ static struct regset alphanbsd_aout_greg
/* Return the appropriate register set for the core section identified
by SECT_NAME and SECT_SIZE. */
-static const struct regset *
+const struct regset *
alphanbsd_regset_from_core_section (struct gdbarch *gdbarch,
const char *sect_name, size_t sect_size)
{
if (strcmp (sect_name, ".reg") == 0 && sect_size >= ALPHANBSD_SIZEOF_GREGS)
- return &alphanbsd_gregset;
+ {
+ if (sect_size >= ALPHANBSD_SIZEOF_GREGS + ALPHANBSD_SIZEOF_FPREGS)
+ return &alphanbsd_aout_gregset;
+ else
+ return &alphanbsd_gregset;
+ }
if (strcmp (sect_name, ".reg2") == 0 && sect_size >= ALPHANBSD_SIZEOF_FPREGS)
return &alphanbsd_fpregset;
return NULL;
}
-
-static const struct regset *
-alphanbsd_aout_regset_from_core_section (struct gdbarch *gdbarch,
- const char *sect_name,
- size_t sect_size)
-{
- if (strcmp (sect_name, ".reg") == 0 && sect_size >= ALPHANBSD_SIZEOF_GREGS)
- return &alphanbsd_aout_gregset;
-
- return NULL;
-}
/* Signal trampolines. */
@@ -216,7 +210,7 @@ static const unsigned char sigtramp_retc
#define RETCODE_NWORDS 4
#define RETCODE_SIZE (RETCODE_NWORDS * 4)
-LONGEST
+static LONGEST
alphanbsd_sigtramp_offset (CORE_ADDR pc)
{
unsigned char ret[RETCODE_SIZE], w[4];
@@ -261,6 +255,7 @@ alphanbsd_sigcontext_addr (struct frame_
out which trampoline frame type we have. */
return get_frame_base (frame);
}
+
static void
alphanbsd_init_abi (struct gdbarch_info info,
@@ -292,23 +287,13 @@ alphanbsd_init_abi (struct gdbarch_info
set_gdbarch_regset_from_core_section
(gdbarch, alphanbsd_regset_from_core_section);
}
-
-static void
-alphanbsd_aout_init_abi (struct gdbarch_info info,
- struct gdbarch *gdbarch)
-{
- alphanbsd_init_abi(info, gdbarch);
-
- set_gdbarch_regset_from_core_section
- (gdbarch, alphanbsd_aout_regset_from_core_section);
-}
static enum gdb_osabi
alphanbsd_core_osabi_sniffer (bfd *abfd)
{
if (strcmp (bfd_get_target (abfd), "netbsd-core") == 0)
- return GDB_OSABI_NETBSD_AOUT;
+ return GDB_OSABI_NETBSD_ELF;
return GDB_OSABI_UNKNOWN;
}
@@ -326,8 +311,6 @@ _initialize_alphanbsd_tdep (void)
gdbarch_register_osabi (bfd_arch_alpha, 0, GDB_OSABI_NETBSD_ELF,
alphanbsd_init_abi);
- gdbarch_register_osabi (bfd_arch_alpha, 0, GDB_OSABI_NETBSD_AOUT,
- alphanbsd_aout_init_abi);
gdbarch_register_osabi (bfd_arch_alpha, 0, GDB_OSABI_OPENBSD_ELF,
- alphanbsd_aout_init_abi);
+ alphanbsd_init_abi);
}