* gdb.texinfo (Command Files): Mention -x, use @enumerate for

[deliverable/binutils-gdb.git] / gdb / core-sol2.c

diff --git a/gdb/core-sol2.c b/gdb/core-sol2.c
index 4ead2ac2085759ebdc1f114747948f72cda79a59..3ce9cd460d0c67725993267cd234aa451eef9b96 100644 (file)
--- a/gdb/core-sol2.c
+++ b/gdb/core-sol2.c
@@ -1,52 +1,53 @@
 /* Machine independent support for Solaris 2 core files for GDB.
    Copyright 1994 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   This file is part of GDB.
 
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
 
 
 /* Solaris comes with two flavours of core files, cores generated by
    an ELF executable and cores generated by programs that were
    run under BCP (the part of Solaris which allows it to run SunOS4
    a.out files).
-   This file combines the core register fetching from core-svr4.c
+   This file combines the core register fetching from core-regset.c
    and sparc-nat.c to be able to read both flavours.  */
 
 #include "defs.h"
-#undef gregset_t
-#undef fpregset_t
-
 #include <time.h>
+#include <sys/types.h>
 #include <sys/regset.h>
 #include <sys/procfs.h>
 #include <fcntl.h>
 #include <errno.h>
-#include <string.h>
+#include "gdb_string.h"
 
 #include "inferior.h"
 #include "target.h"
 #include "command.h"
 #include "gdbcore.h"
 
-void
+static void fetch_core_registers PARAMS ((char *, unsigned, int, CORE_ADDR));
+
+static void
 fetch_core_registers (core_reg_sect, core_reg_size, which, reg_addr)
      char *core_reg_sect;
      unsigned core_reg_size;
      int which;
-     unsigned int reg_addr;    /* Unused in this version */
+     CORE_ADDR reg_addr;       /* Unused in this version */
 {
   prgregset_t prgregset;
   prfpregset_t prfpregset;
@@ -62,15 +63,15 @@ fetch_core_registers (core_reg_sect, core_reg_size, which, reg_addr)
        {
 #define gregs ((struct regs *)core_reg_sect)
          /* G0 *always* holds 0.  */
-         *(int *)&registers[REGISTER_BYTE (0)] = 0;
+         *(int *) &registers[REGISTER_BYTE (0)] = 0;
 
          /* The globals and output registers.  */
-         memcpy (&registers[REGISTER_BYTE (G1_REGNUM)], &gregs->r_g1, 
+         memcpy (&registers[REGISTER_BYTE (G1_REGNUM)], &gregs->r_g1,
                  15 * REGISTER_RAW_SIZE (G1_REGNUM));
-         *(int *)&registers[REGISTER_BYTE (PS_REGNUM)] = gregs->r_ps;
-         *(int *)&registers[REGISTER_BYTE (PC_REGNUM)] = gregs->r_pc;
-         *(int *)&registers[REGISTER_BYTE (NPC_REGNUM)] = gregs->r_npc;
-         *(int *)&registers[REGISTER_BYTE (Y_REGNUM)] = gregs->r_y;
+         *(int *) &registers[REGISTER_BYTE (PS_REGNUM)] = gregs->r_ps;
+         *(int *) &registers[REGISTER_BYTE (PC_REGNUM)] = gregs->r_pc;
+         *(int *) &registers[REGISTER_BYTE (NPC_REGNUM)] = gregs->r_npc;
+         *(int *) &registers[REGISTER_BYTE (Y_REGNUM)] = gregs->r_y;
 
          /* My best guess at where to get the locals and input
             registers is exactly where they usually are, right above
@@ -80,9 +81,9 @@ fetch_core_registers (core_reg_sect, core_reg_size, which, reg_addr)
          {
            int sp;
 
-           sp = *(int *)&registers[REGISTER_BYTE (SP_REGNUM)];
+           sp = *(int *) &registers[REGISTER_BYTE (SP_REGNUM)];
            if (0 != target_read_memory (sp,
-                                        &registers[REGISTER_BYTE (L0_REGNUM)], 
+                                     &registers[REGISTER_BYTE (L0_REGNUM)],
                                         16 * REGISTER_RAW_SIZE (L0_REGNUM)))
              {
                warning ("couldn't read input and local registers from core file\n");
@@ -115,3 +116,21 @@ fetch_core_registers (core_reg_sect, core_reg_size, which, reg_addr)
        }
     }
 }
+\f
+
+/* Register that we are able to handle solaris core file formats. */
+
+static struct core_fns solaris_core_fns =
+{
+  bfd_target_elf_flavour,              /* core_flavour */
+  default_check_format,                        /* check_format */
+  default_core_sniffer,                        /* core_sniffer */
+  fetch_core_registers,                        /* core_read_registers */
+  NULL                                 /* next */
+};
+
+void
+_initialize_core_solaris ()
+{
+  add_core_fns (&solaris_core_fns);
+}