Fri Jun 13 13:44:47 1997 Michael Snyder (msnyder@cleaver.cygnus.com)

* config/mips/tm-tx39[l].h, tx39[l].mt: change r3900 target to tx39.
	[also clean up sanitization]

gdb/.Sanitize

@@ -594,22 +594,22 @@ else
 	done
 fi
 
-if ( echo $* | grep keep\-r3900 > /dev/null ) ; then
+if ( echo $* | grep keep\-tx39 > /dev/null ) ; then
 	for i in * ; do
-		if test ! -d $i && (grep sanitize-r3900 $i > /dev/null) ; then
+		if test ! -d $i && (grep sanitize-tx39 $i > /dev/null) ; then
 			if [ -n "${verbose}" ] ; then
-				echo Keeping r3900 stuff in $i
+				echo Keeping tx39 stuff in $i
 			fi
 		fi
 	done
 else
 	for i in * ; do
-		if test ! -d $i && (grep sanitize-r3900 $i > /dev/null) ; then
+		if test ! -d $i && (grep sanitize-tx39 $i > /dev/null) ; then
 			if [ -n "${verbose}" ] ; then
-				echo Removing traces of \"r3900\" from $i...
+				echo Removing traces of \"tx39\" from $i...
 			fi
 			cp $i new
-			sed '/start\-sanitize\-r3900/,/end-\sanitize\-r3900/d' < $i > new
+			sed '/start\-sanitize\-tx39/,/end-\sanitize\-tx39/d' < $i > new
 			if [ -n "${safe}" -a ! -f .Recover/$i ] ; then
 				if [ -n "${verbose}" ] ; then
 					echo Caching $i in .Recover...

gdb/ChangeLog

@@ -1,3 +1,7 @@
+Fri Jun 13 13:44:47 1997  Michael Snyder  (msnyder@cleaver.cygnus.com)
+
+	* config/mips/tm-tx39[l].h, tx39[l].mt: change r3900 target to tx39.
+
 Fri Jun 13 14:14:10 1997  Jeffrey A Law  (law@cygnus.com)
 
 	* mn10300-tdep.c (mn10300_analyze_prologue): Fix some comments.
@@ -17,8 +21,8 @@ Fri Jun 13 10:28:09 1997  Fred Fish  <fnf@cygnus.com>
 
 	* maint.c (maintenance_translate_address): Avoid assignment
 	inside if, per GNU coding standards.
-	* symfile.c (simple_read_overlay_table): Avoid assignments inside if, per
+	* symfile.c (simple_read_overlay_table): Avoid assignments inside if, 
-	GNU coding standards.
+	per GNU coding standards.
 
 	* monitor.c (parse_register_dump): Is really a void function.
 	Add prototype.
@@ -143,13 +147,11 @@ Thu Jun  5 11:39:03 1997  Ian Lance Taylor  <ian@cygnus.com>
 	include the section address if the symbol has an appropriate
 	storage class.
 
-start-sanitize-r3900
 Tue Jun  3 16:24:46 1997  Michael Snyder  (msnyder@cleaver.cygnus.com)
 
 	* configure.tgt: add mipsr3900-elf target
 	* config/mips/r3900.mt r3900l.mt tm-r3900.h tm-r3900l.h: ditto
 
-end-sanitize-r3900
 start-sanitize-gdbtk
 Tue Jun  3 15:46:51 1997  Tom Tromey  <tromey@cygnus.com>
 

gdb/config/mips/.Sanitize

@@ -63,15 +63,15 @@ tm-mips.h
 tm-mips64.h
 tm-mipsm3.h
 tm-mipsv4.h
-tm-r3900.h
+tm-tx39.h
-tm-r3900l.h
+tm-tx39l.h
 tm-vr4300.h
 tm-vr4300el.h
 tm-vr5000.h
 tm-vr5000el.h
 tm-vxmips.h
-r3900.mh
+tx39.mh
-r3900l.mh
+tx39l.mh
 vr4300.mt
 vr4300el.mt
 vr5000.mt

gdb/config/mips/tm-tx39.h

@@ -0,0 +1,67 @@
+/* Copyright (C) 1993 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 TARGET_BYTE_ORDER_SELECTABLE
+#define MIPS_EABI 1
+
+#include "mips/tm-bigmips.h"
+
+#undef DEFAULT_MIPS_TYPE
+#define DEFAULT_MIPS_TYPE "r3051"
+
+<<<<<<< tm-tx39.h
+/* start-sanitize-gm */
+#ifdef GENERAL_MAGIC
+
+#include "tm-magic.h"		/* Include generic stuff */
+
+/* For some reason GM can't hack this... */
+
+#undef GET_LONGJMP_TARGET
+
+/* Watchpoint support */
+
+#define TARGET_HAS_HARDWARE_WATCHPOINTS
+
+#define TARGET_CAN_USE_HARDWARE_WATCHPOINT(type, cnt, ot) \
+	(1 == 1)	/* We allow all types of hardware watchpoints */
+
+/* Use these macros for watchpoint insertion/deletion.  */
+/* type can be 0: write watch, 1: read watch, 2: access watch (read/write) */
+
+#define target_insert_watchpoint(addr, len, type) \
+	remote_mips_set_watchpoint (addr, len, type)
+
+#define target_remove_watchpoint(addr, len, type) \
+	remote_mips_remove_watchpoint (addr, len, type)
+
+/* We need to remove watchpoints when stepping, else we hit them again! */
+
+#define HAVE_NONSTEPPABLE_WATCHPOINT
+
+#define STOPPED_BY_WATCHPOINT(w) remote_mips_stopped_by_watchpoint ()
+
+#define FLUSH_CACHED_MEMORY() flush_cached_memory()
+
+#endif /* GENERAL_MAGIC */
+/* end-sanitize-gm */
+
+#undef  USE_STRUCT_CONVENTION
+#define USE_STRUCT_CONVENTION(gcc_p, type) (TYPE_LENGTH (type) > 8)
+=======
+>>>>>>> 1.1.2.2

gdb/config/mips/tm-tx39l.h

@@ -0,0 +1,25 @@
+/* Copyright (C) 1993 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 TARGET_BYTE_ORDER_SELECTABLE
+#define MIPS_EABI 1
+
+#include "mips/tm-mips.h"
+
+#undef  USE_STRUCT_CONVENTION
+#define USE_STRUCT_CONVENTION(gcc_p, type) (TYPE_LENGTH (type) > 8)

gdb/config/mips/tx39.mt

@@ -0,0 +1,5 @@
+# Target: Big-endian mips board, typically an IDT.
+TDEPFILES= mips-tdep.o remote-mips.o remote-array.o
+TM_FILE= tm-tx39.h
+SIM_OBS = remote-sim.o
+SIM = ../sim/mips/libsim.a

gdb/config/mips/tx39l.mt

@@ -0,0 +1,5 @@
+# Target: Big-endian mips board, typically an IDT.
+TDEPFILES= mips-tdep.o remote-mips.o remote-array.o
+TM_FILE= tm-tx39l.h
+SIM_OBS = remote-sim.o
+SIM = ../sim/mips/libsim.a

gdb/configure.tgt

@@ -167,10 +167,8 @@ mips64*vr5000*-*-elf*)	gdb_target=vr5000 ;;
 mips64*vr5900*el-*-elf*)	gdb_target=vr5000el ;;
 mips64*vr5900*-*-elf*)	gdb_target=vr5000 ;;
 # end-sanitize-r5900
-# start-sanitize-r3900
+mips*tx39*el*-elf*)	gdb_target=tx39el ;;
-mips*r3900*el*-elf*)	gdb_target=r3900el ;;
+mips*tx39*-elf*)	gdb_target=tx39 ;;
-mips*r3900*-elf*)	gdb_target=r3900 ;;
-# end-sanitize-r3900
 mips64*el-*-elf*)	gdb_target=embedl64 ;;
 mips64*-*-elf*)		gdb_target=embed64 ;;
 mips*el-*-ecoff*)	gdb_target=embedl ;;