10 files changed, 207 insertions, 0 deletions
diff --git a/gdb/config/i386/.Sanitize b/gdb/config/i386/.Sanitize
index af89952..153091c 100644
--- a/gdb/config/i386/.Sanitize
+++ b/gdb/config/i386/.Sanitize
@@ -30,6 +30,10 @@ i386bsd.mt
 i386lynx.mh
 i386lynx.mt
 i386mach.mh
+i386m3.mh
+i386m3.mt
+i386mk.mh
+i386mk.mt
 i386nw.mt
 i386sco.mh
 i386sco4.mh
@@ -63,6 +67,8 @@ symmetry.mt
 tm-i386aix.h
 tm-i386bsd.h
 tm-i386lynx.h
+tm-i386m3.h
+tm-i386mk.h
 tm-i386nw.h
 tm-i386v.h
 tm-i386v4.h
@@ -73,7 +79,9 @@ xm-go32.h
 xm-i386aix.h
 xm-i386bsd.h
 xm-i386lynx.h
+xm-i386m3.h
 xm-i386mach.h
+xm-i386mk.h
 xm-i386sco.h
 xm-i386v.h
 xm-i386v32.h
diff --git a/gdb/config/i386/i386m3.mh b/gdb/config/i386/i386m3.mh
index e69de29..02e0bd6 100644
--- a/gdb/config/i386/i386m3.mh
+++ b/gdb/config/i386/i386m3.mh
@@ -0,0 +1,8 @@
+# Host: Intel 386 running Mach3
+
+XDEPFILES= os-mach3.o i386mach3-xdep.o i387-tdep.o coredep.o
+XM_FILE= xm-i386mach3.h
+
+# Don't use the mmalloc library in Mach 3.
+MMALLOC_LIB = 
+MMALLOC_DISABLE = -DNO_MMALLOC
diff --git a/gdb/config/i386/i386m3.mt b/gdb/config/i386/i386m3.mt
index e69de29..a36e9b0 100644
--- a/gdb/config/i386/i386m3.mt
+++ b/gdb/config/i386/i386m3.mt
@@ -0,0 +1,4 @@
+# Target: Intel 386 with a.out
+
+TDEPFILES= exec.o i386-pinsn.o i386-tdep.o 
+TM_FILE= tm-i386mach3.h
diff --git a/gdb/config/i386/i386mach.mh b/gdb/config/i386/i386mach.mh
index b98c27b..44766c5 100644
--- a/gdb/config/i386/i386mach.mh
+++ b/gdb/config/i386/i386mach.mh
@@ -1,5 +1,9 @@
 # Host: Intel 386 running Mach
 
+# This is for mach2, maybe, or is obsolete (and seems to have only
+# host and native, not target).  Once we get the mach3 stuff working,
+# I think it can go away.
+
 XDEPFILES= 
 XM_FILE= xm-i386mach.h
 NAT_FILE= nm-i386mach.h
diff --git a/gdb/config/i386/i386mk.mh b/gdb/config/i386/i386mk.mh
index e69de29..e5d30f8 100644
--- a/gdb/config/i386/i386mk.mh
+++ b/gdb/config/i386/i386mk.mh
@@ -0,0 +1,8 @@
+# Host: Intel 386 running Mach3 with OSF 1/MK
+
+XDEPFILES= os-mach3.o i386mach3-xdep.o i387-tdep.o
+XM_FILE= xm-i386osf1mk.h
+
+# Don't use the mmalloc library in Mach 3.
+MMALLOC_LIB = 
+MMALLOC_DISABLE = -DNO_MMALLOC
diff --git a/gdb/config/i386/i386mk.mt b/gdb/config/i386/i386mk.mt
index e69de29..e9f7373 100644
--- a/gdb/config/i386/i386mk.mt
+++ b/gdb/config/i386/i386mk.mt
@@ -0,0 +1,7 @@
+# Target: Intel 386 with a.out in osf 1/mk
+#
+TDEPFILES= exec.o i386-pinsn.o i386-tdep.o 
+TM_FILE= tm-i386osf1mk.h
+TM_CFLAGS= -I/usr/mach3/include
+TM_CLIBS= /usr/mach3/ccs/lib/libmachid.a /usr/mach3/ccs/lib/libnetname.a /usr/mach3/ccs/lib/libmach.a
+OBJFORMATS= dbxread.o
diff --git a/gdb/config/i386/tm-i386m3.h b/gdb/config/i386/tm-i386m3.h
index e69de29..0c70930 100644
--- a/gdb/config/i386/tm-i386m3.h
+++ b/gdb/config/i386/tm-i386m3.h
@@ -0,0 +1,74 @@
+/* Macro definitions for i386, Mach 3.0
+   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.  */
+
+/* Include common definitions for Mach3 systems */
+#include "os-mach3.h"
+
+/* Define offsets to access CPROC stack when it does not have
+ * a kernel thread.
+ */
+#define MACHINE_CPROC_SP_OFFSET 20
+#define MACHINE_CPROC_PC_OFFSET 16
+#define MACHINE_CPROC_FP_OFFSET 12
+
+/* Thread flavors used in re-setting the T bit.
+ * @@ this is also bad for cross debugging.
+ */
+#define TRACE_FLAVOR		i386_THREAD_STATE
+#define TRACE_FLAVOR_SIZE	i386_THREAD_STATE_COUNT
+#define TRACE_SET(x,state) \
+  	((struct i386_thread_state *)state)->efl |= 0x100
+#define TRACE_CLEAR(x,state) \
+  	((((struct i386_thread_state *)state)->efl &= ~0x100), 1)
+
+/* we can do it */
+#define ATTACH_DETACH 1
+
+/* number of traps that happen between exec'ing the shell 
+ * to run an inferior, and when we finally get to 
+ * the inferior code.  This is 2 on most implementations.
+ *
+ * On Mach 3.0 it is the number of exec() system calls before
+ * the task contains the debugged program. It is always 2 when
+ * using the shell to start up the program.
+ */
+#undef  START_INFERIOR_TRAPS_EXPECTED
+#define START_INFERIOR_TRAPS_EXPECTED 2
+
+/* Define this if the C compiler puts an underscore at the front
+   of external names before giving them to the linker.  */
+
+#define NAMES_HAVE_UNDERSCORE
+
+/* Sigh. There should be a file for i386 but no sysv stuff in it */
+#include "tm-i386v.h"
+
+/* I want to test this float info code. See comment in tm-i386v.h */
+#undef FLOAT_INFO
+#define FLOAT_INFO { i386_mach3_float_info (); }
+
+/* We use a.out format */
+#undef COFF_NO_LONG_FILE_NAMES
+
+/* Address of end of stack space.
+ * for MACH, see <machine/vmparam.h>
+ * @@@ I don't know what is in the 5 ints...
+ */
+#undef  STACK_END_ADDR
+#define STACK_END_ADDR (0xc0000000-sizeof(int [5]))
diff --git a/gdb/config/i386/tm-i386mk.h b/gdb/config/i386/tm-i386mk.h
index e69de29..8035433 100644
--- a/gdb/config/i386/tm-i386mk.h
+++ b/gdb/config/i386/tm-i386mk.h
@@ -0,0 +1,25 @@
+/* Macro definitions for i386, Mach 3.0, OSF 1/MK
+   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.  */
+
+/* Until OSF switches to a newer Mach kernel that has
+ * a different get_emul_vector() interface.
+ */
+#define MK67 1
+
+#include "tm-i386mach3.h"
diff --git a/gdb/config/i386/xm-i386m3.h b/gdb/config/i386/xm-i386m3.h
index e69de29..639ac8d 100644
--- a/gdb/config/i386/xm-i386m3.h
+++ b/gdb/config/i386/xm-i386m3.h
@@ -0,0 +1,44 @@
+/* Definitions to make GDB run on Mach 3 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
+
+#define BROKEN_LARGE_ALLOCA
+
+/* Do implement the attach and detach commands.  */
+#define ATTACH_DETACH	1
+
+/* Not needeed */
+#define KERNEL_U_ADDR 0
+
+#ifndef EMULATOR_BASE
+/* For EMULATOR_BASE and EMULATOR_END.
+ * OSF 1/MK has different values in some other place.
+ */
+#include <machine/vmparam.h>
+#endif /* EMULATOR_BASE */
diff --git a/gdb/config/i386/xm-i386mk.h b/gdb/config/i386/xm-i386mk.h
index e69de29..7fdf313 100644
--- a/gdb/config/i386/xm-i386mk.h
+++ b/gdb/config/i386/xm-i386mk.h
@@ -0,0 +1,25 @@
+/* Definitions to make GDB run on Mach 3 OSF 1/MK on an Intel 386
+   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 HAVE_TERMIO	1
+
+#define EMULATOR_BASE	0xa0000000
+#define EMULATOR_END	0xa0040000
+
+#include "xm-i386mach3.h"