No longer need to sanitize away h8s.

1 files changed, 1 insertions, 20 deletions

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. */