aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gdb/.Sanitize27
-rw-r--r--gdb/ChangeLog2
-rw-r--r--gdb/config/h8300/.Sanitize27
-rw-r--r--gdb/config/h8300/tm-h8300.h2
-rw-r--r--gdb/h8300-tdep.c21
5 files changed, 1 insertions, 78 deletions
diff --git a/gdb/.Sanitize b/gdb/.Sanitize
index 5f5925f..344207b 100644
--- a/gdb/.Sanitize
+++ b/gdb/.Sanitize
@@ -495,33 +495,6 @@ else
done
fi
-h8s_files="ChangeLog h8300-tdep.c"
-if ( echo $* | grep keep\-h8s > /dev/null ) ; then
- for i in $h8s_files ; do
- if test ! -d $i && (grep sanitize-h8s $i > /dev/null) ; then
- if [ -n "${verbose}" ] ; then
- echo Keeping h8s stuff in $i
- fi
- fi
- done
-else
- for i in $h8s_files ; do
- if test ! -d $i && (grep sanitize-h8s $i > /dev/null) ; then
- if [ -n "${verbose}" ] ; then
- echo Removing traces of \"h8s\" from $i...
- fi
- cp $i new
- sed '/start\-sanitize\-h8s/,/end-\sanitize\-h8s/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 53f8a41..fe115f1 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -183,7 +183,6 @@ Wed Jun 19 17:23:38 1996 Geoffrey Noer <noer@cygnus.com>
* configure: regenerated with autoconf 2.8
end-sanitize-gdbtk
-start-sanitize-h8s
Tue Jun 18 16:25:54 1996 Jeffrey A. Law <law@rtl.cygnus.com>
* h8300-dep.c (gdb_print_insn_h8300): Handle the H8/S.
@@ -194,7 +193,6 @@ Tue Jun 18 16:25:54 1996 Jeffrey A. Law <law@rtl.cygnus.com>
* config/h8300/tm-h8300.h (h8300smode): Declare.
-end-sanitize-h8s
Sun Jun 16 15:21:51 1996 Jeffrey A. Law <law@rtl.cygnus.com>
* somsolib.c (som_solib_create_inferior_hook): Handle tracking
diff --git a/gdb/config/h8300/.Sanitize b/gdb/config/h8300/.Sanitize
index 0c94ff7..b29dad1 100644
--- a/gdb/config/h8300/.Sanitize
+++ b/gdb/config/h8300/.Sanitize
@@ -15,33 +15,6 @@
Do-first:
-h8s_files="tm-h8300.h"
-if ( echo $* | grep keep\-h8s > /dev/null ) ; then
- for i in $h8s_files ; do
- if test ! -d $i && (grep sanitize-h8s $i > /dev/null) ; then
- if [ -n "${verbose}" ] ; then
- echo Keeping h8s stuff in $i
- fi
- fi
- done
-else
- for i in $h8s_files ; do
- if test ! -d $i && (grep sanitize-h8s $i > /dev/null) ; then
- if [ -n "${verbose}" ] ; then
- echo Removing traces of \"h8s\" from $i...
- fi
- cp $i new
- sed '/start\-sanitize\-h8s/,/end-\sanitize\-h8s/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
# 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
diff --git a/gdb/config/h8300/tm-h8300.h b/gdb/config/h8300/tm-h8300.h
index d09f47b..ee270b2 100644
--- a/gdb/config/h8300/tm-h8300.h
+++ b/gdb/config/h8300/tm-h8300.h
@@ -22,9 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
/* 1 if debugging H8/300H application */
extern int h8300hmode;
-/* start-sanitize-h8s */
extern int h8300smode;
-/* end-sanitize-h8s */
/* Number of bytes in a word */
diff --git a/gdb/h8300-tdep.c b/gdb/h8300-tdep.c
index cf455d8..3ca8560 100644
--- a/gdb/h8300-tdep.c
+++ b/gdb/h8300-tdep.c
@@ -121,12 +121,9 @@ gdb_print_insn_h8300 (memaddr, info)
bfd_vma memaddr;
disassemble_info *info;
{
-/* start-sanitize-h8s */
if (h8300smode)
return print_insn_h8300s (memaddr, info);
- else
-/* end-sanitize-h8s */
- if (h8300hmode)
+ else if (h8300hmode)
return print_insn_h8300h (memaddr, info);
else
return print_insn_h8300 (memaddr, info);
@@ -432,9 +429,7 @@ h8300_command(args, from_tty)
{
extern int h8300hmode;
h8300hmode = 0;
-/* start-sanitize-h8s */
h8300smode = 0;
-/* end-sanitize-h8s */
}
static void
@@ -442,11 +437,8 @@ h8300h_command(args, from_tty)
{
extern int h8300hmode;
h8300hmode = 1;
-/* start-sanitize-h8s */
h8300smode = 0;
-/* end-sanitize-h8s */
}
-/* start-sanitize-h8s */
static void
h8300s_command(args, from_tty)
{
@@ -455,7 +447,6 @@ h8300s_command(args, from_tty)
h8300smode = 1;
h8300hmode = 1;
}
-/* end-santiize-h8s */
static void
@@ -464,9 +455,7 @@ set_machine (args, from_tty)
int from_tty;
{
printf_unfiltered ("\"set machine\" must be followed by h8300, h8300h");
-/* start-sanitize-h8s */
printf_unfiltered ("or h8300s");
-/* end-sanitize-h8s */
help_list (setmemorylist, "set memory ", -1, gdb_stdout);
}
@@ -480,26 +469,20 @@ static void
set_machine_hook (filename)
char *filename;
{
-/* start-sanitize-h8s */
if (bfd_get_mach (exec_bfd) == bfd_mach_h8300s)
{
h8300smode = 1;
h8300hmode = 1;
}
else
-/* end-sanitize-h8s */
if (bfd_get_mach (exec_bfd) == bfd_mach_h8300h)
{
-/* start-sanitize-h8s */
h8300smode = 0;
-/* end-sanitize-h8s */
h8300hmode = 1;
}
else
{
-/* start-sanitize-h8s */
h8300smode = 0;
-/* end-sanitize-h8s */
h8300hmode = 0;
}
}
@@ -517,10 +500,8 @@ _initialize_h8300m ()
add_cmd ("h8300h", class_support, h8300h_command,
"Set machine to be H8/300H.", &setmemorylist);
-/* start-sanitize-h8s */
add_cmd ("h8300s", class_support, h8300s_command,
"Set machine to be H8/300S.", &setmemorylist);
-/* end-sanitize-h8s */
/* Add a hook to set the machine type when we're loading a file. */