Java sanitization.

6 files changed, 142 insertions, 11 deletions

diff --git a/gdb/.Sanitize b/gdb/.Sanitize
index 0f1751f..1a0f9ad 100644
--- a/gdb/.Sanitize
+++ b/gdb/.Sanitize
@@ -88,6 +88,20 @@ else
 	fi
 fi
 
+java_files="jv-exp.y jv-lang.c jv-lang.h jv-typeprint.c jv-valprint.c"
+
+if ( echo $* | grep keep\-java > /dev/null ) ; then
+	keep_these_too="${java_files} ${keep_these_too}"
+	if [ -n "${verbose}" ] ; then
+		echo Keeping ${java_files}
+	fi
+else
+	lose_these_too="${java_files} ${lose_these_too}"
+	if [ -n "${verbose}" ] ; then
+		echo Deleting ${java_files}
+	fi
+fi
+
 # All files listed between the "Things-to-keep:" line and the
 # "Files-to-sed:" line will be kept.  All other files will be removed.
 # Directories listed in this section will have their own Sanitize
@@ -253,11 +267,6 @@ inftarg.c
 irix4-nat.c
 irix5-nat.c
 isi-xdep.c
-jv-exp.y
-jv-lang.c
-jv-lang.h
-jv-typeprint.c
-jv-valprint.c
 kdb-start.c
 language.c
 language.h
@@ -811,6 +820,33 @@ else
 	done
 fi
 
+if ( echo $* | grep keep\-java > /dev/null ) ; then
+	for i in * ; do
+		if test ! -d $i && (grep sanitize-java $i > /dev/null) ; then
+			if [ -n "${verbose}" ] ; then
+				echo Keeping java stuff in $i
+			fi
+		fi
+	done
+else
+	for i in * ; do
+		if test ! -d $i && (grep sanitize-java $i > /dev/null) ; then
+			if [ -n "${verbose}" ] ; then
+				echo Removing traces of \"java\" from $i...
+			fi
+			cp $i new
+			sed '/start\-sanitize\-java/,/end-\sanitize\-java/d' < $i > new
+			if [ -n "${safe}" -a ! -f .Recover/$i ] ; then
+				if [ -n "${verbose}" ] ; then
+					echo Caching $i in .Recover...
+				fi
+				mv $i .Recover
+			fi
+			mv new $i
+		fi
+	done
+fi
+
 for i in * ; do
 	if test ! -d $i && (grep sanitize $i > /dev/null) ; then
 		echo '***' Some mentions of Sanitize are still left in $i! 1>&2
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index da48741..093b4af 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+Thu May 14 5:51:00 1998  Ron Unrau  <runrau@cygnus.com>
+
+	* symtab.c (decode_line_1): set section for "break *<addr>"
+
 Wed May 13 20:58:02 1998  Mark Alexander  <marka@cygnus.com>
 
 	* corefile.c (reopen_exec_file): Reopen the exec file if
@@ -16,9 +20,10 @@ Wed May 13 14:42:21 1998  Ian Lance Taylor  <ian@cygnus.com>
 	* defs.h: Check HAVE_ALLOCA_H rather than sparc.  Add _AIX pragma
 	alloca.
 	* configure: Rebuild.
-
+start-sanitize-java
 	* Makefile.in (jv-lang.o, jv-typeprint.o, jv-valprint.o): New
 	targets.
+end-sanitize-java
 
 Thu May  7 14:49:38 1998  Bob Manson  <manson@charmed.cygnus.com>
 
@@ -234,10 +239,12 @@ Thu Apr 23 16:37:20 1998  Jason Molenda  (crash@bugshack.cygnus.com)
 
         * README:  Minor changes for 4.17 release.
 
+start-sanitize-java	
 Thu Apr 23 15:44:39 1998  Per Bothner  <bothner@cygnus.com>
 
 	* symfile.c (deduce_language_from_filename):  .class implies java.
 
+end-sanitize-java	
 Thu Apr 23 12:52:21 1998  Philippe De Muyter  <phdm@macqel.be>
 
         * configure.in (strerror): Check if function must be declared.
@@ -944,7 +951,10 @@ Mon Feb 24 11:24:57 1998  Richard Henderson  <rth@cygnus.com>
 
         * Makefile.in (BISON): Don't even pretend to use yacc.
         (c-exp.tab.o): Use bison -o to use a unique intermediate file.
-        (jv-exp.tab.o, f-exp.tab.o, m2-exp.tab.o): Likewise.
+        (f-exp.tab.o, m2-exp.tab.o): Likewise.
+start-sanitize-java	
+        (jv-exp.tab.o): Likewise.
+end-sanitize-java	
 
 Tue Feb 24 03:32:59 1998  Andrew Cagney  <cagney@b1.cygnus.com>
 
diff --git a/gdb/ChangeLog-97 b/gdb/ChangeLog-97
index d681d82..61e574e 100644
--- a/gdb/ChangeLog-97
+++ b/gdb/ChangeLog-97
@@ -377,10 +377,12 @@ Mon Nov 17 15:35:06 1997  Doug Evans  <devans@canuck.cygnus.com>
 
 	* Makefile.in (remote-sim.o): Depend on $(INCLUDE_DIR)/callback.h.
 
+start-sanitize-java	
 Fri Nov 14 13:04:34 1997  Jeffrey A Law  (law@cygnus.com)
 
 	* jv-exp.y (copy_exp, insert_exp): Avoid ANSI prototypes.
 
+end-sanitize-java	
 start-sanitize-d30v
 Thu Nov 13 09:47:35 1997  Michael Meissner  <meissner@cygnus.com>
 
@@ -418,12 +420,14 @@ Tue Nov  4 16:52:50 1997  Geoffrey Noer  <noer@cygnus.com>
 	to allocate memory for environ space, gdb cannot use memory
 	checks -- set -DNO_MMCHECK
 
+start-sanitize-java	
 Tue Nov  4 13:50:59 1997  Jim Blandy  <jimb@sendai.cygnus.com>
 
 	* jv-exp.y (ArrayAccess): Implement Name [ Expression ]; check the
  	code to see why this is not trivial.
 	(copy_exp, insert_exp): New functions.
-
+	
+end-sanitize-java	
 Fri Oct 24 17:24:00 1997  Dawn Perchik  <dawn@cygnus.com>
 
 	* dwarf2read.c (dwarf2_build_psymtabs_hard): Handle the case
@@ -541,6 +545,7 @@ Sat Oct  4 18:45:44 1997  Mark Alexander  <marka@cygnus.com>
 	* remote-mips.c (mips-initialize): Work around flakiness in
 	some versions of PMON after loading a program.
 
+start-sanitize-java	
 Fri Oct  3 15:49:18 1997  Per Bothner  <bothner@cygnus.com>
 
 	* c-lang.h, cp-valprint.c (static_field_print):  Make non-static.
@@ -560,6 +565,7 @@ Fri Oct  3 15:49:18 1997  Per Bothner  <bothner@cygnus.com>
 	(java_print_value_fields):  New function.
 	(java_val_print):  Better printing of TYPE_CODE_CHAR, TYPE_CODE_STRUCT.
 
+end-sanitize-java	
 Fri Oct  3 09:52:26 1997  Mark Alexander  <marka@cygnus.com>
 
 	* config/mips/tm-mips.h (MAKE_MSYMBOL_SPECIAL): Force MIPS16
@@ -694,6 +700,7 @@ Fri Sep 19 18:51:26 1997  Felix Lee  <flee@cygnus.com>
 	* config/i386/windows.mh (XDEPFILES): need to list some files
  	explicitly, for odd reasons.
 
+start-sanitize-java	
 Tue Sep 16 20:00:05 1997  Per Bothner  <bothner@cygnus.com>
 
 	* jv-exp.y (push_fieldnames):  New, to handle EXP.FIELD1....FIELDN.
@@ -716,6 +723,7 @@ Tue Sep 16 20:00:05 1997  Per Bothner  <bothner@cygnus.com>
 	ascending, not descending order.  Hack to avoid virtual baseclass
 	botch for Java interfaces.
 
+end-sanitize-java	
 Tue Sep 16 19:56:23 1997  Per Bothner  <bothner@cygnus.com>
 
 	* util.c (run_cleanup_chain, make_run_cleanup, do_run_cleanups):
@@ -1247,6 +1255,7 @@ Tue Aug  5 13:37:14 1997  Per Bothner  <bothner@cygnus.com>
 	* coffread.c, hpread.c, stabsread.c:  Remove bugus TYPE_FIELD_VALUE.
 	* value.h, values.c (value_static_field):  New function.
 	* cp-valprint.c, valops.c:  Modify to use value_static_field.
+start-sanitize-java	
 
 	* jv-lang.c (get_java_utf8_name):  Re-write so it works with
 	implied (missing) data field, as defined by cc1java.
@@ -1257,6 +1266,7 @@ Tue Aug  5 13:37:14 1997  Per Bothner  <bothner@cygnus.com>
 	java_type_print_base):  New functions, for better Java output.
 	* jv-valprint.c:  Start to support Java-specific output.
 
+end-sanitize-java	
 Sun Aug  3 08:18:09 1997  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
 
 	* c-valprint.c (c_val_print):  Use extract_address to retrieve
@@ -1278,6 +1288,7 @@ Fri Aug  1 15:21:44 1997  Ian Lance Taylor  <ian@cygnus.com>
 	(gdb): Use $(WIN32LDAPP).
 	* configure: Rebuild.
 
+start-sanitize-java	
 Thu Jul 31 15:40:19 1997  Per Bothner  <bothner@cygnus.com>
 
 	* symtab.h (SYMBOL_INIT_LANGUAGE_SPECIFIC, SYMBOL_INIT_DEMANGLED_NAME,
@@ -1295,6 +1306,7 @@ Wed Jul 30 14:04:18 1997  Per Bothner  <bothner@cygnus.com>
 	(java_language_defn):  Replace c_print_type by java_print_type.
 	* Makefile.in:  Update accordingly.
 
+end-sanitize-java	
 Tue Jul 29 10:12:44 1997  Felix Lee  <flee@cygnus.com>
 
 	* Makefile.in (init.c): except some mswin files do need to be
@@ -1555,6 +1567,7 @@ Fri Jun 13 10:28:09 1997  Fred Fish  <fnf@cygnus.com>
 	cases by just ignoring them.
 	(command.h): Include.
 
+start-sanitize-java
 	* java-exp.y (parse_number): Remove unused variable "unsigned_p".
 	* java-lang.c (gdbcore.h): Include for prototypes.
 	(type_from_class): Remove unused variable "ftype".
@@ -1563,6 +1576,7 @@ Fri Jun 13 10:28:09 1997  Fred Fish  <fnf@cygnus.com>
 	enumerations.
 	* java-valprint.c (c-lang.h): Include for prototypes.
 
+end-sanitize-java
 	* symfile.c (simple_read_overlay_region_table): #if away
 	unused function.
 	(simple_free_overlay_region_table): Ditto.
@@ -1593,11 +1607,15 @@ Fri Jun 13 10:28:09 1997  Fred Fish  <fnf@cygnus.com>
 
 	* c-exp.y (parse_number): Cast args to float* or double* as
 	appropriate for conversion format.
+start-sanitize-java
 	* java-exp.y (parse_number): Ditto.
+end-sanitize-java
 
 	* Makefile.in (c-exp.tab.c): Remove #line lines that refer
 	to nonexistant y.tab.c file.
+start-sanitize-java
 	(java-exp.tab.c): Ditto.
+end-sanitize-java
 	(f-exp.tab.c): Ditto.
 	(m2-exp.tab.c): Ditto.
 
@@ -1823,8 +1841,11 @@ Mon Apr 28 18:21:20 1997  Michael Snyder  <msnyder@cleaver.cygnus.com>
 
 Mon Apr 28 17:27:40 1997  Michael Snyder  <msnyder@cleaver.cygnus.com>
 
-	* c-exp.y, java-exp.y: make parse_number reject "123DEADBEEF".
+	* c-exp.y: make parse_number reject "123DEADBEEF".
 	(fix by Bob Manson).
+start-sanitize-java
+	* java-exp.y: Ditto.
+end-sanitize-java
 	* top.c: change "to enable to enable" to "to enable" in a couple
 	of help strings.
 
@@ -1913,11 +1934,13 @@ Mon Apr 21 09:49:25 1997  Stu Grossman  (grossman@critters.cygnus.com)
 
 	* remote-pa.c:  Remove.  It's broken and no longer necessary.
 
-Sat Apr 19 11:56:10 1997  Per Bothner  <bothner@deneb.cygnus.com>
+start-sanitize-java
+	Sat Apr 19 11:56:10 1997  Per Bothner  <bothner@deneb.cygnus.com>
 
 	* java-exp.y:  Combine TRUE and FALSE into BOOLEAN_LITERAL.
 	(Avoids name clash with broken AIX header files.)
 
+end-sanitize-java
 Sat Apr 19 01:49:37 1997  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
 
 	* serial.c (serial_log_command):  Fix fputs_unfiltered calls.
@@ -2009,11 +2032,13 @@ Fri Apr 18 16:52:41 1997  Andrew Cagney  <cagney@b1.cygnus.com>
 
 Thu Apr 17 14:30:04 1997  Per Bothner  <bothner@deneb.cygnus.com>
 
+	* objfiles.c (allocate_objfile):  Allow NULL bfd argument.
+start-sanitize-java
 	* defs.h (enum language):  Add language_java.
 	* java-exp.y, java-lang.c, java-lang.h, java-valprint.c:  New files.
 	* Makefile.in:  Update for new files.
-	* objfiles.c (allocate_objfile):  Allow NULL bfd argument.
 	* symfile.c (deduce_language_from_filename):  Recognize .java.
+end-sanitize-java
 
 Thu Apr 17 02:20:23 1997  Doug Evans  <dje@canuck.cygnus.com>
 
diff --git a/gdb/NEWS b/gdb/NEWS
index 1af82f9..fa16487 100644
--- a/gdb/NEWS
+++ b/gdb/NEWS
@@ -42,11 +42,13 @@ All configurations can now understand and use the DWARF 2 debugging
 format.  The choice is automatic, if the symbol file contains DWARF 2
 information.
 
+start-sanitize-java
 * Java frontend
 
 GDB now includes basic Java language support.  This support is
 only useful with Java compilers that produce native machine code.
 
+end-sanitize-java
 * solib-absolute-prefix and solib-search-path
 
 For SunOS and SVR4 shared libraries, you may now set the prefix for
diff --git a/include/.Sanitize b/include/.Sanitize
index 179ede4..8aabbc9 100644
--- a/include/.Sanitize
+++ b/include/.Sanitize
@@ -63,6 +63,10 @@ Things-to-lose:
 
 Do-last:
 
+if [ -n "${verbose}" ] ; then
+	echo Processing \"tic80\"...
+fi
+
 tic80_files="ChangeLog dis-asm.h"
 if ( echo $* | grep keep\-tic80 > /dev/null ) ; then
 	for i in $tic80_files ; do
@@ -91,6 +95,10 @@ else
 	done
 fi
 
+if [ -n "${verbose}" ] ; then
+	echo Processing \"d30v\"...
+fi
+
 d30v_files="ChangeLog dis-asm.h"
 if ( echo $* | grep keep\-d30v > /dev/null ) ; then
 	for i in $d30v_files ; do
@@ -119,6 +127,10 @@ else
 	done
 fi
 
+if [ -n "${verbose}" ] ; then
+	echo Processing \"sky\"...
+fi
+
 sky_files="ChangeLog dis-asm.h"
 if ( echo $* | grep keep\-sky > /dev/null ) ; then
 	for i in $sky_files ; do
@@ -147,6 +159,38 @@ else
 	done
 fi
 
+if [ -n "${verbose}" ] ; then
+	echo Processing \"java\"...
+fi
+
+java_files="ChangeLog demangle.h"
+if ( echo $* | grep keep\-java > /dev/null ) ; then
+	for i in $java_files ; do
+		if test ! -d $i && (grep sanitize-java $i > /dev/null) ; then
+			if [ -n "${verbose}" ] ; then
+				echo Keeping java stuff in $i
+			fi
+		fi
+	done
+else
+	for i in * ; do
+		if test ! -d $i && (grep sanitize-java $i > /dev/null) ; then
+			if [ -n "${verbose}" ] ; then
+				echo Removing traces of \"java\" from $i...
+			fi
+			cp $i new
+			sed '/start\-sanitize\-java/,/end-\sanitize\-java/d' < $i > new
+			if [ -n "${safe}" -a ! -f .Recover/$i ] ; then
+				if [ -n "${verbose}" ] ; then
+					echo Caching $i in .Recover...
+				fi
+				mv $i .Recover
+			fi
+			mv new $i
+		fi
+	done
+fi
+
 for i in * ; do
 	if test ! -d $i && (grep sanitize $i > /dev/null) ; then
 		echo '***' Some mentions of Sanitize are still left in $i! 1>&2
diff --git a/include/ChangeLog b/include/ChangeLog
index 7ac545d..04a8b52 100644
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,15 @@
+Tue Feb 24 13:05:02 1998  Doug Evans  <devans@canuck.cygnus.com>
+
+	* dis-asm.h (disassemble_info): Member `symbol' renamed to `symbols'
+	and made an "asymbol **".  New member num_symbols.
+	(INIT_DISASSEMBLE_INFO_NO_ARCH): Update.
+
+Tue Feb 17 12:32:18 1998  Andrew Cagney  <cagney@b1.cygnus.com>
+
+	* remote-sim.h (sim_fetch_register, sim_store_register): Add
+ 	register length parameter.  Functions return actual length of
+ 	register.
+
 Thu Feb 12 16:29:01 1998  Ian Lance Taylor  <ian@cygnus.com>
 
 	* getopt.h: Update to latest FSF version.
@@ -120,10 +132,12 @@ Fri Aug  8 16:43:56 1997  Doug Evans  <dje@canuck.cygnus.com>
 
 	* dis-asm.h (arc_get_disassembler): Declare.
 
+start-sanitize-java
 Wed Jul 30 11:39:50 1997  Per Bothner  <bothner@deneb.cygnus.com>
 
 	* demangle.h (DMGL_JAVA):  New option to request Java demangling.
 
+end-sanitize-java
 Tue Jul 22 17:59:54 1997  Ian Lance Taylor  <ian@cygnus.com>
 
 	* libiberty.h (PEXECUTE_*): Define.