Obsolete ns32k-*-mach3*, ns32k-umax-*, ns32k-utek-sysv* and

ns32k-utek-*.
author: Andrew Cagney <cagney@redhat.com> 2001-04-02 20:57:26 +0000
committer: Andrew Cagney <cagney@redhat.com> 2001-04-02 20:57:26 +0000
commit: bb19ff3b141c4e4820356140cdcaf88b89e27a9d (patch)
tree: 8b25fcdd9a6ce2b8cf0ddaba34c286618a8346e2
parent: d6259d756ba71292f4c3bd40050619b8cf4597f7 (diff)
download: gdb-bb19ff3b141c4e4820356140cdcaf88b89e27a9d.zip
gdb-bb19ff3b141c4e4820356140cdcaf88b89e27a9d.tar.gz
gdb-bb19ff3b141c4e4820356140cdcaf88b89e27a9d.tar.bz2
21 files changed, 1015 insertions, 974 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 706bdb6..0129f02 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,32 @@
+2001-04-01  Andrew Cagney  <ac131313@redhat.com>
+
+	Obsolete ns32k-*-mach3*, ns32k-umax-*, ns32k-utek-sysv* and
+	ns32k-utek-*.
+	* Makefile.in (ALLDEPFILES): Delete umax-xdep.c and ns32km3-nat.c.
+	(umax-xdep.o, ns32km3-nat.o): Obsolete.
+	* configure.tgt (ns32k-*-mach3*, ns32k-utek-sysv*, ns32k-utek-*):
+	Obsolete.
+	* configure.host (ns32k-*-mach3*, ns32k-umax-*, ns32k-utek-sysv*):
+	Obsolete.
+	* config/ns32k/merlin.mh: Obsolete.
+	* config/ns32k/merlin.mt: Obsolete.
+	* config/ns32k/xm-merlin.h: Obsolete.
+	* config/ns32k/tm-merlin.h: Obsolete.
+	* config/ns32k/nm-umax.h: Obsolete.
+	* config/ns32k/umax.mh: Obsolete.
+	* config/ns32k/umax.mt: Obsolete.
+	* config/ns32k/xm-umax.h: Obsolete.
+	* umax-xdep.c: Obsolete.
+	* config/ns32k/ns32km3.mh: Obsolete.
+	* config/ns32k/ns32km3.mt: Obsolete.
+	* config/ns32k/tm-ns32km3.h: Obsolete.
+	* config/ns32k/xm-ns32km3.h: Obsolete.
+	* ns32km3-nat.c: Obsolete.
+	* ns32k-tdep.c (merlin_skip_prologue): Obsolete.
+	(merlin_frame_num_args): Ditto.
+	* NEWS: Update.
+	* TODO: Update.
+
 2001-04-02  Eli Zaretskii  <eliz@is.elta.co.il>
 
 	* config/djgpp/fnchange.lst: Tweak due to
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 0d611fc..c10ca50 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -1151,7 +1151,7 @@ ALLDEPFILES = 29k-share/udi/udip2soc.c 29k-share/udi/udr.c \
 	mips-tdep.c mipsm3-nat.c mipsv4-nat.c news-xdep.c \
 	nindy-share/Onindy.c nindy-share/nindy.c \
 	nindy-share/ttyflush.c nindy-tdep.c \
-	ns32k-tdep.c ns32km3-nat.c osfsolib.c \
+	ns32k-tdep.c osfsolib.c \
 	somread.c somsolib.c $(HPREAD_SOURCE) \
 	ppc-linux-nat.c ppc-linux-tdep.c \
 	procfs.c \
@@ -1165,7 +1165,7 @@ ALLDEPFILES = 29k-share/udi/udip2soc.c 29k-share/udi/udr.c \
 	sh-tdep.c solib.c sparc-nat.c \
 	sparc-tdep.c sparcl-tdep.c sun3-nat.c sun386-nat.c \
 	symm-tdep.c symm-nat.c \
-	ultra3-nat.c ultra3-xdep.c umax-xdep.c \
+	ultra3-nat.c ultra3-xdep.c \
 	vax-tdep.c \
 	vx-share/xdr_ld.c vx-share/xdr_ptrace.c vx-share/xdr_rdb.c \
 	win32-nat.c \
@@ -1667,7 +1667,7 @@ nlmread.o: nlmread.c $(bfd_h) buildsym.h complaints.h $(defs_h) \
 	gdb-stabs.h objfiles.h symfile.h $(symtab_h) stabsread.h \
 	gdb_string.h
 
-ns32km3-nat.o: ns32km3-nat.c $(defs_h) $(inferior_h) $(regcache_h)
+# OBSOLETE ns32km3-nat.o: ns32km3-nat.c $(defs_h) $(inferior_h) $(regcache_h)
 
 ttyflush.o: nindy-share/ttyflush.c
 	$(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/nindy-share/ttyflush.c
@@ -1986,7 +1986,7 @@ ultra3-nat.o: ultra3-nat.c $(defs_h) $(gdbcore_h) $(inferior_h) $(regcache_h)
 
 ultra3-xdep.o: ultra3-xdep.c $(defs_h) $(gdbcore_h) $(inferior_h)
 
-umax-xdep.o: umax-xdep.c $(defs_h) $(gdbcore_h) $(inferior_h) $(regcache_h)
+# OBSOLETE umax-xdep.o: umax-xdep.c $(defs_h) $(gdbcore_h) $(inferior_h) $(regcache_h)
 
 utils.o: utils.c $(bfd_h) $(defs_h) $(expression_h) $(gdbcmd_h) \
 	language.h target.h terminal.h $(readline_headers) \
diff --git a/gdb/NEWS b/gdb/NEWS
index aed876c..672de3d 100644
--- a/gdb/NEWS
+++ b/gdb/NEWS
@@ -16,6 +16,8 @@ x86 FreeBSD 3.x and 4.x				i[3456]86*-freebsd[34]*
 
 x86 FreeBSD before 2.2				i[3456]86*-freebsd{1,2.[01]}*, 
 Harris/CXUX m88k				m88*-harris-cxux*
+Most ns32k hosts and targets			ns32k-*-mach3* ns32k-umax-*
+						ns32k-utek-sysv* ns32k-utek-*
 
 stuff.c (Program to stuff files into a specially prepared space in kdb)
 kdb-start.c (Main loop for the standalone kernel debugger)
diff --git a/gdb/TODO b/gdb/TODO
index dca8f2d..0d80d66 100644
--- a/gdb/TODO
+++ b/gdb/TODO
@@ -176,35 +176,46 @@ Possible selection criteria are:
 
 Steps:		   
 	  
-	o	post proposals to gdb@ (DONE)
+	o	Identify TUPPLE : CPU / HOST / TARGET
+		combinations.
+
+		  TUPPLE	        CPU	 HOST	  TARGET     ZAPPED
+		  ------		---	 ----	  ------     ------
+		  ns32k-*-mach3*        ns32k	 ns32km3  ns32km3    yes
+		  ns32k-umax-*		ns32k	 umax	  -	     yes
+		  ns32k-utek-sysv*	ns32k	 merlin	  merlin     yes
+		  ns32k-utek-*		ns32k	 -	  umax	     yes
+		  tic80-*		tic80	 -	  tic80
+		  m68*-isi-*		m68k	 isi	  isi
+		  m68*-sony-*		m68k	 news	  news
+		  m68030-sony-*		m68k	 news1000 -
+		  m68*-rom68k-*		m68k	 -	  (monitor)
+		  m68*-*bug-*		m68k	 -	  (monitor)
+		  m68*-monitor-*	m68k	 -	  (monitor)
+		  m68*-est-*		m68k	 -	  (monitor)
+		  a29k-*-*		a29k	 ultra3	  -
+		  a29k-*-sym1*		a29k	 -	  ultra3
+		  powerpcle-*-solaris*	powerpc	 solaris  solaris
+		  powerpcle-*-cygwin*	powerpc	 cygwin	  cygwin
+		  powerpc-*-netware*	powerpc  -	  ppc-nw
+		  w65-*-*		w65	 -	  w65
+		  i[3456]86-*-sunos*	i386	 sun386	  sun386
 
-	o	post announcement to gdb-announce@
+		(DONE)
+
+	o	post proposals to gdb@
+		(DONE)
+
+	o	post revised proposals to gdb-announce@
 		crossed with gdb@ reply-to to gdb@
 		(DONE)
 
-	                ns32k-*-mach3*
-        	        ns32k-umax-*
-                	ns32k-utek-sysv*
-		        tic80-*
-			m68*-isi-*
-			m68*-sony-*
-			m68*-rom68k-*
-			m68*-*bug-*
-			m68*-monitor-*
-			m68*-est-*
-			a29k-ultra3
-			powerpcle-*-solaris*
-			powerpcle-*-cygwin*
-			powerpc-*-netware*
-		        w65-*-*
-			i[3456]86-*-sunos*
-
-	o	clobber the files:
-
-			configure.{in,host,tgt}
-			Makefile.in
+	o	clobber the tupple and files:
+			configure.host
+			configure.tgt
+			config/CPU/*HOST*
+			config/CPU/*TARGET*
 			*-tdep.c *-nat.c *-xdep.c
-			configure/*/*
 
 	o	update NEWS
 
diff --git a/gdb/config/ns32k/merlin.mh b/gdb/config/ns32k/merlin.mh
index f9c3e7b..9da8f1e 100644
--- a/gdb/config/ns32k/merlin.mh
+++ b/gdb/config/ns32k/merlin.mh
@@ -1,16 +1,16 @@
-# Host: Merlin running utek 2.1
-XDEPFILES= infptrace.o inftarg.o fork-child.o corelow.o core-aout.o
-XM_FILE= xm-merlin.h
-
-# FIXME: M_INSTALL is gone from the gdb makefile.  If anyone cares
-# about the Merlin anymore, and the bug which inspired
-# SHELL_FILE/gdb-sh is still there, will need to reinstate it.  Also,
-# this should be done for native only.
-
-# See SHELL_FILE in xm-merlin.h for a explanation of this.
-
-# FIXME: This should use $prefix, but only if SHELL_FILE does too.
-
-M_INSTALL=cp /bin/sh /usr/local/lib/gdb-sh; \
-chmod ogu+rw /usr/local/lib/gdb-sh
-M_UNINSTALL = rm -f /usr/local/lib/gdb-sh
+# OBSOLETE # Host: Merlin running utek 2.1
+# OBSOLETE XDEPFILES= infptrace.o inftarg.o fork-child.o corelow.o core-aout.o
+# OBSOLETE XM_FILE= xm-merlin.h
+# OBSOLETE 
+# OBSOLETE # FIXME: M_INSTALL is gone from the gdb makefile.  If anyone cares
+# OBSOLETE # about the Merlin anymore, and the bug which inspired
+# OBSOLETE # SHELL_FILE/gdb-sh is still there, will need to reinstate it.  Also,
+# OBSOLETE # this should be done for native only.
+# OBSOLETE 
+# OBSOLETE # See SHELL_FILE in xm-merlin.h for a explanation of this.
+# OBSOLETE 
+# OBSOLETE # FIXME: This should use $prefix, but only if SHELL_FILE does too.
+# OBSOLETE 
+# OBSOLETE M_INSTALL=cp /bin/sh /usr/local/lib/gdb-sh; \
+# OBSOLETE chmod ogu+rw /usr/local/lib/gdb-sh
+# OBSOLETE M_UNINSTALL = rm -f /usr/local/lib/gdb-sh
diff --git a/gdb/config/ns32k/merlin.mt b/gdb/config/ns32k/merlin.mt
index b346077..a105c14 100644
--- a/gdb/config/ns32k/merlin.mt
+++ b/gdb/config/ns32k/merlin.mt
@@ -1,3 +1,3 @@
-# Target: Merlin running utek 2.1
-TDEPFILES= ns32k-tdep.o
-TM_FILE= tm-merlin.h
+# OBSOLETE # Target: Merlin running utek 2.1
+# OBSOLETE TDEPFILES= ns32k-tdep.o
+# OBSOLETE TM_FILE= tm-merlin.h
diff --git a/gdb/config/ns32k/nm-umax.h b/gdb/config/ns32k/nm-umax.h
index f86706d..7124420 100644
--- a/gdb/config/ns32k/nm-umax.h
+++ b/gdb/config/ns32k/nm-umax.h
@@ -1,55 +1,55 @@
-/* Definitions to make GDB run on an encore under umax 4.2
-   Copyright 1987, 1989, 1992, 2001 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., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-/* Do implement the attach and detach commands...  */
-#define ATTACH_DETACH
-
-/* Offset of registers within u area.  */
-#define U_REGS_OFFSET 0
-
-/* called from register_addr() -- blockend not used for now */
-#define REGISTER_U_ADDR(addr, blockend, regno) \
-{ 									\
-  switch (regno) {							\
-  case 0: case 1: case 2: case 3: case 4: case 5: case 6: case 7:	\
-	addr = PU_R0 - (regno * sizeof (int)); break;			\
-  case SP_REGNUM:							\
-  	addr = PU_SP; break;						\
-  case PC_REGNUM:							\
-  	addr = PU_PC; break;						\
-  case FP_REGNUM:							\
-  	addr = PU_FP; break;						\
-  case PS_REGNUM:							\
-  	addr = PU_PSL; break;						\
-  case FPS_REGNUM:							\
-  	addr = PU_FSR; break;						\
-  case FP0_REGNUM + 0: case FP0_REGNUM + 1:				\
-  case FP0_REGNUM + 2: case FP0_REGNUM + 3: 				\
-  case FP0_REGNUM + 4: case FP0_REGNUM + 5: 				\
-  case FP0_REGNUM + 6: case FP0_REGNUM + 7: 				\
-  	addr = PU_F0 + (regno - FP0_REGNUM) * sizeof (float); break;	\
-  case LP0_REGNUM + 0: case LP0_REGNUM + 1:				\
-  case LP0_REGNUM + 2: case LP0_REGNUM + 3:				\
-  	addr = PU_F0 + (regno - LP0_REGNUM) * sizeof (double); break;	\
-  default:								\
-  	printf ("bad argument to REGISTER_U_ADDR %d\n", regno);		\
-	internal_error (__FILE__, __LINE__, "failed internal consistency check");							\
-  }									\
-}
+/* OBSOLETE /* Definitions to make GDB run on an encore under umax 4.2 */
+/* OBSOLETE    Copyright 1987, 1989, 1992, 2001 Free Software Foundation, Inc. */
+/* OBSOLETE  */
+/* OBSOLETE    This file is part of GDB. */
+/* OBSOLETE  */
+/* OBSOLETE    This program is free software; you can redistribute it and/or modify */
+/* OBSOLETE    it under the terms of the GNU General Public License as published by */
+/* OBSOLETE    the Free Software Foundation; either version 2 of the License, or */
+/* OBSOLETE    (at your option) any later version. */
+/* OBSOLETE  */
+/* OBSOLETE    This program is distributed in the hope that it will be useful, */
+/* OBSOLETE    but WITHOUT ANY WARRANTY; without even the implied warranty of */
+/* OBSOLETE    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the */
+/* OBSOLETE    GNU General Public License for more details. */
+/* OBSOLETE  */
+/* OBSOLETE    You should have received a copy of the GNU General Public License */
+/* OBSOLETE    along with this program; if not, write to the Free Software */
+/* OBSOLETE    Foundation, Inc., 59 Temple Place - Suite 330, */
+/* OBSOLETE    Boston, MA 02111-1307, USA.  */ */
+/* OBSOLETE  */
+/* OBSOLETE /* Do implement the attach and detach commands...  */ */
+/* OBSOLETE #define ATTACH_DETACH */
+/* OBSOLETE  */
+/* OBSOLETE /* Offset of registers within u area.  */ */
+/* OBSOLETE #define U_REGS_OFFSET 0 */
+/* OBSOLETE  */
+/* OBSOLETE /* called from register_addr() -- blockend not used for now */ */
+/* OBSOLETE #define REGISTER_U_ADDR(addr, blockend, regno) \ */
+/* OBSOLETE { 									\ */
+/* OBSOLETE   switch (regno) {							\ */
+/* OBSOLETE   case 0: case 1: case 2: case 3: case 4: case 5: case 6: case 7:	\ */
+/* OBSOLETE 	addr = PU_R0 - (regno * sizeof (int)); break;			\ */
+/* OBSOLETE   case SP_REGNUM:							\ */
+/* OBSOLETE   	addr = PU_SP; break;						\ */
+/* OBSOLETE   case PC_REGNUM:							\ */
+/* OBSOLETE   	addr = PU_PC; break;						\ */
+/* OBSOLETE   case FP_REGNUM:							\ */
+/* OBSOLETE   	addr = PU_FP; break;						\ */
+/* OBSOLETE   case PS_REGNUM:							\ */
+/* OBSOLETE   	addr = PU_PSL; break;						\ */
+/* OBSOLETE   case FPS_REGNUM:							\ */
+/* OBSOLETE   	addr = PU_FSR; break;						\ */
+/* OBSOLETE   case FP0_REGNUM + 0: case FP0_REGNUM + 1:				\ */
+/* OBSOLETE   case FP0_REGNUM + 2: case FP0_REGNUM + 3: 				\ */
+/* OBSOLETE   case FP0_REGNUM + 4: case FP0_REGNUM + 5: 				\ */
+/* OBSOLETE   case FP0_REGNUM + 6: case FP0_REGNUM + 7: 				\ */
+/* OBSOLETE   	addr = PU_F0 + (regno - FP0_REGNUM) * sizeof (float); break;	\ */
+/* OBSOLETE   case LP0_REGNUM + 0: case LP0_REGNUM + 1:				\ */
+/* OBSOLETE   case LP0_REGNUM + 2: case LP0_REGNUM + 3:				\ */
+/* OBSOLETE   	addr = PU_F0 + (regno - LP0_REGNUM) * sizeof (double); break;	\ */
+/* OBSOLETE   default:								\ */
+/* OBSOLETE   	printf ("bad argument to REGISTER_U_ADDR %d\n", regno);		\ */
+/* OBSOLETE 	internal_error (__FILE__, __LINE__, "failed internal consistency check");							\ */
+/* OBSOLETE   }									\ */
+/* OBSOLETE } */
diff --git a/gdb/config/ns32k/ns32km3.mh b/gdb/config/ns32k/ns32km3.mh
index 7f0992a..7514751 100644
--- a/gdb/config/ns32k/ns32km3.mh
+++ b/gdb/config/ns32k/ns32km3.mh
@@ -1,7 +1,7 @@
-# Host: ns32k running Mach3
-
-XDEPFILES=
-NATDEPFILES= m3-nat.o ns32km3-nat.o fork-child.o corelow.o core-aout.o
-NAT_CLIBS= -L/usr/mach/lib -lnetname -lmachid -lmach
-XM_FILE= xm-ns32km3.h
-NAT_FILE= nm-m3.h
+# OBSOLETE # Host: ns32k running Mach3
+# OBSOLETE 
+# OBSOLETE XDEPFILES=
+# OBSOLETE NATDEPFILES= m3-nat.o ns32km3-nat.o fork-child.o corelow.o core-aout.o
+# OBSOLETE NAT_CLIBS= -L/usr/mach/lib -lnetname -lmachid -lmach
+# OBSOLETE XM_FILE= xm-ns32km3.h
+# OBSOLETE NAT_FILE= nm-m3.h
diff --git a/gdb/config/ns32k/ns32km3.mt b/gdb/config/ns32k/ns32km3.mt
index 9391176..f9d0fa0 100644
--- a/gdb/config/ns32k/ns32km3.mt
+++ b/gdb/config/ns32k/ns32km3.mt
@@ -1,3 +1,3 @@
-# Target: ns32k with a.out on Mach 3
-TDEPFILES= ns32k-tdep.o 
-TM_FILE= tm-ns32km3.h
+# OBSOLETE # Target: ns32k with a.out on Mach 3
+# OBSOLETE TDEPFILES= ns32k-tdep.o 
+# OBSOLETE TM_FILE= tm-ns32km3.h
diff --git a/gdb/config/ns32k/tm-merlin.h b/gdb/config/ns32k/tm-merlin.h
index 56c1f5e..8c88f46 100644
--- a/gdb/config/ns32k/tm-merlin.h
+++ b/gdb/config/ns32k/tm-merlin.h
@@ -1,289 +1,289 @@
-/* Definitions to target GDB to a merlin under utek 2.1
-   Copyright 1986, 1987, 1989, 1991, 1993, 1994, 1998, 1999, 2000
-   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., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-#include "regcache.h"
-
-#define TARGET_BYTE_ORDER LITTLE_ENDIAN
-
-/* Offset from address of function to start of its code.
-   Zero on most machines.  */
-
-#define FUNCTION_START_OFFSET 0
-
-/* Advance PC across any function entry prologue instructions
-   to reach some "real" code.  */
-
-extern CORE_ADDR merlin_skip_prologue (CORE_ADDR);
-#define SKIP_PROLOGUE(pc) (merlin_skip_prologue (pc))
-
-/* Immediately after a function call, return the saved pc.
-   Can't always go through the frames for this because on some machines
-   the new frame is not set up until the new function executes
-   some instructions.  */
-
-#define SAVED_PC_AFTER_CALL(frame) \
-	read_memory_integer (read_register (SP_REGNUM), 4)
-
-/* Address of end of stack space.  */
-
-#define STACK_END_ADDR (0x800000)
-
-/* Stack grows downward.  */
-
-#define INNER_THAN(lhs,rhs) ((lhs) < (rhs))
-
-/* Sequence of bytes for breakpoint instruction.  */
-
-#define BREAKPOINT {0xf2}
-
-/* Amount PC must be decremented by after a breakpoint.
-   This is often the number of bytes in BREAKPOINT
-   but not always.  */
-
-#define DECR_PC_AFTER_BREAK 0
-
-/* Define this to say that the "svc" insn is followed by
-   codes in memory saying which kind of system call it is.  */
-
-#define NS32K_SVC_IMMED_OPERANDS
-
-/* Say how long (ordinary) registers are.  This is a piece of bogosity
-   used in push_word and a few other places; REGISTER_RAW_SIZE is the
-   real way to know how big a register is.  */
-
-#define REGISTER_SIZE 4
-
-/* Number of machine registers */
-
-#define NUM_REGS		25
-
-#define NUM_GENERAL_REGS	8
-
-/* Initializer for an array of names of registers.
-   There should be NUM_REGS strings in this initializer.  */
-
-#define REGISTER_NAMES {"r0", "r1", "r2", "r3", "r4", "r5", "r6", "r7",	\
-			"pc", "sp", "fp", "ps",				\
- 			"fsr",						\
- 			"f0", "f1", "f2", "f3", "f4", "f5", "f6", "f7",	\
-			"l0", "l1", "l2", "l3", "l4",			\
- 			}
-
-/* Register numbers of various important registers.
-   Note that some of these values are "real" register numbers,
-   and correspond to the general registers of the machine,
-   and some are "phony" register numbers which are too large
-   to be actual register numbers as far as the user is concerned
-   but do serve to get the desired values when passed to read_register.  */
-
-#define AP_REGNUM FP_REGNUM
-#define FP_REGNUM 10		/* Contains address of executing stack frame */
-#define SP_REGNUM 9		/* Contains address of top of stack */
-#define PC_REGNUM 8		/* Contains program counter */
-#define PS_REGNUM 11		/* Contains processor status */
-#define FPS_REGNUM 12		/* Floating point status register */
-#define FP0_REGNUM 13		/* Floating point register 0 */
-#define LP0_REGNUM 21		/* Double register 0 (same as FP0) */
-
-/* Total amount of space needed to store our copies of the machine's
-   register state, the array `registers'.  */
-#define REGISTER_BYTES ((NUM_REGS - 4) * sizeof (int) + 4 * sizeof (double))
-
-/* Index within `registers' of the first byte of the space for
-   register N.  */
-
-#define REGISTER_BYTE(N) ((N) >= LP0_REGNUM ? \
-	LP0_REGNUM * 4 + ((N) - LP0_REGNUM) * 8 : (N) * 4)
-
-/* Number of bytes of storage in the actual machine representation
-   for register N.  On the 32000, all regs are 4 bytes
-   except for the doubled floating registers. */
-
-#define REGISTER_RAW_SIZE(N) ((N) >= LP0_REGNUM ? 8 : 4)
-
-/* Number of bytes of storage in the program's representation
-   for register N.  On the 32000, all regs are 4 bytes
-   except for the doubled floating registers. */
-
-#define REGISTER_VIRTUAL_SIZE(N) ((N) >= LP0_REGNUM ? 8 : 4)
-
-/* Largest value REGISTER_RAW_SIZE can have.  */
-
-#define MAX_REGISTER_RAW_SIZE 8
-
-/* Largest value REGISTER_VIRTUAL_SIZE can have.  */
-
-#define MAX_REGISTER_VIRTUAL_SIZE 8
-
-/* Return the GDB type object for the "standard" data type
-   of data in register N.  */
-
-#define REGISTER_VIRTUAL_TYPE(N) \
-  ((N) >= FP0_REGNUM ?		\
-    ((N) >= LP0_REGNUM ?	\
-     builtin_type_double	\
-     : builtin_type_float)	\
-   : builtin_type_int)
-
-/* Store the address of the place in which to copy the structure the
-   subroutine will return.  This is called from call_function.
-
-   On this machine this is a no-op, as gcc doesn't run on it yet.
-   This calling convention is not used. */
-
-#define STORE_STRUCT_RETURN(ADDR, SP)
-
-/* Extract from an array REGBUF containing the (raw) register state
-   a function return value of type TYPE, and copy that, in virtual format,
-   into VALBUF.  */
-
-#define EXTRACT_RETURN_VALUE(TYPE,REGBUF,VALBUF) \
-  memcpy (VALBUF, REGBUF, TYPE_LENGTH (TYPE))
-
-/* Write into appropriate registers a function return value
-   of type TYPE, given in virtual format.  */
-
-#define STORE_RETURN_VALUE(TYPE,VALBUF) \
-  write_register_bytes (0, VALBUF, TYPE_LENGTH (TYPE))
-
-/* Extract from an array REGBUF containing the (raw) register state
-   the address in which a function should return its structure value,
-   as a CORE_ADDR (or an expression that can be used as one).  */
-
-#define EXTRACT_STRUCT_VALUE_ADDRESS(REGBUF) (*(int *)(REGBUF))
-
-/* Describe the pointer in each stack frame to the previous stack frame
-   (its caller).  */
-
-/* FRAME_CHAIN takes a frame's nominal address
-   and produces the frame's chain-pointer. */
-
-/* In the case of the Merlin, the frame's nominal address is the FP value,
-   and at that address is saved previous FP value as a 4-byte word.  */
-
-#define FRAME_CHAIN(thisframe)  \
-  (!inside_entry_file ((thisframe)->pc) ? \
-   read_memory_integer ((thisframe)->frame, 4) :\
-   0)
-
-/* Define other aspects of the stack frame.  */
-
-#define FRAME_SAVED_PC(FRAME) (read_memory_integer ((FRAME)->frame + 4, 4))
-
-/* compute base of arguments */
-#define FRAME_ARGS_ADDRESS(fi) ((fi)->frame)
-
-#define FRAME_LOCALS_ADDRESS(fi) ((fi)->frame)
-
-/* Return number of args passed to a frame.
-   Can return -1, meaning no way to tell.  */
-
-extern int merlin_frame_num_args (struct frame_info *fi);
-#define FRAME_NUM_ARGS(fi) (merlin_frame_num_args ((fi)))
-
-/* Return number of bytes at start of arglist that are not really args.  */
-
-#define FRAME_ARGS_SKIP 8
-
-/* Put here the code to store, into a struct frame_saved_regs,
-   the addresses of the saved registers of frame described by FRAME_INFO.
-   This includes special registers such as pc and fp saved in special
-   ways in the stack frame.  sp is even more special:
-   the address we return for it IS the sp for the next frame.  */
-
-#define FRAME_FIND_SAVED_REGS(frame_info, frame_saved_regs) \
-{ int regmask,regnum;						\
-  int localcount;						\
-  CORE_ADDR enter_addr;						\
-  CORE_ADDR next_addr;						\
-								\
-  enter_addr = get_pc_function_start ((frame_info)->pc);	\
-  regmask = read_memory_integer (enter_addr+1, 1);		\
-  localcount = ns32k_localcount (enter_addr);			\
-  next_addr = (frame_info)->frame + localcount;			\
-  for (regnum = 0; regnum < 8; regnum++, regmask >>= 1)		\
-    (frame_saved_regs).regs[regnum]				\
-      = (regmask & 1) ? (next_addr -= 4) : 0;			\
-  (frame_saved_regs).regs[SP_REGNUM] = (frame_info)->frame + 4;	\
-  (frame_saved_regs).regs[PC_REGNUM] = (frame_info)->frame + 4;	\
-  (frame_saved_regs).regs[FP_REGNUM]				\
-     = read_memory_integer ((frame_info)->frame, 4); }
-
-
-/* Things needed for making the inferior call functions.  */
-
-/* Push an empty stack frame, to record the current PC, etc.  */
-
-#define PUSH_DUMMY_FRAME \
-{ register CORE_ADDR sp = read_register (SP_REGNUM);	\
-  register int regnum;					\
-  sp = push_word (sp, read_register (PC_REGNUM));	\
-  sp = push_word (sp, read_register (FP_REGNUM));	\
-  write_register (FP_REGNUM, sp);			\
-  for (regnum = 0; regnum < 8; regnum++)  		\
-    sp = push_word (sp, read_register (regnum));	\
-  write_register (SP_REGNUM, sp);  			\
-}
-
-/* Discard from the stack the innermost frame, restoring all registers.  */
-
-#define POP_FRAME  \
-{ register struct frame_info *frame = get_current_frame ();	 \
-  register CORE_ADDR fp;					 \
-  register int regnum;						 \
-  struct frame_saved_regs fsr;					 \
-  struct frame_info *fi;						 \
-  fp = frame->frame;						 \
-  get_frame_saved_regs (frame, &fsr);				 \
-  for (regnum = 0; regnum < 8; regnum++)			 \
-    if (fsr.regs[regnum])					 \
-      write_register (regnum, read_memory_integer (fsr.regs[regnum], 4)); \
-  write_register (FP_REGNUM, read_memory_integer (fp, 4));	 \
-  write_register (PC_REGNUM, read_memory_integer (fp + 4, 4));   \
-  write_register (SP_REGNUM, fp + 8);				 \
-  flush_cached_frames ();					 \
-}
-
-/* This sequence of words is the instructions
-   enter        0xff,0          82 ff 00
-   jsr  @0x00010203     7f ae c0 01 02 03
-   adjspd       0x69696969      7f a5 01 02 03 04
-   bpt                  f2
-   Note this is 16 bytes.  */
-
-#define CALL_DUMMY { 0x7f00ff82, 0x0201c0ae, 0x01a57f03, 0xf2040302 }
-
-#define CALL_DUMMY_START_OFFSET	3
-#define CALL_DUMMY_LENGTH	16
-#define CALL_DUMMY_ADDR		5
-#define CALL_DUMMY_NARGS	11
-
-/* Insert the specified number of args and function address
-   into a call sequence of the above form stored at DUMMYNAME.  */
-
-#define FIX_CALL_DUMMY(dummyname, pc, fun, nargs, args, type, gcc_p)   		\
-{ int flipped = fun | 0xc0000000;				\
-  flip_bytes (&flipped, 4);					\
-  *((int *) (((char *) dummyname)+CALL_DUMMY_ADDR)) = flipped;	\
-  flipped = - nargs * 4;					\
-  flip_bytes (&flipped, 4);					\
-  *((int *) (((char *) dummyname)+CALL_DUMMY_NARGS)) = flipped;	\
-}
+/* OBSOLETE /* Definitions to target GDB to a merlin under utek 2.1 */
+/* OBSOLETE    Copyright 1986, 1987, 1989, 1991, 1993, 1994, 1998, 1999, 2000 */
+/* OBSOLETE    Free Software Foundation, Inc. */
+/* OBSOLETE  */
+/* OBSOLETE    This file is part of GDB. */
+/* OBSOLETE  */
+/* OBSOLETE    This program is free software; you can redistribute it and/or modify */
+/* OBSOLETE    it under the terms of the GNU General Public License as published by */
+/* OBSOLETE    the Free Software Foundation; either version 2 of the License, or */
+/* OBSOLETE    (at your option) any later version. */
+/* OBSOLETE  */
+/* OBSOLETE    This program is distributed in the hope that it will be useful, */
+/* OBSOLETE    but WITHOUT ANY WARRANTY; without even the implied warranty of */
+/* OBSOLETE    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the */
+/* OBSOLETE    GNU General Public License for more details. */
+/* OBSOLETE  */
+/* OBSOLETE    You should have received a copy of the GNU General Public License */
+/* OBSOLETE    along with this program; if not, write to the Free Software */
+/* OBSOLETE    Foundation, Inc., 59 Temple Place - Suite 330, */
+/* OBSOLETE    Boston, MA 02111-1307, USA.  */ */
+/* OBSOLETE  */
+/* OBSOLETE #include "regcache.h" */
+/* OBSOLETE  */
+/* OBSOLETE #define TARGET_BYTE_ORDER LITTLE_ENDIAN */
+/* OBSOLETE  */
+/* OBSOLETE /* Offset from address of function to start of its code. */
+/* OBSOLETE    Zero on most machines.  */ */
+/* OBSOLETE  */
+/* OBSOLETE #define FUNCTION_START_OFFSET 0 */
+/* OBSOLETE  */
+/* OBSOLETE /* Advance PC across any function entry prologue instructions */
+/* OBSOLETE    to reach some "real" code.  */ */
+/* OBSOLETE  */
+/* OBSOLETE extern CORE_ADDR merlin_skip_prologue (CORE_ADDR); */
+/* OBSOLETE #define SKIP_PROLOGUE(pc) (merlin_skip_prologue (pc)) */
+/* OBSOLETE  */
+/* OBSOLETE /* Immediately after a function call, return the saved pc. */
+/* OBSOLETE    Can't always go through the frames for this because on some machines */
+/* OBSOLETE    the new frame is not set up until the new function executes */
+/* OBSOLETE    some instructions.  */ */
+/* OBSOLETE  */
+/* OBSOLETE #define SAVED_PC_AFTER_CALL(frame) \ */
+/* OBSOLETE 	read_memory_integer (read_register (SP_REGNUM), 4) */
+/* OBSOLETE  */
+/* OBSOLETE /* Address of end of stack space.  */ */
+/* OBSOLETE  */
+/* OBSOLETE #define STACK_END_ADDR (0x800000) */
+/* OBSOLETE  */
+/* OBSOLETE /* Stack grows downward.  */ */
+/* OBSOLETE  */
+/* OBSOLETE #define INNER_THAN(lhs,rhs) ((lhs) < (rhs)) */
+/* OBSOLETE  */
+/* OBSOLETE /* Sequence of bytes for breakpoint instruction.  */ */
+/* OBSOLETE  */
+/* OBSOLETE #define BREAKPOINT {0xf2} */
+/* OBSOLETE  */
+/* OBSOLETE /* Amount PC must be decremented by after a breakpoint. */
+/* OBSOLETE    This is often the number of bytes in BREAKPOINT */
+/* OBSOLETE    but not always.  */ */
+/* OBSOLETE  */
+/* OBSOLETE #define DECR_PC_AFTER_BREAK 0 */
+/* OBSOLETE  */
+/* OBSOLETE /* Define this to say that the "svc" insn is followed by */
+/* OBSOLETE    codes in memory saying which kind of system call it is.  */ */
+/* OBSOLETE  */
+/* OBSOLETE #define NS32K_SVC_IMMED_OPERANDS */
+/* OBSOLETE  */
+/* OBSOLETE /* Say how long (ordinary) registers are.  This is a piece of bogosity */
+/* OBSOLETE    used in push_word and a few other places; REGISTER_RAW_SIZE is the */
+/* OBSOLETE    real way to know how big a register is.  */ */
+/* OBSOLETE  */
+/* OBSOLETE #define REGISTER_SIZE 4 */
+/* OBSOLETE  */
+/* OBSOLETE /* Number of machine registers */ */
+/* OBSOLETE  */
+/* OBSOLETE #define NUM_REGS		25 */
+/* OBSOLETE  */
+/* OBSOLETE #define NUM_GENERAL_REGS	8 */
+/* OBSOLETE  */
+/* OBSOLETE /* Initializer for an array of names of registers. */
+/* OBSOLETE    There should be NUM_REGS strings in this initializer.  */ */
+/* OBSOLETE  */
+/* OBSOLETE #define REGISTER_NAMES {"r0", "r1", "r2", "r3", "r4", "r5", "r6", "r7",	\ */
+/* OBSOLETE 			"pc", "sp", "fp", "ps",				\ */
+/* OBSOLETE  			"fsr",						\ */
+/* OBSOLETE  			"f0", "f1", "f2", "f3", "f4", "f5", "f6", "f7",	\ */
+/* OBSOLETE 			"l0", "l1", "l2", "l3", "l4",			\ */
+/* OBSOLETE  			} */
+/* OBSOLETE  */
+/* OBSOLETE /* Register numbers of various important registers. */
+/* OBSOLETE    Note that some of these values are "real" register numbers, */
+/* OBSOLETE    and correspond to the general registers of the machine, */
+/* OBSOLETE    and some are "phony" register numbers which are too large */
+/* OBSOLETE    to be actual register numbers as far as the user is concerned */
+/* OBSOLETE    but do serve to get the desired values when passed to read_register.  */ */
+/* OBSOLETE  */
+/* OBSOLETE #define AP_REGNUM FP_REGNUM */
+/* OBSOLETE #define FP_REGNUM 10		/* Contains address of executing stack frame */ */
+/* OBSOLETE #define SP_REGNUM 9		/* Contains address of top of stack */ */
+/* OBSOLETE #define PC_REGNUM 8		/* Contains program counter */ */
+/* OBSOLETE #define PS_REGNUM 11		/* Contains processor status */ */
+/* OBSOLETE #define FPS_REGNUM 12		/* Floating point status register */ */
+/* OBSOLETE #define FP0_REGNUM 13		/* Floating point register 0 */ */
+/* OBSOLETE #define LP0_REGNUM 21		/* Double register 0 (same as FP0) */ */
+/* OBSOLETE  */
+/* OBSOLETE /* Total amount of space needed to store our copies of the machine's */
+/* OBSOLETE    register state, the array `registers'.  */ */
+/* OBSOLETE #define REGISTER_BYTES ((NUM_REGS - 4) * sizeof (int) + 4 * sizeof (double)) */
+/* OBSOLETE  */
+/* OBSOLETE /* Index within `registers' of the first byte of the space for */
+/* OBSOLETE    register N.  */ */
+/* OBSOLETE  */
+/* OBSOLETE #define REGISTER_BYTE(N) ((N) >= LP0_REGNUM ? \ */
+/* OBSOLETE 	LP0_REGNUM * 4 + ((N) - LP0_REGNUM) * 8 : (N) * 4) */
+/* OBSOLETE  */
+/* OBSOLETE /* Number of bytes of storage in the actual machine representation */
+/* OBSOLETE    for register N.  On the 32000, all regs are 4 bytes */
+/* OBSOLETE    except for the doubled floating registers. */ */
+/* OBSOLETE  */
+/* OBSOLETE #define REGISTER_RAW_SIZE(N) ((N) >= LP0_REGNUM ? 8 : 4) */
+/* OBSOLETE  */
+/* OBSOLETE /* Number of bytes of storage in the program's representation */
+/* OBSOLETE    for register N.  On the 32000, all regs are 4 bytes */
+/* OBSOLETE    except for the doubled floating registers. */ */
+/* OBSOLETE  */
+/* OBSOLETE #define REGISTER_VIRTUAL_SIZE(N) ((N) >= LP0_REGNUM ? 8 : 4) */
+/* OBSOLETE  */
+/* OBSOLETE /* Largest value REGISTER_RAW_SIZE can have.  */ */
+/* OBSOLETE  */
+/* OBSOLETE #define MAX_REGISTER_RAW_SIZE 8 */
+/* OBSOLETE  */
+/* OBSOLETE /* Largest value REGISTER_VIRTUAL_SIZE can have.  */ */
+/* OBSOLETE  */
+/* OBSOLETE #define MAX_REGISTER_VIRTUAL_SIZE 8 */
+/* OBSOLETE  */
+/* OBSOLETE /* Return the GDB type object for the "standard" data type */
+/* OBSOLETE    of data in register N.  */ */
+/* OBSOLETE  */
+/* OBSOLETE #define REGISTER_VIRTUAL_TYPE(N) \ */
+/* OBSOLETE   ((N) >= FP0_REGNUM ?		\ */
+/* OBSOLETE     ((N) >= LP0_REGNUM ?	\ */
+/* OBSOLETE      builtin_type_double	\ */
+/* OBSOLETE      : builtin_type_float)	\ */
+/* OBSOLETE    : builtin_type_int) */
+/* OBSOLETE  */
+/* OBSOLETE /* Store the address of the place in which to copy the structure the */
+/* OBSOLETE    subroutine will return.  This is called from call_function. */
+/* OBSOLETE  */
+/* OBSOLETE    On this machine this is a no-op, as gcc doesn't run on it yet. */
+/* OBSOLETE    This calling convention is not used. */ */
+/* OBSOLETE  */
+/* OBSOLETE #define STORE_STRUCT_RETURN(ADDR, SP) */
+/* OBSOLETE  */
+/* OBSOLETE /* Extract from an array REGBUF containing the (raw) register state */
+/* OBSOLETE    a function return value of type TYPE, and copy that, in virtual format, */
+/* OBSOLETE    into VALBUF.  */ */
+/* OBSOLETE  */
+/* OBSOLETE #define EXTRACT_RETURN_VALUE(TYPE,REGBUF,VALBUF) \ */
+/* OBSOLETE   memcpy (VALBUF, REGBUF, TYPE_LENGTH (TYPE)) */
+/* OBSOLETE  */
+/* OBSOLETE /* Write into appropriate registers a function return value */
+/* OBSOLETE    of type TYPE, given in virtual format.  */ */
+/* OBSOLETE  */
+/* OBSOLETE #define STORE_RETURN_VALUE(TYPE,VALBUF) \ */
+/* OBSOLETE   write_register_bytes (0, VALBUF, TYPE_LENGTH (TYPE)) */
+/* OBSOLETE  */
+/* OBSOLETE /* Extract from an array REGBUF containing the (raw) register state */
+/* OBSOLETE    the address in which a function should return its structure value, */
+/* OBSOLETE    as a CORE_ADDR (or an expression that can be used as one).  */ */
+/* OBSOLETE  */
+/* OBSOLETE #define EXTRACT_STRUCT_VALUE_ADDRESS(REGBUF) (*(int *)(REGBUF)) */
+/* OBSOLETE  */
+/* OBSOLETE /* Describe the pointer in each stack frame to the previous stack frame */
+/* OBSOLETE    (its caller).  */ */
+/* OBSOLETE  */
+/* OBSOLETE /* FRAME_CHAIN takes a frame's nominal address */
+/* OBSOLETE    and produces the frame's chain-pointer. */ */
+/* OBSOLETE  */
+/* OBSOLETE /* In the case of the Merlin, the frame's nominal address is the FP value, */
+/* OBSOLETE    and at that address is saved previous FP value as a 4-byte word.  */ */
+/* OBSOLETE  */
+/* OBSOLETE #define FRAME_CHAIN(thisframe)  \ */
+/* OBSOLETE   (!inside_entry_file ((thisframe)->pc) ? \ */
+/* OBSOLETE    read_memory_integer ((thisframe)->frame, 4) :\ */
+/* OBSOLETE    0) */
+/* OBSOLETE  */
+/* OBSOLETE /* Define other aspects of the stack frame.  */ */
+/* OBSOLETE  */
+/* OBSOLETE #define FRAME_SAVED_PC(FRAME) (read_memory_integer ((FRAME)->frame + 4, 4)) */
+/* OBSOLETE  */
+/* OBSOLETE /* compute base of arguments */ */
+/* OBSOLETE #define FRAME_ARGS_ADDRESS(fi) ((fi)->frame) */
+/* OBSOLETE  */
+/* OBSOLETE #define FRAME_LOCALS_ADDRESS(fi) ((fi)->frame) */
+/* OBSOLETE  */
+/* OBSOLETE /* Return number of args passed to a frame. */
+/* OBSOLETE    Can return -1, meaning no way to tell.  */ */
+/* OBSOLETE  */
+/* OBSOLETE extern int merlin_frame_num_args (struct frame_info *fi); */
+/* OBSOLETE #define FRAME_NUM_ARGS(fi) (merlin_frame_num_args ((fi))) */
+/* OBSOLETE  */
+/* OBSOLETE /* Return number of bytes at start of arglist that are not really args.  */ */
+/* OBSOLETE  */
+/* OBSOLETE #define FRAME_ARGS_SKIP 8 */
+/* OBSOLETE  */
+/* OBSOLETE /* Put here the code to store, into a struct frame_saved_regs, */
+/* OBSOLETE    the addresses of the saved registers of frame described by FRAME_INFO. */
+/* OBSOLETE    This includes special registers such as pc and fp saved in special */
+/* OBSOLETE    ways in the stack frame.  sp is even more special: */
+/* OBSOLETE    the address we return for it IS the sp for the next frame.  */ */
+/* OBSOLETE  */
+/* OBSOLETE #define FRAME_FIND_SAVED_REGS(frame_info, frame_saved_regs) \ */
+/* OBSOLETE { int regmask,regnum;						\ */
+/* OBSOLETE   int localcount;						\ */
+/* OBSOLETE   CORE_ADDR enter_addr;						\ */
+/* OBSOLETE   CORE_ADDR next_addr;						\ */
+/* OBSOLETE 								\ */
+/* OBSOLETE   enter_addr = get_pc_function_start ((frame_info)->pc);	\ */
+/* OBSOLETE   regmask = read_memory_integer (enter_addr+1, 1);		\ */
+/* OBSOLETE   localcount = ns32k_localcount (enter_addr);			\ */
+/* OBSOLETE   next_addr = (frame_info)->frame + localcount;			\ */
+/* OBSOLETE   for (regnum = 0; regnum < 8; regnum++, regmask >>= 1)		\ */
+/* OBSOLETE     (frame_saved_regs).regs[regnum]				\ */
+/* OBSOLETE       = (regmask & 1) ? (next_addr -= 4) : 0;			\ */
+/* OBSOLETE   (frame_saved_regs).regs[SP_REGNUM] = (frame_info)->frame + 4;	\ */
+/* OBSOLETE   (frame_saved_regs).regs[PC_REGNUM] = (frame_info)->frame + 4;	\ */
+/* OBSOLETE   (frame_saved_regs).regs[FP_REGNUM]				\ */
+/* OBSOLETE      = read_memory_integer ((frame_info)->frame, 4); } */
+/* OBSOLETE  */
+/* OBSOLETE  */
+/* OBSOLETE /* Things needed for making the inferior call functions.  */ */
+/* OBSOLETE  */
+/* OBSOLETE /* Push an empty stack frame, to record the current PC, etc.  */ */
+/* OBSOLETE  */
+/* OBSOLETE #define PUSH_DUMMY_FRAME \ */
+/* OBSOLETE { register CORE_ADDR sp = read_register (SP_REGNUM);	\ */
+/* OBSOLETE   register int regnum;					\ */
+/* OBSOLETE   sp = push_word (sp, read_register (PC_REGNUM));	\ */
+/* OBSOLETE   sp = push_word (sp, read_register (FP_REGNUM));	\ */
+/* OBSOLETE   write_register (FP_REGNUM, sp);			\ */
+/* OBSOLETE   for (regnum = 0; regnum < 8; regnum++)  		\ */
+/* OBSOLETE     sp = push_word (sp, read_register (regnum));	\ */
+/* OBSOLETE   write_register (SP_REGNUM, sp);  			\ */
+/* OBSOLETE } */
+/* OBSOLETE  */
+/* OBSOLETE /* Discard from the stack the innermost frame, restoring all registers.  */ */
+/* OBSOLETE  */
+/* OBSOLETE #define POP_FRAME  \ */
+/* OBSOLETE { register struct frame_info *frame = get_current_frame ();	 \ */
+/* OBSOLETE   register CORE_ADDR fp;					 \ */
+/* OBSOLETE   register int regnum;						 \ */
+/* OBSOLETE   struct frame_saved_regs fsr;					 \ */
+/* OBSOLETE   struct frame_info *fi;						 \ */
+/* OBSOLETE   fp = frame->frame;						 \ */
+/* OBSOLETE   get_frame_saved_regs (frame, &fsr);				 \ */
+/* OBSOLETE   for (regnum = 0; regnum < 8; regnum++)			 \ */
+/* OBSOLETE     if (fsr.regs[regnum])					 \ */
+/* OBSOLETE       write_register (regnum, read_memory_integer (fsr.regs[regnum], 4)); \ */
+/* OBSOLETE   write_register (FP_REGNUM, read_memory_integer (fp, 4));	 \ */
+/* OBSOLETE   write_register (PC_REGNUM, read_memory_integer (fp + 4, 4));   \ */
+/* OBSOLETE   write_register (SP_REGNUM, fp + 8);				 \ */
+/* OBSOLETE   flush_cached_frames ();					 \ */
+/* OBSOLETE } */
+/* OBSOLETE  */
+/* OBSOLETE /* This sequence of words is the instructions */
+/* OBSOLETE    enter        0xff,0          82 ff 00 */
+/* OBSOLETE    jsr  @0x00010203     7f ae c0 01 02 03 */
+/* OBSOLETE    adjspd       0x69696969      7f a5 01 02 03 04 */
+/* OBSOLETE    bpt                  f2 */
+/* OBSOLETE    Note this is 16 bytes.  */ */
+/* OBSOLETE  */
+/* OBSOLETE #define CALL_DUMMY { 0x7f00ff82, 0x0201c0ae, 0x01a57f03, 0xf2040302 } */
+/* OBSOLETE  */
+/* OBSOLETE #define CALL_DUMMY_START_OFFSET	3 */
+/* OBSOLETE #define CALL_DUMMY_LENGTH	16 */
+/* OBSOLETE #define CALL_DUMMY_ADDR		5 */
+/* OBSOLETE #define CALL_DUMMY_NARGS	11 */
+/* OBSOLETE  */
+/* OBSOLETE /* Insert the specified number of args and function address */
+/* OBSOLETE    into a call sequence of the above form stored at DUMMYNAME.  */ */
+/* OBSOLETE  */
+/* OBSOLETE #define FIX_CALL_DUMMY(dummyname, pc, fun, nargs, args, type, gcc_p)   		\ */
+/* OBSOLETE { int flipped = fun | 0xc0000000;				\ */
+/* OBSOLETE   flip_bytes (&flipped, 4);					\ */
+/* OBSOLETE   *((int *) (((char *) dummyname)+CALL_DUMMY_ADDR)) = flipped;	\ */
+/* OBSOLETE   flipped = - nargs * 4;					\ */
+/* OBSOLETE   flip_bytes (&flipped, 4);					\ */
+/* OBSOLETE   *((int *) (((char *) dummyname)+CALL_DUMMY_NARGS)) = flipped;	\ */
+/* OBSOLETE } */
diff --git a/gdb/config/ns32k/tm-ns32km3.h b/gdb/config/ns32k/tm-ns32km3.h
index 48806b3..f192657 100644
--- a/gdb/config/ns32k/tm-ns32km3.h
+++ b/gdb/config/ns32k/tm-ns32km3.h
@@ -1,74 +1,74 @@
-/* Macro definitions for ns532, Mach 3.0
-   Copyright 1992, 1993, 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., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-/* Include common definitions for Mach3 systems */
-#include "nm-m3.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
-
-#include <ns532/psl.h>
-#include <ns532/vmparam.h>
-
-/* Thread flavors used in re-setting the T bit.
- * @@ this is also bad for cross debugging.
- */
-#define TRACE_FLAVOR		NS532_THREAD_STATE
-#define TRACE_FLAVOR_SIZE	NS532_THREAD_STATE_COUNT
-#define TRACE_SET(x,state) \
-  	((struct ns532_thread_state *)state)->psr |= PSR_T
-#define TRACE_CLEAR(x,state) \
-  	((((struct ns532_thread_state *)state)->psr &= ~PSR_T), 1)
-
-/* we can do it */
-#define ATTACH_DETACH 1
-
-/* Address of end of stack space.
- * for MACH, see <ns532/vmparam.h>
- */
-#define STACK_END_ADDR USRSTACK
-
-#include "ns32k/tm-umax.h"
-
-/* tm-umax.h assumes a 32082 fpu. We have a 32382 fpu. */
-#undef REGISTER_NAMES
-#undef NUM_REGS
-#undef REGISTER_BYTES
-/* Initializer for an array of names of registers.
-   There should be NUM_REGS strings in this initializer.  */
-
-#define REGISTER_NAMES {"r0", "r1", "r2", "r3", "r4", "r5", "r6", "r7",	\
- 			"f0", "f1", "f2", "f3", "f4", "f5", "f6", "f7",	\
-			"sp", "fp", "pc", "ps",				\
- 			"fsr",						\
-			"l0", "l1", "l2", "l3", "l4", "l5", "l6", "l7", "xx",			\
- 			}
-
-#define NUM_REGS		29
-
-/* Total amount of space needed to store our copies of the machine's
-   register state, the array `registers'.  */
-#define REGISTER_BYTES \
-  ((NUM_REGS - 4) * REGISTER_RAW_SIZE(R0_REGNUM) \
-   + 8            * REGISTER_RAW_SIZE(LP0_REGNUM))
+/* OBSOLETE /* Macro definitions for ns532, Mach 3.0 */
+/* OBSOLETE    Copyright 1992, 1993, 1994 Free Software Foundation, Inc. */
+/* OBSOLETE  */
+/* OBSOLETE    This file is part of GDB. */
+/* OBSOLETE  */
+/* OBSOLETE    This program is free software; you can redistribute it and/or modify */
+/* OBSOLETE    it under the terms of the GNU General Public License as published by */
+/* OBSOLETE    the Free Software Foundation; either version 2 of the License, or */
+/* OBSOLETE    (at your option) any later version. */
+/* OBSOLETE  */
+/* OBSOLETE    This program is distributed in the hope that it will be useful, */
+/* OBSOLETE    but WITHOUT ANY WARRANTY; without even the implied warranty of */
+/* OBSOLETE    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the */
+/* OBSOLETE    GNU General Public License for more details. */
+/* OBSOLETE  */
+/* OBSOLETE    You should have received a copy of the GNU General Public License */
+/* OBSOLETE    along with this program; if not, write to the Free Software */
+/* OBSOLETE    Foundation, Inc., 59 Temple Place - Suite 330, */
+/* OBSOLETE    Boston, MA 02111-1307, USA.  */ */
+/* OBSOLETE  */
+/* OBSOLETE /* Include common definitions for Mach3 systems */ */
+/* OBSOLETE #include "nm-m3.h" */
+/* OBSOLETE  */
+/* OBSOLETE /* Define offsets to access CPROC stack when it does not have */
+/* OBSOLETE  * a kernel thread. */
+/* OBSOLETE  */ */
+/* OBSOLETE #define MACHINE_CPROC_SP_OFFSET 20 */
+/* OBSOLETE #define MACHINE_CPROC_PC_OFFSET 16 */
+/* OBSOLETE #define MACHINE_CPROC_FP_OFFSET 12 */
+/* OBSOLETE  */
+/* OBSOLETE #include <ns532/psl.h> */
+/* OBSOLETE #include <ns532/vmparam.h> */
+/* OBSOLETE  */
+/* OBSOLETE /* Thread flavors used in re-setting the T bit. */
+/* OBSOLETE  * @@ this is also bad for cross debugging. */
+/* OBSOLETE  */ */
+/* OBSOLETE #define TRACE_FLAVOR		NS532_THREAD_STATE */
+/* OBSOLETE #define TRACE_FLAVOR_SIZE	NS532_THREAD_STATE_COUNT */
+/* OBSOLETE #define TRACE_SET(x,state) \ */
+/* OBSOLETE   	((struct ns532_thread_state *)state)->psr |= PSR_T */
+/* OBSOLETE #define TRACE_CLEAR(x,state) \ */
+/* OBSOLETE   	((((struct ns532_thread_state *)state)->psr &= ~PSR_T), 1) */
+/* OBSOLETE  */
+/* OBSOLETE /* we can do it */ */
+/* OBSOLETE #define ATTACH_DETACH 1 */
+/* OBSOLETE  */
+/* OBSOLETE /* Address of end of stack space. */
+/* OBSOLETE  * for MACH, see <ns532/vmparam.h> */
+/* OBSOLETE  */ */
+/* OBSOLETE #define STACK_END_ADDR USRSTACK */
+/* OBSOLETE  */
+/* OBSOLETE #include "ns32k/tm-umax.h" */
+/* OBSOLETE  */
+/* OBSOLETE /* tm-umax.h assumes a 32082 fpu. We have a 32382 fpu. */ */
+/* OBSOLETE #undef REGISTER_NAMES */
+/* OBSOLETE #undef NUM_REGS */
+/* OBSOLETE #undef REGISTER_BYTES */
+/* OBSOLETE /* Initializer for an array of names of registers. */
+/* OBSOLETE    There should be NUM_REGS strings in this initializer.  */ */
+/* OBSOLETE  */
+/* OBSOLETE #define REGISTER_NAMES {"r0", "r1", "r2", "r3", "r4", "r5", "r6", "r7",	\ */
+/* OBSOLETE  			"f0", "f1", "f2", "f3", "f4", "f5", "f6", "f7",	\ */
+/* OBSOLETE 			"sp", "fp", "pc", "ps",				\ */
+/* OBSOLETE  			"fsr",						\ */
+/* OBSOLETE 			"l0", "l1", "l2", "l3", "l4", "l5", "l6", "l7", "xx",			\ */
+/* OBSOLETE  			} */
+/* OBSOLETE  */
+/* OBSOLETE #define NUM_REGS		29 */
+/* OBSOLETE  */
+/* OBSOLETE /* Total amount of space needed to store our copies of the machine's */
+/* OBSOLETE    register state, the array `registers'.  */ */
+/* OBSOLETE #define REGISTER_BYTES \ */
+/* OBSOLETE   ((NUM_REGS - 4) * REGISTER_RAW_SIZE(R0_REGNUM) \ */
+/* OBSOLETE    + 8            * REGISTER_RAW_SIZE(LP0_REGNUM)) */
diff --git a/gdb/config/ns32k/umax.mh b/gdb/config/ns32k/umax.mh
index e43f6ec..741fe0a 100644
--- a/gdb/config/ns32k/umax.mh
+++ b/gdb/config/ns32k/umax.mh
@@ -1,5 +1,5 @@
-# Host: Encore running umax 4.2
-XDEPFILES= umax-xdep.o
-XM_FILE= xm-umax.h
-NAT_FILE= nm-umax.h
-NATDEPFILES= infptrace.o inftarg.o fork-child.o
+# OBSOLETE # Host: Encore running umax 4.2
+# OBSOLETE XDEPFILES= umax-xdep.o
+# OBSOLETE XM_FILE= xm-umax.h
+# OBSOLETE NAT_FILE= nm-umax.h
+# OBSOLETE NATDEPFILES= infptrace.o inftarg.o fork-child.o
diff --git a/gdb/config/ns32k/umax.mt b/gdb/config/ns32k/umax.mt
index 4c9169d..00987f1 100644
--- a/gdb/config/ns32k/umax.mt
+++ b/gdb/config/ns32k/umax.mt
@@ -1,3 +1,3 @@
-# Target: Encore running umax 4.2
-TDEPFILES= ns32k-tdep.o
-TM_FILE= tm-umax.h
+# OBSOLETE # Target: Encore running umax 4.2
+# OBSOLETE TDEPFILES= ns32k-tdep.o
+# OBSOLETE TM_FILE= tm-umax.h
diff --git a/gdb/config/ns32k/xm-merlin.h b/gdb/config/ns32k/xm-merlin.h
index f08f517..e2dacbe 100644
--- a/gdb/config/ns32k/xm-merlin.h
+++ b/gdb/config/ns32k/xm-merlin.h
@@ -1,67 +1,67 @@
-/* Definitions to make GDB run on a merlin under utek 2.1
-   Copyright 1986, 1987, 1989, 1991, 1992, 1993, 2001
-   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., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-#include <machine/reg.h>
-
-/* This machine doesn't have the siginterrupt call.  */
-#define NO_SIGINTERRUPT
-
-/* Under Utek, a ptrace'd process can be the only active process for
-   an executable.  Therefore instead of /bin/sh use gdb-sh (which should
-   just be a copy of /bin/sh which is world readable and writeable).  */
-/* FIXME: name should be passed in from Makefile so it can use prefix.  */
-#define SHELL_FILE "/usr/local/lib/gdb-sh"
-
-#define HOST_BYTE_ORDER LITTLE_ENDIAN
-
-/* 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 (0xfef000)
-
-#define REGISTER_U_ADDR(addr, blockend, regno) \
-{ 									\
-  switch (regno) {							\
-  case 0: case 1: case 2: case 3: case 4: case 5: case 6: case 7:	\
-	addr = blockend + (R0 - regno) * sizeof (int); break;		\
-  case PC_REGNUM:							\
-  	addr = blockend + PC * sizeof (int); break;			\
-  case SP_REGNUM:							\
-  	addr = blockend + SP * sizeof (int); break;			\
-  case FP_REGNUM:							\
-  	addr = blockend + FP * sizeof (int); break;			\
-  case PS_REGNUM:							\
-  	addr = blockend + 12 * sizeof (int); break;			\
-  case FPS_REGNUM:							\
-  	addr = 108; break;						\
-  case FP0_REGNUM + 0: case FP0_REGNUM + 1:				\
-  case FP0_REGNUM + 2: case FP0_REGNUM + 3: 				\
-  case FP0_REGNUM + 4: case FP0_REGNUM + 5: 				\
-  case FP0_REGNUM + 6: case FP0_REGNUM + 7: 				\
-  	addr = 76 + (regno - FP0_REGNUM) * sizeof (float); break;	\
-  case LP0_REGNUM + 0: case LP0_REGNUM + 1:				\
-  case LP0_REGNUM + 2: case LP0_REGNUM + 3:				\
-  	addr = 76 + (regno - LP0_REGNUM) * sizeof (double); break;	\
-  default:								\
-  	printf ("bad argument to REGISTER_U_ADDR %d\n", regno);		\
-	internal_error (__FILE__, __LINE__, "failed internal consistency check");							\
-  }									\
-}
+/* OBSOLETE /* Definitions to make GDB run on a merlin under utek 2.1 */
+/* OBSOLETE    Copyright 1986, 1987, 1989, 1991, 1992, 1993, 2001 */
+/* OBSOLETE    Free Software Foundation, Inc. */
+/* OBSOLETE  */
+/* OBSOLETE    This file is part of GDB. */
+/* OBSOLETE  */
+/* OBSOLETE    This program is free software; you can redistribute it and/or modify */
+/* OBSOLETE    it under the terms of the GNU General Public License as published by */
+/* OBSOLETE    the Free Software Foundation; either version 2 of the License, or */
+/* OBSOLETE    (at your option) any later version. */
+/* OBSOLETE  */
+/* OBSOLETE    This program is distributed in the hope that it will be useful, */
+/* OBSOLETE    but WITHOUT ANY WARRANTY; without even the implied warranty of */
+/* OBSOLETE    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the */
+/* OBSOLETE    GNU General Public License for more details. */
+/* OBSOLETE  */
+/* OBSOLETE    You should have received a copy of the GNU General Public License */
+/* OBSOLETE    along with this program; if not, write to the Free Software */
+/* OBSOLETE    Foundation, Inc., 59 Temple Place - Suite 330, */
+/* OBSOLETE    Boston, MA 02111-1307, USA.  */ */
+/* OBSOLETE  */
+/* OBSOLETE #include <machine/reg.h> */
+/* OBSOLETE  */
+/* OBSOLETE /* This machine doesn't have the siginterrupt call.  */ */
+/* OBSOLETE #define NO_SIGINTERRUPT */
+/* OBSOLETE  */
+/* OBSOLETE /* Under Utek, a ptrace'd process can be the only active process for */
+/* OBSOLETE    an executable.  Therefore instead of /bin/sh use gdb-sh (which should */
+/* OBSOLETE    just be a copy of /bin/sh which is world readable and writeable).  */ */
+/* OBSOLETE /* FIXME: name should be passed in from Makefile so it can use prefix.  */ */
+/* OBSOLETE #define SHELL_FILE "/usr/local/lib/gdb-sh" */
+/* OBSOLETE  */
+/* OBSOLETE #define HOST_BYTE_ORDER LITTLE_ENDIAN */
+/* OBSOLETE  */
+/* OBSOLETE /* This is the amount to subtract from u.u_ar0 */
+/* OBSOLETE    to get the offset in the core file of the register values.  */ */
+/* OBSOLETE  */
+/* OBSOLETE #define KERNEL_U_ADDR (0xfef000) */
+/* OBSOLETE  */
+/* OBSOLETE #define REGISTER_U_ADDR(addr, blockend, regno) \ */
+/* OBSOLETE { 									\ */
+/* OBSOLETE   switch (regno) {							\ */
+/* OBSOLETE   case 0: case 1: case 2: case 3: case 4: case 5: case 6: case 7:	\ */
+/* OBSOLETE 	addr = blockend + (R0 - regno) * sizeof (int); break;		\ */
+/* OBSOLETE   case PC_REGNUM:							\ */
+/* OBSOLETE   	addr = blockend + PC * sizeof (int); break;			\ */
+/* OBSOLETE   case SP_REGNUM:							\ */
+/* OBSOLETE   	addr = blockend + SP * sizeof (int); break;			\ */
+/* OBSOLETE   case FP_REGNUM:							\ */
+/* OBSOLETE   	addr = blockend + FP * sizeof (int); break;			\ */
+/* OBSOLETE   case PS_REGNUM:							\ */
+/* OBSOLETE   	addr = blockend + 12 * sizeof (int); break;			\ */
+/* OBSOLETE   case FPS_REGNUM:							\ */
+/* OBSOLETE   	addr = 108; break;						\ */
+/* OBSOLETE   case FP0_REGNUM + 0: case FP0_REGNUM + 1:				\ */
+/* OBSOLETE   case FP0_REGNUM + 2: case FP0_REGNUM + 3: 				\ */
+/* OBSOLETE   case FP0_REGNUM + 4: case FP0_REGNUM + 5: 				\ */
+/* OBSOLETE   case FP0_REGNUM + 6: case FP0_REGNUM + 7: 				\ */
+/* OBSOLETE   	addr = 76 + (regno - FP0_REGNUM) * sizeof (float); break;	\ */
+/* OBSOLETE   case LP0_REGNUM + 0: case LP0_REGNUM + 1:				\ */
+/* OBSOLETE   case LP0_REGNUM + 2: case LP0_REGNUM + 3:				\ */
+/* OBSOLETE   	addr = 76 + (regno - LP0_REGNUM) * sizeof (double); break;	\ */
+/* OBSOLETE   default:								\ */
+/* OBSOLETE   	printf ("bad argument to REGISTER_U_ADDR %d\n", regno);		\ */
+/* OBSOLETE 	internal_error (__FILE__, __LINE__, "failed internal consistency check");							\ */
+/* OBSOLETE   }									\ */
+/* OBSOLETE } */
diff --git a/gdb/config/ns32k/xm-ns32km3.h b/gdb/config/ns32k/xm-ns32km3.h
index 465db81..ab4b8a4 100644
--- a/gdb/config/ns32k/xm-ns32km3.h
+++ b/gdb/config/ns32k/xm-ns32km3.h
@@ -1,25 +1,25 @@
-/* Definitions to make GDB run on Mach 3 on an National ns32k
-   Copyright 1986, 1987, 1989, 1991, 1993, 1994, 1995, 1996
-   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., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-#define HOST_BYTE_ORDER LITTLE_ENDIAN
-
-/* Do implement the attach and detach commands.  */
-#define ATTACH_DETACH	1
+/* OBSOLETE /* Definitions to make GDB run on Mach 3 on an National ns32k */
+/* OBSOLETE    Copyright 1986, 1987, 1989, 1991, 1993, 1994, 1995, 1996 */
+/* OBSOLETE    Free Software Foundation, Inc. */
+/* OBSOLETE  */
+/* OBSOLETE    This file is part of GDB. */
+/* OBSOLETE  */
+/* OBSOLETE    This program is free software; you can redistribute it and/or modify */
+/* OBSOLETE    it under the terms of the GNU General Public License as published by */
+/* OBSOLETE    the Free Software Foundation; either version 2 of the License, or */
+/* OBSOLETE    (at your option) any later version. */
+/* OBSOLETE  */
+/* OBSOLETE    This program is distributed in the hope that it will be useful, */
+/* OBSOLETE    but WITHOUT ANY WARRANTY; without even the implied warranty of */
+/* OBSOLETE    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the */
+/* OBSOLETE    GNU General Public License for more details. */
+/* OBSOLETE  */
+/* OBSOLETE    You should have received a copy of the GNU General Public License */
+/* OBSOLETE    along with this program; if not, write to the Free Software */
+/* OBSOLETE    Foundation, Inc., 59 Temple Place - Suite 330, */
+/* OBSOLETE    Boston, MA 02111-1307, USA.  */ */
+/* OBSOLETE  */
+/* OBSOLETE #define HOST_BYTE_ORDER LITTLE_ENDIAN */
+/* OBSOLETE  */
+/* OBSOLETE /* Do implement the attach and detach commands.  */ */
+/* OBSOLETE #define ATTACH_DETACH	1 */
diff --git a/gdb/config/ns32k/xm-umax.h b/gdb/config/ns32k/xm-umax.h
index b7f4dad..8fe762d 100644
--- a/gdb/config/ns32k/xm-umax.h
+++ b/gdb/config/ns32k/xm-umax.h
@@ -1,26 +1,26 @@
-/* Definitions to make GDB run on an encore under umax 4.2
-   Copyright 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., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-#define HOST_BYTE_ORDER LITTLE_ENDIAN
-
-#define HAVE_WAIT_STRUCT
-
-/* Doesn't have siginterupt.  */
-#define NO_SIGINTERRUPT
+/* OBSOLETE /* Definitions to make GDB run on an encore under umax 4.2 */
+/* OBSOLETE    Copyright 1987, 1989, 1992 Free Software Foundation, Inc. */
+/* OBSOLETE  */
+/* OBSOLETE    This file is part of GDB. */
+/* OBSOLETE  */
+/* OBSOLETE    This program is free software; you can redistribute it and/or modify */
+/* OBSOLETE    it under the terms of the GNU General Public License as published by */
+/* OBSOLETE    the Free Software Foundation; either version 2 of the License, or */
+/* OBSOLETE    (at your option) any later version. */
+/* OBSOLETE  */
+/* OBSOLETE    This program is distributed in the hope that it will be useful, */
+/* OBSOLETE    but WITHOUT ANY WARRANTY; without even the implied warranty of */
+/* OBSOLETE    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the */
+/* OBSOLETE    GNU General Public License for more details. */
+/* OBSOLETE  */
+/* OBSOLETE    You should have received a copy of the GNU General Public License */
+/* OBSOLETE    along with this program; if not, write to the Free Software */
+/* OBSOLETE    Foundation, Inc., 59 Temple Place - Suite 330, */
+/* OBSOLETE    Boston, MA 02111-1307, USA.  */ */
+/* OBSOLETE  */
+/* OBSOLETE #define HOST_BYTE_ORDER LITTLE_ENDIAN */
+/* OBSOLETE  */
+/* OBSOLETE #define HAVE_WAIT_STRUCT */
+/* OBSOLETE  */
+/* OBSOLETE /* Doesn't have siginterupt.  */ */
+/* OBSOLETE #define NO_SIGINTERRUPT */
diff --git a/gdb/configure.host b/gdb/configure.host
index 215a966..620ea85 100644
--- a/gdb/configure.host
+++ b/gdb/configure.host
@@ -125,10 +125,10 @@ mips-*-riscos*)		gdb_host=riscos ;;
 
 none-*-*)		gdb_host=none ;;
 
-ns32k-*-mach3*)		gdb_host=ns32km3 ;;
+# OBSOLETE ns32k-*-mach3*)		gdb_host=ns32km3 ;;
 ns32k-*-netbsd*)	gdb_host=nbsd ;;
-ns32k-umax-*)		gdb_host=umax ;;
-ns32k-utek-sysv*)	gdb_host=merlin ;;
+# OBSOLETE ns32k-umax-*)		gdb_host=umax ;;
+# OBSOLETE ns32k-utek-sysv*)	gdb_host=merlin ;;
 
 powerpc-*-aix*)		gdb_host=aix ;;
 powerpcle-*-cygwin*)	gdb_host=cygwin ;;
diff --git a/gdb/configure.tgt b/gdb/configure.tgt
index b277fc1..faa20cb 100644
--- a/gdb/configure.tgt
+++ b/gdb/configure.tgt
@@ -221,11 +221,11 @@ mn10300-*-*)		gdb_target=mn10300 ;;
 
 none-*-*)		gdb_target=none ;;
 
-ns32k-*-mach3*)		gdb_target=ns32km3 ;;
+# OBSOLETE ns32k-*-mach3*)		gdb_target=ns32km3 ;;
 ns32k-*-netbsd*)	gdb_target=nbsd
 		configdirs="${configdirs} gdbserver" ;;
-ns32k-utek-sysv*)	gdb_target=merlin ;;
-ns32k-utek-*)		gdb_target=umax ;;
+# OBSOLETE ns32k-utek-sysv*)	gdb_target=merlin ;;
+# OBSOLETE ns32k-utek-*)		gdb_target=umax ;;
 
 powerpc-*-macos*)	gdb_target=macos ;;
 powerpc-*-netbsd*)	gdb_target=nbsd
diff --git a/gdb/ns32k-tdep.c b/gdb/ns32k-tdep.c
index 57efe07..825247f 100644
--- a/gdb/ns32k-tdep.c
+++ b/gdb/ns32k-tdep.c
@@ -34,22 +34,22 @@ _initialize_ns32k_tdep (void)
 /* Advance PC across any function entry prologue instructions
    to reach some "real" code.  */
 
-CORE_ADDR
-merlin_skip_prologue (CORE_ADDR pc)
-{
-  register int op = read_memory_integer (pc, 1);
-  if (op == 0x82)
-    {
-      op = read_memory_integer (pc + 2, 1);
-      if ((op & 0x80) == 0)
-	pc += 3;
-      else if ((op & 0xc0) == 0x80)
-	pc += 4;
-      else
-	pc += 6;
-    }
-  return pc;
-}
+/* OBSOLETE CORE_ADDR */
+/* OBSOLETE merlin_skip_prologue (CORE_ADDR pc) */
+/* OBSOLETE { */
+/* OBSOLETE   register int op = read_memory_integer (pc, 1); */
+/* OBSOLETE   if (op == 0x82) */
+/* OBSOLETE     { */
+/* OBSOLETE       op = read_memory_integer (pc + 2, 1); */
+/* OBSOLETE       if ((op & 0x80) == 0) */
+/* OBSOLETE 	pc += 3; */
+/* OBSOLETE       else if ((op & 0xc0) == 0x80) */
+/* OBSOLETE 	pc += 4; */
+/* OBSOLETE       else */
+/* OBSOLETE 	pc += 6; */
+/* OBSOLETE     } */
+/* OBSOLETE   return pc; */
+/* OBSOLETE } */
 
 CORE_ADDR
 umax_skip_prologue (CORE_ADDR pc)
@@ -71,46 +71,46 @@ umax_skip_prologue (CORE_ADDR pc)
 /* Return number of args passed to a frame.
    Can return -1, meaning no way to tell.  */
 
-int
-merlin_frame_num_args (struct frame_info *fi)
-{
-  int numargs;
-  CORE_ADDR pc;
-  int insn;
-  int addr_mode;
-  int width;
-
-  pc = FRAME_SAVED_PC (fi);
-  insn = read_memory_integer (pc, 2);
-  addr_mode = (insn >> 11) & 0x1f;
-  insn = insn & 0x7ff;
-  if ((insn & 0x7fc) == 0x57c
-      && addr_mode == 0x14)	/* immediate */
-    {
-      if (insn == 0x57c)	/* adjspb */
-	width = 1;
-      else if (insn == 0x57d)	/* adjspw */
-	width = 2;
-      else if (insn == 0x57f)	/* adjspd */
-	width = 4;
-      else
-	internal_error (__FILE__, __LINE__, "bad else");
-      numargs = read_memory_integer (pc + 2, width);
-      if (width > 1)
-	flip_bytes (&numargs, width);
-      numargs = -sign_extend (numargs, width * 8) / 4;
-    }
-  else
-    numargs = -1;
-  return numargs;
-}
-
+/* OBSOLETE int */
+/* OBSOLETE merlin_frame_num_args (struct frame_info *fi) */
+/* OBSOLETE { */
+/* OBSOLETE   int numargs; */
+/* OBSOLETE   CORE_ADDR pc; */
+/* OBSOLETE   int insn; */
+/* OBSOLETE   int addr_mode; */
+/* OBSOLETE   int width; */
+/* OBSOLETE  */
+/* OBSOLETE   pc = FRAME_SAVED_PC (fi); */
+/* OBSOLETE   insn = read_memory_integer (pc, 2); */
+/* OBSOLETE   addr_mode = (insn >> 11) & 0x1f; */
+/* OBSOLETE   insn = insn & 0x7ff; */
+/* OBSOLETE   if ((insn & 0x7fc) == 0x57c */
+/* OBSOLETE       && addr_mode == 0x14)	 *//* immediate */
+/* OBSOLETE     { */
+/* OBSOLETE       if (insn == 0x57c)	 *//* adjspb */
+/* OBSOLETE 	width = 1; */
+/* OBSOLETE       else if (insn == 0x57d)	 *//* adjspw */
+/* OBSOLETE 	width = 2; */
+/* OBSOLETE       else if (insn == 0x57f)	 *//* adjspd */
+/* OBSOLETE 	width = 4; */
+/* OBSOLETE       else */
+/* OBSOLETE 	internal_error (__FILE__, __LINE__, "bad else"); */
+/* OBSOLETE       numargs = read_memory_integer (pc + 2, width); */
+/* OBSOLETE       if (width > 1) */
+/* OBSOLETE 	flip_bytes (&numargs, width); */
+/* OBSOLETE       numargs = -sign_extend (numargs, width * 8) / 4; */
+/* OBSOLETE     } */
+/* OBSOLETE   else */
+/* OBSOLETE     numargs = -1; */
+/* OBSOLETE   return numargs; */
+/* OBSOLETE } */
 
 /* Return number of args passed to a frame.
    Can return -1, meaning no way to tell.
    Encore's C compiler often reuses same area on stack for args,
    so this will often not work properly.  If the arg names
    are known, it's likely most of them will be printed. */
+
 int
 umax_frame_num_args (struct frame_info *fi)
 {
@@ -151,7 +151,6 @@ umax_frame_num_args (struct frame_info *fi)
   return numargs;
 }
 
-
 static int
 sign_extend (int value, int bits)
 {
diff --git a/gdb/ns32km3-nat.c b/gdb/ns32km3-nat.c
index bd6d0fd..0d18975 100644
--- a/gdb/ns32km3-nat.c
+++ b/gdb/ns32km3-nat.c
@@ -1,183 +1,183 @@
-/* Low level interface to ns532 running mach 3.0.
-   Copyright 1992, 1993, 1998, 2000, 2001 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., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-#include "defs.h"
-#include "inferior.h"
-#include "regcache.h"
-
-#include <stdio.h>
-
-#include <mach.h>
-#include <mach/message.h>
-#include <mach/exception.h>
-#include <mach_error.h>
-
-#define private static
-
-
-/* Find offsets to thread states at compile time.
- * If your compiler does not grok this, calculate offsets
- * offsets yourself and use them (or get a compatible compiler :-)
- */
-
-#define  REG_N_OFFSET(reg) (int)(&((struct ns532_combined_state *)0)->ts.reg)
-#define  REG_F_OFFSET(reg) (int)(&((struct ns532_combined_state *)0)->fs.reg)
-
-/* at reg_offset[i] is the offset to the ns532_combined_state
- * location where the gdb registers[i] is stored.
- */
-
-static int reg_offset[] =
-{
-  REG_N_OFFSET (r0), REG_N_OFFSET (r1), REG_N_OFFSET (r2), REG_N_OFFSET (r3),
-  REG_N_OFFSET (r4), REG_N_OFFSET (r5), REG_N_OFFSET (r6), REG_N_OFFSET (r7),
-  REG_F_OFFSET (l0a), REG_F_OFFSET (l0b), REG_F_OFFSET (l2a), REG_F_OFFSET (l2b),
-  REG_F_OFFSET (l4a), REG_F_OFFSET (l4b), REG_F_OFFSET (l6a), REG_F_OFFSET (l6b),
-REG_N_OFFSET (sp), REG_N_OFFSET (fp), REG_N_OFFSET (pc), REG_N_OFFSET (psr),
-  REG_F_OFFSET (fsr),
-  REG_F_OFFSET (l0a), REG_F_OFFSET (l1a), REG_F_OFFSET (l2a), REG_F_OFFSET (l3a),
-  REG_F_OFFSET (l4a), REG_F_OFFSET (l5a), REG_F_OFFSET (l6a), REG_F_OFFSET (l7a),
-};
-
-#define REG_ADDRESS(state,regnum) ((char *)(state)+reg_offset[regnum])
-
-/* Fetch COUNT contiguous registers from thread STATE starting from REGNUM
- * Caller knows that the regs handled in one transaction are of same size.
- */
-#define FETCH_REGS(state, regnum, count) \
-  memcpy (&registers[REGISTER_BYTE (regnum)], \
-	  (char *)state+reg_offset[ regnum ], \
-	  count*REGISTER_SIZE)
-
-/* Store COUNT contiguous registers to thread STATE starting from REGNUM */
-#define STORE_REGS(state, regnum, count) \
-  memcpy ((char *)state+reg_offset[ regnum ], \
-	  &registers[REGISTER_BYTE (regnum)], \
-	  count*REGISTER_SIZE)
-
-/*
- * Fetch inferiors registers for gdb.
- * REGNO specifies which (as gdb views it) register, -1 for all.
- */
-
-void
-fetch_inferior_registers (int regno)
-{
-  kern_return_t ret;
-  thread_state_data_t state;
-  unsigned int stateCnt = NS532_COMBINED_STATE_COUNT;
-  int index;
-
-  if (!MACH_PORT_VALID (current_thread))
-    error ("fetch inferior registers: Invalid thread");
-
-  if (must_suspend_thread)
-    setup_thread (current_thread, 1);
-
-  ret = thread_get_state (current_thread,
-			  NS532_COMBINED_STATE,
-			  state,
-			  &stateCnt);
-
-  if (ret != KERN_SUCCESS)
-    warning ("fetch_inferior_registers: %s ",
-	     mach_error_string (ret));
-#if 0
-  /* It may be more effective to store validate all of them,
-   * since we fetched them all anyway
-   */
-  else if (regno != -1)
-    supply_register (regno, (char *) state + reg_offset[regno]);
-#endif
-  else
-    {
-      for (index = 0; index < NUM_REGS; index++)
-	supply_register (index, (char *) state + reg_offset[index]);
-    }
-
-  if (must_suspend_thread)
-    setup_thread (current_thread, 0);
-}
-
-/* Store our register values back into the inferior.
- * If REGNO is -1, do this for all registers.
- * Otherwise, REGNO specifies which register
- *
- * On mach3 all registers are always saved in one call.
- */
-void
-store_inferior_registers (int regno)
-{
-  kern_return_t ret;
-  thread_state_data_t state;
-  unsigned int stateCnt = NS532_COMBINED_STATE_COUNT;
-  register int index;
-
-  if (!MACH_PORT_VALID (current_thread))
-    error ("store inferior registers: Invalid thread");
-
-  if (must_suspend_thread)
-    setup_thread (current_thread, 1);
-
-  /* Fetch the state of the current thread */
-  ret = thread_get_state (current_thread,
-			  NS532_COMBINED_STATE,
-			  state,
-			  &stateCnt);
-
-  if (ret != KERN_SUCCESS)
-    {
-      warning ("store_inferior_registers (get): %s",
-	       mach_error_string (ret));
-      if (must_suspend_thread)
-	setup_thread (current_thread, 0);
-      return;
-    }
-
-  /* move gdb's registers to thread's state
-
-   * Since we save all registers anyway, save the ones
-   * that gdb thinks are valid (e.g. ignore the regno
-   * parameter)
-   */
-#if 0
-  if (regno != -1)
-    STORE_REGS (state, regno, 1);
-  else
-#endif
-    {
-      for (index = 0; index < NUM_REGS; index++)
-	STORE_REGS (state, index, 1);
-    }
-
-  /* Write gdb's current view of register to the thread
-   */
-  ret = thread_set_state (current_thread,
-			  NS532_COMBINED_STATE,
-			  state,
-			  NS532_COMBINED_STATE_COUNT);
-
-  if (ret != KERN_SUCCESS)
-    warning ("store_inferior_registers (set): %s",
-	     mach_error_string (ret));
-
-  if (must_suspend_thread)
-    setup_thread (current_thread, 0);
-}
+/* OBSOLETE /* Low level interface to ns532 running mach 3.0. */
+/* OBSOLETE   Copyright 1992, 1993, 1998, 2000, 2001 Free Software Foundation, Inc. */
+/* OBSOLETE */
+/* OBSOLETE   This file is part of GDB. */
+/* OBSOLETE */
+/* OBSOLETE   This program is free software; you can redistribute it and/or modify */
+/* OBSOLETE   it under the terms of the GNU General Public License as published by */
+/* OBSOLETE   the Free Software Foundation; either version 2 of the License, or */
+/* OBSOLETE   (at your option) any later version. */
+/* OBSOLETE */
+/* OBSOLETE   This program is distributed in the hope that it will be useful, */
+/* OBSOLETE   but WITHOUT ANY WARRANTY; without even the implied warranty of */
+/* OBSOLETE   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the */
+/* OBSOLETE   GNU General Public License for more details. */
+/* OBSOLETE */
+/* OBSOLETE   You should have received a copy of the GNU General Public License */
+/* OBSOLETE   along with this program; if not, write to the Free Software */
+/* OBSOLETE   Foundation, Inc., 59 Temple Place - Suite 330, */
+/* OBSOLETE   Boston, MA 02111-1307, USA.  */ */
+/* OBSOLETE */
+/* OBSOLETE#include "defs.h" */
+/* OBSOLETE#include "inferior.h" */
+/* OBSOLETE#include "regcache.h" */
+/* OBSOLETE */
+/* OBSOLETE#include <stdio.h> */
+/* OBSOLETE */
+/* OBSOLETE#include <mach.h> */
+/* OBSOLETE#include <mach/message.h> */
+/* OBSOLETE#include <mach/exception.h> */
+/* OBSOLETE#include <mach_error.h> */
+/* OBSOLETE */
+/* OBSOLETE#define private static */
+/* OBSOLETE */
+/* OBSOLETE */
+/* OBSOLETE/* Find offsets to thread states at compile time. */
+/* OBSOLETE * If your compiler does not grok this, calculate offsets */
+/* OBSOLETE * offsets yourself and use them (or get a compatible compiler :-) */
+/* OBSOLETE */ */
+/* OBSOLETE */
+/* OBSOLETE#define  REG_N_OFFSET(reg) (int)(&((struct ns532_combined_state *)0)->ts.reg) */
+/* OBSOLETE#define  REG_F_OFFSET(reg) (int)(&((struct ns532_combined_state *)0)->fs.reg) */
+/* OBSOLETE */
+/* OBSOLETE/* at reg_offset[i] is the offset to the ns532_combined_state */
+/* OBSOLETE * location where the gdb registers[i] is stored. */
+/* OBSOLETE */ */
+/* OBSOLETE */
+/* OBSOLETEstatic int reg_offset[] = */
+/* OBSOLETE{ */
+/* OBSOLETE  REG_N_OFFSET (r0), REG_N_OFFSET (r1), REG_N_OFFSET (r2), REG_N_OFFSET (r3), */
+/* OBSOLETE  REG_N_OFFSET (r4), REG_N_OFFSET (r5), REG_N_OFFSET (r6), REG_N_OFFSET (r7), */
+/* OBSOLETE  REG_F_OFFSET (l0a), REG_F_OFFSET (l0b), REG_F_OFFSET (l2a), REG_F_OFFSET (l2b), */
+/* OBSOLETE  REG_F_OFFSET (l4a), REG_F_OFFSET (l4b), REG_F_OFFSET (l6a), REG_F_OFFSET (l6b), */
+/* OBSOLETEREG_N_OFFSET (sp), REG_N_OFFSET (fp), REG_N_OFFSET (pc), REG_N_OFFSET (psr), */
+/* OBSOLETE  REG_F_OFFSET (fsr), */
+/* OBSOLETE  REG_F_OFFSET (l0a), REG_F_OFFSET (l1a), REG_F_OFFSET (l2a), REG_F_OFFSET (l3a), */
+/* OBSOLETE  REG_F_OFFSET (l4a), REG_F_OFFSET (l5a), REG_F_OFFSET (l6a), REG_F_OFFSET (l7a), */
+/* OBSOLETE}; */
+/* OBSOLETE */
+/* OBSOLETE#define REG_ADDRESS(state,regnum) ((char *)(state)+reg_offset[regnum]) */
+/* OBSOLETE */
+/* OBSOLETE/* Fetch COUNT contiguous registers from thread STATE starting from REGNUM */
+/* OBSOLETE * Caller knows that the regs handled in one transaction are of same size. */
+/* OBSOLETE */ */
+/* OBSOLETE#define FETCH_REGS(state, regnum, count) \ */
+/* OBSOLETE  memcpy (&registers[REGISTER_BYTE (regnum)], \ */
+/* OBSOLETE	  (char *)state+reg_offset[ regnum ], \ */
+/* OBSOLETE	  count*REGISTER_SIZE) */
+/* OBSOLETE */
+/* OBSOLETE/* Store COUNT contiguous registers to thread STATE starting from REGNUM */ */
+/* OBSOLETE#define STORE_REGS(state, regnum, count) \ */
+/* OBSOLETE  memcpy ((char *)state+reg_offset[ regnum ], \ */
+/* OBSOLETE	  &registers[REGISTER_BYTE (regnum)], \ */
+/* OBSOLETE	  count*REGISTER_SIZE) */
+/* OBSOLETE */
+/* OBSOLETE/* */
+/* OBSOLETE * Fetch inferiors registers for gdb. */
+/* OBSOLETE * REGNO specifies which (as gdb views it) register, -1 for all. */
+/* OBSOLETE */ */
+/* OBSOLETE */
+/* OBSOLETEvoid */
+/* OBSOLETEfetch_inferior_registers (int regno) */
+/* OBSOLETE{ */
+/* OBSOLETE  kern_return_t ret; */
+/* OBSOLETE  thread_state_data_t state; */
+/* OBSOLETE  unsigned int stateCnt = NS532_COMBINED_STATE_COUNT; */
+/* OBSOLETE  int index; */
+/* OBSOLETE */
+/* OBSOLETE  if (!MACH_PORT_VALID (current_thread)) */
+/* OBSOLETE    error ("fetch inferior registers: Invalid thread"); */
+/* OBSOLETE */
+/* OBSOLETE  if (must_suspend_thread) */
+/* OBSOLETE    setup_thread (current_thread, 1); */
+/* OBSOLETE */
+/* OBSOLETE  ret = thread_get_state (current_thread, */
+/* OBSOLETE			  NS532_COMBINED_STATE, */
+/* OBSOLETE			  state, */
+/* OBSOLETE			  &stateCnt); */
+/* OBSOLETE */
+/* OBSOLETE  if (ret != KERN_SUCCESS) */
+/* OBSOLETE    warning ("fetch_inferior_registers: %s ", */
+/* OBSOLETE	     mach_error_string (ret)); */
+/* OBSOLETE#if 0 */
+/* OBSOLETE  /* It may be more effective to store validate all of them, */
+/* OBSOLETE   * since we fetched them all anyway */
+/* OBSOLETE   */ */
+/* OBSOLETE  else if (regno != -1) */
+/* OBSOLETE    supply_register (regno, (char *) state + reg_offset[regno]); */
+/* OBSOLETE#endif */
+/* OBSOLETE  else */
+/* OBSOLETE    { */
+/* OBSOLETE      for (index = 0; index < NUM_REGS; index++) */
+/* OBSOLETE	supply_register (index, (char *) state + reg_offset[index]); */
+/* OBSOLETE    } */
+/* OBSOLETE */
+/* OBSOLETE  if (must_suspend_thread) */
+/* OBSOLETE    setup_thread (current_thread, 0); */
+/* OBSOLETE} */
+/* OBSOLETE */
+/* OBSOLETE/* Store our register values back into the inferior. */
+/* OBSOLETE * If REGNO is -1, do this for all registers. */
+/* OBSOLETE * Otherwise, REGNO specifies which register */
+/* OBSOLETE * */
+/* OBSOLETE * On mach3 all registers are always saved in one call. */
+/* OBSOLETE */ */
+/* OBSOLETEvoid */
+/* OBSOLETEstore_inferior_registers (int regno) */
+/* OBSOLETE{ */
+/* OBSOLETE  kern_return_t ret; */
+/* OBSOLETE  thread_state_data_t state; */
+/* OBSOLETE  unsigned int stateCnt = NS532_COMBINED_STATE_COUNT; */
+/* OBSOLETE  register int index; */
+/* OBSOLETE */
+/* OBSOLETE  if (!MACH_PORT_VALID (current_thread)) */
+/* OBSOLETE    error ("store inferior registers: Invalid thread"); */
+/* OBSOLETE */
+/* OBSOLETE  if (must_suspend_thread) */
+/* OBSOLETE    setup_thread (current_thread, 1); */
+/* OBSOLETE */
+/* OBSOLETE  /* Fetch the state of the current thread */ */
+/* OBSOLETE  ret = thread_get_state (current_thread, */
+/* OBSOLETE			  NS532_COMBINED_STATE, */
+/* OBSOLETE			  state, */
+/* OBSOLETE			  &stateCnt); */
+/* OBSOLETE */
+/* OBSOLETE  if (ret != KERN_SUCCESS) */
+/* OBSOLETE    { */
+/* OBSOLETE      warning ("store_inferior_registers (get): %s", */
+/* OBSOLETE	       mach_error_string (ret)); */
+/* OBSOLETE      if (must_suspend_thread) */
+/* OBSOLETE	setup_thread (current_thread, 0); */
+/* OBSOLETE      return; */
+/* OBSOLETE    } */
+/* OBSOLETE */
+/* OBSOLETE  /* move gdb's registers to thread's state */
+/* OBSOLETE */
+/* OBSOLETE   * Since we save all registers anyway, save the ones */
+/* OBSOLETE   * that gdb thinks are valid (e.g. ignore the regno */
+/* OBSOLETE   * parameter) */
+/* OBSOLETE   */ */
+/* OBSOLETE#if 0 */
+/* OBSOLETE  if (regno != -1) */
+/* OBSOLETE    STORE_REGS (state, regno, 1); */
+/* OBSOLETE  else */
+/* OBSOLETE#endif */
+/* OBSOLETE    { */
+/* OBSOLETE      for (index = 0; index < NUM_REGS; index++) */
+/* OBSOLETE	STORE_REGS (state, index, 1); */
+/* OBSOLETE    } */
+/* OBSOLETE */
+/* OBSOLETE  /* Write gdb's current view of register to the thread */
+/* OBSOLETE   */ */
+/* OBSOLETE  ret = thread_set_state (current_thread, */
+/* OBSOLETE			  NS532_COMBINED_STATE, */
+/* OBSOLETE			  state, */
+/* OBSOLETE			  NS532_COMBINED_STATE_COUNT); */
+/* OBSOLETE */
+/* OBSOLETE  if (ret != KERN_SUCCESS) */
+/* OBSOLETE    warning ("store_inferior_registers (set): %s", */
+/* OBSOLETE	     mach_error_string (ret)); */
+/* OBSOLETE */
+/* OBSOLETE  if (must_suspend_thread) */
+/* OBSOLETE    setup_thread (current_thread, 0); */
+/* OBSOLETE} */
diff --git a/gdb/umax-xdep.c b/gdb/umax-xdep.c
index 0539099..608ccd9 100644
--- a/gdb/umax-xdep.c
+++ b/gdb/umax-xdep.c
@@ -1,133 +1,133 @@
-/* umax host stuff.
-   Copyright 1986, 1987, 1989, 1991, 1992, 1993, 1995, 1999, 2000, 2001
-   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., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-#include "defs.h"
-#include "frame.h"
-#include "inferior.h"
-#include "regcache.h"
-
-#include <sys/param.h>
-#include <sys/dir.h>
-#include <signal.h>
-#include <sys/ioctl.h>
-#include <fcntl.h>
-
-#include "gdbcore.h"
-#include <sys/ptrace.h>
-#define PTRACE_ATTACH PT_ATTACH
-#define PTRACE_DETACH PT_FREEPROC
-
-#include <sys/file.h>
-#include "gdb_stat.h"
-
-/* Work with core dump and executable files, for GDB. 
-   This code would be in corefile.c if it weren't machine-dependent. */
-
-void
-core_file_command (char *filename, int from_tty)
-{
-  int val;
-
-  /* Discard all vestiges of any previous core file
-     and mark data and stack spaces as empty.  */
-
-  if (corefile)
-    xfree (corefile);
-  corefile = 0;
-
-  if (corechan >= 0)
-    close (corechan);
-  corechan = -1;
-
-  data_start = 0;
-  data_end = 0;
-  stack_start = STACK_END_ADDR;
-  stack_end = STACK_END_ADDR;
-
-  /* Now, if a new core file was specified, open it and digest it.  */
-
-  if (filename)
-    {
-      filename = tilde_expand (filename);
-      make_cleanup (xfree, filename);
-
-      if (have_inferior_p ())
-	error ("To look at a core file, you must kill the program with \"kill\".");
-      corechan = open (filename, O_RDONLY, 0);
-      if (corechan < 0)
-	perror_with_name (filename);
-      /* 4.2-style (and perhaps also sysV-style) core dump file.  */
-      {
-	struct ptrace_user u;
-	int reg_offset;
-
-	val = myread (corechan, &u, sizeof u);
-	if (val < 0)
-	  perror_with_name (filename);
-	data_start = exec_data_start;
-
-	data_end = data_start + u.pt_dsize;
-	stack_start = stack_end - u.pt_ssize;
-	data_offset = sizeof u;
-	stack_offset = data_offset + u.pt_dsize;
-	reg_offset = 0;
-
-	memcpy (&core_aouthdr, &u.pt_aouthdr, sizeof (AOUTHDR));
-	printf_unfiltered ("Core file is from \"%s\".\n", u.pt_comm);
-	if (u.pt_signal > 0)
-	  printf_unfiltered ("Program terminated with signal %d, %s.\n",
-			     u.pt_signal, safe_strsignal (u.pt_signal));
-
-	/* Read the register values out of the core file and store
-	   them where `read_register' will find them.  */
-
-	{
-	  register int regno;
-
-	  for (regno = 0; regno < NUM_REGS; regno++)
-	    {
-	      char buf[MAX_REGISTER_RAW_SIZE];
-
-	      val = lseek (corechan, register_addr (regno, reg_offset), 0);
-	      if (val < 0)
-		perror_with_name (filename);
-
-	      val = myread (corechan, buf, sizeof buf);
-	      if (val < 0)
-		perror_with_name (filename);
-	      supply_register (regno, buf);
-	    }
-	}
-      }
-      if (filename[0] == '/')
-	corefile = savestring (filename, strlen (filename));
-      else
-	{
-	  corefile = concat (current_directory, "/", filename, NULL);
-	}
-
-      flush_cached_frames ();
-      select_frame (get_current_frame (), 0);
-      validate_files ();
-    }
-  else if (from_tty)
-    printf_unfiltered ("No core file now.\n");
-}
+/* OBSOLETE /* umax host stuff. */
+/* OBSOLETE    Copyright 1986, 1987, 1989, 1991, 1992, 1993, 1995, 1999, 2000, 2001 */
+/* OBSOLETE    Free Software Foundation, Inc. */
+/* OBSOLETE  */
+/* OBSOLETE    This file is part of GDB. */
+/* OBSOLETE  */
+/* OBSOLETE    This program is free software; you can redistribute it and/or modify */
+/* OBSOLETE    it under the terms of the GNU General Public License as published by */
+/* OBSOLETE    the Free Software Foundation; either version 2 of the License, or */
+/* OBSOLETE    (at your option) any later version. */
+/* OBSOLETE  */
+/* OBSOLETE    This program is distributed in the hope that it will be useful, */
+/* OBSOLETE    but WITHOUT ANY WARRANTY; without even the implied warranty of */
+/* OBSOLETE    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the */
+/* OBSOLETE    GNU General Public License for more details. */
+/* OBSOLETE  */
+/* OBSOLETE    You should have received a copy of the GNU General Public License */
+/* OBSOLETE    along with this program; if not, write to the Free Software */
+/* OBSOLETE    Foundation, Inc., 59 Temple Place - Suite 330, */
+/* OBSOLETE    Boston, MA 02111-1307, USA.  */ */
+/* OBSOLETE  */
+/* OBSOLETE #include "defs.h" */
+/* OBSOLETE #include "frame.h" */
+/* OBSOLETE #include "inferior.h" */
+/* OBSOLETE #include "regcache.h" */
+/* OBSOLETE  */
+/* OBSOLETE #include <sys/param.h> */
+/* OBSOLETE #include <sys/dir.h> */
+/* OBSOLETE #include <signal.h> */
+/* OBSOLETE #include <sys/ioctl.h> */
+/* OBSOLETE #include <fcntl.h> */
+/* OBSOLETE  */
+/* OBSOLETE #include "gdbcore.h" */
+/* OBSOLETE #include <sys/ptrace.h> */
+/* OBSOLETE #define PTRACE_ATTACH PT_ATTACH */
+/* OBSOLETE #define PTRACE_DETACH PT_FREEPROC */
+/* OBSOLETE  */
+/* OBSOLETE #include <sys/file.h> */
+/* OBSOLETE #include "gdb_stat.h" */
+/* OBSOLETE  */
+/* OBSOLETE /* Work with core dump and executable files, for GDB.  */
+/* OBSOLETE    This code would be in corefile.c if it weren't machine-dependent. */ */
+/* OBSOLETE  */
+/* OBSOLETE void */
+/* OBSOLETE core_file_command (char *filename, int from_tty) */
+/* OBSOLETE { */
+/* OBSOLETE   int val; */
+/* OBSOLETE  */
+/* OBSOLETE   /* Discard all vestiges of any previous core file */
+/* OBSOLETE      and mark data and stack spaces as empty.  */ */
+/* OBSOLETE  */
+/* OBSOLETE   if (corefile) */
+/* OBSOLETE     xfree (corefile); */
+/* OBSOLETE   corefile = 0; */
+/* OBSOLETE  */
+/* OBSOLETE   if (corechan >= 0) */
+/* OBSOLETE     close (corechan); */
+/* OBSOLETE   corechan = -1; */
+/* OBSOLETE  */
+/* OBSOLETE   data_start = 0; */
+/* OBSOLETE   data_end = 0; */
+/* OBSOLETE   stack_start = STACK_END_ADDR; */
+/* OBSOLETE   stack_end = STACK_END_ADDR; */
+/* OBSOLETE  */
+/* OBSOLETE   /* Now, if a new core file was specified, open it and digest it.  */ */
+/* OBSOLETE  */
+/* OBSOLETE   if (filename) */
+/* OBSOLETE     { */
+/* OBSOLETE       filename = tilde_expand (filename); */
+/* OBSOLETE       make_cleanup (xfree, filename); */
+/* OBSOLETE  */
+/* OBSOLETE       if (have_inferior_p ()) */
+/* OBSOLETE 	error ("To look at a core file, you must kill the program with \"kill\"."); */
+/* OBSOLETE       corechan = open (filename, O_RDONLY, 0); */
+/* OBSOLETE       if (corechan < 0) */
+/* OBSOLETE 	perror_with_name (filename); */
+/* OBSOLETE       /* 4.2-style (and perhaps also sysV-style) core dump file.  */ */
+/* OBSOLETE       { */
+/* OBSOLETE 	struct ptrace_user u; */
+/* OBSOLETE 	int reg_offset; */
+/* OBSOLETE  */
+/* OBSOLETE 	val = myread (corechan, &u, sizeof u); */
+/* OBSOLETE 	if (val < 0) */
+/* OBSOLETE 	  perror_with_name (filename); */
+/* OBSOLETE 	data_start = exec_data_start; */
+/* OBSOLETE  */
+/* OBSOLETE 	data_end = data_start + u.pt_dsize; */
+/* OBSOLETE 	stack_start = stack_end - u.pt_ssize; */
+/* OBSOLETE 	data_offset = sizeof u; */
+/* OBSOLETE 	stack_offset = data_offset + u.pt_dsize; */
+/* OBSOLETE 	reg_offset = 0; */
+/* OBSOLETE  */
+/* OBSOLETE 	memcpy (&core_aouthdr, &u.pt_aouthdr, sizeof (AOUTHDR)); */
+/* OBSOLETE 	printf_unfiltered ("Core file is from \"%s\".\n", u.pt_comm); */
+/* OBSOLETE 	if (u.pt_signal > 0) */
+/* OBSOLETE 	  printf_unfiltered ("Program terminated with signal %d, %s.\n", */
+/* OBSOLETE 			     u.pt_signal, safe_strsignal (u.pt_signal)); */
+/* OBSOLETE  */
+/* OBSOLETE 	/* Read the register values out of the core file and store */
+/* OBSOLETE 	   them where `read_register' will find them.  */ */
+/* OBSOLETE  */
+/* OBSOLETE 	{ */
+/* OBSOLETE 	  register int regno; */
+/* OBSOLETE  */
+/* OBSOLETE 	  for (regno = 0; regno < NUM_REGS; regno++) */
+/* OBSOLETE 	    { */
+/* OBSOLETE 	      char buf[MAX_REGISTER_RAW_SIZE]; */
+/* OBSOLETE  */
+/* OBSOLETE 	      val = lseek (corechan, register_addr (regno, reg_offset), 0); */
+/* OBSOLETE 	      if (val < 0) */
+/* OBSOLETE 		perror_with_name (filename); */
+/* OBSOLETE  */
+/* OBSOLETE 	      val = myread (corechan, buf, sizeof buf); */
+/* OBSOLETE 	      if (val < 0) */
+/* OBSOLETE 		perror_with_name (filename); */
+/* OBSOLETE 	      supply_register (regno, buf); */
+/* OBSOLETE 	    } */
+/* OBSOLETE 	} */
+/* OBSOLETE       } */
+/* OBSOLETE       if (filename[0] == '/') */
+/* OBSOLETE 	corefile = savestring (filename, strlen (filename)); */
+/* OBSOLETE       else */
+/* OBSOLETE 	{ */
+/* OBSOLETE 	  corefile = concat (current_directory, "/", filename, NULL); */
+/* OBSOLETE 	} */
+/* OBSOLETE  */
+/* OBSOLETE       flush_cached_frames (); */
+/* OBSOLETE       select_frame (get_current_frame (), 0); */
+/* OBSOLETE       validate_files (); */
+/* OBSOLETE     } */
+/* OBSOLETE   else if (from_tty) */
+/* OBSOLETE     printf_unfiltered ("No core file now.\n"); */
+/* OBSOLETE } */
author	Andrew Cagney <cagney@redhat.com>	2001-04-02 20:57:26 +0000
committer	Andrew Cagney <cagney@redhat.com>	2001-04-02 20:57:26 +0000
commit	bb19ff3b141c4e4820356140cdcaf88b89e27a9d (patch)
tree	8b25fcdd9a6ce2b8cf0ddaba34c286618a8346e2
parent	d6259d756ba71292f4c3bd40050619b8cf4597f7 (diff)
download	gdb-bb19ff3b141c4e4820356140cdcaf88b89e27a9d.zip gdb-bb19ff3b141c4e4820356140cdcaf88b89e27a9d.tar.gz gdb-bb19ff3b141c4e4820356140cdcaf88b89e27a9d.tar.bz2