i386mach host/target/native separation

7 files changed, 190 insertions, 10 deletions

diff --git a/gdb/.Sanitize b/gdb/.Sanitize
index 3399963..f2672c8 100644
--- a/gdb/.Sanitize
+++ b/gdb/.Sanitize
@@ -107,6 +107,7 @@ i386-stub.c
 i386-tdep.c
 i386-xdep.c
 i386b-nat.c
+i386mach-nat.c
 i387-tdep.c
 i960-pinsn.c
 i960-tdep.c
@@ -129,7 +130,6 @@ m68k-tdep.c
 m88k-nat.c
 m88k-pinsn.c
 m88k-tdep.c
-mach386-xdep.c
 main.c
 maint.c
 mem-break.c
@@ -145,6 +145,7 @@ nindy-share
 nindy-tdep.c
 nm-delta88.h
 nm-i386bsd.h
+nm-i386mach.h
 nm-irix3.h
 nm-irix4.h
 nm-m88k.h
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 9fe484e..70f369a 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,17 @@
 Fri Oct 16 13:06:08 1992  K. Richard Pixley  (rich@sendai.cygnus.com)
 
+	Native support for i386mach (untested).
+
+	* config/i386mach.mh (XDEPFILES): removed infptrace.o inftarg.o
+	  fork-child.o mach386-xdep.o.
+	  (NAT_FILE, NATDEPFILES): new macros.	  
+	* Makefile.in (HFILES): added nm-i386mach.h.
+	* nm-i386mach.h, i386mach-nat.c: new files.
+	* mach386-xdep.c: removed.
+	* xm-i386mach.h: updated copyright.
+	  (ATTACH_DETACH, FETCH_INFERIOR_REGISTERS): removed to
+	  nm-i386mach.h.
+
 	Native separation for go32 (untested).
 
 	* config/go32.mh (NAT_FILE, NATDEPFILES): new macros.
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 0a3e8c4..f6dbeee 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -254,7 +254,8 @@ HFILES=	breakpoint.h buildsym.h call-cmds.h command.h defs.h \
 	tm-68k.h tm-hppa.h tm-i960.h tm-sparc.h tm-sunos.h tm-sysv4.h \
 	xm-m68k.h xm-sparc.h xm-sysv4.h xm-vax.h \
 	nm-irix3.h nm-irix4.h nm-mips.h nm-rs6000.h nm-sun2.h nm-sun3.h \
-	nm-sun4os4.h nm-trash.h nm-news.h nm-ultra3.h nm-m88k.h
+	nm-sun4os4.h nm-trash.h nm-news.h nm-ultra3.h nm-m88k.h \
+	nm-i386mach.h
 
 REMOTE_EXAMPLES = m68k-stub.c i386-stub.c sparc-stub.c rem-multi.shar
 
diff --git a/gdb/config/i386mach.mh b/gdb/config/i386mach.mh
index fbfcde5..b98c27b 100644
--- a/gdb/config/i386mach.mh
+++ b/gdb/config/i386mach.mh
@@ -1,4 +1,6 @@
 # Host: Intel 386 running Mach
 
-XDEPFILES= infptrace.o inftarg.o fork-child.o mach386-xdep.o
+XDEPFILES= 
 XM_FILE= xm-i386mach.h
+NAT_FILE= nm-i386mach.h
+NATDEPFILES= infptrace.o inftarg.o fork-child.o i386mach-nat.o
diff --git a/gdb/i386mach-nat.c b/gdb/i386mach-nat.c
new file mode 100644
index 0000000..52081c7
--- /dev/null
+++ b/gdb/i386mach-nat.c
@@ -0,0 +1,145 @@
+/* Native dependent code for Mach 386's for GDB, the GNU debugger.
+   Copyright (C) 1986, 1987, 1989, 1991, 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.  */
+
+#include "defs.h"
+#include "frame.h"
+#include "inferior.h"
+#include "gdbcore.h"
+
+#include <sys/param.h>
+#include <sys/dir.h>
+#include <sys/user.h>
+#include <signal.h>
+#include <sys/ioctl.h>
+#include <fcntl.h>
+
+#include <sys/ptrace.h>
+#include <machine/reg.h>
+
+#include <sys/file.h>
+#include <sys/stat.h>
+#include <sys/core.h>
+
+
+
+void
+fetch_inferior_registers (regno)
+     int regno;		/* Original value discarded */
+{
+  struct regs inferior_registers;
+  struct fp_state inferior_fp_registers;
+  extern char registers[];
+
+  registers_fetched ();
+
+  ptrace (PTRACE_GETREGS, inferior_pid,
+	  (PTRACE_ARG3_TYPE) &inferior_registers);
+  ptrace (PTRACE_GETFPREGS, inferior_pid,
+	  (PTRACE_ARG3_TYPE) &inferior_fp_registers);
+
+  bcopy (&inferior_registers, registers, sizeof inferior_registers);
+
+  bcopy (inferior_fp_registers.f_st,&registers[REGISTER_BYTE (FP0_REGNUM)],
+	 sizeof inferior_fp_registers.f_st);
+  bcopy (&inferior_fp_registers.f_ctrl,
+	 &registers[REGISTER_BYTE (FPC_REGNUM)],
+	 sizeof inferior_fp_registers - sizeof inferior_fp_registers.f_st);
+}
+
+/* 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;
+  struct fp_state inferior_fp_registers;
+  extern char registers[];
+
+  bcopy (registers, &inferior_registers, 20 * 4);
+
+  bcopy (&registers[REGISTER_BYTE (FP0_REGNUM)],inferior_fp_registers.f_st,
+	 sizeof inferior_fp_registers.f_st);
+  bcopy (&registers[REGISTER_BYTE (FPC_REGNUM)],
+	 &inferior_fp_registers.f_ctrl,
+	 sizeof inferior_fp_registers - sizeof inferior_fp_registers.f_st);
+  
+#ifdef PTRACE_FP_BUG
+  if (regno == FP_REGNUM || regno == -1)
+    /* Storing the frame pointer requires a gross hack, in which an
+       instruction that moves eax into ebp gets single-stepped.  */
+    {
+      int stack = inferior_registers.r_reg[SP_REGNUM];
+      int stuff = ptrace (PTRACE_PEEKDATA, inferior_pid,
+			  (PTRACE_ARG3_TYPE) stack);
+      int reg = inferior_registers.r_reg[EAX];
+      inferior_registers.r_reg[EAX] =
+	inferior_registers.r_reg[FP_REGNUM];
+      ptrace (PTRACE_SETREGS, inferior_pid,
+	      (PTRACE_ARG3_TYPE) &inferior_registers);
+      ptrace (PTRACE_POKEDATA, inferior_pid, (PTRACE_ARG3_TYPE) stack, 0xc589);
+      ptrace (PTRACE_SINGLESTEP, inferior_pid, (PTRACE_ARG3_TYPE) stack, 0);
+      wait (0);
+      ptrace (PTRACE_POKEDATA, inferior_pid, (PTRACE_ARG3_TYPE) stack, stuff);
+      inferior_registers.r_reg[EAX] = reg;
+    }
+#endif
+  ptrace (PTRACE_SETREGS, inferior_pid,
+	  (PTRACE_ARG3_TYPE) &inferior_registers);
+  ptrace (PTRACE_SETFPREGS, inferior_pid,
+	  (PTRACE_ARG3_TYPE) &inferior_fp_registers);
+}
+
+
+
+/* Work with core files, for GDB. */
+
+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 */
+{
+  int val;
+  extern char registers[];
+
+  switch (which) {
+  case 0:
+  case 1:
+    bcopy (core_reg_sect, registers, core_reg_size);
+    break;
+
+  case 2:
+#ifdef FP0_REGNUM
+    bcopy (core_reg_sect,
+	   &registers[REGISTER_BYTE (FP0_REGNUM)],
+	   core_reg_size);		/* FIXME, probably bogus */
+#endif
+#ifdef FPC_REGNUM
+    bcopy (&corestr.c_fpu.f_fpstatus.f_ctrl,
+	   &registers[REGISTER_BYTE (FPC_REGNUM)],
+	   sizeof corestr.c_fpu.f_fpstatus -
+	   sizeof corestr.c_fpu.f_fpstatus.f_st);
+#endif
+    break;
+  }
+}
diff --git a/gdb/nm-i386mach.h b/gdb/nm-i386mach.h
new file mode 100644
index 0000000..73f08a1
--- /dev/null
+++ b/gdb/nm-i386mach.h
@@ -0,0 +1,25 @@
+/* Native definitions for Mach on an Intel 386
+   Copyright (C) 1986, 1987, 1989, 1991, 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.  */
+
+/* Do implement the attach and detach commands.  */
+/* #define ATTACH_DETACH	1 */
+
+/* Override copies of {fetch,store}_inferior_registers in infptrace.c.  */
+#define FETCH_INFERIOR_REGISTERS
+
diff --git a/gdb/xm-i386mach.h b/gdb/xm-i386mach.h
index c714448..1681988 100644
--- a/gdb/xm-i386mach.h
+++ b/gdb/xm-i386mach.h
@@ -1,5 +1,5 @@
 /* Definitions to make GDB run on Mach on an Intel 386
-   Copyright (C) 1986, 1987, 1989, 1991 Free Software Foundation, Inc.
+   Copyright (C) 1986, 1987, 1989, 1991, 1992 Free Software Foundation, Inc.
 
 This file is part of GDB.
 
@@ -35,12 +35,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #define BROKEN_LARGE_ALLOCA
 
-/* Do implement the attach and detach commands.  */
-/* #define ATTACH_DETACH	1 */
-
-/* Override copies of {fetch,store}_inferior_registers in infptrace.c.  */
-#define FETCH_INFERIOR_REGISTERS
-
 #define PREPARE_TO_STORE() read_register_bytes (0, NULL, REGISTER_BYTES)
 
 /* <errno.h> only defines this if __STDC__!!! */