apollo native support

8 files changed, 218 insertions, 8 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 9b64852..501fbed 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,15 @@
 Tue Oct 27 17:08:45 1992  K. Richard Pixley  (rich@cygnus.com)
 
+	Apollo native support (untested).
+
+	* a68v-nat.c, nm-apollo68[bv].h: new files.
+	* xm-apollo68[bv].h (FETCH_INFERIOR_REGISTERS): removed.
+	* xm-apollo68b.h (PTRACE_IN_WRONG_PLACE): removed.
+	* a68v-xdep.c: removed.
+	* config/apollo68[bv].mh (XDEPFILES): removed infptrace.o
+	  inftarg.o fork-child.o a68v-xdep.o.
+	  (NAT_FILE, NATDEPFILES): new macros.
+
 	* defs.h: include nm.h.
 	* coredep.c, infptrace.c, procfs.c, rs6000-nat.c, sparc-nat.c,
 	  sparc-tdep.c, : do not include nm.h.
diff --git a/gdb/a68v-nat.c b/gdb/a68v-nat.c
new file mode 100644
index 0000000..d81cbe8
--- /dev/null
+++ b/gdb/a68v-nat.c
@@ -0,0 +1,158 @@
+/* Host-dependent code for Apollo-68ksfor GDB, the GNU debugger.
+   Copyright 1986, 1987, 1989, 1991 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.  */
+
+#include "defs.h"
+#include "inferior.h"
+#include "gdbcore.h"
+
+extern int errno;
+
+#if defined (GDB_TARGET_IS_SUN3)
+/* All of this stuff is only relevant if both host and target are sun3.  */
+void
+fetch_inferior_registers ()
+{
+  struct regs inferior_registers;
+#ifdef FP0_REGNUM
+  struct fp_status inferior_fp_registers;
+#endif
+  extern char registers[];
+
+  registers_fetched ();
+  
+  ptrace (PTRACE_GETREGS, inferior_pid,
+	  (PTRACE_ARG3_TYPE) &inferior_registers, 0);
+#ifdef FP0_REGNUM
+  ptrace (PTRACE_GETFPREGS, inferior_pid,
+	  (PTRACE_ARG3_TYPE) &inferior_fp_registers, 0);
+#endif 
+  
+  bcopy (&inferior_registers, registers, 16 * 4);
+#ifdef FP0_REGNUM
+  bcopy (&inferior_fp_registers, &registers[REGISTER_BYTE (FP0_REGNUM)],
+	 sizeof inferior_fp_registers.fps_regs);
+#endif 
+  *(int *)&registers[REGISTER_BYTE (PS_REGNUM)] = inferior_registers.r_ps;
+  *(int *)&registers[REGISTER_BYTE (PC_REGNUM)] = inferior_registers.r_pc;
+#ifdef FP0_REGNUM
+  bcopy (&inferior_fp_registers.fps_control,
+	 &registers[REGISTER_BYTE (FPC_REGNUM)],
+	 sizeof inferior_fp_registers - sizeof inferior_fp_registers.fps_regs);
+#endif 
+}
+
+/* Store our register values back into the inferior.
+   If REGNO is -1, do this for all registers.
+   Otherwise, REGNO specifies which register (so we can save time).  */
+
+void
+store_inferior_registers (regno)
+     int regno;
+{
+  struct regs inferior_registers;
+#ifdef FP0_REGNUM
+  struct fp_status inferior_fp_registers;
+#endif
+  extern char registers[];
+
+  bcopy (registers, &inferior_registers, 16 * 4);
+#ifdef FP0_REGNUM
+  bcopy (&registers[REGISTER_BYTE (FP0_REGNUM)], &inferior_fp_registers,
+	 sizeof inferior_fp_registers.fps_regs);
+#endif
+  inferior_registers.r_ps = *(int *)&registers[REGISTER_BYTE (PS_REGNUM)];
+  inferior_registers.r_pc = *(int *)&registers[REGISTER_BYTE (PC_REGNUM)];
+
+#ifdef FP0_REGNUM
+  bcopy (&registers[REGISTER_BYTE (FPC_REGNUM)],
+	 &inferior_fp_registers.fps_control,
+	 sizeof inferior_fp_registers - sizeof inferior_fp_registers.fps_regs);
+#endif
+
+  ptrace (PTRACE_SETREGS, inferior_pid,
+	  (PTRACE_ARG3_TYPE) &inferior_registers, 0);
+#if FP0_REGNUM
+  ptrace (PTRACE_SETFPREGS, inferior_pid,
+	  (PTRACE_ARG3_TYPE) &inferior_fp_registers, 0);
+#endif
+}
+
+/* Machine-dependent code for pulling registers out of a Sun-3 core file. */
+
+void
+fetch_core_registers (core_reg_sect, core_reg_size, which)
+     char *core_reg_sect;
+     unsigned core_reg_size;
+     int which;
+{
+  extern char registers[];
+  struct regs *regs = (struct regs *) core_reg_sect;
+
+  if (which == 0) {
+    if (core_reg_size < sizeof (struct regs))
+      error ("Can't find registers in core file");
+
+    bcopy ((char *)regs, registers, 16 * 4);
+    supply_register (PS_REGNUM, &regs->r_ps);
+    supply_register (PC_REGNUM, &regs->r_pc);
+
+  } else if (which == 2) {
+
+#define fpustruct  ((struct fpu *) core_reg_sect)
+
+    if (core_reg_size >= sizeof (struct fpu))
+      {
+#ifdef FP0_REGNUM
+	bcopy (fpustruct->f_fpstatus.fps_regs,
+	      &registers[REGISTER_BYTE (FP0_REGNUM)],
+	      sizeof fpustruct->f_fpstatus.fps_regs);
+	bcopy (&fpustruct->f_fpstatus.fps_control,
+	      &registers[REGISTER_BYTE (FPC_REGNUM)],
+	      sizeof fpustruct->f_fpstatus - 
+		sizeof fpustruct->f_fpstatus.fps_regs);
+#endif
+      }
+    else
+      fprintf (stderr, "Couldn't read float regs from core file\n");
+  }
+}
+#else /* Not sun3 target.  */
+/* These functions shouldn't be called when we're cross-debugging.  */
+
+void
+fetch_inferior_registers ()
+{
+}
+
+/* ARGSUSED */
+void
+store_inferior_registers (regno)
+     int regno;
+{
+}
+
+/* ARGSUSED */
+void
+fetch_core_registers (core_reg_sect, core_reg_size, which)
+     char *core_reg_sect;
+     unsigned core_reg_size;
+     int which;
+{
+}
+#endif /* Not sun3 target.  */
diff --git a/gdb/config/apollo68b.mh b/gdb/config/apollo68b.mh
index 63d07be..58f7313 100755
--- a/gdb/config/apollo68b.mh
+++ b/gdb/config/apollo68b.mh
@@ -1,4 +1,6 @@
 # Host: Apollo 68k, BSD mode.
 
 XM_FILE= xm-apollo68b.h
-XDEPFILES= infptrace.o inftarg.o fork-child.o a68v-xdep.o ser-bsd.o
+XDEPFILES= ser-bsd.o
+NAT_FILE= nm-apollo68b.h
+NATDEPFILES= infptrace.o inftarg.o fork-child.o a68v-nat.o
diff --git a/gdb/config/apollo68v.mh b/gdb/config/apollo68v.mh
index 714ae03..f710724 100644
--- a/gdb/config/apollo68v.mh
+++ b/gdb/config/apollo68v.mh
@@ -5,4 +5,6 @@ SYSV_DEFINE=-DSYSV
 REGEX=regex.o
 REGEX1=regex.o
 CC= cc -A ansi -A runtype,any -A systype,any -U__STDC__ -DNO_SYS_FILE
-XDEPFILES= infptrace.o inftarg.o fork-child.o a68v-xdep.o
+XDEPFILES= 
+NAT_FILE= nm-apollo68v.h
+NATDEPFILES= infptrace.o inftarg.o fork-child.o a68v-nat.o
diff --git a/gdb/nm-apollo68b.h b/gdb/nm-apollo68b.h
new file mode 100644
index 0000000..ba2998a
--- /dev/null
+++ b/gdb/nm-apollo68b.h
@@ -0,0 +1,23 @@
+/* Macro defintions for an Apollo 68k in BSD mode
+   Copyright (C) 1992 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.  */
+
+#define PTRACE_IN_WRONG_PLACE
+
+#define	FETCH_INFERIOR_REGISTERS
+
diff --git a/gdb/nm-apollo68v.h b/gdb/nm-apollo68v.h
new file mode 100644
index 0000000..6c83f38
--- /dev/null
+++ b/gdb/nm-apollo68v.h
@@ -0,0 +1,20 @@
+/* Macro defintions for an Apollo.
+   Copyright (C) 1986, 1987, 1989, 1992 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.  */
+
+#define	FETCH_INFERIOR_REGISTERS
diff --git a/gdb/xm-apollo68b.h b/gdb/xm-apollo68b.h
index 0c0e14f..9d1d39c 100755
--- a/gdb/xm-apollo68b.h
+++ b/gdb/xm-apollo68b.h
@@ -21,8 +21,4 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #define ALIGN_STACK_ON_STARTUP
 
-#define	FETCH_INFERIOR_REGISTERS
-
-#define PTRACE_IN_WRONG_PLACE
-
 extern char *strdup();
diff --git a/gdb/xm-apollo68v.h b/gdb/xm-apollo68v.h
index e510e99..6129523 100644
--- a/gdb/xm-apollo68v.h
+++ b/gdb/xm-apollo68v.h
@@ -1,5 +1,5 @@
 /* Macro defintions for an Apollo.
-   Copyright (C) 1986, 1987, 1989 Free Software Foundation, Inc.
+   Copyright (C) 1986, 1987, 1989, 1992 Free Software Foundation, Inc.
 
 This file is part of GDB.
 
@@ -42,4 +42,3 @@ on those where it does, it occurs quite reliably.  */
 
 #define HAVE_TERMIO
 
-#define	FETCH_INFERIOR_REGISTERS