* core-sol2.c: New file to handle ELF and BCP core file flavours.

	* config/sparc/sun4sol2.mh (NATDEPFILES):  Use it instead of
	core-svr4.
	* Makefile.in:  Updated for core-sol2.c.

4 files changed, 129 insertions, 4 deletions

diff --git a/gdb/.Sanitize b/gdb/.Sanitize
index 326ea3e..c58b28d 100644
--- a/gdb/.Sanitize
+++ b/gdb/.Sanitize
@@ -106,6 +106,7 @@ convex-tdep.c
 convex-xdep.c
 copying.awk
 copying.c
+core-sol2.c
 core-svr4.c
 core.c
 coredep.c
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index aa35401..4f9740a 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,7 +1,11 @@
 Fri Jun 24 08:15:42 1994  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
 
-	* README:  Add notes about SPARCworks cc under Solaris 2.x
-	(from Casper H.S. Dik casper@fwi.uva.nl).
+	* core-sol2.c:  New file to handle ELF and BCP core file flavours.
+	* config/sparc/sun4sol2.mh (NATDEPFILES):  Use it instead of
+	core-svr4.
+	* Makefile.in:  Updated for core-sol2.c.
+	* README:  Add notes about SPARCworks cc under Solaris 2.x,
+	from Casper H.S. Dik (casper@fwi.uva.nl).
 	* config/mips/xm-makeva.h:  Removed, no longer necessary.
 	* Makefile.in, config/mips/xm-irix3.h, config/mips/xm-irix5.h,
 	config/mips/xm-mips.h, config/mips/xm-news-mips.h,
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index d38228f..b1e7c48 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -896,8 +896,8 @@ ALLDEPFILES = 29k-share/udi/udip2soc.c 29k-share/udi/udr.c \
 	altos-xdep.c arm-convert.s \
 	arm-pinsn.c arm-tdep.c arm-xdep.c coff-solib.c convex-pinsn.c \
 	convex-tdep.c \
-	convex-xdep.c core-svr4.c coredep.c corelow.c dcache.c delta68-nat.c \
-	dpx2-nat.c dstread.c exec.c fork-child.c \
+	convex-xdep.c core-sol2.c core-svr4.c coredep.c corelow.c dcache.c \
+	delta68-nat.c dpx2-nat.c dstread.c exec.c fork-child.c \
 	go32-xdep.c gould-pinsn.c gould-xdep.c h8300-tdep.c h8500-tdep.c \
 	hp300ux-nat.c hppa-pinsn.c hppa-tdep.c hppab-nat.c hppah-nat.c \
 	i386-pinsn.c i386-tdep.c i386b-nat.c i386mach-nat.c i386v-nat.c \
@@ -1157,6 +1157,9 @@ convex-tdep.o: convex-tdep.c $(wait_h) $(defs_h) $(gdbcmd_h) \
 convex-xdep.o: convex-xdep.c $(defs_h) $(gdbcmd_h) $(gdbcore_h) \
 	$(inferior_h)
 
+core-sol2.o: core-sol2.c $(command_h) $(defs_h) $(gdbcore_h) \
+	$(inferior_h) target.h
+
 core-svr4.o: core-svr4.c $(command_h) $(defs_h) $(gdbcore_h) \
 	$(inferior_h) target.h
 
diff --git a/gdb/core-sol2.c b/gdb/core-sol2.c
new file mode 100644
index 0000000..4ead2ac
--- /dev/null
+++ b/gdb/core-sol2.c
@@ -0,0 +1,117 @@
+/* Machine independent support for Solaris 2 core files for GDB.
+   Copyright 1994 Free Software Foundation, Inc.
+
+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 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.  */
+
+
+/* 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
+   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/regset.h>
+#include <sys/procfs.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <string.h>
+
+#include "inferior.h"
+#include "target.h"
+#include "command.h"
+#include "gdbcore.h"
+
+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 */
+{
+  prgregset_t prgregset;
+  prfpregset_t prfpregset;
+
+  if (which == 0)
+    {
+      if (core_reg_size == sizeof (prgregset))
+	{
+	  memcpy ((char *) &prgregset, core_reg_sect, sizeof (prgregset));
+	  supply_gregset (&prgregset);
+	}
+      else if (core_reg_size == sizeof (struct regs))
+	{
+#define gregs ((struct regs *)core_reg_sect)
+	  /* G0 *always* holds 0.  */
+	  *(int *)&registers[REGISTER_BYTE (0)] = 0;
+
+	  /* The globals and output registers.  */
+	  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;
+
+	  /* My best guess at where to get the locals and input
+	     registers is exactly where they usually are, right above
+	     the stack pointer.  If the core dump was caused by a bus error
+	     from blowing away the stack pointer (as is possible) then this
+	     won't work, but it's worth the try. */
+	  {
+	    int sp;
+
+	    sp = *(int *)&registers[REGISTER_BYTE (SP_REGNUM)];
+	    if (0 != target_read_memory (sp,
+					 &registers[REGISTER_BYTE (L0_REGNUM)], 
+					 16 * REGISTER_RAW_SIZE (L0_REGNUM)))
+	      {
+		warning ("couldn't read input and local registers from core file\n");
+	      }
+	  }
+	}
+      else
+	{
+	  warning ("wrong size gregset struct in core file");
+	}
+    }
+  else if (which == 2)
+    {
+      if (core_reg_size == sizeof (prfpregset))
+	{
+	  memcpy ((char *) &prfpregset, core_reg_sect, sizeof (prfpregset));
+	  supply_fpregset (&prfpregset);
+	}
+      else if (core_reg_size >= sizeof (struct fpu))
+	{
+#define fpuregs  ((struct fpu *) core_reg_sect)
+	  memcpy (&registers[REGISTER_BYTE (FP0_REGNUM)], &fpuregs->fpu_fr,
+		  sizeof (fpuregs->fpu_fr));
+	  memcpy (&registers[REGISTER_BYTE (FPS_REGNUM)], &fpuregs->fpu_fsr,
+		  sizeof (FPU_FSR_TYPE));
+	}
+      else
+	{
+	  warning ("wrong size fpregset struct in core file");
+	}
+    }
+}