* config/tc-ppc.c (ppc_frob_symbol): Formatting, warning fix.

[deliverable/binutils-gdb.git] / gdb / i386bsd-tdep.c

diff --git a/gdb/i386bsd-tdep.c b/gdb/i386bsd-tdep.c
index 940f2ec66b84f589fc01382a35c6152165e224ee..368fa5631aee5b53acf3b7e18dc5336a132f7a2a 100644 (file)
--- a/gdb/i386bsd-tdep.c
+++ b/gdb/i386bsd-tdep.c
@@ -24,6 +24,8 @@
 #include "gdbcore.h"
 #include "regcache.h"
 
+#include "gdb_string.h"
+
 #include "i386-tdep.h"
 
 /* Support for signal handlers.  */
@@ -39,9 +41,12 @@ i386bsd_pc_in_sigtramp (CORE_ADDR pc, char *name)
 }
 
 /* Assuming FRAME is for a BSD sigtramp routine, return the address of
-   the associated sigcontext structure.  */
+   the associated sigcontext structure.
+
+   Note: This function is used for Solaris 2 too, so don't make it
+   static.  */
 
-static CORE_ADDR
+CORE_ADDR
 i386bsd_sigcontext_addr (struct frame_info *frame)
 {
   if (frame->next)
@@ -55,33 +60,6 @@ i386bsd_sigcontext_addr (struct frame_info *frame)
   return read_memory_unsigned_integer (read_register (SP_REGNUM) + 8, 4);
 }
 
-/* Assuming FRAME is for a BSD sigtramp routine, return the saved
-   program counter.
-
-   Note: This function is used for Solaris 2 too, so don't make it
-   static.  */
-
-CORE_ADDR
-i386bsd_sigtramp_saved_pc (struct frame_info *frame)
-{
-  int sc_pc_offset = gdbarch_tdep (current_gdbarch)->sc_pc_offset;
-  CORE_ADDR addr;
-
-  addr = i386bsd_sigcontext_addr (frame);
-  return read_memory_unsigned_integer (addr + sc_pc_offset, 4);
-}
-
-/* Return the saved program counter for FRAME.  */
-
-static CORE_ADDR
-i386bsd_frame_saved_pc (struct frame_info *frame)
-{
-  if (frame->signal_handler_caller)
-    return i386bsd_sigtramp_saved_pc (frame);
-
-  return read_memory_unsigned_integer (frame->frame + 4, 4);
-}
-
 /* Return the start address of the sigtramp routine.  */
 
 CORE_ADDR
@@ -113,8 +91,9 @@ i386bsd_aout_in_solib_call_trampoline (CORE_ADDR pc, char *name)
 
 /* From <machine/signal.h>.  */
 int i386bsd_sc_pc_offset = 20;
+int i386bsd_sc_sp_offset = 8;
 
-static void
+void
 i386bsd_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
 {
   struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
@@ -127,60 +106,11 @@ i386bsd_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
 
   tdep->jb_pc_offset = 0;
 
-  tdep->sigtramp_saved_pc = i386bsd_sigtramp_saved_pc;
   tdep->sigtramp_start = 0xfdbfdfc0;
   tdep->sigtramp_end = 0xfdbfe000;
+  tdep->sigcontext_addr = i386bsd_sigcontext_addr;
   tdep->sc_pc_offset = i386bsd_sc_pc_offset;
-}
-
-/* NetBSD 1.0 or later.  */
-
-/* From <machine/signal.h>.  */
-int i386nbsd_sc_pc_offset = 44;
-
-static void
-i386nbsd_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
-{
-  struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
-
-  /* Obviously NetBSD is BSD-based.  */
-  i386bsd_init_abi (info, gdbarch);
-
-  /* NetBSD uses -freg-struct-return by default.  */
-  tdep->struct_return = reg_struct_return;
-
-  /* NetBSD uses a different memory layout.  */
-  tdep->sigtramp_start = 0xbfbfdf20;
-  tdep->sigtramp_end = 0xbfbfdff0;
-
-  /* NetBSD has a `struct sigcontext' that's different from the
-     origional 4.3 BSD.  */
-  tdep->sc_pc_offset = i386nbsd_sc_pc_offset;
-}
-
-/* NetBSD ELF.  */
-static void
-i386nbsdelf_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
-{
-  struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
-
-  /* It's still NetBSD.  */
-  i386nbsd_init_abi (info, gdbarch);
-
-  /* But ELF-based.  */
-  i386_elf_init_abi (info, gdbarch);
-
-  /* NetBSD ELF uses SVR4-style shared libraries.  */
-  set_gdbarch_in_solib_call_trampoline (gdbarch,
-                                       generic_in_solib_call_trampoline);
-
-  /* NetBSD ELF uses -fpcc-struct-return by default.  */
-  tdep->struct_return = pcc_struct_return;
-
-  /* We support the SSE registers on NetBSD ELF.  */
-  tdep->num_xmm_regs = I386_NUM_XREGS - 1;
-  set_gdbarch_num_regs (gdbarch, I386_NUM_GREGS + I386_NUM_FREGS
-                       + I386_NUM_XREGS);
+  tdep->sc_sp_offset = i386bsd_sc_sp_offset;
 }
 
 /* FreeBSD 3.0-RELEASE or later.  */
@@ -222,6 +152,7 @@ i386fbsd_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
 
 /* From <machine/signal.h>.  */
 int i386fbsd4_sc_pc_offset = 76;
+int i386fbsd4_sc_sp_offset = 88;
 
 static void
 i386fbsd4_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
@@ -234,6 +165,7 @@ i386fbsd4_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
 
   /* FreeBSD 4.0 introduced a new `struct sigcontext'.  */
   tdep->sc_pc_offset = i386fbsd4_sc_pc_offset;
+  tdep->sc_sp_offset = i386fbsd4_sc_sp_offset;
 }
 
 \f
@@ -259,10 +191,6 @@ _initialize_i386bsd_tdep (void)
   gdbarch_register_osabi_sniffer (bfd_arch_i386, bfd_target_aout_flavour,
                                  i386bsd_aout_osabi_sniffer);
 
-  gdbarch_register_osabi (bfd_arch_i386, GDB_OSABI_NETBSD_AOUT,
-                         i386nbsd_init_abi);
-  gdbarch_register_osabi (bfd_arch_i386, GDB_OSABI_NETBSD_ELF,
-                         i386nbsdelf_init_abi);
   gdbarch_register_osabi (bfd_arch_i386, GDB_OSABI_FREEBSD_AOUT,
                          i386fbsdaout_init_abi);
   gdbarch_register_osabi (bfd_arch_i386, GDB_OSABI_FREEBSD_ELF,