Intel 386 Mach host port.

5 files changed, 210 insertions, 3 deletions

diff --git a/gdb/configure.in b/gdb/configure.in
index 9dfc1f2..2bf2d0f 100644
--- a/gdb/configure.in
+++ b/gdb/configure.in
@@ -78,6 +78,7 @@ i386)
 		case "${host_os}" in
 		sysv)	gdb_host=i386v ;;
 		sysv32)	gdb_host=i386v32 ;;
+		mach)	gdb_host=i386mach ;;
 		esac
 		;;
 	esac
@@ -208,6 +209,7 @@ i386)
 		case "${target_os}" in
 		sysv)	gdb_target=i386v ;;
 		sysv32)	gdb_target=i386v32 ;;
+		mach)	gdb_target=i386mach ;;
 		esac
 	esac
 	;;
diff --git a/gdb/mach386-xdep.c b/gdb/mach386-xdep.c
new file mode 100644
index 0000000..358bb17
--- /dev/null
+++ b/gdb/mach386-xdep.c
@@ -0,0 +1,162 @@
+/* Machine-dependent code for host Mach 386's for GDB, the GNU debugger.
+   Copyright (C) 1986, 1987, 1989, 1991 Free Software Foundation, Inc.
+
+This file is part of GDB.
+
+GDB 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 1, or (at your option)
+any later version.
+
+GDB 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 GDB; see the file COPYING.  If not, write to
+the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+
+#if defined (GDB_TARGET_IS_MACH386)
+
+#include <stdio.h>
+#include "defs.h"
+#include "param.h"
+#include "frame.h"
+#include "inferior.h"
+#include "signame.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 ()
+{
+  struct regs inferior_registers;
+  struct fp_state inferior_fp_registers;
+  extern char registers[];
+
+  registers_fetched ();
+
+  ptrace (PTRACE_GETREGS, inferior_pid, &inferior_registers);
+  ptrace (PTRACE_GETFPREGS, inferior_pid, &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).  */
+
+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, stack);
+      int reg = inferior_registers.r_reg[EAX];
+      inferior_registers.r_reg[EAX] =
+	inferior_registers.r_reg[FP_REGNUM];
+      ptrace (PTRACE_SETREGS, inferior_pid, &inferior_registers);
+      ptrace (PTRACE_POKEDATA, inferior_pid, stack, 0xc589);
+      ptrace (PTRACE_SINGLESTEP, inferior_pid, stack, 0);
+      wait (0);
+      ptrace (PTRACE_POKEDATA, inferior_pid, stack, stuff);
+      inferior_registers.r_reg[EAX] = reg;
+    }
+#endif
+  ptrace (PTRACE_SETREGS, inferior_pid, &inferior_registers);
+  ptrace (PTRACE_SETFPREGS, inferior_pid, &inferior_fp_registers);
+}
+
+/* Machine-dependent code which would otherwise be in core.c */
+/* Work with core files, for GDB. */
+
+
+void
+fetch_core_registers (core_reg_sect, core_reg_size, which)
+     char *core_reg_sect;
+     unsigned core_reg_size;
+     int which;
+{
+  int val;
+  extern char registers[];
+
+  switch (which) {
+  case 0:
+  case 1:
+    bcopy (core_reg_sect, registers, core_reg_size);
+    break;
+
+  case 2:
+    bcopy (core_reg_sect,
+	   &registers[REGISTER_BYTE (FP0_REGNUM)],
+	   core_reg_size);		/* FIXME, probably bogus */
+#if 0
+    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;
+  }
+}
+#else /* Not mach386 target.  */
+
+/* These functions shouldn't be called when we're cross-debugging.  */
+
+void
+fetch_inferior_registers ()
+{
+}
+
+/* ARGSUSED */
+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 mach386 target.  */
diff --git a/gdb/tm-i386v.h b/gdb/tm-i386v.h
index f6f737d..03315bc 100644
--- a/gdb/tm-i386v.h
+++ b/gdb/tm-i386v.h
@@ -139,9 +139,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #define PC_REGNUM 8
 #define PS_REGNUM 9
 
-#define REGISTER_U_ADDR(addr, blockend, regno) \
-	(addr) = i386_register_u_addr ((blockend),(regno));
-
 /* Total amount of space needed to store our copies of the machine's
    register state, the array `registers'.  */
 #define REGISTER_BYTES (NUM_REGS * 4)
diff --git a/gdb/xm-i386mach.h b/gdb/xm-i386mach.h
new file mode 100644
index 0000000..244361b
--- /dev/null
+++ b/gdb/xm-i386mach.h
@@ -0,0 +1,44 @@
+/* Definitions to make GDB run on Mach on an Intel 386
+   Copyright (C) 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.  */
+
+#define HOST_BYTE_ORDER LITTLE_ENDIAN
+
+/* Avoid "INT_MIN redefined" warnings -- by defining it here, exactly
+   the same as in the system <machine/machtypes.h> file.  */
+#undef	INT_MIN
+#define	INT_MIN		0x80000000
+
+/* Get rid of any system-imposed stack limit if possible.  */
+
+#define SET_STACK_LIMIT_HUGE
+
+/* This is the amount to subtract from u.u_ar0
+   to get the offset in the core file of the register values.  */
+
+#define KERNEL_U_ADDR (0x80000000 - (UPAGES * NBPG))
+
+#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)
diff --git a/gdb/xm-i386v.h b/gdb/xm-i386v.h
index d6874ed..589d709 100644
--- a/gdb/xm-i386v.h
+++ b/gdb/xm-i386v.h
@@ -55,6 +55,8 @@ on those where it does, it occurs quite reliably.  */
 
 #define KERNEL_U_ADDR 0xe0000000
 
+#define REGISTER_U_ADDR(addr, blockend, regno) \
+	(addr) = i386_register_u_addr ((blockend),(regno));
 
 #if 0
 /* Interface definitions for kernel debugger KDB.  */