gdb-3.3

1 files changed, 29 insertions, 20 deletions

diff --git a/gdb/m-merlin.h b/gdb/m-merlin.h
index 196d734..ef8d1ec 100644
--- a/gdb/m-merlin.h
+++ b/gdb/m-merlin.h
@@ -1,27 +1,31 @@
 /* Definitions to make GDB run on a merlin under utek 2.1
-   Copyright (C) 1986, 1987 Free Software Foundation, Inc.
+   Copyright (C) 1986, 1987, 1989 Free Software Foundation, Inc.
 
-GDB is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY.  No author or distributor accepts responsibility to anyone
-for the consequences of using it or for whether it serves any
-particular purpose or works at all, unless he says so in writing.
-Refer to the GDB General Public License for full details.
+This file is part of GDB.
 
-Everyone is granted permission to copy, modify and redistribute GDB,
-but only under the conditions described in the GDB General Public
-License.  A copy of this license is supposed to have been given to you
-along with GDB so you can know your rights and responsibilities.  It
-should be in a file named COPYING.  Among other things, the copyright
-notice and this notice must be preserved on all copies.
+GDB is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 1, or (at your option)
+any later version.
 
-In other words, go ahead and share GDB, but don't try to stop
-anyone else from sharing it farther.  Help stamp out software hoarding!
-*/
+GDB is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GDB; see the file COPYING.  If not, write to
+the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #ifndef ns16000
 #define ns16000
 #endif
 
+/* Define the bit, byte, and word ordering of the machine.  */
+/* #define BITS_BIG_ENDIAN */
+/* #define BYTES_BIG_ENDIAN */
+/* #define WORDS_BIG_ENDIAN */
+
 # include	<machine/reg.h>
 
 /* Define this if the C compiler puts an underscore at the front
@@ -265,10 +269,13 @@ anyone else from sharing it farther.  Help stamp out software hoarding!
 /* 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)  (read_memory_integer ((thisframe)->frame, 4))
+#define FRAME_CHAIN(thisframe)  \
+  (outside_startup_file ((thisframe)->pc) ? \
+   read_memory_integer ((thisframe)->frame, 4) :\
+   0)
 
 #define FRAME_CHAIN_VALID(chain, thisframe) \
-  (chain != 0 && (FRAME_SAVED_PC (thisframe) >= first_object_file_end))
+  (chain != 0 && (outside_startup_file (FRAME_SAVED_PC (thisframe))))
 
 #define FRAME_CHAIN_COMBINE(chain, thisframe) (chain)
 
@@ -337,8 +344,10 @@ anyone else from sharing it farther.  Help stamp out software hoarding!
   (frame_saved_regs).regs[FP_REGNUM]				\
      = read_memory_integer ((frame_info)->frame, 4); }
 
-/* Compensate for lack of `vprintf' function.  */ 
-#define vprintf(format, ap) _doprnt (format, ap, stdout) 
+/* Compensate for lack of `vprintf' function.  */
+#ifndef HAVE_VPRINTF
+#define vprintf(format, ap) _doprnt (format, ap, stdout)
+#endif /* not HAVE_VPRINTF */
 
 /* Things needed for making the inferior call functions.  */
 
@@ -374,7 +383,7 @@ anyone else from sharing it farther.  Help stamp out software hoarding!
   write_register (SP_REGNUM, fp + 8);				 \
   flush_cached_frames ();					 \
   set_current_frame (create_new_frame (read_register (FP_REGNUM),\
-				       read_pc ()));
+				       read_pc ()));		 \
 }
 
 /* This sequence of words is the instructions