Patch from Will Schmidt <willschm@us.ibm.com>:jimb-ppc64-linux-20030509-branchcvs/jimb-ppc64-linux-20030509-branch

These changes enable support of PPC64 architecture.
* config/powerpc/ppc64linux.mh: New file.
* config/powerpc/ppc64linux.mt: New file.
* config/powerpc/tm-ppc64linux.h: New file.
* ppc64-linux-tdep.c: New file.
* configure.host: Add clause for powerpc64-*-linux*
* configure.tgt: Add clause for powerpc64-*-linux*
* elfread.c (record_minimal_symbol_and_info): If
DROP_TEXT_NAME_PREFIX_CHAR is #defined, then drop a leading
instance of that char from the names of text symbols.
(elf_symtab_read): If SKIP_DATA_IN_OPD is #defined, ignore data
symbols in the .opd section.
* ppc-linux-nat.c (PTRACE_XFER_TYPE): Change the default for this
to 'long'.
(PPC_PTRACE_POKEUSR_3264, PPC_PTRACE_PEEKUSR_3264,
PPC_PTRACE_POKEDATA_3264, PPC_PTRACE_PEEKDATA_3264): Provide
default definitions for these.
(ARCH64): New macro.
(ppc_wordsize_pid): New function.
(kernel_u_size): Handle 64-bit case.
(ppc_register_u_addr): Same.
(fetch_register): Use the *_3264 requests when
debugging a 64-bit process from a 32-bit GDB.
(store_register): Same.
(GDB_MAX_ALLOCA, child_xfer_memory, udot_info): Copied from
infptrace.c.
(_initialize_ppc_linux_nat): New function, to register our copy of
the udot_info command.
* ppc-linux-tdep.c (TDEP): New macro.
(ppc64_linux_svr4_fetch_link_map_offsets): New function.
(read_memory_addr): Copied from rs6000-tdep.c.
(ppc64_linux_convert_from_func_ptr_addr): New function.
* rs6000-tdep.c (skip_prologue): Recognize more instructions for
saving the 'lr' and 'cr' registers; don't just pre-emptively mask
in the 'st' opcode as soon as we see an 'mflr' or 'mfcr' opcode.
Recognize more instructions for updating the stack pointer, and
loading the TOC pointer.
(registers_powerpc64, registers_a35): New register tables.
(rs6000_gdbarch_init): Register the 64-bit solib functions.
* solib-svr4.c (solib_break_names): If SOLIB_BREAK_NAME is
#defined, include an entry for it.
(enable_break): Call CONVERT_FROM_FUNC_PTR_ADDR when trying to
guess the linker's base address.
* config/powerpc/tm-linux.h
(ppc64_linux_svr4_fetch_link_map_offsets,
ppc64_linux_convert_from_func_ptr_addr): New declarations.

731 files changed, 830 insertions, 121284 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 9c58b41c498..9bd5f9dc2ff 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,52 @@
+2003-05-12  Will Schmidt <willschm@us.ibm.com>
+
+        These changes enable support of PPC64 architecture.
+	* config/powerpc/ppc64linux.mh: New file.
+	* config/powerpc/ppc64linux.mt: New file.
+	* config/powerpc/tm-ppc64linux.h: New file.
+	* ppc64-linux-tdep.c: New file.
+	* configure.host: Add clause for powerpc64-*-linux*
+	* configure.tgt: Add clause for powerpc64-*-linux*
+	* elfread.c (record_minimal_symbol_and_info): If
+	DROP_TEXT_NAME_PREFIX_CHAR is #defined, then drop a leading
+	instance of that char from the names of text symbols.
+	(elf_symtab_read): If SKIP_DATA_IN_OPD is #defined, ignore data
+	symbols in the .opd section.
+	* ppc-linux-nat.c (PTRACE_XFER_TYPE): Change the default for this
+	to 'long'.
+	(PPC_PTRACE_POKEUSR_3264, PPC_PTRACE_PEEKUSR_3264,
+	PPC_PTRACE_POKEDATA_3264, PPC_PTRACE_PEEKDATA_3264): Provide
+	default definitions for these.
+	(ARCH64): New macro.
+	(ppc_wordsize_pid): New function.
+	(kernel_u_size): Handle 64-bit case.
+	(ppc_register_u_addr): Same.
+	(fetch_register): Use the *_3264 requests when
+	debugging a 64-bit process from a 32-bit GDB.
+	(store_register): Same.
+	(GDB_MAX_ALLOCA, child_xfer_memory, udot_info): Copied from
+	infptrace.c.
+	(_initialize_ppc_linux_nat): New function, to register our copy of
+	the udot_info command.
+	* ppc-linux-tdep.c (TDEP): New macro.
+	(ppc64_linux_svr4_fetch_link_map_offsets): New function.
+	(read_memory_addr): Copied from rs6000-tdep.c.
+	(ppc64_linux_convert_from_func_ptr_addr): New function.
+	* rs6000-tdep.c (skip_prologue): Recognize more instructions for
+	saving the 'lr' and 'cr' registers; don't just pre-emptively mask
+	in the 'st' opcode as soon as we see an 'mflr' or 'mfcr' opcode.
+	Recognize more instructions for updating the stack pointer, and
+	loading the TOC pointer.
+	(registers_powerpc64, registers_a35): New register tables.
+	(rs6000_gdbarch_init): Register the 64-bit solib functions.
+	* solib-svr4.c (solib_break_names): If SOLIB_BREAK_NAME is
+	#defined, include an entry for it.
+	(enable_break): Call CONVERT_FROM_FUNC_PTR_ADDR when trying to
+	guess the linker's base address.
+	* config/powerpc/tm-linux.h
+	(ppc64_linux_svr4_fetch_link_map_offsets,
+	ppc64_linux_convert_from_func_ptr_addr): New declarations.
+
 2003-05-08  Andrew Cagney  <cagney@redhat.com>
 
 	* regcache.h (max_register_size): Delete declaration.
diff --git a/gdb/config/powerpc/ppc64linux.mh b/gdb/config/powerpc/ppc64linux.mh
new file mode 100644
index 00000000000..e18a1885860
--- /dev/null
+++ b/gdb/config/powerpc/ppc64linux.mh
@@ -0,0 +1,14 @@
+# Host: PowerPC, running Linux
+
+XM_FILE= xm-linux.h
+XM_CLIBS=
+
+NAT_FILE= nm-linux.h
+NATDEPFILES= infptrace.o inftarg.o fork-child.o corelow.o linux-proc.o \
+	core-regset.o ppc-linux-nat.o proc-service.o thread-db.o lin-lwp.o  \
+	gcore.o ppc-sysv-tdep.o
+
+LOADLIBES = -ldl -lthread_db
+
+GDBSERVER_DEPFILES= low-linux.o
+GDBSERVER_LIBS= -lnss_dns  -lnss_files -lresolv
diff --git a/gdb/config/powerpc/ppc64linux.mt b/gdb/config/powerpc/ppc64linux.mt
new file mode 100644
index 00000000000..878eb15ed21
--- /dev/null
+++ b/gdb/config/powerpc/ppc64linux.mt
@@ -0,0 +1,4 @@
+# Target: PPC running Linux 64bit programs
+TDEPFILES= rs6000-tdep.o ppc-linux-tdep.o ppc64-linux-tdep.o solib.o solib-svr4.o solib-legacy.o 
+TM_FILE= tm-ppc64linux.h
+
diff --git a/gdb/config/powerpc/tm-linux.h b/gdb/config/powerpc/tm-linux.h
index d69dfc1f5bf..9d72374a5be 100644
--- a/gdb/config/powerpc/tm-linux.h
+++ b/gdb/config/powerpc/tm-linux.h
@@ -67,4 +67,9 @@ extern int ppc_linux_in_sigtramp (CORE_ADDR pc, char *func_name);
    to be relocated. */
 #define SOFUN_ADDRESS_MAYBE_MISSING
 
+/* used for ppc64 only, but added here because code is common between ppc and ppc64 */
+struct link_map_offsets *ppc64_linux_svr4_fetch_link_map_offsets (void);
+extern CORE_ADDR ppc64_linux_convert_from_func_ptr_addr (CORE_ADDR addr);
+
+
 #endif  /* #ifndef TM_LINUX_H */
diff --git a/gdb/config/powerpc/tm-ppc64linux.h b/gdb/config/powerpc/tm-ppc64linux.h
new file mode 100644
index 00000000000..4b30c18c765
--- /dev/null
+++ b/gdb/config/powerpc/tm-ppc64linux.h
@@ -0,0 +1,80 @@
+#ifndef TM_PPC64LINUX_H
+#define TM_PPC64LINUX_H
+
+#include "rs6000/tm-rs6000.h"
+
+/* Avoid warning from redefinition in tm-sysv4.h (included from tm-linux.h) */
+#undef SKIP_TRAMPOLINE_CODE
+#include "tm-linux.h"
+
+#include "gdbarch.h"
+/* Reset these back to the default.  Should really fix this for other
+   powerpc tm.h so it can be chosen at runtime  */
+#undef SOFTWARE_SINGLE_STEP_P
+#define SOFTWARE_SINGLE_STEP_P() (gdbarch_software_single_step_p (current_gdbarch))
+#undef SOFTWARE_SINGLE_STEP
+#define SOFTWARE_SINGLE_STEP(sig, insert_breakpoints_p) (gdbarch_software_single_step (current_gdbarch, sig, insert_breakpoints_p))
+
+#ifdef DEAD_CODE
+/* FIXME: tm-linux defines this which a dead interface, as far as I
+   can tell. The macro is unused and there is no definition for the
+   function the macro calls. It is here so we know to get rid of it
+   there. */
+/* Make sure nexti gets the help it needs for debugging assembly code
+   without symbols */
+
+#define AT_SUBROUTINE_CALL_INSTRUCTION_TARGET(prevpc,stoppc) \
+   at_subroutine_call_instruction_target(prevpc,stoppc)
+extern int at_subroutine_call_instruction_target();
+#endif /* DEAD_CODE */
+
+/* We _want_ the SVR4 section offset calculations (see syms_from_objfile()
+   in symfile.c) */
+#undef IBM6000_TARGET
+
+/* Default offset from SP where the LR is stored */
+#undef DEFAULT_LR_SAVE
+#define	DEFAULT_LR_SAVE 16
+
+/* Say that we're using ELF, not XCOFF.  */
+#define ELF_OBJECT_FORMAT 1
+
+/* Say that we're using ELF64 since ABI is closer to XCOFF64. */
+#define ELF64_OBJECT_FORMAT 1
+
+#undef PROCESS_LINENUMBER_HOOK
+
+#undef TEXT_SEGMENT_BASE
+#define TEXT_SEGMENT_BASE 1
+
+/* don't think it is but it can't hurt (can it?) */
+#define TARGET_BYTE_ORDER_SELECTABLE_P 1
+
+/* The value of symbols of type N_SO and N_FUN maybe null when 
+   it shouldn't be. */
+#define SOFUN_ADDRESS_MAYBE_MISSING
+
+#undef CHILD_SPECIAL_WAITSTATUS
+
+/* Use generic shared library machinery.  */
+#include "solib.h"
+
+/* function entrypoints have a '.' prepended to them (elfread.c) */
+#define DROP_TEXT_NAME_PREFIX_CHAR '.'
+/* skip data symbols if they are from the .opd section (elfread.c) */
+#define SKIP_DATA_IN_OPD
+
+/* define our own child_xfer_memory() ppc-linux-nat.c */
+#define CHILD_XFER_MEMORY
+
+#undef bfd_get_start_address
+#define bfd_get_start_address(abfd) ppc64_bfd_get_start_address (abfd)
+extern  CORE_ADDR ppc64_bfd_get_start_address (bfd *);
+struct link_map_offsets *ppc64_linux_svr4_fetch_link_map_offsets (void);
+extern CORE_ADDR ppc64_linux_convert_from_func_ptr_addr (CORE_ADDR addr);
+
+/* define additional name for solib functions (solib-svr4.c) to hinge on. */
+#define SOLIB_BREAK_NAME "._dl_debug_state"
+
+
+#endif  /* #ifndef TM_PPC64LINUX_H */
diff --git a/gdb/configure.host b/gdb/configure.host
index 8f96b0a842c..ab5c2b7d14b 100644
--- a/gdb/configure.host
+++ b/gdb/configure.host
@@ -120,6 +120,8 @@ powerpc-*-aix*)		gdb_host=aix432 ;;
 powerpc-*-linux*)	gdb_host=linux ;;
 powerpc-*-netbsd*)	gdb_host=nbsd ;;
 
+powerpc64-*-linux*)	gdb_host=ppc64linux ;;
+
 rs6000-*-lynxos*)	gdb_host=rs6000lynx ;;
 rs6000-*-aix4*)		gdb_host=aix4 ;;
 rs6000-*-*)		gdb_host=rs6000 ;;
diff --git a/gdb/configure.tgt b/gdb/configure.tgt
index fe4cc5d4856..2f5c909795a 100644
--- a/gdb/configure.tgt
+++ b/gdb/configure.tgt
@@ -193,6 +193,15 @@ powerpc-*-aix*)		gdb_target=aix ;;
 powerpc-*-linux*)	gdb_target=linux
 			build_gdbserver=yes
 			;;
+powerpc64-*-linux*)	gdb_target=ppc64linux
+			###HACK -JX
+			case "${host}" in
+			powerpc-*-linux*)
+			  ## This host can treat target as native
+			  nativefile=nm-linux.h
+			  ;;
+			esac
+			;;
 powerpc-*-vxworks*)	gdb_target=vxworks ;;
 powerpc*-*-*)		if test -f ../sim/ppc/Makefile; then
 			  gdb_target=ppc-sim
diff --git a/gdb/elfread.c b/gdb/elfread.c
index 7aee37cc5db..fd4c9566dbf 100644
--- a/gdb/elfread.c
+++ b/gdb/elfread.c
@@ -141,6 +141,12 @@ record_minimal_symbol_and_info (char *name, CORE_ADDR address,
   if (ms_type == mst_text || ms_type == mst_file_text)
     address = SMASH_TEXT_ADDRESS (address);
 
+#ifdef DROP_TEXT_NAME_PREFIX_CHAR
+  if ((ms_type == mst_text || ms_type == mst_file_text)
+      && name[0] == DROP_TEXT_NAME_PREFIX_CHAR)
+    ++name;
+#endif /* DROP_TEXT_NAME_PREFIX_CHAR */
+
   return prim_record_minimal_symbol_and_info
     (name, address, ms_type, info, bfd_section->index, bfd_section, objfile);
 }
@@ -363,6 +369,10 @@ elf_symtab_read (struct objfile *objfile, int dynamic)
 		    {
 		      if (sym->section->flags & SEC_LOAD)
 			{
+#ifdef SKIP_DATA_IN_OPD
+			  if (strcmp(sym->section->name, ".opd") == 0)
+			    continue;
+#endif /* SKIP_DATA_IN_OPD */
 			  ms_type = mst_data;
 			}
 		      else
@@ -444,6 +454,10 @@ elf_symtab_read (struct objfile *objfile, int dynamic)
 		         symbol processing. */
 		      if (sym->section->flags & SEC_LOAD)
 			{
+#ifdef SKIP_DATA_IN_OPD
+			  if (strcmp(sym->section->name, ".opd") == 0)
+			    continue;
+#endif /* SKIP_DATA_IN_OPD */
 			  ms_type = mst_file_data;
 			}
 		      else
diff --git a/gdb/gdbtk/ChangeLog b/gdb/gdbtk/ChangeLog
deleted file mode 100644
index c22f169608a..00000000000
--- a/gdb/gdbtk/ChangeLog
+++ /dev/null
@@ -1,319 +0,0 @@
-2003-05-08  Andrew Cagney  <cagney@redhat.com>
-
-	* generic/gdbtk-register.c (get_register): Replace
-	MAX_REGISTER_VIRTUAL_SIZE and MAX_REGISTER_RAW_SIZE with
-	MAX_REGISTER_SIZE.
-	(register_changed_p, setup_architecture_data): Ditto.
-
-2003-04-30  Andrew Cagney  <cagney@redhat.com>
-
-	* generic/gdbtk-cmds.c (gdb_disassemble_driver): Instead of
-	TARGET_PRINT_INSN_INFO, "dis_asm_memory_error",
-	"dis_asm_read_memory", and "dis_asm_print_address", use
-	"deprecated_tm_print_insn_info"
-
-2003-04-11  Andrew Cagney  <cagney@redhat.com>
-
-	* generic/gdbtk-stack.c (get_frame_name): Use get_frame_pc and
-	get_next_frame.
-
-2003-03-18  Keith Seitz  <keiths@redhat.com>
-
-	From Nick Kelsey <nickk@ubicom.com>:
-	* process.itb (build_win): Removed ide_sizebox instantiation that is
-	no longer required and is causing errors for win hosts.
-	* tdump.tcl (build_win): Ditto.
-	* locals.tcl (build_win): Removed ide_sizebox instantiation that is
-	no longer required and already commented out.
-	* regwin.itb (build_win): Ditto.
-	* srcwin.itb (constructor): Ditto.
-	* stackwin.itb (constructor): Ditto.
-	* watch.tcl (constructor): Ditto.
-
-2003-03-24  Martin M. Hunt  <hunt@redhat.com>
-
-	* generic/gdbtk-register.c (get_register_types): Use 
-	register_type instead of REGISTER_VIRTUAL_TYPE.
-	(get_register): Ditto.
-
-2003-03-17  Keith R Seitz  <keiths@redhat.com>
-
-	* generic/gdbtk-register.c (get_register): Use frame_register
-	instead of get_saved_register (which was deleted from gdb).
-
-2003-03-06  Martin M. Hunt  <hunt@redhat.com>
-
-	* generic/gdbtk-interp.c (gdbtk_interpreter_init): Remove
-	unused variable.
-
-	* generic/gdbtk-cmds.c (gdb_update_mem): Remove unused variable.
-	(gdbtk_print_source): Deleted.
-	(gdbtk_print_asm): Deleted.
-
-2003-03-06  Martin M. Hunt  <hunt@redhat.com>
-	
-	* generic/gdbtk-bp.c (gdb_get_tracepoint_info): Return CORE_ADDR.
-
-2003-03-06  Martin M. Hunt  <hunt@redhat.com>
-	
-	* generic/gdbtk-cmds.c (gdb_disassemble): Deleted.
-	(sprintf_append_element_to_obj): Deleted.
-
-	* generic/gdbtk-bp.c (get_breakpoint_commands): Use
-	Tcl_ListObjAppendElement() instead of 
-	sprintf_append_element_to_obj().
-	
-2003-03-05  Martin M. Hunt  <hunt@redhat.com>
-
-	* library/srctextwin.itb (SrcTextWin::FillAssembly): 
-	Remove unused variables asm_lo_addr and asm_hi_addr.
-	(FillMixed): Ditto.
-
-2003-03-05  Martin M. Hunt  <hunt@redhat.com>	
-
-	* generic/gdbtk-cmds.c (Gdbtk_Init): Create gdb_CA_to_TAS.
-	(gdb_load_disassembly): Now takes CORE_ADDRs. Returns CORE_ADDRs
-	for low and high.
-	(gdbtk_load_asm): Use CORE_ADDRs.
-	(gdb_loc): Return CORE_ADDRs.
-	(gdb_entry_point): Return CORE_ADDR.
-	(gdb_incr_addr): Update description.
-	(gdb_CA_to_TAS): New function. Takes a CORE_ADDR and returns 
-	a target sddress string.
-
-	* generic/gdbtk-bp.c (gdb_find_bp_at_addr): Change to
-	take a CORE_ADDR.
-	(gdb_get_breakpoint_info): Returns a CORE_ADDR.
-	(gdb_set_bp_addr): Takes a CORE_ADDR.
-	
-	* library/bpwin.itb (bp_add): Call gdb_CA_to_TAS before 
-	displaying address.
-	(bp_modify): Ditto.
-
-	* library/srcwin.itb (location): Call gdb_CA_to_TAS before 
-	displaying address. Don't add "0x" in front of address.
-	(set_execution_status): Call gdb_CA_to_TAS before 
-	displaying address. Don't call [gdb_cmd printf] to format
-	output. Weird.
-
-2003-02-25  David Carlton  <carlton@math.stanford.edu>
-
-	* generic/gdbtk.h: Replace all instances of SYMBOL_NAME by
-	DEPRECATED_SYMBOL_NAME.
-	* generic/gdbtk-stack.c, generic/gdbtk-cmds.c: Ditto.
-	* generic/gdbtk-stack.c, generic/gdbtk-cmds.c: Update copyright.
-
-2003-02-21  Tom Tromey  <tromey@redhat.com>
-
-	* generic/gdbtk-interp.c (gdbtk_interpreter_init): Declare locals
-	before code.
-
-2003-02-21  Daniel Jacobowitz  <drow@mvista.com>
-
-	* generic/gdbtk-stack.c (gdb_get_blocks, gdb_block_vars)
-	(gdb_get_vars_command): Handle LOC_COMPUTED and LOC_COMPUTED_ARG.
-
-2003-02-20  Keith Seitz  <keiths@redhat.com>
-
-	* generic/gdbtk-cmds.c (gdb_search): Change SYMBOL_SOURCE_NAME
-	to SYMBOL_PRINT_NAME to track recent changes in gdb.
-
-2003-02-20  Pierre Muller  <muller@ics.u-strasbg.fr>
-
-	* generic/gdbtk-cmds.c: Add missing "block.h" include.
-	generic/gdbtk-stack.c: Ditto.
-	generic/gdbtk-wrapper.c: Ditto.
-
-2003-02-18  Keith Seitz  <keiths@redhat.com>
-
-	* generic/gdbtk-main.c (main): Change name of intepreter to "insight".
-	* generic/gdbtk.h: Add ifdef wrappers.
-	(gdbtk_init): Declare.
-	(gdbtk_source_start_file): Declare.
-	* generic/gdbtk.c (gdbtk_init): Export.
-	Reomve init_ui_hook stuff.
-	Do not add hooks here anymore (moved into interps).
-	Do not muck with gdbk_stdout et al (moved into interps).
-	(gdbtk_source_start_file): Code ripped out of gdbtk_init
-	which deals with sourcing the main startup file.
-	(gdbtk_init_1): Hack: New function.
-	(argv0): Hack: New static global.
-	(tk_init): Moved to gdbtk-interps.c.
-	(gdbtk_resume): Likewise.
-	(gdbtk_suspend): Likewise.
-	(gdbtk_prompt_p): Likewise.
-	(gdbtk_exec): Likewise.
-	(gdbtk_command_loop): Likewise.
-	(_initialize_gdbtk): Move interpreter stuff to gdbtk-interps.c.
-	Hack: Add new init_ui_hook.
-	* generic/gdbtk-interps.c: New file.
-
-2003-02-17  Christopher Faylor  <cgf@redhat.com>
-
-	Revert below change.
-
-2003-02-17  Christopher Faylor  <cgf@redhat.com>
-
-	* gdbtk/gdbtk.c (tk_procs): Make file global.  Declare at top.
-	(_initialize_gdbtk): Move interp_add from here.
-	(gdb_tk): Call interp_add here.  Pass correct uiout to interp_new.
-
-2003-02-14  Keith Seitz  <keiths@redhat.com>
-
-	From Chris Faylor <cgf@redhat.com>:
-	* generic/gdbtk-main.c (main): Initialize args.interpreter_p.
-
-2003-02-14  Martin M. Hunt  <hunt@redhat.com>
-
-	* library/globalpref.itb (GlobalPref::_change_icons): Fix
-	curselection call for combobox.
-
-2003-02-12  Andrew Cagney  <ac131313@redhat.com>
-
-	* generic/gdbtk-hooks.c (tk_command_loop): Move function ...
-	* generic/gdbtk.c (gdbtk_command_loop): ... to here.  Add data
-	parameter.
-
-	* generic/gdbtk.c: Include "interps.h".
-	(_initialize_gdbtk): Register the "gdbtk" interpreter.  Don't set
-	init_ui_hook.
-	(gdbtk_init): Change parameter to a void data pointer.
-	(tk_init, gdbtk_resume, gdbtk_suspend): New functions.
-	(gdbtk_prompt_p, gdbtk_exec): New functions.
-
-	* generic/gdbtk-hooks.c (gdbtk_add_hooks): Don't set
-	command_loop_hook.  Update copyright.
-	
-2003-02-11  Martin M. Hunt  <hunt@redhat.com>
-
-	* library/help/images/browser1.png: New file.
-	* library/help/images/browser2.png: New file.	
-
-2003-02-11  Keith R Seitz  <keiths@redhat.com>
-
-	* generic/gdbtk-register.c (register_changed_p): If the selected
-	frame is NULL, do not call frame_register_read, since that will
-	now cause an internal error.
-
-2003-02-10  Andrew Cagney  <ac131313@redhat.com>
-
-	* generic/gdbtk-varobj.c (gdb_variable_command): Ditto for
-	`commands'.
-	(variable_type): Ditto for `first'.
-	(variable_obj_command): Ditto.
-	(variable_create): Ditto for create_options.
-	(variable_type): Ditto for `last'.  Use `string' and not `first'
-	when modifying the buffer.
-	(struct disassembly_client_data ): Ditto for `asm_argv'
-	* generic/gdbtk-register.c (gdb_register_info): Ditto for
-	`commands'.
-	* generic/gdbtk-hooks.c (tk_command_loop): Ditto for `msg'.
-	* generic/gdbtk-cmds.c (gdb_search): Ditto for `switches'.
-	(gdbtk_load_source): Ditto for `text_argv'.
-	(struct disassembly_client_data ): Ditto for `source_argv'.
-	(gdbtk_load_asm): Ditto for `text_argv'.
-	(struct disassembly_client_data ): Ditto for `asm_argv'
-	(gdb_loadfile): Ditto for `text_argv'.
-	* generic/gdbtk.c (TclDebug): Make `v' a constant pointer.
-	(gdbtk_init): Ditto for `old_chain', `src_path', `msg', and
-	`lib_path'.
-
-2003-02-10  Martin M. Hunt  <hunt@redhat.com>
-
-	* library/browserwin.itb: Set textbackground option to
-	$::Colors(textbg) instead of "white".
-
-2003-02-10  Martin M. Hunt  <hunt@redhat.com>	
-
-	* library/interface.tcl (gdbtk_attach_native): Don't force the user
-	to choose an exec file when attaching.
-
-	* library/attachdlg.itb: Some fixes to work with latest iwidgets.
-
-2003-02-10  Martin M. Hunt  <hunt@redhat.com>
-	
-	* library/prefs.tcl (pref_set_defaults): Remove prefs
-	gdb/browser/width, gdb/browser/top_height, gdb/browser/view_height,
-	gdb/browser/view_is_open. Add gdb/browser/layout.
-
-	* library/browserwin.ith: Update declarations to match 
-	changes in browserwin.itb.
-
-	* library/browserwin.itb (constructor): Don't set toplevel
-	bindings. Set _layout from prefs.
-	(destructor): Don't check $resize_after. Don't save view_is_open.
-	(_build_win): Create a popup menu and bind to button 3.
-	Split the rest into 4 functions; _build_file_frame, 
-	_build_filter_frame, _build_function_frame, and _build_view_frame.
-	Pack these 4 frames according to $_layout.
-	(_toggle_more): Deleted.
-	(_bind_toplevel): Deleted.
-	(_do_resize): Deleted.
-	(_resize): Deleted.
-	(_fill_source): Always fill because source is always visible.
-	(_fill_funcs_combo): Limit width of combo to 40 chars.
-	(_build_filter_frame): New function.
-	(_build_file_frame): New function.
-	(_build_function_frame): New function.
-	(_build_view_frame): New function.
-	(_switch_layout): New function. Toggle between layouts.
-
-	* library/tclIndex: Rebuilt.
-	
-	* library/help/browser.html: Rewrite.
-
-2003-02-03  Martin M. Hunt  <hunt@redhat.com>
-
-	* library/targetselection.itb (TargetSelection::build_win): Remove 
-	duplicate label.
-
-2003-02-03  Martin M. Hunt  <hunt@redhat.com>	
-
-	* library/globalpref.itb, library/mempref.itb, library/srcpref.itb,
-	library/srcwin.itb, library/targetselection.itb, library/tracedlg.tcl:
-	Set background color of comboboxes to Colors(textbg).
-
-	* library/main.tcl: Load combobox version 2.2.
-
-	* library/prefs.tcl: Minor optimization. Change order of main_names
-	to have the most common, "main", first.
-	
-2003-02-03  Martin M. Hunt  <hunt@redhat.com>
-	
-	* library/targetselection.itb (TargetSelection::port_list): Keep
-	checking ports on Windows until we can open no more. Replaces
-	fixed limit of 9.
-
-2003-02-03  Martin M. Hunt  <hunt@redhat.com>
-	
-	* library/session.tcl (_recreate_bps): Catch errors.
-
-2003-02-03  Martin M. Hunt  <hunt@redhat.com>
-	
-	* library/interface.tcl (gdbtk_locate_main): Rewrite for efficiency.
-	No longer uses gdb_search.  Caches result. 
-	(initialize_gdbtk): Initialize gdb_locate_main cache.
-	* library/main.tcl: Call initialize_gdbtk after loading prefs.
-
-2003-01-21  Martin M. Hunt  <hunt@redhat.com>
-	* library/main.tcl: Don't require iwidgets 3.0.
-
-	* library/console.itb (Console::_build_win): Rename
-	tkTextClosestGap to tk::TextClosestGap. Rename tkCancelRepeat
-	to tk::CancelRepeat. Rename tkPriv to tk::Priv. Needed for tk 8.4.1.
-
-	* library/bpwin.itb (BpWin::build_win): Don't
-	create sizebox.
-	* library/locals.tcl (build_win): Ditto.
-	* library/regwin.itb (RegWin::_build_win): Ditto.
-	* library/srcwin.itb (SrcWin::constructor): Ditto.
-	* library/stackwin.itb (StackWin::build_win): Ditto.
-	* library/watch.tcl (build_win): Ditto.
-	
-	* generic/gdbtk.c (gdbtk_init): Look for iwidgets in
-	"iwidgets" instead of "iwidgets3.0.0".
-	Don't call ide_create_sizebox_command.
-
-	* ChangeLog: New log for 2003.
-	* ChangeLog-2002: Renamed from ChangeLog. 
-
diff --git a/gdb/gdbtk/ChangeLog-2001 b/gdb/gdbtk/ChangeLog-2001
deleted file mode 100644
index b543b911d71..00000000000
--- a/gdb/gdbtk/ChangeLog-2001
+++ /dev/null
@@ -1,1719 +0,0 @@
-2001-12-21  Tom Tromey  <tromey@redhat.com>
-
-	* generic/gdbtk-cmds.h (full_lookup_symtab): Don't declare.
-	* generic/gdbtk-cmds.c (gdb_find_file_command): Use
-	lookup_symtab.
-	(gdb_listfuncs): Likewise.
-	(gdb_loadfile): Likewise.
-	(full_lookup_symtab): Removed.
-	* generic/gdbtk-bp.c (gdb_find_bp_at_line): Use lookup_symtab.
-	(gdb_set_bp): Likewise.
-
-2001-12-21  Keith Seitz  <keiths@redhat.com>
-
-	* library/bpwin.ith (_select_and_popup): New private method.
-	* library/bpwin.itb (bp_select): Don't bind to Button-3.
-	(build_win): Bind Button-3 to _select_and_popup.
-	(_select_and_popup): New private method.
-
-2001-12-18  Keith Seitz  <keiths@redhat.com>
-
-	* library/memwin.itb (incr_addr): Fix typo.
-
-2001-12-16  Andrew Cagney  <ac131313@redhat.com>
-
-	* generic/gdbtk-cmds.c (hex2bin): Replace LITTLE_ENDIAN with
-	BFD_ENDIAN_LITTLE.
-
-2001-12-10  Ian Roxborough  <irox@redhat.com>
-
-	* library/interface.tcl (set_target_name): Call "pref getd"
-	instead of "pref get" to avoid undefined preference error
-	message for default-hostname.
-
-2001-12-07  Keith Seitz  <keiths@redhat.com>
-
-	* library/managedwin.itb (shutdown): Don't save geometry for
-	plugins, either.
-
-2001-12-05  Keith Seitz  <keiths@redhat.com>
-
-	* library/console.itb (busy): Set the cursor to the watch.
-	(idle): Reset cursor to normal.
-
-2001-11-30  Martin M. Hunt  <hunt@redhat.com>
-
-	* library/interface.tcl (gdbtk_eval): Remove
-	undocumented debug function.
-
-2001-11-21  Tom Tromey  <tromey@redhat.com>
-
-	* library/interface.tcl (gdbtk_tcl_preloop): Override session's
-	command-line arguments if required.
-
-2001-11-20  Keith Seitz  <keiths@redhat.com>
-
-	* generic/gdbtk.c (gdbtk_init): If DISPLAY is not set on Unix,
-	clear the init_ui_hook so that gdb will properly initialize
-	the cli.
-
-2001-11-08  Martin M. Hunt  <hunt@redhat.com>
-	* generic/gdbtk-cmds.c (gdb_eval): Add an optional
-	format argument.
-	(hex2bin): Swap bytes around if target is little endian.
-	Fix loop count.
-	(gdb_incr_addr): New function to do address arithmetic.
-	Needed because some addresses are 64-bits and tcl can't
-	deal with them, except as strings.
-
-	* library/memwin.itb (MemWin::build_win): Add a label
-	to indicate the target endianess.
-	(MemWin::edit): Use gdb_incr_addr.
-	(MemWin::busy): The constructor calls gdbtk_busy which
-	calls this before the window has finished drawing, so
-	don't disable items that don't exist yet.
-	(MemWin::update_address): Set a flag, bad_expr, if the
-	expression does not evaluate. Call gdb_eval with 'x' flag
-	to force the result to be hex.
-	(MemWin::BadExpr): Set bad_expr.
-	(MemWin::incr_addr): Use gdb_incr_addr.
-	(MemWin::update_addr): Return is bad_expr is set. Use
-	gdb_incr_addr.
-	(MemWin::goto): Call update_address.
-	* library/memwin.itb: Declare private variable bad_expr.
-	
-	* library/util.tcl (gdbtk_endian): New procedure. Returns
-	BIG or LITTLE to indicate target endianess.
-
-2001-11-08  Martin M. Hunt  <hunt@redhat.com>	
-	* library/managedwin.itb (ManagedWin::shutdown): Fix
-	typo in class name DebugWinDOpts.
-
-	* library/debugwin.itb: Add MemWin to _classes.
-
-2001-11-05  Martin M. Hunt  <hunt@redhat.com>
-	* generic/gdbtk-cmds.h (gdbtk_set_result): Declare.
-	A printf-like function to return error messages.
-	* generic/gdbtk-cmds.c (gdbtk_set_result): New
-	function.
-	(gdb_cmd): Use gdbtk_set_result.
-	(gdb_immediate_command): Ditto.
-	(gdb_load_info): Ditto.
-	(gdb_find_file_command): Ditto.
-	(gdb_listfuncs): Ditto.
-	(gdb_load_disassembly): Ditto.
-	(gdb_loc): Ditto.
-	(gdb_set_mem): Ditto.
-	(gdb_get_mem): Ditto.
-	(gdb_loadfile): Ditto.
-	* generic/gdbtk-varobj.c (variable_format): Ditto.
-	(variable_value): Ditto.
-	* generic/gdbtk-stack.c (gdb_get_vars_command): Ditto.
-	* generic/gdbtk-bp.c (gdb_get_breakpoint_info): Ditto.
-	(gdb_set_bp): Ditto.
-	(gdb_set_bp_addr): Ditto.
-	(gdb_get_tracepoint_info): Ditto.
-
-2001-11-05  Martin M. Hunt  <hunt@redhat.com>
-
-	* library/stackwin.itb (StcakWin::reconfig): Destroy sbox 
-	if it exists.
-
-	* library/process.itb (ProcessWin::reconfig): Destroy sbox 
-	if it exists. This fixes reconfig failures on Windows. Also 
-	destroy slbox.
-
-	* library/bpwin.itb (BpWin::reconfig): Destroy sbox if 
-	it exists.This fixes reconfig failures on Windows. Also 
-	destroy sf
-	
-	* library/tdump.tcl (TdumpWin::reconfig): Delete sbox
-	and stext then rebuild window.
-
-2001-11-05  Martin M. Hunt  <hunt@redhat.com>	
-
-	* library/debugwin.itb (DebugWin::build_win): 
-	Initialize gdbtk_de(ERRORS_ONLY) and gdbtk_de(filter_var)
-	(DebugWin::puts): Rewrite filter to handle new options.
-	(DebugWinDOpts::build_win): Update list of classes. Change 
-	filter dialog so we can not display only errors and warnings
-	or choose between displaying ALL classes except those selected
-	or only selected classes. Fix "OK" button to apply
-	changes before closing dialog.
-	DebugWinOpts::_apply): Now takes an agrument that
-	indicates if dialog should exit after applying filter.
-	
-	* library/debugwin.ith (_apply): Now takes an arg.
-
-	* library/main.tcl: If GDBTK_DEBUGFILE is not set,
-	use "insight.log" as the default. If GDBTK_DEBUG is set
-	and nonzero, start logging debug messages to
-	GDBTK_DEBUGFILE immediately. Never open the debug window
-	automatically.
-
-	* library/managedwin.itb (ManagedWin::shutdown): Don't 
-	save debug window options dialog on active list
-	
-	* library/srcwin.itb: Remove troublesome debug line.
-
-2001-11-05  Martin M. Hunt  <hunt@redhat.com>
-	* library/globalpref.itb (GlobalPref::_init_var):
-	New method to initialize _saved and _new arrays.
-	(GlobalPref::constructor): Call _init_var.
-	(GlobalPref::_buildwin): Use _new array for prefs
-	variables. Font optimizations. Remove troublesome
-	fonts and sort the list.
-	(GlobalPref::toggle_tracing_mode): Removed.  Some
-	functionality moved to _apply and _cancel.
-	(GlobalPref::_apply): Set prefs with values from the
-	_new array.
-	(SrcPref::_cancel): Reset prefs with values from _saved.
-	* library/globalpref.ith: Changed private variables
-	and methods to start with underscore.
-	(tracing_cb): Removed.
-	(_init): Changed from proc to method.
-
-2001-11-01  Keith Seitz  <keiths@redhat.com>
-
-	* library/memwin.itb (update_addr): Evaluate the address
-	to be sent to gdb_get_mem to prevent passing error strings
-	to string_to_coreaddr in gdb_get_mem.
-
-2001-10-29  Martin M. Hunt  <hunt@redhat.com>	
-
-	* library/debugwin.itb: Don't increment number of
-	TopLevelWins. 
-
-	* library/managedwin.itb: Don't save DebugWins to
-	active list.
-
-2001-10-29  Martin M. Hunt  <hunt@redhat.com>		
-
-	* generic/gdbtk-bp.c (gdb_set_bp_addr): When setting
-	the bp addr_string, use the string the function was called
-	with instead of using sprintf to write a new one. This
-	avoids a problem with truncating 64-bit addresses.
-
-	* library/srcbar.itcl (SrcBar::create_buttons) Don't
-	set width of address label.
-	(SrcBar::address) When the address changes, recompute
-	width of address label.  If it is more than 10, force it
-	to 18, otherwise use 10.
-	
-2001-10-29  Martin M. Hunt  <hunt@redhat.com>	
-
-	* generic/gdbtk-bp.c (gdb_find_bp_at_addr): Use
-	string_to_core_addr to read address so 64 bits will work.
-	(gdb_set_bp): Set error message with Tcl_SetObjResult()
-	so it will be displayed.
-	(gdb_set_bp_addr):Use string_to_core_addr to read address.
-	Set error message with Tcl_SetObjResult().
-
-	* generic/gdbtk-cmds.c (gdb_get_mem): :Use string_to_core_addr 
-	to read address. Set error message with Tcl_SetObjResult() or
-	Tcl_WrongNumArgs.
-	
-2001-10-27  Tom Tromey  <tromey@redhat.com>
-
-	* tclIndex: Updated.
-	* library/main.tcl: Add session_notice_file_change to
-	file_changed_hook.
-	* library/session.tcl (session_load): Only load the executable.
-	(session_notice_file_change): New proc.
-	(SESSION_exe_name): New proc.
-	(session_save): Use it.
-	(session_notice_file_change): Likewise.
-	* library/interface.tcl (gdbtk_tcl_exec_file_display): Don't call
-	session_save.
-	(gdbtk_tcl_preloop): Don't set executable name or try to find
-	main.  Notice a new session if required.
-	
-2001-10-18  Martin M. Hunt  <hunt@redhat.com>
-	
-	* library/srcpref.itb (SrcPref::contructor): Move array
-	initialization to _init_var.
-	(SrcPref::_init_var): New method to initialize _saved and 
-	_new arrays.
-	(SrcPref::buildwin): Rename to _buildwin. Have widgets use 
-	_new instead of [pref varname ...].  Set initial value of
-	tab size spinint.
-	(SrcPref::_apply): Set prefs with values from the _new array.
-	(SrcPref::_cancel): Reset disassembly flavor and don't call 
-	_save because nothing is saved unless OK is selected.
-	(SrcPref::set_flavor): Rename to _set_flavor.
-	(SrcPref::_pick): Just set _new, not prefs.
-	
-	* library/srcpref.ith: Add private variable _new and
-	private method cancel. Rename others with leading underscore.
-
-2001-10-16  Andrew Cagney  <ac131313@redhat.com>
-
-	From 2001-08-29 John Moore <jmoore@redhat.com>:
-	* gdbtk/generic/gdbtk-cmds.c (gdb_disassemble): Replaced
-	parse_and_eval_address() with string_to_core_addr().
-	(gdb_load_disassembly): Same.
-	(gdb_set_mem): Ditto.
-	* gdbtk/generic/gdbtk-stack.c (gdb_block_vars): Ditto.
-	* gdbtk/generic/gdbtk-varobj.c (variable_create): Same.
-
-2001-10-17  Tom Tromey  <tromey@cygnus.com>
-
-	* console.itb (Console::_build_win): Handle bindings which
-	are ";".  Also, completely override underlying Text binding.
-
-2001-10-12  Tom Tromey  <tromey@redhat.com>
-
-	* library/console.itb (Console::_build_win): Bind Control-m and
-	Control-j.
-
-2001-10-12  Daniel Jacobowitz  <drow@mvista.com>
-
-	* generic/gdbtk-cmds.c (gdb_listfuncs): Use ALL_BLOCK_SYMBOLS.
-	* generic/gdbtk-stack.c (gdb_block_vars): Likewise.
-	(gdb_get_blocks): Likewise.
-	(gdb_get_vars_command): Likewise.
-
-2001-10-10  Ian Roxborough  <irox@redhat.com>
-
-	* library/gdbtoolbar.itcl (GDBToolBar::add): Add option
-	for "custom" type. 
-	(GDBToolBar::toolbar_add_custom): new method.
-
-2001-10-06  Tom Tromey  <tromey@redhat.com>
-
-	* library/session.tcl (SESSION_recreate_bps): Use
-	gdb_run_readline_command_no_output to recreate breakpoints.
-	* library/interface.tcl (gdb_run_readline_command): Set
-	readlineShowUser element of gdbtk_state.
-	(gdb_run_readline_command_no_output): New proc.
-	(initialize_gdbtk): Initialize readlineShowUser element.
-	(gdbtk_tcl_readline_begin): Use readlineShowUser element.
-	(gdbtk_tcl_readline): Likewise.
-
-2001-10-05  Keith Seitz  <keiths@redhat.com>
-
-	* generic/gdbtk-bp.c (get_breakpoint_commands): New function.
-	(gdb_get_breakpoint_info): Use gdb_breakpoint_commands to
-	assemble breakpoint commands information.
-
-2001-10-02  Tom Tromey  <tromey@redhat.com>
-
-	* library/tclIndex: Updated.
-	* library/prefs.tcl (pref_set_defaults): Define gdb/editor
-	preference.
-	* library/srcpref.itb (SrcPref::constructor): Save gdb/editor
-	preference.
-	(SrcPref::build_win): Added external editor control.
-	* library/srctextwin.itb (SrcTextWin::do_source_popup): Always
-	enable external editor.  Use `code' instead of `list'.
-	* library/srcwin.itb (SrcWin::edit): Use Editor::edit.
-	* library/editor.tcl: New file.
-	* generic/gdbtk.c (enable_external_editor): Removed.
-	(external_editor_command): Default to NULL.
-	(gdbtk_init): Don't set enable_external_editor.  Free external
-	editor command when finished with it.
-
-2001-09-28  Tom Tromey  <tromey@redhat.com>
-
-	* library/console.itb (Console::_operate_and_get_next): New method.
-	(Console::_setprompt): Insert next history element if requested.
-	(Console::_build_win): Bind C-o to _operate_and_get_next.
-	* library/console.ith (_operate_and_get_next): Declare.
-	(_pendingHistElement): New variable.
-
-2001-09-27  Elena Zannoni  <ezannoni@redhat.com>
-
-	* library/targetselection.itb (build_win, default_port): Handle
-        hpux 11.00.
-
-2001-09-27  Keith Seitz  <keiths@redhat.com>
-
-        * library/prefs.tcl (escape_value): Update to work
-        with Tcl's new and old syntax.
-
-2001-09-19  Keith Seitz  <keiths@redhat.com>
-
-	* library/main.tcl: Append iwidgets library path, if needed.
-	* generic/gdbtk.c (gdbtk_init): Add TCLLIBPATH to iwidgets
-	package index.
-	Define IWIDGETS_LIBRARY in interpreter so that we can add
-	this path to the auto_path at the right time later.
-
-2001-09-10  Ian Roxborough <irox@redhat.com>
-
-	* generic/gdbtk.c (gdbtk_init): Set IWIDGETS_LIBRARY if
-	Insight is launched from within the build directory.
-	* library/util.tcl (find_iwidgets_library): Removed.
-	* library/main.tcl: Don't call find_iwidgets_library, do a 
-	package require instead.
-
-2001-08-28  Keith Seitz  <keiths@redhat.com>
-
-	* library/bpwin.itb (bp_select): Use standard preferences
-	for selection fg & bg, not tixOption database.
-
-	* process.itb, tracedlg.tcl: Remove all traces of those
-	three evil little letters, "t", "i", "x".
-
-2001-08-28  Keith Seitz  <keiths@redhat.com>
-
-	* library/tracedlg.tcl (build_win): Use libgui's
-	Labelledframe instead of tixLabelFrame.
-	Use iwidgets::scrolledlistbox instead of tixScrolledListbox.
-	(edit): Check if there is a selection in the listbox
-	before proceeding.
-	Escape method callbacks before passing to ActionDlg.
-
-	* library/actiondlg.tcl (constructor): Use "gdb_reginfo"
-
-2001-08-28  Keith Seitz  <keiths@redhat.com>
-
-	* library/tdump.tcl (class TdumpWin): Inherit from GDBWin
-	and ManagedWin.
-	(constructor): Remove old itcl2 handling code and name the
-	window.
-	(build_win): Use iwidgets::scrolledtext instead of
-	tixScrolledText.
-	(twin): Remove unused variable. Use itk_component(stext)
-	instead.
-	(maxwidth): Remove unused variable.
-	(destructor): Remove unused method.
-	(config): Ditto.
-
-2001-08-28  Keith Seitz  <keiths@redhat.com>
-
-	* library/srcpref.itb (build_win): Use iwidgets::spinint
-	instead of tixControl.
-
-2001-08-28  Keith Seitz  <keiths@redhat.com>
-
-	* library/process.ith (top): Remove unused protected variable.
-	Use GDBWin::_top instead.
-	(lb): Remove unused variable.
-	(change_context): Remove parameter. It's not needed.
-	* library/process.itb (constructor): Don't set the variable
-	"top". It isn't needed. GDBWin has this information.
-	(buildwin): Get rid of tixScrolledListbox. Use
-	iwidgets::scrolledlistbox instead.
-	Loose the balloon help. It annoys more than helps.
-	(update): Use new scrolledlistbox component.
-	Split the list of threads BEFORE doing llength. Someone
-	shoot me if this has to be fixed one more time...
-	(change_context): Update definition and usage.
-	(cursor): Use GDBWin::_top instead of our own private copy.
-
-2001-08-28  Keith Seitz  <keiths@redhat.com>
-
-	* generic/gdbtk-cmds.c (gdb_disassemble_driver): We should be
-	looking for "thread", not "threads" to determine if we have
-	a multi-threaded child process.
-
-2001-08-28  Keith Seitz  <keiths@redhat.com>
-
-	* library/bpwin.itb (build_win): Get rid of tixScrolledWindow
-	and use iwidgets::scrolledframe until something better comes
-	along.
-
-2001-08-23  Tom Tromey  <tromey@redhat.com>
-
-	* library/srcwin.itb (SrcWin::fillFuncCB): Sort function names.
-
-2001-08-23  Martin M. Hunt  <hunt@redhat.com>
-
-	* library/targetselection.itb: Added PMON and DDB targets.
-
-2001-08-22  Tom Tromey  <tromey@redhat.com>
-
-	* library/prefs.tcl (pref_read): Version number appears in
-	comment.
-
-2001-08-21  Keith Seitz  <keiths@redhat.com>
-
-	* generic/gdbtk.c (gdbtk_init): Gdb just fixed this. No
-	need for the workaround I just checked in anymore.
-
-2001-08-21  Keith Seitz  <keiths@redhat.com>
-
-	* generic/gdbtk.c (gdbtk_init): Reinitialize disassemle info's
-	stream parameter: we just deleted the one it saved when we
-	re-routed gdb_stdout to our own gdb_stdout.
-
-2001-08-20  Keith Seitz  <keiths@redhat.com>
-
-	* library/stackwin.itb (build_win): Use iwidget's scrolled listbox
-	instead of tix scrolled list box.
-	(update): Update to use iwidget's scrolled list box.
-	(change_frame): Ditto.
-	Remove parameters.
-	* library/stackwin.ith (change_frame): Remove all parameters.
-
-2001-08-20  Keith Seitz  <keiths@redhat.com>
-
-	* generic/gdbtk-cmds.c (gdb_load_disassembly): Save the original
-	address from parse_and_eval_address: if find_pc_partial_function
-	errors, we will lose our original address.
-	If find_pc_partial_function does error, print out both
-	the address we thought we were disassembling at AND the address
-	we actually did disassemble at. This should help elide address-
-	to-pointer and pointer-to-address problems.
-	* library/srctextwin.itb (FillAssembly): When gdb_load_disassembly
-	fails, use its error message instead of the cooked "Unable to
-	Read insturctions..." message.
-	(UnLoadFromCache): If oldpane is empty, don't try show it,
-	don't try to set our view to it, don't do anything but
-	erase the given pane.
-
-2001-08-17  Keith Seitz  <keiths@redhat.com>
-
-	* generic/gdbtk-varobj.c (variable_obj_command): Pass pointer
-	to varobj* when calling variable_update (API changed).
-	(variable_create): Don't pass varobj* to install_variable. It's
-	not used.
-	(variable_children): Likewise.
-	(variable_update): Change parameters to accept pointer to
-	varobj*. Matches API change in varobj_update.
-	(install_variable): Remove unused "var" parameter.
-
-2001-08-16  Keith Seitz  <keiths@redhat.com>
-
-	* generic/gdbtk.c (gdbtk_init): Revert change from earlier.
-	It is insufficient. We must get the absolute pathname
-	from autoconf.
-	Don't bother setting TCL_LIBRARY: it must be set already
-	in order for us to execute a script.
-
-2001-08-16  Keith Seitz  <keiths@redhat.com>
-
-	* library/globalpref.ith (_change_font, _change_size): New
-	private methods.
-	(_size): New private variable.
-	(font_changed, wfont_changed): Removed.
-	* library/globalpref.itb (make_font_item): Change combobox
-	callback to use _change_font.
-	Replace tixControl with iwidgets::spinint.
-	(font_changed, wfont_changed): Removed.
-	(_change_font, _change_size): New private methods.
-	* tclIndex: Regenerate.
-
-2001-08-16  Keith Seitz  <keiths@redhat.com>
-
-	* generic/gdbtk.c (gdbtk_init): Make sure we're working with
-	absolute pathnames in the *_LIBRAY variables.
-
-2001-08-16  Keith Seitz  <keiths@redhat.com>
-
-	From Ian Roxborough  <irox@redhat.com>
-	* generic/gdbtk-hooks.c (x_event): Deal with Tcl API insanity
-	for Tcl_ObjGetVar2 or Tcl_GetObjVar2.
-	(gdbtk_trace_find): Likewise for Tcl_GlobalEvalObj
-	or Tcl_EvalObj (TCL_EVAL_GLOBAL).
-
-2001-08-15  Keith Seitz  <keiths@redhat.com>
-
-	* generic/gdbtk.c (gdbtk_init): Don't assume a particular
-	layout for the source directory, let the Makefile tell us
-	where the real source directory is.
-	When compiling under Cygwin, convert the (posix) path to a
-	win32 path, which is what tcl really wants.
-
-2001-08-15  Ian Roxborough  <irox@redhat.com>
-
-        * generic/gdbtk.c (gdbtk_init): If Insight isn't
-        executed from inside a directory called "bin",
-        assume that we are being running from the build
-        directory and set the *_LIBRARY variables to point
-        to (hopefully) the correct source directory.
-
-2001-08-13  Keith Seitz  <keiths@redhat.com>
-
-	* library/regwin.ith: Rewrite.
-	* library/regwin.itb: Rewrite.
-	* library/tclIndex: Regenerate.
-
-2001-08-13  Keith Seitz  <keiths@redhat.com>
-
-	* generic/gdbtk-register.c (gdb_register_info): New function.
-	Consolidates all register handling.
-	(get_register_size): New function.
-	(gdb_changed_register_list, gdb_fetch_registers,
-	gdb_regnames): Deprecate.
-	(setup_architecture_data): Free old register cache
-	when necessary.
-
-2001-08-13  Keith Seitz  <keiths@redhat.com>
-
-	* generic/gdbtk-hooks.c (gdbtk_add_hooks): Register
-	architecture_changed event handler.
-	(gdbtk_architecture_changed): New function.
-	* library/gdbevent.ith (class ArchChangdEvent): New event.
-	* library/ehandler.ith (arch_changed): New method. Handler
-	for ArchChangedEvents.
-	* library/interface.tcl (gdbtk_tcl_architecture_changed): New
-	proc to handle architecture change events.
-
-2001-08-09  Keith Seitz  <keiths@redhat.com>
-
-	* library/prefs.tcl (pref_set_defaults): Add new font
-	color defaults for highlighting, headers, selecting, and "normal".
-	Get rid of gdb/variable/highlight_fg and gdb/reg/highlight_fg.
-	* library/variables.tcl (build_win): Use gdb/font/highlight_fg
-	and gdb/font/highilght_bg to set highlight style.
-	* library/memwin.itb (build_win): Use header_fg and header_bg.
-
-2001-08-03  Keith Seitz  <keiths@redhat.com>
-
-	* library/srcbar.itcl (_post): New method.
-	(_update_file_menu): New method.
-	(create_file_menu): Move the guts to _update_file_menu.
-	Add a post command to the menu.
-	* library/interface.tcl (gdbtk_tcl_file_changed): Catch the
-	call to run_hooks.
-	(gdbtk_tcl_exec_file_display): Save the new session, too.
-	(set_exe_name): Don't bother saving the session here.
-	(_close_file): Save the session here, too.
-	(gdbtk_clear_file): Catch the call to run_hooks, too.
-	* library/gdbmenubar.itcl (menubar_new_menu): Allow caller
-	to specify optional arguments to be passed to Tk when
-	creating the menu.
-	Tk's "menu add" command returns an empty string. Save the
-	menu's index in the parent instead. This is what all
-	the menu subcommands want.
-
-2001-08-02  Keith Seitz  <keiths@redhat.com>
-
-	* generic/gdbtk-bp.c (gdb_get_breakpoint_info): Update
-	with recent breakpoint structure changes in gdb.
-	(gdb_set_bp_addr): Likewise.
-	(gdb_get_tracepoint_info): Update with recent tracepoint
-	structure changes in gdb.
-
-2001-07-31  Elena Zannoni  <ezannoni@redhat.com>
-
-	* generic/gdbtk-cmds.c: Don't include regcache.h.
-	* generic/gdbtk-register.c: Include regcache.h.
-	
-2001-07-26  Jonathan Larmour  <jlarmour@redhat.com>
-
-	* library/prefs.tcl (pref_set_defaults): Add additional entry
-	points for eCos if main is not present.
-
-2001-07-21  Martin M. Hunt  <hunt@redhat.com>
-
-	* library/interface.tcl (gdbtk_locate_main): Fix function 
-	so that it returns either a null string or a valid location,
-	as documented.
-
-	* library/variables.tcl (build_menu_helper): Set
-	the Format menu option to "disabled" initially.
-
-2001-07-20  Martin M. Hunt  <hunt@redhat.com>
-
-	* library/managedwin.itb: Revert to global to properly
-	initialize geometry with some window managers.
-	* library/managedwin.ith (shutdown): Remove _geometry.
-
-	* library/memwin.itb: Fix syntax to open a new window
-	using the "-force" flag.
-
-	* generic/gdbtk-register.c (gdb_regnames): Fix 'if'
-	statement so count is decremented only if "-numbers"
-	is the first arg.
-
-2001-07-18  Martin M. Hunt  <hunt@redhat.com>
-
-	* library/util.tcl (find_iwidgets_library): Look
-	for iwidgets3* so we don't accidently find iwidgets2.x.
-
-2001-07-16  Nick Duffek  <nsd@redhat.com>
-
-	* library/regwin.itb (RegWin::build_win): Add radio button
-	for unsigned register format.
-	(RegWin::reg_select): Iterate through 8 rather than 7 formats.
-	(RegWin::but3): Add menu option for unsigned register format.
-
-2001-07-13  Keith Seitz  <keiths@redhat.com>
-
-	* library/download.itb (constructor): Use the iwidgets
-	feedback widget instead of tixMeter.
-	Pack all the topmost widgets together -- don't use grid.
-	(update_download): Support the feedback widget.
-	(done): Ditto.
-
-	* library/download.ith (steps): New private variable.
-	(num_steps): New common.
-
-2001-07-12  Keith Seitz  <keiths@redhat.com>
-
-	* library/srcbar.itcl (create_trace_buttons): Fix
-	syntax errors.
-
-	* library/tracedlg.tcl: Update to work with Itcl3.0
-	and ManagedWin.
-
-	* library/actiondlg.tcl: Update to work with Itcl3.0
-	and ManagedWin.
-	(build_win): Use iwidgets scrolled listbox instead
-	of the tix one.
-
-2001-07-05  Keith Seitz  <keiths@redhat.com>
-
-	* library/managedwin.itb (_create): Don't pass "-over"
-	to center_window unless we really are asked to put the
-	window over another!
-
-2001-06-18  Keith Seitz  <keiths@redhat.com>
-
-	* library/managedwin.itb (_create): When creating a
-	window over another, be sure to center on the window,
-	not the object.
-
-2001-06-13  Keith Seitz  <keiths@redhat.com>
-
-	* generic/gdbtk-bp.c (gdbtk_tracepoint_create): Change
-	parameter to int to match breakpoint notifications.
-	(gdbtk_tracepoint_modify): Ditto.
-	(gdbtk_tracepoint_delete): Ditto.
-	(tracepoint_notify): Ditto.
-	* generic/gdbtk-hooks.c (gdbtk_add_hooks): Remove
-	tracepoint hooks and install tracepoint event handlers.
-
-2001-06-11  Tom Tromey  <tromey@redhat.com>
-
-	* library/help/session.html: New file.
-	* library/help/index.html: Added link.
-
-	* library/session.tcl (session_save): Save breakpoints.
-	(SESSION_serialize_bps): New proc.
-	(SESSION_recreate_bps): New proc.
-	(session_load): Recreate breakpoints.
-	* library/util.tcl (bp_exists): Expect user specification in
-	breakpoint info.
-	* library/srctextwin.itb (SrcTextWin::showBPBalloon): Expect user
-	specification in breakpoint info.
-	* library/gdbevent.itb (BreakpointEvent::_init): Initialize
-	_user_specification.
-	(BreakpointEvent::get): Handle user_specification.
-	* library/gdbevent.ith (BreakpointEvent): Added
-	_user_specification field.
-	* library/bpwin.itb (BpWin::bp_store): Expect user specification
-	and use it when saving.
-	(BpWin::bp_type): Expect user specification.
-	* generic/gdbtk-bp.c (BREAKPOINT_IS_WATCHPOINT): New macro.
-	(gdb_get_breakpoint_info): Added `user specification' to result.
-
-2001-06-11  Keith Seitz  <keiths@redhat.com>
-
-	* generic/gdbtk-stack.c (gdb_stack): Return TCL_ERROR if
-	we are unable to get the current frame. get_current_frame
-	may have output an error message.
-
-2001-06-07  Keith Seitz  <keiths@redhat.com>
-
-	* generic/gdbtk-hooks.c (x_event): Remove unused variable "count".
-	(tracepoint_notify): Remove superfluous declaration. This funtion
-	was moved to gdbtk-bp.c.
-
-	* generic/gdbtk-bp.c (gdb_find_bp_at_addr): Remove unused variable
-	"b".
-	(gdb_set_bp): Remove unused variable "cmd".
-	(gdb_set_bp_addr): Remove unused variables "cmd" and "filename".
-
-	* generic/gdbtk.c (gdbtk_init): Remove unused variables
-	"auto_path_name", "auto_path_elem", and "found_main".
-
-2001-06-05  Martin Hunt  <hunt@redhat.com>                                    
-
-	* generic/gdbtk.c (_initialize_gdbtk): Don't close console yet.
-	(gdbtk_init): Wait until after tcl/tk stuff is all initialized
-	to close console (on Windows) and redirect ouput.
-	
-2001-06-05  Martin Hunt  <hunt@redhat.com>
-
-	* library/globalpref.itb(build_win): Don't change directory
-	before building icon combobox.  Add debug lines.
-
-2001-06-04  Keith Seitz  <keiths@redhat.com>
-
-	* library/srcbar.itcl (constructor): Set the toolbar's initial
-	state.
-
-2001-06-04  Keith Seitz  <keiths@redhat.com>
-
-	* library/interface.tcl (gdb_update_hook): Mark as deprecated.
-	(gdbtk_update): Dispatch and UpdateEvent, too.
-	* library/ehandler.ith (update): New event handler.
-	* library/gdbevent.ith (UpdateEvent): New event.
-	* library/gdbevent.itb (UpdateEvent::constructor): New method.
-	(UpdateEvent::get): New method.
-	* library/kod.ith (udpate): Match event handler definition.
-	* library/kod.itb (update): Ditto.
-	(build_win): Pass dummy argument to update method.
-	(top): Ditto.
-	(up): Ditto.
-	(set_variable): Ditto.
-	* library/memwin.ith (update): Match event handler definition.
-	* library/memwin.itb (update): Ditto.
-	(constructor): Remove gdb_update_hook.
-	(destructor): Ditto.
-	* library/process.ith (update): Match event handler definition.
-	* library/process.itb (update): Ditto.
-	(constructor): Remove gdb_update_hook.
-	(destructor): Ditto.
-	(build_win): Pass dummy argument to update method.
-	* library/regwin.ith (update): Match event handler definition.
-	* library/regwin.itb (update): Ditto.
-	(constructor): Remove gdb_update_hook.
-	(destructor): Ditto.
-	(build_win): Pass dummy argument to update method.
-	(but3): Ditto.
-	(unedit): Ditto.
-	* library/stackwin.ith (update): Match event handler definition.
-	* library/stackwin.itb (update): Ditto.
-	(constructor): Remove gdb_update_hook.
-	(destructor): Ditto.
-	(build_win): Pass dummy argument to update method.
-	* library/tdump.tcl (update): Match event handler definition.
-	(constructor): Remove gdb_update_hook.
-	(destructor): Ditto.
-	(build_win): Pass dummy argument to update method.
-	* library/variables.tcl (update): Match event handler definition.
-	(build_win): Pass dummy argument to update method.
-	* library/locals.tcl (update): Match event handler definition.
-	(constructor): Pass dummy argument to update method.
-	* library/watch.tcl (update): Match event handler definition.
-	Pass dummy argument to VariableWin::update.
-	(add): Pass dummy argument to update method.
-	* library/srcwin.ith (update): New method.
-	(update_hook_init): Remove.
-	* library/srcwin.itb (update): New method.
-	(constructor): Remove gdb_update_hook.
-	(destructor): Ditto.
-	* tclIndex: Regenerate.
-
-2001-06-01  Keith Seitz  <keiths@redhat.com>
-
-	* library/console.itb (constructor): Pass dummy argument
-	to idle method.
-	(destructor): Ditto.
-
-2001-05-31  Keith Seitz  <keiths@redhat.com>
-
-	* library/interface.tcl (gdbtk_idle): Run hooks, too,
-	until they're all gone.
-
-2001-05-31  Keith Seitz  <keiths@redhat.com>
-
-	* library/interface.tcl (gdb_idle_hook): Mark as deprecated.
-	(gdbtk_idle): Dispatch an IdleEvent. gdb_idle_hook is gone.
-	* library/ehandler.ith (idle): New event handler.
-	* library/gdbevent.ith (IdleEvent): New event.
-	* library/console.ith (idle): Match event handler definition.
-	* library/console.itb (idle): Ditto.
-	(constructor): Remove gdb_idle_hook.
-	(destructor): Ditto.
-	* library/kod.ith (idle): Match event handler definition.
-	* library/kod.itb (idle): Ditto.
-	(constructor): Remove gdb_idle_hook.
-	(destructor): Ditto.
-	* library/memwin.ith (idle): Match event handler definition.
-	* library/memwin.itb (idle): Ditto.
-	(constructor): Remove gdb_idle_hook.
-	(destructor): Ditto.
-	* library/pluginwin.itcl (stopped): Rename to "idle" and
-	match event handler definition.
-	Fix misleading comments.
-	* library/process.ith (idle): Match event handler definition.
-	* library/process.itb (idle): Ditto.
-	(constructor): Remove gdb_idle_hook.
-	(destructor): Ditto.
-	* library/regwin.ith (idle): Match event handler definition.
-	* library/regwin.itb (idle): Ditto.
-	(constructor): Remove gdb_idle_hook.
-	(destructor): Ditto.
-	* library/srcbar.itcl (idle): New method.
-	(constructor): Remove gdb_idle_hook.
-	(destructor): Ditto.
-	* library/srcwin.ith (idle): Match event handler definition.
-	* library/srcwin.itb (idle): Ditto.
-	(constructor): Remove gdb_idle_hook.
-	(destructor): Ditto.
-	* library/stackwin.ith (idle): Match event handler definition.
-	* library/stackwin.itb (idle): Ditto.
-	(constructor): Remove gdb_idle_hook.
-	(destructor): Ditto.
-	* library/variables.tcl (idle): Match event handler definition.
-	(constructor): Remove gdb_idle_hook.
-	(destructor): Ditto.
-	* library/plugins/rhabout/rhabout.itcl (stopped): Rename
-	to "idle" and match new event handler definition.
-	* library/tclIndex: Regenerated.
-
-2001-05-31  Keith Seitz  <keiths@redhat.com>
-
-	* library/interface.tcl (gdb_busy_hook): Deprecate.
-	(gdbtk_busy): Create and dispatch a BusyEvent instead
-	of running hooks.
-	* library/ehandler.ith (busy): New event handler.
-	* library/gdbevent.ith (BusyEvent): New event class.
-	* library/console.ith: Inherit from GDBEventHandler.
-	(busy): Match event handler definition.
-	* library/console.itb (busy): Ditto.
-	(constructor): Remove gdb_busy_event.
-	(destructor): Ditto.
-	* library/kod.ith (busy): Match event handler definition.
-	* library/kod.itb (busy): Ditto.
-	(constructor): Remove gdb_busy_hook.
-	(destructor): Ditto.
-	* library/memwin.ith (busy): Match event handler definition.
-	* library/memwin.itb (busy): Ditto.
-	(constructor): Remove gdb_busy_hook.
-	(destructor): Ditto.
-	* library/pluginwin.itcl (running): Rename to "busy" and
-	match event handler definition.
-	(consturctor): Remove gdb_busy_hook.
-	(destructor): Ditto.
-	* library/process.ith (busy): Match event handler definition.
-	* library/process.itb (busy): Ditto.
-	(constructor): Remove gdb_busy_hook.
-	(destructor): Ditto.
-	* library/regwin.ith (busy): Match event handler definition.
-	* library/regwin.itb (busy): Ditto.
-	(constructor): Remove gdb_busy_hook.
-	(destructor): Ditto.
-	* library/srcbar.itcl (constructor): Remove gdb_busy_hook.
-	(destructor): Ditto.
-	(busy): New method.
-	* library/srcwin.ith (busy): Match event handler definition.
-	* library/srcwin.itb (busy): Ditto.
-	Only do the "busy" stuff if do_updates is set.
-	(toggle_updates): Remove gdb_busy_hook.
-	(constructor): Ditto.
-	(destructor): Ditto.
-	* library/stackwin.ith (busy): Match event handler definition.
-	* library/stackwin.itb (busy): Ditto.
-	(constructor): Remove gdb_busy_hook.
-	(destructor): Ditto.
-	* library/variables.tcl (constructor): Ditto.
-	(destructor): Ditto.
-	(disable_ui): Rename to "busy" and match event handler
-	definition.
-	* library/plugins/rhabout/rhabout.itcl (running): Rename
-	to "busy" and match new event handler definition.
-	* library/tclIndex: Regenerated.
-
-2001-05-25  Keith Seitz  <keiths@cygnus.com>
-
-	* generic/gdbtk-cmds.c (bin2hex): New function.
-	(fromhex): New function.
-	(gdb_set_mem): New function.
-	(Gdbtk_Init): Add new command, "gdb_set_mem".
-	* library/memwin.itb (edit): Use "gdb_set_mem" to set
-	memory, not some gdb_cmd contrivance.
-	When sending data to gdb_set_mem, make sure that it
-	is properly zero-padded.
-
-2001-05-22  Keith Seitz  <keiths@cygnus.com>
-
-	* memwin.ith (error_dialog): Declare public method.
-	* memwin.itb (error_dialog): Define.
-	(edit): When attempting to set memory, post an error dialog
-	if gdb told us an error occurred while writing the memory.
-
-2001-05-22  Keith Seitz  <keiths@cygnus.com>
-
-	* library/interface.tcl (gdbtk_tcl_file_changed): Handle
-	the case of empty-string files, sent by gdb when the
-	user requests to reset the file.
-	(_close_file): New proc to deal with closing an exe.
-	* library/srcbar.itcl (create_file_menu): Add "Close" menu
-	option.
-	(create_view_menu): Change key binding for Watch Window to
-	Ctrl+T to accomodate "Close" going to Ctrl+W.
-	* library/srctextwin.itb (config_win): Update key binding
-	for Watch Window.
-	Add key binding for Close.
-	(do_key): Add "close".
-	(_clear_cache): Finally implement. I think this works now.
-
-2001-05-22  Keith Seitz  <keiths@cygnus.com>
-
-	* library/variables.tcl (postMenu): Add mysterious workaround
-	for popup menu bug in Tk for windows.
-	Highlight the selection, too.
-
-2001-05-21  Keith Seitz  <keiths@cygnus.com>
-
-	* library/managedwin.itb (_create): Check the geometry of
-	any window we create. Don't create a window that is
-	bigger than the screen.
-
-2001-05-18  Keith Seitz  <keiths@cygnus.com>
-
-	* library/managedwin.ith (_geometry): Use a protected variable
-	instead of a global from ManagedWin::reveal.
-	(open): Make arg list reflect managedwin.itb.
-	* library/managedwin.itb (window_name): Use class variable
-	_top instead of recomputing the toplevel every time.
-	(reveal): Ditto.
-	Use class variable "_geometry" instead of global variable.
-	(shutdown): Do not save ModalDialogs.
-	(_create): If centering the new window, use libgui's
-	center_window to do it.
-
-2001-05-18  Keith Seitz  <keiths@cygnus.com>
-
-	* generic/gdbtk-hooks.c (gdbtk_wait): Change integer pid
-	argument to match gdb's new "ptid_t" pids.
-
-2001-05-14  Keith Seitz  <keiths@cygnus.com>
-
-	* library/interface.tcl (gdbtk_quit_check): Don't save sessions
-	here. It doesn't work for the Console Window.
-	(gdbtk_cleanup): Save session information here.
-	(gdbtk_tcl_exec_file_display): When files are loaded,
-	get the full pathname to the exe.
-
-2001-05-11  Tom Tromey  <tromey@redhat.com>
-
-	* library/prefs.tcl (pref_save): Fix bug when key in gdb space has
-	extra `/' in it.
-
-2001-05-11  Kevin Buettner  <kevinb@redhat.com>
-
-	* generic/gdbtk-bp.c (set_raw_breakpoint): Revise declaration
-	to match the recently changed declaration in breakpoint.c. 
-	Update all callers.
-
-2001-05-11  Keith Seitz  <keiths@cygnus.com>
-
-	* generic/gdbtk-bp.c (gdbtk_create_breakpoint): Safe guard
-	against "invalid" (internal) breakpoint numbers.
-	(gdbtk_modify_breakpoint): Ditto.
-	(gdbtk_delete_breakpoint): Ditto.
-
-2001-05-10  Keith Seitz  <keiths@cygnus.com>
-
-	* generic/gdbtk-bp.c (gdb_set_bp): Generate a breakpoint event
-	when we create a breakpoint. The hook is no longer used.
-	(gdb_set_bp_addr): Ditto.
-
-2001-05-10  Keith Seitz  <keiths@cygnus.com>
-
-	* generic/gdbtk-bp.c (breakpoint_list, breakpoint_list_size): New
-	variables. Gdb is forcing us to maintain our own breakpoint
-	database.
-	(Gdbtk_Breakpoint_Init): Initialize our breakpoint database.
-	(gdb_find_bp_at_addr): Use our breakpoint database.
-	(gdb_find_bp_at_line): Ditto.
-	(gdb_get_breakpoint_list): Ditto.
-	(gdb_get_breakpoint_info): Remove deleted breakpoint hack.
-	(gdbtk_create_breakpoint): Moved here from gdbtk-hooks.c.
-	Add breakpoint to our breakpoint database.
-	(gdbtk_modify_breakpoint): Ditto the move.
-	(gdbtk_delete_breakpoint): Ditto the move.
-	Remove breakpoint from our database.
-	(gdb_get_tracepoint_info): Remove delete tracepoint hack.
-	It's not needed for tracepoints: they were implemented properly.
-	(gdbtk_create_tracepoint): Moved here from gdbtk-hooks.c.
-	(gdbtk_modify_tracepoint): Ditto.
-	(gdbtk_delete_tracepoint): Ditto.
-	* generic/gdbtk-hooks.c: Include "gdb-events.h".
-	(gdbtk_create_breakpoint): Moved to gdbtk-bp.c
-	(gdbtk_modify_breakpoint): Ditto.
-	(gdbtk_delete_breakpoint): Ditto.
-	(breakpoint_notify): Ditto.
-	(gdbtk_create_tracepoint): Ditto.
-	(gdbtk_modify_tracepoint): Ditto.
-	(gdbtk_delete_tracepoint): Ditto.
-	(tracepoint_notify): Ditto.
-	(report_error): No longer static.
-	(gdbtk_add_hooks): Create our own event handler
-	vector and register breakpoint_create, breakpoint_modify,
-	and breakpoint_delete handlers in gdbtk-bp.c.
-
-2001-05-10  Keith Seitz  <keiths@cygnus.com>
-
-	* generic/gdbtk-cmds.c: Put on diet. All breakpoint-,
-	tracepoint-, register-, and stack-related functions moved
-	into separate files.
-	(call_wrapper): Renamed to "gdbtk_call_wrapper" and export.
-	Update all callers.
-	* generic/gdbtk.h: Move all breakpoint-related stuff into
-	gdbtk-bp.c.
-	Remove declaration for "call_wrapper". Now in gdbtk-cmds.h
-	(and called "gdbtk_call_wrapper").
-	* generic/gdbtk-varobj.c: Include "gdbtk-cmds.h".
-	* generic/gdbtk-cmds.h: New file.
-	* generic/gdbtk-bp.c: New file.
-	* generic/gdbtk-register.c: New file.
-	* generic/gdbtk-stack.c: New file.
-
-2001-05-09  Keith Seitz  <keiths@cygnus.com>
-
-	* library/interface.tcl (gdb_quit_hook): Remove. It's unused.
-	(gdbtk_quit): Do no shutdown window manager and save
-	preferences here.
-	(gdbtk_cleanup): This is the proper place to do those
-	things.
-
-2001-05-07  Keith Seitz  <keiths@cygnus.com>
-
-	* library/globalpref.itb (build_win): Preserve the
-	current working directory.
-
-2001-05-06  Kevin Buettner  <kevinb@redhat.com>
-
-	* generic/gdbtk-cmds.c (gdb_target_has_execution_command)
-	(get_clear_file): Use ptid_equal() for comparing ptid values. 
-	Use ``null_ptid'' instead of 0 in comparisons against
-	``inferior_ptid''.
-
-	From Phil Edwards <pedwards@disaster.jaj.com>:
-	* generic/gdbtk-cmds.c (gdb_target_has_execution_command)
-	(get_clear_file): Rename ``inferior_pid'' to ``inferior_ptid''.
-
-2001-05-01  Keith Seitz  <keiths@cygnus.com>
-
-        * gdbtk.c (gdbtk_init): Include the command "warp_pointer"
-        for all platforms. Used for testing ONLY.
-
-        * util.tcl (gdbtk_read_defs): If there is an error reading
-        the testsuite definition file, print the error message to
-        stderr, not stdout. This will allow tcl to know that an error
-        has occurred.
-        (find_iwidgets_library): Make it work for running testsuites
-        from installed directory.
-
-        * main.tcl: If we failed to find iwidgets, check if the
-        testsuite is running. If it is running, do not pop up
-        a dialog box: just print out the error and exit.
-        Initialize _test(verbose) for the testsuite.
-
-2001-04-23  Keith Seitz  <keiths@cygnus.com>
-
-	* generic/gdbtk-cmds.c (gdb_get_breakpoint_info): If unable
-	to find the requested breakpoint for lookup, check if
-	it is about to be deleted and return information about
-	that breakpoint.
-	(gdb_get_tracepoint_info): Ditto for tracepoints.
-	* generic/gdbtk-hooks.c (gdbtk_deleted_bp): New global.
-	(gdbtk_delete_breakpoint): Remember the deleted breakpoint
-	for gdb_get_breakpoint_info, in case it is called during
-	the event notification.
-	(gdbtk_delete_tracepoints): Ditto for tracepoints.
-
-	* generic/gdbtk-cmds.c (gdb_entry_point): Return an empty
-	string when there is no active target (i.e., there is no
-	entry point to return yet).
-
-2001-04-20  Keith Seitz  <keiths@cygnus.com>
-
-	* library/srctextwin.ith (handle_set_hook): Rename to set_variable.
-	* library/srctextwin.itb (set_variable): Handle SetVariableEvent.
-	(constructor): Remove gdb_set_hook.
-	(destructor): Ditto.
-	* library/srcbar.itcl: Inherit from GDBEventHandler.
-	(set_hook): Rename to set_variable and handle SetVariableEvent.
-	(constructor): Remove gdb_set_hook.
-	(destructor): Ditto.
-	* library/regwin.ith (handle_set_hook): Renamed to set_variable.
-	* library/regwin.itb (set_variable): Handle SetVariableEvent.
-	(constructor): Remove gdb_set_hook.
-	(destructor): Ditto.
-	* library/kod.ith (set_os): Renamed to "set_variable".
-	* library/kod.itb (set_variable): Handle SetVariableEvent.
-	(constructor): Remove gdb_set_hook.
-	(destructor): Ditto.
-	* library/tclIndex: Regenerated.
-
-2001-04-20  Keith Seitz  <keiths@cygnus.com>
-
-	* library/interface.tcl (gdbtk_tcl_set_variable): New proc.
-	* library/gdbevent.ith (SetVariableEvent): New event.
-	* library/gdbevent.itb (SetVariableEvent::get): Override
-	GDBEvent::get.
-	* library/ehandler.ith (set_variable): New public method.
-	* generic/gdbtk-hooks.c (gdbtk_set_hook): Let inteface function
-	gdbtk_tcl_set_variable do all the work.
-	* tclIndex: Regenerated.
-
-2001-04-19  Keith Seitz  <keiths@cygnus.com>
-
-	* library/gdbevent.ith: New file. Defines new event model.
-	* library/gdbevent.itb: New file. Implements new event
-	model.
-	* library/ehandler.ith: New file. Defines new event model.
-	* library/ehandler.itb: New file. Implements new event
-	model.
-	* library/gdbwin.ith: Inherit from GDBEventHandler.
-	(update): Delete unused method.
-	(_state): Delete unused variable.
-	* library/tclIndex: Regenerated.
-
-	* generic/gdbtk-cmds.c (gdb_set_bp): Use create_breakpoint_hook
-	to notify gui of changes.
-	(gdb_set_bp_addr): Ditto.
-	(gdb_get_breakpoint_info): Update comments to match reality.
-	* generic/gdbtk-hooks.c (breakpoint_notify): Only pass the
-	breakpoint number which generated the event.
-	(tracepoint_notify): Ditto for tracepoints.
-	* library/interface.tcl (gdb_breakpoint_change_hook): Mark
-	as deprecated and comment out definition.
-	(gdbtk_tcl_breakpoint): Use new GDBEvent event "breakpoint"
-	to notify rest of UI about breakpoint event.
-	(gdbtk_tcl_tracepoint): Ditto for "tracepoint" event.
-	* library/bpwin.ith (update): Renamed to "breakpoint".
-	(breakpoint): New public method.
-	(tracepoint): New public method.
-	(bp_add): Take event as argument instead of number.
-	(bp_modify): Ditto.
-	(bp_delete): Ditto.
-	* library/bpwin.itb (constructor): Remove
-	gdb_breakpoint_changed_hook.
-	(destructor): Ditto.
-	(build_win): Insert any existing breakpoints by
-	making BreakpointEvents for them.
-	(breakpoint): Renamed from "update" to handle
-	breakpoint events.
-	Remove code to deal with tracepoints.
-	(tracepoint): New method to handle tracepoint
-	events.
-	(bp_add): Deal with breakpoint events, not breakpoint
-	numbers.
-	(bp_modify): Ditto.
-	(bp_delete): Ditto.
-	* library/srctextwin.ith: Inherit from GDBWin.
-	(breakpoint): New public method.
-	(tracepoint): New public method.
-	* library/srctextwin.itb (constructor): Remove
-	gdb_breakpoint_changed_hook.
-	(destructor): Ditto.
-	(breakpoint): New method to handle breakpoint event.
-	(tracepoint): New method to handle tracepoint event.
-	(do_bp): Handle duplicate breakpoints for asm, too.
-	(remove_bp_at_line): Delete breakpoints by number, not
-	linespec. clear_command removes breakpoints from the
-	breakpoint_chain BEFORE deleting the breakpoint. delete_command
-	does this afterward (so we can call gdb_get_breakpoint_info on
-	an about-to-be-deleted breakpoint).
-
-2001-04-18  Martin M. Hunt  <hunt@redhat.com>
-	
-	* generic/gdbtk.c (gdbtk_init): Initialize uiout.
-
-2001-04-18  Tom Tromey  <tromey@redhat.com>
-
-	* library/interface.tcl (run_executable): Use
-	gdb_set_inferior_args.
-	* library/session.tcl (session_load): Use gdb_set_inferior_args.
-	* generic/gdbtk-cmds.c (Gdbtk_Init): Register
-	gdb_set_inferior_args.
-	(gdb_get_inferior_args): New function.
-
-2001-04-17  Tom Tromey  <tromey@redhat.com>
-
-	* library/session.tcl (session_save): Use gdb_get_inferior_args.
-	* generic/gdbtk-cmds.c (inferior_args): Removed.
-	(Gdbtk_Init): Don't register gdb_inferior_args variable.  Do
-	register gdb_get_inferior_args function.
-	(gdb_get_inferior_args): New function.
-
-2001-04-17  Fernando Nasser  <fnasser@redhat.com>
-
-	* library/variables.tcl (update): Temporary fix to the detection of
-	"type_changed" condition.  Proper fix will require that this condition
-	is properly reported by the underlying code.
-
-2001-04-12  Nicholas Duffek  <nsd@redhat.com>
-
-	* generic/gdbtk-cmds.c (gdb_entry_point): New TCL command.
-	* library/interface.tcl (gdbtk_locate_main): Try the program's
-	entry point if no main function is found.
-
-2001-04-10  Keith Seitz  <keiths@cygnus.com>
-
-	From Tom Tromey (tromey@redhat.com):
-	* library/managedwin.itb (reveal): We actually do want to force
-	the focus for Windows.
-
-2001-04-09  Martin M. Hunt  <hunt@redhat.com>
-
-	* library/managedwin.itb (ManagedWin::reveal): After
-	deiconifying window for the first time, set its geometry
-	again, if the platform is unix. This fixes a problem with kde.
-	(ManagedWin::_create): Set a variable with the initial
-	geometry.
-
-2001-04-04  Christopher Faylor  <cgf@redhat.com>
-
-	* generic/gdbtk.c: Add __CYGWIN__ conditional to WIN32 test.
-
-2001-04-04  Martin M. Hunt  <hunt@redhat.com>
-
-	* generic/gdbtk-hooks.c (gdbtk_fileopen): New function.
-	Initialize ui_file stuff for gdbtk.
-	(gdbtk_fputs): Don't print if gdbtk_disable_fputs. Send
-	stdlog and stdtarg to their handler functions.
-
-	* generic/gdbtk.c (Gdbtk_Init): Don't set gdb_stdlog 
-	and gdb_stdtarg to gdb_stdout, 
-	(gdbtk_init): Unset gdbtk_disable_fputs
-	when ready to accept output from gdb. Remove references to
-	fputs_unfiltered_hook.
-	
-	* generic/gdbtk.h: Declare new flag gdbtk_disable_fputs.
-
-	* generic/gdbtk-cmds.c (gdb_restore_fputs): Instead of setting
-	fputs_unfiltered_hook, set the new flag gdbtk_disable_fputs.
-
-	* library/prefs.tcl (pref_set_defaults): Add defaults
-	for log_fg and target_fg.
-
-	* library/interface.tcl (gdbtk_tcl_fputs_error): Use
-	err_tag.
-	(gdbtk_tcl_fputs_log): New function. Write log messages
-	to console.
-	(gdbtk_tcl_fputs_target): New function.	Write target
-	IO to console.
-
-	* library/console.ith (einsert): Add tag parameter.
-	
-	* library/console.itb (_build_win): Add new tags for log 
-	and target IO.
-	(einsert): Add tag parameter.
-
-2001-04-02  Martin M. Hunt  <hunt@redhat.com>
-
-	* generic/gdbtk-cmds.c (gdb_loadfile): Adjust size of text_argv
-	array to prevent writing out of range. Remove unused variables.
-	Fix formatting.
-	(gdb_get_tracepoint_info): Remove unused variable "fname".
-	(gdb_load_disassembly): Remove unused variable "widget".
-	(gdb_loc): Remove unused variable "sym".
-	(gdb_set_bp_addr): Remove unused variable "line".
-	(gdb_get_breakpoint_info): Remove unused variable "sym".
-	(get_frame_name): Remove unused variable "name".
-
-2001-03-29  Fernando Nasser  <fnasser@redhat.com>
-
-	* library/variables.tcl (update): Cope with varobj type changes.
-
-2001-03-29  Fernando Nasser  <fnasser@redhat.com>
-
-	* library/variables.tcl (destructor): Remove file_changed_hook hook.
-
-2001-03-29  Fernando Nasser  <fnasser@redhat.com>
-
-	* generic/gdbtk-varobj.c (variable_obj_command): Do not cache varobj
-	handles as they may change -- use varobj_get_handle() instead.
-
-2001-03-15  Martin Hunt  <hunt@redhat.com>
-	* library/browserwin.itb: Change all references to freeze_me,
-	thaw_me and Top to _freeze_me, _thaw_me, and _top to match 
-	changes to managedwin.
-	
-	* library/kod.itb: Ditto.  
-
-2001-03-15  Tom Tromey  <tromey@redhat.com>
-
-	* library/mempref.itb (MemPref::build_win): Correctly set initial
-	value of combobox.
-	* library/memwin.itb: Added copyright header.
-	(MemWin::constructor): Set defaults from preference database.
-	(MemWin::reconfig): Update preference database.
-	* library/prefs.tcl (pref_save): Save `mem' preferences.
-	(pref_set_defaults): Define default memory preferences.
-
-2001-03-08  Andrew Cagney  <ac131313@redhat.com>
-
-	* generic/gdbtk-cmds.c (map_arg_registers): Use REG_NUM instead of
-	ARCH_REG_NUM.
-
-2001-03-01  Nicholas Duffek  <nsd@redhat.com>
-
-	* README.GDBTK: Minor spelling, grammar, and formatting fixes.
-
-2001-03-01  Keith Seitz  <keiths@cygnus.com>
-
-	* library/managedwin.ith: Move all implementations into
-	managedwin.itb.
-	(public variable nosize): Delete.
-	(freeze_me, thaw_me, make_icon_window): Prepend with
-	underscore to remind people these are not public
-	methods/procs.
-	(protected variable Top, screenwidth, screenheight): Ditto
-	for these variables.
-	(protected common manage_active, mainwindow): Delete.
-	(enable): Delete.
-	(reconfig): Add empty body.
-	* library/managedwin.itb: Move all implementations from
-	header here.
-	Update all references to renamed variables/methods/procs.
-	(destructor, restart, shutdown, _open, find) Let
-	Itcl tell us which ManagedWins we have lying around.
-	(enable): Delete.
-	(reconfig): It's empty. Moved empty body to header.
-
-2001-03-01  Nicholas Duffek  <nsd@redhat.com>
-
-	* library/managedwin.itb (ManagedWin::shutdown): Save each
-	managed window's geometry as a preference.
-	* library/managedwin.ith (ManagedWin::destructor): Don't save
-	managed windows' geometries as preferences.
-
-2001-03-01  Nicholas Duffek  <nsd@redhat.com>
-
-	* library/srctextwin.itb (SrcTextWin::location): Clear previous
-	pane's cursor after switching panes.
-
-2001-03-01  Nicholas Duffek  <nsd@redhat.com>
-
-	* library/srctextwin.itb (config_win): Give focus to $win.
-
-Tue Feb 27 23:56:23 2001  Andrew Cagney  <ac131313@redhat.com>
-
-	* generic/gdbtk-cmds.c: Include recently created "regcache.h"
-
-2001-02-27  Keith Seitz  <kseitz@nwlink.com>
-
-	* generic/gdbtk-cmds.c (gdb_fetch_registers): Mark
-	the result as generating a list only if it really does
-	generate a list.
-
-2001-02-21  Fernando Nasser  <fnasser@redhat.com>
-
-	* TODO: New file.  Initial version of the TODO file, as posted to the
-	insight list circa October 2000.
-
-2001-02-14  Fernando Nasser  <fnasser@redhat.com>
-
-	From 2001-02-09  Martin Hunt  <hunt@redhat.com>
-	* generic/gdbtk-cmds.c (gdb_load_disassembly): In mixed
-	mode, source lines should be tagged with source_tag2.
-
-2001-02-08  Fernando Nasser  <fnasser@redhat.com>
-
-	From 2001-02-06  Martin Hunt  <hunt@redhat.com>
-	* library/debugwin.itb: Change window name to "Insight Debug"
-	* library/embeddedwin.ith: Fix debug messages.
-	* library/locals.tcl: Ditto.
-	* library/watch.tcl (postMenu): Ditto.
-	* library/variables.tcl: Ditto.
-	* library/interface.tcl: Ditto.
-	* library/regwin.itb: Ditto.
-	* library/gdbwin.ith: Ditto.
-	* library/srcbar.itcl: Ditto.
-
-2001-02-06  Fernando Nasser  <fnasser@redhat.com>
-
-	Originally from Martin Hunt <hunt@redhat.com>, with modifications
-	* library/srcwin.itb (_name): Check for errors when invoking
-	gdb_find_file.
-	* library/srctextwin.itb (_mtime_changed, location): Ditto.
-	* generic/gdbtk-cmds.c (gdb_find_file_command): Better error checking.
-	(full_lookup_symtab): Fix misleading comment.
-
-2001-02-04  Fernando Nasser  <fnasser@redhat.com>
-
-	* library/plugins/plugins.tcl: Fix typos and remove "-transient"
-	parameter from open command.
-	* library/plugins/HOW-TO: New file.  Describes how to add a plug-in
-	window to Insight.
-
-2001-02-01  Fernando Nasser  <fnasser@redhat.com>
-
-	* library/images/insight.gif: New splash screen/about graphics.
-	* library/images2/insight.gif: New splash screen/about graphics.
-	* library/about.tcl: Update copyright, window title and change colors
-	to match new splash screen/about images.
-
-2001-02-01  Fernando Nasser  <fnasser@redhat.com>
-
-	* library/gdbtoolbar.itcl (add): New method.  Emulate the style of the
-	toolbar iwidget commands.
-	(toolbar_show): Old name.
-        (show): New name.
-	(toolbar_create_button): Old name.
-        (create): New name.
-	(toolbar_configure_button): Old name.
-        (itemconfigure): New name.
-        (toolbar_bind_button): Old name.
-        (itembind): New name.
-        (toolbar_set_button_balloon): Old name.
-        (itemballoon): New name.
-        (toolbar_add_button): Make private.
-        (toolbar_add_label): Ditto.
-        (toolbar_add_button_separator): Ditto.
-	(toolbar_remove_button): Ditto.
-	(tollbar_insert_button): Ditto.
-	* library/srcbar.itcl: Adjust to the above syntax.
-	* library/plugins/rhabout/rhabout.itcl: Ditto.
-
-2001-02-01  Fernando Nasser  <fnasser@redhat.com>
-
-	* library/gdbmenubar.itcl (constructor): Remove unused code.
-	(add): New method.  Emulate the style of the menubar iwidget commands.
-	(menubar_show): Old name.
-	(show): New name.
-	(menubar_menu_exists): Old name.
-	(exists): New name.
-	(menubar_clear_menu): Old name.
-	(clear): New name.
-	(menubar_delete_menu): Old name.
-        (delete): New name.
-	(menubar_new_menu): Make private.  Does not return anything.
-	(menubar_add_menu_command): Make private.
-	(menubar_add_menu_separator): Ditto.
-	(menubar_change_menu_state): Ditto.
-	* library/srcbar.itcl: Adjust to the above syntax.
-	* library/plugins/plugins.tcl: Ditto.
-	* library/plugins/rhabout/rhabout.itcl: Ditto.
-
-2001-02-01  Fernando Nasser  <fnasser@redhat.com>
-
-	* library/pluginwin.itcl (contrucdtor, destructor): Use "code" to
-	specify callbacks.
-	(running, stopped, no_inferior): Make it a protected method.
-	(childsite): Explicitly mark as a public method.
-	* library/plugins/rhabout/rhabout.itcl (constructor): Add a label
-	widget to show status messages.
-	(running, stopped): Overload versions of the base class; display
-	status messages as an example.
-
-2001-01-31  Fernando Nasser  <fnasser@redhat.com>
-
-	* library/pluginwin.itcl: New file.  Implements the PluginWindow
-	class that provides some basic functionality for plug-ins.
-	* library/plugins/rhabout/rhabout.itcl: Inherit from the new
-	PluginWindow class.  Remove code dependent on ModalDlg.
-	(constructor): Creates menus and a toolbar to show how these
-	PluginWindow components are used.
-	* library/tclIndex: Regenerate.
-
-2001-01-31  Fernando Nasser  <fnasser@redhat.com>
-
-	* library/plugins/rhabout.tcl: Add load for optional sample C command 
-	procedure.
-	* library/plugins/rhabout/rhabout.itcl (constructor): Try calling
-	optional sample C command procedure rhabout_extra_text.
-	* library/plugins/rhabout/rhabout.c: New file. Implement an example
-	plug-in shared library with a sample C command procedure.
-	* library/plugins/rhabout/Makefile: New file. Makefile for the sample
-	shared library above (Linux only).
-
-2001-01-28  Fernando Nasser  <fnasser@redhat.com>
-
-	* library/plugins: New directory.  Sample plug-in directory to help
-	developers of Insight plug-ins.  See README file in that directory.
-	* library/plugins/plugins.tcl: New file. Sample version of a code
-	fragment file which adds entries to the PlugIn menu of the Source
-	Window to activate custom plug-in windows.
-	* library/plugins/pkgIndex.tcl: New file.  Sample version of a file
-	with package information for the installed plug-ins.
-	* library/plugins/rhabout.tcl: New file. Sample file providing a
-	plug-in package.
-	* library/plugins/rhabout: New directory.  Sample plug-in.
-	* library/plugins/rhabout/rhabout.itcl: New file.  Sample class
-	implementing a plug-in window.
-	* library/plugins/rhabout/tclIndex: New file.  Tcl index for the sample
-	plug-in implementation.
-
-2001-01-28  Fernando Nasser  <fnasser@redhat.com>
-
-	* library/main.tcl: Add plugin subdirectory, if existent, to auto_path.
-	* library/srcbar.itcl (create_plugin_menu): New method.  Create a pull
-	down menu for plugins if there are any for this target configuration.
-	(create_menu_items): Invoke the new method above.
-
-2001-01-28  Fernando Nasser  <fnasser@redhat.com>
-
-	* library/gdbmenubar.itcl (menubar_new_menu): Save lable of a menu to
-	use as index.
-	(menubar_delete_menu): New function.  Delete a menu.
-
-2001-01-28  Fernando Nasser  <fnasser@redhat.com>
-
-	* library/gdbmenubar.itcl (menu_list): Add missing declararion for
-	global variable.
-
-2001-01-28  Fernando Nasser  <fnasser@redhat.com>
-
-	* library/gdbmenubar.itcl (set_class_state): Turn off verbose debug
-	messages.
-	* library/gdbtoolbar.itcl (set_class_state): Ditto.
-
-2001-01-26  Fernando Nasser  <fnasser@redhat.com>
-
-	* generic/gdbtk-cmds.c (gdb_clear_file): Call exec_file_clear() and
-	symbol_file_clear() instead of exec_file_command() and
-	symbol_file_command().
-	(gdb_find_file_command): Return the proper error text.
-
-2001-01-25  Fernando Nasser  <fnasser@redhat.com>
-
-	* library/srcbar.itcl: New file. Implement SrcBar, a menu and toolbar
-	for the Source Window (code previously in srcmenubar.itcl and
-	srctoolbar.itcl).
-	* library/srcmenubar.itcl: Remove obsolete file.
-	* library/srctoolbar.itcl: Remove obsolete file.
-	* library/srcbar.tcl: Remove obsolete file.
-	* library/gdbmenubar.itcl (menubar_show): New method. Associate the
-	menu with the toplevel window.
-        * library/srcwin.itb (_build_win): Use SrcBar.
-	* library/tclIndex: Regenerate.
-
-2001-01-24  Fernando Nasser  <fnasser@redhat.com>
-
-	From  Martin Hunt  <hunt@cygnus.com>
-	* generic/gdbtk-cmds.c (gdb_set_bp_addr, gdb_set_bp): Change
-	strsave() to xstrdup().
-
-2001-01-24  Fernando Nasser  <fnasser@redhat.com>
-
-	From  Martin Hunt  <hunt@cygnus.com>
-	* generic/gdbtk-cmds.c (gdbtk_dis_asm_read_memory): Fix call
-	to xfer_memory().
-
-2001-01-19  Fernando Nasser  <fnasser@redhat.com>
-
-	* library/prefs.tcl (pref_set_defaults): Set default value of
-	gdb/src/top_control to place the source window controls at the top.
-
-2001-01-18  Fernando Nasser  <fnasser@redhat.com>
-
-        * library/srctextwin.itb (_highlightAsmLine): Add missing FUNCNAME
-	parameter.
-        (FillAssembly, FillMixed): Pass the FUNCNAME parameter that is
-        needed by the above method.
-        * library/srctextwin.ith (_highlightAsmLine): Add FUNCNAME parameter
-	to method definition.
-
-2001-01-17  Fernando Nasser  <fnasser@redhat.com>
-
-        * library/srctextwin.itb (_highlightAsmLine): Add missing FILENAME
-	parameter.
-        (FillAssembly, FillMixed): Pass the FILENAME parameter that is
-        needed by the above method.
-        * library/srctextwin.ith (_highlightAsmLine): Add FILENAME parameter
-	to method definition.
-
-2001-01-15  Fernando Nasser  <fnasser@redhat.com>
-
-	* srcwin.itb (clear_file): Pass the appropriate value to the GO 
-	argument of mode() so it does not try to read a source file when
-	no executable is loaded.
-
-2001-01-09  Fernando Nasser  <fnasser@redhat.com>
-
-	* library/srcmenubar.itcl (create_file_menu): Add missing incr for
-	session numbers.
-
-2001-01-04  Fernando Nasser  <fnasser@redhat.com>
-
-	The following changes fix the problem of having to click on a splash
-	window to make it disapear.
-	* modal.tcl (post): Take as an argument "expire", the time a modal
-	window is displayed.
-	* managedwin.itb (open): Check for an "expire" argument and pass the
-	value down to modal post method.
-
-2001-01-04  Fernando Nasser  <fnasser@redhat.com>
-
-	* library/gdbmenubar.itcl (set_class_state): New public method.
-	Standard method to control state by class.
-	(menubar_menu_class_find): Delete public accessor method.
-	(menubar_change_menu_state): Change the state of a menu item
-	not of a whole class list.
-	* library/srcmenubar.itcl (enable_ui): Use set_class_state instead
-	of prying into base class internal data.
-        * library/gdbtoolbar.itcl (set_class_state): New public method.
-        Standard method to control state by class.
-        (toolbar_button_class_find): Delete public accessor method.
-	* library/srctoolbar.itcl (enable_ui): Use set_class_state instead
-	of prying into base class internal data.
-
-2001-01-04  Fernando Nasser  <fnasser@redhat.com>
-
-	* library/interface.tcl (gdbtk_connect): New proc. Connects to ai
-	 remote target (code previously at library/gdbmenubar.itcl).
-	(disconnect): Rename to...
-	(gdbtk_disconnect): New name for proc disconnect.
-	* library/srcmenubar.itcl (do_connect): Remove the code mentioned
-	above and call the new interface proc gdbtk_connect.
-	Also, call ::update idletasks after changing the state of the
-	menu entries.
-	(do_detach): Call gdbtk_disconnect, not ::disconnect (old name).
-	(do_disconnect): Call gdbtk_disconnect, not disconnect (old name).
-
-2001-01-03  Fernando Nasser  <fnasser@redhat.com>
-
-	* library/prefs.tcl (pref_set_defaults): Define gdb/src/top_control
-	to allow the source window controls to be placed at the top.
-	* library/srcwin.itb (_build_win): Test for gdb/src/top_control
-	and place the controls accordingly.
-
-2001-01-02  Fernando Nasser  <fnasser@redhat.com>
-
-	* library/gdbmenubar.itcl: New file. Define the GDBMenuBar class,
-	a generic menubar building facility for Insight windows (WIP).
-	* library/gdbtoolbar.itcl: New file. Define the GDBToolBar class,
-	a generic toolbar building facility for Insight windows (WIP).
-	* library/srcmenubar.itcl: New file. Define the SrcMenuBar class,
-	which implements the Source Window menubar (inherits GDBMenuBar).
-	* library/srctoolbar.itcl: New file. Define the SrcToolBar class,
-	which implements the Source Window toolbar (inherits GDBToolBar).
-	* library/srcwin.itb (_build_win): Use SrcMenuBar and SrcToolBar
-	instead of the obsolete GDBSrcBar.
-	* library/srcbar.tcl: Mark as OBSOLETE.
-	* library/toolbar.tcl: Mark as OBSOLETE. Rename class GDBToolBar
-	to avoid conflict with new class with the same name.
-	* library/Makefile (TCL): Include .itcl files.
-	* library/tclIndex: Regenerate.
-
-2001-01-02  Fernando Nasser  <fnasser@redhat.com>
-
-	* library/srcwin.itb (_build_win): If gdb is running a program, load
-	the window with source for that location (if available).
-	(download_progress): Calls to "update" must refer to the global
-	namespace.
-
-2001-01-02  Fernando Nasser  <fnasser@redhat.com>
-
-	* library/interface.tcl (gdbtk_quit_check): Save session whenever
-	possible.
-
-2001-01-01  Fernando Nasser  <fnasser@redhat.com>
-
-	* library/ChangeLog-2000: New file. Entries dated 2000 moved here
-        from library/ChangeLog.
-        * library/ChangeLog: Removed. 
-        * generic/ChangeLog-2000: New file. Entries dated 2000 moved here
-        from library/ChangeLog.
-        * generic/ChangeLog: Removed.
-
-2000-12-14  Fernando Nasser  <fnasser@redhat.com>
-
-	* library/ChangeLog-1999: New file. Entries dated 1999 moved here
-	from library/ChangeLog.
-	* library/ChangeLog-1998: New file.  Similar change for 1998.
-	* library/ChangeLog-1997: New file.  Similar change for 1997.
-	* library/ChangeLog: Removed entries previous to 2000.
-	* generic/ChangeLog-1999: New file. Entries dated 1999 moved here
-	from library/ChangeLog.
-	* generic/ChangeLog-1998: New file.  Similar change for 1998.
-	* generic/ChangeLog-1997: New file.  Similar change for 1997.
-	* generic/ChangeLog: Removed entries previous to 2000.
-
-2000-04-17  Jonathan Larmour  <jlarmour@redhat.co.uk>
-
-	* ChangeLog-gdbtk: Renamed to ChangeLog
-	* ChangeLog: New file
-	* README.GDBTK: No need for changelog-default-name hint for Emacs now
-
-Sat Feb  5 00:14:30 2000  Andrew Cagney  <cagney@b1.cygnus.com>
-
-	* gdb.rc, gdbtool.ico, README.GDBTK: To here from top level GDB
- 	directory.
-	* gdb/gdbtcl2: Directory moved to gdbtk/library.
-	* gdb/gdbtk/generic: New directory.
-	
diff --git a/gdb/gdbtk/ChangeLog-2002 b/gdb/gdbtk/ChangeLog-2002
deleted file mode 100644
index 6c22903ad3e..00000000000
--- a/gdb/gdbtk/ChangeLog-2002
+++ /dev/null
@@ -1,878 +0,0 @@
-2002-12-20  Martin M. Hunt  <hunt@redhat.com>
-
-	* library/srcbar.itcl (SrcBar): Don't load vmake icon.
-
-	* library/images: Removed back.gif, build.gif, file.gif, fore.gif,
-	gdbtk.gif, opt.gif, tools.gif, tools2_3d.gif, and vmake.gif.
-
-	* library/images2: Removed back.gif, build.gif, file.gif, fore.gif,
-	gdbtk.gif, load.gif, opt.gif, tools.gif, tools2_3d.gif, and vmake.gif.
-	
-2002-12-18  Martin M. Hunt  <hunt@redhat.com>
-
-	* library/main.tcl: Don't try to print errors to stderr on Windows.
-
-2002-12-18  Martin M. Hunt  <hunt@redhat.com>
-	
-	* library/regwin.itb (RegWin::update): When updating, check
-	that a cell still exists before checking its value.
-	(RegWin::_select_group): Clear cells with changed values before
-	changing group.  After new group is selected, highlight any changed
-	values still visible.
-
-2002-12-17  Martin M. Hunt  <hunt@redhat.com>
-
-	* library/interface.tcl (gdbtk_tcl_fputs_target_err):
- 	New function.
-	(gdbtk_tcl_fputs_target): Open console window if it is 
-	not already open.	
-	(gdbtk_gets): New function.
-	Opens a console window if necessary and calls Console::gets.
-
-	* library/console.ith (gets): Declare method.
-	(_input_mode): New private variable.
-	(_input_result): Ditto.
-	(_input_error): Ditto.
-	(_cancel): New private method
-	(invoke): Add arg.
-
-	* library/console.itb (_setprompt): Allow setting prompt
-	to nothing.  Delete to beginning of line before writing prompt.
-	(gets): New public method to prompt user for input.
-	(_cancel): New private method to handle ^C when inputting data.
-	(invoke): Check for ^d when in input mode.
-
-2002-12-17  Martin M. Hunt  <hunt@redhat.com>
-
-	* library/regwin.itb (_load_prefs): Get list of registers from
-	the group name.
-	(_build_win): Remove old menu system.  Replace with an optionmenu
-	that contains all the valid group names for this architecture.
-	(_layout_table): No need to update old menu.
-	(_but3): Add "Close" to popup menu.
-	(_delete_from_display): No need to update old menu.
-	(_display_all): Ditto.
-	(_post_menu): Deleted.
-	(_select_group): New method. Callback for group optionmenu.
-	
-	* library/regwin.ith: New private variable _group.
-	New private method _select_group.  Removed _post_menu.
-
-	* generic/gdbtk-register.c: Include reggroups.h.
-	(gdb_register_info): Add "group" and "grouplist".
-	(gdb_regformat): Fix Tcl_WrongNumArgs call so it doesn't crash.
-	(gdb_reggrouplist): New function. Returns the names of the
-	register groups.
-	(gdb_reggroup): New function. Returns the register numbers of the
-	registers in a group.
-
-2002-12-06  Andrew Cagney  <ac131313@redhat.com>
-
-	* generic/gdbtk-cmds.c (gdb_update_mem): Don't add a 0x prefix.
-
-2002-12-05  Martin M. Hunt  <hunt@redhat.com>
-
-	* library/regwin.itb (update): Revert previous patch to this
-	function. But also don't tag blank cells.
-	(_but3): Fix help call.
-
-2002-12-04  Martin M. Hunt  <hunt@redhat.com>
-
-	* library/regwin.itb (_but3): Fix help call. 
-
-	* library/helpviewer.tcl (open_help): Fix KDE apps list.
-
-	* library/debugwin.itb (build_win): Fix help call.
-	
-	* library/regwin.itb (update): Remove some old code
-	that marked registers as changed when the target started.
-	(_build_win): Make changed registers more visible by
-	changing their bg to Colors(change).
-
-	* library/prefs.tcl (pref_set_option_db): Create a new
-	Color(change) which is the color of text indicating a change.
-	Current default is green.
-
-	* library/vartree.itb (_init_data): Make changed values
-	Color(change). Can't change bg, so we change fill color.
-
-2002-12-04  Keith Seitz  <keiths@redhat.com>
-
-	* generic/gdbtk-hooks.c: Include tcl.h and tk.h to pull
-	in declarations for some Tk functions used in this file.
-	* generic/gdbtk-cmds.c: Likewise.
-
-2002-12-03  Martin M. Hunt  <hunt@redhat.com>
-
-	* library/vartree.itb (_but3): Add popup menu item to dump
-	memory at the value of the variable.
-
-	* library/vartree.itb (buildlayer): Check for error when updating
-	a variable's value.
-	(update_var): Ditto.
-	
-	* library/srcpref.itb: Latest tk doesn't support
-	"-col" as a grid option.  Use "-column".
-
-	* library/regwin.itb: Ditto.
-
-	* library/main.tcl: Require package "debug". Make
-	package loading a bit more robust.
-
-2002-11-30  Andrew Cagney  <ac131313@redhat.com>
-
-	* generic/gdbtk-stack.c: Replace selected_frame with
-	deprecated_selected_frame.
-	* generic/gdbtk-register.c: Ditto.
-	* generic/gdbtk-cmds.c (gdb_loc): Replace selected_frame with
-	deprecated_selected_frame.  Use get_frame_pc and find_frame_sal.
-
-2002-11-27  Martin M. Hunt  <hunt@redhat.com>
-
-	* generic/gdbtk.c (gdbtk_init): Don't call Tix_Init.
-	Don't include tix.h
-
-	* generic/gdbtk-hooks.c: Don't include tix.h.
-
-	* generic/gdbtkj-cmds.c: Don't include tix.h.
-	
-2002-11-27  Andrew Cagney  <cagney@redhat.com>
-
-	* generic/gdbtk-stack.c (get_frame_name): Use get_frame_type
-	instead of deprecated_frame_in_dummy.
-	* generic/gdbtk-cmds.c (gdb_loc): Ditto.
-
-2002-11-19  Andrew Cagney  <ac131313@redhat.com>
-
-	* generic/gdbtk-stack.c (gdb_selected_frame): Use get_frame_base
-	instead of FRAME_FP.  Mention that get_frame_id() should be used.
-	
-2002-11-19  Andrew Cagney  <ac131313@redhat.com>
-
-	* generic/gdbtk-cmds.c (gdb_loc): Use get_frame_type instead of
-	->signal_handler_caller.
-	* generic/gdbtk-stack.c (get_frame_name): Ditto.
-	(get_frame_name): Ditto.
-
-2002-11-12  Andrew Cagney  <ac131313@redhat.com>
-
-	From 2002-11-11 David Carlton <carlton@math.stanford.edu>
-	* generic/gdbtk-stack.c (get_frame_name): Replace call to
-	frame_in_dummy with one to deprecated_frame_in_dummy.
-	* generic/gdbtk-cmds.c (gdb_loc): Ditto.
-
-2002-11-11  Martin M. Hunt  <hunt@redhat.com>	
-
-	* library/srctextwin.itb (do_key): Add arg to
-	print call.
-
-2002-11-11  Martin M. Hunt  <hunt@redhat.com>	
-	
-	* library/data.ith: Deleted.
-	* library/data.itb: Deleted.
-	
-2002-11-11  Martin M. Hunt  <hunt@redhat.com>		
-
-	* library/memwin.itb: Supply arg to _update_address.
-
-2002-11-11  Martin M. Hunt  <hunt@redhat.com>	
-	
-	* library/toolbar.tcl: Deleted this obsolete file.
-	* library/tclIndex: Rebuilt.
-
-2002-11-11  Martin M. Hunt  <hunt@redhat.com>		
-
-	* library/srcbar.itcl (create_help_menu): For unix systems,
-	if compatibility is set to KDE or GNOME, put the help menu
-	in the right place. Otherwise put it on the far right, like
-	Motif does.
-
-2002-11-11  Martin M. Hunt  <hunt@redhat.com>	
-	
-	* library/helpviewer.tcl: New file. Finds
-	an appropriate help browser and displays the help files.
-
-	* library/vartree.itb: Fix open_help calls.
-	
-	* library/helpviewer.ith: Deleted.
-	* library/helpviewer.itb: Deleted.
-	
-	* library/prefs.tcl (pref_set_defaults): Remove 
-	pref gdb/help/browser. Add pref gdb/help/browsername.  
-	We couldn't simply rename because it would break older 
-	versions of Insight that expect gdb/help/browser to be 
-	a number.
-
-2002-11-08  Martin M. Hunt  <hunt@redhat.com>
-
-	* library/prefs.tcl (pref_save): Fix GDBtkInitVersion.
-	(pref_save): Check that value is not null before writing.
-	
-2002-11-07  Martin M. Hunt  <hunt@redhat.com>
-
-	* library/util.tcl (CygScrolledListbox): Delete.
-
-	* library/srctextwin.itb: Change from CygScrolledListbox
-	to iwidgets::scrolledlistbox. Set foreground and background.
-	Center popup over source window.
-
-2002-11-06  Martin M. Hunt  <hunt@redhat.com>
-
-	* library/locals.tcl (build_win): Fix so window opens
-	on Windows.	
-
-2002-11-06  Martin M. Hunt  <hunt@redhat.com>	
-	* library/debugwin.itb: Remove VariableWin.  Add VarTree.
-
-2002-11-06  Martin M. Hunt  <hunt@redhat.com>	
-	* library/watch.tcl: Completely rewritten to use VarTree.
-	* library/locals.tcl: Completely rewritten to use VarTree.
-	* library/variables.tcl: Deleted.
-	* library/vartree.ith: New file.
-	* library/vartree.itb: New file. Implements a variable
-	tree.
-	* library/tclIndex: Rebuilt.
-	
-2002-11-06  Martin M. Hunt  <hunt@redhat.com>
-	* library/globalpref.itb (_build_win): Add radiobox
-	to select KDE/GNOME/default for pref gdb/compat. Remove
-	browser option. 
-
-	* library/regwin.itb (build_win): Colors(hbg) has been 
-	removed so use Colors(bg) instead.
-
-	* library/prefs.tcl (pref_set_defaults): Add a new
-	preference "gdb/compat" which can be set to KDE, GNOME, 
-	Windows or default. This allows us to change Insight's
-	behavior based on windowing system.
-	(pref_set_colors): Attempt to read in .gtkrc files.
-	Do different things for KDE vs GNOME.
-	(pref_load_default): New function. Load default colors.
-	(pref_load_gnome): New function. Find and open GNOME file.	
-	(load_gnome_file): New function. Loads GNOME file.		
-	(pref_set_option_db): New function.  Set option database.
-
-2002-11-06  Martin M. Hunt  <hunt@redhat.com>	
-	* generic/gdbtk-varobj.c: Remove FREEIF and replace with xfree.
-	Make format_string static.
-	(variable_update): Return an object
-	with "-1" in it on error.
-	
-2002-11-06  Keith Seitz  <keiths@redhat.com>
-
-	* generic/gdbtk-hooks.c (gdbtk_call_command): Make a null
-	cleanup and run it after every issued gdb command. Apparently
-	some commands depend on this. [This should really be part of
-	main gdb...]
-
-2002-10-15  Martin M. Hunt  <hunt@redhat.com>
-
-	* library/tclIndex: Rebuilt.
-
-	* library/* : auto_mkindex cannot rebuild
-	tclIndex because it does not recognize the namespace
-	import in main.tcl.  To get it to work again, rename the
-	following:
-		body -> itcl::body
-		configbody -> itcl::configbody
-		class -> itcl::class
-
-2002-10-10  Martin M. Hunt  <hunt@redhat.com>
-
-	* generic/gdbtk-cmds.c (gdb_update_mem): No results
-	were being returned. Append results to result_ptr_obj_ptr.
-
-2002-10-10  Martin M. Hunt  <hunt@redhat.com>
-	
-	* library/session.tcl (save): Save target_cmd,
-	attach, load, run, and cont as session prefs.
-	(notice_file_change): Load in above session
-	prefs.
-	
-	* library/interface.tcl (set_target): Set icons busy
-	before attempting target command and set back to idle after.
-	(run_executable): Return on ATTACH_ERROR.
-	(gdbtk_run): If run button is hit when a program
-	is currently being debugged, put up a dialog allowing
-	user to continue or cancel.
-
-2002-10-09  Martin M. Hunt  <hunt@redhat.com>
-	
-	* library/targetselection.itb (init_target_db): Add gdbserver
-	target.
-	(get_target_list): Always add "gdbserver" to list of valid 
-	targets.
-	(valid_target): Always allow "gdbserver".
-
-2002-09-27  Keith Seitz  <keiths@redhat.com>
-
-	* generic/gdbtk-hooks.c (gdbtk_add_hooks): Add gdbtk_annotate_signal
-	as annotate_signalled_hook.
-
-2002-09-26  Andrew Cagney  <ac131313@redhat.com>
-
-	From Grace Sainsbury <graces@redhat.com>:
-	* generic/gdbtk-main.c: New file.
-
-2002-09-24  Martin M. Hunt  <hunt@redhat.com>
-
-	* library/srctextwin.itb (FillMixed): Fix debug
-	statement for 64-bit.
-	(_highlightAsmLine): Fix 64-bit arithmetic.
-
-2002-09-19  Martin M. Hunt  <hunt@redhat.com>
-
-	* library/srctextwin.itb (FillAssembly): Fix debug
-        statement for 64-bit addresses.
-        (showBPBalloon): Fix for 64-bit addresses.
-
-	* library/memwin.itb (incr_addr): Fix 64-bit addresses.
-
-2002-09-18  Keith Seitz  <keiths@redhat.com>
-
-	* library/console.itb (_build_win): Bind control-c and control-v
-	to copy and paste.
-
-2002-08-15  Keith Seitz  <keiths@redhat.com>
-
-	* README: Massive update.
-
-2002-08-14  Keith Seitz  <keiths@redhat.com>
-
-	* README.GDBTK: Updated and renamed to README.
-	* README: "New" file.
-
-2002-08-14  Keith Seitz  <keiths@redhat.com>
-
-	* library/srcbar.itcl (create_plugin_menu): Deal with
-	multi plugin directories.
-	Catch any errors that might occur reading plugin.tcl.
-	* library/main.tcl: Add plugins from new default directory.
-	(INSIGHT_PLUGINS): New environment variable to point to other
-	plugin directories.
-
-2002-08-14  Keith Seitz  <keiths@redhat.com>
-
-	* library/plugins: Removed.
-	* plugins/: New folder to hold plugins.
-	* Makefile.am, Makefile.in, aclocal.m4, configure,
-	configure.in: New files.
-	
-2002-08-14  Keith Seitz  <keiths@redhat.com>
-
-	* generic/gdbtk.c (view_command): New function to display
-	location in source window.
-	(gdbtk_init): Add new gdb "view" command.
-
-2002-08-06  Keith Seitz  <keiths@redhat.com>
-
-	* library/srcwin.itb (_build_win): Anchor status label so that
-	text appears at left instead of centered.
-
-2002-08-03  Andrew Cagney  <ac131313@redhat.com>
-
-	* generic/gdbtk-bp.c: Include "gdb_string.h".
-	* generic/gdbtk-register.c: Ditto.
-	* generic/gdbtk-varobj.c: Ditto.
-
-2002-08-01  Keith Seitz  <keiths@redhat.com>
-
-	* library/prefs.tcl (pref_read): Don't suppress setting the default
-	colors if the user has suppressed reading the preferences file.
-
-2002-07-31  Keith Seitz  <keiths@redhat.com>
-
-	* library/browserwin.itb (_full_funcs_combo): Remove "-modal"
-	option from tk_messageBox call. It was redhat-local in tk8.0,
-	but is no longer in tk8.3.
-	* library/download.itb (download_it): Likewise.
-	* library/interface.tcl (gdbtk_tcl_query): Likewise.
-	(show_warning): Likewise.
-	(set_exe): Likewise.
-	(set_target): Likewise.
-	* library/memwin.itb (error_dialog): Likewise.
-	* library/srcwin.itb (fillFuncCB): Likewise.
-	* library/util.tcl (tfind_cmd): Likewise.
-
-2002-07-03  Martin M. Hunt  <hunt@redhat.com>
-
-	* generic/gdbtk-hooks.c (gdbtk_call_command): Use cmd_func().
-
-2002-06-12  Keith Seitz  <keiths@redhat.com>
-
-	* library/gdbmenubar.itcl (add): Add new "cascade" type.
-	(menubar_add_cascade): New method to build cascading menus.
-
-2002-06-07  Martin M. Hunt  <hunt@redhat.com>
-
-	* library/prefs.tcl (pref_set_colors): New function.  Set up colors
-	from Windows system colors or X resource database. Save in array.
-	(pref_set_defaults): Remove gdb/font/normal_fg, etc.
-	(pref_read): Call pref_set_colors.
-
-	* library/main.tcl: Remove call to "tix resetoptions TixGray".
-
-	* library/bpwin.itb, library/browserwin.itb, library/console.itb,
-	library/globalpref.itb, library/memwin.itb, library/process.itb,
-	library/regwin.itb, library/srcpref.itb, library/srctextwin.itb,
-	library/stackwin.itb, library/tdump.tcl, library/tracedlg.tcl,
-	library/variables.tcl: Replace calls to [pref get gdb/fonts/*] 
-	for colors with references to Color array. Remove all tixOptions calls.
-	Fix up colors as necessary.
-	
-2002-05-31  Martin M. Hunt  <hunt@redhat.com>
-
-	* library/prefs.tcl (pref_read): If the regular expression
-	cannot parse line, print debug message and skip it.
-
-2002-05-15  Martin M. Hunt  <hunt@redhat.com>
-
-	* library/help/register.html: Rewrite docs.
-	
-	* library/regwin.ith (_types): New private variable array to save
-	the possible types for each register.
-	(_type): New private variable array to save the selected type for 
-	each register.
-	(_rows): New private variable. Number of rows in the table.
-	(_cols): New private variable. Number of cols in the table.
-	(_load_prefs): New private method.
-	(_open_memory): New private method.
-	(_edit_menu): Deleted:
-	(_select): Deleted.
-	(_change_format): Add optional type argument.
-	
-	* library/regwin.itb (RegWin::_load_prefs): New method. Collects
-	all the prefs stuff here instead of in _layout_table. Prefs
-	code was all rewritten to handle new types and formats.
-	(RegWin::_build_win): Disable Double-1 binding. Bind
-	button 1 to edit the cell. Don't make an Edit menu item.
-	Remove Natural, Binary, Octal, and Raw formats. Add "Open
-	Memory Window" menu item. 
-	(RegWin::_dimensions): This function was being abused so I removed 
-	it. Replaced with inline code in _layout_table which saves its
-	computed values so it doesn't have to be recalculated unless 
-	something changes.
-	(RegWin::_layout_table): Rewritten to be more efficient. Grabs
-	all values in one call to gdb_reginfo instead of one for each register.
-	Uses new types and formats.  Calls _load_prefs.
-	(RegWin::_accept_edit): Use type information when setting value.
-	When done, call _unedit to remove tags.
-	(RegWin::_open_memory): Open memory window with initial value
-	set to the value of a register.	
-	(RegWin::_but3): Add types menu items. Limit format options
-	to reasonable ones. Add "Open Memory Window". Add "Help" 
-	(RegWin::_edit): Just call _select_cell.
-	(RegWin::_edit_menu): Deleted.
-	(RegWin::_move): Don't recompute rows and cols; use _rows and
-	_cols computed by _layout_table.
-	(RegWin::_post_menu): Update types and formats. Disable "Open Memory
-	Window" if register is not integer. Remove Edit.
-	(RegWin::_select): Deleted.
-	(RegWin::_select_cell):	Tag cell as being edited. Then
-	call focus, which is a workaround for a TkTable glitch where
-	the insertion bar sometimes disappeared.
-	(RegWin::_unedit): Clear selection. Call focus. Don't change
-	any bindings.
-	(RegWin::_get_value): Eliminate previous crap and just call 
-	"gdb_reginfo value".
-	(RegWin::_change_format): Add optional type arg.  Call 
-	"gdb_reginfo format".
-	(RegWin::_update): Get a list of all the changed registers
-	instead of checking one at a time.
-
-	* generic/gdbtk-register.c (Gdbtk_Register_Init): Don't
-	create gdb_pc_reg.  It is not used. Call register_gdbarch_swap 
-	with regformat and regtype.
-	(gdb_register_info): Add "type" and "format" options.
-	(get_pc_register): Delete.
-	(get_register_types): New function.  Returns list of valid types 
-	for a list of registers.
-	(get_register): Use saved format and type for each register. Check if
-	there are any registers yet (target not running). Use mem_file 
-	to collect output. Append output to a list.
-	(map_arg_registers): If passed a list, iterate though each element
-	and build a list of values to return.
-	(setup_architecture_data): Memory was not being initialized, so
-	use xcalloc(). Allocate memory for regformat and regtype.
-	(gdb_regformat): New function called by "gdb_reginfo format".
-	
-2002-05-15  Martin M. Hunt  <hunt@redhat.com>
-
-	* generic/gdbtk-cmds.c (gdb_eval): For mem_file stuff, delete
-	the file when done and free memory.
-	
-2002-05-06  Martin M. Hunt  <hunt@redhat.com>
-
-	* library/session.tcl (notice_file_change): Catch the
-	directory change, in case the directory no longer exists.
-
-2002-05-05  Alexandre Oliva  <aoliva@redhat.com>
-
-	* generic/gdbtk-register.c (get_register, register_changed_p):
-	Don't depend on variable-sized automatic arrays.
-
-2002-05-04  Andrew Cagney  <ac131313@redhat.com>
-
-	* generic/gdbtk-wrapper.h (GDB_select_frame): Delete declaration.
-	* generic/gdbtk-wrapper.c (GDB_select_frame): Delete function.
-	(wrap_select_frame): Delete function.
-
-2002-04-26  Martin M. Hunt  <hunt@redhat.com>
-
-	* library/interface.tcl (gdbtk_force_quit): New function.
-	Closes source windows then calls gdb_force_quit.
-	(gdbtk_quit): Call gdbtk_force_quit.
-
-2002-04-24  Keith Seitz  <keiths@redhat.com>
-
-	* library/managedwin.ith (_ignore_on_save): New protected method.
-	* library/managedwin.itb (shutdown): If _ignore_on_save, don't
-	save this window to the active window list in the preferences
-	file.
-	* library/debugwin.ith (DebugWin::_ignore_on_save): Don't save
-	this window to preferences active list.
-	(DebugWinDOpts::_ignore_on_save): Likewise.
-	* library/pluginwin.itcl (_ignore_on_save): Likewise.
-	* library/download.ith (_ignore_on_save): Likewise.
-
-2002-04-22  Keith Seitz  <keiths@redhat.com>
-
-	* generic/gdbtk-stack.c (Gdbtk_Stack_Init): Don't link
-	selected_frame_level directly.
-	* generic/gdbtk-hooks.c (gdbtk_selected_frame_changed): Set
-	the global "gdb_selected_frame_level" directly.
-
-2002-04-21  Andrew Cagney  <ac131313@redhat.com>
-
-	* generic/gdbtk-wrapper.c (GDB_find_frame_addr_in_frame_chain):
-	Delete function.
-	(wrap_find_frame_addr_in_frame_chain): Delete function.
-	* generic/gdbtk-wrapper.h (GDB_find_frame_addr_in_frame_chain):
-	Delete declaration.
-
-2002-04-17  Andrew Cagney  <cagney@redhat.com>
-
-	* generic/gdbtk.c (gdbtk_init): Use error or throw_exception to
-	report an error.
-
-2002-04-12  Andrew Cagney  <cagney@redhat.com>
-
-	* generic/gdbtk-register.c (register_changed_p): Use
-	frame_register_read instead of read_relative_register_raw_bytes.
-	(get_register): Delete out-of-date comment.
-	
-2002-04-08  Andrew Cagney  <ac131313@redhat.com>
-
-	* generic/gdbtk-wrapper.c (wrap_get_frame_block): Add missing NULL
-	parameter.  Match recent get_frame_block changes.
-
-2002-04-05  Keith Seitz  <keiths@redhat.com>
-
-	* generic/gdbtk-stack.c (gdb_block_vars): Update get_frame_block to
-	match recent gdb changes.
-	(gdb_get_blocks): Likewise.
-	(gdb_get_vars_command): Likewise.
-	(gdb_selected_block): Likewise.
-
-2002-04-04  Keith Seitz  <keiths@redhat.com>
-
-	* library/download.itb (constructor): Set feedback meter
-	to "0.0".
-	Remove "steps" array.
-	(update_download): Use fractional completions for feedback.
-	(done): Ditto.
-	* library/download.ith (protected variable steps): Remove.
-
-2002-04-04  Daniel Jacobowitz  <drow@mvista.com>
-
-	* generic/gdbtk-cmds.c (gdb_disassemble_driver): Skip
-	end-of-function markers in the line table.
-
-2002-04-01  Keith Seitz  <keiths@redhat.com>
-
-	* generic/gdbtk-cmds.c (gdb_load_disassembly): Use string_to_core_addr
-	instead of parse_and_eval_address.
-	Use xfree instead of free.
-
-2002-03-25  Elena Zannoni  <ezannoni@redhat.com>
-
-        * generic/gdbtk-hooks.c: Include cli/cli-decode.h for
-        cmd_list_element.
-
-2002-03-25  Alexandre Oliva  <aoliva@redhat.com>
-
-	* generic/gdbtk.c (HAS_STDARG): Define.
-	* generic/gdbtk-cmds.c (HAS_STDARG): Likewise.
-	* generic/gdbtk-hooks.c (HAS_STDARG): Likewise.
-
-2002-03-14  Keith Seitz  <keiths@redhat.com>
-
-	* library/bpwin.itb (constructor): Set some sane initial
-	size.
-
-2002-03-07  Martin M. Hunt  <hunt@redhat.com>
-
-	* library/srctextwin.itb (SrcTextWin::showBPBalloon): Put 
-	linefeeds between multiple breakpoints.
-
-2002-03-06  Martin M. Hunt  <hunt@redhat.com>
-
-	* library/srctextwin.itb (SrcTextWin::showBPBalloon):
-	Reformat output. Add conditions, ignore count, commands.
-
-	* library/interface.tcl (gdbtk_tcl_readline): Remove
-	call to "command::insert" and instead insert the command
-	into the console window.
-	(gdbtk_tcl_readline_end): Catch the unsets and do not call
-	non-existent function command::end_multi_line_input.
-
-2002-03-06  Martin M. Hunt  <hunt@redhat.com>
-	
-	* library/bpwin.itb: Left-justify the labels in
-	the table.
-
-2002-03-06  Keith Seitz  <keiths@redhat.com>
-
-	* generic/gdbtk-cmds.c: Include "ctype.h" if available.
-        (gdb_get_mem): Renamed to gdb_update_mem.
-        (gdb_update_mem): Take array as first tcl argument. This
-        array will hold the data for the table, which is now stuffed
-        in C instead of tcl.
-        (gdb_eval): Use our own ui-file instead of gdb_stdout.
-	* library/memwin.ith (_update_address): New method.
-	(update_address): Address expression is no longer optional.
-	* library/memwin.itb (build_win): Use _update_address instead of
-	update_address.
-	(toggle_enabled): Ditto.
-	(newsize): Use _update_address instead of update_addr.
-	(update_address_cb): Use _update_address instead of update_address.
-	(do_popup): Likewise.
-	(goto): Likewise.
-	(incr_addr): Use _update_address instead of update_addr.
-	(edit): Use gdb_update_mem instead of gdb_get_mem.
-	(update_addr): use gdb_update_mem to do all the window updating.
-
-2002-03-06  Martin M. Hunt  <hunt@redhat.com>
-
-	* library/srcwin.itb: Don't try to set balloon help
-	for search widget; it moved to srcbar.
-
-2002-03-05  Martin M. Hunt  <hunt@redhat.com>
-
-	* library/prefs.tcl (pref_read): If a preference specifies
-	"src-font", substitute "global/fixed".
-	(pref_set_defaults): Change defaults from "src-font" to 
-	"global/fixed". Do not create font object "src-font". Do
-	not add hook to trace its changes.
-	(pref_src-font_trace): Remove.
-
-	* library/console.itb (Console::_update_option): Remove 
-	font update because this happens automatically.
-
-	* library/globalpref.itb: No need to set
-	changed flag for fonts; updates happen automatically
-	when prefs are updated.
-
-	* library/bpwin.itb: Replaced src-font with global/fixed.
-	* library/browserwin.itb: Ditto.
-	* library/mempref.itb: Ditto.
-	* library/memwin.itb: Ditto.
-	* library/process.itb: Ditto.
-	* library/regwin.itb: Ditto.
-	* library/srcbar.itcl: Ditto.
-	* library/srcpref.itb: Ditto.
-	* library/srctextwin.itb: Ditto.
-	* library/srcwin.itb: Ditto.
-	* library/stackwin.itb: Ditto.
-	* library/tdump.tcl: Ditto.
-	* library/tracedlg.tcl: Ditto.
-	* library/variables.tcl: Ditto.
-	* library/watch.tcl: Ditto.
-	
-2002-03-01  Keith Seitz  <keiths@redhat.com>
-
-	* generic/gdbtk-register.c (register_changed_p): Don't use REGISTER_BYTES.
-	There is no guarantee anymore that REGISTER_BYTES contains
-	NUM_REGS+NUM_PSEUDO_REGS registers.
-	(setup_architecture_data): Likewise.
-
-2002-02-25  Ian Roxborough  <irox@redhat.com>
-
-	* library/srcbar.itcl (SrcBar::create_buttons): Added
-	"Search in source file" entry box and label to the top
-	row toolbar.
-	* library/srcwin.itb (SrcWin::_build_win): Removed
-	"Search in source file" entry box.
-	(SrcWin::_search): Renamed to "search", add string
-	parameter and cleaned up.
-	* library/srcwin.ith (SrcWin): Removed private
-	method "_search" and added public method "search".
-
-2002-02-17  Tom Tromey  <tromey@redhat.com>
-
-	* library/tclIndex: Updated.
-	* library/srcbar.itcl (SrcBar): Use new Session namespace.
-	* library/main.tcl: Use new Session namespace.
-	* library/interface.tcl (gdbtk_tcl_preloop): Use new Session
-	namespace.
-	(gdbtk_cleanup): Likewise.
-	(_close_file): Likewise.
-	* library/session.tcl: Use a namespace.  Renamed all functions.
-
-2002-02-13  Martin M. Hunt  <hunt@redhat.com>
-
-	* generic/gdbtk-hooks.c (gdbtk_print_frame_info): Don't 
-	set GDB globals current_source_symtab and current_source_line.
-	Let GDB do it. 
-
-2002-02-13  Keith Seitz  <keiths@redhat.com>
-
-	* library/managedwin.itb (_create): If given a transient window,
-	make sure that the SrcWin that is to become its master exists;
-	otherwise, use ".".
-
-2002-02-12  Keith Seitz  <keiths@redhat.com>
-
-	From Don Bowman <don@sandvine.com>:
-	* library/targetselection.itb (init_target_db): Add target
-	vxWorks.
-        Update copyright.
-
-2002-02-10  Daniel Jacobowitz  <drow@mvista.com>
-
-	* generic/gdbtk-cmds.c (gdb_listfuncs): Don't call
-	BLOCK_SHOULD_SORT.
-	* library/browserwin.itb (BrowserWin::_fill_funcs_combo): Sort
-	the output of gdb_listfuncs.
-
-2002-02-07  Martin M. Hunt  <hunt@redhat.com>
-
-	* generic/gdbtk.c, generic/gdbtk-bp.c, generic/gdbtk-cmds.c,
-	generic/gdbtk-hooks.c, generic/gdbtk-stack.c: Cleanup includes.
-
-2002-02-06  Martin M. Hunt  <hunt@redhat.com>
-
-	* generic/gdbtk.c, generic/gdbtk-bp.c, generic/gdbtk-cmds.c,
-	generic/gdbtk-hooks.c, generic/gdbtk-register.c,
-	generic/gdbtk-stack.c, generic/gdbtk-varobj.c,
-	generic/gdbtk-wrapper.c: Cleanup. Fix indentation. Fix
-	function declarations. Remove unused variables. Add 2002
-	copyrights.
-
-2002-02-06  Keith Seitz  <keiths@redhat.com>
-
-	* library/images/cygnus.gif: Remove.
-	* library/images2/cygnus.gif: Remove.
-
-2002-02-05  Elena Zannoni  <ezannoni@redhat.com>
-
-        * generic/gdbtk-cmds.c (gdbtk_load_asm, gdbtk_print_asm): Use
-        TARGET_PRINT_INSN instead of tm_print_insn.
-
-2002-01-18  Keith Seitz  <keiths@redhat.com>
-
-	* library/console.ith (get_text): Delete.
-	(test): New public method.
-	* library/console.itb (get_text): Delete.
-	(test): New public method.
-
-2002-01-15  Keith Seitz  <keiths@redhat.com>
-
-	* generic/gdbtk-varobj.c (variable_value): When varobj_get_value
-	fails, use error_last_message to return the error to tcl land.
-	This allows us to display nice messages about why "0xdeadbeef" is
-	not accessible!
-
-2002-01-11  Martin M. Hunt  <hunt@redhat.com>
-
-	* library/memwin.itb (idle): Check for existence of window.
-	Prevents race-condition error.
-
-	* library/srctextwin.itb (enable): Check for existence of $twin.
-
-	* library/interface.tcl (gdbtk_tcl_exec_file_display): 
-	Set pathname in host-independent manner using "file" and
-	gdb_current_directory.
-
-2002-01-10  Keith Seitz  <keiths@redhat.com>
-
-	* library/Makefile (ITCL_SH): Renamed to "ITCLSH".
-	(tclIndex): We no longer have an Itcl shell, so we must use
-	"package require Itcl".
-
-2002-01-08  Keith Seitz  <keiths@redhat.com>
-
-	* generic/gdbtk-cmds.c (gdb_find_file_command): If the symtab
-	doesn't have the filename's fullname, look it up with
-	symtab_to_filename.
-
-2002-01-08  Keith Seitz  <keiths@redhat.com>
-
-	* library/srcwin.itb (location): Fix typo. It's "addr" not
-	"address".
-
-2002-01-08  Tom Tromey  <tromey@redhat.com>
-
-	* library/interface.tcl (gdbtk_tcl_preloop): Use current directory
-	when `--args' given.
-
-2002-01-07  Ian Roxborough  <irox@redhat.com>
-
-	* library/srcbar.itcl (SrcBar::create_buttons): Line number
-	and address fields have been removed and added to the
-	status bar.
-	* library/srcwin.itb (SrcWin::_build_win): Add address and
-	line number fields to status bar.  Moved download progress
-	bar to status bar.
-	(SrcWin::download_progress):  Use canvas on status bar.
-	Remember to adjust width of 64-bit address.
-	(SrcWin::location): Set line number and address on status bar.
-	* library/srcwin.ith (SrcWin): Added new private variable.
-
-2002-01-04  Andrew Cagney  <ac131313@redhat.com>
-
-	* generic/gdbtk-cmds.c (gdb_disassemble_driver): Replace
-	LITTLE_ENDIAN with BFD_ENDIAN_LITTLE.
-	* generic/gdbtk-register.c (get_register): Ditto.
-
-2002-01-04  Andrew Cagney  <ac131313@redhat.com>
-
-	* generic/gdbtk-wrapper.h: Add typedef value_ptr.
-
-2002-01-03  Martin M. Hunt  <hunt@redhat.com>
-
-	* library/session.tcl (SESSION_serialize_bps): Ignore
-	breakpoints set on internal_error and info_command because
-	these are set by .gdbinit and will be recreated by it.
-	This is a bit of a hack and should be fixed properly
-	someday.
-	
-	* library/debugwin.itb: Fix incorrect button names
-	so they will be enabled/disabled properly.
-
-	* library/srctextwin.itb: Set focus on srcwin only
-	if another window doesn't have the focus.
-
-2002-01-02  Keith Seitz  <keiths@redhat.com>
-
-	* library/interface.tcl (set_exe): Allow users to debug
-	executables with no debug information.
-
-2002-01-02  Keith Seitz  <keiths@redhat.com>
-
-	* library/console.ith (insert): Add tag parameter.
-	(einsert): Delete.
-	* library/console.itb: (insert): Add tag parameter.
-	(einsert): Delete.
-	* library/interface.tcl (gdbtk_tcl_fputs): Use Console::insert.
-	(gdbtk_tcl_fputs_error): Likewise.
-	(gdbtk_tcl_fputs_log): Likewise.
-	(gdbtk_tcl_fputs_target): Likewise.
-	(set_target): Likewise.
-
-2002-01-02  Ian Roxborough  <irox@redhat.com>
-
-	* library/managedwin.itb (ManagedWin::_create):  When
-	making a modal window transient, use the source window
-	as the master and not ".".
-
diff --git a/gdb/gdbtk/Makefile.am b/gdb/gdbtk/Makefile.am
deleted file mode 100644
index 530ab66e228..00000000000
--- a/gdb/gdbtk/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-## Process this file with automake to produce Makefile.in
-
-AUTOMAKE_OPTIONS = cygnus
-SUBDIRS = plugins
diff --git a/gdb/gdbtk/Makefile.in b/gdb/gdbtk/Makefile.in
deleted file mode 100644
index 724bf6853bf..00000000000
--- a/gdb/gdbtk/Makefile.in
+++ /dev/null
@@ -1,323 +0,0 @@
-# Makefile.in generated automatically by automake 1.4 from Makefile.am
-
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = .
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-host_alias = @host_alias@
-host_triplet = @host@
-CC = @CC@
-EXEEXT = @EXEEXT@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-VERSION = @VERSION@
-
-AUTOMAKE_OPTIONS = cygnus
-SUBDIRS = plugins
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/../../mkinstalldirs
-CONFIG_CLEAN_FILES = 
-DIST_COMMON =  ChangeLog Makefile.am Makefile.in TODO aclocal.m4 \
-configure configure.in
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = gtar
-GZIP_ENV = --best
-all: all-redirect
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --cygnus Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in 
-	cd $(srcdir) && $(ACLOCAL)
-
-config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	$(SHELL) ./config.status --recheck
-$(srcdir)/configure: @MAINTAINER_MODE_TRUE@$(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
-	cd $(srcdir) && $(AUTOCONF)
-
-# This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-
-@SET_MAKE@
-
-all-recursive install-data-recursive install-exec-recursive \
-installdirs-recursive install-recursive uninstall-recursive install-info-recursive \
-check-recursive installcheck-recursive info-recursive dvi-recursive:
-	@set fnord $(MAKEFLAGS); amf=$$2; \
-	dot_seen=no; \
-	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    dot_seen=yes; \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-	done; \
-	if test "$$dot_seen" = "no"; then \
-	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-	fi; test -z "$$fail"
-
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
-	@set fnord $(MAKEFLAGS); amf=$$2; \
-	dot_seen=no; \
-	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
-	  rev="$$subdir $$rev"; \
-	  test "$$subdir" = "." && dot_seen=yes; \
-	done; \
-	test "$$dot_seen" = "no" && rev=". $$rev"; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-
-tags: TAGS
-
-ID: $(HEADERS) $(SOURCES) $(LISP)
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	here=`pwd` && cd $(srcdir) \
-	  && mkid -f$$here/ID $$unique $(LISP)
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-   if test "$$subdir" = .; then :; else \
-	    test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
-   fi; \
-	done; \
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
-
-mostlyclean-tags:
-
-clean-tags:
-
-distclean-tags:
-	-rm -f TAGS ID
-
-maintainer-clean-tags:
-
-distdir = $(PACKAGE)-$(VERSION)
-top_distdir = $(distdir)
-
-# This target untars the dist file and tries a VPATH configuration.  Then
-# it guarantees that the distribution is self-contained by making another
-# tarfile.
-distcheck: dist
-	-rm -rf $(distdir)
-	GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz
-	mkdir $(distdir)/=build
-	mkdir $(distdir)/=inst
-	dc_install_base=`cd $(distdir)/=inst && pwd`; \
-	cd $(distdir)/=build \
-	  && ../configure --srcdir=.. --prefix=$$dc_install_base \
-	  && $(MAKE) $(AM_MAKEFLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
-	  && $(MAKE) $(AM_MAKEFLAGS) check \
-	  && $(MAKE) $(AM_MAKEFLAGS) install \
-	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
-	  && $(MAKE) $(AM_MAKEFLAGS) dist
-	-rm -rf $(distdir)
-	@banner="$(distdir).tar.gz is ready for distribution"; \
-	dashes=`echo "$$banner" | sed s/./=/g`; \
-	echo "$$dashes"; \
-	echo "$$banner"; \
-	echo "$$dashes"
-dist: distdir
-	-chmod -R a+r $(distdir)
-	GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
-	-rm -rf $(distdir)
-dist-all: distdir
-	-chmod -R a+r $(distdir)
-	GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
-	-rm -rf $(distdir)
-distdir: $(DISTFILES)
-	-rm -rf $(distdir)
-	mkdir $(distdir)
-	-chmod 777 $(distdir)
-	@for file in $(DISTFILES); do \
-	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-	  fi; \
-	done
-	for subdir in $(SUBDIRS); do \
-	  if test "$$subdir" = .; then :; else \
-	    test -d $(distdir)/$$subdir \
-	    || mkdir $(distdir)/$$subdir \
-	    || exit 1; \
-	    chmod 777 $(distdir)/$$subdir; \
-	    (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(distdir) distdir=../$(distdir)/$$subdir distdir) \
-	      || exit 1; \
-	  fi; \
-	done
-info-am:
-info: info-recursive
-dvi-am:
-dvi: dvi-recursive
-check-am:
-check: check-recursive
-installcheck-am:
-installcheck: installcheck-recursive
-install-info-am: 
-install-info: install-info-recursive
-install-exec-am:
-install-exec: install-exec-recursive
-
-install-data-am:
-install-data: install-data-recursive
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-recursive
-uninstall-am:
-uninstall: uninstall-recursive
-all-am: Makefile
-all-redirect: all-recursive
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs: installdirs-recursive
-installdirs-am:
-
-
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-
-maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-tags mostlyclean-generic
-
-mostlyclean: mostlyclean-recursive
-
-clean-am:  clean-tags clean-generic mostlyclean-am
-
-clean: clean-recursive
-
-distclean-am:  distclean-tags distclean-generic clean-am
-
-distclean: distclean-recursive
-	-rm -f config.status
-
-maintainer-clean-am:  maintainer-clean-tags maintainer-clean-generic \
-		distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-maintainer-clean: maintainer-clean-recursive
-	-rm -f config.status
-
-.PHONY: install-data-recursive uninstall-data-recursive \
-install-exec-recursive uninstall-exec-recursive installdirs-recursive \
-uninstalldirs-recursive all-recursive check-recursive \
-installcheck-recursive info-recursive dvi-recursive \
-mostlyclean-recursive distclean-recursive clean-recursive \
-maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
-distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
-dvi-am dvi check check-am installcheck-am installcheck install-info-am \
-install-info install-exec-am install-exec install-data-am install-data \
-install-am install uninstall-am uninstall all-redirect all-am all \
-installdirs-am installdirs mostlyclean-generic distclean-generic \
-clean-generic maintainer-clean-generic clean mostlyclean distclean \
-maintainer-clean
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/gdb/gdbtk/README b/gdb/gdbtk/README
deleted file mode 100644
index d8756430b9e..00000000000
--- a/gdb/gdbtk/README
+++ /dev/null
@@ -1,283 +0,0 @@
-				    README
-			   Written by Stu Grossman
-	      Updated 9/26/95 by Fred Fish for gdb 4.15 release
-              Updated 4/18/97 by Martin Hunt
-	      Updated 8/15/02 by Keith Seitz
-
-This file describes how to build, install, use and hack on Insight (formerly
-GDBtk), a TK-based GUI for GDB, the GNU debugger.
-
-Introduction
-============
-
-Insight is a version of GDB that uses Tcl/Tk to implement a graphical
-user inter-face.  It is a fully integrated GUI, not a separate
-front-end program.  The interface consists of several separate
-windows, which use standard elements like buttons, scrollbars, entry
-boxes and such to create a fairly easy to use interface.  Each window
-has a distinct content and purpose, and can be enabled or disabled
-individually.  The windows contain things like the current source
-file, a disassembly of the current function, text commands (for things
-that aren't accessible via a button), and so forth.
-
-Building and Installing
-=======================
-
-Building Insight is very straightforward.  It is configured/built by
-default when you checkout or download Insight.  Right now, Insight MUST
-be built using the versions of Tcl, Tk, Itcl, and Tix that come with
-the sources.  We're working to fix that, but it is going to take a lot
-of time.  (Want to help?)
-
-On Unix machines, you will also need to have X11 (R4/R5/R6) installed 
-(this is a prerequisite to installing Tk).  
-
-Insight inherits much of GDB's configuration options (like where it is
-to be installed).  See the GDB README file for more details on configure
-options and such for GDB.
-
-It is recommended that Insight, like GDB, be built outside of the source
-directory in order to preserve the integrity of the source directory.  This
-is very useful, for example, when building GDB/Insight for multiple hosts
-or targets.
-
-For example:
-
-	host> ls
-	src/
-	host> mkdir insight; cd insight
-	host> ../src/configure
-	host> make
-	host> make install
-
-Environment Variables
-=====================
-
-Insight and all of its support infrastructure read various environment variables
-for optional startup information. All of these environment variables are
-optional: Insight and its packages know how to find their files in both the
-install and the source trees.
-
-	Name			Description
-	----			-----------
-	TCL_LIBRARY		The location of the Tcl library files
-	TK_LIBRARY		The location of the Tk library files
-	TIX_LIBRARY		The location of the Tix library files
-	REDHAT_GUI_LIBRARY	The location of the libgui library files
-	GDBTK_LIBRARY		The location of the Insight library files
-	INSIGHT_PLUGINS		A colon-separated list of directories
-				to search for plugins (see gdb/gdbtk/plugins/HOW-TO)
-	GDBTK_DEBUG		Controls runtime loading of the Debug Window.
-				(This is the most useful debug option.)
-	GDBTK_TRACE		Controls runtime tracing of the tcl code
-	GDBTK_DEBUGFILE		Filename to send debug output
-	GDBTK_TEST_RUNNING	Testsuite variable. See gdb/testsuite/gdb.gdbtk/README
-				for more information.
-
-All of the environment variables for controlling Insight are well documented
-in gdb/gdbtk/library/main.tcl. Search for "env" to find them all.
-
-Using Insight
-=============
-
-Just run it like you would a normal GDB (in fact, it's actually called `gdb').
-If everything goes well, you should have several windows pop up.  To get going,
-hit the Run button, and go exploring.
-
-If you want to use GDB in command line mode, just use the -nw option.  Or, you
-can undefine the DISPLAY environment variable.
-
-Insight comes with all your standard debugger windows, including:
-
-	o Console Window
-	o Source Window
-	o Register Window
-	o Memory Window
-	o Locals Window
-	o Watch Window
-	o Stack Window
-	o Thread/Process Window
-	o Function Browser Window
-	o Debug Window (for developers)
-
-Insight also has an extensive (if outdated) online help system which describes
-all the windows and explains how to use them.  Users are urged to browse this
-help system for information on using Insight.
-
-Hacking Insight
-===============
-
-The GUI is primarily implemented by Tcl/Tk code which lives in gdb/gdbtk/library
- and bunch of C files in gdb/gdbtk/generic.  The Tcl/Tk code determines the look
-and feel, the layout, and the functions associated with all of the interface
-elements.  The C code is mostly just glue between GDB internals and Tcl-land.
-In essence, all of the policy is implemented in Tcl/Tk, and is easily changed
-without recompiling.
-
-To make more serious changes to the interface, such as adding a new window or
-changing the framework, you will have to hack the tcl code (and probably the C
-code as well).  The tcl library install directory is $(libdir) (probably
-/usr/local/lib/insight1.0).  But, you will probably want to hack on your own
-private copy before putting it up for the rest of the users.  To find the GDB tcl
-code, GDB first checks for the environment variable GDBTK_LIBRARY.  GDB will check
-this directory for the file "main.tcl".  If GDBTK_LIBRARY is not set, GDB will
-look for main.tcl in the install directory, and finally it will try to find 
-the tcl directory in the sources.
-
-A word about the different files in Insight is in order.  Insight is a hybrid of
-C code and "Tcl" code (actuall Incr Tcl code).  We use the following conventions
-for naming our tcl files (most of the time!).  Any file with a ".tcl" extension
-is simply vanilla tcl code.  Any file ending with ".itcl" is an Itcl file,
-class definition and implementation all in one.  So far so good.  Now comes the
-toughy: Files ending in ".ith" are Itcl class definition files, and they all
-must have a corresponding implementation file, ending in ".itb".  Why do we do
-this? Simple.  With Itcl, one can reread class implementations at runtime, but
-one cannot change the class definition.  So all those ".itcl" files can only
-be reread be restarting Insight.  The same is not true, though, of the ".itb"
-files.  Those files can be changed and immediately reread and used in Insight
-without having to restart (as long as the class definition doesn't change).  This
-is a nifty Itcl feature which is fully exploited by the Debug Window, which
-has a "ReSource" menu on it to reread the Tcl files.  (To get to the Debug Window,
-hit Ctrl-Alt-F11 in the Source Window or type "tk ManagedWin::open DebugWin" in
-the Console Window.)
-
-Internally, Insight is basically GDB, linked with Tcl/Tk, some Tcl/Tk extensions,
-and some glue code that interfaces GDB internals to Tcl-land.  This means that
-Insight operates as a single program, not a front-end to GDB.  All GDB commands,
-and a great deal of the target program state are accessible to the Tcl programmer.
-In addition, there are many callbacks from GDB to notify Tcl-land of important
-events.  Many of these are accomplished via "hooks" in GDB, and others are
-accomplished using event notifications.  GDB is slowly deprecating the use of
-"hooks" in favor of its new event mechanism.
-
-All of the below commands have lots of nice comments before them explaining what
-they all do, how they are to be used, etc.  The source code is the definitive
-authority (other than a maintainer) for the definition/usage of a command in
-Insight.  Hackers are urged to read through the source code for any commands
-which may need explaining.
-
-New Tcl Commands:
-
-Here is a brief, if incomplete, summary of the Tcl commands that are created
-by Insight.  These are installed into the Tcl interpreter in the C files.
-
-	Name			Description
-	----			-----------
-	gdb_cmd			Sends a text command to gdb.  Returns the result.
-				DEPRECATED: Do not use any more.
-	gdb_loc			Returns a list of useful tidbits about the specified
-				GDB linespec
-	gdb_sourcelines		Returns a list of executable lines for a source file
-	gdb_listfiles		Returns a list of all of the source files
-	gdb_stop		Stops the target process (or at least tries to)
-	gdb_reginfo		Returns information about registers (names, numbers,
-	              		values, size, etc.)
-	gdb_disassemble		Returns the text of a disassembly of the entire
-				function.  No longer used.
-	gdb_load_disassembly	Loads the disassembly of a location into a
-				source window's textbox
-	gdb_eval		Returns the value of a given expression
-	gdb_get_breakpoint_list	Returns a list of all breakpoints
-	gdb_get_breakpoint_info Returns a list of info about a breakpoint
-
-Tcl procedures that are hooked into GDB:
-
-This is a list, albeit incomplete, of the "hook" functions that are installed
-into GDB.  The actual "hooks" are installed/initialized in
-gdb/gdbtk/generic/gdbtk-hooks.c (and maybe one or two in gdbtk.c).  The list
-below is the Tcl side of the hook.
-
-	Name			Description
-	----			-----------
-	gdb_tcl_fputs		Sends output into Tcl for the command window
-	gdb_tcl_query		Pops up a query window
-	gdbtk_tcl_breakpoint	Notifies Tcl of changes to a breakpoint
-	gdbtk_tcl_idle		Notifies Tcl that debugged process is now idle
-	gdbtk_tcl_busy		Notifies Tcl that debugged process is now running
-
-Events:
-
-Starting with GDB 5.0, GDB has had an event loop.  Although largely unused right
-now, with it came some useful "baggage", especially event notifications, even
-though they, too, were largely incomplete.  The list of events continues to grow,
-and Insight and GDB often "share" overlapping events, but the list below is
-complete (since there are only a few defined events).  The source for these
-events can be found in gdb/gdbtk/library/gdbevents.it[hb].
-
-	Name			Description
-	----			-----------
-	BreakpointEvent		A breakpoint has been created/modified/deleted
-	TracepointEvent		A tracepoint has been created/modified/deleted
-	SetVariableEvent	User has issued a "set" command in Console
-	BusyEvent		The debugger is "busy"
-	IdleEvent		The debugger is "idle"
-	UpdateEvent		The state of the target has changed (or the
-				GDB's view of the target has changed)
-	ArchChangedEvent	The architecture of the system has changed
-				(this can happen when GDB defaults to using
-				some basic CPU and detects that a more elaborate
-				CPU is actually being used, e.g., SH5)
-
-GDB Commands:
-
-Insight installs a few GDB commands, which are available with the Console Window.
-
-	Name			Description
-	----			-----------
-	tk			Executes the arguments in the Insight Tcl
-				interpreter
-	view			Displays the given linespec in the Source Window
-
-Problems
-========
-
-During building, you may run into problems with finding Tcl, Tk or X11.  Look
-in gdb/Makefile, and fix TCL_CFLAGS, TCL, TK_CFLAGS, TK, and ENABLE_CLIBS as
-appropriate.
-
-If you one of the following messages when you run gdb:
-
-	Tcl_Init failed: can't find init.tcl; perhaps you need to
-	install Tcl or set your TCL_LIBRARY environment variable?
-or
-	Tk_Init failed: can't find tk.tcl; perhaps you need to
-	install Tk or set your TK_LIBRARY environment variable?
-
-then you haven't installed Tcl or TK properly.  Fix the appropriate environment
-variable to point at the {tcl tk}/library directory, and restart gdb.
-
-Known Bugs
-==========
-
-generic problems
-
-    o	Using the GDB commands "up"/"down"/"frame" in Console Window
-	can cause GDB and Insight to get out of sync.  If this happens,
-	simply use the Stack Window or the frame navigation buttons on
-	the Source Window's toolbar to resync the two.
-
-    o	Not really a problem, but it might be nice to have a frame/stack
-	window that displays the last N words on the stack, along with
-	indications about which function owns a particular frame, how the
-	frame pointers are chained, and possibly the names of variables
-	alongside their frame slots.
-
-host- or target-specific problems
-
-    o	Windows is hosed. Tk8.3 in sources.redhat.com is not stable
-	on windows. Wanna help?
-
-Where to find help
-==================
-
-The first place to turn for help is the online help system.  It may be old, but
-it is still largely correct: it explains what everything does.  If that fails,
-search the mailing list archives for other users who may have had similar problems
-or questions.  The archives are online at
-
-http://sources.redhat.com/insight/mailinglist.htm .
-
-If all else fails, send a note to the mailing list, insight@sources.redhat.com,
-where users and maintainers lurk.  This is a very low traffic list, so don't
-be afraid to join the list.  Instructions for joining are on our homepage,
-http://sources.redhat.com/insight .
diff --git a/gdb/gdbtk/TODO b/gdb/gdbtk/TODO
deleted file mode 100644
index 942febdb2ca..00000000000
--- a/gdb/gdbtk/TODO
+++ /dev/null
@@ -1,113 +0,0 @@
-If you find inaccuracies in this list, please send mail to
-insight@sources.redhat.com.  If you would like to work on any
-of these, you should consider sending mail to the same address, to
-find out whether anyone else is working on it.
-
-                New Features and Enhancements
-                =============================
-
-Display of the target program output.  Perhaps use the XTerm hack created
-by Tom.
-
---
-
-Support for inserting breakpoints at arbitrary locations, perhaps adding an
-entry widget to the breakpoints window.
-
---
-
-Support for hardware breakpoints and watchpoints (will need fixes in gdb).
-
---
-
-"Disassembly from Memory" Window. Perhaps as a pane in place of the source
-code one.
-
---
-
-Register Window capable of handling large number of registers, typed
-registers, registers organized in groups that can be shown/hidden and
-that provide for better screen organization.
-
---
-
-Per-project preferences so that one can have a preferred target settings
-for each project (and environment variable and the current directory would
-be searched for the project preference file -- global preferences would
-still come from the users's home directory).
-
---
-
-Reactivate the "Use this target?" confirmation box.  Do it independently of
-the above?
-
---
-
-Add option to activate the Source Window from the signal popup box when
-the inferior program is signaled.
-
-                     Code Cleanups
-                     =============
-
-Reorganize the Source Memory code.
-
---
-
-Clean up the class hierarchy.
-
---
-
-Migrate to Tcl/Tk 8.3.2
-
---
-
-Try BLT tree as an alternative to the Tix Tree, so we can drop Tix altogether.
-
---
-
-Optional use of installed Tcl/Tk (keeping it available on the distribution)
-
---
-
-Fix the gdbtk testsuite.
-
---
-
-Enhance the test harness, perhaps migrating to the new SourceNavigator testing
-system.
-
-                 Architectural Improvements
-                 ==========================
-
-Decouple the GUI from gdb, running them as separate processes.
-
---
-
-Separate the Tcl part from the Tk part to facilitate scripting.
-
-                        Bug Fixes
-                        =========
-
-Fix process attach, specially the process listing code.
-
-Fix Source Window so that Key shortcuts work (may not be possible without
-rewritting).
-
-Fix info popup annoyances (like trying to show a large array without even
-adding line breaks and showing up over right click menus).
-
-Fix command window command line recall that misses the arguments of
-commands that autoincrement their arguments.
-
-Fix function browser window problems.
-
-Maximization of a window affects preference sizing but forgets that maximized
-state was set.
-
-Taskbar "always on top" hides funcxtion combobox.
-
--- 
-Fernando Nasser
-Red Hat Canada Ltd.                     E-Mail:  fnasser@cygnus.com
-2323 Yonge Street, Suite #300
-Toronto, Ontario   M4P 2C9
diff --git a/gdb/gdbtk/aclocal.m4 b/gdb/gdbtk/aclocal.m4
deleted file mode 100644
index f5379a5be03..00000000000
--- a/gdb/gdbtk/aclocal.m4
+++ /dev/null
@@ -1,137 +0,0 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4
-
-dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-dnl PARTICULAR PURPOSE.
-
-# Do all the work for Automake.  This macro actually does too much --
-# some checks are only needed if your package does certain things.
-# But this isn't really a big deal.
-
-# serial 1
-
-dnl Usage:
-dnl AM_INIT_AUTOMAKE(package,version, [no-define])
-
-AC_DEFUN(AM_INIT_AUTOMAKE,
-[AC_REQUIRE([AC_PROG_INSTALL])
-PACKAGE=[$1]
-AC_SUBST(PACKAGE)
-VERSION=[$2]
-AC_SUBST(VERSION)
-dnl test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
-  AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-fi
-ifelse([$3],,
-AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
-AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package]))
-AC_REQUIRE([AM_SANITY_CHECK])
-AC_REQUIRE([AC_ARG_PROGRAM])
-dnl FIXME This is truly gross.
-missing_dir=`cd $ac_aux_dir && pwd`
-AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
-AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
-AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
-AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
-AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
-AC_REQUIRE([AC_PROG_MAKE_SET])])
-
-#
-# Check to make sure that the build environment is sane.
-#
-
-AC_DEFUN(AM_SANITY_CHECK,
-[AC_MSG_CHECKING([whether build environment is sane])
-# Just in case
-sleep 1
-echo timestamp > conftestfile
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
-   if test "[$]*" = "X"; then
-      # -L didn't work.
-      set X `ls -t $srcdir/configure conftestfile`
-   fi
-   if test "[$]*" != "X $srcdir/configure conftestfile" \
-      && test "[$]*" != "X conftestfile $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
-alias in your environment])
-   fi
-
-   test "[$]2" = conftestfile
-   )
-then
-   # Ok.
-   :
-else
-   AC_MSG_ERROR([newly created file is older than distributed files!
-Check your system clock])
-fi
-rm -f conftest*
-AC_MSG_RESULT(yes)])
-
-dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
-dnl The program must properly implement --version.
-AC_DEFUN(AM_MISSING_PROG,
-[AC_MSG_CHECKING(for working $2)
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if ($2 --version) < /dev/null > /dev/null 2>&1; then
-   $1=$2
-   AC_MSG_RESULT(found)
-else
-   $1="$3/missing $2"
-   AC_MSG_RESULT(missing)
-fi
-AC_SUBST($1)])
-
-# Add --enable-maintainer-mode option to configure.
-# From Jim Meyering
-
-# serial 1
-
-AC_DEFUN(AM_MAINTAINER_MODE,
-[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
-  dnl maintainer-mode is disabled by default
-  AC_ARG_ENABLE(maintainer-mode,
-[  --enable-maintainer-mode enable make rules and dependencies not useful
-                          (and sometimes confusing) to the casual installer],
-      USE_MAINTAINER_MODE=$enableval,
-      USE_MAINTAINER_MODE=no)
-  AC_MSG_RESULT($USE_MAINTAINER_MODE)
-  AM_CONDITIONAL(MAINTAINER_MODE, test $USE_MAINTAINER_MODE = yes)
-  MAINT=$MAINTAINER_MODE_TRUE
-  AC_SUBST(MAINT)dnl
-]
-)
-
-# Define a conditional.
-
-AC_DEFUN(AM_CONDITIONAL,
-[AC_SUBST($1_TRUE)
-AC_SUBST($1_FALSE)
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi])
-
diff --git a/gdb/gdbtk/configure b/gdb/gdbtk/configure
deleted file mode 100755
index b26c4e7bd7b..00000000000
--- a/gdb/gdbtk/configure
+++ /dev/null
@@ -1,1587 +0,0 @@
-#! /bin/sh
-
-# Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.13 
-# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
-#
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-
-# Defaults:
-ac_help=
-ac_default_prefix=/usr/local
-# Any additions from configure.in:
-ac_help="$ac_help
-  --enable-maintainer-mode enable make rules and dependencies not useful
-                          (and sometimes confusing) to the casual installer"
-
-# Initialize some variables set by options.
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-build=NONE
-cache_file=./config.cache
-exec_prefix=NONE
-host=NONE
-no_create=
-nonopt=NONE
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-sitefile=
-srcdir=
-target=NONE
-verbose=
-x_includes=NONE
-x_libraries=NONE
-bindir='${exec_prefix}/bin'
-sbindir='${exec_prefix}/sbin'
-libexecdir='${exec_prefix}/libexec'
-datadir='${prefix}/share'
-sysconfdir='${prefix}/etc'
-sharedstatedir='${prefix}/com'
-localstatedir='${prefix}/var'
-libdir='${exec_prefix}/lib'
-includedir='${prefix}/include'
-oldincludedir='/usr/include'
-infodir='${prefix}/info'
-mandir='${prefix}/man'
-
-# Initialize some other variables.
-subdirs=
-MFLAGS= MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
-# Maximum number of lines to put in a shell here document.
-ac_max_here_lines=12
-
-ac_prev=
-for ac_option
-do
-
-  # If the previous option needs an argument, assign it.
-  if test -n "$ac_prev"; then
-    eval "$ac_prev=\$ac_option"
-    ac_prev=
-    continue
-  fi
-
-  case "$ac_option" in
-  -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-  *) ac_optarg= ;;
-  esac
-
-  # Accept the important Cygnus configure options, so we can diagnose typos.
-
-  case "$ac_option" in
-
-  -bindir | --bindir | --bindi | --bind | --bin | --bi)
-    ac_prev=bindir ;;
-  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-    bindir="$ac_optarg" ;;
-
-  -build | --build | --buil | --bui | --bu)
-    ac_prev=build ;;
-  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build="$ac_optarg" ;;
-
-  -cache-file | --cache-file | --cache-fil | --cache-fi \
-  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-    ac_prev=cache_file ;;
-  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-    cache_file="$ac_optarg" ;;
-
-  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
-    ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
-  | --da=*)
-    datadir="$ac_optarg" ;;
-
-  -disable-* | --disable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*disable-//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    eval "enable_${ac_feature}=no" ;;
-
-  -enable-* | --enable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=*) ;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "enable_${ac_feature}='$ac_optarg'" ;;
-
-  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-  | --exec | --exe | --ex)
-    ac_prev=exec_prefix ;;
-  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
-  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
-  | --exec=* | --exe=* | --ex=*)
-    exec_prefix="$ac_optarg" ;;
-
-  -gas | --gas | --ga | --g)
-    # Obsolete; use --with-gas.
-    with_gas=yes ;;
-
-  -help | --help | --hel | --he)
-    # Omit some internal or obsolete options to make the list less imposing.
-    # This message is too long to be a string in the A/UX 3.1 sh.
-    cat << EOF
-Usage: configure [options] [host]
-Options: [defaults in brackets after descriptions]
-Configuration:
-  --cache-file=FILE       cache test results in FILE
-  --help                  print this message
-  --no-create             do not create output files
-  --quiet, --silent       do not print \`checking...' messages
-  --site-file=FILE        use FILE as the site file
-  --version               print the version of autoconf that created configure
-Directory and file names:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-                          [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-                          [same as prefix]
-  --bindir=DIR            user executables in DIR [EPREFIX/bin]
-  --sbindir=DIR           system admin executables in DIR [EPREFIX/sbin]
-  --libexecdir=DIR        program executables in DIR [EPREFIX/libexec]
-  --datadir=DIR           read-only architecture-independent data in DIR
-                          [PREFIX/share]
-  --sysconfdir=DIR        read-only single-machine data in DIR [PREFIX/etc]
-  --sharedstatedir=DIR    modifiable architecture-independent data in DIR
-                          [PREFIX/com]
-  --localstatedir=DIR     modifiable single-machine data in DIR [PREFIX/var]
-  --libdir=DIR            object code libraries in DIR [EPREFIX/lib]
-  --includedir=DIR        C header files in DIR [PREFIX/include]
-  --oldincludedir=DIR     C header files for non-gcc in DIR [/usr/include]
-  --infodir=DIR           info documentation in DIR [PREFIX/info]
-  --mandir=DIR            man documentation in DIR [PREFIX/man]
-  --srcdir=DIR            find the sources in DIR [configure dir or ..]
-  --program-prefix=PREFIX prepend PREFIX to installed program names
-  --program-suffix=SUFFIX append SUFFIX to installed program names
-  --program-transform-name=PROGRAM
-                          run sed PROGRAM on installed program names
-EOF
-    cat << EOF
-Host type:
-  --build=BUILD           configure for building on BUILD [BUILD=HOST]
-  --host=HOST             configure for HOST [guessed]
-  --target=TARGET         configure for TARGET [TARGET=HOST]
-Features and packages:
-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --x-includes=DIR        X include files are in DIR
-  --x-libraries=DIR       X library files are in DIR
-EOF
-    if test -n "$ac_help"; then
-      echo "--enable and --with options recognized:$ac_help"
-    fi
-    exit 0 ;;
-
-  -host | --host | --hos | --ho)
-    ac_prev=host ;;
-  -host=* | --host=* | --hos=* | --ho=*)
-    host="$ac_optarg" ;;
-
-  -includedir | --includedir | --includedi | --included | --include \
-  | --includ | --inclu | --incl | --inc)
-    ac_prev=includedir ;;
-  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
-  | --includ=* | --inclu=* | --incl=* | --inc=*)
-    includedir="$ac_optarg" ;;
-
-  -infodir | --infodir | --infodi | --infod | --info | --inf)
-    ac_prev=infodir ;;
-  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-    infodir="$ac_optarg" ;;
-
-  -libdir | --libdir | --libdi | --libd)
-    ac_prev=libdir ;;
-  -libdir=* | --libdir=* | --libdi=* | --libd=*)
-    libdir="$ac_optarg" ;;
-
-  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
-  | --libexe | --libex | --libe)
-    ac_prev=libexecdir ;;
-  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
-  | --libexe=* | --libex=* | --libe=*)
-    libexecdir="$ac_optarg" ;;
-
-  -localstatedir | --localstatedir | --localstatedi | --localstated \
-  | --localstate | --localstat | --localsta | --localst \
-  | --locals | --local | --loca | --loc | --lo)
-    ac_prev=localstatedir ;;
-  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-  | --localstate=* | --localstat=* | --localsta=* | --localst=* \
-  | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
-    localstatedir="$ac_optarg" ;;
-
-  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-    ac_prev=mandir ;;
-  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-    mandir="$ac_optarg" ;;
-
-  -nfp | --nfp | --nf)
-    # Obsolete; use --without-fp.
-    with_fp=no ;;
-
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c)
-    no_create=yes ;;
-
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
-    no_recursion=yes ;;
-
-  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
-  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
-  | --oldin | --oldi | --old | --ol | --o)
-    ac_prev=oldincludedir ;;
-  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
-  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
-  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-    oldincludedir="$ac_optarg" ;;
-
-  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-    ac_prev=prefix ;;
-  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-    prefix="$ac_optarg" ;;
-
-  -program-prefix | --program-prefix | --program-prefi | --program-pref \
-  | --program-pre | --program-pr | --program-p)
-    ac_prev=program_prefix ;;
-  -program-prefix=* | --program-prefix=* | --program-prefi=* \
-  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-    program_prefix="$ac_optarg" ;;
-
-  -program-suffix | --program-suffix | --program-suffi | --program-suff \
-  | --program-suf | --program-su | --program-s)
-    ac_prev=program_suffix ;;
-  -program-suffix=* | --program-suffix=* | --program-suffi=* \
-  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-    program_suffix="$ac_optarg" ;;
-
-  -program-transform-name | --program-transform-name \
-  | --program-transform-nam | --program-transform-na \
-  | --program-transform-n | --program-transform- \
-  | --program-transform | --program-transfor \
-  | --program-transfo | --program-transf \
-  | --program-trans | --program-tran \
-  | --progr-tra | --program-tr | --program-t)
-    ac_prev=program_transform_name ;;
-  -program-transform-name=* | --program-transform-name=* \
-  | --program-transform-nam=* | --program-transform-na=* \
-  | --program-transform-n=* | --program-transform-=* \
-  | --program-transform=* | --program-transfor=* \
-  | --program-transfo=* | --program-transf=* \
-  | --program-trans=* | --program-tran=* \
-  | --progr-tra=* | --program-tr=* | --program-t=*)
-    program_transform_name="$ac_optarg" ;;
-
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil)
-    silent=yes ;;
-
-  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
-    ac_prev=sbindir ;;
-  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-  | --sbi=* | --sb=*)
-    sbindir="$ac_optarg" ;;
-
-  -sharedstatedir | --sharedstatedir | --sharedstatedi \
-  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
-  | --sharedst | --shareds | --shared | --share | --shar \
-  | --sha | --sh)
-    ac_prev=sharedstatedir ;;
-  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
-  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
-  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
-  | --sha=* | --sh=*)
-    sharedstatedir="$ac_optarg" ;;
-
-  -site | --site | --sit)
-    ac_prev=site ;;
-  -site=* | --site=* | --sit=*)
-    site="$ac_optarg" ;;
-
-  -site-file | --site-file | --site-fil | --site-fi | --site-f)
-    ac_prev=sitefile ;;
-  -site-file=* | --site-file=* | --site-fil=* | --site-fi=* | --site-f=*)
-    sitefile="$ac_optarg" ;;
-
-  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-    ac_prev=srcdir ;;
-  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-    srcdir="$ac_optarg" ;;
-
-  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
-  | --syscon | --sysco | --sysc | --sys | --sy)
-    ac_prev=sysconfdir ;;
-  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
-  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-    sysconfdir="$ac_optarg" ;;
-
-  -target | --target | --targe | --targ | --tar | --ta | --t)
-    ac_prev=target ;;
-  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target="$ac_optarg" ;;
-
-  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-    verbose=yes ;;
-
-  -version | --version | --versio | --versi | --vers)
-    echo "configure generated by autoconf version 2.13"
-    exit 0 ;;
-
-  -with-* | --with-*)
-    ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=*) ;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "with_${ac_package}='$ac_optarg'" ;;
-
-  -without-* | --without-*)
-    ac_package=`echo $ac_option|sed -e 's/-*without-//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    eval "with_${ac_package}=no" ;;
-
-  --x)
-    # Obsolete; use --with-x.
-    with_x=yes ;;
-
-  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
-  | --x-incl | --x-inc | --x-in | --x-i)
-    ac_prev=x_includes ;;
-  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
-  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-    x_includes="$ac_optarg" ;;
-
-  -x-libraries | --x-libraries | --x-librarie | --x-librari \
-  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
-    ac_prev=x_libraries ;;
-  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
-  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-    x_libraries="$ac_optarg" ;;
-
-  -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
-    ;;
-
-  *)
-    if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
-      echo "configure: warning: $ac_option: invalid host type" 1>&2
-    fi
-    if test "x$nonopt" != xNONE; then
-      { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
-    fi
-    nonopt="$ac_option"
-    ;;
-
-  esac
-done
-
-if test -n "$ac_prev"; then
-  { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; }
-fi
-
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-# File descriptor usage:
-# 0 standard input
-# 1 file creation
-# 2 errors and warnings
-# 3 some systems may open it to /dev/tty
-# 4 used on the Kubota Titan
-# 6 checking for... messages and results
-# 5 compiler messages saved in config.log
-if test "$silent" = yes; then
-  exec 6>/dev/null
-else
-  exec 6>&1
-fi
-exec 5>./config.log
-
-echo "\
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-" 1>&5
-
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Also quote any args containing shell metacharacters.
-ac_configure_args=
-for ac_arg
-do
-  case "$ac_arg" in
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c) ;;
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;;
-  *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*)
-  ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-  *) ac_configure_args="$ac_configure_args $ac_arg" ;;
-  esac
-done
-
-# NLS nuisances.
-# Only set these to C if already set.  These must not be set unconditionally
-# because not all systems understand e.g. LANG=C (notably SCO).
-# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
-# Non-C LC_CTYPE values break the ctype check.
-if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
-if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
-if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
-if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
-
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -rf conftest* confdefs.h
-# AIX cpp loses on an empty file, so make sure it contains at least a newline.
-echo > confdefs.h
-
-# A filename unique to this package, relative to the directory that
-# configure is in, which we can look for to find out if srcdir is correct.
-ac_unique_file=generic/gdbtk.h
-
-# Find the source files, if location was not specified.
-if test -z "$srcdir"; then
-  ac_srcdir_defaulted=yes
-  # Try the directory containing this script, then its parent.
-  ac_prog=$0
-  ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'`
-  test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
-  srcdir=$ac_confdir
-  if test ! -r $srcdir/$ac_unique_file; then
-    srcdir=..
-  fi
-else
-  ac_srcdir_defaulted=no
-fi
-if test ! -r $srcdir/$ac_unique_file; then
-  if test "$ac_srcdir_defaulted" = yes; then
-    { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; }
-  else
-    { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; }
-  fi
-fi
-srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
-
-# Prefer explicitly selected file to automatically selected ones.
-if test -z "$sitefile"; then
-  if test -z "$CONFIG_SITE"; then
-    if test "x$prefix" != xNONE; then
-      CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-    else
-      CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
-    fi
-  fi
-else
-  CONFIG_SITE="$sitefile"
-fi
-for ac_site_file in $CONFIG_SITE; do
-  if test -r "$ac_site_file"; then
-    echo "loading site script $ac_site_file"
-    . "$ac_site_file"
-  fi
-done
-
-if test -r "$cache_file"; then
-  echo "loading cache $cache_file"
-  . $cache_file
-else
-  echo "creating cache $cache_file"
-  > $cache_file
-fi
-
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-ac_exeext=
-ac_objext=o
-if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
-  # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
-  if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
-    ac_n= ac_c='
-' ac_t='	'
-  else
-    ac_n=-n ac_c= ac_t=
-  fi
-else
-  ac_n= ac_c='\c' ac_t=
-fi
-
-
-ac_aux_dir=
-for ac_dir in ../.. $srcdir/../..; do
-  if test -f $ac_dir/install-sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f $ac_dir/install.sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  { echo "configure: error: can not find install-sh or install.sh in ../.. $srcdir/../.." 1>&2; exit 1; }
-fi
-ac_config_guess=$ac_aux_dir/config.guess
-ac_config_sub=$ac_aux_dir/config.sub
-ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
-
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# ./install, which can be erroneously created by make from ./install.sh.
-echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:570: checking for a BSD compatible install" >&5
-if test -z "$INSTALL"; then
-if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
-  for ac_dir in $PATH; do
-    # Account for people who put trailing slashes in PATH elements.
-    case "$ac_dir/" in
-    /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
-    *)
-      # OSF1 and SCO ODT 3.0 have their own names for install.
-      # Don't use installbsd from OSF since it installs stuff as root
-      # by default.
-      for ac_prog in ginstall scoinst install; do
-        if test -f $ac_dir/$ac_prog; then
-	  if test $ac_prog = install &&
-            grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  else
-	    ac_cv_path_install="$ac_dir/$ac_prog -c"
-	    break 2
-	  fi
-	fi
-      done
-      ;;
-    esac
-  done
-  IFS="$ac_save_IFS"
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL="$ac_cv_path_install"
-  else
-    # As a last resort, use the slow shell script.  We don't cache a
-    # path for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the path is relative.
-    INSTALL="$ac_install_sh"
-  fi
-fi
-echo "$ac_t""$INSTALL" 1>&6
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
-echo "configure:623: checking whether build environment is sane" >&5
-# Just in case
-sleep 1
-echo timestamp > conftestfile
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
-   if test "$*" = "X"; then
-      # -L didn't work.
-      set X `ls -t $srcdir/configure conftestfile`
-   fi
-   if test "$*" != "X $srcdir/configure conftestfile" \
-      && test "$*" != "X conftestfile $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      { echo "configure: error: ls -t appears to fail.  Make sure there is not a broken
-alias in your environment" 1>&2; exit 1; }
-   fi
-
-   test "$2" = conftestfile
-   )
-then
-   # Ok.
-   :
-else
-   { echo "configure: error: newly created file is older than distributed files!
-Check your system clock" 1>&2; exit 1; }
-fi
-rm -f conftest*
-echo "$ac_t""yes" 1>&6
-if test "$program_transform_name" = s,x,x,; then
-  program_transform_name=
-else
-  # Double any \ or $.  echo might interpret backslashes.
-  cat <<\EOF_SED > conftestsed
-s,\\,\\\\,g; s,\$,$$,g
-EOF_SED
-  program_transform_name="`echo $program_transform_name|sed -f conftestsed`"
-  rm -f conftestsed
-fi
-test "$program_prefix" != NONE &&
-  program_transform_name="s,^,${program_prefix},; $program_transform_name"
-# Use a double $ so make ignores it.
-test "$program_suffix" != NONE &&
-  program_transform_name="s,\$\$,${program_suffix},; $program_transform_name"
-
-# sed with no file args requires a program.
-test "$program_transform_name" = "" && program_transform_name="s,x,x,"
-
-echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:680: checking whether ${MAKE-make} sets \${MAKE}" >&5
-set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftestmake <<\EOF
-all:
-	@echo 'ac_maketemp="${MAKE}"'
-EOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=`
-if test -n "$ac_maketemp"; then
-  eval ac_cv_prog_make_${ac_make}_set=yes
-else
-  eval ac_cv_prog_make_${ac_make}_set=no
-fi
-rm -f conftestmake
-fi
-if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  SET_MAKE=
-else
-  echo "$ac_t""no" 1>&6
-  SET_MAKE="MAKE=${MAKE-make}"
-fi
-
-
-PACKAGE=insight
-
-VERSION=1.0
-
-if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
-  { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
-fi
-cat >> confdefs.h <<EOF
-#define PACKAGE "$PACKAGE"
-EOF
-
-cat >> confdefs.h <<EOF
-#define VERSION "$VERSION"
-EOF
-
-
-
-missing_dir=`cd $ac_aux_dir && pwd`
-echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
-echo "configure:726: checking for working aclocal" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (aclocal --version) < /dev/null > /dev/null 2>&1; then
-   ACLOCAL=aclocal
-   echo "$ac_t""found" 1>&6
-else
-   ACLOCAL="$missing_dir/missing aclocal"
-   echo "$ac_t""missing" 1>&6
-fi
-
-echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-echo "configure:739: checking for working autoconf" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (autoconf --version) < /dev/null > /dev/null 2>&1; then
-   AUTOCONF=autoconf
-   echo "$ac_t""found" 1>&6
-else
-   AUTOCONF="$missing_dir/missing autoconf"
-   echo "$ac_t""missing" 1>&6
-fi
-
-echo $ac_n "checking for working automake""... $ac_c" 1>&6
-echo "configure:752: checking for working automake" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (automake --version) < /dev/null > /dev/null 2>&1; then
-   AUTOMAKE=automake
-   echo "$ac_t""found" 1>&6
-else
-   AUTOMAKE="$missing_dir/missing automake"
-   echo "$ac_t""missing" 1>&6
-fi
-
-echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-echo "configure:765: checking for working autoheader" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (autoheader --version) < /dev/null > /dev/null 2>&1; then
-   AUTOHEADER=autoheader
-   echo "$ac_t""found" 1>&6
-else
-   AUTOHEADER="$missing_dir/missing autoheader"
-   echo "$ac_t""missing" 1>&6
-fi
-
-echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
-echo "configure:778: checking for working makeinfo" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (makeinfo --version) < /dev/null > /dev/null 2>&1; then
-   MAKEINFO=makeinfo
-   echo "$ac_t""found" 1>&6
-else
-   MAKEINFO="$missing_dir/missing makeinfo"
-   echo "$ac_t""missing" 1>&6
-fi
-
-
-echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:792: checking whether to enable maintainer-specific portions of Makefiles" >&5
-    # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
-if test "${enable_maintainer_mode+set}" = set; then
-  enableval="$enable_maintainer_mode"
-  USE_MAINTAINER_MODE=$enableval
-else
-  USE_MAINTAINER_MODE=no
-fi
-
-  echo "$ac_t""$USE_MAINTAINER_MODE" 1>&6
-  
-
-if test $USE_MAINTAINER_MODE = yes; then
-  MAINTAINER_MODE_TRUE=
-  MAINTAINER_MODE_FALSE='#'
-else
-  MAINTAINER_MODE_TRUE='#'
-  MAINTAINER_MODE_FALSE=
-fi
-  MAINT=$MAINTAINER_MODE_TRUE
-  
-
-
-# Make sure we can run config.sub.
-if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
-else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:821: checking host system type" >&5
-
-host_alias=$host
-case "$host_alias" in
-NONE)
-  case $nonopt in
-  NONE)
-    if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then :
-    else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
-    fi ;;
-  *) host_alias=$nonopt ;;
-  esac ;;
-esac
-
-host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias`
-host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$host" 1>&6
-
-echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:842: checking whether ${MAKE-make} sets \${MAKE}" >&5
-set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftestmake <<\EOF
-all:
-	@echo 'ac_maketemp="${MAKE}"'
-EOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=`
-if test -n "$ac_maketemp"; then
-  eval ac_cv_prog_make_${ac_make}_set=yes
-else
-  eval ac_cv_prog_make_${ac_make}_set=no
-fi
-rm -f conftestmake
-fi
-if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  SET_MAKE=
-else
-  echo "$ac_t""no" 1>&6
-  SET_MAKE="MAKE=${MAKE-make}"
-fi
-
-# Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:871: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CC="gcc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:901: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_prog_rejected=no
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
-        ac_prog_rejected=yes
-	continue
-      fi
-      ac_cv_prog_CC="cc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# -gt 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    set dummy "$ac_dir/$ac_word" "$@"
-    shift
-    ac_cv_prog_CC="$@"
-  fi
-fi
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-  if test -z "$CC"; then
-    case "`uname -s`" in
-    *win32* | *WIN32*)
-      # Extract the first word of "cl", so it can be a program name with args.
-set dummy cl; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:952: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CC="cl"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
- ;;
-    esac
-  fi
-  test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:984: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
-
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-cat > conftest.$ac_ext << EOF
-
-#line 995 "configure"
-#include "confdefs.h"
-
-main(){return(0);}
-EOF
-if { (eval echo configure:1000: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  ac_cv_prog_cc_works=yes
-  # If we can't run a trivial program, we are probably using a cross compiler.
-  if (./conftest; exit) 2>/dev/null; then
-    ac_cv_prog_cc_cross=no
-  else
-    ac_cv_prog_cc_cross=yes
-  fi
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  ac_cv_prog_cc_works=no
-fi
-rm -fr conftest*
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
-if test $ac_cv_prog_cc_works = no; then
-  { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
-fi
-echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1026: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
-echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
-cross_compiling=$ac_cv_prog_cc_cross
-
-echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1031: checking whether we are using GNU C" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.c <<EOF
-#ifdef __GNUC__
-  yes;
-#endif
-EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1040: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-  ac_cv_prog_gcc=yes
-else
-  ac_cv_prog_gcc=no
-fi
-fi
-
-echo "$ac_t""$ac_cv_prog_gcc" 1>&6
-
-if test $ac_cv_prog_gcc = yes; then
-  GCC=yes
-else
-  GCC=
-fi
-
-ac_test_CFLAGS="${CFLAGS+set}"
-ac_save_CFLAGS="$CFLAGS"
-CFLAGS=
-echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1059: checking whether ${CC-cc} accepts -g" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  echo 'void f(){}' > conftest.c
-if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
-  ac_cv_prog_cc_g=yes
-else
-  ac_cv_prog_cc_g=no
-fi
-rm -f conftest*
-
-fi
-
-echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
-if test "$ac_test_CFLAGS" = set; then
-  CFLAGS="$ac_save_CFLAGS"
-elif test $ac_cv_prog_cc_g = yes; then
-  if test "$GCC" = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-g"
-  fi
-else
-  if test "$GCC" = yes; then
-    CFLAGS="-O2"
-  else
-    CFLAGS=
-  fi
-fi
-
-echo $ac_n "checking for object suffix""... $ac_c" 1>&6
-echo "configure:1091: checking for object suffix" >&5
-if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  rm -f conftest*
-echo 'int i = 1;' > conftest.$ac_ext
-if { (eval echo configure:1097: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  for ac_file in conftest.*; do
-    case $ac_file in
-    *.c) ;;
-    *) ac_cv_objext=`echo $ac_file | sed -e s/conftest.//` ;;
-    esac
-  done
-else
-  { echo "configure: error: installation or configuration problem; compiler does not work" 1>&2; exit 1; }
-fi
-rm -f conftest*
-fi
-
-echo "$ac_t""$ac_cv_objext" 1>&6
-OBJEXT=$ac_cv_objext
-ac_objext=$ac_cv_objext
-
-echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
-echo "configure:1115: checking for Cygwin environment" >&5
-if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 1120 "configure"
-#include "confdefs.h"
-
-int main() {
-
-#ifndef __CYGWIN__
-#define __CYGWIN__ __CYGWIN32__
-#endif
-return __CYGWIN__;
-; return 0; }
-EOF
-if { (eval echo configure:1131: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  ac_cv_cygwin=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_cygwin=no
-fi
-rm -f conftest*
-rm -f conftest*
-fi
-
-echo "$ac_t""$ac_cv_cygwin" 1>&6
-CYGWIN=
-test "$ac_cv_cygwin" = yes && CYGWIN=yes
-echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
-echo "configure:1148: checking for mingw32 environment" >&5
-if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 1153 "configure"
-#include "confdefs.h"
-
-int main() {
-return __MINGW32__;
-; return 0; }
-EOF
-if { (eval echo configure:1160: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  ac_cv_mingw32=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_mingw32=no
-fi
-rm -f conftest*
-rm -f conftest*
-fi
-
-echo "$ac_t""$ac_cv_mingw32" 1>&6
-MINGW32=
-test "$ac_cv_mingw32" = yes && MINGW32=yes
-
-
-echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1179: checking for executable suffix" >&5
-if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test "$CYGWIN" = yes || test "$MINGW32" = yes; then
-  ac_cv_exeext=.exe
-else
-  rm -f conftest*
-  echo 'int main () { return 0; }' > conftest.$ac_ext
-  ac_cv_exeext=
-  if { (eval echo configure:1189: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
-    for file in conftest.*; do
-      case $file in
-      *.c | *.o | *.obj | *.ilk | *.pdb) ;;
-      *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
-      esac
-    done
-  else
-    { echo "configure: error: installation or configuration problem: compiler cannot create executables." 1>&2; exit 1; }
-  fi
-  rm -f conftest*
-  test x"${ac_cv_exeext}" = x && ac_cv_exeext=no
-fi
-fi
-
-EXEEXT=""
-test x"${ac_cv_exeext}" != xno && EXEEXT=${ac_cv_exeext}
-echo "$ac_t""${ac_cv_exeext}" 1>&6
-ac_exeext=$EXEEXT
-
-
-subdirs="plugins"
-
-trap '' 1 2 15
-cat > confcache <<\EOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs.  It is not useful on other systems.
-# If it contains results you don't want to keep, you may remove or edit it.
-#
-# By default, configure uses ./config.cache as the cache file,
-# creating it if it does not exist already.  You can give configure
-# the --cache-file=FILE option to use a different cache file; that is
-# what configure does when it calls configure scripts in
-# subdirectories, so they share the cache.
-# Giving --cache-file=/dev/null disables caching, for debugging configure.
-# config.status only pays attention to the cache file if you give it the
-# --recheck option to rerun configure.
-#
-EOF
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(set) 2>&1 |
-  case `(ac_space=' '; set | grep ac_space) 2>&1` in
-  *ac_space=\ *)
-    # `set' does not quote correctly, so add quotes (double-quote substitution
-    # turns \\\\ into \\, and sed turns \\ into \).
-    sed -n \
-      -e "s/'/'\\\\''/g" \
-      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
-    ;;
-  *)
-    # `set' quotes correctly as required by POSIX, so do not add quotes.
-    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
-    ;;
-  esac >> confcache
-if cmp -s $cache_file confcache; then
-  :
-else
-  if test -w $cache_file; then
-    echo "updating cache $cache_file"
-    cat confcache > $cache_file
-  else
-    echo "not updating unwritable cache $cache_file"
-  fi
-fi
-rm -f confcache
-
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-# Any assignment to VPATH causes Sun make to only execute
-# the first set of double-colon rules, so remove it if not needed.
-# If there is a colon in the path, we need to keep it.
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[ 	]*VPATH[ 	]*=[^:]*$/d'
-fi
-
-trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
-
-# Transform confdefs.h into DEFS.
-# Protect against shell expansion while executing Makefile rules.
-# Protect against Makefile macro expansion.
-cat > conftest.defs <<\EOF
-s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g
-s%[ 	`~#$^&*(){}\\|;'"<>?]%\\&%g
-s%\[%\\&%g
-s%\]%\\&%g
-s%\$%$$%g
-EOF
-DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '`
-rm -f conftest.defs
-
-
-# Without the "./", some shells look in PATH for config.status.
-: ${CONFIG_STATUS=./config.status}
-
-echo creating $CONFIG_STATUS
-rm -f $CONFIG_STATUS
-cat > $CONFIG_STATUS <<EOF
-#! /bin/sh
-# Generated automatically by configure.
-# Run this file to recreate the current configuration.
-# This directory was configured as follows,
-# on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-#
-# $0 $ac_configure_args
-#
-# Compiler output produced by configure, useful for debugging
-# configure, is in ./config.log if it exists.
-
-ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]"
-for ac_option
-do
-  case "\$ac_option" in
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
-    exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
-  -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
-    echo "$CONFIG_STATUS generated by autoconf version 2.13"
-    exit 0 ;;
-  -help | --help | --hel | --he | --h)
-    echo "\$ac_cs_usage"; exit 0 ;;
-  *) echo "\$ac_cs_usage"; exit 1 ;;
-  esac
-done
-
-ac_given_srcdir=$srcdir
-ac_given_INSTALL="$INSTALL"
-
-trap 'rm -fr `echo "Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
-EOF
-cat >> $CONFIG_STATUS <<EOF
-
-# Protect against being on the right side of a sed subst in config.status.
-sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g;
- s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
-$ac_vpsub
-$extrasub
-s%@SHELL@%$SHELL%g
-s%@CFLAGS@%$CFLAGS%g
-s%@CPPFLAGS@%$CPPFLAGS%g
-s%@CXXFLAGS@%$CXXFLAGS%g
-s%@FFLAGS@%$FFLAGS%g
-s%@DEFS@%$DEFS%g
-s%@LDFLAGS@%$LDFLAGS%g
-s%@LIBS@%$LIBS%g
-s%@exec_prefix@%$exec_prefix%g
-s%@prefix@%$prefix%g
-s%@program_transform_name@%$program_transform_name%g
-s%@bindir@%$bindir%g
-s%@sbindir@%$sbindir%g
-s%@libexecdir@%$libexecdir%g
-s%@datadir@%$datadir%g
-s%@sysconfdir@%$sysconfdir%g
-s%@sharedstatedir@%$sharedstatedir%g
-s%@localstatedir@%$localstatedir%g
-s%@libdir@%$libdir%g
-s%@includedir@%$includedir%g
-s%@oldincludedir@%$oldincludedir%g
-s%@infodir@%$infodir%g
-s%@mandir@%$mandir%g
-s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
-s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
-s%@INSTALL_DATA@%$INSTALL_DATA%g
-s%@PACKAGE@%$PACKAGE%g
-s%@VERSION@%$VERSION%g
-s%@ACLOCAL@%$ACLOCAL%g
-s%@AUTOCONF@%$AUTOCONF%g
-s%@AUTOMAKE@%$AUTOMAKE%g
-s%@AUTOHEADER@%$AUTOHEADER%g
-s%@MAKEINFO@%$MAKEINFO%g
-s%@SET_MAKE@%$SET_MAKE%g
-s%@MAINTAINER_MODE_TRUE@%$MAINTAINER_MODE_TRUE%g
-s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g
-s%@MAINT@%$MAINT%g
-s%@host@%$host%g
-s%@host_alias@%$host_alias%g
-s%@host_cpu@%$host_cpu%g
-s%@host_vendor@%$host_vendor%g
-s%@host_os@%$host_os%g
-s%@CC@%$CC%g
-s%@OBJEXT@%$OBJEXT%g
-s%@EXEEXT@%$EXEEXT%g
-s%@subdirs@%$subdirs%g
-
-CEOF
-EOF
-
-cat >> $CONFIG_STATUS <<\EOF
-
-# Split the substitutions into bite-sized pieces for seds with
-# small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=60 # Maximum number of lines to put in a sed script.
-ac_file=1 # Number of current file.
-ac_beg=1 # First line for current file.
-ac_end=$ac_max_sed_cmds # Line after last line for current file.
-ac_more_lines=:
-ac_sed_cmds=""
-while $ac_more_lines; do
-  if test $ac_beg -gt 1; then
-    sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file
-  else
-    sed "${ac_end}q" conftest.subs > conftest.s$ac_file
-  fi
-  if test ! -s conftest.s$ac_file; then
-    ac_more_lines=false
-    rm -f conftest.s$ac_file
-  else
-    if test -z "$ac_sed_cmds"; then
-      ac_sed_cmds="sed -f conftest.s$ac_file"
-    else
-      ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file"
-    fi
-    ac_file=`expr $ac_file + 1`
-    ac_beg=$ac_end
-    ac_end=`expr $ac_end + $ac_max_sed_cmds`
-  fi
-done
-if test -z "$ac_sed_cmds"; then
-  ac_sed_cmds=cat
-fi
-EOF
-
-cat >> $CONFIG_STATUS <<EOF
-
-CONFIG_FILES=\${CONFIG_FILES-"Makefile"}
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case "$ac_file" in
-  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
-       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-  *) ac_file_in="${ac_file}.in" ;;
-  esac
-
-  # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
-
-  # Remove last slash and all that follows it.  Not all systems have dirname.
-  ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
-  if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
-    # The file is in a subdirectory.
-    test ! -d "$ac_dir" && mkdir "$ac_dir"
-    ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`"
-    # A "../" for each directory in $ac_dir_suffix.
-    ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'`
-  else
-    ac_dir_suffix= ac_dots=
-  fi
-
-  case "$ac_given_srcdir" in
-  .)  srcdir=.
-      if test -z "$ac_dots"; then top_srcdir=.
-      else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;;
-  /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;;
-  *) # Relative path.
-    srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
-    top_srcdir="$ac_dots$ac_given_srcdir" ;;
-  esac
-
-  case "$ac_given_INSTALL" in
-  [/$]*) INSTALL="$ac_given_INSTALL" ;;
-  *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
-  esac
-
-  echo creating "$ac_file"
-  rm -f "$ac_file"
-  configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
-  case "$ac_file" in
-  *Makefile*) ac_comsub="1i\\
-# $configure_input" ;;
-  *) ac_comsub= ;;
-  esac
-
-  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
-  sed -e "$ac_comsub
-s%@configure_input@%$configure_input%g
-s%@srcdir@%$srcdir%g
-s%@top_srcdir@%$top_srcdir%g
-s%@INSTALL@%$INSTALL%g
-" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file
-fi; done
-rm -f conftest.s*
-
-EOF
-cat >> $CONFIG_STATUS <<EOF
-
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-
-exit 0
-EOF
-chmod +x $CONFIG_STATUS
-rm -fr confdefs* $ac_clean_files
-test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
-
-if test "$no_recursion" != yes; then
-
-  # Remove --cache-file and --srcdir arguments so they do not pile up.
-  ac_sub_configure_args=
-  ac_prev=
-  for ac_arg in $ac_configure_args; do
-    if test -n "$ac_prev"; then
-      ac_prev=
-      continue
-    fi
-    case "$ac_arg" in
-    -cache-file | --cache-file | --cache-fil | --cache-fi \
-    | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-      ac_prev=cache_file ;;
-    -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-    | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-      ;;
-    -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-      ac_prev=srcdir ;;
-    -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-      ;;
-    *) ac_sub_configure_args="$ac_sub_configure_args $ac_arg" ;;
-    esac
-  done
-
-  for ac_config_dir in plugins; do
-
-    # Do not complain, so a configure script can configure whichever
-    # parts of a large source tree are present.
-    if test ! -d $srcdir/$ac_config_dir; then
-      continue
-    fi
-
-    echo configuring in $ac_config_dir
-
-    case "$srcdir" in
-    .) ;;
-    *)
-      if test -d ./$ac_config_dir || mkdir ./$ac_config_dir; then :;
-      else
-        { echo "configure: error: can not create `pwd`/$ac_config_dir" 1>&2; exit 1; }
-      fi
-      ;;
-    esac
-
-    ac_popdir=`pwd`
-    cd $ac_config_dir
-
-      # A "../" for each directory in /$ac_config_dir.
-      ac_dots=`echo $ac_config_dir|sed -e 's%^\./%%' -e 's%[^/]$%&/%' -e 's%[^/]*/%../%g'`
-
-    case "$srcdir" in
-    .) # No --srcdir option.  We are building in place.
-      ac_sub_srcdir=$srcdir ;;
-    /*) # Absolute path.
-      ac_sub_srcdir=$srcdir/$ac_config_dir ;;
-    *) # Relative path.
-      ac_sub_srcdir=$ac_dots$srcdir/$ac_config_dir ;;
-    esac
-
-    # Check for guested configure; otherwise get Cygnus style configure.
-    if test -f $ac_sub_srcdir/configure; then
-      ac_sub_configure=$ac_sub_srcdir/configure
-    elif test -f $ac_sub_srcdir/configure.in; then
-      ac_sub_configure=$ac_configure
-    else
-      echo "configure: warning: no configuration information is in $ac_config_dir" 1>&2
-      ac_sub_configure=
-    fi
-
-    # The recursion is here.
-    if test -n "$ac_sub_configure"; then
-
-      # Make the cache file name correct relative to the subdirectory.
-      case "$cache_file" in
-      /*) ac_sub_cache_file=$cache_file ;;
-      *) # Relative path.
-        ac_sub_cache_file="$ac_dots$cache_file" ;;
-      esac
-  case "$ac_given_INSTALL" in
-        [/$]*) INSTALL="$ac_given_INSTALL" ;;
-        *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
-        esac
-
-      echo "running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir"
-      # The eval makes quoting arguments work.
-      if eval ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir
-      then :
-      else
-        { echo "configure: error: $ac_sub_configure failed for $ac_config_dir" 1>&2; exit 1; }
-      fi
-    fi
-
-    cd $ac_popdir
-  done
-fi
-
diff --git a/gdb/gdbtk/configure.in b/gdb/gdbtk/configure.in
deleted file mode 100644
index 5925d6b84e0..00000000000
--- a/gdb/gdbtk/configure.in
+++ /dev/null
@@ -1,12 +0,0 @@
-AC_INIT(generic/gdbtk.h)
-AC_CONFIG_AUX_DIR(../..)
-AM_INIT_AUTOMAKE(insight, 1.0)
-AM_MAINTAINER_MODE
-AC_CANONICAL_HOST
-AC_PROG_MAKE_SET
-AC_PROG_CC
-AC_OBJEXT
-AC_EXEEXT
-
-AC_CONFIG_SUBDIRS(plugins)
-AC_OUTPUT(Makefile)
diff --git a/gdb/gdbtk/gdb.rc b/gdb/gdbtk/gdb.rc
deleted file mode 100644
index 9f7c44035a0..00000000000
--- a/gdb/gdbtk/gdb.rc
+++ /dev/null
@@ -1 +0,0 @@
-tk                         ICON    DISCARDABLE     "gdbtool.ico"
diff --git a/gdb/gdbtk/gdbtool.ico b/gdb/gdbtk/gdbtool.ico
deleted file mode 100644
index 919202c7f43..00000000000
--- a/gdb/gdbtk/gdbtool.ico
+++ /dev/null
diff --git a/gdb/gdbtk/generic/ChangeLog-1997 b/gdb/gdbtk/generic/ChangeLog-1997
deleted file mode 100644
index 365457035b8..00000000000
--- a/gdb/gdbtk/generic/ChangeLog-1997
+++ /dev/null
@@ -1,1196 +0,0 @@
-Tue Dec 16 21:16:42 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* Makefile.in (LIBGUI): New variable.
-	(GUI_CFLAGS_X): New variable.
-	(IDE_CFLAGS): Add $(GUI_CFLAGS_X).
-	* configure.in: Add $(LIBGUI) to TCL_LIBS and CONFIG_DEPS.
-	* configure: Rebuild.
-
-Wed Dec  10 13:16:45 1997  Keith Seitz  <keiths@onions.cygnus.com>
-
-	* gdbtk.c (gdb_get_tracepoint_info): Use info in struct 
-	symtab_and_line (not struct tracepoint) so that we get the
-	real line info for an address. Arrange data more like
-	gdb_get_breakpoint_info.
-	(tracepoint_notify): Use info in struct symtab_and_line again.
-	(gdbtk_init): Add command "gdb_get_tracepoint_list" into
-	interpreter.
-	(gdb_get_tracepoint_list): New function that aids the source
-	window in displaying tracepoints when the file changes.
-	
-Fri Dec  5 10:31:23 1997  Keith Seitz  <keiths@pizza.cygnus.com>
-
-	* gdbtk.c (gdbtk_init): Add gdb_find_file into interpreter.
-	(gdb_find_file_command): New function which searches source path
-	to find the real full filename of a file.
-
-Mon Dec  1 10:19:44 1997  Keith Seitz  <keiths@onions.cygnus.com>
-
-	* gdbtk.c: Move include of "guitcl.h" back out of IDE ifdef.
-	(gdbtk_init): Move ide_initialize_paths out of IDE ifdef.
-
-	* configure.in (TCL_LIBS, CONFIG_DEPS): Add IDE libraries for all
-	builds.
-	(CONFIG_OBS): Remove tracepoint.o, which should always be included.
-
-	* configure: regenerate
-
-	* Makefile.in (install-only): ALWAYS install the new gdbtk
-	(REMOTE_OBS): add tracepoint.o
-	
-Thu Nov 27 09:07:18 1997  Michael Meissner  <meissner@cygnus.com>
-
-	* configure.in ({TCL_LIBS,CONFIG_DEPS}): Don't add IDE libraries
-	if not --enable-ide.
-	(CONFIG_OBS): Add tracepoint.o to list if --enable-gdbtk.
-	* configure: Regenerate.
-
-	* gdbtk.c (gdb_get_breakpoint_info): Add missing filename
-	argument.
-	(toplevel): Move include of guitcl.h into #ifdef IDE region.
-	(gdbtk_init): Move ide_initialize_paths call into #ifdef IDE
-	section.
-
-	* Makefile.in (gdbtk.o): Update dependencies.
-
-Wed Nov 26 15:02:43 1997  Keith Seitz  <keiths@onions.cygnus.com>
-
-    	* gdbtk.c (gdb_loc): symtab_to_filename can return NULL.
-	(breakpoint_notify): Ditto.
-	(gdb_get_breakpoint_info): Ditto.
-
-Wed Nov 26 11:33:09 1997  Keith Seitz  <keiths@onions.cygnus.com>
-
-	Merge in code from Foundry branch:
-	
-	* Makefile.in (install-only): install the new gdbtk, not the old
-
-	* gdbtk.c (gdbtk_call_command): also run idle hooks for class_trace
-	commands
-	(gdbtk_init): Add new commands "gdb_get_locals", "gdb_get_args",
-	"gdb_get_function", "gdb_get_line", "gdb_get_file",
-	"gdb_tracepoint_exists", "gdb_get_tracepoint_info", "gdb_actions",
-	and "gdb_prompt".
-	(gdb_get_vars_command): New function.
-	(gdb_get_line_command): New.
-	(gdb_get_file_command): New.
-	(gdb_get_function_command): New.
-	(gdb_get_tracepoint_info): New.
-	(gdbtk_create_tracepoint): New.
-	(gdbtk_delete_tracepoint): New.
-	(tracepoint_notify): New.
-	(tracepoint_exists): New.
-	(gdb_actions_command): New.
-	(gdb_tracepoint_exists_command): New.
-	(gdb_prompt_command): New.
-
-Thu Nov 13 18:15:54 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* gdbtk.c: Move include of gdbcore.h to top of file.
-	(close_bfds): New static function if _WIN32.
-	(gdbtk_readline): Call close_bfds.
-	(call_wrapper, tk_command_loop): Likewise.
-	(gdb_clear_file): New static function.
-	(gdbtk_init): Create gdb_clear_file Tcl command.
-
-Wed Nov 12 14:58:39 1997  Jeff Holcomb  <jeffh@cygnus.com>
-
-	* gdbtk.c: gdbtk_load_hash and ui_load_progress_hook return an
-	int result.
-	(gdbtk_load_hash): download hash routine returns an int result.
-
-Mon Nov 10 15:11:51 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* gdbtk.c (gdbtk_init): Call ide_create_shell_execute_command if
-	__CYGWIN32__.
-	* configure.in: Add -lshell32 to WIN32LIBS on cygwin32.
-	* configure: Rebuild.
-
-Sun Nov  9 16:25:34 1997  Tom Tromey  <tromey@cygnus.com>
-
-	* gdbtk.c (gdbtk_init): Run ide_create_help_command.
-
-Tue Oct 28 17:31:47 1997  Martin M. Hunt  <hunt@cygnus.com>
-
-	* gdbtk.c (gdbtk_init): Call ide_create_winprint_command.
-
-Thu Oct 23 15:53:37 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* configure.in: Add -lgdi32 to WIN32LIBS when linking gdbtk on
-	cygwin32.
-	* configure: Rebuild.
-
-Wed Oct 22 21:32:54 1997  Martin M. Hunt  <hunt@cygnus.com>
-
-	* gdbtk.c (gdbtk_init): Create sizebox command on Windows.
-
-Thu Oct  9 14:33:21 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* gdbtk.c (gdbtk_init): Remove assertion argument from call to
-	ide_create_window_register_command.
-
-Wed Oct  1 11:09:52 1997  Tom Tromey  <tromey@cygnus.com>
-
-	* gdbtk.c (gdbtk_init): Pass name of restore interface to
-	ide_create_window_register_command.
-
-Fri Sep 26 21:08:22 1997  Keith Seitz  <keiths@pizza.cygnus.com>
-
-	* gdbtk.c (gdbtk_init): Initialize ui_load_progress_hook.
-
-Thu Sep 25 03:05:00 1997  Martin M. Hunt  <hunt@cygnus.com>
-
-	* gdbtk.c (gdb_load_info): New function.  Returns a list
-	of section names and sizes for an executable.
-	(gdbtk_load_hash): Stub function to call tcl function
-	download_hash.
-
-Tue Sep 23 01:29:00 1997  Martin M. Hunt  <hunt@cygnus.com>	
-
-	* gdbtk.c (gdb_get_mem): Fix compiler warning.
-
-Sun Sep 21 00:15:00 1997  Martin M. Hunt  <hunt@cygnus.com>
-
-	* gdbtk.c (gdb_get_mem): Fix problem with ASCII dump.
-
-Tue Sep 16 18:07:17 1997  Martin M. Hunt  <hunt@cygnus.com>	
-
-	* gdbtk.c (gdb_get_mem): New function.  Returns
-	a formatted memory dump with optional ASCII dump.
-
-Mon Sep  8 12:48:50 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* gdbtk.c: Include ilutk.h if IDE.
-	(gdb_confirm_quit, gdb_force_quit): New static functions.
-	(gdbtk_init): Add Tcl commands gdb_confirm_quit and
-	gdb_force_quit.
-
-Mon Sep  8 03:05:33 1997  Martin M. Hunt  <hunt@cygnus.com>
-
-	* gdbtk.c (gdb_get_breakpoint_info): Now returns the
-	function a breakpoint is in.
-
-Fri Sep  5 20:23:58 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* gdbtk.c (gdbtk_init): Call ide_create_exit_command.
-
-Wed Sep  3 19:39:15 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* gdbtk.c: Include guitcl.h.
-	(gdbtk_init): Always call ide_initialize_paths.  Set the Tcl
-	variable IDE to 1 when using the IDE.  Always try using auto path
-	to find main.tcl.
-	* Makefile.in (IDE_CFLAGS_X): Always include libide.
-	(LIBIDE): New variable.
-	(IDE_X): Omit -lide.
-	(IDE_DEPS): Omit libide.
-	* configure.in: Add LIBIDE to TCL_LIBS and CONFIG_DEPS.
-	* configure: Rebuild.
-
-Mon Aug 25 02:28:55 1997  Keith Seitz  <keiths@pizza.cygnus.com>
-
-	* gdbtk.c: (gdb_target_has_inferior) check if inferior_pid is non-zero
-	before assuming that the inferior is running.
-
-Mon Aug 25 01:06:48 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* gdbtk.c (gdbtk_start_timer): Pass third argument to setitimer.
-	(gdbtk_stop_timer): Likewise.
-
-Mon Aug 25 00:23:08 1997  Keith Seitz  <keiths@pizza.cygnus.com>
-
-	* gdbtk.c: (gdbtk_init) create new command "gdb_target_has_execution"
-	(gdb_target_has_execution_command) new function
-
-Sun Aug 24 20:27:22 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* gdbtk.c (gdb_loc): If there are no symbols, just bail
-	immediately.
-	(tk_command_loop): Print errors encountered while running
-	gdbtk_tcl_preloop.
-
-Sun Aug 24 13:44:03 1997  Tom Tromey  <tromey@cygnus.com>
-
-	* gdbtk.c (gdbtk_init): Run ide_create_build_command.
-
-Sat Aug 23 21:53:39 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* gdbtk.c: If CYGWIN32, include <sys/time.h>.
-	(x_fd): Don't define if WINNT.
-	(gdbtk_start_timer, gdbtk_stop_timer): New static functions if
-	CYGWIN32.
-	(gdbtk_wait): Don't set up signal handling if WINNT.  If CYGWIN32,
-	call gdbtk_start_timer and gdbtk_stop_timer.
-	(gdbtk_init): Don't set up signal handling or make x_fd
-	asynchronous if CYGWIN32.
-
-Fri Aug 22 15:23:15 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* gdbtk.c (error_string_ptr): New static variable.
-	(gdbtk_fputs): If result_ptr is NULL, and error_string_ptr is not
-	NULL, and we're outputting to stderr, append string to
-	error_string_ptr rather than calling gdbtk_tcl_fputs.
-	(call_wrapper): Set up error_string_ptr.  Put both error string
-	and normal string in Tcl result.
-
-	* gdbtk.c (gdbtk_init): Don't call ide_run_server_init until after
-	gdb has initialized.
-
-Thu Aug 21 19:14:38 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* gdbtk.c: If _WIN32, include winuser.h.
-	(gdbtk_init): If _WIN32, use MessageBox to display an error
-	evaluating main.tcl.
-
-Thu Aug 21 00:48:00 1997  Martin M. Hunt  <hunt@pern.cygnus.com>
-
-	* gdbtk.c (gdbtk_init): Add call to ide_run_server_init().
-	(gdb_cmd): For the load command, don't buffer the I/O.
-
-Wed Aug 20 11:41:22 1997  Martin M. Hunt  <hunt@cygnus.com>
-
-	* gdbtk.c (gdbtk_query): Chaneg free() call to Tcl_Free().
- 	
-Tue Aug 19 17:09:19 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* Makefile.in (TCL_DEPS, TK_DEPS): New variables.
-	(ITCL_DEPS, TIX_DEPS): New variables.
-	(IDE_DEPS): New variable.
-	(CDEPS): Include @CONFIG_DEPS@.
-	* configure.in: Set and substitute CONFIG_DEPS and TIX_DEPS.
-	* configure: Rebuild.
-
-Sun Aug 17 00:42:11 1997  Martin M. Hunt  <hunt@cygnus.com>
-
-	* gdbtk.c (gdb_listfuncs): New function that returns
-	a list of all the functions in a source file.
-
-Tue Aug 12 16:35:21 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* Makefile.in (install-only): Install tclIndex if ENABLE_IDE.
-
-Mon Aug 11 10:43:04 1997  Tom Tromey  <tromey@cygnus.com>
-
-	* gdbtk.c (gdbtk_init): Use ide_event_init_from_environment.
-
-Fri Aug  8 15:59:24 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* gdbtk.c (gdbtk_init): Change gdbtk_lib_tmp and gdbtk_file to be
-	dynamically allocated, rather than fixed size.  Pass "gdbtcl" to
-	ide_initialize_paths to match installed directory name.  If IDE,
-	use auto_path to search for main.tcl.
-	* Makefile.in (install-only): If ENABLE_IDE, install from gdbtcl2
-	rather than gdbtcl.
-
-	* gdbtk.c (gdbtk_cleanup): New static function.
-	(gdbtk_init): Add gdbtk_cleanup as a final cleanup.  Uncomment
-	call to ide_initialize_paths.  If we can't initialize the event
-	system, set GDBTK_IDE to 0 in the Tcl interpreter.  Create the
-	ide_window_register and the ide_window commands.  Initialize tk,
-	itcl, and tix after initializing the IDE.
-
-	* configure.in (tixdir): Update for cygwin32 case for Tcl 8.0.
-	* configure: Rebuild.
-
-Fri Aug  8 00:13:32 1997  Martin M. Hunt  <hunt@cygnus.com>
-
-	* gdbtk.c (breakpoint_notify): Change buffer size from 100
-	to 256 to avoid memory corruption with very long pathnames.
-
-Thu Aug  7 14:08:23 1997  Martin M. Hunt  <hunt@cygnus.com>
-
-	* configure.in: Change required Tix version to 4.1.8.0 .
-	* configure: Rebuilt.
-
-Fri Aug  1 15:21:44 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* gdbtk.c (Tcl_Alloc): Don't provide our own version of this if
-	_WIN32.
-	(Tcl_Realloc, Tcl_Free): Likewise.
-	* configure.in: Check for cygwin32 environment.  Define and
-	substitute WIN32LIBS and WIN32LDAPP.  Always set configdir to
-	unix; setting it to win was for an old Tcl/Tk configuration
-	scheme.
-	* aclocal.m4 (CY_AC_LOAD_TKCONFIG): Substitute TK_BUILD_INCLUDES.
-	* Makefile.in (TK_CFLAGS): Add @TK_BUILD_INCLUDES@.
-	(WIN32LDAPP, WIN32LIBS): Define.
-	(CLIBS): Add $(WIN32LIBS).
-	(gdb): Use $(WIN32LDAPP).
-	* configure: Rebuild.
-
-Tue Jul 22 19:45:37 1997  Martin M. Hunt  <hunt@cygnus.com>
-
-	* configure.in, aclocal.m4: Another fix to find the
-	correct Tix library name.
-
-	* configure: Rebuilt.
-	
-Mon Jul 21 22:24:07 1997  Martin M. Hunt  <hunt@cygnus.com>
-
-	* aclocal.m4: Search for the correct tix library. 
-
-Thu Jul 10 00:02:41 1997  Martin M. Hunt  <hunt@cygnus.com>
-
-	* Makefile.in, configure.in, aclocal.m4: Add Itcl, Tix, and 
-	IDE configuration information.
-
-	* gdbtk.c (breakpoint_notify): Send address, linenumber and 
-	filename when a breakpoint is set.  Avoids call to bp_info.
- 	(gdbtk_init): Call Tcl_FindExecutable(). Add code to handle 
-	Itcl, Tix and IDE initialization.
-
-	* configure: Regenerated.
-
-Fri Jun 13 10:28:09 1997  Fred Fish  <fnf@cygnus.com>
-
-	* gdbtk.c (gdbtk_init): Make truth value test explicit.
-	Remove unused static variable "Gdbtk_Library".
-
-Sat Jun  7 02:34:19 1997  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
-
-	* gdbtk.c (gdb_get_breakpoint_info):  Add string for new
-	enumeration del_at_next_stop to bpdisp array.
-
-Tue Jun  3 15:46:51 1997  Tom Tromey  <tromey@cygnus.com>
-
-	* Makefile.in (LIB_RUNTIME_DIR): New variable.
-
-Wed May  7 19:10:19 1997  Andrew Cagney  <cagney@b1.cygnus.com>
-
-	* gdbtk.c (wrapped_call): New function - make actual call to tk
- 	worker function.
-	(call_wrapper): Rewrite to use top.c:catch_errors.
-
-	* gdbtk.c (gdb_stop): If No target_stop set quit flag and hope for
- 	best.
-
-Mon Apr 21 14:00:08 1997  Doug Evans  <dje@canuck.cygnus.com>
-
-	* gdbtk.c (gdb_disassemble): Store endian-ness in `di'.
-
-Wed Apr 16 12:33:06 1997  Andrew Cagney  <cagney@b1.cygnus.com>
-
-	* Makefile.in (install-only): Make list of gdbtcl files to install
- 	explicit - was picking up files such as ChangeLog etc.
-	(install-only): Don't blindly create the directory.
-
-Tue Apr  1 15:04:21 1997  Jason Molenda  (crash@godzilla.cygnus.co.jp)
-
-	* configure.in (gdbtcl): Create soft-link for gdbtcl/ directory
- 	instead of gdbtk.tcl.
-
-Fri Mar 28 17:04:02 1997  Jason Molenda  (crash@godzilla.cygnus.co.jp)
-
-	* Makefile.in (gdbtk.o): look for GDBTK_LIBRARY in $(datadir) by
-	default, not $(srcdir).
-
-Wed Mar 19 15:16:17 1997  Martin M. Hunt  <hunt@onions.cygnus.com>
-
-	* Makefile.in:  Install gdbtcl dir instead of gdbtk.tcl.
-	
-	* gdbtk.c: Added some ifdefs for Windows.  Changed GDBTK_FILENAME
-	to GDBTK_LIBRARY, which is now a path to search.
-	(gdb_path_conv): New function.  Convert Cygwin32 pathname to
-	DOS-style pathname.
-
-	* {aclocal.m4,configure.in}: Changes for Windows builds.
-
-	* configure: Rebuilt.
-
-Fri Mar 14 10:01:29 1997  Tom Tromey  <tromey@cygnus.com>
-
-	* configure: Regenerated.
-	* configure.in (LIBS): Re-reverse order of TCL_LIBS and TK_LIBS.
-
-Wed Mar 12 14:29:52 1997  Tom Tromey  <tromey@cygnus.com>
-
-	* gdbtk.c (x_event): Use Tcl_DoOneEvent, TCL_DONT_WAIT,
-	TCL_ALL_EVENTS.
-
-	* configure: Regenerated.
-	* configure.in (ENABLE_GDBTK): Put TCL_LIBS after TK_LIBS in
-	LIBS.
-
-Mon Feb 10 13:50:53 1997  Stu Grossman  (grossman@critters.cygnus.com)
-
-	* gdbtk.c (call_wrapper):  Clear running_now if an error occurs.
-
-Wed Dec 11 18:51:35 1996  Mark Alexander  <marka@cygnus.com>
-
-	* gdbtk.c (gdb_loc): Correct truncation of PC on 64-bit MIPS.
-
-Tue Nov 19 09:26:14 1996  Tom Tromey  <tromey@cygnus.com>
-
-	* gdbtk.c (gdbtk_readline): Fix memory leak.
-
-Mon Nov 18 23:43:05 1996  Tom Tromey  <tromey@cygnus.com>
-
-	Fixes for Tcl 7.6 / Tk 4.2:
-	* gdbtk.tcl (apply_filespec): Use tk_getOpenFile.
-	Remove old fileselect code.
-	* gdbtk.c (Tcl_Alloc): Rename from Tcl_Malloc.
-
-Fri Sep 27 10:25:30 1996  Fred Fish  <fnf@cygnus.com>
-
-	* gdbtk.tcl (create_copyright_window): Increase timeout from
-	15 seconds to 30 seconds.
-
-Wed Sep  4 17:28:40 1996  Stu Grossman  (grossman@critters.cygnus.com)
-
-	* configure configure.in:  Add host *windows* to list of hosts
-	that don't support GDBtk.
-
-Fri Aug 23 00:44:57 1996  Fred Fish  <fnf@cygnus.com>
-
-	* gdbtk.c (gdbtk_init): Check for a DISPLAY env variable and
-	gracefully degrade to using command line interface if none is
-	found.
-
-Fri Aug  9 12:32:53 1996  Tom Tromey  <tromey@creche.cygnus.com>
-
-	* Makefile.in (LIB_INSTALL_DIR): New macro.
-	(TCL): Include @TCL_LD_SEARCH_FLAGS@.
-
-Thu Aug  1 20:35:01 1996  Tom Tromey  <tromey@creche.cygnus.com>
-
-	* gdbtk.c (mainWindow): Deleted.
-	(cleanup_init): Don't destroy main window.
-	(gdbtk_init): Main window now created by Tk_Init.
-
-	* configure.in: Most X checks now handled automatically by Tk.
-	Use new macros to find Tcl/Tk.
-	* aclocal.m4: New version for new Tcl/Tk; from Don Libes.
-	* config.in, configure: Regenerated.
-
-	* Makefile.in (TCL, TCL_CFLAGS, TK, TK_CFLAGS, X11_CFLAGS,
-	X11_LDFLAGS, X11_LIBS): Changed for new Tcl and Tk.
-
-Thu Aug  1 16:12:05 1996  Jason Molenda  (crash@godzilla.cygnus.co.jp)
-
-	* Makefile.in (gdbtk.tcl): put in $(datadir), not $(libdir).
-
-Fri Jul 26 14:07:37 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* gdbtk.c (gdb_disassemble): Initialize di.flavour.
-
-Thu Jul 25 19:41:31 1996  Fred Fish  <fnf@cygnus.com>
-
-	* gdbtk.c (null_routine): Ditto.
-	(gdbtk_flush): Ditto.
- 	(gdbtk_fputs): Ditto.
- 	(gdbtk_query): Ditto.
-	(gdbtk_readline): Ditto.
- 	(gdbtk_readline_end): Ditto.
- 	(gdb_get_breakpoint_list): Ditto.
-	(gdb_get_breakpoint_info): Ditto.
- 	(breakpoint_notify): Ditto.
- 	(gdbtk_create_breakpoint): Ditto.
-	(gdbtk_delete_breakpoint): Ditto.
- 	(gdbtk_modify_breakpoint): Ditto.
- 	(gdb_loc): Ditto.
- 	(gdb_eval): Ditto.
-	(gdb_sourcelines): Ditto.
- 	(map_arg_registers): Ditto.
- 	(get_register_name): Ditto.
- 	(gdb_regnames): Ditto.
-	(get_register): Ditto.
- 	(gdb_fetch_registers): Ditto.
- 	(register_changed_p): Ditto.
-	(gdb_changed_register_list): Ditto.
- 	(gdb_cmd): Ditto.
- 	(call_wrapper): Ditto.
- 	(gdb_listfiles): Ditto.
-	(gdb_stop): Ditto.
- 	(gdbtk_dis_asm_read_memory): Ditto.
- 	(compare_lines): Ditto.
- 	(gdb_disassemble): Ditto.
-	(tk_command): Ditto.
- 	(cleanup_init): Ditto.
- 	(gdbtk_interactive): Ditto.
- 	(x_event): Ditto.
- 	(gdbtk_wait): Ditto.
-	(gdbtk_call_command): Ditto.
- 	(tk_command_loop): Ditto.
- 	(gdbtk_init): Ditto.
-
-	* gdbtk.c (register_changed_p): Remove unused local variable "buf".
-
-Sat Jul 20 17:46:40 1996  Fred Fish  <fnf@cygnus.com>
-
-	* gdbtk.tcl (files_command): Reorder the binding tags for
-	the listbox widget to avoid referencing the listbox after
-	the containing widget has been destroyed by the action of
-	a previous binding.
-
-Sat Jul 20 10:09:28 1996  Fred Fish  <fnf@cygnus.com>
-
-	* gdbtk.tcl (delete_expr): Unset corresponding element of
-	expr_update_list when destroying an expression.
-	(create_expr_window): Initialize expr_num, delete_expr_num,
-	and expr_update_list here when each new expression window
-	is created, rather than once at startup.
-
-Mon Jul 15 16:44:05 1996  Stu Grossman  (grossman@critters.cygnus.com)
-
-	* gdbtk.c (gdb_disassemble):  Setup di.mach from
-	tm_print_insn_info.mach, and set endian from TARGET_BYTE_ORDER.
-
-Fri Jun 21 11:04:47 1996  Fred Fish  <fnf@cygnus.com>
-
-	* gdbtk.tcl (create_register_windows): Include missing '$'s.
-	Add global declarations for various reg_format_* variables.
-	* gdbtk.tcl (populate_register_window): Make initial window one
-	line taller to account for new column header line.
-
-Fri Jun 21 09:46:47 1996  Fred Fish  <fnf@cygnus.com>
-
-	* gdbtk.c (get_register): Support for printing raw formats.
-	* gdbtk.tcl: Add hint for using debug_interface.
-	(center_window, add_breakpoint_frame, delete_breakpoint_frame):
-	Enclose arg in braces for consistency.
-	(create_registers_window, populate_reg_window, update_registers):
-	Major rewrite to support displaying multiple formats in the register
- 	window.
-	(init_reg_info): New function.
-	(recompute_reg_display_list):  Reset reg_display_list, start
-	register display lines at line 2.
-
-Thu Jun 20 08:18:59 1996  Fred Fish  <fnf@cygnus.com>
-
-	* gdbtk.tcl (gdbtk_tcl_readline_begin): Handle backspace to
-	avoid backing up over prompt.  At every input, make sure insert
-	point is at least after command start, handle control-u to delete
-	current input line.
-	(tclsh): Handle backspace to avoid backing up over prompt.  Handle
-	control-u to delete current input line.
-
-Wed Jun 19 17:23:38 1996  Geoffrey Noer  <noer@cygnus.com>
-
-	* configure.in: disable gdbtk for *cygwin32* hosted compiles
-	* configure: regenerated with autoconf 2.8
-
-Sun May 19 16:49:37 1996  Fred Fish  <fnf@cygnus.com>
-
-	* gdbtk.c (gdbtk_readline_begin, gdbtk_readline, gdbtk_readline_end):
-	New functions.
-	(tk_command_loop): Set instream to NULL to enable Tk user interaction.
-	(gdbtk_init): Set readline_begin_hook, readline_hook,
-	and readline_end_hook.
-	* gdbtk.tcl (gdbtk_tcl_readline_begin, gdbtk_tcl_readline,
-	gdbtk_tcl_readline_end): New functions.
-	(tclsh): Pack scroll bar on right side of window, not left.
-
-Fri May 17 13:54:34 1996  Fred Fish  <fnf@cygnus.com>
-
-	* gdbtk.tcl (create_command_window): Change a misspelled "get"
-	to the intended "cget".
-	(delete_line): Fix so it deletes the current line at the
-	insertion cursor.
-
-Thu May 16 19:20:29 1996  Fred Fish  <fnf@cygnus.com>
-
-	* gdbtk.tcl (gdb_prompt): Set this early on.
-	(create_command_window): Use gdb_prompt rather than "(gdb) ".
-	(gdbtk_tcl_preloop): Proc executed just prior to Tk main loop.
-	(tclsh): If an evaluation window already exists, just bring it
-	to the front instead of trying to create another.
-	* gdbtk.c (tk_command_loop): New function.
-	(gdbtk_init): Call tk_command_loop rather than Tk_MainLoop.
-
-Thu May 16 16:16:35 1996  Fred Fish  <fnf@cygnus.com>
-
-	* gdbtk.tcl (evaluate_tcl_command, tclsh):  New functions that
-	implement a tcl evaluation window for gdbtk maintainers to use.
-
-Thu May 16 11:42:58 1996  Tom Tromey  <tromey@creche.cygnus.com>
-
-	* gdbtk.tcl (files_command): Correctly insert list of files into
-	listbox widget.
-
-	* gdbtk.tcl (files_command): listbox command no longer accepts
-	-geometry.
-
-Wed May 15 16:04:09 1996  Stan Shebs  <shebs@andros.cygnus.com>
-
-	* gdbtk.tcl (create_command_window): If command window's buffer
-	is disabled, don't execute any of the key bindings.
-
-Mon May 13 13:43:25 1996  Fred Fish  <fnf@cygnus.com>
-
-	* gdbtk.c (tk_command): Catch case where no argument is given
-	since this will cause the tcl interpreter to dump core.
-
-Wed May  8 20:33:24 1996  Fred Fish  <fnf@cygnus.com>
-
-	* gdbtk.c: Fix a couple of misspellings.
-
-Thu May  2 19:17:49 1996  Stan Shebs  <shebs@andros.cygnus.com>
-
-	* gdbtk.tcl (debug_interface): New global, use to aid debugging.
-	(insert_breakpoint_tag, delete_breakpoint_tag): Fix range.
-	(file_popup_menu): Delete, never used.
-	(listing_window_popup): Rename from listing_window_button_1,
-	remove breakpoint toggling code.
-	(toggle_breakpoint): New procedure.
-	(create_file_win): Bind popup menu to button 2, toggle breakpoints
- 	with button 1 in breakpoint area, add display of tagged areas if
- 	debugging on.
-
-Fri Apr  5 13:44:40 1996  Stan Shebs  <shebs@andros.cygnus.com>
-
-	* gdbtk.c (running_now): New global variable.
-	(gdb_cmd): Test it before executing any command.
-	(gdbtk_call_command): Set it when inferior is running.
-	* gdbtk.tcl (gdbtk_tcl_busy, gdbtk_tcl_idle): Enable and
-	disable interaction with command window's text appropriately.
-
-Fri Apr  5 13:25:42 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
-
-	* gdbtk.c (SIOCSPGRP, linux): If on Linux, undef SIOCSPGRP, since
-	some versions of the kernel don't support it.
-
-Tue Feb  6 16:31:25 1996  Tom Tromey  <tromey@creche.cygnus.com>
-
-	* gdbtk.tcl (create_file_win): Eliminate text widget B1 binding so
-	double-clicking will work again.
-	(create_asm_win): Put "break" at end of all B1 bindings.
-	(create_file_win): Lower "sel" tag, don't raise it.
-	(ensure_line_visible): New proc.
-	(update_listing, update_assembly): Use it.
-	(create_copyright_window): Destroy window on Leave event.
-	(create_command_window): Put "break" at end of all B2 bindings.
-
-Wed Jan 24 15:28:41 1996  Tom Tromey  <tromey@creche.cygnus.com>
-
-	* gdbtk.tcl, gdbtk.c: Updated copyrights.
-
-	* configure.in: Look for -ldl or -ldld when using Tcl 7.5 or
-	greater.
-	* configure: Rebuilt.
-
-Tue Jan 23 09:00:48 1996  Doug Evans  <dje@charmed.cygnus.com>
-
-	* gdbtk.c (gdb_disassemble): Pass fprintf_unfiltered to
- 	INIT_DISASSEMBLE_INFO.
-
-Mon Jan 15 09:58:41 1996  Tom Tromey  <tromey@creche.cygnus.com>
-
-	* gdbtk.tcl (create_expr_window): Many changes to update GUI.
-	(add_expr): Changes from create_expr_window.
-	(create_command_window): Set focus.
-	(delete_expr): Rewrote.
-	(expr_update_button): New proc.
-	(add_expr): Put bindings on FocusIn, FocusOut.
-	Don't allow .file_popup to be torn off.
-
-Fri Jan 12 09:36:17 1996  Tom Tromey  <tromey@creche.cygnus.com>
-
-	* gdbtk.tcl (gdbtk_tcl_query): Swap Yes and No buttons.
-	(update_listing): Use lassign.  Use "see" to scroll.  Don't need
-	screen_top, screen_bot, screen_height.
-	(update_assembly): Use "see" to scroll.
-	(textscrollproc): Removed.
-	(create_file_win): Don't use textscrollproc.
-	(asmscrollproc): Removed.
-	(create_asm_window): Don't use asmscrollproc.
-	(create_asm_win): Ditto.
-	(screen_height, screen_top, screen_bot): Removed.
-	(run_editor): New proc.
-	(build_framework): Use it.
-	(create_file_win, create_source_window): Don't use textscrollproc.
-	(create_breakpoints_window): Set -xscrollcommand on canvas.
-	(not_implemented_yet): Default button is 0.
-	(delete_char): Don't use tk_textBackspace.
-	(create_command_window): Allow Tk bindings to fire after deleting
-	character.
-	(create_command_window): Make Delete delete left, not right.
-
-Thu Jan 11 10:08:14 1996  Tom Tromey  <tromey@creche.cygnus.com>
-
-	* gdbtk.tcl (FSBox): Don't use tk_listboxSingleSelect.
-
-	Changes in sync with expect:
-	* configure.in (ENABLE_GDBTK): Use CY_AC_PATH_TCL and
-	CY_AC_PATH_TK.
-	* aclocal.m4: Replaced with version from expect.
-	* configure: Regenerated.
-
-Wed Jan 10 09:07:22 1996  Tom Tromey  <tromey@creche.cygnus.com>
-
-	* gdbtk.tcl (gdbtk_tcl_fputs, gdbtk_tcl_fputs_error,
-	gdbtk_tcl_flush): Use "see", not "yview".
-	(gdbtk_tcl_query): Use questhead bitmap.
-	various: Always wrap condition of 'if' in {...}.
-	(add_breakpoint_frame): Set -value on radiobuttons.
-	(lassign): New proc.
-	(add_breakpoint_frame): Use lassign, not series of assignments.
-	(decr): Made faster.
-	(interactive_cmd): Use "see", not "yview".
-	(not_implemented_yet): Use warning bitmap.
-	(update_expr): Don't allow $expr to be evalled by Tcl.
-	(create_expr_window): Don't use "focus".
-	(delete_char, delete_line): Define globally.
-	(delete_line, delete_char, create_command_window, update_autocmd,
-	build_framework, create_asm_win, create_file_win): Use "see", not
-	"yview".
-	(create_copyright_window, center_window, bind_widget_after_class):
-	New procs.
-	(FSBox,create_command_window, create_autocmd_window): Binding
-	changes for Tk4.
-	(textscrollproc): Define globally.
-	(build_framework): tk_menuBar no longer needed.  Keys Prior, Next,
-	Home, End, Up, and Down are all defined by Tk.
-	(apply_filespec): Use error bitmap in dialog.
-	(files_command): Don't use tk_listboxSingleSelect.
-	(files_command): Don't use "uniq" to remove duplicates from a
-	list.
-	(update_assembly): Use lassign.
-	(create_asm_win): Removed redundant bindings.
-	(listing_window_button_1, file_popup_menu): Use tk_popup.
-	(ButtonRelease-1 binding): Just remove tag from window; rest
-	handled by Tk.
-
-	* gdbtk.c (gdbtk_query): Use Tcl_Merge to provide quoting.
-	(call_wrapper): Use Tcl_Eval, not Tcl_VarEval.
-	(gdbtk_call_command): Ditto.
-
-Thu Jan  4 16:04:54 1996  Stu Grossman  (grossman@cygnus.com)
-
-	* configure configure.in:  Make --enable-gdbtk be the default.
-
-Thu Dec 28 15:10:49 1995  Stan Shebs  <shebs@andros.cygnus.com>
-
-	* README.GDBTK: Polish introductory paragraph.
-
-Mon Oct 16 11:27:06 1995  Stu Grossman  (grossman@cygnus.com)
-
-	* gdbtk.c (gdb_disassemble):  Use fprintf_unfiltered instead of
-	fprintf_filtered.
-
-Tue Oct 10 15:26:39 1995  Fred Fish  <fnf@cygnus.com>
-
-	* README.GDBTK: Updated for version 4.15.
-	
-Sat Aug 19 17:20:22 1995  Michael Tiemann  <tiemann@axon.cygnus.com>
-
-	* gdbtk.tcl: ENABLE comes back as "1" or "0", not "enable" or
-	"disable".
-	Also, wire up the breakpoint window so that it can be demo'd.
-
-Tue Aug  1 11:44:53 1995  J.T. Conklin  <jtc@rtl.cygnus.com>
-
-	* gdbtk.c: Include "gdb_string.h" instead of <string.h>.
-
-Tue Jun 20 10:19:40 1995  Stu Grossman  (grossman@cygnus.com)
-
-	* gdbtk.c:  Add functions Tcl_Malloc, Tcl_Realloc, and Tcl_Free.
-
-	* gdbtk.tcl (add_breakpoint_frame):  Add more fields.
-	* (create_file_win create_asm_win build_framework):  Create null
-	bindings for meta keys to keep window from dropping down to
-	insertion point when meta is pressed by itself.  New bindings:
-	   Up/Down - Scroll up/down one line at a time
-	   Next/Prior - Scroll up/down one page at a time
-	   Home/End - Warp to current pc/end of file
-	* (build_framework):  Turn on breakpoint menu.
-	* (create_command_window):  Implement tab completion.  Add binding
-	for ^C to stop target.
-
-Fri May 19 06:15:40 1995  Jim Kingdon  <kingdon@deneb.cygnus.com>
-
-	* gdbtk.c: Conditionalize use of stdarg rather than varargs on
- 	ANSI_PROTOTYPES not __STDC__; it must match the definition of
- 	PARAMS.
-
-Thu May 18 15:58:46 1995  J.T. Conklin  <jtc@rtl.cygnus.com>
-
-	* gdbtk.c (gdbtk_query): Use stdarg.h macros when compiling with
- 	an ANSI compiler.
-
-Sat Apr 15 13:52:24 1995  Stan Shebs  <shebs@andros.cygnus.com>
-
-	* gdbtk.c (gdb_disassemble): Read from inferior if connected
-	to a VxWorks target.
-
-Fri Apr 14 10:18:20 1995  Stu Grossman  (grossman@cygnus.com)
-
-	* README.GDBTK:  New file.  Contains the obvious.
-
-Tue Apr 11 11:07:12 1995  Michael Meissner  <meissner@tiktok.cygnus.com>
-
-	* gdbtk.c (gdbtk_init): If SIOCSPGRP is not available, but
-	F_SETOWN is, use that.
-
-Thu Apr  6 17:00:46 1995  Michael Meissner  <meissner@tiktok.cygnus.com>
-
-	* Makefile.in (X11_INCLUDES): Define as empty.
-	(X11_CFLAGS): Define as including $(X11_INCLUDES).
-	(X11_LIB_SWITCHES): Define as empty.
-	(X11_LIBS): Define as -lX11.
-
-	* configure.in (enable_gdbtk): If gdbtk, support the --x-includes
-	and --x-libraries switches, setting the X11_INCLUDES and
-	X11_LIB_SWITCHES respectively.  Instead of using a hardcoded -lX11
-	in ENABLE_CLIBS, use the X11_LIB_SWITCHES and X11_LIBS variables.
-
-	* gdbtk.c (gdbtk_init): If SIOCSPGRP is not available, don't use
-	it.  This means that the stop button doesn't work, but is better
-	than nothing.
-
-Wed Mar 29 17:09:29 1995  Stu Grossman  (grossman@cygnus.com)
-
-	* Makefile.in (gdbtk.o):  Use X11_CFLAGS to provide alternate
-	locations (per-host) for X11 include files.
-	* config/pa/hppahpux.mh (XM_CLIBS):  Add -L/usr/lib/X11R5 to force
-	the use of R5 libs.
-	(X11_CFLAGS):  Add this to indicate the locs
-	of the R5 include files.
-
-Wed Mar  8 16:12:21 1995  Stu Grossman  (grossman@cygnus.com)
-
-	* gdbtk.c (gdb_get_breakpoint_info):  Return error if breakpoint
-	type is not bp_breakpoint.
-
-Tue Feb 14 17:16:41 1995  Stu Grossman  (grossman@cygnus.com)
-
-	* gdbtk.c: Ditto.
-	* gdbtk.c: General cleanups, get rid of unused variables.  Redo
-	handling of stdout/stderr to just return output as the result of
-	the tcl command that caused the output.  Cleanup -Wall stuff.
-	* (breakpoint_notify):  Now returns just action and breakpoint
-	number.
-	* (gdb_get_breakpoint_list):  New routine.  Does the obvious.
-	* (gdb_get_breakpoint_info):  Mostly derived from the old
-	breakpoint_notify, but returns lots more info.
-	* (dsprintf_append_element):  Helper routine, works like printf,
-	but appends a tcl element onto the specified DString.  Good for
-	building up lists as return values.
-	* (gdbtk_enable/disable_breakpoint):  Go away.  Replaced with
-	gdbtk_modify_breakpoint.
-	* (*many routines*):  Use new result protocol.
-	* (call_wrapper):  Make sure that recursive calls don't trash results.
-	* gdbtk.tcl:  New windows, autocmd, and breakpoints.
-	* (gdbtk_tcl_fputs):  Don't use $current_output_win redirection
-	anymore.  It's not needed (in fact, this routine may not be needed
-	anymore).
-	* (gdbtk_tcl_breakpoint):  Change to reflect new breakpoint
-	notification protocol.
-	* (gdbtk_tcl_busy gdbtk_tcl_idle):  Straighten out buttons, remove
-	catches.
-	* (interactive_cmd):  Use this wrapper around button invocations
-	of many commands.  This will catch errors and put the results into
-	the command window.  It also updates all the other windows.
-	* Also, change reliefs of most things to sunken.  This actually
-	looks better.
-	* (create_file_win):  Fix margin binding to allow breakpoints to
-	work again.
-	* (create_asm_win):  Use return value of gdb_disassemble instead
-	of implicit I/O to the command window.	
-	* (create_command_window):  Use new result protocol to get output
-	from commands.
-
-Sun Feb  5 20:32:44 1995  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* gdbtk.c (gdb_disassemble): Deference pointer to function before
-	calling it (pre-ANSI compilers generally require this).
-
-Fri Feb  3 11:19:20 1995  Stu Grossman  (grossman@cygnus.com)
-
-	* gdbtk.c (gdb_disassemble): Get rid of
-	dis_asm_read_memory_hook.  We can now call the disassemblers
-	directly and have no need for this hook anymore.
-
-Mon Jan 30 17:34:24 1995  Stu Grossman  (grossman@cygnus.com)
-
-	* gdbtk.tcl (create_file_win):  Disable old popup menu for source
-	window.
-
-Wed Jan 25 18:23:46 1995  Stu Grossman  (grossman@cygnus.com)
-
-	* gdbtk.c (gdbtk_init):  Prevent segfault when gdbtk.tcl can't be
-	found.
-	* gdbtk.tcl:  Initialize expr_update_list() to prevent errors when
-	popping up expression window for the first time.
-
-Tue Jan 24 12:10:28 1995  Stu Grossman  (grossman@cygnus.com)
-
-	* gdbtk.tcl (create_registers_window):  Work around a radiobutton
-	widget bug to make Options|Natural button work.
-
-	* gdbtk.c (gdb_disassemble):  Fix problem with source+assembly and
-	g++ caused by out-of-order pc's.
-	* gdbtk.tcl (files_command):  Remove duplicate file names.  Also,
-	add scrollbar.
-
-Mon Jan 23 17:21:09 1995  Stu Grossman  (grossman@cygnus.com)
-
-	* gdbtk.tcl:  Take .gdbtkinit if it exists.  Makes gdbtk match the
-	doc!
-
-Thu Jan 12 15:02:40 1995  Stu Grossman  (grossman@cygnus.com)
-
-	* gdbtk.c, gdbtk.tcl:  Update/add copyright.
-	* gdbtk.tcl (build_framework):  Several fixes for filespec widget,
-	including dismiss button, and better error handling.
-	* (create_command_win):  Bind button 2 to retrieve selection.
-
-Wed Jan 11 17:06:55 1995  Stu Grossman  (grossman@cygnus.com)
-
-	* gdbtk.tcl:  Add button to control mixed source disassembly.
-	Use text widgets in expr window.  The give me more control over
-	layout.
-	Add auto-updating of exprs in expression window.
-	Handle expressions out of scope a bit better.
-	Make selected window pop up to the top when invoked via the
-	menubar.
-	Make copyright message have raised relief.
-
-	* gdbtk.c (gdbtk_init):  Improve handling for errors in gdbtk.tcl
-	during startup.
-
-Thu Jan  5 17:38:29 1995  Stu Grossman  (grossman@cygnus.com)
-
-	* gdbtk.c (finish_saving_output):  Don't do anything if not saving
-	output.
-	* (breakpoint_notify):  Don't send null filename to tcl.
-	* (gdb_eval):  New tcl command to eval an expression.
-	* (gdb_disassemble):  New tcl command to do disassembly.  This
-	allows tcl code to choose between exec file and target memeory,
-	and can also do mixed source and assembly.
-	* (gdbtk_init):  Move reading of gdbtk.tcl to the end to make sure
-	that more of the environment is set up.  Also, create link between
-	gdb and tcl vars disassemble{-_}from{-_}exec.
-
-	* gdbtk.tcl:  New expression window support.
-	* Make assembly window be 80 columns wide.
-	* Use new disassembly method.  Add menu items to select
-	disassembly from exec file or target.
-	* Change View menubar item to Options.
-
-	* Get rid of Stack, Breakpoints, Signals, and Variables Windows,
-	since they don't exist yet.
-
-	* Pop up a copyright window on startup.
-
-Wed Jan  4 19:49:10 1995  Stan Shebs  <shebs@andros.cygnus.com>
-
-	* gdbtk.tcl (build_framework): Add standard commands menu, more
-	windows to standard windows menu.
-	(not_implemented_yet): Clarify message.
-
-Fri Dec 30 15:49:00 1994  Stan Shebs  <shebs@andros.cygnus.com>
-
-	* gdbtk.tcl (FSBox): New proc, File Selection Box code from exmh.
-	(not_implemented_yet): New proc.
-	(build_framework): Add various file commands to file menu.
-
-Fri Dec 23 16:18:50 1994  Stu Grossman  (grossman@cygnus.com)
-
-	* gdbtk.c (gdbtk_wait gdbtk_init):  Portability improvements for
-	SIGIO handling.
-
-Mon Dec 19 09:55:47 1994  Stu Grossman  (grossman@cygnus.com)
-
-	* gdbtk.tcl (update_assembly):  Force update to make sure that pc
-	is visible when creating new assembly windows.
-
-Sun Dec 18 23:31:20 1994  Stu Grossman  (grossman@cygnus.com)
-
-	* gdbtk.c (gdbtk_wait gdbtk_init):  Use different method of
-	enabling I/O interrupts for SVR4 (streams).
-	* (start_saving_output save_output get_saved_output
-	finish_saving_output flush_holdbuf gdbtk_flush gdbtk_fputs
-	gdbtk_init):
-	Totally revamp to use TCLs dynamic string functions.  Also, quote
-	all data passed back to TCL to prevent errors with unmatched
-	braces, odd characters, etc...  This fixes several wierd problems
-	with outputting strings containing unmatched braces.
-	* (breakpoint_notify gdb_loc):  Use long hex format to output
-	addresses of breakpoints and PCs.  This fixes some Alpha problems.
-	* (breakpoint_notify):  Add stream arg to call to gdbtk_fputs.
-	* (gdb_listfiles):  Also, go through the symtabs when looking for
-	files.  This makes xcoff work (sort of), but probably breaks
-	something else.
-	* (gdb_stop):  Return TCL_OK instead of nothing.  This fixes odd
-	TCL errors when hitting stop button.
-	* (tk_command):  Don't pass interp->result on to Tcl_{Var}Eval, as
-	that will trash the result.  strdup the result instead and pass
-	that on.  Improve error handling as well.
-
-	* gdbtk.tcl (gdbtk_tcl_flush):  Use global def of
-	current_output_win.  Makes flushing actually work!
-	* (asm_win_name create_asm_win update_assembly):  Bunch of fixes
-	to make assembly windows stop flashing when loading a new file.
-	* (gdbtk_tcl_busy gdbtk_tcl_idle):  Use catch to prevent gdb_cmd
-	errors from losing control.
-	* (create_source_window):  Add source file selection to View menu.
-	* (create_command_window (<Key-Return> binding):  Quote text fed
-	into gdb_cmd to prevent eval errors.
-
-Thu Dec 15 16:40:10 1994  Stu Grossman  (grossman@cygnus.com)
-
-	* gdbtk.c: Improve mechanism for capturing output values.
-	(full_filename): Remove.
-	(gdb_cmd call_wrapper gdbtk_init): Protect all calls from tcl land
-	with call_wrapper.  This prevents longjmps (usually via error())
-	from jumping out of tcl/tk and leaving things in an indeterminate
-	state.
-	(gdbtk_fputs): Differentiate stdout from stderr when passing text
-	into tcl land.
-	* gdbtk.tcl: New view option to disable line numbers.  Put catch
-	around most uses of gdb_cmd.  Add update button to reg config
-	window.  Stop doing immediate updates when selecting registers.
-	Change register view values into checkbuttons.
-
-Mon Dec 12 16:59:29 1994  Stu Grossman  (grossman@cygnus.com)
-
-	* gdbtk.tcl (reg_config_menu create_registers_window
-	recompute_reg_display_list):  Use array instead of individual vars
-	for register display list.
-	* (recompute_reg_display_list update_registers):  Fix bug with not
-	displaying all registers.
-
-Mon Dec 12 12:22:21 1994  Stu Grossman  (grossman@cygnus.com)
-
-	* gdbtk.c:  New tcl commands:  gdb_fetch_registers,
-	gdb_changed_register_list, and gdb_regnames.
-	* gdbtk.tcl:  Use monochrome color model for now.
-	* (delete_breakpoint_tag create_file_win):  Add breakdot support.
-	* (create_file_win create_asm_win update_listing build_framework
-	create_source_window create_command_window):  Re-org window
-	creation to give all windows consistent look and feel.
-	* (update_listing update_asm):  Change pc pointer to '->'.
-	* (registers_command reg_config_menu create_registers_window
-	populate_reg_window update_registers):  Revamp register window.
-	Allow selection of registers to be displayed.  Highlight changed
-	registers.
-
-Mon Nov 28 09:17:20 1994  Stu Grossman  (grossman@cygnus.com)
-
-	* gdbtk.tcl (build_framework):  Fix bug with setting window titles.
-
-	* gdbtk.tcl (build_framework):  Add "Report bug" to help menu.
-
-	* gdbtk.tcl:  Re-arrange windows using new, consistent layout. Clean
-	up lots of code and centralize framework initialization.
-
-Wed Nov 16 15:28:29 1994  Rob Savoye  (rob@cygnus.com)
-
-	* Makefile.in: Fix the test for installing gdbtk.
-
-Mon Nov 14 08:51:29 1994  Stu Grossman  (grossman@cygnus.com)
-
-	* Makefile.in:  Install gdbtk.tcl.
-	* configure.in:  Add ENABLE_GDBTK flag.
-	* gdbtk.c (gdb_sourcelines):  Returns list of source lines
-	containing code.  (gdb_regnames):  Returns list of register names.
-
-Thu Nov  3 14:25:24 1994  Stu Grossman  (grossman@cygnus.com)
-
-	* gdbtk.c (gdb_stop):  Switch to target_stop().
-
-Tue Nov  1 16:41:12 1994  Stu Grossman  (grossman@cygnus.com)
-
-	* Makefile.in:  Use $(objdir)/tcl and $(objdir)/tk if they are
-	available.
-	* configure.in (ENABLE_CLIBS):  Use $(TCL) and $(TK) instead of
-	-ltcl and -ltk.
-	* gdbtk.c:  Get rid of lots of unnecessary #includes.
-	* (gdbtk_init):  Use ConnectionNumber macro instead of referencing
-	Display structure directly.
-	* gdbtk.tcl:  Change exit button to quit button.
-
-Wed Oct 26 15:41:07 1994  Stu Grossman  (grossman@cygnus.com)
-
-	* gdbtk.c: Change sense and name of no_windows variable.  Now
- 	called use_windows, and defaults to off (for compatibility).
-
-Thu Oct 20 17:35:45 1994  Stu Grossman  (grossman@cygnus.com)
-
-	* gdbtk.c (gdb_cmd):  Force GUI into idle mode when errors occur.
-	* (gdb_stop):  New tcl command to stop the target process.
-	* (x_event, gdbtk_wait):  Allow GUI to interrupt gdb out of target
-	waits.
-	* (gdbtk_call_command):  Wrapper around command processing to
-	alert GUI of target state changes.
-	* (gdbtk_init):  Get the fd of X server for doing async
-	notification of X events (via x_event).  Setup new hooks.
-	* gdbtk.tcl:  Add scrollbars to assembly and command windows.
-	* Change window foreground & background colors.
-	* Create margin tag for breakpoints in source and assembly windows.
-	* Add new routines to be invoked when target state changes to/from
-	idle.
-	* Add start of expression window.
-	* Change bindings of mouse button 1 in assembly and source window
-	to just set or clear breakpoints when in the margin tag.
-	* Change shape of register window to be more vertical to better
-	reflect its contents.
-	* Add stop button.
-	* Cleanup some code around command window bindings.
-
-Sat Sep 17 17:05:14 1994  Stu Grossman  (grossman@cygnus.com)
-
-	* gdbtk.tcl:  Let ^U delete lines in the command window.
-
-Fri Sep 16 15:40:34 1994  Stu Grossman  (grossman@cygnus.com)
-
-	* gdbtk.c:  Replace calls to full_filename with symtab_to_filename.  
-	* gdbtk.tcl:  New routine pc_to_line replaces in line code.  New
-	routine decr replaces in line code.
-	* (create_file_win):  Use catch to handle open failures more
-	elegantly.  Also, create special window to display file open
-	failure message.  Move opening of file prior to creation of text
-	widget.
-	* (create_asm_win):  Add PC as argument.  We now base disassembly
-	on PC instead of function name, since function names can be
-	ambiguous (usually seen with shared libs).  Also, use catch to
-	simplify code where we don't care about failures.
-
-Wed Sep 14 00:55:26 1994  Stu Grossman  (grossman@cygnus.com)
-
-	* gdbtk.tcl:  Add ref counts to breakpoint tags.
-	* Put quotes around function name in disassemble command to better
-	handle assembler names containing `.'.
-	* Make pclist element 0 be filler to avoid off-by-one problem with
-	line numbers.
-	* Set names of top-level windows.
-	* Add register display window.
-	* Add PC to label of assembly window.
-
-Tue Sep 13 08:59:04 1994  Stu Grossman  (grossman@cygnus.com)
-
-	* gdbtk.c (gdbtk_flush gdbtk_fputs):  Buffer up output to make
-	disassembly more efficient.
-	* (breakpoint_notify):  Include pc in gdbtk_tcl_breakpoint
-	callback.
-	* (gdb_loc):  Include pc in return value.  Also, return function
-	name if arg was specified.
-	* (gdb_cmd_stub):  Call gdb_flush to drain internal GDB buffers
-	after command completes.
-	* (gdbtk_init):  Improve error handling.
-
-	* gdbtk.tcl:  Add lots of comments.  Clean up code.
-	* (gdbtk_tcl_fputs):  Make output window redirectable.
-	* Add assembly window, and breapoint support.
-	* Make button 1 in margin toggle breakpoints.
-	* Use stippling to indicate breakpoint disabling.
-
-Fri Sep  2 19:11:40 1994  Stu Grossman  (grossman@cygnus.com)
-
-	* configure.in: Don't symlink to gdbtk.tcl if it's already there.
-
-Thu Jul 28 14:37:36 1994  Stu Grossman  (grossman@cygnus.com)
-
-	Support for TK GUI.
-	* Makefile.in:  Add rule for gdbtk.o.
-	* configure.in:  Add support for --enable-gdbtk.
-	* gdbtk.c:  New file.  Contains support routines for TK interface.
-	* gdbtk.tcl:  New file.  Implements GUI policy.
-
-
-Local Variables:
-mode: change-log
-left-margin: 8
-fill-column: 74
-version-control: never
-End:
diff --git a/gdb/gdbtk/generic/ChangeLog-1998 b/gdb/gdbtk/generic/ChangeLog-1998
deleted file mode 100644
index ca919a6156c..00000000000
--- a/gdb/gdbtk/generic/ChangeLog-1998
+++ /dev/null
@@ -1,837 +0,0 @@
-  Mon Dec 21 11:11:02 1998  Keith Seitz  <keiths@cygnus.com>
-
-	  * gdbtk-cmds.c (get_register): Call get_saved_register instead of
-	  read_relative_register_raw_bytes to fetch registers.
-
-  Thu Dec 17 09:00:56 1998  Keith Seitz  <keiths@cygnus.com>
-
-	  * gdbtk-cmds.c (gdb_search): Don't mention C++ RTTI and
-	  global constructor/destructor symbols.
-
-  Thu Nov 12 15:20:15 1998  Jim Ingham   <jingham@cygnus.com>
-	  * More bug fixes merged in from devo.
-
-	  * gdbtk-cmds.c (gdb_cmd): Added an optional second argument to the
-	  gdb_cmd, which is from_tty.  This is passed to the gdb command
-	  parser.  It is 0 by default, and the console window passes 1.
-
-	  * gdbtk-cmds.c: moved disassemble_from_exec from gdbtk.c to gdbtk-cmds.c
-	  with all the other link-var'ed variables
-
-	  * gdbtk-hooks.c (gdbtk_trace_find): Only run the hook functions if 
-	  we are called from_tty.
-
-	  * gdbtk-hooks.c (gdbtk_trace_start_stop): Set the trace buttons
-	  from a trace_start_command callback rather than doing it as a
-	  special case in gdb_cmd.
-
-	  * tracepoint.c (tstart_command, tstop_command): Add call to
-	  trace_start_stop_hook here.
-
-  1998-11-04  Martin M. Hunt  <hunt@cygnus.com>
-
-	  * gdbtk-cmds.c (gdb_set_bp_addr): For callback, send full 
-	  pathname instead of just basename.
-
-  1998-11-03  Keith Seitz  <keiths@cygnus.com>
-	  * v850ice.c (do_gdb): New function.
-	  (ice_stepi): Use do_gdb to step properly.
-	  (ice_nexti): Use do_gdb to step properly.
-	  (view_source): Correct call to src window's location for new version.
-
-  Tue Aug 25 18:13:30 1998  Jim Ingham    <jingham@cygnus.com>
-
-	  * gdbtk.c (gdbtk_init): I hadn't excised ALL the old startup code, 
-	  so it was not working correctly.  Now it does.
-
-  Fri Aug 21 14:37:40 1998  Jim Ingham	<jingham@cygnus.com>
-
-	  * gdbtk.c (gdbtk_init): Changed the startup code to use
-	  tcl_findLibrary
-
-
-
-	
-on Dec 28 17:44:36 1998  David Taylor  <taylor@texas.cygnus.com>
-
-
-	The following changes were made by Jim Blandy <jimb@cygnus.com>,
- 	Edith Epstein <eepstein@cygnus.com>, Elena Zannoni
- 	<ezannoni@cygnus.com> Stan Shebs <shebs@cygnus.com>, and David
- 	Taylor <taylor@cygnus.com>, as part of the project to merge in
- 	changes originally made by HP; HP did not create ChangeLog
- 	entries.
-
-	* gdbtk.c (gdbtk_init): change stderr to gdb_stderr.
-
-	* gdbtk-cmds.c
-	(get_pc_register): Use paddr_nz, not sprintf's %llx and
-	a cast to `long long'.  Those aren't portable.
-	(gdb_eval): add embedded_offset param to val_print call
-	(get_register): add embedded_offset param to val_print call
-
-	* gdbtk-hooks.c
-	(tk_command_loop): change instream to a FILE.
-	(gdbtk_flush): change both the declaration and definition to 
-	use GDB_FILE rather than FILE.
-
-Mon Dec 21 11:11:02 1998  Keith Seitz  <keiths@cygnus.com>
-
-	* gdbtk-cmds.c (get_register): Call get_saved_register instead of
-	read_relative_register_raw_bytes to fetch registers.
-
-Thu Dec 17 09:00:56 1998  Keith Seitz  <keiths@cygnus.com>
-
-        * gdbtk-cmds.c (gdb_search): Don't mention C++ RTTI and
-        global constructor/destructor symbols.
-
-Tue Dec 15 10:09:31 1998  Andrew Cagney  <cagney@b1.cygnus.com>
-
-	* gdbtk-cmds.c (gdb_disassemble): Fix typo.
-
-Sun Dec 13 09:52:51 1998  Andrew Cagney  <cagney@b1.cygnus.com>
-
-	* gdbtk-cmds.c: Update TARGET_PRINT_INSN_INFO, TARGET_PRINT_INSN.
-
-Fri Dec 11 09:52:04 1998  Andrew Cagney  <cagney@chook>
-
-	* gdbtk-cmds.c: Replace reg_name with REGISTER_NAME.
-	
-Mon Dec 14 13:20:50 1998 Jim Ingham  <jingham@cygnus.com>
-
-	* Makefile.in, configure.in configure - add support for LIBGUI
-	outside the IDE context.
-	
-Thu Nov 19 13:14:57 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	* gdbtk-cmds.c: Can't start using new API names yet.  Switch back
-	to calling cygwin32_ funcs until some time has passed...
-	* gdbtk.c: Ditto.  Also, include sys/cygwin.h for Cygwin, instead
-	of providing own proto.
-
-Fri Nov 13 00:15:08 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	Changes to account for name change from cygwin32 to cygwin and
-	clean up Win32-related ifdefs.
-	
-        * gdbtk.c: lose "32" from cygwin_ func calls.  ifndef for
-        checking DISPLAY should be for _WIN32, not WINNT.
-        * gdbtk.h: pick GDBTK_PATH_SEP based on _WIN32, not WINNT.
-        * gdbtk-cmds.c (gdb_path_conv): lose "32" from cygwin_	func call,
-        change ifdef to __CYGWIN32__ instead of WINNT.
-	* {gdbtk.c, gdbtk-hooks.c}: __CYGWIN32__ refs drop the "32".
-
-Thu Nov 12 15:20:15 1998  Jim Ingham   <jingham@cygnus.com>
-
-	* gdbtk-cmds.c (gdb_cmd): Added an optional second argument to the
-	gdb_cmd, which is from_tty.  This is passed to the gdb command
-	parser.  It is 0 by default, and the console window passes 1.
-
-	* gdbtk-cmds.c: moved disassemble_from_exec from gdbtk.c to gdbtk-cmds.c
-	with all the other link-var'ed variables
-
-	* gdbtk-hooks.c (gdbtk_trace_find): Only run the hook functions if 
-	we are called from_tty.
-
-	* gdbtk-hooks.c (gdbtk_trace_start_stop): Set the trace buttons
-	from a trace_start_command callback rather than doing it as a
-	special case in gdb_cmd.
-
-	* tracepoint.c (tstart_command, tstop_command): Add call to
-	trace_start_stop_hook here.
-	
-Wed Nov  4 12:41:42 1998  Jim Ingham  <jingham@cygnus.com>
-
-	* gdbtk-cmds.c (gdb_set_bp_addr): Pass the type, enable & thread
-	to gdbtk_tcl_breakpoint.
-	* gdbtk-hooks.c (gdbtk_trace_find): Added this function.  It is
-	the hook function for tfind commands.
-	* tracepoint.c (trace_find_command): Added the trace_find_hook,
-	run when you do trace_find_command.
-	* tracepoint.h: Define the trace_find_hook.
-
-1998-11-03  Keith Seitz  <keiths@cygnus.com>
-
-        * v850ice.c (do_gdb): New function.
-        (ice_stepi): Use do_gdb to step properly.
-        (ice_nexti): Use do_gdb to step properly.
-        (view_source): Correct call to src window's location for new version.
-
-Mon Nov  2 11:16:10 1998  Jim Ingham  <jingham@cygnus.com>
-
-	* gdbtk-cmds (gdb_get_tracepoint_info): Demangle C++ function names.	
-
-Fri Oct 30 11:22:23 1998  Jim Ingham  <jingham@cygnus.com>
-
-	* gdbtk-cmds (gdb_get_tracepoint_info): Fixed typo.
-	
-Wed Oct 28 16:19:02 1998  Martin M. Hunt  <hunt@cygnus.com>
-
-	* gdbtk-cmds.c (gdb_set_bp_addr): For callback, send full 
-	pathname instead of just basename.
-
-Wed Oct 28 10:14:33 1998  Jim Ingham   <jingham@cygnus.com>
-
-	* gdbtk-cmds.c: Made the bdtypes & bpdisp arrays shared so they
-	could be used in gdbtk-hooks.c (breakpoint_notify).
-	Also fixed a few error messages to actually print the bp number
-	rather that #%d...	
-	* gdbtk-hooks.c (breakpoint_notify): pass more of the information
-	about the breakpoint into the Tcl command, so it does not have to
-	try and guess about information we have on the C side.
-	* gdbtk.h: Export the bptypes & pbdisp arrays.
-	
-1998-10-13  Jason Molenda  (jsm@bugshack.cygnus.com)
-
- 	* gdbtk.c, gdbtk-cmds.c: Cast parameters passed to make_cleanup to
- 	use the new make_cleanup_func typedef.
-
-1998-10-08  Keith Seitz  <keiths@cygnus.com>
-
-	* gdbtk-hooks.c (gdbtk_add_hooks): Install a hook for
-	(new) file_changed_hook.
-	(gdbtk_exec_file_changed): Rename to gdbtk_exec_file_display
-	to mimic hook's name.
-	(gdbtk_file_changed): New hook function.
-	
-Tue Oct  6 22:57:13 1998  Andrew Cagney  <cagney@b1.cygnus.com>
-
-	* configure.in (links): Link gdbtcl2 directory instead of gdbtcl.
-
-Mon Oct  5 00:34:00 1998  Martin M. Hunt  <hunt@cygnus.com>
-
-	* gdbtk-cmds.c (gdb_set_bp_addr): New command. Sets a
-	breakpoint at an address. Use this instead of gdb_cmd "break"
-	because the syntax of the break command is broken and doesn't
-	allow you to create a thread-specific BP at an address.  Also
-	this is faster.
-
-Sun Oct  4 22:35:47 1998  Martin M. Hunt  <hunt@cygnus.com>
-
-	* gdbtk-cmds.c (gdb_set_bp): Add an optional thread number.
-	(gdb_find_bp_at_line): New function. Returns a list of bpnums 
-	at the specified line number.
-	(gdb_find_bp_at_addr): New function. Returns a list of bpnums 
-	at an address..
-
-1998-10-02  Keith Seitz  <keiths@cygnus.com>
-
-	* gdbtk-hooks.c (gdbtk_exec_file_changed): New function which handles
-	exec_file changes.
-	(gdbtk_add_hooks): Define exec_file_display_hook (to gdbtk_exec_file_changed)
-
-	* gdbtk-cmds.c (gdb_stop): target_stop is ALWAYS defined, so
-	compare against something a little more meaningful (target_ignore).
-
-1998-09-24  Keith Seitz  <keiths@cygnus.com>
-
-	* gdbtk.c (gdbtk_wait): Don't run the timer for ice targets.
-
-	* v850ice.c (WM_ADDR_TO_SYM): New message.
-	(v850ice_wndproc): Add handler for WM_SOURCE.
-	(v850ice_wait): Call the ui_loop_hook occasionally.
-	(ice_cont): Acknowledge message before doing anything.
-	(ice_stepi): Ack message and let gdbtk do stepping.
-	(ice_nexti): Ack message and let gdbtk do stepping.
-	(view_source): New function ICE calls to display source code.
-
-1998-09-18  Keith Seitz  <keiths@cygnus.com>
-
-        * gdbtk-cmds.c (get_frame_name): Demangle function names, too.
-
-Thu Sep 10 22:10:29  1998 Jim Ingham <jingham@cygnus.com>
-
-	*gdbtk-cmds.c (gdb_disassemble): Make sure the symtab's linetable is not
-	null before trying to use it...
-	
-1998-09-02  Keith Seitz  <keiths@cygnus.com>
-
-	* gdbtk-cmds.c (gdb_cmd): Do not run the timer when downloading --
-	the ui_progress_hook that has been installed will actually
-	update the gui for us.
-
-Mon Aug 31 15:42:10 1998  Tom Tromey  <tromey@cygnus.com>
-
-	* gdbtk-hooks.c (context_hook): Don't define.
-
-1998-08-31  Keith Seitz  <keiths@cygnus.com>
-
-	* gdbtk-cmds.c (gdb_listfuncs): When stripping out "global destructors"
-	and "global constructors", do not append any elements to the result.
-
-Sun Aug 30 00:49:18 1998  Martin M. Hunt  <hunt@cygnus.com>
-
-	* gdbtk-cmds.c (Gdbtk_Init): Link C variable gdb_context
-	with tcl variable gdb_context_id.
-
-	* gdbtk-hooks.c (gdbtk_context_change): Implement new hook called 
-	context_hook.  Called when threads change.
-
-	* gdbtk.c: Initialize gdb_context.
-
-	* gdbtk.h: Declare gdb_context.
-
-	* infrun (wait_for_inferior): Call context_hook.
-
-	* thread.c (thread_command): Call context_hook.
-
-	* defs.h: Declare context_hook.
-	
-Fri Aug 28 12:14:49 1998  Martin M. Hunt  <hunt@cygnus.com>
-
-	* gdbtk-cmds.c (gdb_loadfile): Open the file after doing
-	the symtab lookup and calling symtab_to_filename(). This
-	makes GDBtk work with the GDB "dir" command.
-
-1998-08-18  Keith Seitz  <keiths@cygnus.com>
-	
-	* gdbtk-hooks.c (gdbtk_add_hooks): Set selected_frame_level_changed_hook.
-	(gdbtk_selected_frame_changed): New function.
-
-	* gdbtk-cmds.c (Gdbtk_Init): Add command gdb_stack into interpreter.
-	Link gdb's global selected_frame_level with interpreter global
-	gdb_selected_frame_level.
-	(gdb_stack): New function to faciltate speedier backtraces from
-	gdbtk.
-	(get_frame_name): New helper function for gdb_stack.
-
-Tue Aug 18 15:42:40 1998  Martin M. Hunt  <hunt@cygnus.com>
-
-	* gdbtk-cmds.c (gdb_listfuncs): Strip out global constructors
-	and destructors from the function list.
-
-Thu Aug 13 15:09:59 1998  Drew Moseley  <dmoseley@cygnus.com>
-
-	* gdbtk.c (gdbtk_cleanup): added a scope-level around the contents
-	of the #ifdef so that the variable declarations in there would not
-	be illegal in a C compilation.
-
-Mon Jul 27 13:07:16 1998  Martin M. Hunt  <hunt@cygnus.com>
-
-	* gdbtk.c (gdbtk_call_command): Removed because it is now
-	in gdbtk-hooks.c
-	(null_routine): Removed.
-
-	* gdbtk-hooks.c (tracepoint_notify): Fix sprintf to
-	match number of arguments.
-
-	* gdbtk-cmds.c (gdb_loc): When calling gdb_loc with an
-	argument, call find_pc_line() to get a complete
-	symtab_and_line struct.
-
-Fri Jul 24 14:25:43 1998  Keith Seitz  <keiths@cygnus.com>
-
-	* gdbtk-cmds.c (gdb_search): Add missing NULL to switches.
-	Add missing flags to result_ptr.
-	Pass along any errors caused by getting the list of files from
-	tcl.
-	Allocate correct amount of memory for the file list.
-	Don't do any unecessary cleanups.
-
-Fri Jul 24 01:08:37 1998  Martin M. Hunt  <hunt@cygnus.com>
-
-	* gdbtk-cmds.c (gdb_loadfile): When there are no
-	linenumbers, use only one tab.
-
-Sat Jul 18 12:28:39 1998  Martin M. Hunt  <hunt@cygnus.com>
-
-	* gdbtk.c (gdbtk_cleanup): Add call to tcl function
-	gdbtk_cleanup. We need this so the GUI gets to clean
-	up no matter how GDB exits.
-
-Wed Jul  1 13:10:58 1998  Jim Ingham   <jingham@cygnus.com>
-
-	* Moved gdbtk_hooks.c & gdbtk_cmds.c to gdbtk-hooks.c &
-	gdbtk-cmds.c to comply with the gdb conventions.  Changed the
-	configure & makefile to reflect the change...
-	
-Wed Jul  1 11:07:21 1998  Jim Ingham   <jingham@cygnus.com>
-
-	* gdbtk.c: removed all the commands and hooks from this file so
-	now it contains only the startup code.
-	* gdbtk.c (gdbtk_init): Fixed a bug in the startup code on Windows 
-	that caused gdbtk not to find the share directory unless
-	GDBTK_LIBRARY was set.
- 	* gdbtk_cmds.c: New file - this contains all the Tcl commands that
-	gdb defines.  All the old commands were moved here, the
-	string-based commands were converted to object commands, and the
-	object-based commands were all converted to uniformly use the
-	call_wrapper.  A new function, Gdbtk_Init was added to centralize
-	initializing the gdb package.
-	* gdbtk_hooks.c: New file - All the hooks were moved here, and a new
-	function, gdbtk_add_hooks was added to centralize adding all these 
-	hook functions.  gdbtk_fputs was also modified to handle the new
-	result_ptr structure.  See the comments in gdbtk.h for more
-	details.
-	* gdbtk.h: New file - this contains all the defines and globals
-	shared by gdbtk.c, gdbtk_cmds.c & gdbtk_hooks.c
-	* Makefile.in, configure.in & configure: mutatis mutandi for the
-	new files.
-	
-
-Mon Jun 29 11:49:17 1998  Keith Seitz  <keiths@cygnus.com>
-
-	* main.c (main): Don't include gdbtk test code if GDBTK is
-	not defined by configure.
-
-	* configure.in: When enabling gdbtk, add "-DGDBTK" to ENABLE_CFLAGS.
-
-	* configure: Regenerate.
-	
-Fri Jun 26 13:56:07 1998  Keith Seitz  <keiths@cygnus.com>
-
-	* gdbtk.c: Change all references to static global "interp" to
-	"gdbtk_interp" and export this global.
-	(gdbtk_init): If gdbtk_source_filename is not NULL, source this file
-	into the interpreter when it goes idle.
-	Add new command "gdb_search".
-	(gdb_search): New function which searches the symbol table.
-	(gdbtk_test): New function called by main when the --tclcommand
-	option is used.
-
-	* main.c (main): Add a new option "--tclcommand" which is used
-	by the testsuite to source a file into the interpreter when it
-	goes idle.
-
-Sun Jun 21 09:31:12 1998  Ron Unrau  (runrau@cygnus.com)
-
-	* gdbtk.c (gdb_set_bp): Use new interface.
-
-Wed Jun 17 19:12:23 1998  Jeff Holcomb  <jeffh@cygnus.com>
-
-	* Makefile.in (install-only): Install tracing help files.
-
-Mon Jun 15 13:18:21 1998  Jim Ingham <jingham@cygnus.com>
-
-	* gdbtk.c (gdbtk_init): Add elements to the auto_path AS LIST
-	ELEMENTS.  This allows gdbtk to work when installed in a directory 
-	which has a space in the path.  D. Moseley pointed out the bug.
-
-
-Tue Jun  9 14:10:46 1998  Keith Seitz  <keiths@cygnus.com>
-
-	* gdbtk.c (gdb_get_vars_command): Return static variables and
-	variables stored in registers.
-
-	* main.c (main): Call pre/post_add_symbol_hook's when loading
-	executables and symbol files.
-	
-Fri Jun  5 00:16:22 1998  Martin M. Hunt  <hunt@cygnus.com>
-
-	* gdbtk.c (gdbtk_init): Change all references to
-	GDBTK_IDE to IDE_ENABLED.
-
-Thu Jun  4 18:31:53 1998  Martin M. Hunt  <hunt@cygnus.com>
-
-	* gdbtk.c (gdbtk_init): Initialize tkTable.
-
-Thu Jun  4 10:15:03 1998  Elena Zannoni  <ezannoni@kwikemart.cygnus.com>
-
-	* gdbtk.c: merged:
-	
-	- Elena Zannoni  <ezannoni@kwikemart.cygnus.com>
-        (call_obj_wrapper): in case of error, copy the
-        error message from the result to the error_string.
-        (gdbtk_fputs): add comments.
-        (gdb_actions_command): call validate_actionline when installing the
-        tracepoint, to do the syntax checking of the actions for us.
-        - Elena Zannoni  <ezannoni@kwikemart.cygnus.com>
-        (gdb_get_trace_frame_num): new function to get the
-        trace frame number from gdb.
-        (gdbtk_init): added new command gdb_get_trace_frame_num.
-        - Jim Blandy  <jimb@zwingli.cygnus.com>
-        (struct wrapped_call_objs): Change the `func' member to
-        be a Tcl_ObjCmdProc, not an Tcl_CmdProc, since it accepts a vector
-        of objects as arguments.  Change the object vector to be const,
-        since that's what all the users of this structure seem to expect.
-        (call_obj_wrapper): Cast clientData properly before storing it in
-        the wrapped_args structure.
-	
-Thu May 28 17:19:14 1998  Keith Seitz  <keiths@cygnus.com>
-
-	* gdbtk.c (_initialize_gdbtk): Get rid of the console. Patch from
-	Chris Faylor (cgf@cygnus.com).
-
-	* configure.in: Link cygwin32 with subsystem console.
-
-	* configure: Regenerated
-	
-Sun May 24 14:00:24 1998  Keith Seitz  <keiths@cygnus.com>
-
-	* ser-unix.c (wait_for): Do not reset timeout_remaining for cygwin32 so that
-	we can use this member to track real timeouts.
-	(hardwire_readchar): Modify for cygwin32 so that we only ever use a real
-	system timeout of one second. Track the "real" timeout as a series of these
-	one second timeouts.
-	Call ui_loop_hook to keep the gui alive.
-
-	* top.c: Define new hook for cygwin32, "ui_loop_hook".
-
-	* gdbtk.c (gdbtk_init): Add ui_loop_hook for CygWin32 to work around
-	update problems.
-
-Thu May 21 13:56:24 1998  Elena Zannoni  <ezannoni@kwikemart.cygnus.com>
-       
-	* gdbtk.c: reinserted the changes that were accidentally deleted:
-	(_initialize_gdbtk): Use correct device names in
-	cygwin-specific call (cosmetic change). 
-        (gdbtk_ignorable_warning): removed va_list parameter,
-	which was unused.
-        (_initialize_gdbtk): add cygwin32 specific code to
-	allow `gdb -nw' to work when specified specified from a windows
-	console-mode command line.
-
-1998-05-19  Jim Blandy  <jimb@zwingli.cygnus.com>
-
-	* gdbtk.c (struct wrapped_call_objs): Change the `func' member to
- 	be a Tcl_ObjCmdProc, not an Tcl_CmdProc, since it accepts a vector
- 	of objects as arguments.  Change the object vector to be const,
- 	since that's what all the users of this structure seem to expect.
-	(call_obj_wrapper): Cast clientData properly before storing it in
-	the wrapped_args structure.
-
-Wed May 13 11:12:58 1998  James Ingham  <jingham@leda.cygnus.com>
-
-	* gdbtk.c: Fixed a goof in the definition of the gdb_get_args &
-	gdb_get_locals Tcl commands.  Moved the previous ChangeLog entry
-	from ChangeLog to ChangeLog-gdbtk (here)...
-	
-Tue May 12 13:29:20 1998  Jeff Holcomb  <jeffh@cygnus.com>
-
-	* Makefile.in (install-only): Add images/icons.txt and
-	images2/icons.txt to files that need to be installed.
-
-Tue May 12 12:03:16 1998  James Ingham  <jingham@leda.cygnus.com>
-
-	* gdbtk.c: Add an object call wrapper for the new Tcl_Obj based
-	commands.  This way the obj commands will also go through
-	catch_errors.  This is just a bandaid while I rewrite the
-	string-based commands to use the object format.
-
-Tue May  5 09:30:25 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* gdbtk.c (_initialize_gdbtk): Use correct device names in
-	cygwin-specific call (cosmetic change). 
-
-Wed Apr 29 15:53:16 1998  Elena Zannoni  <ezannoni@kwikemart.cygnus.com>
-
-	* gdbtk.c (gdbtk_ignorable_warning): removed va_list parameter,
-	which was unused.
-
-Tue Apr 28 19:41:33 1998  Tom Tromey  <tromey@cygnus.com>
-
-	* Makefile.in (GDBTKLIBS): New macro.
-	(INSTALLED_LIBS): Include GDBTKLIBS.
-	(CLIBS): Likewise.
-	* configure: Rebuilt.
-	* configure.in: Put Tcl/Tk libs into GDBTKLIBS, not LIBS.
-	(GDBTKLIBS): AC_SUBST.
-
-Thu Apr 23 19:01:05 1998  Keith Seitz  <keiths@onions.cygnus.com>
-
-	* Makefile.in (install-only): Install help files.
-
-Wed Apr 22 21:17:35 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* gdbtk.c (_initialize_gdbtk): add cygwin32 specific code to
-	allow `gdb -nw' to work when specified specified from a windows
-	console-mode command line.
-
-Wed Apr 15 11:23:53 1998  Stan Shebs  <shebs@andros.cygnus.com>
-
-	* gdbtcl: Remove directory and contents, this version of
-	the interface is obsolete.
-
-Mon Apr 13 16:17:52 1998  Martin M. Hunt  <hunt@cygnus.com>
-
-	* gdbtk.c (gdb_loadfile): Change fstat() call to stat().
-	Needed because you can't convert a FILE* to an fd.
-
-Mon Apr 13 16:28:07 1998  Elena Zannoni  <ezannoni@kwikemart.cygnus.com>
-	
-	* gdbtk.c: (perror_with_name_wrapper) new function to call 
-	perror_with_name safely.
-	(gdb_loadfile) added source vs. executable time stamp check.
-	(gdbtk_warning) new function to pass a warning message to the gui.
-	(gdbtk_ignorable_warning) new function to pass a warning
-	to the gui. Used only for the src. vs. exec check.
-	(gdbtk_init) added warning_hook 
-	added include <sys/stat.h>
-
-Mon Apr 13 12:58:26 1998  Keith Seitz  <keiths@onions.cygnus.com>
-
-	* gdbtk.c (gdbtk_start_timer): Include on all platforms. Decrease
-	timer interval a little.
-	(gdbtk_stop_timer): Include on all platforms.
-	(gdbtk_wait): No more signals! Use a timer on all platforms to keep the
-	GUI alive.
-	(gdbtk_init): Remove FIOASYNC and all x_fd references. Now using timers
-	on all platforms.
-	
-Fri Apr 10 15:48:10 1998  Jason Molenda  (crash@bugshack.cygnus.com)
-
-        * gdbtk.c (gdb_listfiles): Allocate space for 'files' dynamically.
-
-Thu Apr  9 14:20:59 1998  Martin M. Hunt  <hunt@cygnus.com>
-
-	* gdbtk.c (gdbtk_init): Remove redundant variable "IDE".
-
-Tue Apr  7 15:13:58 1998  Stan Shebs  <shebs@andros.cygnus.com>
-
-	* gdbtk.tcl: Remove, no longer used.
-
-Tue Apr  7 12:49:45 1998  Keith Seitz  <keiths@onions.cygnus.com>
-
-	* gdbtk.c (gdb_cmd): NEVER call the busy, update, and idle hooks.
-
-Tue Mar 31 15:42:06 1998  Keith Seitz  <keiths@onions.cygnus.com>
-
-	* gdbtk.c (gdb_loadfile): Don't use the return result from
- 	sprintf, which returns a char * under SunOS4.
-
-Tue Mar 31 17:18:43 1998  Ian Lance Taylor  <ian@cygnus.com>
-
-	* configure.in: Add $(LIBIDETCL) as well as $(LIBIDE) if
-	--enable-ide.
-	* Makefile.in (IDE_CFLAGS_X): Add -I for libidetcl/src.
-	(LIBIDETCL): Define.
-	* configure: Rebuild.
-
-Sun Mar 29 21:19:46 1998  Keith Seitz  <keiths@onions.cygnus.com>
-
-	* gdbtk.c (gdb_get_tracepoint_info): Change formatting of address.
-	(tracepoint_exists): Remove code which confuses assembly traces.
-
-Sat Mar 28 12:13:23 1998  Keith Seitz  <keiths@onions.cygnus.com>
-
-	* gdbtk.c (gdb_cmd): If argc > 2, assume that the busy and idle hooks
-	should not be called.
-
-Thu Mar 26 22:29:28 1998  Elena Zannoni  <ezannoni@kwikemart.cygnus.com>
-
-        * gdbtk.c: (gdb_trace_status) new function.
-        (gdbtk_init) added command "gdb_is_tracing".
-        (tracepoint_notify) added passcount information.
-
-Thu Mar 26 12:00:35 1998  Martin M. Hunt  <hunt@cygnus.com>
-
-	* gdbtk.c (gdbtk_fputs): Insert fencepost.
-	(gdb_loc): Correct pc calculation.
-	(gdb_immediate_command): Return if a load is in progress.
-	(gdb_cmd): Return if a load is in progress.
-	(target_stop_wrapper): New function.
-	(gdb_stop): Call target_stop_wrapper.
-	(x_event): Add fencepost and optimize load cancel check.
-	(gdbtk_start_timer): Set up structs only once.
-	(gdbtk_stop_timer): Just use preset structs to set timer parameters.
-	(gdb_loadfile): If file cannot be loaded, return error message.
-	(gdb_loadfile): Add space before tab so that lines without
-	a '-' can later be changed to have one.
-
-Wed Mar 25 14:08:51 1998  Elena Zannoni  <ezannoni@kwikemart.cygnus.com>
-
-	* gdbtk.c (gdbtk_pre_add_symbol): Use Tcl_merge to form Tcl commands.
-
-Mon Mar 23 13:41:39 1998  Elena Zannoni  <ezannoni@kwikemart.cygnus.com>
-
-	* gdbtk.c (gdb_get_mem): Rewrite to fetch entire contents
-	of the memory window at once.
-
-Sat Mar 21 19:34:49 1998  Elena Zannoni  <ezannoni@kwikemart.cygnus.com>
-
-	Merged changes from Foundry: list follows by author:
-	
-	- Tom Tromey  <tromey@cygnus.com>
-
-	* Makefile.in (gdbres.o): New target.
-	(WINDRES): New define.
-	* configure: Rebuilt.
-	* configure.in (WINDRES): Define.
-	(CONFIG_OBS): Include gdbres.o on Windows.
-	* gdbtool.ico: New file.
-	* gdb.rc: New file.
-        * gdbtk.c (gdbtk_init): Call ide_create_messagebox_command.
-	(gdbtk_cleanup): Call ide_interface_deregister_all.
-	(gdbtk_init): Pass event handle to cleanup.
-	(TclDebug): Use Tcl_Merge to construct command.
-	(gdbtk_init): Call ide_create_cygwin_path_command.
-
-        - Martin M. Hunt  <hunt@cygnus.com>
-
-	* gdbtk.c (gdb_set_bp): Set addr_string for bp.
-	(gdb_get_breakpoint_info): Demangle function 
-	names in breakpoint info.
-	Include "demangle.h".
-	(gdb_loc, gdb_listfuncs): Demangle C++ 
-	function names.
-	(gdb_set_bp): Properly quote filename to fix
-	problems with spaces. Send pc back as a hex string.
-	(gdb_listfuncs): Remove debugging line.
-	 Turn off some debugging lines.
- 	(breakpoint_notify): Return correct line number.
-	(gdb_get_breakpoint_info): Return correct line number.
-	(gdb_set_bp): New function to provide a better way to
-	set breakpoints.
-	(gdbtk_readline, gdbtk_readline_begin): Memory 
-	allocated by tcl needs to be freed by Tcl_Free().
-	(find_file_in_dir): Deleted.
-	(gdb_find_file_command): Call full_lookup_symtab().
-	(gdb_listfuncs): Call full_lookup_symtab().
-	(full_lookup_symtab): New function.  Like lookup_symtab
-	except handles multiple files with the same basename,
-	full pathnames, and always sets symtab->fullname.
-	(gdb_loadfile): Call full_lookup_symtab(). Clear
-	realloc'd memory.
-	(gdb_loadfile):  Don't tag lines without source.
-	Tag source lines with source_tag.
-	(gdb_find_file_command, find_file_in_dir):
- 	Rewrite.  Now searches symtabs and psymtabs for a match
-	on the partial or full filename.  Returns the full pathname.
-	(gdb_loadfile): Realloc additional memory
-	if someone loads in a file with more than 160,000
-	lines.  I don't know if this really works because
-	I don't have enough memory to test it.
-	(gdb_sourcelines): Deleted.
-	(gdb_loadfile): New function. Takes a text widget
-	and loads it with the contents of a file.  Marks
-	and tags source lines.
-	(pc_changed): New function.
-	(get_pc_register): Returns the value of
-	the PC to GDB.
-	(gdb_loc): If looking on the stack, return
-	real pc along with calling source line.
-	(gdb_loc): Return "" instead of "N/A" if
-	filename is not found.
-	(gdb_get_breakpoint_info): Same.
-	(get_register): For Natural mode, set format to 0.
-	 Minor bugfixes from keiths.
-	(TclDebug): New function for debugging use.
-	(gdb_loc): Return correct PC for frames
-	that are not the innermost frame.
-	(gdb_listfiles): Rewritten to use object
-	API.  Now takes an optional dirname which will cause
-	only files in that directory or its subdirectories
-	to be returned.  Now returns basenames instead of
-	full pathnames.
-	(gdb_cmd): Set/reset load_in_progress flag.
-	(call_wrapper): Don't pop up dialog for errors in
-	downloads; just abort download.
-	(gdbtk_load_hash): Set return value correctly.
-
-        -  Keith Seitz  <keiths@onions.cygnus.com>
-
-	* gdbtk.c (gdbtk_init): Define the ui_loop_hook so that it can be
-	called by routines which might block, allowing us to update the GUI.
-	(gdbtk_wait): Move timer calls to annotation hooks.
-	(gdbtk_init): Define the annotation hooks.
-	(gdbtk_annotate_starting): New function for cygwin32 hosts.
-	(gdbtk_annotate_stopped): New function for cygwin32 hosts.
-	(gdbtk_annotate_exited): New function for cygwin32 hosts.
-	(gdbtk_annotate_signalled): New function. for cygwin32 hosts.
-	(gdbtk_init): Use gdbtk_print_frame_info hook.
-	(gdbtk_print_frame_info): New function which sets current_source_symtab
-	based on the given symtab and line info.
-	(gdb_immediate_command): New function which does 
-	not buffer any
-	output. (Contrast to gdb_cmd.)
-	(gdb_prompt_command): New function to return gdb's prompt.
-	(find_file_in_dir): New functon which searches source paths 
-	for a given filename.
-	(gdb_find_file): New function which returns path to given file -- uses
-	find_file_in_dir.
-	(gdbtk_init): Install "gdb_immediate", "gdb_find_file", and 
-	"gdb_prompt"
- 	commands into interpreter.
-
-        -  Ian Lance Taylor  <ian@cygnus.com>
-
-	* gdbtk.c (gdbtk_timer_going): If __CYGWIN32__, new static
-	variable.
-	(gdb_cmd): If __CYGWIN32__, if executing the load command, call
-	gdbtk_start_timer and gdbtk_stop_timer.
-	(call_wrapper): If __CYGWIN32__, if the timer is going, turn it
-	off.  Clear load_in_progress.
-	(x_event): If load_in_progress, quit if download_cancel_ok.
-	(gdbtk_start_timer): Set gdbtk_timer_going.
-	(gdbtk_stop_timer): Clear gdbtk_timer_going.
-	(gdbtk_wait): Call x_event.
-	(gdbtk_init): Call ide_create_win_grab_command if
-	__CYGIN32__.
-	(gdb_clear_file): Clear stop_pc.
-
-Wed Mar  4 16:50:18 1998  Jason Molenda  (crash@bugshack.cygnus.com)
-
-	* gdbtk.c (gdb_listfiles): Fix thinko in last change.
-
-Wed Mar  4 15:34:49 1998  Jason Molenda  (crash@bugshack.cygnus.com)
-
-	* gdbtk.c (gdb_listfiles): Allocate space for 'files' dynamically.
-
-Tue Feb 10 17:50:37 1998  Keith Seitz  <keiths@onions.cygnus.com>
-
-	* gdbtk.c (gdbtk_modify_tracepoint): Define new tracepoint modification hook.
-	(gdbtk_print_frame_info): Define this hook so that current_source_symtab
-	is set properly.
-	(gdb_actions_command): Use free_actions () from tracepoint.c/h.
-	
-Mon Jan 26 11:37:55 1998  Keith Seitz  <keiths@onions.cygnus.com>
-
-	* gdbtk.c (gdb_actions_command): Make note of next action
-	before freeing all references to it.
-
-Sat Jan 24 23:52:08 1998  Martin M. Hunt  <hunt@cygnus.com>
-
-	* gdbtk.c: Merge from Foundry branch.
-	(TclDebug): New debugging function.
-	(gdb_loc): For frames, find address of calling function
-	instead of whatever is on the stack (usually the next
-	instruction).
-	(gdb_listfiles): Takes an optional pathname argument and 
-	returns an alphabetized list of basenames of files in the
-	path.
-
-Wed Jan 22  10:37:02 1998  Keith Seitz  <keiths@onions.cygnus.com>
-
-	* symfile.c: Define two new hooks for symbol reading: 
-	"pre_add_symbol_hook" and "post_add_symbol_hook". These hooks 
-	are called before we begin reading symbols, and after we finish.
-	(generic_load): Use new symbol reading hooks and get rid of 
-	compiler warning.
-
-	* gdbtk.c (gdbtk_init): Add hooks for pre- and post-symbol reading.
-	(gdbtk_pre_add_symbol): New function: the pre-add-symbol hook.
-	(gdbtk_post_add_symbol): New function: the post-add-symbol hook.
-	(find_file_in_dir): New function. Moved the guts of gdb_find_file_command
-	into here to allow its use by others.
-	(gdb_loc): Use find_file_in_dir to return the real path to the file
-	(or "N/A" if we can't find it).
-
-	* configure.in (TIX_LIB_EXT): Define new variable for those special cases
-	when TCL_SHLIB_SUFFIX is not enough to specify the dependency.
-
-	* configure: Regenerate.
-
-Fri Jan 23 07:47:06 1998  Fred Fish  <fnf@cygnus.com>
-
-	* Makefile.in (uninstall): Remove installed gdbtcl dir, if one
-	was installed.
-
-Thu Jan 15 12:42:28 1998  Keith Seitz  <keiths@onions.cygnus.com>
-
-	* gdbtk.c (gdb_immediate_command): New function which does not buffer any
-	output. (Contrast to gdb_cmd.)
-	(gdbtk_init): Install "gdb_immediate" command into interpreter.
-
-Wed Jan 14 16:38:44 1998  Keith Seitz  <keiths@pizza.cygnus.com>
-
-	* configure.in (--enable-gdbtk): If tcl was built with --enable-shared,
-	use TCL_SHLIB_SUFFIX to specify the suffix of the library file so that
-	we don't expect to see "libfoo.a" instead of "libfoo.{so,sl, etc}".
-
-	* configure: Regenerate.
-	
-Wed Dec 31 16:50:26 1998  Keith Seitz  (keiths@onions.cygnus.com)
- 
-        * gdbtk.c (gdb_actions_command): extract and save step count
-        from "while-stepping" command
-
diff --git a/gdb/gdbtk/generic/ChangeLog-1999 b/gdb/gdbtk/generic/ChangeLog-1999
deleted file mode 100644
index b5788594070..00000000000
--- a/gdb/gdbtk/generic/ChangeLog-1999
+++ /dev/null
@@ -1,2624 +0,0 @@
-1999-09-23  Fernando Nasser  <fnasser@totem.to.cygnus.com>
-
-	* gdbtk-varobj.c (variable_value):  Fix small memory leak.
-
-Thu Nov 18 18:19:59 1999  Andrew Cagney  <cagney@b1.cygnus.com>
-
-	* gdbtk.c (tk_command), gdbtk-hooks.c (gdbtk_readline),
- 	gdbtk-variable.c (variable_type): Replace strdup with xstrdup.
-
-Thu Nov 18 19:03:28 1999  Andrew Cagney  <cagney@b1.cygnus.com>
-
-	* gdbtk-cmds.c (gdb_get_mem): Document nbr parameter.  Fix check
- 	on nbr and nbytes parameters.
-
-1999-11-18  Tom Tromey  <tromey@cygnus.com>
-
-	* gdbtk-cmds.c (gdb_actions_command): Updated for new
-	get_tracepoint_by_number.
-
-Tue Nov  9 15:40:51 1999  Andrew Cagney  <cagney@b1.cygnus.com>
-
-	* gdbtk-cmds.c (gdb_get_mem): Keep calling
- 	target_read_memory_partial until all the data is read.
-
-1999-11-01  Tom Tromey  <tromey@cygnus.com>
-
-	* gdbtk-cmds.c (gdb_actions_command): Updated for new
-	get_tracepoint_by_number.
-
-Fri Oct 15 18:34:41 1999  Andrew Cagney  <cagney@b1.cygnus.com>
-
-	* gdbtk-hooks.c (ui_load_progress_hook): Move extern declaration
- 	to defs.h.
-	(gdbtk_load_hash): Update SECTION argument to match prototype.
-  	Make static.
-
-Wed Oct 13 17:57:17 1999  Andrew Cagney  <cagney@b1.cygnus.com>
-
-	* gdbtk-hooks.c (gdbtk_flush): Delete.
-	(gdbtk_add_hooks): Don't initialize flush_hook.
-
-Mon Oct 11 10:19:04 1999  Andrew Cagney  <cagney@b1.cygnus.com>
-
-	* gdbtk-cmds.c (gdb_get_tracepoint_info): Use paddr_nz to convert
- 	the address into a string.
-
-1999-10-05  James Ingham  <jingham@leda.cygnus.com>
-
-	* gdbtk-cmds.c (map_arg_registers): Don't stop at the first
-	undefined register, but skip it and go on.  There may be other
-	defined registers higher up in the list.
-
-1999-09-29  Fred Fish  <fnf@cygnus.com>
-
-	* gdbtk-varobj.c (variable_create):  Replace cast "(CORE_ADDR) - 1"
-	with the more obviously intended expression "(CORE_ADDR) -1".
-
-1999-09-23  Fernando Nasser  <fnasser@totem.to.cygnus.com>
-
-	* gdbtk-variable.c (variable_value): Fix handling of baseclasses and
-	correct the behavior when it is not a baseclass (both cases could
-	potentially dumping core).
-
-1999-09-23  James Ingham  <jingham@leda.cygnus.com>
-
-	* gdbtk.c (gdbtk_init): Add the initialization of the shell
-	execute command under cygwin.
-
-	* gdbtk-hooks.c (gdbtk_attach): New function, run from the attach
-	hook.  
-	(gdbtk_detach): New function, run from the detach hook.
-	(gdbtk_add_hooks): Add the attach & detach hooks.
-
-1999-09-23  Fernando Nasser  <fnasser@totem.to.cygnus.com>
-
-	* gdbtk-varobj.c (variable_create): Dynamically allocate variable
-	object name string.
-
-1999-09-22  Fernando Nasser  <fnasser@totem.to.cygnus.com>
-
-	* gdbtk-variable.c (_gdb_variable): Remove unused entry.
-	(variable_update): Fix error in list initialization (apparently
-	innocuous).
-	(type_changeable): Fix handling of typedef'ed structs and
-	unions (removing c_variable.exp test case 2.12 FAIL).
-
-Mon Sep 20 18:03:28 1999  Andrew Cagney  <cagney@b1.cygnus.com>
-
-	* gdbtk-variable.c (new_root_variable): Fix prototype declaration.
-	* gdbtk.c (_initialize_gdbtk): Add declaration.
-	* gdbtk-cmds.c (tracepoint_exists): Make static.  Add declaration.
-	* gdbtk.c (gdbtk_add_hooks): Move declaration from here.
-	* gdbtk.h (gdbtk_add_hooks): To here.
-
-Fri Sep 17 19:00:39 1999  Andrew Cagney  <cagney@b1.cygnus.com>
-
-	* gdbtk-cmds.c: Include "source.h".
- 	(gdb_load_disassembly): Fix printf calls.
-	Makefile.in (gdbtk-cmds.o): Add dependency on source.h.
-
-	* gdbtk.c: Include <itk.h> for Itk_Init.
-
-1999-09-17  Fernando Nasser  <fnasser@totem.to.cygnus.com>
-
-	* gdbtk-varobj.c: New file.  It supersedes gdbtk-variable.c and
-	uses standard gdb varobj code.
-
-Fri Sep  3 20:16:54 1999  Andrew Cagney  <cagney@b1.cygnus.com>
-
-	* gdbtk.c (gdbtk_init): Cast ``host_name'' and ``target_name'' to
- 	void.  While Tcl_SetVar2 treats the value argument as read-only
- 	its prototype does not specify const for the parameter.
-
-Mon Aug 30 17:56:28 1999  Andrew Cagney  <cagney@b1.cygnus.com>
-
-	* gdbtk.c, gdbtk-hooks.c, gdbtk-cmds.c: #include <unistd.h> moved
- 	to defs.h.
-
-Mon Aug 30 15:34:42 1999  Andrew Cagney  <cagney@b1.cygnus.com>
-
-	* gdbtk-hooks.c (x_event): Missing result to return - return 0.
-  	Make in_x_event volatile.
-	(in_fputs): Make volatile.
-
-1999-09-02  Stan Shebs  <shebs@andros.cygnus.com>
-
-	* gdbtk.c: Include version.h, remove inconsistent decls of
- 	host_name and target_name.
-
-1999-08-27  James Ingham  <jingham@leda.cygnus.com>
-
-	* gdbtk.h: Add def'n for gdbtk_fputs, since it is needed outside
-	of gdbtk-hooks.c
-
-	* gdbtk-cmds.c (gdb_load_disassembly): Really implement this
-	function.  Load the source widget from C.
-	(gdbtk_load_source): Helper for the above, which loads source lines.
-	(gdbtk_load_asm): Helper for the above, which loads assembly
-	lines.
-	(gdb_restore_fputs): New function, restore the gdbtk_fputs hook,
-	in case somebody supressed it, and then errored out before they
-	got a chance to put it back.
-
-1999-08-10  James Ingham  <jingham@leda.cygnus.com>
-
-	* gdbtk-hooks.c: Remove the gdb_disassembly_flavor_hook.  Use the
-	set_hook instead.
-
-Mon Aug  9 10:28:22 1999  Andrew Cagney  <cagney@b1.cygnus.com>
-
-	* gdbtk.c, gdbtk-cmds.c: Delete #if ANSI_PROTOTYPES code, GDB
- 	assumes ISO-C.
-
-1999-08-06  Tom Tromey  <tromey@cygnus.com>
-
-	* gdbtk-hooks.c (gdbtk_add_hooks): Set `set_hook'.
-	(gdbtk_set_hook): New function.
-
-1999-08-05  Keith Seitz  <keiths@cygnus.com>
-
-	* gdbtk-variable.c (new_variable): Add missing return value.
-
-1999-08-02  James Ingham  <jingham@leda.cygnus.com>
-
-	* gdbtk-cmds.c: Misc. Cleanups...  Mostly wrapping at 80
-	characters. 
-	(gdb_loadfile): Go straight to the widget command to insert the
-	text, rather than through the interpreter.  Gives about 2x-3x
-	speedup in rendering the source text.
-	(gdb_disassemble): Rewrite to separate out the generic disassembly 
-	work from the printing part.  The former goes in
-	gdb_disassembly_driver.  This way I can share the code with the
-	version that loads the text widget directly.
-	(gdb_load_disassembly): New function.  This will load the text
-	widget directly (not done yet).
-	(gdbtk_load_source): Load the text widget with a source line. 
-	(gdbtk_load_asm): Load the text widget with an assembly line.
-	(gdbtk_print_source): Print a source line to stdout.
-	(gdbtk_print_asm): Print an assembly line to stdout.
-	(gdb_disassemble_driver): New function.
-
-	* gdbtk.h: Fix a compiler warning from Keith's 07-27 checkin.
-
-1999-08-02  Keith Seitz  <keiths@cygnus.com>
-
-	* gdbtk-variable.c (CPLUS_FAKE_CHILD): NULL variables are not
-	"fakes", either.
-
-1999-07-27  Keith Seitz  <keiths@cygnus.com>
-
-	* gdbtk-variable.c: Rewrite. :-)
-	* gdbtk-wrapper.c (GDB_value_ind): New function.
-	(GDB_value_slice): New function.
-	(GDB_value_coerce_array): New function.
-	(GDB_value_struct_elt): New function.
-	(GDB_value_cast): New function.
-	(GDB_get_frame_block): New function.
-	(wrap_value_slice): New function.
-	(wrap_value_coerce_array): New function.
-	(wrap_value_struct_elt): New function.
-	(wrap_value_cast): New function.
-	(wrap_get_frame_block): New function.
-	* gdbtk-wrapper.h: Add declarations for above new functions.	
-	* gdbtk-cmds.c (gdb_selected_block): New function.
-	(gdb_get_blocks): New function.
-	(gdb_block_vars): New function.
-
-1999-07-16  Keith Seitz  <keiths@cygnus.com>
-
-	* gdbtk-cmds.c (gdb_loc): Change all references of "stop_pc" to
-	"read_pc ()".
-
-	* gdbtk.c (target_is_native): New function.
-	(target_should_use_timer): Use target_is_native to determine whether
-	the timer should run.
-	* gdbtk.h (target_is_native): Add prototype.
-	* gdbtk-cmds.c (gdb_disassemble): Use target_is_native to determine if
-	we should disassemble from inferior memory.
-
-1999-07-09  Fernando Nasser  <fnasser@totem.to.cygnus.com>
-
-	* gdbtk-variable.c (variable_obj_command): Add missing comments
-	for object variable commands.
-
-Fri Jul  9 12:06:36 1999  Andrew Cagney  <cagney@b1.cygnus.com>
-
-	* gdbtk-cmds.c (Gdbtk_Init): Explicitly route log/debug and target
- 	output to stderr instead of stdout.
-
-1999-06-21  James Ingham  <jingham@leda.cygnus.com>
-
-	* gdbtk.c (target_should_use_timer): Add check for "linuxthreads"
-	to enable the timer for Linux as well as other natives.
-
-1999-06-15  Keith Seitz  <keiths@cygnus.com>
-
-	* gdbtk-hooks.c (gdbtk_annotate_signal): Run
-	gdbtk_stop_idle_callback so that signals don't interfere
-	with the stop button.
-
-1999-06-10  Keith Seitz  <keiths@cygnus.com>
-
-	* gdbtk.c (gdbtk_init): Add host_name and target_name to
-	GDBStartup.
-
-	* gdbtk-cmds.c (gdb_clear_file): Delete breakpoints and
-	clear the exec file, too.
-	(gdb_loadfile): Don't close a file that's not opened until
-	later.
-
-Wed Jun  9 14:21:40 1999  Andrew Cagney  <cagney@b1.cygnus.com>
-
-	* gdbtk-cmds.c (old_regs): Change array to a pointer.
-	(setup_architecture_data): New function.
-	(Gdbtk_Init): Call setup_architecture_data.  Register ``old_regs''
- 	as an architecture dependant variable.
-
-1999-05-25  Keith Seitz  <keiths@cygnus.com>
-
-	* gdbtk-wrapper.c (GDB_val_print): Fix compiler warnings.
-	(wrap_val_print): Ditto.
-	(GDB_block_for_pc): Ditto.
-	(wrap_block_for_pc): Ditto.
-	(GDB_find_frame_addr_in_frame_chain): Ditto.
-	(wrap_find_frame_addr_in_frame_chain): Ditto.
-
-	* gdbtk-variable.c (variable_create): Rename "-pc" option
-	to the more explicit name "-frame". Update usage.
-	(create_variable): Swallow errors before parse_exp_1, too.
-	If no frame is given as an argument, use the current frame;
-	otherwise, use the current block in the specified frame.
-	(variable_children): Check for errors creating children.
-	(create_child): Ditto.
-
-	* gdbtk-cmds.c (get_selected_frame): New function.
-	(Gdbtk_Init): Add get_selected_frame to interpreter.
-	(gdb_get_vars_command): Use current block in selected frame
-	if no args specified.
-
-	* Makefile.in (gdbtk-cmds.o): Depend on frame.h, too
-
-Tue May 25 16:12:57 1999  Andrew Cagney  <cagney@b1.cygnus.com>
-
-	* gdbtk-cmds.c (REGISTER_CONVERTIBLE,
- 	REGISTER_CONVERT_TO_VIRTUAL): Delete default definitions.
-  	gdbarch.h ensures that there is always a definition available.
-
-1999-05-20  Andrew Cagney  <cagney@b1.cygnus.com>
-
-	Mon Apr 26 09:15:27 1999  Andrew Cagney  <cagney@b1.cygnus.com>:
-	* gdbtk.c (x_event_wrapper): Wrapper for x_event that matches
-	signal function signature.
-	(gdbtk_start_timer): set .sa_handler to x_event_wrapper instead of
- 	x_event.
-
-1999-05-14  Keith Seitz  <keiths@cygnus.com>
-
-	* configure.in (ENABLE_GDBTK): Don't clobber WIN32LIBS.
-	* configure: Regenerated.
-	
-1999-04-12  Keith Seitz  <keiths@cygnus.com>
-
-	* gdbtk-variable.c (variable_value_changed): Swallow errors from
-	evaluate_expression.
-
-1999-04-09  James Ingham  <jingham@cygnus.com>
-
-	* gdbtk-cmds.c (gdb_get_mem): Use the Tcl list API to add the
-	ASCII entry to the return list.  We were trying to do the quoting 
-	by hand which is bound to lose in some cases.
-
-1999-04-06  Martin Hunt  <hunt@cygnus.com>
-
-	* gdbtk-hooks.c (gdbtk_annotate_signal): New function.
-	Notifies GDBtk when a signal occurs.
-
-1999-04-02  Keith Seitz  <keiths@cygnus.com>
-
-	* gdbtk-hooks.c (gdbtk_force_detach): New global.
-	(x_event): Change to return gdbtk_force_detach so that
-	callers will know if we want to detach. See comments.
-	(gdbtk_wait): Insert calls to gdbtk_start/stop_timer. This
-	is a nop for most hosts/targets. Remove ice-specific code.
-
-	* gdbtk-cmds.c (gdb_stop): Add "detach" option, which forces
-	gdb to detach from the target. See comments.
-
-	* gdbtk.c (target_should_use_timer): New function.
-	(gdbtk_start_timer): Only use on unix native targets.
-	(gdbtk_stop_timer): Ditto.
-
-	* gdbtk.h (x_event): Update declaration: now returns an int.
-
-1999-03-29  Stan Shebs  <shebs@andros.cygnus.com>
-
-	* gdbtk.c, gdbtk-cmds.c, gdbtk-hooks.c: Don't include setjmp.h.
-
-1999-03-29  Keith Seitz  <keiths@cygnus.com>
-
-	* gdbtk-cmds.c (pc_function_name): New function which returns the
-	source name (regardless of mangling) of the function at a given PC.
-	(gdb_get_function_command): Use it.
-	(gdb_get_tracepoint_info): Ditto.
-	(gdb_loc): Ditto.
-	(gdb_get_breakpoint_info): Ditto.
-
-	* Makefile.in (install-only): Don't install help/index.toc: it doesn't
-	exist anymore.
-
-Wed Mar 10 19:37:23 1999  Geoffrey Noer  <noer@cygnus.com>
-
-	* gdbtk-cmds.c: Don't need to include any Win32 API headers.
-	* gdbtk-hooks.c: Include Windows.h, not just winuser.h.
-	* gdbtk.c: Ditto.
-
-1999-03-04  Martin Hunt  <hunt@cygnus.com>
-
-	* gdbtk-hooks.c (gdbtk_load_hash): Change download_hash()
-	to Download::download_hash().
-
-1999-03-01  Martin Hunt  <hunt@cygnus.com>
-
-	* gdbtk.c (TclDebug): Increase buffer size to 10000, in case
-	backtraces are very long.
-
-1999-02-26  James Ingham  <jingham@cygnus.com>
-
-	* gdbtk-cmds.c (gdb_search): Add a -filename switch, which returns 
-	the file in which the function or type was defined, along with the 
-	function...
-
-	* gdbtk.c (gdbtk_find_main): The external editor stuff was getting 
-	set twice...
-
-1999-02-18  Martin Hunt  <hunt@cygnus.com>
-
-	* gdbtk-cmds.c (gdb_disassemble): When debugging native threads,
-	set disassemble_from_exec to 0. This fixes bugs where disassembly 
-	of threaded programs failed.
-
-1999-02-16  James Ingham  <jingham@cygnus.com>
-
-	* gdbtk.c (gdbtk_init): Remove redundant setting of the external
-	editor variables.
-
-1999-02-11  Martin Hunt  <hunt@cygnus.com>
-
-	* gdbtk-variable.c (variable_format): Enable binary format.
-
-1999-02-11  Martin Hunt  <hunt@cygnus.com>
-	
-	* gdbtk-hooks.c: Change ALL Tcl_Eval calls in hooks to
-	call report_error() if there are errors.
-
-1999-02-11  Martin Hunt  <hunt@cygnus.com>
-	
-	* gdbtk.c, gdbtk-cmds.c, gdbtk-hooks.c: Removed old IDE stuff.
-
-1999-02-09  Martin Hunt  <hunt@cygnus.com>
-
-	* gdbtk-hooks.c: Remove gdbtk_ignorable_warning prototype.
-	It is in gdbtk.h.
-	(report_error): New function. Displays debugging information
-	if a hook function fails.  All hook functions should probably
-	call this.
-	(gdbtk_warning): Call report_error() if there is a problem.
-	(gdbtk_register_changed): Call report_error() if there is a problem.
-	(gdbtk_memory_changed): Call report_error() if there is a problem.
-	(gdbtk_ignorable_warning): Pass along class argument. If there
-	is a problem, call report_error().
-	
-	* gdbtk-cmds.c: Remove TclDebug prototype.  It is in gdbtk.h.
-	(gdb_loadfile): Add class name to gdbtk_ignorable_warning call.
-
-	* gdbtk.c (TclDebug): Add "priority" argument. Calls "dbug"
-	instead of "debug". Removed non-ANSI ifdefs.
-
-	* gdbtk.h: Fixed protos for gdbtk_ignorable_warning and TclDebug.
-	
-1999-02-05  James Ingham  <jingham@cygnus.com>
-
-	* Makefile.in: Add GDBTK_CFLAGS - this is now used to hold
-	-fwritable-strings when compiling with Tk8.1.
- 	* configure.in: Add GDBTK_CFLAGS, set it to -fwritable-strings for 
-	Tcl/Tk8.1 & greater.
-	* acinclude.m4: Move the rest of the defines to find Itcl, Itk &
-	Tix from aclocal.m4 to here.
-	* aclocal.m4: regenerate.
-	* configure: regenerate.
-
-	* gdbtk-hooks.c (x_event): Tcl_ObjGetVar2 was removed from
-	Tcl8.1.  Use Tcl_GetVar2 instead.
-	* gdbtk-hooks.c (gdbtk_trace_find): Fix up call to
-	Tcl_GlobalEvalObj for Tcl/Tk 8.1.
-	* gdbtk-hooks.c (gdbtk_trace_start_stop): Call to Tcl_EvalObj was
-	inefficient, replace with call to Tcl_GlobalEval.
-	* gdbtk.c: Don't swap out the Tcl_Alloc calls in gdbtk.c.  We took 
-	care of that in Tcl itself for 8.1.
-	* gdbtk.c: Remove const from the script string since Tcl8.1 has
-	taken to scribbling sentinals into strings passed to it again...
-
-	* gdbtk-cmds.c (wrapped_call): Change declaration of 1st arg from
-	char * to PTR to eliminate warning.
-	* gdbtk-cmds.c (perror_with_name_wrapper): Ditto
-
-Thu Feb  4 10:35:28 1999  Keith Seitz  <keiths@cygnus.com>
-
-	* gdbtk-variable.c (variable_create): Allocate enough
-	space to hold the NULL, too!
-
-Wed Feb  3 13:37:07 1999  Keith Seitz  <keiths@cygnus.com>
-
-	* gdbtk-variable.c (variable_create): Add parentheses to the name
-	so that casts do not confuse the expression parser.
-
-1999-02-03  Keith Seitz  <keiths@cygnus.com>
-
-	* gdbtool.ico: Add missing desktop image.
-
-1999-02-02  Martin Hunt  <hunt@cygnus.com>
-
-	* gdbtk-cmds.c (get_register): For RAW display, concat all the
-	pieces together before calling fputs.
-
-1999-02-01  Martin Hunt  <hunt@cygnus.com>
-
-	* gdbtk-cmds.c: (gdb_set_bp): Change the "type" argument
-	to be ASCII instead of an integer. Currently accepts "temp"
-	or "normal".  Fixed error messages.
-	(gdb_set_bp_addr): Ditto.
-
-1999-01-29  James Ingham  <jingham@cygnus.com>
-
-	* gdbtk.c (gdbtk_init): Set the fputs_unfiltered_hook to
-	gdbtk_fputs BEFORE you eval script.  The old code was setting it
-	to null until after you did this, but that is wrong, because it
-	will cause the output of CAUGHT errors to go to gdb_stderr, which
-	is wrong.  You only want to write errors to the console if the
-	eval generates an error.
-
-1999-01-29  Martin Hunt  <hunt@cygnus.com>
-
-	* gdbtk-cmds.c (gdb_get_breakpoint_info): When printing addresses,
-        do not rely on the format string "%lx" -- it does not exist for all
-        hosts. Use paddr instead.
-	(gdb_loadfile): Increase maximum line size to pass testsuite cases.
-
-	* gdbtk-hooks.c (gdbtk_add_hooks): Remove pc_changed_hook and
-        add register_changed_hook and memory_changed_hook.
-        (gdbtk_register_changed): New function.
-        (gdbtk_memory_changed): New function.
-
-        * gdbtk.c (gdbtk_init): Create tcl warp_pointer command
-        for use with testing.
-
-        * gdbtk-cmds.c (gdb_loc): Fix for case where there are only
-        minimal symbols.  Also make gdb_loc return the shared library
-        the location is in, if it is in one.
-
-1999-01-27  James Ingham  <jingham@cygnus.com>
-
-	* gdbtk-wrapper.c: Missed a couple of places where FILE->GDB_FILE
-	in the fputs_unfiltered_hook needed to propagate.
-
-1999-01-27  James Ingham  <jingham@cygnus.com>
-
-	Merging in changes from gdbtk-980810 - the Itcl3
-	gdb branch.
-
-  1999-01-12  Martin Hunt  <hunt@cygnus.com>
-
-	  * gdbtk-cmds.c (gdb_loadfile): Increase maximum line size so
-	  files with very long lines get numbered correctly.
-
-  Thu Jan  7 06:50:32 1999  Keith Seitz  <keiths@cygnus.com>
-
-	  * gdbtk-hooks.c (gdbtk_add_hooks): Add the error_begin_hook;
-	  (gdbtk_error_begin): New function.
-	  (gdbtk_fputs): If GDBTK_ERROR_ONLY is set, treat output to
-	  any stream as if it had come from gdb_stderr.
-
-	  * gdbtk.h: Define GDBTK_SYMBOL_SOURCE_NAME: does the same thing
-	  as SYMBOL_SOURCE_NAME, except that it NEVER returns a mangled name.
-	  Define GDBTK_ERROR_ONLY flag for result_ptr.
-
-	  * gdbtk-cmds.c (gdb_listfuncs): Use SYMBOL_DEMANGLED_NAME to
-	  get the symbol's fully demangled name (including class and
-	  args for overloaded funcs), not cplus_demangle.
-	  (get_frame_name): Use GDBTK_SYMBOL_SOURCE_NAME to get the name
-	  of the frame level.
-
-	  * gdbtk-wrapper.c, gdbtk-wrapper.h:
-	  (GDB_val_print): Allow caller to specify all function args to val_print.
-	  (wrap_val_print): Ditto.
-
-	  * gdbtk-variable.c (variable_value): Clear addressprint when getting
-	  value of C++ reference-type variables
-	  If we errored because a parent (struct pointer) was junk, output
-	  an error message indicating so.
-	  (call_gdb_val_print): Tell val_print to dereference C++ reference
-	  types.
-	  (number_of_children): void * also has no children.
-	  (get_call_output): Clear any error flags that may have been set
-	  as a result of error_begin.
-
-	  * utils.c (error_begin_hook): New hook.
-	  (error_begin): Call error_begin_hook so that the GUI
-	  gets notified.
-
-	  * defs.h (error_begin_hook): Declare.
-
-  Wed Jan  6 08:43:31 1999  Keith Seitz  <keiths@cygnus.com>
-
-	  * gdbtk-wrapper.c, gdbtk-wrapper.h: Add wrappers for parse_exp_1,
-	  evaluate_type, block_for_pc, block_innermost_frame, reinit_frame_cache,
-	  and find_frame_addr_in_frame_chain.
-
-	  * gdbtk-variable.c (variable_create): Check for failure when
-	  creating variables.
-	  (create_variable): Use wrapped calls for block_for_pc, parse_exp_1,
-	  and block_innermost_frame.
-	  Return NULL if parse_exp_1 fails.
-	  Attempt to prohibit creating a gdb_variable for type names.
-	  (variable_value_changed): Use wrapped calls for reinit_frame_cache and
-	  find_frame_addr_in_frame_chain.
-	  (variable_type): Use wrapped call for evaluate_type.
-	  (variable_value): Use wrapped call for parse_exp_1.
-	  (variable_editable): Use wrapped call for evaluate_type.
-
-  Tue Jan  5 11:37:17 1999  Keith Seitz  <keiths@cygnus.com>
-
-	  * gdbtk-variable.c: New variable object interface.
-	  * gdbtk-wrapper.c, gdbtk-wrapper.h: New wrappers for safely calling
-	  gdb functions without the fear of longjmp'ing.
-	  * configure.in (CONFIG_OBS): Add gdbtk-wrapper.o and gdbtk-variable.o
-	  when gdbtk is enabled.
-	  * configure: Regenerate.
-	  * Makefile.in: Add gdbtk-wrapper.o and gdbtk-variable.o
-	  * gdbtk-cmds.c (call_wrapper): Export so that other files can use.
-	  (Gdbtk_Init): Initialize new variable interface.
-	  * gdbtk.h: Add declaration for call_wrapper.
-
-  Tue Jan  5 11:19:14 1999  Keith Seitz  <keiths@cygnus.com>
-
-	  * gdbtk-cmds.c (gdb_loc): Call resolve_sal_pc to before using
-	  the sal's pc.
-
-	  * gdbtk.c (gdbtk_init): Add global array GDBStartup to interpreter
-	  which contains any startup info. Add "inhibit_prefs" (follows -nx)
-	  so that "-nx" turns preference reading/writing off.
-
-  Mon Dec 21 11:11:02 1998  Keith Seitz  <keiths@cygnus.com>
-
-	  * gdbtk-cmds.c (get_register): Call get_saved_register instead of
-	  read_relative_register_raw_bytes to fetch registers.
-
-  Thu Dec 17 09:00:56 1998  Keith Seitz  <keiths@cygnus.com>
-
-	  * gdbtk-cmds.c (gdb_search): Don't mention C++ RTTI and
-	  global constructor/destructor symbols.
-
-  Thu Nov 12 15:20:15 1998  Jim Ingham   <jingham@cygnus.com>
-	  * More bug fixes merged in from devo.
-
-	  * gdbtk-cmds.c (gdb_cmd): Added an optional second argument to the
-	  gdb_cmd, which is from_tty.  This is passed to the gdb command
-	  parser.  It is 0 by default, and the console window passes 1.
-
-	  * gdbtk-cmds.c: moved disassemble_from_exec from gdbtk.c to gdbtk-cmds.c
-	  with all the other link-var'ed variables
-
-	  * gdbtk-hooks.c (gdbtk_trace_find): Only run the hook functions if 
-	  we are called from_tty.
-
-	  * gdbtk-hooks.c (gdbtk_trace_start_stop): Set the trace buttons
-	  from a trace_start_command callback rather than doing it as a
-	  special case in gdb_cmd.
-
-	  * tracepoint.c (tstart_command, tstop_command): Add call to
-	  trace_start_stop_hook here.
-
-  1998-11-04  Martin M. Hunt  <hunt@cygnus.com>
-
-	  * gdbtk-cmds.c (gdb_set_bp_addr): For callback, send full 
-	  pathname instead of just basename.
-
-  1998-11-03  Keith Seitz  <keiths@cygnus.com>
-	  * v850ice.c (do_gdb): New function.
-	  (ice_stepi): Use do_gdb to step properly.
-	  (ice_nexti): Use do_gdb to step properly.
-	  (view_source): Correct call to src window's location for new version.
-
-  Tue Aug 25 18:13:30 1998  Jim Ingham    <jingham@cygnus.com>
-
-	  * gdbtk.c (gdbtk_init): I hadn't excised ALL the old startup code, 
-	  so it was not working correctly.  Now it does.
-
-  Fri Aug 21 14:37:40 1998  Jim Ingham	<jingham@cygnus.com>
-
-	  * gdbtk.c (gdbtk_init): Changed the startup code to use
-	  tcl_findLibrary
-
-
-
-	
-on Dec 28 17:44:36 1998  David Taylor  <taylor@texas.cygnus.com>
-
-
-	The following changes were made by Jim Blandy <jimb@cygnus.com>,
- 	Edith Epstein <eepstein@cygnus.com>, Elena Zannoni
- 	<ezannoni@cygnus.com> Stan Shebs <shebs@cygnus.com>, and David
- 	Taylor <taylor@cygnus.com>, as part of the project to merge in
- 	changes originally made by HP; HP did not create ChangeLog
- 	entries.
-
-	* gdbtk.c (gdbtk_init): change stderr to gdb_stderr.
-
-	* gdbtk-cmds.c
-	(get_pc_register): Use paddr_nz, not sprintf's %llx and
-	a cast to `long long'.  Those aren't portable.
-	(gdb_eval): add embedded_offset param to val_print call
-	(get_register): add embedded_offset param to val_print call
-
-	* gdbtk-hooks.c
-	(tk_command_loop): change instream to a FILE.
-	(gdbtk_flush): change both the declaration and definition to 
-	use GDB_FILE rather than FILE.
-
-Mon Dec 21 11:11:02 1998  Keith Seitz  <keiths@cygnus.com>
-
-	* gdbtk-cmds.c (get_register): Call get_saved_register instead of
-	read_relative_register_raw_bytes to fetch registers.
-
-Thu Dec 17 09:00:56 1998  Keith Seitz  <keiths@cygnus.com>
-
-        * gdbtk-cmds.c (gdb_search): Don't mention C++ RTTI and
-        global constructor/destructor symbols.
-
-Tue Dec 15 10:09:31 1998  Andrew Cagney  <cagney@b1.cygnus.com>
-
-	* gdbtk-cmds.c (gdb_disassemble): Fix typo.
-
-Sun Dec 13 09:52:51 1998  Andrew Cagney  <cagney@b1.cygnus.com>
-
-	* gdbtk-cmds.c: Update TARGET_PRINT_INSN_INFO, TARGET_PRINT_INSN.
-
-Fri Dec 11 09:52:04 1998  Andrew Cagney  <cagney@chook>
-
-	* gdbtk-cmds.c: Replace reg_name with REGISTER_NAME.
-	
-Mon Dec 14 13:20:50 1998 Jim Ingham  <jingham@cygnus.com>
-
-	* Makefile.in, configure.in configure - add support for LIBGUI
-	outside the IDE context.
-	
-Thu Nov 19 13:14:57 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	* gdbtk-cmds.c: Can't start using new API names yet.  Switch back
-	to calling cygwin32_ funcs until some time has passed...
-	* gdbtk.c: Ditto.  Also, include sys/cygwin.h for Cygwin, instead
-	of providing own proto.
-
-Fri Nov 13 00:15:08 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	Changes to account for name change from cygwin32 to cygwin and
-	clean up Win32-related ifdefs.
-	
-        * gdbtk.c: lose "32" from cygwin_ func calls.  ifndef for
-        checking DISPLAY should be for _WIN32, not WINNT.
-        * gdbtk.h: pick GDBTK_PATH_SEP based on _WIN32, not WINNT.
-        * gdbtk-cmds.c (gdb_path_conv): lose "32" from cygwin_	func call,
-        change ifdef to __CYGWIN32__ instead of WINNT.
-	* {gdbtk.c, gdbtk-hooks.c}: __CYGWIN32__ refs drop the "32".
-
-Thu Nov 12 15:20:15 1998  Jim Ingham   <jingham@cygnus.com>
-
-	* gdbtk-cmds.c (gdb_cmd): Added an optional second argument to the
-	gdb_cmd, which is from_tty.  This is passed to the gdb command
-	parser.  It is 0 by default, and the console window passes 1.
-
-	* gdbtk-cmds.c: moved disassemble_from_exec from gdbtk.c to gdbtk-cmds.c
-	with all the other link-var'ed variables
-
-	* gdbtk-hooks.c (gdbtk_trace_find): Only run the hook functions if 
-	we are called from_tty.
-
-	* gdbtk-hooks.c (gdbtk_trace_start_stop): Set the trace buttons
-	from a trace_start_command callback rather than doing it as a
-	special case in gdb_cmd.
-
-	* tracepoint.c (tstart_command, tstop_command): Add call to
-	trace_start_stop_hook here.
-	
-Wed Nov  4 12:41:42 1998  Jim Ingham  <jingham@cygnus.com>
-
-	* gdbtk-cmds.c (gdb_set_bp_addr): Pass the type, enable & thread
-	to gdbtk_tcl_breakpoint.
-	* gdbtk-hooks.c (gdbtk_trace_find): Added this function.  It is
-	the hook function for tfind commands.
-	* tracepoint.c (trace_find_command): Added the trace_find_hook,
-	run when you do trace_find_command.
-	* tracepoint.h: Define the trace_find_hook.
-
-1998-11-03  Keith Seitz  <keiths@cygnus.com>
-
-        * v850ice.c (do_gdb): New function.
-        (ice_stepi): Use do_gdb to step properly.
-        (ice_nexti): Use do_gdb to step properly.
-        (view_source): Correct call to src window's location for new version.
-
-Mon Nov  2 11:16:10 1998  Jim Ingham  <jingham@cygnus.com>
-
-	* gdbtk-cmds (gdb_get_tracepoint_info): Demangle C++ function names.	
-
-Fri Oct 30 11:22:23 1998  Jim Ingham  <jingham@cygnus.com>
-
-	* gdbtk-cmds (gdb_get_tracepoint_info): Fixed typo.
-	
-Wed Oct 28 16:19:02 1998  Martin M. Hunt  <hunt@cygnus.com>
-
-	* gdbtk-cmds.c (gdb_set_bp_addr): For callback, send full 
-	pathname instead of just basename.
-
-Wed Oct 28 10:14:33 1998  Jim Ingham   <jingham@cygnus.com>
-
-	* gdbtk-cmds.c: Made the bdtypes & bpdisp arrays shared so they
-	could be used in gdbtk-hooks.c (breakpoint_notify).
-	Also fixed a few error messages to actually print the bp number
-	rather that #%d...	
-	* gdbtk-hooks.c (breakpoint_notify): pass more of the information
-	about the breakpoint into the Tcl command, so it does not have to
-	try and guess about information we have on the C side.
-	* gdbtk.h: Export the bptypes & pbdisp arrays.
-	
-1998-10-13  Jason Molenda  (jsm@bugshack.cygnus.com)
-
- 	* gdbtk.c, gdbtk-cmds.c: Cast parameters passed to make_cleanup to
- 	use the new make_cleanup_func typedef.
-
-1998-10-08  Keith Seitz  <keiths@cygnus.com>
-
-	* gdbtk-hooks.c (gdbtk_add_hooks): Install a hook for
-	(new) file_changed_hook.
-	(gdbtk_exec_file_changed): Rename to gdbtk_exec_file_display
-	to mimic hook's name.
-	(gdbtk_file_changed): New hook function.
-	
-Tue Oct  6 22:57:13 1998  Andrew Cagney  <cagney@b1.cygnus.com>
-
-	* configure.in (links): Link gdbtcl2 directory instead of gdbtcl.
-
-Mon Oct  5 00:34:00 1998  Martin M. Hunt  <hunt@cygnus.com>
-
-	* gdbtk-cmds.c (gdb_set_bp_addr): New command. Sets a
-	breakpoint at an address. Use this instead of gdb_cmd "break"
-	because the syntax of the break command is broken and doesn't
-	allow you to create a thread-specific BP at an address.  Also
-	this is faster.
-
-Sun Oct  4 22:35:47 1998  Martin M. Hunt  <hunt@cygnus.com>
-
-	* gdbtk-cmds.c (gdb_set_bp): Add an optional thread number.
-	(gdb_find_bp_at_line): New function. Returns a list of bpnums 
-	at the specified line number.
-	(gdb_find_bp_at_addr): New function. Returns a list of bpnums 
-	at an address..
-
-1998-10-02  Keith Seitz  <keiths@cygnus.com>
-
-	* gdbtk-hooks.c (gdbtk_exec_file_changed): New function which handles
-	exec_file changes.
-	(gdbtk_add_hooks): Define exec_file_display_hook (to gdbtk_exec_file_changed)
-
-	* gdbtk-cmds.c (gdb_stop): target_stop is ALWAYS defined, so
-	compare against something a little more meaningful (target_ignore).
-
-1998-09-24  Keith Seitz  <keiths@cygnus.com>
-
-	* gdbtk.c (gdbtk_wait): Don't run the timer for ice targets.
-
-	* v850ice.c (WM_ADDR_TO_SYM): New message.
-	(v850ice_wndproc): Add handler for WM_SOURCE.
-	(v850ice_wait): Call the ui_loop_hook occasionally.
-	(ice_cont): Acknowledge message before doing anything.
-	(ice_stepi): Ack message and let gdbtk do stepping.
-	(ice_nexti): Ack message and let gdbtk do stepping.
-	(view_source): New function ICE calls to display source code.
-
-1998-09-18  Keith Seitz  <keiths@cygnus.com>
-
-        * gdbtk-cmds.c (get_frame_name): Demangle function names, too.
-
-Thu Sep 10 22:10:29  1998 Jim Ingham <jingham@cygnus.com>
-
-	*gdbtk-cmds.c (gdb_disassemble): Make sure the symtab's linetable is not
-	null before trying to use it...
-	
-1998-09-02  Keith Seitz  <keiths@cygnus.com>
-
-	* gdbtk-cmds.c (gdb_cmd): Do not run the timer when downloading --
-	the ui_progress_hook that has been installed will actually
-	update the gui for us.
-
-Mon Aug 31 15:42:10 1998  Tom Tromey  <tromey@cygnus.com>
-
-	* gdbtk-hooks.c (context_hook): Don't define.
-
-1998-08-31  Keith Seitz  <keiths@cygnus.com>
-
-	* gdbtk-cmds.c (gdb_listfuncs): When stripping out "global destructors"
-	and "global constructors", do not append any elements to the result.
-
-Sun Aug 30 00:49:18 1998  Martin M. Hunt  <hunt@cygnus.com>
-
-	* gdbtk-cmds.c (Gdbtk_Init): Link C variable gdb_context
-	with tcl variable gdb_context_id.
-
-	* gdbtk-hooks.c (gdbtk_context_change): Implement new hook called 
-	context_hook.  Called when threads change.
-
-	* gdbtk.c: Initialize gdb_context.
-
-	* gdbtk.h: Declare gdb_context.
-
-	* infrun (wait_for_inferior): Call context_hook.
-
-	* thread.c (thread_command): Call context_hook.
-
-	* defs.h: Declare context_hook.
-	
-Fri Aug 28 12:14:49 1998  Martin M. Hunt  <hunt@cygnus.com>
-
-	* gdbtk-cmds.c (gdb_loadfile): Open the file after doing
-	the symtab lookup and calling symtab_to_filename(). This
-	makes GDBtk work with the GDB "dir" command.
-
-1998-08-18  Keith Seitz  <keiths@cygnus.com>
-	
-	* gdbtk-hooks.c (gdbtk_add_hooks): Set selected_frame_level_changed_hook.
-	(gdbtk_selected_frame_changed): New function.
-
-	* gdbtk-cmds.c (Gdbtk_Init): Add command gdb_stack into interpreter.
-	Link gdb's global selected_frame_level with interpreter global
-	gdb_selected_frame_level.
-	(gdb_stack): New function to faciltate speedier backtraces from
-	gdbtk.
-	(get_frame_name): New helper function for gdb_stack.
-
-Tue Aug 18 15:42:40 1998  Martin M. Hunt  <hunt@cygnus.com>
-
-	* gdbtk-cmds.c (gdb_listfuncs): Strip out global constructors
-	and destructors from the function list.
-
-Thu Aug 13 15:09:59 1998  Drew Moseley  <dmoseley@cygnus.com>
-
-	* gdbtk.c (gdbtk_cleanup): added a scope-level around the contents
-	of the #ifdef so that the variable declarations in there would not
-	be illegal in a C compilation.
-
-Mon Jul 27 13:07:16 1998  Martin M. Hunt  <hunt@cygnus.com>
-
-	* gdbtk.c (gdbtk_call_command): Removed because it is now
-	in gdbtk-hooks.c
-	(null_routine): Removed.
-
-	* gdbtk-hooks.c (tracepoint_notify): Fix sprintf to
-	match number of arguments.
-
-	* gdbtk-cmds.c (gdb_loc): When calling gdb_loc with an
-	argument, call find_pc_line() to get a complete
-	symtab_and_line struct.
-
-Fri Jul 24 14:25:43 1998  Keith Seitz  <keiths@cygnus.com>
-
-	* gdbtk-cmds.c (gdb_search): Add missing NULL to switches.
-	Add missing flags to result_ptr.
-	Pass along any errors caused by getting the list of files from
-	tcl.
-	Allocate correct amount of memory for the file list.
-	Don't do any unecessary cleanups.
-
-Fri Jul 24 01:08:37 1998  Martin M. Hunt  <hunt@cygnus.com>
-
-	* gdbtk-cmds.c (gdb_loadfile): When there are no
-	linenumbers, use only one tab.
-
-Sat Jul 18 12:28:39 1998  Martin M. Hunt  <hunt@cygnus.com>
-
-	* gdbtk.c (gdbtk_cleanup): Add call to tcl function
-	gdbtk_cleanup. We need this so the GUI gets to clean
-	up no matter how GDB exits.
-
-Wed Jul  1 13:10:58 1998  Jim Ingham   <jingham@cygnus.com>
-
-	* Moved gdbtk_hooks.c & gdbtk_cmds.c to gdbtk-hooks.c &
-	gdbtk-cmds.c to comply with the gdb conventions.  Changed the
-	configure & makefile to reflect the change...
-	
-Wed Jul  1 11:07:21 1998  Jim Ingham   <jingham@cygnus.com>
-
-	* gdbtk.c: removed all the commands and hooks from this file so
-	now it contains only the startup code.
-	* gdbtk.c (gdbtk_init): Fixed a bug in the startup code on Windows 
-	that caused gdbtk not to find the share directory unless
-	GDBTK_LIBRARY was set.
- 	* gdbtk_cmds.c: New file - this contains all the Tcl commands that
-	gdb defines.  All the old commands were moved here, the
-	string-based commands were converted to object commands, and the
-	object-based commands were all converted to uniformly use the
-	call_wrapper.  A new function, Gdbtk_Init was added to centralize
-	initializing the gdb package.
-	* gdbtk_hooks.c: New file - All the hooks were moved here, and a new
-	function, gdbtk_add_hooks was added to centralize adding all these 
-	hook functions.  gdbtk_fputs was also modified to handle the new
-	result_ptr structure.  See the comments in gdbtk.h for more
-	details.
-	* gdbtk.h: New file - this contains all the defines and globals
-	shared by gdbtk.c, gdbtk_cmds.c & gdbtk_hooks.c
-	* Makefile.in, configure.in & configure: mutatis mutandi for the
-	new files.
-	
-
-Mon Jun 29 11:49:17 1998  Keith Seitz  <keiths@cygnus.com>
-
-	* main.c (main): Don't include gdbtk test code if GDBTK is
-	not defined by configure.
-
-	* configure.in: When enabling gdbtk, add "-DGDBTK" to ENABLE_CFLAGS.
-
-	* configure: Regenerate.
-	
-Fri Jun 26 13:56:07 1998  Keith Seitz  <keiths@cygnus.com>
-
-	* gdbtk.c: Change all references to static global "interp" to
-	"gdbtk_interp" and export this global.
-	(gdbtk_init): If gdbtk_source_filename is not NULL, source this file
-	into the interpreter when it goes idle.
-	Add new command "gdb_search".
-	(gdb_search): New function which searches the symbol table.
-	(gdbtk_test): New function called by main when the --tclcommand
-	option is used.
-
-	* main.c (main): Add a new option "--tclcommand" which is used
-	by the testsuite to source a file into the interpreter when it
-	goes idle.
-
-Sun Jun 21 09:31:12 1998  Ron Unrau  (runrau@cygnus.com)
-
-	* gdbtk.c (gdb_set_bp): Use new interface.
-
-Wed Jun 17 19:12:23 1998  Jeff Holcomb  <jeffh@cygnus.com>
-
-	* Makefile.in (install-only): Install tracing help files.
-
-Mon Jun 15 13:18:21 1998  Jim Ingham <jingham@cygnus.com>
-
-	* gdbtk.c (gdbtk_init): Add elements to the auto_path AS LIST
-	ELEMENTS.  This allows gdbtk to work when installed in a directory 
-	which has a space in the path.  D. Moseley pointed out the bug.
-
-
-Tue Jun  9 14:10:46 1998  Keith Seitz  <keiths@cygnus.com>
-
-	* gdbtk.c (gdb_get_vars_command): Return static variables and
-	variables stored in registers.
-
-	* main.c (main): Call pre/post_add_symbol_hook's when loading
-	executables and symbol files.
-	
-Fri Jun  5 00:16:22 1998  Martin M. Hunt  <hunt@cygnus.com>
-
-	* gdbtk.c (gdbtk_init): Change all references to
-	GDBTK_IDE to IDE_ENABLED.
-
-Thu Jun  4 18:31:53 1998  Martin M. Hunt  <hunt@cygnus.com>
-
-	* gdbtk.c (gdbtk_init): Initialize tkTable.
-
-Thu Jun  4 10:15:03 1998  Elena Zannoni  <ezannoni@kwikemart.cygnus.com>
-
-	* gdbtk.c: merged:
-	
-	- Elena Zannoni  <ezannoni@kwikemart.cygnus.com>
-        (call_obj_wrapper): in case of error, copy the
-        error message from the result to the error_string.
-        (gdbtk_fputs): add comments.
-        (gdb_actions_command): call validate_actionline when installing the
-        tracepoint, to do the syntax checking of the actions for us.
-        - Elena Zannoni  <ezannoni@kwikemart.cygnus.com>
-        (gdb_get_trace_frame_num): new function to get the
-        trace frame number from gdb.
-        (gdbtk_init): added new command gdb_get_trace_frame_num.
-        - Jim Blandy  <jimb@zwingli.cygnus.com>
-        (struct wrapped_call_objs): Change the `func' member to
-        be a Tcl_ObjCmdProc, not an Tcl_CmdProc, since it accepts a vector
-        of objects as arguments.  Change the object vector to be const,
-        since that's what all the users of this structure seem to expect.
-        (call_obj_wrapper): Cast clientData properly before storing it in
-        the wrapped_args structure.
-	
-Thu May 28 17:19:14 1998  Keith Seitz  <keiths@cygnus.com>
-
-	* gdbtk.c (_initialize_gdbtk): Get rid of the console. Patch from
-	Chris Faylor (cgf@cygnus.com).
-
-	* configure.in: Link cygwin32 with subsystem console.
-
-	* configure: Regenerated
-	
-Sun May 24 14:00:24 1998  Keith Seitz  <keiths@cygnus.com>
-
-	* ser-unix.c (wait_for): Do not reset timeout_remaining for cygwin32 so that
-	we can use this member to track real timeouts.
-	(hardwire_readchar): Modify for cygwin32 so that we only ever use a real
-	system timeout of one second. Track the "real" timeout as a series of these
-	one second timeouts.
-	Call ui_loop_hook to keep the gui alive.
-
-	* top.c: Define new hook for cygwin32, "ui_loop_hook".
-
-	* gdbtk.c (gdbtk_init): Add ui_loop_hook for CygWin32 to work around
-	update problems.
-
-Thu May 21 13:56:24 1998  Elena Zannoni  <ezannoni@kwikemart.cygnus.com>
-       
-	* gdbtk.c: reinserted the changes that were accidentally deleted:
-	(_initialize_gdbtk): Use correct device names in
-	cygwin-specific call (cosmetic change). 
-        (gdbtk_ignorable_warning): removed va_list parameter,
-	which was unused.
-        (_initialize_gdbtk): add cygwin32 specific code to
-	allow `gdb -nw' to work when specified specified from a windows
-	console-mode command line.
-
-1998-05-19  Jim Blandy  <jimb@zwingli.cygnus.com>
-
-	* gdbtk.c (struct wrapped_call_objs): Change the `func' member to
- 	be a Tcl_ObjCmdProc, not an Tcl_CmdProc, since it accepts a vector
- 	of objects as arguments.  Change the object vector to be const,
- 	since that's what all the users of this structure seem to expect.
-	(call_obj_wrapper): Cast clientData properly before storing it in
-	the wrapped_args structure.
-
-Wed May 13 11:12:58 1998  James Ingham  <jingham@leda.cygnus.com>
-
-	* gdbtk.c: Fixed a goof in the definition of the gdb_get_args &
-	gdb_get_locals Tcl commands.  Moved the previous ChangeLog entry
-	from ChangeLog to ChangeLog-gdbtk (here)...
-	
-Tue May 12 13:29:20 1998  Jeff Holcomb  <jeffh@cygnus.com>
-
-	* Makefile.in (install-only): Add images/icons.txt and
-	images2/icons.txt to files that need to be installed.
-
-Tue May 12 12:03:16 1998  James Ingham  <jingham@leda.cygnus.com>
-
-	* gdbtk.c: Add an object call wrapper for the new Tcl_Obj based
-	commands.  This way the obj commands will also go through
-	catch_errors.  This is just a bandaid while I rewrite the
-	string-based commands to use the object format.
-
-Tue May  5 09:30:25 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* gdbtk.c (_initialize_gdbtk): Use correct device names in
-	cygwin-specific call (cosmetic change). 
-
-Wed Apr 29 15:53:16 1998  Elena Zannoni  <ezannoni@kwikemart.cygnus.com>
-
-	* gdbtk.c (gdbtk_ignorable_warning): removed va_list parameter,
-	which was unused.
-
-Tue Apr 28 19:41:33 1998  Tom Tromey  <tromey@cygnus.com>
-
-	* Makefile.in (GDBTKLIBS): New macro.
-	(INSTALLED_LIBS): Include GDBTKLIBS.
-	(CLIBS): Likewise.
-	* configure: Rebuilt.
-	* configure.in: Put Tcl/Tk libs into GDBTKLIBS, not LIBS.
-	(GDBTKLIBS): AC_SUBST.
-
-Thu Apr 23 19:01:05 1998  Keith Seitz  <keiths@onions.cygnus.com>
-
-	* Makefile.in (install-only): Install help files.
-
-Wed Apr 22 21:17:35 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* gdbtk.c (_initialize_gdbtk): add cygwin32 specific code to
-	allow `gdb -nw' to work when specified specified from a windows
-	console-mode command line.
-
-Wed Apr 15 11:23:53 1998  Stan Shebs  <shebs@andros.cygnus.com>
-
-	* gdbtcl: Remove directory and contents, this version of
-	the interface is obsolete.
-
-Mon Apr 13 16:17:52 1998  Martin M. Hunt  <hunt@cygnus.com>
-
-	* gdbtk.c (gdb_loadfile): Change fstat() call to stat().
-	Needed because you can't convert a FILE* to an fd.
-
-Mon Apr 13 16:28:07 1998  Elena Zannoni  <ezannoni@kwikemart.cygnus.com>
-	
-	* gdbtk.c: (perror_with_name_wrapper) new function to call 
-	perror_with_name safely.
-	(gdb_loadfile) added source vs. executable time stamp check.
-	(gdbtk_warning) new function to pass a warning message to the gui.
-	(gdbtk_ignorable_warning) new function to pass a warning
-	to the gui. Used only for the src. vs. exec check.
-	(gdbtk_init) added warning_hook 
-	added include <sys/stat.h>
-
-Mon Apr 13 12:58:26 1998  Keith Seitz  <keiths@onions.cygnus.com>
-
-	* gdbtk.c (gdbtk_start_timer): Include on all platforms. Decrease
-	timer interval a little.
-	(gdbtk_stop_timer): Include on all platforms.
-	(gdbtk_wait): No more signals! Use a timer on all platforms to keep the
-	GUI alive.
-	(gdbtk_init): Remove FIOASYNC and all x_fd references. Now using timers
-	on all platforms.
-	
-Fri Apr 10 15:48:10 1998  Jason Molenda  (crash@bugshack.cygnus.com)
-
-        * gdbtk.c (gdb_listfiles): Allocate space for 'files' dynamically.
-
-Thu Apr  9 14:20:59 1998  Martin M. Hunt  <hunt@cygnus.com>
-
-	* gdbtk.c (gdbtk_init): Remove redundant variable "IDE".
-
-Tue Apr  7 15:13:58 1998  Stan Shebs  <shebs@andros.cygnus.com>
-
-	* gdbtk.tcl: Remove, no longer used.
-
-Tue Apr  7 12:49:45 1998  Keith Seitz  <keiths@onions.cygnus.com>
-
-	* gdbtk.c (gdb_cmd): NEVER call the busy, update, and idle hooks.
-
-Tue Mar 31 15:42:06 1998  Keith Seitz  <keiths@onions.cygnus.com>
-
-	* gdbtk.c (gdb_loadfile): Don't use the return result from
- 	sprintf, which returns a char * under SunOS4.
-
-Tue Mar 31 17:18:43 1998  Ian Lance Taylor  <ian@cygnus.com>
-
-	* configure.in: Add $(LIBIDETCL) as well as $(LIBIDE) if
-	--enable-ide.
-	* Makefile.in (IDE_CFLAGS_X): Add -I for libidetcl/src.
-	(LIBIDETCL): Define.
-	* configure: Rebuild.
-
-Sun Mar 29 21:19:46 1998  Keith Seitz  <keiths@onions.cygnus.com>
-
-	* gdbtk.c (gdb_get_tracepoint_info): Change formatting of address.
-	(tracepoint_exists): Remove code which confuses assembly traces.
-
-Sat Mar 28 12:13:23 1998  Keith Seitz  <keiths@onions.cygnus.com>
-
-	* gdbtk.c (gdb_cmd): If argc > 2, assume that the busy and idle hooks
-	should not be called.
-
-Thu Mar 26 22:29:28 1998  Elena Zannoni  <ezannoni@kwikemart.cygnus.com>
-
-        * gdbtk.c: (gdb_trace_status) new function.
-        (gdbtk_init) added command "gdb_is_tracing".
-        (tracepoint_notify) added passcount information.
-
-Thu Mar 26 12:00:35 1998  Martin M. Hunt  <hunt@cygnus.com>
-
-	* gdbtk.c (gdbtk_fputs): Insert fencepost.
-	(gdb_loc): Correct pc calculation.
-	(gdb_immediate_command): Return if a load is in progress.
-	(gdb_cmd): Return if a load is in progress.
-	(target_stop_wrapper): New function.
-	(gdb_stop): Call target_stop_wrapper.
-	(x_event): Add fencepost and optimize load cancel check.
-	(gdbtk_start_timer): Set up structs only once.
-	(gdbtk_stop_timer): Just use preset structs to set timer parameters.
-	(gdb_loadfile): If file cannot be loaded, return error message.
-	(gdb_loadfile): Add space before tab so that lines without
-	a '-' can later be changed to have one.
-
-Wed Mar 25 14:08:51 1998  Elena Zannoni  <ezannoni@kwikemart.cygnus.com>
-
-	* gdbtk.c (gdbtk_pre_add_symbol): Use Tcl_merge to form Tcl commands.
-
-Mon Mar 23 13:41:39 1998  Elena Zannoni  <ezannoni@kwikemart.cygnus.com>
-
-	* gdbtk.c (gdb_get_mem): Rewrite to fetch entire contents
-	of the memory window at once.
-
-Sat Mar 21 19:34:49 1998  Elena Zannoni  <ezannoni@kwikemart.cygnus.com>
-
-	Merged changes from Foundry: list follows by author:
-	
-	- Tom Tromey  <tromey@cygnus.com>
-
-	* Makefile.in (gdbres.o): New target.
-	(WINDRES): New define.
-	* configure: Rebuilt.
-	* configure.in (WINDRES): Define.
-	(CONFIG_OBS): Include gdbres.o on Windows.
-	* gdbtool.ico: New file.
-	* gdb.rc: New file.
-        * gdbtk.c (gdbtk_init): Call ide_create_messagebox_command.
-	(gdbtk_cleanup): Call ide_interface_deregister_all.
-	(gdbtk_init): Pass event handle to cleanup.
-	(TclDebug): Use Tcl_Merge to construct command.
-	(gdbtk_init): Call ide_create_cygwin_path_command.
-
-        - Martin M. Hunt  <hunt@cygnus.com>
-
-	* gdbtk.c (gdb_set_bp): Set addr_string for bp.
-	(gdb_get_breakpoint_info): Demangle function 
-	names in breakpoint info.
-	Include "demangle.h".
-	(gdb_loc, gdb_listfuncs): Demangle C++ 
-	function names.
-	(gdb_set_bp): Properly quote filename to fix
-	problems with spaces. Send pc back as a hex string.
-	(gdb_listfuncs): Remove debugging line.
-	 Turn off some debugging lines.
- 	(breakpoint_notify): Return correct line number.
-	(gdb_get_breakpoint_info): Return correct line number.
-	(gdb_set_bp): New function to provide a better way to
-	set breakpoints.
-	(gdbtk_readline, gdbtk_readline_begin): Memory 
-	allocated by tcl needs to be freed by Tcl_Free().
-	(find_file_in_dir): Deleted.
-	(gdb_find_file_command): Call full_lookup_symtab().
-	(gdb_listfuncs): Call full_lookup_symtab().
-	(full_lookup_symtab): New function.  Like lookup_symtab
-	except handles multiple files with the same basename,
-	full pathnames, and always sets symtab->fullname.
-	(gdb_loadfile): Call full_lookup_symtab(). Clear
-	realloc'd memory.
-	(gdb_loadfile):  Don't tag lines without source.
-	Tag source lines with source_tag.
-	(gdb_find_file_command, find_file_in_dir):
- 	Rewrite.  Now searches symtabs and psymtabs for a match
-	on the partial or full filename.  Returns the full pathname.
-	(gdb_loadfile): Realloc additional memory
-	if someone loads in a file with more than 160,000
-	lines.  I don't know if this really works because
-	I don't have enough memory to test it.
-	(gdb_sourcelines): Deleted.
-	(gdb_loadfile): New function. Takes a text widget
-	and loads it with the contents of a file.  Marks
-	and tags source lines.
-	(pc_changed): New function.
-	(get_pc_register): Returns the value of
-	the PC to GDB.
-	(gdb_loc): If looking on the stack, return
-	real pc along with calling source line.
-	(gdb_loc): Return "" instead of "N/A" if
-	filename is not found.
-	(gdb_get_breakpoint_info): Same.
-	(get_register): For Natural mode, set format to 0.
-	 Minor bugfixes from keiths.
-	(TclDebug): New function for debugging use.
-	(gdb_loc): Return correct PC for frames
-	that are not the innermost frame.
-	(gdb_listfiles): Rewritten to use object
-	API.  Now takes an optional dirname which will cause
-	only files in that directory or its subdirectories
-	to be returned.  Now returns basenames instead of
-	full pathnames.
-	(gdb_cmd): Set/reset load_in_progress flag.
-	(call_wrapper): Don't pop up dialog for errors in
-	downloads; just abort download.
-	(gdbtk_load_hash): Set return value correctly.
-
-        -  Keith Seitz  <keiths@onions.cygnus.com>
-
-	* gdbtk.c (gdbtk_init): Define the ui_loop_hook so that it can be
-	called by routines which might block, allowing us to update the GUI.
-	(gdbtk_wait): Move timer calls to annotation hooks.
-	(gdbtk_init): Define the annotation hooks.
-	(gdbtk_annotate_starting): New function for cygwin32 hosts.
-	(gdbtk_annotate_stopped): New function for cygwin32 hosts.
-	(gdbtk_annotate_exited): New function for cygwin32 hosts.
-	(gdbtk_annotate_signalled): New function. for cygwin32 hosts.
-	(gdbtk_init): Use gdbtk_print_frame_info hook.
-	(gdbtk_print_frame_info): New function which sets current_source_symtab
-	based on the given symtab and line info.
-	(gdb_immediate_command): New function which does 
-	not buffer any
-	output. (Contrast to gdb_cmd.)
-	(gdb_prompt_command): New function to return gdb's prompt.
-	(find_file_in_dir): New functon which searches source paths 
-	for a given filename.
-	(gdb_find_file): New function which returns path to given file -- uses
-	find_file_in_dir.
-	(gdbtk_init): Install "gdb_immediate", "gdb_find_file", and 
-	"gdb_prompt"
- 	commands into interpreter.
-
-        -  Ian Lance Taylor  <ian@cygnus.com>
-
-	* gdbtk.c (gdbtk_timer_going): If __CYGWIN32__, new static
-	variable.
-	(gdb_cmd): If __CYGWIN32__, if executing the load command, call
-	gdbtk_start_timer and gdbtk_stop_timer.
-	(call_wrapper): If __CYGWIN32__, if the timer is going, turn it
-	off.  Clear load_in_progress.
-	(x_event): If load_in_progress, quit if download_cancel_ok.
-	(gdbtk_start_timer): Set gdbtk_timer_going.
-	(gdbtk_stop_timer): Clear gdbtk_timer_going.
-	(gdbtk_wait): Call x_event.
-	(gdbtk_init): Call ide_create_win_grab_command if
-	__CYGIN32__.
-	(gdb_clear_file): Clear stop_pc.
-
-Wed Mar  4 16:50:18 1998  Jason Molenda  (crash@bugshack.cygnus.com)
-
-	* gdbtk.c (gdb_listfiles): Fix thinko in last change.
-
-Wed Mar  4 15:34:49 1998  Jason Molenda  (crash@bugshack.cygnus.com)
-
-	* gdbtk.c (gdb_listfiles): Allocate space for 'files' dynamically.
-
-Tue Feb 10 17:50:37 1998  Keith Seitz  <keiths@onions.cygnus.com>
-
-	* gdbtk.c (gdbtk_modify_tracepoint): Define new tracepoint modification hook.
-	(gdbtk_print_frame_info): Define this hook so that current_source_symtab
-	is set properly.
-	(gdb_actions_command): Use free_actions () from tracepoint.c/h.
-	
-Mon Jan 26 11:37:55 1998  Keith Seitz  <keiths@onions.cygnus.com>
-
-	* gdbtk.c (gdb_actions_command): Make note of next action
-	before freeing all references to it.
-
-Sat Jan 24 23:52:08 1998  Martin M. Hunt  <hunt@cygnus.com>
-
-	* gdbtk.c: Merge from Foundry branch.
-	(TclDebug): New debugging function.
-	(gdb_loc): For frames, find address of calling function
-	instead of whatever is on the stack (usually the next
-	instruction).
-	(gdb_listfiles): Takes an optional pathname argument and 
-	returns an alphabetized list of basenames of files in the
-	path.
-
-Wed Jan 22  10:37:02 1998  Keith Seitz  <keiths@onions.cygnus.com>
-
-	* symfile.c: Define two new hooks for symbol reading: 
-	"pre_add_symbol_hook" and "post_add_symbol_hook". These hooks 
-	are called before we begin reading symbols, and after we finish.
-	(generic_load): Use new symbol reading hooks and get rid of 
-	compiler warning.
-
-	* gdbtk.c (gdbtk_init): Add hooks for pre- and post-symbol reading.
-	(gdbtk_pre_add_symbol): New function: the pre-add-symbol hook.
-	(gdbtk_post_add_symbol): New function: the post-add-symbol hook.
-	(find_file_in_dir): New function. Moved the guts of gdb_find_file_command
-	into here to allow its use by others.
-	(gdb_loc): Use find_file_in_dir to return the real path to the file
-	(or "N/A" if we can't find it).
-
-	* configure.in (TIX_LIB_EXT): Define new variable for those special cases
-	when TCL_SHLIB_SUFFIX is not enough to specify the dependency.
-
-	* configure: Regenerate.
-
-Fri Jan 23 07:47:06 1998  Fred Fish  <fnf@cygnus.com>
-
-	* Makefile.in (uninstall): Remove installed gdbtcl dir, if one
-	was installed.
-
-Thu Jan 15 12:42:28 1998  Keith Seitz  <keiths@onions.cygnus.com>
-
-	* gdbtk.c (gdb_immediate_command): New function which does not buffer any
-	output. (Contrast to gdb_cmd.)
-	(gdbtk_init): Install "gdb_immediate" command into interpreter.
-
-Wed Jan 14 16:38:44 1998  Keith Seitz  <keiths@pizza.cygnus.com>
-
-	* configure.in (--enable-gdbtk): If tcl was built with --enable-shared,
-	use TCL_SHLIB_SUFFIX to specify the suffix of the library file so that
-	we don't expect to see "libfoo.a" instead of "libfoo.{so,sl, etc}".
-
-	* configure: Regenerate.
-	
-Wed Dec 31 16:50:26 1998  Keith Seitz  (keiths@onions.cygnus.com)
- 
-        * gdbtk.c (gdb_actions_command): extract and save step count
-        from "while-stepping" command
-
-Tue Dec 16 21:16:42 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* Makefile.in (LIBGUI): New variable.
-	(GUI_CFLAGS_X): New variable.
-	(IDE_CFLAGS): Add $(GUI_CFLAGS_X).
-	* configure.in: Add $(LIBGUI) to TCL_LIBS and CONFIG_DEPS.
-	* configure: Rebuild.
-
-Wed Dec  10 13:16:45 1997  Keith Seitz  <keiths@onions.cygnus.com>
-
-	* gdbtk.c (gdb_get_tracepoint_info): Use info in struct 
-	symtab_and_line (not struct tracepoint) so that we get the
-	real line info for an address. Arrange data more like
-	gdb_get_breakpoint_info.
-	(tracepoint_notify): Use info in struct symtab_and_line again.
-	(gdbtk_init): Add command "gdb_get_tracepoint_list" into
-	interpreter.
-	(gdb_get_tracepoint_list): New function that aids the source
-	window in displaying tracepoints when the file changes.
-	
-Fri Dec  5 10:31:23 1997  Keith Seitz  <keiths@pizza.cygnus.com>
-
-	* gdbtk.c (gdbtk_init): Add gdb_find_file into interpreter.
-	(gdb_find_file_command): New function which searches source path
-	to find the real full filename of a file.
-
-Mon Dec  1 10:19:44 1997  Keith Seitz  <keiths@onions.cygnus.com>
-
-	* gdbtk.c: Move include of "guitcl.h" back out of IDE ifdef.
-	(gdbtk_init): Move ide_initialize_paths out of IDE ifdef.
-
-	* configure.in (TCL_LIBS, CONFIG_DEPS): Add IDE libraries for all
-	builds.
-	(CONFIG_OBS): Remove tracepoint.o, which should always be included.
-
-	* configure: regenerate
-
-	* Makefile.in (install-only): ALWAYS install the new gdbtk
-	(REMOTE_OBS): add tracepoint.o
-	
-Thu Nov 27 09:07:18 1997  Michael Meissner  <meissner@cygnus.com>
-
-	* configure.in ({TCL_LIBS,CONFIG_DEPS}): Don't add IDE libraries
-	if not --enable-ide.
-	(CONFIG_OBS): Add tracepoint.o to list if --enable-gdbtk.
-	* configure: Regenerate.
-
-	* gdbtk.c (gdb_get_breakpoint_info): Add missing filename
-	argument.
-	(toplevel): Move include of guitcl.h into #ifdef IDE region.
-	(gdbtk_init): Move ide_initialize_paths call into #ifdef IDE
-	section.
-
-	* Makefile.in (gdbtk.o): Update dependencies.
-
-Wed Nov 26 15:02:43 1997  Keith Seitz  <keiths@onions.cygnus.com>
-
-    	* gdbtk.c (gdb_loc): symtab_to_filename can return NULL.
-	(breakpoint_notify): Ditto.
-	(gdb_get_breakpoint_info): Ditto.
-
-Wed Nov 26 11:33:09 1997  Keith Seitz  <keiths@onions.cygnus.com>
-
-	Merge in code from Foundry branch:
-	
-	* Makefile.in (install-only): install the new gdbtk, not the old
-
-	* gdbtk.c (gdbtk_call_command): also run idle hooks for class_trace
-	commands
-	(gdbtk_init): Add new commands "gdb_get_locals", "gdb_get_args",
-	"gdb_get_function", "gdb_get_line", "gdb_get_file",
-	"gdb_tracepoint_exists", "gdb_get_tracepoint_info", "gdb_actions",
-	and "gdb_prompt".
-	(gdb_get_vars_command): New function.
-	(gdb_get_line_command): New.
-	(gdb_get_file_command): New.
-	(gdb_get_function_command): New.
-	(gdb_get_tracepoint_info): New.
-	(gdbtk_create_tracepoint): New.
-	(gdbtk_delete_tracepoint): New.
-	(tracepoint_notify): New.
-	(tracepoint_exists): New.
-	(gdb_actions_command): New.
-	(gdb_tracepoint_exists_command): New.
-	(gdb_prompt_command): New.
-
-Thu Nov 13 18:15:54 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* gdbtk.c: Move include of gdbcore.h to top of file.
-	(close_bfds): New static function if _WIN32.
-	(gdbtk_readline): Call close_bfds.
-	(call_wrapper, tk_command_loop): Likewise.
-	(gdb_clear_file): New static function.
-	(gdbtk_init): Create gdb_clear_file Tcl command.
-
-Wed Nov 12 14:58:39 1997  Jeff Holcomb  <jeffh@cygnus.com>
-
-	* gdbtk.c: gdbtk_load_hash and ui_load_progress_hook return an
-	int result.
-	(gdbtk_load_hash): download hash routine returns an int result.
-
-Mon Nov 10 15:11:51 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* gdbtk.c (gdbtk_init): Call ide_create_shell_execute_command if
-	__CYGWIN32__.
-	* configure.in: Add -lshell32 to WIN32LIBS on cygwin32.
-	* configure: Rebuild.
-
-Sun Nov  9 16:25:34 1997  Tom Tromey  <tromey@cygnus.com>
-
-	* gdbtk.c (gdbtk_init): Run ide_create_help_command.
-
-Tue Oct 28 17:31:47 1997  Martin M. Hunt  <hunt@cygnus.com>
-
-	* gdbtk.c (gdbtk_init): Call ide_create_winprint_command.
-
-Thu Oct 23 15:53:37 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* configure.in: Add -lgdi32 to WIN32LIBS when linking gdbtk on
-	cygwin32.
-	* configure: Rebuild.
-
-Wed Oct 22 21:32:54 1997  Martin M. Hunt  <hunt@cygnus.com>
-
-	* gdbtk.c (gdbtk_init): Create sizebox command on Windows.
-
-Thu Oct  9 14:33:21 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* gdbtk.c (gdbtk_init): Remove assertion argument from call to
-	ide_create_window_register_command.
-
-Wed Oct  1 11:09:52 1997  Tom Tromey  <tromey@cygnus.com>
-
-	* gdbtk.c (gdbtk_init): Pass name of restore interface to
-	ide_create_window_register_command.
-
-Fri Sep 26 21:08:22 1997  Keith Seitz  <keiths@pizza.cygnus.com>
-
-	* gdbtk.c (gdbtk_init): Initialize ui_load_progress_hook.
-
-Thu Sep 25 03:05:00 1997  Martin M. Hunt  <hunt@cygnus.com>
-
-	* gdbtk.c (gdb_load_info): New function.  Returns a list
-	of section names and sizes for an executable.
-	(gdbtk_load_hash): Stub function to call tcl function
-	download_hash.
-
-Tue Sep 23 01:29:00 1997  Martin M. Hunt  <hunt@cygnus.com>	
-
-	* gdbtk.c (gdb_get_mem): Fix compiler warning.
-
-Sun Sep 21 00:15:00 1997  Martin M. Hunt  <hunt@cygnus.com>
-
-	* gdbtk.c (gdb_get_mem): Fix problem with ASCII dump.
-
-Tue Sep 16 18:07:17 1997  Martin M. Hunt  <hunt@cygnus.com>	
-
-	* gdbtk.c (gdb_get_mem): New function.  Returns
-	a formatted memory dump with optional ASCII dump.
-
-Mon Sep  8 12:48:50 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* gdbtk.c: Include ilutk.h if IDE.
-	(gdb_confirm_quit, gdb_force_quit): New static functions.
-	(gdbtk_init): Add Tcl commands gdb_confirm_quit and
-	gdb_force_quit.
-
-Mon Sep  8 03:05:33 1997  Martin M. Hunt  <hunt@cygnus.com>
-
-	* gdbtk.c (gdb_get_breakpoint_info): Now returns the
-	function a breakpoint is in.
-
-Fri Sep  5 20:23:58 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* gdbtk.c (gdbtk_init): Call ide_create_exit_command.
-
-Wed Sep  3 19:39:15 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* gdbtk.c: Include guitcl.h.
-	(gdbtk_init): Always call ide_initialize_paths.  Set the Tcl
-	variable IDE to 1 when using the IDE.  Always try using auto path
-	to find main.tcl.
-	* Makefile.in (IDE_CFLAGS_X): Always include libide.
-	(LIBIDE): New variable.
-	(IDE_X): Omit -lide.
-	(IDE_DEPS): Omit libide.
-	* configure.in: Add LIBIDE to TCL_LIBS and CONFIG_DEPS.
-	* configure: Rebuild.
-
-Mon Aug 25 02:28:55 1997  Keith Seitz  <keiths@pizza.cygnus.com>
-
-	* gdbtk.c: (gdb_target_has_inferior) check if inferior_pid is non-zero
-	before assuming that the inferior is running.
-
-Mon Aug 25 01:06:48 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* gdbtk.c (gdbtk_start_timer): Pass third argument to setitimer.
-	(gdbtk_stop_timer): Likewise.
-
-Mon Aug 25 00:23:08 1997  Keith Seitz  <keiths@pizza.cygnus.com>
-
-	* gdbtk.c: (gdbtk_init) create new command "gdb_target_has_execution"
-	(gdb_target_has_execution_command) new function
-
-Sun Aug 24 20:27:22 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* gdbtk.c (gdb_loc): If there are no symbols, just bail
-	immediately.
-	(tk_command_loop): Print errors encountered while running
-	gdbtk_tcl_preloop.
-
-Sun Aug 24 13:44:03 1997  Tom Tromey  <tromey@cygnus.com>
-
-	* gdbtk.c (gdbtk_init): Run ide_create_build_command.
-
-Sat Aug 23 21:53:39 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* gdbtk.c: If CYGWIN32, include <sys/time.h>.
-	(x_fd): Don't define if WINNT.
-	(gdbtk_start_timer, gdbtk_stop_timer): New static functions if
-	CYGWIN32.
-	(gdbtk_wait): Don't set up signal handling if WINNT.  If CYGWIN32,
-	call gdbtk_start_timer and gdbtk_stop_timer.
-	(gdbtk_init): Don't set up signal handling or make x_fd
-	asynchronous if CYGWIN32.
-
-Fri Aug 22 15:23:15 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* gdbtk.c (error_string_ptr): New static variable.
-	(gdbtk_fputs): If result_ptr is NULL, and error_string_ptr is not
-	NULL, and we're outputting to stderr, append string to
-	error_string_ptr rather than calling gdbtk_tcl_fputs.
-	(call_wrapper): Set up error_string_ptr.  Put both error string
-	and normal string in Tcl result.
-
-	* gdbtk.c (gdbtk_init): Don't call ide_run_server_init until after
-	gdb has initialized.
-
-Thu Aug 21 19:14:38 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* gdbtk.c: If _WIN32, include winuser.h.
-	(gdbtk_init): If _WIN32, use MessageBox to display an error
-	evaluating main.tcl.
-
-Thu Aug 21 00:48:00 1997  Martin M. Hunt  <hunt@pern.cygnus.com>
-
-	* gdbtk.c (gdbtk_init): Add call to ide_run_server_init().
-	(gdb_cmd): For the load command, don't buffer the I/O.
-
-Wed Aug 20 11:41:22 1997  Martin M. Hunt  <hunt@cygnus.com>
-
-	* gdbtk.c (gdbtk_query): Chaneg free() call to Tcl_Free().
- 	
-Tue Aug 19 17:09:19 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* Makefile.in (TCL_DEPS, TK_DEPS): New variables.
-	(ITCL_DEPS, TIX_DEPS): New variables.
-	(IDE_DEPS): New variable.
-	(CDEPS): Include @CONFIG_DEPS@.
-	* configure.in: Set and substitute CONFIG_DEPS and TIX_DEPS.
-	* configure: Rebuild.
-
-Sun Aug 17 00:42:11 1997  Martin M. Hunt  <hunt@cygnus.com>
-
-	* gdbtk.c (gdb_listfuncs): New function that returns
-	a list of all the functions in a source file.
-
-Tue Aug 12 16:35:21 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* Makefile.in (install-only): Install tclIndex if ENABLE_IDE.
-
-Mon Aug 11 10:43:04 1997  Tom Tromey  <tromey@cygnus.com>
-
-	* gdbtk.c (gdbtk_init): Use ide_event_init_from_environment.
-
-Fri Aug  8 15:59:24 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* gdbtk.c (gdbtk_init): Change gdbtk_lib_tmp and gdbtk_file to be
-	dynamically allocated, rather than fixed size.  Pass "gdbtcl" to
-	ide_initialize_paths to match installed directory name.  If IDE,
-	use auto_path to search for main.tcl.
-	* Makefile.in (install-only): If ENABLE_IDE, install from gdbtcl2
-	rather than gdbtcl.
-
-	* gdbtk.c (gdbtk_cleanup): New static function.
-	(gdbtk_init): Add gdbtk_cleanup as a final cleanup.  Uncomment
-	call to ide_initialize_paths.  If we can't initialize the event
-	system, set GDBTK_IDE to 0 in the Tcl interpreter.  Create the
-	ide_window_register and the ide_window commands.  Initialize tk,
-	itcl, and tix after initializing the IDE.
-
-	* configure.in (tixdir): Update for cygwin32 case for Tcl 8.0.
-	* configure: Rebuild.
-
-Fri Aug  8 00:13:32 1997  Martin M. Hunt  <hunt@cygnus.com>
-
-	* gdbtk.c (breakpoint_notify): Change buffer size from 100
-	to 256 to avoid memory corruption with very long pathnames.
-
-Thu Aug  7 14:08:23 1997  Martin M. Hunt  <hunt@cygnus.com>
-
-	* configure.in: Change required Tix version to 4.1.8.0 .
-	* configure: Rebuilt.
-
-Fri Aug  1 15:21:44 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* gdbtk.c (Tcl_Alloc): Don't provide our own version of this if
-	_WIN32.
-	(Tcl_Realloc, Tcl_Free): Likewise.
-	* configure.in: Check for cygwin32 environment.  Define and
-	substitute WIN32LIBS and WIN32LDAPP.  Always set configdir to
-	unix; setting it to win was for an old Tcl/Tk configuration
-	scheme.
-	* aclocal.m4 (CY_AC_LOAD_TKCONFIG): Substitute TK_BUILD_INCLUDES.
-	* Makefile.in (TK_CFLAGS): Add @TK_BUILD_INCLUDES@.
-	(WIN32LDAPP, WIN32LIBS): Define.
-	(CLIBS): Add $(WIN32LIBS).
-	(gdb): Use $(WIN32LDAPP).
-	* configure: Rebuild.
-
-Tue Jul 22 19:45:37 1997  Martin M. Hunt  <hunt@cygnus.com>
-
-	* configure.in, aclocal.m4: Another fix to find the
-	correct Tix library name.
-
-	* configure: Rebuilt.
-	
-Mon Jul 21 22:24:07 1997  Martin M. Hunt  <hunt@cygnus.com>
-
-	* aclocal.m4: Search for the correct tix library. 
-
-Thu Jul 10 00:02:41 1997  Martin M. Hunt  <hunt@cygnus.com>
-
-	* Makefile.in, configure.in, aclocal.m4: Add Itcl, Tix, and 
-	IDE configuration information.
-
-	* gdbtk.c (breakpoint_notify): Send address, linenumber and 
-	filename when a breakpoint is set.  Avoids call to bp_info.
- 	(gdbtk_init): Call Tcl_FindExecutable(). Add code to handle 
-	Itcl, Tix and IDE initialization.
-
-	* configure: Regenerated.
-
-Fri Jun 13 10:28:09 1997  Fred Fish  <fnf@cygnus.com>
-
-	* gdbtk.c (gdbtk_init): Make truth value test explicit.
-	Remove unused static variable "Gdbtk_Library".
-
-Sat Jun  7 02:34:19 1997  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
-
-	* gdbtk.c (gdb_get_breakpoint_info):  Add string for new
-	enumeration del_at_next_stop to bpdisp array.
-
-Tue Jun  3 15:46:51 1997  Tom Tromey  <tromey@cygnus.com>
-
-	* Makefile.in (LIB_RUNTIME_DIR): New variable.
-
-Wed May  7 19:10:19 1997  Andrew Cagney  <cagney@b1.cygnus.com>
-
-	* gdbtk.c (wrapped_call): New function - make actual call to tk
- 	worker function.
-	(call_wrapper): Rewrite to use top.c:catch_errors.
-
-	* gdbtk.c (gdb_stop): If No target_stop set quit flag and hope for
- 	best.
-
-Mon Apr 21 14:00:08 1997  Doug Evans  <dje@canuck.cygnus.com>
-
-	* gdbtk.c (gdb_disassemble): Store endian-ness in `di'.
-
-Wed Apr 16 12:33:06 1997  Andrew Cagney  <cagney@b1.cygnus.com>
-
-	* Makefile.in (install-only): Make list of gdbtcl files to install
- 	explicit - was picking up files such as ChangeLog etc.
-	(install-only): Don't blindly create the directory.
-
-Tue Apr  1 15:04:21 1997  Jason Molenda  (crash@godzilla.cygnus.co.jp)
-
-	* configure.in (gdbtcl): Create soft-link for gdbtcl/ directory
- 	instead of gdbtk.tcl.
-
-Fri Mar 28 17:04:02 1997  Jason Molenda  (crash@godzilla.cygnus.co.jp)
-
-	* Makefile.in (gdbtk.o): look for GDBTK_LIBRARY in $(datadir) by
-	default, not $(srcdir).
-
-Wed Mar 19 15:16:17 1997  Martin M. Hunt  <hunt@onions.cygnus.com>
-
-	* Makefile.in:  Install gdbtcl dir instead of gdbtk.tcl.
-	
-	* gdbtk.c: Added some ifdefs for Windows.  Changed GDBTK_FILENAME
-	to GDBTK_LIBRARY, which is now a path to search.
-	(gdb_path_conv): New function.  Convert Cygwin32 pathname to
-	DOS-style pathname.
-
-	* {aclocal.m4,configure.in}: Changes for Windows builds.
-
-	* configure: Rebuilt.
-
-Fri Mar 14 10:01:29 1997  Tom Tromey  <tromey@cygnus.com>
-
-	* configure: Regenerated.
-	* configure.in (LIBS): Re-reverse order of TCL_LIBS and TK_LIBS.
-
-Wed Mar 12 14:29:52 1997  Tom Tromey  <tromey@cygnus.com>
-
-	* gdbtk.c (x_event): Use Tcl_DoOneEvent, TCL_DONT_WAIT,
-	TCL_ALL_EVENTS.
-
-	* configure: Regenerated.
-	* configure.in (ENABLE_GDBTK): Put TCL_LIBS after TK_LIBS in
-	LIBS.
-
-Mon Feb 10 13:50:53 1997  Stu Grossman  (grossman@critters.cygnus.com)
-
-	* gdbtk.c (call_wrapper):  Clear running_now if an error occurs.
-
-Wed Dec 11 18:51:35 1996  Mark Alexander  <marka@cygnus.com>
-
-	* gdbtk.c (gdb_loc): Correct truncation of PC on 64-bit MIPS.
-
-Tue Nov 19 09:26:14 1996  Tom Tromey  <tromey@cygnus.com>
-
-	* gdbtk.c (gdbtk_readline): Fix memory leak.
-
-Mon Nov 18 23:43:05 1996  Tom Tromey  <tromey@cygnus.com>
-
-	Fixes for Tcl 7.6 / Tk 4.2:
-	* gdbtk.tcl (apply_filespec): Use tk_getOpenFile.
-	Remove old fileselect code.
-	* gdbtk.c (Tcl_Alloc): Rename from Tcl_Malloc.
-
-Fri Sep 27 10:25:30 1996  Fred Fish  <fnf@cygnus.com>
-
-	* gdbtk.tcl (create_copyright_window): Increase timeout from
-	15 seconds to 30 seconds.
-
-Wed Sep  4 17:28:40 1996  Stu Grossman  (grossman@critters.cygnus.com)
-
-	* configure configure.in:  Add host *windows* to list of hosts
-	that don't support GDBtk.
-
-Fri Aug 23 00:44:57 1996  Fred Fish  <fnf@cygnus.com>
-
-	* gdbtk.c (gdbtk_init): Check for a DISPLAY env variable and
-	gracefully degrade to using command line interface if none is
-	found.
-
-Fri Aug  9 12:32:53 1996  Tom Tromey  <tromey@creche.cygnus.com>
-
-	* Makefile.in (LIB_INSTALL_DIR): New macro.
-	(TCL): Include @TCL_LD_SEARCH_FLAGS@.
-
-Thu Aug  1 20:35:01 1996  Tom Tromey  <tromey@creche.cygnus.com>
-
-	* gdbtk.c (mainWindow): Deleted.
-	(cleanup_init): Don't destroy main window.
-	(gdbtk_init): Main window now created by Tk_Init.
-
-	* configure.in: Most X checks now handled automatically by Tk.
-	Use new macros to find Tcl/Tk.
-	* aclocal.m4: New version for new Tcl/Tk; from Don Libes.
-	* config.in, configure: Regenerated.
-
-	* Makefile.in (TCL, TCL_CFLAGS, TK, TK_CFLAGS, X11_CFLAGS,
-	X11_LDFLAGS, X11_LIBS): Changed for new Tcl and Tk.
-
-Thu Aug  1 16:12:05 1996  Jason Molenda  (crash@godzilla.cygnus.co.jp)
-
-	* Makefile.in (gdbtk.tcl): put in $(datadir), not $(libdir).
-
-Fri Jul 26 14:07:37 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* gdbtk.c (gdb_disassemble): Initialize di.flavour.
-
-Thu Jul 25 19:41:31 1996  Fred Fish  <fnf@cygnus.com>
-
-	* gdbtk.c (null_routine): Ditto.
-	(gdbtk_flush): Ditto.
- 	(gdbtk_fputs): Ditto.
- 	(gdbtk_query): Ditto.
-	(gdbtk_readline): Ditto.
- 	(gdbtk_readline_end): Ditto.
- 	(gdb_get_breakpoint_list): Ditto.
-	(gdb_get_breakpoint_info): Ditto.
- 	(breakpoint_notify): Ditto.
- 	(gdbtk_create_breakpoint): Ditto.
-	(gdbtk_delete_breakpoint): Ditto.
- 	(gdbtk_modify_breakpoint): Ditto.
- 	(gdb_loc): Ditto.
- 	(gdb_eval): Ditto.
-	(gdb_sourcelines): Ditto.
- 	(map_arg_registers): Ditto.
- 	(get_register_name): Ditto.
- 	(gdb_regnames): Ditto.
-	(get_register): Ditto.
- 	(gdb_fetch_registers): Ditto.
- 	(register_changed_p): Ditto.
-	(gdb_changed_register_list): Ditto.
- 	(gdb_cmd): Ditto.
- 	(call_wrapper): Ditto.
- 	(gdb_listfiles): Ditto.
-	(gdb_stop): Ditto.
- 	(gdbtk_dis_asm_read_memory): Ditto.
- 	(compare_lines): Ditto.
- 	(gdb_disassemble): Ditto.
-	(tk_command): Ditto.
- 	(cleanup_init): Ditto.
- 	(gdbtk_interactive): Ditto.
- 	(x_event): Ditto.
- 	(gdbtk_wait): Ditto.
-	(gdbtk_call_command): Ditto.
- 	(tk_command_loop): Ditto.
- 	(gdbtk_init): Ditto.
-
-	* gdbtk.c (register_changed_p): Remove unused local variable "buf".
-
-Sat Jul 20 17:46:40 1996  Fred Fish  <fnf@cygnus.com>
-
-	* gdbtk.tcl (files_command): Reorder the binding tags for
-	the listbox widget to avoid referencing the listbox after
-	the containing widget has been destroyed by the action of
-	a previous binding.
-
-Sat Jul 20 10:09:28 1996  Fred Fish  <fnf@cygnus.com>
-
-	* gdbtk.tcl (delete_expr): Unset corresponding element of
-	expr_update_list when destroying an expression.
-	(create_expr_window): Initialize expr_num, delete_expr_num,
-	and expr_update_list here when each new expression window
-	is created, rather than once at startup.
-
-Mon Jul 15 16:44:05 1996  Stu Grossman  (grossman@critters.cygnus.com)
-
-	* gdbtk.c (gdb_disassemble):  Setup di.mach from
-	tm_print_insn_info.mach, and set endian from TARGET_BYTE_ORDER.
-
-Fri Jun 21 11:04:47 1996  Fred Fish  <fnf@cygnus.com>
-
-	* gdbtk.tcl (create_register_windows): Include missing '$'s.
-	Add global declarations for various reg_format_* variables.
-	* gdbtk.tcl (populate_register_window): Make initial window one
-	line taller to account for new column header line.
-
-Fri Jun 21 09:46:47 1996  Fred Fish  <fnf@cygnus.com>
-
-	* gdbtk.c (get_register): Support for printing raw formats.
-	* gdbtk.tcl: Add hint for using debug_interface.
-	(center_window, add_breakpoint_frame, delete_breakpoint_frame):
-	Enclose arg in braces for consistency.
-	(create_registers_window, populate_reg_window, update_registers):
-	Major rewrite to support displaying multiple formats in the register
- 	window.
-	(init_reg_info): New function.
-	(recompute_reg_display_list):  Reset reg_display_list, start
-	register display lines at line 2.
-
-Thu Jun 20 08:18:59 1996  Fred Fish  <fnf@cygnus.com>
-
-	* gdbtk.tcl (gdbtk_tcl_readline_begin): Handle backspace to
-	avoid backing up over prompt.  At every input, make sure insert
-	point is at least after command start, handle control-u to delete
-	current input line.
-	(tclsh): Handle backspace to avoid backing up over prompt.  Handle
-	control-u to delete current input line.
-
-Wed Jun 19 17:23:38 1996  Geoffrey Noer  <noer@cygnus.com>
-
-	* configure.in: disable gdbtk for *cygwin32* hosted compiles
-	* configure: regenerated with autoconf 2.8
-
-Sun May 19 16:49:37 1996  Fred Fish  <fnf@cygnus.com>
-
-	* gdbtk.c (gdbtk_readline_begin, gdbtk_readline, gdbtk_readline_end):
-	New functions.
-	(tk_command_loop): Set instream to NULL to enable Tk user interaction.
-	(gdbtk_init): Set readline_begin_hook, readline_hook,
-	and readline_end_hook.
-	* gdbtk.tcl (gdbtk_tcl_readline_begin, gdbtk_tcl_readline,
-	gdbtk_tcl_readline_end): New functions.
-	(tclsh): Pack scroll bar on right side of window, not left.
-
-Fri May 17 13:54:34 1996  Fred Fish  <fnf@cygnus.com>
-
-	* gdbtk.tcl (create_command_window): Change a misspelled "get"
-	to the intended "cget".
-	(delete_line): Fix so it deletes the current line at the
-	insertion cursor.
-
-Thu May 16 19:20:29 1996  Fred Fish  <fnf@cygnus.com>
-
-	* gdbtk.tcl (gdb_prompt): Set this early on.
-	(create_command_window): Use gdb_prompt rather than "(gdb) ".
-	(gdbtk_tcl_preloop): Proc executed just prior to Tk main loop.
-	(tclsh): If an evaluation window already exists, just bring it
-	to the front instead of trying to create another.
-	* gdbtk.c (tk_command_loop): New function.
-	(gdbtk_init): Call tk_command_loop rather than Tk_MainLoop.
-
-Thu May 16 16:16:35 1996  Fred Fish  <fnf@cygnus.com>
-
-	* gdbtk.tcl (evaluate_tcl_command, tclsh):  New functions that
-	implement a tcl evaluation window for gdbtk maintainers to use.
-
-Thu May 16 11:42:58 1996  Tom Tromey  <tromey@creche.cygnus.com>
-
-	* gdbtk.tcl (files_command): Correctly insert list of files into
-	listbox widget.
-
-	* gdbtk.tcl (files_command): listbox command no longer accepts
-	-geometry.
-
-Wed May 15 16:04:09 1996  Stan Shebs  <shebs@andros.cygnus.com>
-
-	* gdbtk.tcl (create_command_window): If command window's buffer
-	is disabled, don't execute any of the key bindings.
-
-Mon May 13 13:43:25 1996  Fred Fish  <fnf@cygnus.com>
-
-	* gdbtk.c (tk_command): Catch case where no argument is given
-	since this will cause the tcl interpreter to dump core.
-
-Wed May  8 20:33:24 1996  Fred Fish  <fnf@cygnus.com>
-
-	* gdbtk.c: Fix a couple of misspellings.
-
-Thu May  2 19:17:49 1996  Stan Shebs  <shebs@andros.cygnus.com>
-
-	* gdbtk.tcl (debug_interface): New global, use to aid debugging.
-	(insert_breakpoint_tag, delete_breakpoint_tag): Fix range.
-	(file_popup_menu): Delete, never used.
-	(listing_window_popup): Rename from listing_window_button_1,
-	remove breakpoint toggling code.
-	(toggle_breakpoint): New procedure.
-	(create_file_win): Bind popup menu to button 2, toggle breakpoints
- 	with button 1 in breakpoint area, add display of tagged areas if
- 	debugging on.
-
-Fri Apr  5 13:44:40 1996  Stan Shebs  <shebs@andros.cygnus.com>
-
-	* gdbtk.c (running_now): New global variable.
-	(gdb_cmd): Test it before executing any command.
-	(gdbtk_call_command): Set it when inferior is running.
-	* gdbtk.tcl (gdbtk_tcl_busy, gdbtk_tcl_idle): Enable and
-	disable interaction with command window's text appropriately.
-
-Fri Apr  5 13:25:42 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
-
-	* gdbtk.c (SIOCSPGRP, linux): If on Linux, undef SIOCSPGRP, since
-	some versions of the kernel don't support it.
-
-Tue Feb  6 16:31:25 1996  Tom Tromey  <tromey@creche.cygnus.com>
-
-	* gdbtk.tcl (create_file_win): Eliminate text widget B1 binding so
-	double-clicking will work again.
-	(create_asm_win): Put "break" at end of all B1 bindings.
-	(create_file_win): Lower "sel" tag, don't raise it.
-	(ensure_line_visible): New proc.
-	(update_listing, update_assembly): Use it.
-	(create_copyright_window): Destroy window on Leave event.
-	(create_command_window): Put "break" at end of all B2 bindings.
-
-Wed Jan 24 15:28:41 1996  Tom Tromey  <tromey@creche.cygnus.com>
-
-	* gdbtk.tcl, gdbtk.c: Updated copyrights.
-
-	* configure.in: Look for -ldl or -ldld when using Tcl 7.5 or
-	greater.
-	* configure: Rebuilt.
-
-Tue Jan 23 09:00:48 1996  Doug Evans  <dje@charmed.cygnus.com>
-
-	* gdbtk.c (gdb_disassemble): Pass fprintf_unfiltered to
- 	INIT_DISASSEMBLE_INFO.
-
-Mon Jan 15 09:58:41 1996  Tom Tromey  <tromey@creche.cygnus.com>
-
-	* gdbtk.tcl (create_expr_window): Many changes to update GUI.
-	(add_expr): Changes from create_expr_window.
-	(create_command_window): Set focus.
-	(delete_expr): Rewrote.
-	(expr_update_button): New proc.
-	(add_expr): Put bindings on FocusIn, FocusOut.
-	Don't allow .file_popup to be torn off.
-
-Fri Jan 12 09:36:17 1996  Tom Tromey  <tromey@creche.cygnus.com>
-
-	* gdbtk.tcl (gdbtk_tcl_query): Swap Yes and No buttons.
-	(update_listing): Use lassign.  Use "see" to scroll.  Don't need
-	screen_top, screen_bot, screen_height.
-	(update_assembly): Use "see" to scroll.
-	(textscrollproc): Removed.
-	(create_file_win): Don't use textscrollproc.
-	(asmscrollproc): Removed.
-	(create_asm_window): Don't use asmscrollproc.
-	(create_asm_win): Ditto.
-	(screen_height, screen_top, screen_bot): Removed.
-	(run_editor): New proc.
-	(build_framework): Use it.
-	(create_file_win, create_source_window): Don't use textscrollproc.
-	(create_breakpoints_window): Set -xscrollcommand on canvas.
-	(not_implemented_yet): Default button is 0.
-	(delete_char): Don't use tk_textBackspace.
-	(create_command_window): Allow Tk bindings to fire after deleting
-	character.
-	(create_command_window): Make Delete delete left, not right.
-
-Thu Jan 11 10:08:14 1996  Tom Tromey  <tromey@creche.cygnus.com>
-
-	* gdbtk.tcl (FSBox): Don't use tk_listboxSingleSelect.
-
-	Changes in sync with expect:
-	* configure.in (ENABLE_GDBTK): Use CY_AC_PATH_TCL and
-	CY_AC_PATH_TK.
-	* aclocal.m4: Replaced with version from expect.
-	* configure: Regenerated.
-
-Wed Jan 10 09:07:22 1996  Tom Tromey  <tromey@creche.cygnus.com>
-
-	* gdbtk.tcl (gdbtk_tcl_fputs, gdbtk_tcl_fputs_error,
-	gdbtk_tcl_flush): Use "see", not "yview".
-	(gdbtk_tcl_query): Use questhead bitmap.
-	various: Always wrap condition of 'if' in {...}.
-	(add_breakpoint_frame): Set -value on radiobuttons.
-	(lassign): New proc.
-	(add_breakpoint_frame): Use lassign, not series of assignments.
-	(decr): Made faster.
-	(interactive_cmd): Use "see", not "yview".
-	(not_implemented_yet): Use warning bitmap.
-	(update_expr): Don't allow $expr to be evalled by Tcl.
-	(create_expr_window): Don't use "focus".
-	(delete_char, delete_line): Define globally.
-	(delete_line, delete_char, create_command_window, update_autocmd,
-	build_framework, create_asm_win, create_file_win): Use "see", not
-	"yview".
-	(create_copyright_window, center_window, bind_widget_after_class):
-	New procs.
-	(FSBox,create_command_window, create_autocmd_window): Binding
-	changes for Tk4.
-	(textscrollproc): Define globally.
-	(build_framework): tk_menuBar no longer needed.  Keys Prior, Next,
-	Home, End, Up, and Down are all defined by Tk.
-	(apply_filespec): Use error bitmap in dialog.
-	(files_command): Don't use tk_listboxSingleSelect.
-	(files_command): Don't use "uniq" to remove duplicates from a
-	list.
-	(update_assembly): Use lassign.
-	(create_asm_win): Removed redundant bindings.
-	(listing_window_button_1, file_popup_menu): Use tk_popup.
-	(ButtonRelease-1 binding): Just remove tag from window; rest
-	handled by Tk.
-
-	* gdbtk.c (gdbtk_query): Use Tcl_Merge to provide quoting.
-	(call_wrapper): Use Tcl_Eval, not Tcl_VarEval.
-	(gdbtk_call_command): Ditto.
-
-Thu Jan  4 16:04:54 1996  Stu Grossman  (grossman@cygnus.com)
-
-	* configure configure.in:  Make --enable-gdbtk be the default.
-
-Thu Dec 28 15:10:49 1995  Stan Shebs  <shebs@andros.cygnus.com>
-
-	* README.GDBTK: Polish introductory paragraph.
-
-Mon Oct 16 11:27:06 1995  Stu Grossman  (grossman@cygnus.com)
-
-	* gdbtk.c (gdb_disassemble):  Use fprintf_unfiltered instead of
-	fprintf_filtered.
-
-Tue Oct 10 15:26:39 1995  Fred Fish  <fnf@cygnus.com>
-
-	* README.GDBTK: Updated for version 4.15.
-	
-Sat Aug 19 17:20:22 1995  Michael Tiemann  <tiemann@axon.cygnus.com>
-
-	* gdbtk.tcl: ENABLE comes back as "1" or "0", not "enable" or
-	"disable".
-	Also, wire up the breakpoint window so that it can be demo'd.
-
-Tue Aug  1 11:44:53 1995  J.T. Conklin  <jtc@rtl.cygnus.com>
-
-	* gdbtk.c: Include "gdb_string.h" instead of <string.h>.
-
-Tue Jun 20 10:19:40 1995  Stu Grossman  (grossman@cygnus.com)
-
-	* gdbtk.c:  Add functions Tcl_Malloc, Tcl_Realloc, and Tcl_Free.
-
-	* gdbtk.tcl (add_breakpoint_frame):  Add more fields.
-	* (create_file_win create_asm_win build_framework):  Create null
-	bindings for meta keys to keep window from dropping down to
-	insertion point when meta is pressed by itself.  New bindings:
-	   Up/Down - Scroll up/down one line at a time
-	   Next/Prior - Scroll up/down one page at a time
-	   Home/End - Warp to current pc/end of file
-	* (build_framework):  Turn on breakpoint menu.
-	* (create_command_window):  Implement tab completion.  Add binding
-	for ^C to stop target.
-
-Fri May 19 06:15:40 1995  Jim Kingdon  <kingdon@deneb.cygnus.com>
-
-	* gdbtk.c: Conditionalize use of stdarg rather than varargs on
- 	ANSI_PROTOTYPES not __STDC__; it must match the definition of
- 	PARAMS.
-
-Thu May 18 15:58:46 1995  J.T. Conklin  <jtc@rtl.cygnus.com>
-
-	* gdbtk.c (gdbtk_query): Use stdarg.h macros when compiling with
- 	an ANSI compiler.
-
-Sat Apr 15 13:52:24 1995  Stan Shebs  <shebs@andros.cygnus.com>
-
-	* gdbtk.c (gdb_disassemble): Read from inferior if connected
-	to a VxWorks target.
-
-Fri Apr 14 10:18:20 1995  Stu Grossman  (grossman@cygnus.com)
-
-	* README.GDBTK:  New file.  Contains the obvious.
-
-Tue Apr 11 11:07:12 1995  Michael Meissner  <meissner@tiktok.cygnus.com>
-
-	* gdbtk.c (gdbtk_init): If SIOCSPGRP is not available, but
-	F_SETOWN is, use that.
-
-Thu Apr  6 17:00:46 1995  Michael Meissner  <meissner@tiktok.cygnus.com>
-
-	* Makefile.in (X11_INCLUDES): Define as empty.
-	(X11_CFLAGS): Define as including $(X11_INCLUDES).
-	(X11_LIB_SWITCHES): Define as empty.
-	(X11_LIBS): Define as -lX11.
-
-	* configure.in (enable_gdbtk): If gdbtk, support the --x-includes
-	and --x-libraries switches, setting the X11_INCLUDES and
-	X11_LIB_SWITCHES respectively.  Instead of using a hardcoded -lX11
-	in ENABLE_CLIBS, use the X11_LIB_SWITCHES and X11_LIBS variables.
-
-	* gdbtk.c (gdbtk_init): If SIOCSPGRP is not available, don't use
-	it.  This means that the stop button doesn't work, but is better
-	than nothing.
-
-Wed Mar 29 17:09:29 1995  Stu Grossman  (grossman@cygnus.com)
-
-	* Makefile.in (gdbtk.o):  Use X11_CFLAGS to provide alternate
-	locations (per-host) for X11 include files.
-	* config/pa/hppahpux.mh (XM_CLIBS):  Add -L/usr/lib/X11R5 to force
-	the use of R5 libs.
-	(X11_CFLAGS):  Add this to indicate the locs
-	of the R5 include files.
-
-Wed Mar  8 16:12:21 1995  Stu Grossman  (grossman@cygnus.com)
-
-	* gdbtk.c (gdb_get_breakpoint_info):  Return error if breakpoint
-	type is not bp_breakpoint.
-
-Tue Feb 14 17:16:41 1995  Stu Grossman  (grossman@cygnus.com)
-
-	* gdbtk.c: Ditto.
-	* gdbtk.c: General cleanups, get rid of unused variables.  Redo
-	handling of stdout/stderr to just return output as the result of
-	the tcl command that caused the output.  Cleanup -Wall stuff.
-	* (breakpoint_notify):  Now returns just action and breakpoint
-	number.
-	* (gdb_get_breakpoint_list):  New routine.  Does the obvious.
-	* (gdb_get_breakpoint_info):  Mostly derived from the old
-	breakpoint_notify, but returns lots more info.
-	* (dsprintf_append_element):  Helper routine, works like printf,
-	but appends a tcl element onto the specified DString.  Good for
-	building up lists as return values.
-	* (gdbtk_enable/disable_breakpoint):  Go away.  Replaced with
-	gdbtk_modify_breakpoint.
-	* (*many routines*):  Use new result protocol.
-	* (call_wrapper):  Make sure that recursive calls don't trash results.
-	* gdbtk.tcl:  New windows, autocmd, and breakpoints.
-	* (gdbtk_tcl_fputs):  Don't use $current_output_win redirection
-	anymore.  It's not needed (in fact, this routine may not be needed
-	anymore).
-	* (gdbtk_tcl_breakpoint):  Change to reflect new breakpoint
-	notification protocol.
-	* (gdbtk_tcl_busy gdbtk_tcl_idle):  Straighten out buttons, remove
-	catches.
-	* (interactive_cmd):  Use this wrapper around button invocations
-	of many commands.  This will catch errors and put the results into
-	the command window.  It also updates all the other windows.
-	* Also, change reliefs of most things to sunken.  This actually
-	looks better.
-	* (create_file_win):  Fix margin binding to allow breakpoints to
-	work again.
-	* (create_asm_win):  Use return value of gdb_disassemble instead
-	of implicit I/O to the command window.	
-	* (create_command_window):  Use new result protocol to get output
-	from commands.
-
-Sun Feb  5 20:32:44 1995  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* gdbtk.c (gdb_disassemble): Deference pointer to function before
-	calling it (pre-ANSI compilers generally require this).
-
-Fri Feb  3 11:19:20 1995  Stu Grossman  (grossman@cygnus.com)
-
-	* gdbtk.c (gdb_disassemble): Get rid of
-	dis_asm_read_memory_hook.  We can now call the disassemblers
-	directly and have no need for this hook anymore.
-
-Mon Jan 30 17:34:24 1995  Stu Grossman  (grossman@cygnus.com)
-
-	* gdbtk.tcl (create_file_win):  Disable old popup menu for source
-	window.
-
-Wed Jan 25 18:23:46 1995  Stu Grossman  (grossman@cygnus.com)
-
-	* gdbtk.c (gdbtk_init):  Prevent segfault when gdbtk.tcl can't be
-	found.
-	* gdbtk.tcl:  Initialize expr_update_list() to prevent errors when
-	popping up expression window for the first time.
-
-Tue Jan 24 12:10:28 1995  Stu Grossman  (grossman@cygnus.com)
-
-	* gdbtk.tcl (create_registers_window):  Work around a radiobutton
-	widget bug to make Options|Natural button work.
-
-	* gdbtk.c (gdb_disassemble):  Fix problem with source+assembly and
-	g++ caused by out-of-order pc's.
-	* gdbtk.tcl (files_command):  Remove duplicate file names.  Also,
-	add scrollbar.
-
-Mon Jan 23 17:21:09 1995  Stu Grossman  (grossman@cygnus.com)
-
-	* gdbtk.tcl:  Take .gdbtkinit if it exists.  Makes gdbtk match the
-	doc!
-
-Thu Jan 12 15:02:40 1995  Stu Grossman  (grossman@cygnus.com)
-
-	* gdbtk.c, gdbtk.tcl:  Update/add copyright.
-	* gdbtk.tcl (build_framework):  Several fixes for filespec widget,
-	including dismiss button, and better error handling.
-	* (create_command_win):  Bind button 2 to retrieve selection.
-
-Wed Jan 11 17:06:55 1995  Stu Grossman  (grossman@cygnus.com)
-
-	* gdbtk.tcl:  Add button to control mixed source disassembly.
-	Use text widgets in expr window.  The give me more control over
-	layout.
-	Add auto-updating of exprs in expression window.
-	Handle expressions out of scope a bit better.
-	Make selected window pop up to the top when invoked via the
-	menubar.
-	Make copyright message have raised relief.
-
-	* gdbtk.c (gdbtk_init):  Improve handling for errors in gdbtk.tcl
-	during startup.
-
-Thu Jan  5 17:38:29 1995  Stu Grossman  (grossman@cygnus.com)
-
-	* gdbtk.c (finish_saving_output):  Don't do anything if not saving
-	output.
-	* (breakpoint_notify):  Don't send null filename to tcl.
-	* (gdb_eval):  New tcl command to eval an expression.
-	* (gdb_disassemble):  New tcl command to do disassembly.  This
-	allows tcl code to choose between exec file and target memeory,
-	and can also do mixed source and assembly.
-	* (gdbtk_init):  Move reading of gdbtk.tcl to the end to make sure
-	that more of the environment is set up.  Also, create link between
-	gdb and tcl vars disassemble{-_}from{-_}exec.
-
-	* gdbtk.tcl:  New expression window support.
-	* Make assembly window be 80 columns wide.
-	* Use new disassembly method.  Add menu items to select
-	disassembly from exec file or target.
-	* Change View menubar item to Options.
-
-	* Get rid of Stack, Breakpoints, Signals, and Variables Windows,
-	since they don't exist yet.
-
-	* Pop up a copyright window on startup.
-
-Wed Jan  4 19:49:10 1995  Stan Shebs  <shebs@andros.cygnus.com>
-
-	* gdbtk.tcl (build_framework): Add standard commands menu, more
-	windows to standard windows menu.
-	(not_implemented_yet): Clarify message.
-
-Fri Dec 30 15:49:00 1994  Stan Shebs  <shebs@andros.cygnus.com>
-
-	* gdbtk.tcl (FSBox): New proc, File Selection Box code from exmh.
-	(not_implemented_yet): New proc.
-	(build_framework): Add various file commands to file menu.
-
-Fri Dec 23 16:18:50 1994  Stu Grossman  (grossman@cygnus.com)
-
-	* gdbtk.c (gdbtk_wait gdbtk_init):  Portability improvements for
-	SIGIO handling.
-
-Mon Dec 19 09:55:47 1994  Stu Grossman  (grossman@cygnus.com)
-
-	* gdbtk.tcl (update_assembly):  Force update to make sure that pc
-	is visible when creating new assembly windows.
-
-Sun Dec 18 23:31:20 1994  Stu Grossman  (grossman@cygnus.com)
-
-	* gdbtk.c (gdbtk_wait gdbtk_init):  Use different method of
-	enabling I/O interrupts for SVR4 (streams).
-	* (start_saving_output save_output get_saved_output
-	finish_saving_output flush_holdbuf gdbtk_flush gdbtk_fputs
-	gdbtk_init):
-	Totally revamp to use TCLs dynamic string functions.  Also, quote
-	all data passed back to TCL to prevent errors with unmatched
-	braces, odd characters, etc...  This fixes several wierd problems
-	with outputting strings containing unmatched braces.
-	* (breakpoint_notify gdb_loc):  Use long hex format to output
-	addresses of breakpoints and PCs.  This fixes some Alpha problems.
-	* (breakpoint_notify):  Add stream arg to call to gdbtk_fputs.
-	* (gdb_listfiles):  Also, go through the symtabs when looking for
-	files.  This makes xcoff work (sort of), but probably breaks
-	something else.
-	* (gdb_stop):  Return TCL_OK instead of nothing.  This fixes odd
-	TCL errors when hitting stop button.
-	* (tk_command):  Don't pass interp->result on to Tcl_{Var}Eval, as
-	that will trash the result.  strdup the result instead and pass
-	that on.  Improve error handling as well.
-
-	* gdbtk.tcl (gdbtk_tcl_flush):  Use global def of
-	current_output_win.  Makes flushing actually work!
-	* (asm_win_name create_asm_win update_assembly):  Bunch of fixes
-	to make assembly windows stop flashing when loading a new file.
-	* (gdbtk_tcl_busy gdbtk_tcl_idle):  Use catch to prevent gdb_cmd
-	errors from losing control.
-	* (create_source_window):  Add source file selection to View menu.
-	* (create_command_window (<Key-Return> binding):  Quote text fed
-	into gdb_cmd to prevent eval errors.
-
-Thu Dec 15 16:40:10 1994  Stu Grossman  (grossman@cygnus.com)
-
-	* gdbtk.c: Improve mechanism for capturing output values.
-	(full_filename): Remove.
-	(gdb_cmd call_wrapper gdbtk_init): Protect all calls from tcl land
-	with call_wrapper.  This prevents longjmps (usually via error())
-	from jumping out of tcl/tk and leaving things in an indeterminate
-	state.
-	(gdbtk_fputs): Differentiate stdout from stderr when passing text
-	into tcl land.
-	* gdbtk.tcl: New view option to disable line numbers.  Put catch
-	around most uses of gdb_cmd.  Add update button to reg config
-	window.  Stop doing immediate updates when selecting registers.
-	Change register view values into checkbuttons.
-
-Mon Dec 12 16:59:29 1994  Stu Grossman  (grossman@cygnus.com)
-
-	* gdbtk.tcl (reg_config_menu create_registers_window
-	recompute_reg_display_list):  Use array instead of individual vars
-	for register display list.
-	* (recompute_reg_display_list update_registers):  Fix bug with not
-	displaying all registers.
-
-Mon Dec 12 12:22:21 1994  Stu Grossman  (grossman@cygnus.com)
-
-	* gdbtk.c:  New tcl commands:  gdb_fetch_registers,
-	gdb_changed_register_list, and gdb_regnames.
-	* gdbtk.tcl:  Use monochrome color model for now.
-	* (delete_breakpoint_tag create_file_win):  Add breakdot support.
-	* (create_file_win create_asm_win update_listing build_framework
-	create_source_window create_command_window):  Re-org window
-	creation to give all windows consistent look and feel.
-	* (update_listing update_asm):  Change pc pointer to '->'.
-	* (registers_command reg_config_menu create_registers_window
-	populate_reg_window update_registers):  Revamp register window.
-	Allow selection of registers to be displayed.  Highlight changed
-	registers.
-
-Mon Nov 28 09:17:20 1994  Stu Grossman  (grossman@cygnus.com)
-
-	* gdbtk.tcl (build_framework):  Fix bug with setting window titles.
-
-	* gdbtk.tcl (build_framework):  Add "Report bug" to help menu.
-
-	* gdbtk.tcl:  Re-arrange windows using new, consistent layout. Clean
-	up lots of code and centralize framework initialization.
-
-Wed Nov 16 15:28:29 1994  Rob Savoye  (rob@cygnus.com)
-
-	* Makefile.in: Fix the test for installing gdbtk.
-
-Mon Nov 14 08:51:29 1994  Stu Grossman  (grossman@cygnus.com)
-
-	* Makefile.in:  Install gdbtk.tcl.
-	* configure.in:  Add ENABLE_GDBTK flag.
-	* gdbtk.c (gdb_sourcelines):  Returns list of source lines
-	containing code.  (gdb_regnames):  Returns list of register names.
-
-Thu Nov  3 14:25:24 1994  Stu Grossman  (grossman@cygnus.com)
-
-	* gdbtk.c (gdb_stop):  Switch to target_stop().
-
-Tue Nov  1 16:41:12 1994  Stu Grossman  (grossman@cygnus.com)
-
-	* Makefile.in:  Use $(objdir)/tcl and $(objdir)/tk if they are
-	available.
-	* configure.in (ENABLE_CLIBS):  Use $(TCL) and $(TK) instead of
-	-ltcl and -ltk.
-	* gdbtk.c:  Get rid of lots of unnecessary #includes.
-	* (gdbtk_init):  Use ConnectionNumber macro instead of referencing
-	Display structure directly.
-	* gdbtk.tcl:  Change exit button to quit button.
-
-Wed Oct 26 15:41:07 1994  Stu Grossman  (grossman@cygnus.com)
-
-	* gdbtk.c: Change sense and name of no_windows variable.  Now
- 	called use_windows, and defaults to off (for compatibility).
-
-Thu Oct 20 17:35:45 1994  Stu Grossman  (grossman@cygnus.com)
-
-	* gdbtk.c (gdb_cmd):  Force GUI into idle mode when errors occur.
-	* (gdb_stop):  New tcl command to stop the target process.
-	* (x_event, gdbtk_wait):  Allow GUI to interrupt gdb out of target
-	waits.
-	* (gdbtk_call_command):  Wrapper around command processing to
-	alert GUI of target state changes.
-	* (gdbtk_init):  Get the fd of X server for doing async
-	notification of X events (via x_event).  Setup new hooks.
-	* gdbtk.tcl:  Add scrollbars to assembly and command windows.
-	* Change window foreground & background colors.
-	* Create margin tag for breakpoints in source and assembly windows.
-	* Add new routines to be invoked when target state changes to/from
-	idle.
-	* Add start of expression window.
-	* Change bindings of mouse button 1 in assembly and source window
-	to just set or clear breakpoints when in the margin tag.
-	* Change shape of register window to be more vertical to better
-	reflect its contents.
-	* Add stop button.
-	* Cleanup some code around command window bindings.
-
-Sat Sep 17 17:05:14 1994  Stu Grossman  (grossman@cygnus.com)
-
-	* gdbtk.tcl:  Let ^U delete lines in the command window.
-
-Fri Sep 16 15:40:34 1994  Stu Grossman  (grossman@cygnus.com)
-
-	* gdbtk.c:  Replace calls to full_filename with symtab_to_filename.  
-	* gdbtk.tcl:  New routine pc_to_line replaces in line code.  New
-	routine decr replaces in line code.
-	* (create_file_win):  Use catch to handle open failures more
-	elegantly.  Also, create special window to display file open
-	failure message.  Move opening of file prior to creation of text
-	widget.
-	* (create_asm_win):  Add PC as argument.  We now base disassembly
-	on PC instead of function name, since function names can be
-	ambiguous (usually seen with shared libs).  Also, use catch to
-	simplify code where we don't care about failures.
-
-Wed Sep 14 00:55:26 1994  Stu Grossman  (grossman@cygnus.com)
-
-	* gdbtk.tcl:  Add ref counts to breakpoint tags.
-	* Put quotes around function name in disassemble command to better
-	handle assembler names containing `.'.
-	* Make pclist element 0 be filler to avoid off-by-one problem with
-	line numbers.
-	* Set names of top-level windows.
-	* Add register display window.
-	* Add PC to label of assembly window.
-
-Tue Sep 13 08:59:04 1994  Stu Grossman  (grossman@cygnus.com)
-
-	* gdbtk.c (gdbtk_flush gdbtk_fputs):  Buffer up output to make
-	disassembly more efficient.
-	* (breakpoint_notify):  Include pc in gdbtk_tcl_breakpoint
-	callback.
-	* (gdb_loc):  Include pc in return value.  Also, return function
-	name if arg was specified.
-	* (gdb_cmd_stub):  Call gdb_flush to drain internal GDB buffers
-	after command completes.
-	* (gdbtk_init):  Improve error handling.
-
-	* gdbtk.tcl:  Add lots of comments.  Clean up code.
-	* (gdbtk_tcl_fputs):  Make output window redirectable.
-	* Add assembly window, and breapoint support.
-	* Make button 1 in margin toggle breakpoints.
-	* Use stippling to indicate breakpoint disabling.
-
-Fri Sep  2 19:11:40 1994  Stu Grossman  (grossman@cygnus.com)
-
-	* configure.in: Don't symlink to gdbtk.tcl if it's already there.
-
-Thu Jul 28 14:37:36 1994  Stu Grossman  (grossman@cygnus.com)
-
-	Support for TK GUI.
-	* Makefile.in:  Add rule for gdbtk.o.
-	* configure.in:  Add support for --enable-gdbtk.
-	* gdbtk.c:  New file.  Contains support routines for TK interface.
-	* gdbtk.tcl:  New file.  Implements GUI policy.
-
-
-Local Variables:
-mode: change-log
-left-margin: 8
-fill-column: 74
-version-control: never
-End:
diff --git a/gdb/gdbtk/generic/ChangeLog-2000 b/gdb/gdbtk/generic/ChangeLog-2000
deleted file mode 100644
index 51993bdee1a..00000000000
--- a/gdb/gdbtk/generic/ChangeLog-2000
+++ /dev/null
@@ -1,211 +0,0 @@
-2000-11-29  Tom Tromey  <tromey@cygnus.com>
-
-	* gdbtk-cmds.c (Gdbtk_Init): Create gdb_current_directory,
-	gdb_inferior_args, and gdb_source_path variables.
-
-2000-11-29  Tom Tromey  <tromey@cygnus.com>
-
-	* gdbtk-cmds.c (call_wrapper): Don't reset result if wrapped
-	command returned error.
-
-2000-11-28  Tom Tromey  <tromey@cygnus.com>
-
-	* gdbtk-cmds.c (gdb_clear_file): Use Tcl_WrongNumArgs.
-	(gdb_confirm_quit): Likewise.
-	(gdb_force_quit): Likewise.
-	(gdb_eval): Likewise.
-	(gdb_immediate_command): Likewise.
-	(gdb_get_vars_command): Likewise.
-	(gdb_get_line_command): Likewise.
-	(gdb_get_file_command): Likewise.
-	(gdb_get_function_command): Likewise.
-	(gdb_cmd): Likewise.  Also, don't allow more than 2 arguments.
-	(gdb_listfiles): Corrected usage of Tcl_WrongNumArgs.
-	(gdb_listfuncs): Use Tcl_WrongNumArgs.  Return error.
-	(gdb_fetch_registers): Likewise.
-	(gdb_tracepoint_exists_command): Use Tcl_WrongNumArgs.
-	(gdb_get_tracepoint_info): Likewise.
-	(gdb_get_trace_frame_num): Likewise.
-	(gdb_actions_command): Likewise.
-	(gdb_disassemble): Likewise.  Also, return error.
-	(gdb_get_breakpoint_list): Likewise.
-	(gdb_path_conv): Likewise.
-	(gdb_load_disassembly): Use Tcl_WrongNumArgs.
-	(gdb_loc): Likewise.
-	(gdb_set_bp): Likewise.
-	(gdb_set_bp_addr): Likewise.
-	(gdb_get_breakpoint_info): Likewise.
-
-2000-10-23  Fernando Nasser  <fnasser@redhat.com>
-
-	From 2000-10-19  Steven Johnson  <sbjohnson@ozemail.com.au>
-        Note: The original patch used asprintf/vasprintf.  I changed it to
-	use the new xasprintf/xvasprintf gdb functions.
-        * gdbtk.c (TclDebug, gdbtk_init): Replaced the vast majority of
-	sprintf/vsprintf calls with asprintf and vasprintf respectively.
-	Should prevent any possible buffer overruns possible with
-	fixed size sprintf buffers. Specifically fixes a problem with long
-	filenames and clearing breakpoints overflowing their buffers when
-	using sprintf, causing a segfault. Generically should also prevent
-	any other similar problems from occuring.
-        * gdbtk-cmds.c (sprintf_append_element_to_obj, get_pc_register,
-	gdb_get_tracepoint_info, gdb_load_disassembly, gdbtk_load_source,
-	gdbtk_load_asm, gdb_set_bp, gdb_set_bp_addr, gdb_get_breakpoint_info,
-	gdb_selected_frame, gdb_selected_block, gdb_get_blocks): Ditto.
-        * gdbtk-hooks.c (gdbtk_warning, gdbtk_ignorable_warning,
-	gdbtk_readline_begin, gdbtk_set_hook, breakpoint_notify,
-	gdbtk_query, tracepoint_notify, gdbtk_error_begin,
-	gdbtk_annotate_signal): Ditto.
-
-2000-10-23  Fernando Nasser  <fnasser@totem.to.cygnus.com>
-
-	* gdbtk-hooks.c (x_event): Only process events if the target is
-	running.
-
-2000-10-23  Fernando Nasser  <fnasser@totem.to.cygnus.com>
-
-	* gdbtk-variable.c: Removed. Obsolete file.
-
-2000-10-13  Fernando Nasser  <fnasser@totem.to.cygnus.com>
-
-	* gdbtk.c (target_is_native): The "multi-thread" target is native.
-
-2000-09-15  Fernando Nasser  <fnasser@totem.to.cygnus.com>
-
-	* gdbtk-varobj.c (variable_value): Send back the error text issued
-	by gdb so it can be displayed in a pop-up box.
-
-2000-07-25  Elena Zannoni  <ezannoni@kwikemart.cygnus.com>
-
-        * gdbtk-cmds.c (map_arg_registers): Set numregs to include the
-        pseudo regs as well.
-
-2000-07-10  Kevin Buettner  <kevinb@redhat.com>
-
-	* gdbtk-cmds.c, gdbtk-hooks.c, gdbtk-variable.c: Eliminate use
-	of PARAMS in function pointer declarations.
-
-2000-07-02  Kevin Buettner  <kevinb@redhat.com>
-
-	* gdbtk-cmds.c, gdbtk-hooks.c, gdbtk-variable.c,
-	gdbtk-varobj.c, gdbtk-wrapper.c, gdbtk-wrapper.h, gdbtk.c,
-	gdbtk.h: Eliminate use of PARAMS from declarations in these
-	files.
-
-2000-06-08  Fernando Nasser  <fnasser@cygnus.com>
-
-	* gdbtk-cmds.c (get_register):  Allow editing of typed registers if
-	the type is a union with the first tag equal to the register name.
-
-Thu Jun  8 17:59:01 2000  Andrew Cagney  <cagney@b1.cygnus.com>
-
-	(gdb_load_info): Use make_cleanup_bfd_close.
-	(gdb_search): Use make_cleanup_free_search_symbols.
-	* gdbtk.c (cleanup_init): Change signature to match make_cleanups.
-	(gdbtk_init): Discard make_cleanup_func cast.
-	* gdbtk-cmds.c (gdb_eval): Ditto.
-
-2000-06-06  Elena Zannoni  <ezannoni@kwikemart.cygnus.com>
-
-	* gdbtk.c: Remove CYGWIN32 conditional around timer machinery.
-  	Cygwin can handle timers fine now.	
-
-2000-04-17  Jonathan Larmour  <jlarmour@redhat.co.uk>
-
-	* ChangeLog-gdbtk: Renamed to ChangeLog
-	* ChangeLog: New file
-	* gdbtk-cmds.c, gdbtk-hooks.c, gdbtk-variable.c, gdbtk-varobj.c,
-	gdbtk-wrapper.h, gdbtk-wrapper.c, gdbtk.h, gdbtk.c: No need for
-	changelog-default-name hint for Emacs now
-
-2000-04-14  Jonathan Larmour  <jlarmour@redhat.co.uk>
-
-	* gdbtk.c (gdbtk_init): For now, reset gdb_stdtarg to gdb_stdout
-	when using gdbtk.
-
-2000-04-01  Jim Blandy  <jimb@redhat.com>
-
-	* gdbtk-hooks.c (gdbtk_restore_result_ptr): New function.
-	* gdbtk.h (gdbtk_restore_result_ptr): Declare it.
-	* gdbtk-cmds.c (gdbtk_load_asm): Use it to restore the old value
-	of result_ptr, in case we get errors while disassembling things.
-
-2000-03-28  Jim Blandy  <jimb@redhat.com>
-
-	Handle the fact that there are holes in the register numbering.
-	* gdbtk-cmds.c (gdb_regnames): If given the -numbers option,
-	return the register numbers along with their names.
- 	(get_register_name): Record both the register name and number, if
- 	requested.
-
-2000-03-13  James Ingham  <jingham@leda.cygnus.com>
-
-	* gdbtk-varobj.c (variable_create): Pass the correct
-	"how_specified" flag to the varobj_create routine.
-
-2000-02-29  James Ingham  <jingham@leda.cygnus.com>
-
-	* gdbtk-cmds.c (gdb_disassemble_driver): The to_shortname for
-	Linux is "linuxthreads", not "linux-threads", so we have to change 
-	the heuristic to account for this.  This fixes a crash when trying 
-	to disassemble from shared libraries.
-
-2000-02-23  Keith R Seitz  <kseitz@nwlink.com>
-
-	* gdbtk-wrapper.h: Add declarations for GDB_get_prev_frame, GDB_get_next_frame,
-	GDB_find_relative_frame, GDB_get_current_frame.
-	* gdbtk-wrapper.c (GDB_get_prev_frame, wrap_get_prev_frame): New functions.
-	(GDB_get_next_frame, wrap_get_next_frame): New functions.
-	(GDB_find_relative_frame, wrap_find_relative_frame): New functions.
-	(GDB_get_current_frame, wrap_get_current_frame): New functions.
-
-	* gdbtk-hooks.c (gdbtk_add_hooks): Use "specify_exec_file_hook" so
-	that our hook is added to the list of hooks run instead of overwriting
-	all other hooks.
-
-	* gdbtk-cmds.c (gdb_stack): Wrap all calls to internal functions and
-	deal with errors more gracefully.
-
-Wed Feb 23 13:01:36 2000  Andrew Cagney  <cagney@b1.cygnus.com>
-
-	* gdbtk-cmds.c (gdbtk_dis_asm_read_memory): Change LEN to unsigned
- 	long.  Match ../include/dis-asm.h change.
-
-Fri Feb  4 23:19:03 2000  Andrew Cagney  <cagney@b1.cygnus.com>
-
-	* gdbtk.c (gdbtk_init): Update default path to tcl code - now
- 	gdbtk/library.
-
-Fri Feb  4 23:19:03 2000  Andrew Cagney  <cagney@b1.cygnus.com>
-
-	* ChangeLog-gdbtk, gdbtk-cmds.c, gdbtk-hooks.c, gdbtk-variable.c,
- 	gdbtk-varobj.c, gdbtk-wrapper.c, gdbtk-wrapper.h, gdbtk.c,
- 	gdbtk.h: Moved here from the top level GDB directory.
-	
-Tue Feb  1 00:17:12 2000  Andrew Cagney  <cagney@b1.cygnus.com>
-
-	* gdbtk-hooks.c, gdbtk-variable.c, gdbtk-wrapper.c,
- 	gdbtk-wrapper.h, gdbtk.h: Update to reflect rename of gdb-file /
- 	GDB_FILE to ui-file / ``struct ui_file''.
-
-2000-01-31  Keith Seitz  <kseitz@nwlink.com>
-
-        * gdbtk-cmds.c (gdb_disassemble_driver) If using multi-arch, set the
-        architecture in the disassembly info.
-
-Mon Jan 31 18:32:06 2000  Andrew Cagney  <cagney@b1.cygnus.com>
-
-	* gdbtk-variable.c, gdbtk-cmds.c, gdbtk.c: Include "tui/tui-file.h"
-
-Mon Jan  3 01:09:24 2000  Andrew Cagney  <cagney@b1.cygnus.com>
-
-	* gdbtk-cmds.c (gdb_get_mem): Use builtin_type_int32 et.al. to
- 	force the word size to 32 bits.
-
-
-Local Variables:
-mode: change-log
-left-margin: 8
-fill-column: 74
-version-control: never
-End:
diff --git a/gdb/gdbtk/generic/gdbtk-bp.c b/gdb/gdbtk/generic/gdbtk-bp.c
deleted file mode 100644
index a40a21997c3..00000000000
--- a/gdb/gdbtk/generic/gdbtk-bp.c
+++ /dev/null
@@ -1,992 +0,0 @@
-/* Tcl/Tk command definitions for Insight - Breakpoints.
-   Copyright 2001, 2002 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.  */
-
-#include "defs.h"
-#include "symtab.h"
-#include "symfile.h"
-#include "linespec.h"
-#include "breakpoint.h"
-#include "tracepoint.h"
-#include "gdb_string.h"
-#include <tcl.h>
-#include "gdbtk.h"
-#include "gdbtk-cmds.h"
-
-/* From breakpoint.c */
-extern struct breakpoint *breakpoint_chain;
-
-/* From gdbtk-hooks.c */
-extern void report_error (void);
-
-/* These two lookup tables are used to translate the type & disposition fields
-   of the breakpoint structure (respectively) into something gdbtk understands.
-   They are also used in gdbtk-hooks.c */
-
-char *bptypes[] =
-  {"none", "breakpoint", "hw breakpoint", "until",
-   "finish", "watchpoint", "hw watchpoint",
-   "read watchpoint", "acc watchpoint",
-   "longjmp", "longjmp resume", "step resume",
-   "sigtramp", "watchpoint scope",
-   "call dummy", "shlib events", "catch load",
-   "catch unload", "catch fork", "catch vfork",
-   "catch exec", "catch catch", "catch throw"
-  };
-char *bpdisp[] =
-  {"delete", "delstop", "disable", "donttouch"};
-
-/* Is this breakpoint interesting to a user interface? */
-#define BREAKPOINT_IS_INTERESTING(bp) \
-((bp)->type == bp_breakpoint             \
- || (bp)->type == bp_hardware_breakpoint \
- || (bp)->type == bp_watchpoint          \
- || (bp)->type == bp_hardware_watchpoint \
- || (bp)->type == bp_read_watchpoint     \
- || (bp)->type == bp_access_watchpoint)
-
-/* Is this breakpoint a watchpoint?  */
-#define BREAKPOINT_IS_WATCHPOINT(bp)					      \
-((bp)->type == bp_watchpoint						      \
- || (bp)->type == bp_hardware_watchpoint				      \
- || (bp)->type == bp_read_watchpoint					      \
- || (bp)->type == bp_access_watchpoint)
-
-/*
- * These are routines we need from breakpoint.c.
- * at some point make these static in breakpoint.c and move GUI code there
- */
-
-extern struct breakpoint *set_raw_breakpoint (struct symtab_and_line sal,
-					      enum bptype bp_type);
-extern void set_breakpoint_count (int);
-extern int breakpoint_count;
-
-/* Breakpoint/Tracepoint lists. Unfortunately, gdb forces us to
-   keep a list of breakpoints, too. Why couldn't it be done like
-   treacepoints? */
-#define DEFAULT_LIST_SIZE 32
-static struct breakpoint **breakpoint_list;
-static int breakpoint_list_size = DEFAULT_LIST_SIZE;
-
-/*
- * Forward declarations
- */
-
-/* Breakpoint-related functions */
-static int gdb_find_bp_at_addr (ClientData, Tcl_Interp *, int,
-				Tcl_Obj * CONST objv[]);
-static int gdb_find_bp_at_line (ClientData, Tcl_Interp *, int,
-				Tcl_Obj * CONST objv[]);
-static int gdb_get_breakpoint_info (ClientData, Tcl_Interp *, int,
-				    Tcl_Obj * CONST[]);
-static int gdb_get_breakpoint_list (ClientData, Tcl_Interp *, int,
-				    Tcl_Obj * CONST[]);
-static int gdb_set_bp (ClientData, Tcl_Interp *, int, Tcl_Obj * CONST objv[]);
-static int gdb_set_bp_addr (ClientData, Tcl_Interp *, int,
-			    Tcl_Obj * CONST objv[]);
-
-/* Tracepoint-related functions */
-static int gdb_actions_command (ClientData, Tcl_Interp *, int,
-				Tcl_Obj * CONST objv[]);
-static int gdb_get_trace_frame_num (ClientData, Tcl_Interp *, int,
-				    Tcl_Obj * CONST objv[]);
-static int gdb_get_tracepoint_info (ClientData, Tcl_Interp *, int,
-				    Tcl_Obj * CONST objv[]);
-static int gdb_get_tracepoint_list (ClientData, Tcl_Interp *, int,
-				    Tcl_Obj * CONST objv[]);
-static int gdb_trace_status (ClientData, Tcl_Interp *, int,
-			     Tcl_Obj * CONST[]);
-static int gdb_tracepoint_exists_command (ClientData, Tcl_Interp *,
-					  int, Tcl_Obj * CONST objv[]);
-static Tcl_Obj *get_breakpoint_commands (struct command_line *cmd);
-
-static int tracepoint_exists (char *args);
-
-/* Breakpoint/tracepoint events and related functions */
-
-void gdbtk_create_breakpoint (int);
-void gdbtk_delete_breakpoint (int);
-void gdbtk_modify_breakpoint (int);
-void gdbtk_create_tracepoint (int);
-void gdbtk_delete_tracepoint (int);
-void gdbtk_modify_tracepoint (int);
-static void breakpoint_notify (int, const char *);
-static void tracepoint_notify (int, const char *);
-
-int
-Gdbtk_Breakpoint_Init (Tcl_Interp *interp)
-{
-  /* Breakpoint commands */
-  Tcl_CreateObjCommand (interp, "gdb_find_bp_at_addr", gdbtk_call_wrapper,
-			gdb_find_bp_at_addr, NULL);
-  Tcl_CreateObjCommand (interp, "gdb_find_bp_at_line", gdbtk_call_wrapper,
-			gdb_find_bp_at_line, NULL);
-  Tcl_CreateObjCommand (interp, "gdb_get_breakpoint_info", gdbtk_call_wrapper,
-			gdb_get_breakpoint_info, NULL);
-  Tcl_CreateObjCommand (interp, "gdb_get_breakpoint_list", gdbtk_call_wrapper,
-			gdb_get_breakpoint_list, NULL);
-  Tcl_CreateObjCommand (interp, "gdb_set_bp", gdbtk_call_wrapper, gdb_set_bp, NULL);
-  Tcl_CreateObjCommand (interp, "gdb_set_bp_addr", gdbtk_call_wrapper,
-			gdb_set_bp_addr, NULL);
-
-  /* Tracepoint commands */
-  Tcl_CreateObjCommand (interp, "gdb_actions",
-			gdbtk_call_wrapper, gdb_actions_command, NULL);
-  Tcl_CreateObjCommand (interp, "gdb_get_trace_frame_num",
-			gdbtk_call_wrapper, gdb_get_trace_frame_num, NULL);
-  Tcl_CreateObjCommand (interp, "gdb_get_tracepoint_info",
-			gdbtk_call_wrapper, gdb_get_tracepoint_info, NULL);
-  Tcl_CreateObjCommand (interp, "gdb_get_tracepoint_list",
-			gdbtk_call_wrapper, gdb_get_tracepoint_list, NULL);
-  Tcl_CreateObjCommand (interp, "gdb_is_tracing",
-			gdbtk_call_wrapper, gdb_trace_status,	NULL);
-  Tcl_CreateObjCommand (interp, "gdb_tracepoint_exists",
-			gdbtk_call_wrapper, gdb_tracepoint_exists_command, NULL);
-
-  /* Initialize our tables of BPs. */
-  breakpoint_list = (struct breakpoint **) xmalloc (breakpoint_list_size * sizeof (struct breakpoint *));
-  memset (breakpoint_list, 0, breakpoint_list_size * sizeof (struct breakpoint *));
-
-  return TCL_OK;
-}
-
-/*
- *  This section contains commands for manipulation of breakpoints.
- */
-
-/* set a breakpoint by source file and line number
-   flags are as follows:
-   least significant 2 bits are disposition, rest is 
-   type (normally 0).
-
-   enum bptype {
-   bp_breakpoint,                Normal breakpoint 
-   bp_hardware_breakpoint,      Hardware assisted breakpoint
-   }
-
-   Disposition of breakpoint.  Ie: what to do after hitting it.
-   enum bpdisp {
-   del,                         Delete it
-   del_at_next_stop,            Delete at next stop, whether hit or not
-   disable,                     Disable it 
-   donttouch                    Leave it alone 
-   };
-*/
-
-
-/* This implements the tcl command "gdb_find_bp_at_addr"
-
-* Tcl Arguments:
-*    addr:     CORE_ADDR
-* Tcl Result:
-*    It returns a list of breakpoint numbers
-*/
-static int
-gdb_find_bp_at_addr (ClientData clientData, Tcl_Interp *interp,
-		     int objc, Tcl_Obj *CONST objv[])
-{
-  int i;
-  CORE_ADDR addr;
-  Tcl_WideInt waddr;
-
-  if (objc != 2)
-    {
-      Tcl_WrongNumArgs (interp, 1, objv, "address");
-      return TCL_ERROR;
-    }
-  
-  if (Tcl_GetWideIntFromObj (interp, objv[1], &waddr) != TCL_OK)
-    return TCL_ERROR;
-  addr = waddr;
-
-  Tcl_SetListObj (result_ptr->obj_ptr, 0, NULL);
-  for (i = 0; i < breakpoint_list_size; i++)
-    {
-      if (breakpoint_list[i] != NULL
-	  && breakpoint_list[i]->address == addr)
-	Tcl_ListObjAppendElement (NULL, result_ptr->obj_ptr,
-				  Tcl_NewIntObj (i));
-    }
-
-  return TCL_OK;
-}
-
-/* This implements the tcl command "gdb_find_bp_at_line"
-
-* Tcl Arguments:
-*    filename: the file in which to find the breakpoint
-*    line:     the line number for the breakpoint
-* Tcl Result:
-*    It returns a list of breakpoint numbers
-*/
-static int
-gdb_find_bp_at_line (ClientData clientData, Tcl_Interp *interp,
-		     int objc, Tcl_Obj *CONST objv[])
-
-{
-  struct symtab *s;
-  int i, line;
-
-  if (objc != 3)
-    {
-      Tcl_WrongNumArgs (interp, 1, objv, "filename line");
-      return TCL_ERROR;
-    }
-
-  s = lookup_symtab (Tcl_GetStringFromObj (objv[1], NULL));
-  if (s == NULL)
-    return TCL_ERROR;
-
-  if (Tcl_GetIntFromObj (interp, objv[2], &line) == TCL_ERROR)
-    {
-      result_ptr->flags = GDBTK_IN_TCL_RESULT;
-      return TCL_ERROR;
-    }
-
-  Tcl_SetListObj (result_ptr->obj_ptr, 0, NULL);
-  for (i = 0; i < breakpoint_list_size; i++)
-    if (breakpoint_list[i] != NULL
-	&& breakpoint_list[i]->line_number == line
-	&& !strcmp (breakpoint_list[i]->source_file, s->filename))
-      Tcl_ListObjAppendElement (NULL, result_ptr->obj_ptr,
-				Tcl_NewIntObj (i));
-
-  return TCL_OK;
-}
-
-/* This implements the tcl command gdb_get_breakpoint_info
- *
- * Tcl Arguments:
- *   breakpoint_number
- * Tcl Result:
- *   A list with {file, function, line_number, address, type, enabled?,
- *                disposition, ignore_count, {list_of_commands},
- *                condition, thread, hit_count user_specification}
- */
-static int
-gdb_get_breakpoint_info (ClientData clientData, Tcl_Interp *interp, int objc,
-			 Tcl_Obj *CONST objv[])
-{
-  struct symtab_and_line sal;
-  int bpnum;
-  struct breakpoint *b;
-  char *funcname, *filename;
-
-  Tcl_Obj *new_obj;
-
-  if (objc != 2)
-    {
-      Tcl_WrongNumArgs (interp, 1, objv, "breakpoint");
-      return TCL_ERROR;
-    }
-
-  if (Tcl_GetIntFromObj (NULL, objv[1], &bpnum) != TCL_OK)
-    {
-      result_ptr->flags = GDBTK_IN_TCL_RESULT;
-      return TCL_ERROR;
-    }
-
-  b = (bpnum <= breakpoint_list_size ? breakpoint_list[bpnum] : NULL);
-  if (!b || b->type != bp_breakpoint)
-    {
-      gdbtk_set_result (interp, "Breakpoint #%d does not exist.", bpnum);
-      return TCL_ERROR;
-    }
-
-  sal = find_pc_line (b->address, 0);
-
-  filename = symtab_to_filename (sal.symtab);
-  if (filename == NULL)
-    filename = "";
-
-  Tcl_SetListObj (result_ptr->obj_ptr, 0, NULL);
-  Tcl_ListObjAppendElement (NULL, result_ptr->obj_ptr,
-			    Tcl_NewStringObj (filename, -1));
-
-  funcname = pc_function_name (b->address);
-  new_obj = Tcl_NewStringObj (funcname, -1);
-  Tcl_ListObjAppendElement (NULL, result_ptr->obj_ptr, new_obj);
-
-  Tcl_ListObjAppendElement (NULL, result_ptr->obj_ptr,
-			    Tcl_NewIntObj (b->line_number));
-  Tcl_ListObjAppendElement (NULL, result_ptr->obj_ptr,
-			    Tcl_NewStringObj (core_addr_to_string (b->address), -1));
-  Tcl_ListObjAppendElement (NULL, result_ptr->obj_ptr,
-			    Tcl_NewStringObj (bptypes[b->type], -1));
-  Tcl_ListObjAppendElement (NULL, result_ptr->obj_ptr,
-			    Tcl_NewBooleanObj (b->enable_state == bp_enabled));
-  Tcl_ListObjAppendElement (NULL, result_ptr->obj_ptr,
-			    Tcl_NewStringObj (bpdisp[b->disposition], -1));
-  Tcl_ListObjAppendElement (NULL, result_ptr->obj_ptr,
-			    Tcl_NewIntObj (b->ignore_count));
-
-  Tcl_ListObjAppendElement (NULL, result_ptr->obj_ptr,
-			    get_breakpoint_commands (b->commands));
-
-  Tcl_ListObjAppendElement (NULL, result_ptr->obj_ptr,
-			    Tcl_NewStringObj (b->cond_string, -1));
-
-  Tcl_ListObjAppendElement (NULL, result_ptr->obj_ptr,
-			    Tcl_NewIntObj (b->thread));
-  Tcl_ListObjAppendElement (NULL, result_ptr->obj_ptr,
-			    Tcl_NewIntObj (b->hit_count));
-
-  Tcl_ListObjAppendElement (NULL, result_ptr->obj_ptr,
-			    Tcl_NewStringObj (BREAKPOINT_IS_WATCHPOINT (b)
-					      ? b->exp_string
-					      : b->addr_string, -1));
-
-  return TCL_OK;
-}
-
-/* Helper function for gdb_get_breakpoint_info, this function is
-   responsible for figuring out what to type at the "commands" command
-   in gdb's cli in order to get at the same command list passed here. */
-
-static Tcl_Obj *
-get_breakpoint_commands (struct command_line *cmd)
-{
-  Tcl_Obj *obj, *tmp;
-
-  obj = Tcl_NewObj ();
-  while (cmd != NULL)
-    {
-      switch (cmd->control_type)
-	{
-	case simple_control:
-	  /* A simple command. Just append it. */
-	  Tcl_ListObjAppendElement (NULL, obj,
-				    Tcl_NewStringObj (cmd->line, -1));
-	  break;
-
-	case break_control:
-	  /* A loop_break */
-	  Tcl_ListObjAppendElement (NULL, obj,
-				    Tcl_NewStringObj ("loop_break", -1));
-	  break;
-
-	case continue_control:
-	  /* A loop_continue */
-	  Tcl_ListObjAppendElement (NULL, obj,
-				    Tcl_NewStringObj ("loop_continue", -1));
-	  break;
-
-	case while_control:
-	  /* A while loop. Must append "end" to the end of it. */
-	  tmp = Tcl_NewStringObj ("while ", -1);
-	  Tcl_AppendToObj (tmp, cmd->line, -1);
-	  Tcl_ListObjAppendElement (NULL, obj, tmp);
-	  Tcl_ListObjAppendList (NULL, obj,
-				 get_breakpoint_commands (*cmd->body_list));
-	  Tcl_ListObjAppendElement (NULL, obj,
-				    Tcl_NewStringObj ("end", -1));
-	  break;
-
-	case if_control:
-	  /* An if statement. cmd->body_list[0] is the true part,
-	     cmd->body_list[1] contains the "else" (false) part. */
-	  tmp = Tcl_NewStringObj ("if ", -1);
-	  Tcl_AppendToObj (tmp, cmd->line, -1);
-	  Tcl_ListObjAppendElement (NULL, obj, tmp);
-	  Tcl_ListObjAppendList (NULL, obj,
-				 get_breakpoint_commands (cmd->body_list[0]));
-	  if (cmd->body_count == 2)
-	    {
-	      Tcl_ListObjAppendElement (NULL, obj,
-					Tcl_NewStringObj ("else", -1));
-	      Tcl_ListObjAppendList (NULL, obj,
-				     get_breakpoint_commands(cmd->body_list[1]));
-	    }
-	  Tcl_ListObjAppendElement (NULL, obj,
-				    Tcl_NewStringObj ("end", -1));
-	  break;
-
-	case invalid_control:
-	  /* Something invalid. Just skip it. */
-	  break;
-	}
-
-      cmd = cmd->next;
-    }
-
-  return obj;
-}
-
-/* This implements the tcl command gdb_get_breakpoint_list
- * It builds up a list of the current breakpoints.
- *
- * Tcl Arguments:
- *    None.
- * Tcl Result:
- *    A list of breakpoint numbers.
- */
-static int
-gdb_get_breakpoint_list (ClientData clientData, Tcl_Interp *interp,
-			 int objc, Tcl_Obj *CONST objv[])
-{
-  int i;
-  Tcl_Obj *new_obj;
-
-  if (objc != 1)
-    {
-      Tcl_WrongNumArgs (interp, 1, objv, NULL);
-      return TCL_ERROR;
-    }
-
-  for (i = 0; i < breakpoint_list_size; i++)
-    {
-      if (breakpoint_list[i] != NULL
-	  && breakpoint_list[i]->type == bp_breakpoint)
-	{
-	  new_obj = Tcl_NewIntObj (i);
-	  Tcl_ListObjAppendElement (NULL, result_ptr->obj_ptr, new_obj);
-	}
-    }
-
-  return TCL_OK;
-}
-
-/* This implements the tcl command "gdb_set_bp"
- * It sets breakpoints, and notifies the GUI.
- *
- * Tcl Arguments:
- *    filename: the file in which to set the breakpoint
- *    line:     the line number for the breakpoint
- *    type:     the type of the breakpoint
- *    thread:   optional thread number
- * Tcl Result:
- *    The return value of the call to gdbtk_tcl_breakpoint.
- */
-static int
-gdb_set_bp (ClientData clientData, Tcl_Interp *interp,
-	    int objc, Tcl_Obj *CONST objv[])
-{
-  struct symtab_and_line sal;
-  int line, thread = -1;
-  struct breakpoint *b;
-  char *buf, *typestr;
-  enum bpdisp disp;
-
-  if (objc != 4 && objc != 5)
-    {
-      Tcl_WrongNumArgs (interp, 1, objv, "filename line type ?thread?");
-      return TCL_ERROR;
-    }
-
-  sal.symtab = lookup_symtab (Tcl_GetStringFromObj (objv[1], NULL));
-  if (sal.symtab == NULL)
-    return TCL_ERROR;
-
-  if (Tcl_GetIntFromObj (interp, objv[2], &line) == TCL_ERROR)
-    {
-      result_ptr->flags = GDBTK_IN_TCL_RESULT;
-      return TCL_ERROR;
-    }
-
-  typestr = Tcl_GetStringFromObj (objv[3], NULL);
-  if (strncmp (typestr, "temp", 4) == 0)
-    disp = disp_del;
-  else if (strncmp (typestr, "normal", 6) == 0)
-    disp = disp_donttouch;
-  else
-    {
-      gdbtk_set_result (interp, "type must be \"temp\" or \"normal\"");
-      return TCL_ERROR;
-    }
-
-  if (objc == 5)
-    {
-      if (Tcl_GetIntFromObj (interp, objv[4], &thread) == TCL_ERROR)
-	{
-	  result_ptr->flags = GDBTK_IN_TCL_RESULT;
-	  return TCL_ERROR;
-	}
-    }
-
-  sal.line = line;
-  if (!find_line_pc (sal.symtab, sal.line, &sal.pc))
-    return TCL_ERROR;
-
-  sal.section = find_pc_overlay (sal.pc);
-  b = set_raw_breakpoint (sal, bp_breakpoint);
-  set_breakpoint_count (breakpoint_count + 1);
-  b->number = breakpoint_count;
-  b->disposition = disp;
-  b->thread = thread;
-
-  /* FIXME: this won't work for duplicate basenames! */
-  xasprintf (&buf, "%s:%d", basename (Tcl_GetStringFromObj (objv[1], NULL)),
-	     line);
-  b->addr_string = xstrdup (buf);
-  free(buf);
-
-  /* now send notification command back to GUI */
-  breakpoint_create_event (b->number);
-  return TCL_OK;
-}
-
-/* This implements the tcl command "gdb_set_bp_addr"
- * It sets breakpoints, and notifies the GUI.
- *
- * Tcl Arguments:
- *    addr:     the CORE_ADDR at which to set the breakpoint
- *    type:     the type of the breakpoint
- *    thread:   optional thread number
- * Tcl Result:
- *    The return value of the call to gdbtk_tcl_breakpoint.
- */
-static int
-gdb_set_bp_addr (ClientData clientData, Tcl_Interp *interp, int objc,
-		 Tcl_Obj *CONST objv[])
-     
-{
-  struct symtab_and_line sal;
-  int thread = -1;
-  CORE_ADDR addr;
-  Tcl_WideInt waddr;
-  struct breakpoint *b;
-  char *saddr, *typestr;
-  enum bpdisp disp;
-
-  if (objc != 3 && objc != 4)
-    {
-      Tcl_WrongNumArgs (interp, 1, objv, "address type ?thread?");
-      return TCL_ERROR;
-    }
-
-  if (Tcl_GetWideIntFromObj (interp, objv[1], &waddr) != TCL_OK)
-    return TCL_ERROR;
-  addr = waddr;
-  saddr = Tcl_GetStringFromObj (objv[1], NULL);
-
-  typestr = Tcl_GetStringFromObj (objv[2], NULL);
-  if (strncmp (typestr, "temp", 4) == 0)
-    disp = disp_del;
-  else if (strncmp (typestr, "normal", 6) == 0)
-    disp = disp_donttouch;
-  else
-    {
-      gdbtk_set_result (interp, "type must be \"temp\" or \"normal\"");
-      return TCL_ERROR;
-    }
-
-  if (objc == 4)
-    {
-      if (Tcl_GetIntFromObj (interp, objv[3], &thread) == TCL_ERROR)
-	{
-	  result_ptr->flags = GDBTK_IN_TCL_RESULT;
-	  return TCL_ERROR;
-	}
-    }
-
-  sal = find_pc_line (addr, 0);
-  sal.pc = addr;
-  b = set_raw_breakpoint (sal, bp_breakpoint);
-  set_breakpoint_count (breakpoint_count + 1);
-  b->number = breakpoint_count;
-  b->disposition = disp;
-  b->thread = thread;
-  b->addr_string = xstrdup (saddr);
-
-  /* now send notification command back to GUI */
-  breakpoint_create_event (b->number);
-  return TCL_OK;
-}
-
-/*
- * This section contains functions that deal with breakpoint
- * events from gdb.
- */
-
-/* The next three functions use breakpoint_notify to allow the GUI 
- * to handle creating, deleting and modifying breakpoints.  These three
- * functions are put into the appropriate gdb hooks in gdbtk_init.
- */
-
-void
-gdbtk_create_breakpoint (int num)
-{
-  struct breakpoint *b;
-  for (b = breakpoint_chain; b != NULL; b = b->next)
-    {
-      if (b->number == num)
-	break;
-    }
-
-  if (b == NULL || !BREAKPOINT_IS_INTERESTING (b))
-    return;
-
-  /* Check if there is room to store it */
-  if (num >= breakpoint_list_size)
-    {
-      int oldsize = breakpoint_list_size;
-      while (num >= breakpoint_list_size)
-	breakpoint_list_size += DEFAULT_LIST_SIZE;
-      breakpoint_list = (struct breakpoint **) xrealloc (breakpoint_list, breakpoint_list_size * sizeof (struct breakpoint *));
-      memset (&(breakpoint_list[oldsize]), 0, (breakpoint_list_size - oldsize) * sizeof (struct breakpoint *));
-    }
-
-  breakpoint_list[num] = b;
-  breakpoint_notify (num, "create");
-}
-
-void
-gdbtk_delete_breakpoint (int num)
-{
-  if (num >= 0
-      && num <= breakpoint_list_size
-      && breakpoint_list[num] != NULL)
-    {
-      breakpoint_notify (num, "delete");
-      breakpoint_list[num] = NULL;
-    }
-}
-
-void
-gdbtk_modify_breakpoint (int num)
-{
-  if (num >= 0)
-    breakpoint_notify (num, "modify");
-}
-
-/* This is the generic function for handling changes in
- * a breakpoint.  It routes the information to the Tcl
- * command "gdbtk_tcl_breakpoint" in the form:
- *   gdbtk_tcl_breakpoint action b_number b_address b_line b_file
- * On error, the error string is written to gdb_stdout.
- */
-static void
-breakpoint_notify (int num, const char *action)
-{
-  char *buf;
-
-  if (num > breakpoint_list_size
-      || num < 0
-      || breakpoint_list[num] == NULL
-      /* FIXME: should not be so restrictive... */
-      || breakpoint_list[num]->type != bp_breakpoint)
-    return;
-
-  /* We ensure that ACTION contains no special Tcl characters, so we
-     can do this.  */
-  xasprintf (&buf, "gdbtk_tcl_breakpoint %s %d", action, num);
-
-  if (Tcl_Eval (gdbtk_interp, buf) != TCL_OK)
-    report_error ();
-  free(buf); 
-}
-
-/*
- * This section contains the commands that deal with tracepoints:
- */
-
-/* This implements the tcl command gdb_actions
- * It sets actions for a given tracepoint.
- *
- * Tcl Arguments:
- *    number: the tracepoint in question
- *    actions: the actions to add to this tracepoint
- * Tcl Result:
- *    None.
- */
-
-static int
-gdb_actions_command (ClientData clientData, Tcl_Interp *interp,
-		     int objc, Tcl_Obj *CONST objv[])
-{
-  struct tracepoint *tp;
-  Tcl_Obj **actions;
-  int nactions, i, len;
-  char *number, *args, *action;
-  long step_count;
-  struct action_line *next = NULL, *temp;
-  enum actionline_type linetype;
-
-  if (objc != 3)
-    {
-      Tcl_WrongNumArgs (interp, 1, objv, "number actions");
-      return TCL_ERROR;
-    }
-
-  args = number = Tcl_GetStringFromObj (objv[1], NULL);
-  tp = get_tracepoint_by_number (&args, 0, 0);
-  if (tp == NULL)
-    {
-      Tcl_AppendStringsToObj (result_ptr->obj_ptr, "Tracepoint \"",
-			      number, "\" does not exist", NULL);
-      return TCL_ERROR;
-    }
-
-  /* Free any existing actions */
-  if (tp->actions != NULL)
-    free_actions (tp);
-
-  step_count = 0;
-
-  Tcl_ListObjGetElements (interp, objv[2], &nactions, &actions);
-
-  /* Add the actions to the tracepoint */
-  for (i = 0; i < nactions; i++)
-    {
-      temp = xmalloc (sizeof (struct action_line));
-      temp->next = NULL;
-      action = Tcl_GetStringFromObj (actions[i], &len);
-      temp->action = savestring (action, len);
-
-      linetype = validate_actionline (&(temp->action), tp);
-
-      if (linetype == BADLINE)
-	{
-	  free (temp);
-	  continue;
-	}
-
-      if (next == NULL)
-	{
-	  tp->actions = temp;
-	  next = temp;
-	}
-      else
-	{
-	  next->next = temp;
-	  next = temp;
-	}
-    }
-
-  return TCL_OK;
-}
-
-static int
-gdb_get_trace_frame_num (ClientData clientData, Tcl_Interp *interp,
-			 int objc, Tcl_Obj *CONST objv[])
-{
-  if (objc != 1)
-    {
-      Tcl_WrongNumArgs (interp, 1, objv, "linespec");
-      return TCL_ERROR;
-    }
-
-  Tcl_SetIntObj (result_ptr->obj_ptr, get_traceframe_number ());
-  return TCL_OK;
-
-}
-
-static int
-gdb_get_tracepoint_info (ClientData clientData, Tcl_Interp *interp,
-			 int objc, Tcl_Obj *CONST objv[])
-{
-  struct symtab_and_line sal;
-  int tpnum;
-  struct tracepoint *tp;
-  struct action_line *al;
-  Tcl_Obj *action_list;
-  char *filename, *funcname;
-
-  if (objc != 2)
-    {
-      Tcl_WrongNumArgs (interp, 1, objv, "tpnum");
-      return TCL_ERROR;
-    }
-
-  if (Tcl_GetIntFromObj (NULL, objv[1], &tpnum) != TCL_OK)
-    {
-      result_ptr->flags |= GDBTK_IN_TCL_RESULT;
-      return TCL_ERROR;
-    }
-
-  ALL_TRACEPOINTS (tp)
-    if (tp->number == tpnum)
-      break;
-
-  if (tp == NULL)
-    {
-      gdbtk_set_result (interp, "Tracepoint #%d does not exist", tpnum);
-      return TCL_ERROR;
-    }
-
-  Tcl_SetListObj (result_ptr->obj_ptr, 0, NULL);
-  sal = find_pc_line (tp->address, 0);
-  filename = symtab_to_filename (sal.symtab);
-  if (filename == NULL)
-    filename = "N/A";
-  Tcl_ListObjAppendElement (interp, result_ptr->obj_ptr,
-			    Tcl_NewStringObj (filename, -1));
-
-  funcname = pc_function_name (tp->address);
-  Tcl_ListObjAppendElement (interp, result_ptr->obj_ptr, Tcl_NewStringObj
-			    (funcname, -1));
-
-  Tcl_ListObjAppendElement (interp, result_ptr->obj_ptr,
-			    Tcl_NewIntObj (sal.line));
-  Tcl_ListObjAppendElement (interp, result_ptr->obj_ptr,
-			    Tcl_NewStringObj (core_addr_to_string (tp->address), -1));
-  Tcl_ListObjAppendElement (interp, result_ptr->obj_ptr,
-			    Tcl_NewIntObj (tp->enabled_p));
-  Tcl_ListObjAppendElement (interp, result_ptr->obj_ptr,
-			    Tcl_NewIntObj (tp->pass_count));
-  Tcl_ListObjAppendElement (interp, result_ptr->obj_ptr,
-			    Tcl_NewIntObj (tp->step_count));
-  Tcl_ListObjAppendElement (interp, result_ptr->obj_ptr,
-			    Tcl_NewIntObj (tp->thread));
-  Tcl_ListObjAppendElement (interp, result_ptr->obj_ptr,
-			    Tcl_NewIntObj (tp->hit_count));
-
-  /* Append a list of actions */
-  action_list = Tcl_NewObj ();
-  for (al = tp->actions; al != NULL; al = al->next)
-    {
-      Tcl_ListObjAppendElement (interp, action_list,
-				Tcl_NewStringObj (al->action, -1));
-    }
-  Tcl_ListObjAppendElement (interp, result_ptr->obj_ptr, action_list);
-
-  return TCL_OK;
-}
-
-/* return a list of all tracepoint numbers in interpreter */
-static int
-gdb_get_tracepoint_list (ClientData clientData,
-			 Tcl_Interp *interp,
-			 int objc,
-			 Tcl_Obj *CONST objv[])
-{
-  struct tracepoint *tp;
-
-  Tcl_SetListObj (result_ptr->obj_ptr, 0, NULL);
-
-  ALL_TRACEPOINTS (tp)
-    Tcl_ListObjAppendElement (interp, result_ptr->obj_ptr,
-			      Tcl_NewIntObj (tp->number));
-
-  return TCL_OK;
-}
-
-static int
-gdb_trace_status (ClientData clientData,
-		  Tcl_Interp *interp,
-		  int objc,
-		  Tcl_Obj *CONST objv[])
-{
-  int result = 0;
-
-  if (trace_running_p)
-    result = 1;
-
-  Tcl_SetIntObj (result_ptr->obj_ptr, result);
-  return TCL_OK;
-}
-
-/* returns -1 if not found, tracepoint # if found */
-static int
-tracepoint_exists (char *args)
-{
-  struct tracepoint *tp;
-  char **canonical;
-  struct symtabs_and_lines sals;
-  char *file = NULL;
-  int result = -1;
-
-  sals = decode_line_1 (&args, 1, NULL, 0, &canonical);
-  if (sals.nelts == 1)
-    {
-      resolve_sal_pc (&sals.sals[0]);
-      file = xmalloc (strlen (sals.sals[0].symtab->dirname)
-		      + strlen (sals.sals[0].symtab->filename) + 1);
-      if (file != NULL)
-	{
-	  strcpy (file, sals.sals[0].symtab->dirname);
-	  strcat (file, sals.sals[0].symtab->filename);
-
-	  ALL_TRACEPOINTS (tp)
-	    {
-	      if (tp->address == sals.sals[0].pc)
-		result = tp->number;
-#if 0
-	      /* Why is this here? This messes up assembly traces */
-	      else if (tp->source_file != NULL
-		       && strcmp (tp->source_file, file) == 0
-		       && sals.sals[0].line == tp->line_number)
-		result = tp->number;
-#endif
-	    }
-	}
-    }
-  if (file != NULL)
-    free (file);
-  return result;
-}
-
-static int
-gdb_tracepoint_exists_command (ClientData clientData,
-			       Tcl_Interp *interp,
-			       int objc,
-			       Tcl_Obj *CONST objv[])
-{
-  char *args;
-
-  if (objc != 2)
-    {
-      Tcl_WrongNumArgs (interp, 1, objv,
-			"function:line|function|line|*addr");
-      return TCL_ERROR;
-    }
-
-  args = Tcl_GetStringFromObj (objv[1], NULL);
-
-  Tcl_SetIntObj (result_ptr->obj_ptr, tracepoint_exists (args));
-  return TCL_OK;
-}
-
-/*
- * This section contains functions which deal with tracepoint
- * events from gdb.
- */
-
-void
-gdbtk_create_tracepoint (int num)
-{
-  tracepoint_notify (num, "create");
-}
-
-void
-gdbtk_delete_tracepoint (int num)
-{
-  tracepoint_notify (num, "delete");
-}
-
-void
-gdbtk_modify_tracepoint (int num)
-{
-  tracepoint_notify (num, "modify");
-}
-
-static void
-tracepoint_notify (int num, const char *action)
-{
-  char *buf;
-
-  /* We ensure that ACTION contains no special Tcl characters, so we
-     can do this.  */
-  xasprintf (&buf, "gdbtk_tcl_tracepoint %s %d", action, num);
-
-  if (Tcl_Eval (gdbtk_interp, buf) != TCL_OK)
-    report_error ();
-  free(buf); 
-}
diff --git a/gdb/gdbtk/generic/gdbtk-cmds.c b/gdb/gdbtk/generic/gdbtk-cmds.c
deleted file mode 100644
index ab3e1cc982b..00000000000
--- a/gdb/gdbtk/generic/gdbtk-cmds.c
+++ /dev/null
@@ -1,3031 +0,0 @@
-/* Tcl/Tk command definitions for Insight.
-   Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002, 2003
-   Free Software Foundation, Inc.
-
-   Written by Stu Grossman <grossman@cygnus.com> of Cygnus Support.
-   Substantially augmented by Martin Hunt, Keith Seitz & Jim Ingham of
-   Cygnus Support.
-
-   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.  */
-
-#include "defs.h"
-#include "inferior.h"
-#include "source.h"
-#include "symfile.h"
-#include "objfiles.h"
-#include "gdbcore.h"
-#include "demangle.h"
-#include "linespec.h"
-#include "tui/tui-file.h"
-#include "top.h"
-#include "annotate.h"
-#include "block.h"
-
-/* tcl header files includes varargs.h unless HAS_STDARG is defined,
-   but gdb uses stdarg.h, so make sure HAS_STDARG is defined.  */
-#define HAS_STDARG 1
-
-#include <itcl.h>
-#include <tcl.h>
-#include <tk.h>
-
-#include "guitcl.h"
-#include "gdbtk.h"
-#include "gdbtk-wrapper.h"
-#include "gdbtk-cmds.h"
-
-#include <signal.h>
-#include <fcntl.h>
-#include <sys/ioctl.h>
-#include <sys/time.h>
-#include <sys/stat.h>
-
-#include "gdb_string.h"
-#include "dis-asm.h"
-#include "gdbcmd.h"
-
-#ifdef HAVE_CTYPE_H
-#include <ctype.h>		/* for isprint() */
-#endif
-
-/* Various globals we reference.  */
-extern char *source_path;
-
-/* These two objects hold boolean true and false,
-   and are shared by all the list objects that gdb_listfuncs
-   returns. */
-
-static Tcl_Obj *mangled, *not_mangled;
-
-/* These two control how the GUI behaves when gdb is either tracing or loading.
-   They are used in this file & gdbtk_hooks.c */
-
-int No_Update = 0;
-int load_in_progress = 0;
-
-/* This Structure is used in gdb_disassemble_driver.
-   We need a different sort of line table from the normal one cuz we can't
-   depend upon implicit line-end pc's for lines to do the
-   reordering in this function.  */
-
-struct my_line_entry
-{
-  int line;
-  CORE_ADDR start_pc;
-  CORE_ADDR end_pc;
-};
-
-/* Use this to pass the Tcl Text widget command and the open file
-   descriptor to the disassembly load command. */
-
-struct disassembly_client_data 
-{
-  FILE *fp;
-  int file_opened_p;
-  int widget_line_no;
-  Tcl_Interp *interp;
-  char *widget;
-  Tcl_Obj *result_obj[3];
-  const char *asm_argv[14];
-  const char *source_argv[7];
-  char *map_arr;
-  Tcl_DString src_to_line_prefix;
-  Tcl_DString pc_to_line_prefix;
-  Tcl_DString line_to_pc_prefix;
-  Tcl_CmdInfo cmd;
-};
-
-/* This variable determines where memory used for disassembly is read from.
- * See note in gdbtk.h for details.
- */
-int disassemble_from_exec = -1;
-
-extern int gdb_variable_init (Tcl_Interp * interp);
-
-/*
- * Declarations for routines exported from this file
- */
-
-int Gdbtk_Init (Tcl_Interp * interp);
-
-/*
- * Declarations for routines used only in this file.
- */
-
-static int compare_lines (const PTR, const PTR);
-static int comp_files (const void *, const void *);
-static int gdb_clear_file (ClientData, Tcl_Interp * interp, int,
-			   Tcl_Obj * CONST[]);
-static int gdb_cmd (ClientData, Tcl_Interp *, int, Tcl_Obj * CONST[]);
-static int gdb_confirm_quit (ClientData, Tcl_Interp *, int,
-			     Tcl_Obj * CONST[]);
-static int gdb_entry_point (ClientData, Tcl_Interp *, int, Tcl_Obj * CONST[]);
-static int gdb_eval (ClientData, Tcl_Interp *, int, Tcl_Obj * CONST[]);
-static int gdb_find_file_command (ClientData, Tcl_Interp *, int,
-				  Tcl_Obj * CONST objv[]);
-static int gdb_force_quit (ClientData, Tcl_Interp *, int, Tcl_Obj * CONST[]);
-static int gdb_get_file_command (ClientData, Tcl_Interp *, int,
-				 Tcl_Obj * CONST objv[]);
-static int gdb_get_function_command (ClientData, Tcl_Interp *, int,
-				     Tcl_Obj * CONST objv[]);
-static int gdb_get_line_command (ClientData, Tcl_Interp *, int,
-				 Tcl_Obj * CONST objv[]);
-static int gdb_update_mem (ClientData, Tcl_Interp *, int, Tcl_Obj * CONST[]);
-static int gdb_set_mem (ClientData, Tcl_Interp *, int, Tcl_Obj * CONST[]);
-static int gdb_immediate_command (ClientData, Tcl_Interp *, int,
-				  Tcl_Obj * CONST[]);
-static int gdb_incr_addr (ClientData, Tcl_Interp *, int, Tcl_Obj * CONST[]);
-static int gdb_CA_to_TAS (ClientData, Tcl_Interp *, int, Tcl_Obj * CONST[]);
-static int gdb_listfiles (ClientData, Tcl_Interp *, int, Tcl_Obj * CONST[]);
-static int gdb_listfuncs (ClientData, Tcl_Interp *, int, Tcl_Obj * CONST[]);
-static int gdb_loadfile (ClientData, Tcl_Interp *, int,
-			 Tcl_Obj * CONST objv[]);
-static int gdb_load_disassembly (ClientData clientData, Tcl_Interp
-				 * interp, int objc, Tcl_Obj * CONST objv[]);
-static int gdb_get_inferior_args (ClientData clientData,
-				  Tcl_Interp *interp,
-				  int objc, Tcl_Obj * CONST objv[]);
-static int gdb_set_inferior_args (ClientData clientData,
-				  Tcl_Interp *interp,
-				  int objc, Tcl_Obj * CONST objv[]);
-static int gdb_load_info (ClientData, Tcl_Interp *, int,
-			  Tcl_Obj * CONST objv[]);
-static int gdb_loc (ClientData, Tcl_Interp *, int, Tcl_Obj * CONST[]);
-static int gdb_path_conv (ClientData, Tcl_Interp *, int, Tcl_Obj * CONST[]);
-static int gdb_prompt_command (ClientData, Tcl_Interp *, int,
-			       Tcl_Obj * CONST objv[]);
-static int gdb_restore_fputs (ClientData, Tcl_Interp *, int,
-			      Tcl_Obj * CONST[]);
-static int gdb_search (ClientData, Tcl_Interp *, int, Tcl_Obj * CONST objv[]);
-static int gdb_stop (ClientData, Tcl_Interp *, int, Tcl_Obj * CONST[]);
-static int gdb_target_has_execution_command (ClientData,
-					     Tcl_Interp *, int,
-					     Tcl_Obj * CONST[]);
-static int gdbtk_dis_asm_read_memory (bfd_vma, bfd_byte *, unsigned int,
-				      disassemble_info *);
-static void gdbtk_load_source (ClientData clientData,
-			       struct symtab *symtab,
-			       int start_line, int end_line);
-static CORE_ADDR gdbtk_load_asm (ClientData clientData, CORE_ADDR pc,
-				 struct disassemble_info *di);
-static int gdb_disassemble_driver (CORE_ADDR low, CORE_ADDR high,
-				   int mixed_source_and_assembly,
-				   ClientData clientData,
-				   void (*print_source_fn) (ClientData, struct
-							    symtab *, int,
-							    int),
-				   CORE_ADDR (*print_asm_fn) (ClientData,
-							      CORE_ADDR,
-							      struct
-							      disassemble_info
-							      *));
-char *get_prompt (void);
-static int perror_with_name_wrapper (PTR args);
-static int wrapped_call (PTR opaque_args);
-static int hex2bin (const char *hex, char *bin, int count);
-static int fromhex (int a);
-
-
-/* Gdbtk_Init
- *    This loads all the Tcl commands into the Tcl interpreter.
- *
- * Arguments:
- *    interp - The interpreter into which to load the commands.
- *
- * Result:
- *     A standard Tcl result.
- */
-
-int
-Gdbtk_Init (Tcl_Interp *interp)
-{
-  Tcl_CreateObjCommand (interp, "gdb_cmd", gdbtk_call_wrapper, gdb_cmd, NULL);
-  Tcl_CreateObjCommand (interp, "gdb_immediate", gdbtk_call_wrapper,
-			gdb_immediate_command, NULL);
-  Tcl_CreateObjCommand (interp, "gdb_loc", gdbtk_call_wrapper, gdb_loc, NULL);
-  Tcl_CreateObjCommand (interp, "gdb_path_conv", gdbtk_call_wrapper, gdb_path_conv,
-			NULL);
-  Tcl_CreateObjCommand (interp, "gdb_listfiles", gdbtk_call_wrapper, gdb_listfiles,
-			NULL);
-  Tcl_CreateObjCommand (interp, "gdb_listfuncs", gdbtk_call_wrapper, gdb_listfuncs,
-			NULL);
-  Tcl_CreateObjCommand (interp, "gdb_entry_point", gdbtk_call_wrapper,
-			gdb_entry_point, NULL);
-  Tcl_CreateObjCommand (interp, "gdb_update_mem", gdbtk_call_wrapper, gdb_update_mem,
-			NULL);
-  Tcl_CreateObjCommand (interp, "gdb_set_mem", gdbtk_call_wrapper, gdb_set_mem,
-			NULL);
-  Tcl_CreateObjCommand (interp, "gdb_stop", gdbtk_call_wrapper, gdb_stop, NULL);
-  Tcl_CreateObjCommand (interp, "gdb_restore_fputs", gdbtk_call_wrapper, gdb_restore_fputs,
-			NULL);
-  Tcl_CreateObjCommand (interp, "gdb_eval", gdbtk_call_wrapper, gdb_eval, NULL);
-  Tcl_CreateObjCommand (interp, "gdb_incr_addr", gdbtk_call_wrapper, gdb_incr_addr, NULL);
-  Tcl_CreateObjCommand (interp, "gdb_CA_to_TAS", gdbtk_call_wrapper, gdb_CA_to_TAS, NULL);
-  Tcl_CreateObjCommand (interp, "gdb_clear_file", gdbtk_call_wrapper,
-			gdb_clear_file, NULL);
-  Tcl_CreateObjCommand (interp, "gdb_confirm_quit", gdbtk_call_wrapper,
-			gdb_confirm_quit, NULL);
-  Tcl_CreateObjCommand (interp, "gdb_force_quit", gdbtk_call_wrapper,
-			gdb_force_quit, NULL);
-  Tcl_CreateObjCommand (interp, "gdb_target_has_execution",
-			gdbtk_call_wrapper,
-			gdb_target_has_execution_command, NULL);
-  Tcl_CreateObjCommand (interp, "gdb_load_info", gdbtk_call_wrapper, gdb_load_info,
-			NULL);
-  Tcl_CreateObjCommand (interp, "gdb_get_function", gdbtk_call_wrapper,
-			gdb_get_function_command, NULL);
-  Tcl_CreateObjCommand (interp, "gdb_get_line", gdbtk_call_wrapper,
-			gdb_get_line_command, NULL);
-  Tcl_CreateObjCommand (interp, "gdb_get_file", gdbtk_call_wrapper,
-			gdb_get_file_command, NULL);
-  Tcl_CreateObjCommand (interp, "gdb_prompt",
-			gdbtk_call_wrapper, gdb_prompt_command, NULL);
-  Tcl_CreateObjCommand (interp, "gdb_find_file",
-			gdbtk_call_wrapper, gdb_find_file_command, NULL);
-  Tcl_CreateObjCommand (interp, "gdb_loadfile", gdbtk_call_wrapper, gdb_loadfile,
-			NULL);
-  Tcl_CreateObjCommand (interp, "gdb_load_disassembly", gdbtk_call_wrapper,
-			gdb_load_disassembly,  NULL);
-  Tcl_CreateObjCommand (gdbtk_interp, "gdb_search", gdbtk_call_wrapper,
-			gdb_search, NULL);
-  Tcl_CreateObjCommand (interp, "gdb_get_inferior_args", gdbtk_call_wrapper,
-			gdb_get_inferior_args, NULL);
-  Tcl_CreateObjCommand (interp, "gdb_set_inferior_args", gdbtk_call_wrapper,
-			gdb_set_inferior_args, NULL);
-
-  /* gdb_context is used for debugging multiple threads or tasks */
-  Tcl_LinkVar (interp, "gdb_context_id",
-	       (char *) &gdb_context,
-	       TCL_LINK_INT | TCL_LINK_READ_ONLY);
-
-  /* Make gdb's notion of the pwd visible.  This is read-only because
-     (1) it doesn't make sense to change it directly and (2) it is
-     allocated using xmalloc and not Tcl_Alloc.  You might think we
-     could just use the Tcl `pwd' command.  However, Tcl (erroneously,
-     imho) maintains a cache of the current directory name, and
-     doesn't provide a way for gdb to invalidate the cache.  */
-  Tcl_LinkVar (interp, "gdb_current_directory",
-	       (char *) &current_directory,
-	       TCL_LINK_STRING | TCL_LINK_READ_ONLY);
-
-  /* Current gdb source file search path.  This is read-only for
-     reasons similar to those for gdb_current_directory.  */
-  Tcl_LinkVar (interp, "gdb_source_path",
-	       (char *) &source_path,
-	       TCL_LINK_STRING | TCL_LINK_READ_ONLY);
-
-  /* Init variable interface... */
-  if (gdb_variable_init (interp) != TCL_OK)
-    return TCL_ERROR;
-
-  /* Init breakpoint module */
-  if (Gdbtk_Breakpoint_Init (interp) != TCL_OK)
-    return TCL_ERROR;
-
-  /* Init stack module */
-  if (Gdbtk_Stack_Init (interp) != TCL_OK)
-    return TCL_ERROR;
-
-  /* Init register module */
-  if (Gdbtk_Register_Init (interp) != TCL_OK)
-    return TCL_ERROR;
-
-  /* Determine where to disassemble from */
-  Tcl_LinkVar (gdbtk_interp, "disassemble-from-exec",
-	       (char *) &disassemble_from_exec,
-	       TCL_LINK_INT);
-
-  Tcl_PkgProvide (interp, "Gdbtk", GDBTK_VERSION);
-  return TCL_OK;
-}
-
-/* This routine acts as a top-level for all GDB code called by Tcl/Tk.  It
-   handles cleanups, and uses catch_errors to trap calls to return_to_top_level
-   (usually via error).
-   This is necessary in order to prevent a longjmp out of the bowels of Tk,
-   possibly leaving things in a bad state.  Since this routine can be called
-   recursively, it needs to save and restore the contents of the result_ptr as
-   necessary. */
-
-int
-gdbtk_call_wrapper (ClientData clientData, Tcl_Interp *interp,
-		    int objc, Tcl_Obj *CONST objv[])
-{
-  struct wrapped_call_args wrapped_args;
-  gdbtk_result new_result, *old_result_ptr;
-  int wrapped_returned_error = 0;
-
-  old_result_ptr = result_ptr;
-  result_ptr = &new_result;
-  result_ptr->obj_ptr = Tcl_NewObj ();
-  result_ptr->flags = GDBTK_TO_RESULT;
-
-  wrapped_args.func = (Tcl_ObjCmdProc *) clientData;
-  wrapped_args.interp = interp;
-  wrapped_args.objc = objc;
-  wrapped_args.objv = objv;
-  wrapped_args.val = TCL_OK;
-
-  if (!catch_errors (wrapped_call, &wrapped_args, "", RETURN_MASK_ALL))
-    {
-
-      wrapped_args.val = TCL_ERROR;	/* Flag an error for TCL */
-
-      /* Make sure the timer interrupts are turned off.  */
-      gdbtk_stop_timer ();
-
-      gdb_flush (gdb_stderr);	/* Flush error output */
-      gdb_flush (gdb_stdout);	/* Sometimes error output comes here as well */
-
-      /* If we errored out here, and the results were going to the
-         console, then gdbtk_fputs will have gathered the result into the
-         result_ptr.  We also need to echo them out to the console here */
-
-      gdb_flush (gdb_stderr);	/* Flush error output */
-      gdb_flush (gdb_stdout);	/* Sometimes error output comes here as well */
-
-      /* In case of an error, we may need to force the GUI into idle
-         mode because gdbtk_call_command may have bombed out while in
-         the command routine.  */
-
-      running_now = 0;
-      Tcl_Eval (interp, "gdbtk_tcl_idle");
-
-    }
-  else
-    {
-      /* If the wrapped call returned an error directly, then we don't
-	 want to reset the result.  */
-      wrapped_returned_error = wrapped_args.val == TCL_ERROR;
-    }
-
-  /* do not suppress any errors -- a remote target could have errored */
-  load_in_progress = 0;
-
-  /*
-   * Now copy the result over to the true Tcl result.  If
-   * GDBTK_TO_RESULT flag bit is set, this just copies a null object
-   * over to the Tcl result, which is fine because we should reset the
-   * result in this case anyway.  If the wrapped command returned an
-   * error, then we assume that the result is already set correctly.
-   */
-  if ((result_ptr->flags & GDBTK_IN_TCL_RESULT) || wrapped_returned_error)
-    {
-      Tcl_DecrRefCount (result_ptr->obj_ptr);
-    }
-  else
-    {
-      Tcl_SetObjResult (interp, result_ptr->obj_ptr);
-    }
-
-  result_ptr = old_result_ptr;
-
-#ifdef _WIN32
-  close_bfds ();
-#endif
-
-  return wrapped_args.val;
-}
-
-/*
- * This is the wrapper that is passed to catch_errors.
- */
-
-static int
-wrapped_call (PTR opaque_args)
-{
-  struct wrapped_call_args *args = (struct wrapped_call_args *) opaque_args;
-  args->val = (*args->func) (args->func, args->interp, args->objc, args->objv);
-  return 1;
-}
-
-
-/*
- * This section contains the commands that control execution.
- */
-
-/* This implements the tcl command gdb_clear_file.
-
-* Prepare to accept a new executable file.  This is called when we
-* want to clear away everything we know about the old file, without
-* asking the user.  The Tcl code will have already asked the user if
-* necessary.  After this is called, we should be able to run the
-* `file' command without getting any questions.  
-*
-* Arguments:
-*    None
-* Tcl Result:
-*    None
-*/
-
-static int
-gdb_clear_file (ClientData clientData, Tcl_Interp *interp,
-		int objc, Tcl_Obj *CONST objv[])
-{
-  if (objc != 1)
-    {
-      Tcl_WrongNumArgs (interp, 1, objv, NULL);
-      return TCL_ERROR;
-    }
-
-  if (! ptid_equal (inferior_ptid, null_ptid) && target_has_execution)
-    {
-      if (attach_flag)
-	target_detach (NULL, 0);
-      else
-	target_kill ();
-    }
-
-  if (target_has_execution)
-    pop_target ();
-
-  delete_command (NULL, 0);
-  exec_file_clear (0);
-  symbol_file_clear (0);
-
-  return TCL_OK;
-}
-
-/* This implements the tcl command gdb_confirm_quit
- * Ask the user to confirm an exit request.
- *
- * Arguments:
- *    None
- * Tcl Result:
- *    A boolean, 1 if the user answered yes, 0 if no.
- */
-
-static int
-gdb_confirm_quit (ClientData clientData, Tcl_Interp *interp,
-		  int objc, Tcl_Obj *CONST objv[])
-{
-  int ret;
-
-  if (objc != 1)
-    {
-      Tcl_WrongNumArgs (interp, 1, objv, NULL);
-      return TCL_ERROR;
-    }
-
-  ret = quit_confirm ();
-  Tcl_SetBooleanObj (result_ptr->obj_ptr, ret);
-  return TCL_OK;
-}
-
-/* This implements the tcl command gdb_force_quit
- * Quit without asking for confirmation.
- *
- * Arguments:
- *    None
- * Tcl Result:
- *    None
- */
-
-static int
-gdb_force_quit (ClientData clientData, Tcl_Interp *interp,
-		int objc, Tcl_Obj *CONST objv[])
-{
-  if (objc != 1)
-    {
-      Tcl_WrongNumArgs (interp, 1, objv, NULL);
-      return TCL_ERROR;
-    }
-
-  quit_force ((char *) NULL, 1);
-  return TCL_OK;
-}
-
-/* Pressing the stop button on the source window should attempt to
- * stop the target. If, after some short time, this fails, a dialog
- * should appear allowing the user to detach.
- *
- * The global GDBTK_FORCE_DETACH is set when we wish to detach
- * from a target. This value is returned by ui_loop_hook (x_event),
- * indicating to callers that they should detach.
- *
- * Read the comments before x_event to find out how we (try) to keep
- * gdbtk alive while some other event loop has stolen control from us.
- */
-
-/*
- * This command implements the tcl command gdb_stop, which
- * is used to either stop the target or detach.
- * Note that it is assumed that a simulator or native target
- * can ALWAYS be stopped. Doing a "detach" on them has no effect.
- * 
- * Arguments:
- *    None or "detach"
- * Tcl Result:
- *    None
- */
-
-static int
-gdb_stop (ClientData clientData, Tcl_Interp *interp,
-	  int objc, Tcl_Obj *CONST objv[])
-{
-  int force = 0;
-  char *s;
-
-  if (objc > 1)
-    {
-      s = Tcl_GetStringFromObj (objv[1], NULL);
-      if (STREQ (s, "detach"))
-	force = 1;
-    }
-
-  if (force)
-    {
-      /* Set the "forcibly detach from target" flag. x_event will
-         return this value to callers when they should forcibly detach. */
-      gdbtk_force_detach = 1;
-    }
-  else
-    {
-      if (target_stop != target_ignore)
-	target_stop ();
-      else
-	quit_flag = 1;		/* hope something sees this */
-    }
-
-  return TCL_OK;
-}
-
-
-/*
- * This section contains Tcl commands that are wrappers for invoking
- * the GDB command interpreter.
- */
-
-
-/* This implements the tcl command `gdb_eval'.
- * It uses the gdb evaluator to return the value of
- * an expression in the current language
- *
- * Tcl Arguments:
- *     expression - the expression to evaluate.
- *     format - optional format character.  Valid chars are:
- *	o - octal
- *	x - hex
- *	d - decimal
- *	u - unsigned decimal
- *	t - binary
- *	f - float
- *	a - address
- *	c - char
- * Tcl Result:
- *     The result of the evaluation.
- */
-
-static int
-gdb_eval (ClientData clientData, Tcl_Interp *interp,
-	  int objc, Tcl_Obj *CONST objv[])
-{
-  struct expression *expr;
-  struct cleanup *old_chain = NULL;
-  int format = 0;
-  value_ptr val;
-  struct ui_file *stb;
-  long dummy;
-  char *result;
-
-  if (objc != 2 && objc != 3)
-    {
-      Tcl_WrongNumArgs (interp, 1, objv, "expression [format]");
-      return TCL_ERROR;
-    }
-
-  if (objc == 3)
-    format = *(Tcl_GetStringFromObj (objv[2], NULL));
-
-  expr = parse_expression (Tcl_GetStringFromObj (objv[1], NULL));
-  old_chain = make_cleanup (free_current_contents, &expr);
-  val = evaluate_expression (expr);
-
-  /* "Print" the result of the expression evaluation. */
-  stb = mem_fileopen ();
-  make_cleanup_ui_file_delete (stb);
-  val_print (VALUE_TYPE (val), VALUE_CONTENTS (val),
-	     VALUE_EMBEDDED_OFFSET (val), VALUE_ADDRESS (val),
-	     stb, format, 0, 0, 0);
-  result = ui_file_xstrdup (stb, &dummy);
-  Tcl_SetObjResult (interp, Tcl_NewStringObj (result, -1));
-  xfree (result);
-  result_ptr->flags |= GDBTK_IN_TCL_RESULT;
-
-  do_cleanups (old_chain);
-  return TCL_OK;
-}
-
-/* This implements the tcl command "gdb_cmd".
-
-* It sends its argument to the GDB command scanner for execution. 
-* This command will never cause the update, idle and busy hooks to be called
-* within the GUI.
-* 
-* Tcl Arguments:
-*    command - The GDB command to execute
-*    from_tty - 1 indicates this comes to the console.
-*               Pass this to the gdb command.
-* Tcl Result:
-*    The output from the gdb command (except for the "load" & "while"
-*    which dump their output to the console.
-*/
-
-static int
-gdb_cmd (ClientData clientData, Tcl_Interp *interp,
-	 int objc, Tcl_Obj *CONST objv[])
-{
-  int from_tty = 0;
-
-  if (objc < 2 || objc > 3)
-    {
-      Tcl_WrongNumArgs (interp, 1, objv, "command ?from_tty?");
-      return TCL_ERROR;
-    }
-
-  if (objc == 3)
-    {
-      if (Tcl_GetBooleanFromObj (NULL, objv[2], &from_tty) != TCL_OK)
-	{
-	  gdbtk_set_result (interp, "from_tty must be a boolean.");
-	  return TCL_ERROR;
-	}
-    }
-
-  if (running_now || load_in_progress)
-    return TCL_OK;
-
-  No_Update = 1;
-
-  /* for the load instruction (and possibly others later) we
-     set turn off the GDBTK_TO_RESULT flag bit so gdbtk_fputs() 
-     will not buffer all the data until the command is finished. */
-
-  if ((strncmp ("load ", Tcl_GetStringFromObj (objv[1], NULL), 5) == 0))
-    {
-      result_ptr->flags &= ~GDBTK_TO_RESULT;
-      load_in_progress = 1;
-    }
-
-  execute_command (Tcl_GetStringFromObj (objv[1], NULL), from_tty);
-
-  if (load_in_progress)
-    {
-      load_in_progress = 0;
-      result_ptr->flags |= GDBTK_TO_RESULT;
-    }
-
-  bpstat_do_actions (&stop_bpstat);
-
-  return TCL_OK;
-}
-
-/*
- * This implements the tcl command "gdb_immediate"
- *  
- * It does exactly the same thing as gdb_cmd, except NONE of its outut 
- * is buffered.  This will also ALWAYS cause the busy, update, and idle 
- * hooks to be called, contrasted with gdb_cmd, which NEVER calls them.
- * It turns off the GDBTK_TO_RESULT flag, which diverts the result
- * to the console window.
- *
- * Tcl Arguments:
- *    command - The GDB command to execute
- *    from_tty - 1 to indicate this is from the console.
- * Tcl Result:
- *    None.
- */
-
-static int
-gdb_immediate_command (ClientData clientData, Tcl_Interp *interp,
-		       int objc, Tcl_Obj *CONST objv[])
-{
-  int from_tty = 0;
-
-  if (objc < 2 || objc > 3)
-    {
-      Tcl_WrongNumArgs (interp, 1, objv, "command ?from_tty?");
-      return TCL_ERROR;
-    }
-
-  if (objc == 3)
-    {
-      if (Tcl_GetBooleanFromObj (NULL, objv[2], &from_tty) != TCL_OK)
-	{
-	  gdbtk_set_result (interp, "from_tty must be a boolean.");
-	  return TCL_ERROR;
-	}
-    }
-
-  if (running_now || load_in_progress)
-    return TCL_OK;
-
-  No_Update = 0;
-
-  result_ptr->flags &= ~GDBTK_TO_RESULT;
-
-  execute_command (Tcl_GetStringFromObj (objv[1], NULL), from_tty);
-
-  bpstat_do_actions (&stop_bpstat);
-
-  result_ptr->flags |= GDBTK_TO_RESULT;
-
-  return TCL_OK;
-}
-
-/* This implements the tcl command "gdb_prompt"
-
-* It returns the gdb interpreter's prompt.
-*
-* Tcl Arguments:
-*    None.
-* Tcl Result:
-*    The prompt.
-*/
-
-static int
-gdb_prompt_command (ClientData clientData, Tcl_Interp *interp,
-		    int objc, Tcl_Obj *CONST objv[])
-{
-  Tcl_SetStringObj (result_ptr->obj_ptr, get_prompt (), -1);
-  return TCL_OK;
-}
-
-
-/*
- * This section contains general informational commands.
- */
-
-/* This implements the tcl command "gdb_target_has_execution"
-
-* Tells whether the target is executing.
-*
-* Tcl Arguments:
-*    None
-* Tcl Result:
-*    A boolean indicating whether the target is executing.
-*/
-
-static int
-gdb_target_has_execution_command (ClientData clientData, Tcl_Interp *interp,
-				  int objc, Tcl_Obj *CONST objv[])
-{
-  int result = 0;
-
-  if (target_has_execution && ! ptid_equal (inferior_ptid, null_ptid))
-    result = 1;
-
-  Tcl_SetBooleanObj (result_ptr->obj_ptr, result);
-  return TCL_OK;
-}
-
-/* This implements the tcl command "gdb_get_inferior_args"
-
-* Returns inferior command line arguments as a string
-*
-* Tcl Arguments:
-*    None
-* Tcl Result:
-*    A string containing the inferior command line arguments
-*/
-
-static int
-gdb_get_inferior_args (ClientData clientData, Tcl_Interp *interp,
-		       int objc, Tcl_Obj *CONST objv[])
-{
-  if (objc != 1)
-    {
-      Tcl_WrongNumArgs (interp, 1, objv, NULL);
-      return TCL_ERROR;
-    }
-
-  Tcl_SetStringObj (result_ptr->obj_ptr, get_inferior_args (), -1);
-  return TCL_OK;
-}
-
-/* This implements the tcl command "gdb_set_inferior_args"
-
-* Sets inferior command line arguments
-*
-* Tcl Arguments:
-*    A string containing the inferior command line arguments
-* Tcl Result:
-*    None
-*/
-
-static int
-gdb_set_inferior_args (ClientData clientData, Tcl_Interp *interp,
-		       int objc, Tcl_Obj *CONST objv[])
-{
-  char *args;
-
-  if (objc != 2)
-    {
-      Tcl_WrongNumArgs (interp, 1, objv, "argument");
-      return TCL_ERROR;
-    }
-
-  args = Tcl_GetStringFromObj (objv[1], NULL);
-
-  /* The xstrdup/xfree stuff is so that we maintain a coherent picture
-     for gdb.  I would expect the accessors to do this, but they
-     don't.  */
-  args = xstrdup (args);
-  args = set_inferior_args (args);
-  xfree (args);
-
-  return TCL_OK;
-}
-
-/* This implements the tcl command "gdb_load_info"
-
-* It returns information about the file about to be downloaded.
-*
-* Tcl Arguments:
-*    filename: The file to open & get the info on.
-* Tcl Result:
-*    A list consisting of the name and size of each section.
-*/
-
-static int
-gdb_load_info (ClientData clientData, Tcl_Interp *interp,
-	       int objc, Tcl_Obj *CONST objv[])
-{
-  bfd *loadfile_bfd;
-  struct cleanup *old_cleanups;
-  asection *s;
-  Tcl_Obj *ob[2];
-
-  char *filename = Tcl_GetStringFromObj (objv[1], NULL);
-
-  loadfile_bfd = bfd_openr (filename, gnutarget);
-  if (loadfile_bfd == NULL)
-    {
-      gdbtk_set_result (interp, "Open of %s failed", filename);
-      return TCL_ERROR;
-    }
-  old_cleanups = make_cleanup_bfd_close (loadfile_bfd);
-
-  if (!bfd_check_format (loadfile_bfd, bfd_object))
-    {
-      gdbtk_set_result (interp, "Bad Object File");
-      return TCL_ERROR;
-    }
-
-  Tcl_SetListObj (result_ptr->obj_ptr, 0, NULL);
-
-  for (s = loadfile_bfd->sections; s; s = s->next)
-    {
-      if (s->flags & SEC_LOAD)
-	{
-	  bfd_size_type size = bfd_get_section_size_before_reloc (s);
-	  if (size > 0)
-	    {
-	      ob[0] = Tcl_NewStringObj ((char *)
-					bfd_get_section_name (loadfile_bfd, s),
-					-1);
-	      ob[1] = Tcl_NewLongObj ((long) size);
-	      Tcl_ListObjAppendElement (NULL, result_ptr->obj_ptr,
-					Tcl_NewListObj (2, ob));
-	    }
-	}
-    }
-
-  do_cleanups (old_cleanups);
-  return TCL_OK;
-}
-
-
-/* This implements the tcl command "gdb_get_line"
-
-* It returns the linenumber for a given linespec.  It will take any spec
-* that can be passed to decode_line_1
-*
-* Tcl Arguments:
-*    linespec - the line specification
-* Tcl Result:
-*    The line number for that spec.
-*/
-static int
-gdb_get_line_command (ClientData clientData, Tcl_Interp *interp,
-		      int objc, Tcl_Obj *CONST objv[])
-{
-  struct symtabs_and_lines sals;
-  char *args, **canonical;
-
-  if (objc != 2)
-    {
-      Tcl_WrongNumArgs (interp, 1, objv, "linespec");
-      return TCL_ERROR;
-    }
-
-  args = Tcl_GetStringFromObj (objv[1], NULL);
-  sals = decode_line_1 (&args, 1, NULL, 0, &canonical);
-  if (sals.nelts == 1)
-    {
-      Tcl_SetIntObj (result_ptr->obj_ptr, sals.sals[0].line);
-      return TCL_OK;
-    }
-
-  Tcl_SetStringObj (result_ptr->obj_ptr, "N/A", -1);
-  return TCL_OK;
-
-}
-
-/* This implements the tcl command "gdb_get_file"
-
-* It returns the file containing a given line spec.
-*
-* Tcl Arguments:
-*    linespec - The linespec to look up
-* Tcl Result:
-*    The file containing it.
-*/
-
-static int
-gdb_get_file_command (ClientData clientData, Tcl_Interp *interp,
-		      int objc, Tcl_Obj *CONST objv[])
-{
-  struct symtabs_and_lines sals;
-  char *args, **canonical;
-
-  if (objc != 2)
-    {
-      Tcl_WrongNumArgs (interp, 1, objv, "linespec");
-      return TCL_ERROR;
-    }
-
-  args = Tcl_GetStringFromObj (objv[1], NULL);
-  sals = decode_line_1 (&args, 1, NULL, 0, &canonical);
-  if (sals.nelts == 1)
-    {
-      Tcl_SetStringObj (result_ptr->obj_ptr,
-			sals.sals[0].symtab->filename, -1);
-      return TCL_OK;
-    }
-
-  Tcl_SetStringObj (result_ptr->obj_ptr, "N/A", -1);
-  return TCL_OK;
-}
-
-/* This implements the tcl command "gdb_get_function"
-
-* It finds the function containing the given line spec.
-*
-* Tcl Arguments:
-*    linespec - The line specification
-* Tcl Result:
-*    The function that contains it, or "N/A" if it is not in a function.
-*/
-static int
-gdb_get_function_command (ClientData clientData, Tcl_Interp *interp,
-			  int objc, Tcl_Obj *CONST objv[])
-{
-  char *function;
-  struct symtabs_and_lines sals;
-  char *args, **canonical;
-
-  if (objc != 2)
-    {
-      Tcl_WrongNumArgs (interp, 1, objv, "linespec");
-      return TCL_ERROR;
-    }
-
-  args = Tcl_GetStringFromObj (objv[1], NULL);
-  sals = decode_line_1 (&args, 1, NULL, 0, &canonical);
-  if (sals.nelts == 1)
-    {
-      resolve_sal_pc (&sals.sals[0]);
-      function = pc_function_name (sals.sals[0].pc);
-      Tcl_SetStringObj (result_ptr->obj_ptr, function, -1);
-      return TCL_OK;
-    }
-
-  Tcl_SetStringObj (result_ptr->obj_ptr, "N/A", -1);
-  return TCL_OK;
-}
-
-/* This implements the tcl command "gdb_find_file"
-
-* It searches the symbol tables to get the full pathname to a file.
-*
-* Tcl Arguments:
-*    filename: the file name to search for.
-* Tcl Result:
-*    The full path to the file, an empty string if the file was not
-*    available or an error message if the file is not found in the symtab.
-*/
-
-static int
-gdb_find_file_command (ClientData clientData, Tcl_Interp *interp,
-		       int objc, Tcl_Obj *CONST objv[])
-{
-  struct symtab *st;
-  char *filename, *fullname;
-
-  if (objc != 2)
-    {
-      Tcl_WrongNumArgs (interp, 1, objv, "filename");
-      return TCL_ERROR;
-    }
-
-  filename = Tcl_GetStringFromObj (objv[1], NULL);
-  st = lookup_symtab (filename);
-
-  /* We should always get a symtab. */
-  if (!st)
-    {
-      gdbtk_set_result (interp, "File not found in symtab (2)");
-      return TCL_ERROR;
-    }
-
-  if (st->fullname == NULL)
-    fullname = symtab_to_filename (st);
-  else
-    fullname = st->fullname;
-
-  /* We may not be able to open the file (not available). */
-  if (fullname == NULL)
-    {
-      Tcl_SetStringObj (result_ptr->obj_ptr, "", -1);
-      return TCL_OK;
-    }
-
-  Tcl_SetStringObj (result_ptr->obj_ptr, fullname, -1);
-
-  return TCL_OK;
-}
-
-/* This implements the tcl command "gdb_listfiles"
-
-* This lists all the files in the current executible.
-*
-* Note that this currently pulls in all sorts of filenames
-* that aren't really part of the executable.  It would be
-* best if we could check each file to see if it actually
-* contains executable lines of code, but we can't do that
-* with psymtabs.
-*
-* Arguments:
-*    ?pathname? - If provided, only files which match pathname
-*        (up to strlen(pathname)) are included. THIS DOES NOT
-*        CURRENTLY WORK BECAUSE PARTIAL_SYMTABS DON'T SUPPLY
-*        THE FULL PATHNAME!!!
-*
-* Tcl Result:
-*    A list of all matching files.
-*/
-static int
-gdb_listfiles (ClientData clientData, Tcl_Interp *interp,
-	       int objc, Tcl_Obj *CONST objv[])
-{
-  struct objfile *objfile;
-  struct partial_symtab *psymtab;
-  struct symtab *symtab;
-  char *lastfile, *pathname = NULL, **files;
-  int files_size;
-  int i, numfiles = 0, len = 0;
-
-  files_size = 1000;
-  files = (char **) xmalloc (sizeof (char *) * files_size);
-
-  if (objc > 2)
-    {
-      Tcl_WrongNumArgs (interp, 1, objv, "?pathname?");
-      return TCL_ERROR;
-    }
-  else if (objc == 2)
-    pathname = Tcl_GetStringFromObj (objv[1], &len);
-
-  ALL_PSYMTABS (objfile, psymtab)
-    {
-      if (numfiles == files_size)
-	{
-	  files_size = files_size * 2;
-	  files = (char **) xrealloc (files, sizeof (char *) * files_size);
-	}
-      if (psymtab->filename)
-	{
-	  if (!len || !strncmp (pathname, psymtab->filename, len)
-	      || !strcmp (psymtab->filename, basename (psymtab->filename)))
-	    {
-	      files[numfiles++] = basename (psymtab->filename);
-	    }
-	}
-    }
-
-  ALL_SYMTABS (objfile, symtab)
-    {
-      if (numfiles == files_size)
-	{
-	  files_size = files_size * 2;
-	  files = (char **) xrealloc (files, sizeof (char *) * files_size);
-	}
-      if (symtab->filename && symtab->linetable && symtab->linetable->nitems)
-	{
-	  if (!len || !strncmp (pathname, symtab->filename, len)
-	      || !strcmp (symtab->filename, basename (symtab->filename)))
-	    {
-	      files[numfiles++] = basename (symtab->filename);
-	    }
-	}
-    }
-
-  qsort (files, numfiles, sizeof (char *), comp_files);
-
-  lastfile = "";
-
-  /* Discard the old result pointer, in case it has accumulated anything
-     and set it to a new list object */
-
-  Tcl_SetListObj (result_ptr->obj_ptr, 0, NULL);
-
-  for (i = 0; i < numfiles; i++)
-    {
-      if (strcmp (files[i], lastfile))
-	Tcl_ListObjAppendElement (interp, result_ptr->obj_ptr,
-				  Tcl_NewStringObj (files[i], -1));
-      lastfile = files[i];
-    }
-
-  free (files);
-  return TCL_OK;
-}
-
-static int
-comp_files (const void *file1, const void *file2)
-{
-  return strcmp (*(char **) file1, *(char **) file2);
-}
-
-
-/* This implements the tcl command "gdb_search"
-
-
-* Tcl Arguments:
-*    option - One of "functions", "variables" or "types"
-*    regexp - The regular expression to look for.
-* Then, optionally:
-*    -files fileList
-*    -static 1/0
-*    -filename 1/0
-* Tcl Result:
-*    A list of all the matches found.  Optionally, if -filename is set to 1,
-*    then the output is a list of two element lists, with the symbol first,
-*    and the file in which it is found second.
-*/
-
-static int
-gdb_search (ClientData clientData, Tcl_Interp *interp,
-	    int objc, Tcl_Obj *CONST objv[])
-{
-  struct symbol_search *ss = NULL;
-  struct symbol_search *p;
-  struct cleanup *old_chain = NULL;
-  Tcl_Obj *CONST * switch_objv;
-  int index, switch_objc, i, show_files = 0;
-  namespace_enum space = 0;
-  char *regexp;
-  int static_only, nfiles;
-  Tcl_Obj **file_list;
-  char **files;
-  static const char *search_options[] =
-    {"functions", "variables", "types", (char *) NULL};
-  static const char *switches[] =
-    {"-files", "-filename", "-static", (char *) NULL};
-  enum search_opts
-    {
-      SEARCH_FUNCTIONS, SEARCH_VARIABLES, SEARCH_TYPES
-    };
-  enum switches_opts
-    {
-      SWITCH_FILES, SWITCH_FILENAME, SWITCH_STATIC_ONLY
-    };
-
-  if (objc < 3)
-    {
-      Tcl_WrongNumArgs (interp, 1, objv, "option regexp ?arg ...?");
-      return TCL_ERROR;
-    }
-
-  if (Tcl_GetIndexFromObj (interp, objv[1], search_options, "option", 0,
-			   &index) != TCL_OK)
-    {
-      result_ptr->flags |= GDBTK_IN_TCL_RESULT;
-      return TCL_ERROR;
-    }
-
-  /* Unfortunately, we cannot teach search_symbols to search on
-     multiple regexps, so we have to do a two-tier search for
-     any searches which choose to narrow the playing field. */
-  switch ((enum search_opts) index)
-    {
-    case SEARCH_FUNCTIONS:
-      space = FUNCTIONS_NAMESPACE;
-      break;
-    case SEARCH_VARIABLES:
-      space = VARIABLES_NAMESPACE;
-      break;
-    case SEARCH_TYPES:
-      space = TYPES_NAMESPACE;
-      break;
-    }
-
-  regexp = Tcl_GetStringFromObj (objv[2], NULL);
-  /* Process any switches that refine the search */
-  switch_objc = objc - 3;
-  switch_objv = objv + 3;
-
-  static_only = 0;
-  nfiles = 0;
-  files = (char **) NULL;
-  while (switch_objc > 0)
-    {
-      if (Tcl_GetIndexFromObj (interp, switch_objv[0], switches,
-			       "option", 0, &index) != TCL_OK)
-	{
-	  result_ptr->flags |= GDBTK_IN_TCL_RESULT;
-	  return TCL_ERROR;
-	}
-
-      switch ((enum switches_opts) index)
-	{
-	case SWITCH_FILENAME:
-	  {
-	    if (switch_objc < 2)
-	      {
-		Tcl_WrongNumArgs (interp, 3, objv,
-				  "?-files fileList  -filename 1|0 -static 1|0?");
-		result_ptr->flags |= GDBTK_IN_TCL_RESULT;
-		return TCL_ERROR;
-	      }
-	    if (Tcl_GetBooleanFromObj (interp, switch_objv[1], &show_files)
-		!= TCL_OK)
-	      {
-		result_ptr->flags |= GDBTK_IN_TCL_RESULT;
-		return TCL_ERROR;
-	      }
-	    switch_objc--;
-	    switch_objv++;
-	  }
-	  break;
-	case SWITCH_FILES:
-	  {
-	    int result;
-	    if (switch_objc < 2)
-	      {
-		Tcl_WrongNumArgs (interp, 3, objv,
-				  "?-files fileList  -filename 1|0 -static 1|0?");
-		result_ptr->flags |= GDBTK_IN_TCL_RESULT;
-		return TCL_ERROR;
-	      }
-	    result = Tcl_ListObjGetElements (interp, switch_objv[1],
-					     &nfiles, &file_list);
-	    if (result != TCL_OK)
-	      return result;
-
-	    files = (char **) xmalloc (nfiles * sizeof (char *));
-	    for (i = 0; i < nfiles; i++)
-	      files[i] = Tcl_GetStringFromObj (file_list[i], NULL);
-	    switch_objc--;
-	    switch_objv++;
-	  }
-	  break;
-	case SWITCH_STATIC_ONLY:
-	  if (switch_objc < 2)
-	    {
-	      Tcl_WrongNumArgs (interp, 3, objv,
-				"?-files fileList  -filename 1|0 -static 1|0?");
-	      result_ptr->flags |= GDBTK_IN_TCL_RESULT;
-	      return TCL_ERROR;
-	    }
-	  if (Tcl_GetBooleanFromObj (interp, switch_objv[1], &static_only)
-	      != TCL_OK)
-	    {
-	      result_ptr->flags |= GDBTK_IN_TCL_RESULT;
-	      return TCL_ERROR;
-	    }
-	  switch_objc--;
-	  switch_objv++;
-	}
-      switch_objc--;
-      switch_objv++;
-    }
-
-  search_symbols (regexp, space, nfiles, files, &ss);
-  if (ss != NULL)
-    old_chain = make_cleanup_free_search_symbols (ss);
-
-  Tcl_SetListObj (result_ptr->obj_ptr, 0, NULL);
-
-  for (p = ss; p != NULL; p = p->next)
-    {
-      Tcl_Obj *elem;
-
-      if (static_only && p->block != STATIC_BLOCK)
-	continue;
-
-      /* Strip off some C++ special symbols, like RTTI and global
-         constructors/destructors. */
-      if ((p->symbol != NULL && !STREQN (DEPRECATED_SYMBOL_NAME (p->symbol), "__tf", 4)
-	   && !STREQN (DEPRECATED_SYMBOL_NAME (p->symbol), "_GLOBAL_", 8))
-	  || p->msymbol != NULL)
-	{
-	  elem = Tcl_NewListObj (0, NULL);
-
-	  if (p->msymbol == NULL)
-	    Tcl_ListObjAppendElement (interp, elem,
-				      Tcl_NewStringObj (SYMBOL_PRINT_NAME (p->symbol), -1));
-	  else
-	    Tcl_ListObjAppendElement (interp, elem,
-				      Tcl_NewStringObj (SYMBOL_PRINT_NAME (p->msymbol), -1));
-
-	  if (show_files)
-	    {
-	      if ((p->symtab != NULL) && (p->symtab->filename != NULL))
-		{
-		  Tcl_ListObjAppendElement (interp, elem, Tcl_NewStringObj
-					    (p->symtab->filename, -1));
-		}
-	      else
-		{
-		  Tcl_ListObjAppendElement (interp, elem,
-					    Tcl_NewStringObj ("", 0));
-		}
-	    }
-
-	  Tcl_ListObjAppendElement (interp, result_ptr->obj_ptr, elem);
-	}
-    }
-
-  if (ss != NULL)
-    do_cleanups (old_chain);
-
-  return TCL_OK;
-}
-
-/* This implements the tcl command gdb_listfuncs
-
-* It lists all the functions defined in a given file
-* 
-* Arguments:
-*    file - the file to look in
-* Tcl Result:
-*    A list of two element lists, the first element is
-*    the symbol name, and the second is a boolean indicating
-*    whether the symbol is demangled (1 for yes).
-*/
-
-static int
-gdb_listfuncs (clientData, interp, objc, objv)
-     ClientData clientData;
-     Tcl_Interp *interp;
-     int objc;
-     Tcl_Obj *CONST objv[];
-{
-  struct symtab *symtab;
-  struct blockvector *bv;
-  struct block *b;
-  struct symbol *sym;
-  int i, j;
-  Tcl_Obj *funcVals[2];
-
-  if (objc != 2)
-    {
-      Tcl_WrongNumArgs (interp, 1, objv, "file");
-      return TCL_ERROR;
-    }
-
-  symtab = lookup_symtab (Tcl_GetStringFromObj (objv[1], NULL));
-  if (!symtab)
-    {
-      gdbtk_set_result (interp, "No such file (%s)", 
-			Tcl_GetStringFromObj (objv[1], NULL));
-      return TCL_ERROR;
-    }
-  
-  if (mangled == NULL)
-    {
-      mangled = Tcl_NewBooleanObj (1);
-      not_mangled = Tcl_NewBooleanObj (0);
-      Tcl_IncrRefCount (mangled);
-      Tcl_IncrRefCount (not_mangled);
-    }
-
-  Tcl_SetListObj (result_ptr->obj_ptr, 0, NULL);
-
-  bv = BLOCKVECTOR (symtab);
-  for (i = GLOBAL_BLOCK; i <= STATIC_BLOCK; i++)
-    {
-      b = BLOCKVECTOR_BLOCK (bv, i);
-      ALL_BLOCK_SYMBOLS (b, j, sym)
-	{
-	  if (SYMBOL_CLASS (sym) == LOC_BLOCK)
-	    {
-
-	      char *name = SYMBOL_DEMANGLED_NAME (sym);
-
-	      if (name)
-		{
-		  /* strip out "global constructors" and
-		   * "global destructors"
-		   * because we aren't interested in them. */
-		  
-		  if (strncmp (name, "global ", 7))
-		    {
-		      /* If the function is overloaded,
-		       * print out the functions
-		       * declaration, not just its name. */
-
-		      funcVals[0] = Tcl_NewStringObj (name, -1);
-		      funcVals[1] = mangled;
-		    }
-		  else
-		    continue;
-
-		}
-	      else
-		{
-		  funcVals[0] = Tcl_NewStringObj (DEPRECATED_SYMBOL_NAME (sym), -1);
-		  funcVals[1] = not_mangled;
-		}
-	      Tcl_ListObjAppendElement (NULL, result_ptr->obj_ptr,
-					Tcl_NewListObj (2, funcVals));
-	    }
-	}
-    }
-  return TCL_OK;
-}
-
-/* This implements the TCL command `gdb_restore_fputs'
-   It sets the fputs_unfiltered hook back to gdbtk_fputs.
-   Its sole reason for being is that sometimes we move the
-   fputs hook out of the way to specially trap output, and if
-   we get an error which we weren't expecting, it won't get put
-   back, so we run this at idle time as insurance.
-*/
-
-static int
-gdb_restore_fputs (ClientData clientData, Tcl_Interp *interp,
-		   int objc, Tcl_Obj *CONST objv[])
-{
-  gdbtk_disable_fputs = 0;
-  return TCL_OK;
-}
-
-
-/* This implements the tcl command gdb_load_disassembly
- *
- * Arguments:
- *    widget - the name of a text widget into which to load the data
- *    source_with_assm - must be "source" or "nosource"
- *    low_address - the CORE_ADDR from which to start disassembly
- *    ?hi_address? - the CORE_ADDR to which to disassemble, defaults
- *                   to the end of the function containing low_address.
- * Tcl Result:
- *    The text widget is loaded with the data, and a list is returned.
- *    The first element of the list is a two element list containing the
- *    real low & high elements, the rest is a mapping between line number
- *    in the text widget, and either the source line number of that line,
- *    if it is a source line, or the assembly address.  You can distinguish
- *    between the two, because the address will start with 0x...
- */
-
-static int
-gdb_load_disassembly (ClientData clientData, Tcl_Interp *interp,
-		      int objc, Tcl_Obj *CONST objv[])
-{
-  CORE_ADDR low, high, orig;
-  struct disassembly_client_data client_data;
-  int mixed_source_and_assembly, ret_val, i;
-  char *arg_ptr;
-  char *map_name;
-  Tcl_WideInt waddr;
-
-  if (objc != 6 && objc != 7)
-    {
-      Tcl_WrongNumArgs (interp, 1, objv, "[source|nosource] map_arr index_prefix low_address ?hi_address");
-      return TCL_ERROR;
-    }
-
-  client_data.widget = Tcl_GetStringFromObj (objv[1], NULL);
-  if ( Tk_NameToWindow (interp, client_data.widget,
-			Tk_MainWindow (interp)) == NULL)
-    {
-      gdbtk_set_result (interp, "Invalid widget name.");
-      return TCL_ERROR;
-    }
-
-  if (!Tcl_GetCommandInfo (interp, client_data.widget, &client_data.cmd))
-    {
-      gdbtk_set_result (interp, "Can't get widget command info");
-      return TCL_ERROR;
-    }
-
-  arg_ptr = Tcl_GetStringFromObj (objv[2], NULL);
-  if (*arg_ptr == 's' && strcmp (arg_ptr, "source") == 0)
-    mixed_source_and_assembly = 1;
-  else if (*arg_ptr == 'n' && strcmp (arg_ptr, "nosource") == 0)
-    mixed_source_and_assembly = 0;
-  else
-    {
-      gdbtk_set_result (interp, "Second arg must be 'source' or 'nosource'");
-      return TCL_ERROR;
-    }
-
-  /* As we populate the text widget, we will also create an array in the
-     caller's scope.  The name is given by objv[3].
-     Each source line gets an entry or the form:
-     array($prefix,srcline=$src_line_no) = $widget_line_no
-
-     Each assembly line gets two entries of the form:
-     array($prefix,pc=$pc) = $widget_line_no
-     array($prefix,line=$widget_line_no) = $src_line_no
-
-     Where prefix is objv[4].
-  */
-    
-  map_name = Tcl_GetStringFromObj (objv[3], NULL);
-
-  if (*map_name != '\0')
-    {
-      char *prefix;
-      int prefix_len;
-      
-      client_data.map_arr = "map_array";
-      if (Tcl_UpVar (interp, "1", map_name, client_data.map_arr, 0) != TCL_OK)
-	{
-	  gdbtk_set_result (interp, "Can't link map array.");
-	  return TCL_ERROR;
-	}
-
-      prefix = Tcl_GetStringFromObj (objv[4], &prefix_len);
-      
-      Tcl_DStringInit(&client_data.src_to_line_prefix);
-      Tcl_DStringAppend (&client_data.src_to_line_prefix,
-			 prefix, prefix_len);
-      Tcl_DStringAppend (&client_data.src_to_line_prefix, ",srcline=",
-			 sizeof (",srcline=") - 1);
-			      
-      Tcl_DStringInit(&client_data.pc_to_line_prefix);
-      Tcl_DStringAppend (&client_data.pc_to_line_prefix,
-			 prefix, prefix_len);
-      Tcl_DStringAppend (&client_data.pc_to_line_prefix, ",pc=",
-			 sizeof (",pc=") - 1);
-      
-      Tcl_DStringInit(&client_data.line_to_pc_prefix);
-      Tcl_DStringAppend (&client_data.line_to_pc_prefix,
-			 prefix, prefix_len);
-      Tcl_DStringAppend (&client_data.line_to_pc_prefix, ",line=",
-			 sizeof (",line=") - 1);
-
-    }
-  else
-    {
-      client_data.map_arr = "";
-    }
-
-  /* Now parse the addresses */
-  if (Tcl_GetWideIntFromObj (interp, objv[5], &waddr) != TCL_OK)
-    return TCL_ERROR;
-  low = waddr;
-
-  orig = low;
-
-  if (objc == 6)
-    {
-      if (find_pc_partial_function (low, NULL, &low, &high) == 0)
-	error ("No function contains address 0x%s", core_addr_to_string (orig));
-    }
-  else
-    {
-      if (Tcl_GetWideIntFromObj (interp, objv[6], &waddr) != TCL_OK)
-	return TCL_ERROR;
-      high = waddr;
-    }
-  
-  /* Setup the client_data structure, and call the driver function. */
-  
-  client_data.file_opened_p = 0;
-  client_data.widget_line_no = 0;
-  client_data.interp = interp;
-  for (i = 0; i < 3; i++)
-    {
-      client_data.result_obj[i] = Tcl_NewObj();
-      Tcl_IncrRefCount (client_data.result_obj[i]);
-    }
-
-  /* Fill up the constant parts of the argv structures */
-  client_data.asm_argv[0] = client_data.widget;
-  client_data.asm_argv[1] = "insert";
-  client_data.asm_argv[2] = "end";
-  client_data.asm_argv[3] = "-\t";
-  client_data.asm_argv[4] = "break_rgn_tag";
-  /* client_data.asm_argv[5] = address; */
-  client_data.asm_argv[6] = "break_rgn_tag";
-  /* client_data.asm_argv[7] = offset; */
-  client_data.asm_argv[8] = "break_rgn_tag";
-  client_data.asm_argv[9] = ":\t\t";
-  client_data.asm_argv[10] = "source_tag";
-  /* client_data.asm_argv[11] = code; */
-  client_data.asm_argv[12] = "source_tag";
-  client_data.asm_argv[13] = "\n";
-
-  if (mixed_source_and_assembly)
-    {
-      client_data.source_argv[0] = client_data.widget;
-      client_data.source_argv[1] = "insert";
-      client_data.source_argv[2] = "end";
-      /* client_data.source_argv[3] = line_number; */
-      client_data.source_argv[4] = "";
-      /* client_data.source_argv[5] = line; */
-      client_data.source_argv[6] = "source_tag2";
-    }
-  
-  ret_val = gdb_disassemble_driver (low, high, mixed_source_and_assembly, 
-				    (ClientData) &client_data,
-				    gdbtk_load_source, gdbtk_load_asm);
-
-  /* Now clean up the opened file, and the Tcl data structures */
-  
-  if (client_data.file_opened_p == 1) 
-    fclose(client_data.fp);
-  
-  if (*client_data.map_arr != '\0')
-    {
-      Tcl_DStringFree(&client_data.src_to_line_prefix);
-      Tcl_DStringFree(&client_data.pc_to_line_prefix);
-      Tcl_DStringFree(&client_data.line_to_pc_prefix);
-    }
-  
-  for (i = 0; i < 3; i++)
-    {
-      Tcl_DecrRefCount (client_data.result_obj[i]);
-    }
-  
-  /* Finally, if we were successful, stick the low & high addresses
-     into the Tcl result. */
-
-  if (ret_val == TCL_OK) 
-    {
-      Tcl_ListObjAppendElement (NULL, result_ptr->obj_ptr,
-				Tcl_NewStringObj (core_addr_to_string (low), -1));
-      Tcl_ListObjAppendElement (NULL, result_ptr->obj_ptr,
-				Tcl_NewStringObj (core_addr_to_string (high), -1));
-    }
-  return ret_val;
-}
-
-static void
-gdbtk_load_source (ClientData clientData, struct symtab *symtab, 
-		   int start_line, int end_line)
-{
-  struct disassembly_client_data *client_data =
-    (struct disassembly_client_data *) clientData;
-  char *buffer;
-  int index_len;
-
-  index_len = Tcl_DStringLength (&client_data->src_to_line_prefix);
-  
-  if (client_data->file_opened_p == 1)
-    {
-      const char **text_argv;
-      char line[10000], line_number[18];
-      int found_carriage_return = 1;
-
-      /* First do some sanity checks on the requested lines */
-
-      if (start_line < 1
-	  || end_line < start_line || end_line > symtab->nlines)
-	{
-	  return;
-	}
-
-      line_number[0] = '\t';
-      line[0] = '\t';
-
-      text_argv = client_data->source_argv;
-      
-      text_argv[3] = line_number;
-      text_argv[5] = line;
-
-      if (fseek (client_data->fp, symtab->line_charpos[start_line - 1],
-		 SEEK_SET) < 0)
-	{
-	  fclose(client_data->fp);
-	  client_data->file_opened_p = -1;
-	  return;
-	}
-      
-      for (; start_line < end_line; start_line++)
-	{
-	  if (!fgets (line + 1, 9980, client_data->fp))
-	    {
-	      fclose(client_data->fp);
-	      client_data->file_opened_p = -1;
-	      return;
-	    }
-
-	  client_data->widget_line_no++;
-	  
-	  sprintf (line_number + 1, "%d", start_line);
-	  
-	  if (found_carriage_return)
-	    {
-	      char *p = strrchr(line, '\0') - 2;
-	      if (*p == '\r')
-		{
-		  *p = '\n';
-		  *(p + 1) = '\0';
-		}
-	      else 
-		found_carriage_return = 0;
-	    }
-	  
-	  /* Run the command, then add an entry to the map array in
-	     the caller's scope, if requested. */
-	  
-	  client_data->cmd.proc (client_data->cmd.clientData, 
-				 client_data->interp, 7, text_argv);
-	  
-	  if (*client_data->map_arr != '\0')
-	    {
-	      
-	      Tcl_DStringAppend (&client_data->src_to_line_prefix,
-				 line_number + 1, -1);
-	      
-	      /* FIXME: Convert to Tcl_SetVar2Ex when we move to 8.2.  This
-		 will allow us avoid converting widget_line_no into a string. */
-	      
-	      xasprintf (&buffer, "%d", client_data->widget_line_no);
-	      
-	      Tcl_SetVar2 (client_data->interp, client_data->map_arr,
-			   Tcl_DStringValue (&client_data->src_to_line_prefix),
-			   buffer, 0);
-	      free(buffer);
-	      
-	      Tcl_DStringSetLength (&client_data->src_to_line_prefix, index_len);
-	    }
-	}
-      
-    }
-  else if (!client_data->file_opened_p)
-    {
-      int fdes;
-      /* The file is not yet open, try to open it, then print the
-	 first line.  If we fail, set FILE_OPEN_P to -1. */
-      
-      fdes = open_source_file (symtab);
-      if (fdes < 0)
-	{
-	  client_data->file_opened_p = -1;
-	}
-      else
-	{
-          /* FIXME: Convert to a Tcl File Channel and read from there.
-	     This will allow us to get the line endings and conversion
-	     to UTF8 right automatically when we move to 8.2.
-	     Need a Cygwin call to convert a file descriptor to the native
-	     Windows handler to do this. */
-	     
-	  client_data->file_opened_p = 1;
-	  client_data->fp = fdopen (fdes, FOPEN_RB);
-	  clearerr (client_data->fp);
-	  
-          if (symtab->line_charpos == 0)
-            find_source_lines (symtab, fdes);
-
-	  /* We are called with an actual load request, so call ourselves
-	     to load the first line. */
-	  
-	  gdbtk_load_source (clientData, symtab, start_line, end_line);
-	}
-    }
-  else 
-    {
-      /* If we couldn't open the file, or got some prior error, just exit. */
-      return;
-    }
-}
-
-
-static CORE_ADDR
-gdbtk_load_asm (ClientData clientData, CORE_ADDR pc, 
-		struct disassemble_info *di)
-{
-  struct disassembly_client_data * client_data
-    = (struct disassembly_client_data *) clientData;
-  const char **text_argv;
-  int i, pc_to_line_len, line_to_pc_len;
-  gdbtk_result new_result;
-  int insn;
-  struct cleanup *old_chain = NULL;
-
-  pc_to_line_len = Tcl_DStringLength (&client_data->pc_to_line_prefix);
-  line_to_pc_len = Tcl_DStringLength (&client_data->line_to_pc_prefix);
-    
-  text_argv = client_data->asm_argv;
-  
-  /* Preserve the current Tcl result object, print out what we need, and then
-     suck it out of the result, and replace... */
-
-  old_chain = make_cleanup (gdbtk_restore_result_ptr, (void *) result_ptr);
-  result_ptr = &new_result;
-  result_ptr->obj_ptr = client_data->result_obj[0];
-  result_ptr->flags = GDBTK_TO_RESULT;
-
-  /* Null out the three return objects we will use. */
-
-  for (i = 0; i < 3; i++)
-    Tcl_SetObjLength (client_data->result_obj[i], 0);
-
-  print_address_numeric (pc, 1, gdb_stdout);
-  gdb_flush (gdb_stdout);
-
-  result_ptr->obj_ptr = client_data->result_obj[1];
-  print_address_symbolic (pc, gdb_stdout, 1, "\t");
-  gdb_flush (gdb_stdout);
-
-  result_ptr->obj_ptr = client_data->result_obj[2];
-  insn = TARGET_PRINT_INSN (pc, di);
-  gdb_flush (gdb_stdout);
-
-  client_data->widget_line_no++;
-
-  text_argv[5] = Tcl_GetStringFromObj (client_data->result_obj[0], NULL);
-  text_argv[7] = Tcl_GetStringFromObj (client_data->result_obj[1], NULL);
-  text_argv[11] = Tcl_GetStringFromObj (client_data->result_obj[2], NULL);
-
-  client_data->cmd.proc (client_data->cmd.clientData, 
-			 client_data->interp, 14, text_argv);
-
-  if (*client_data->map_arr != '\0')
-    {
-      char *buffer;
-      
-      /* Run the command, then add an entry to the map array in
-	 the caller's scope. */
-      
-      Tcl_DStringAppend (&client_data->pc_to_line_prefix, core_addr_to_string (pc), -1);
-      
-      /* FIXME: Convert to Tcl_SetVar2Ex when we move to 8.2.  This
-	 will allow us avoid converting widget_line_no into a string. */
-      
-      xasprintf (&buffer, "%d", client_data->widget_line_no);
-      
-      Tcl_SetVar2 (client_data->interp, client_data->map_arr,
-		   Tcl_DStringValue (&client_data->pc_to_line_prefix),
-		   buffer, 0);
-
-      Tcl_DStringAppend (&client_data->line_to_pc_prefix, buffer, -1);
-      
-
-      Tcl_SetVar2 (client_data->interp, client_data->map_arr,
-		   Tcl_DStringValue (&client_data->line_to_pc_prefix),
-		   core_addr_to_string (pc), 0);
-      
-      /* Restore the prefixes to their initial state. */
-      
-      Tcl_DStringSetLength (&client_data->pc_to_line_prefix, pc_to_line_len);      
-      Tcl_DStringSetLength (&client_data->line_to_pc_prefix, line_to_pc_len);      
-      
-      xfree (buffer);
-    }
-  
-  do_cleanups (old_chain);
-
-  return pc + insn;
-}
-
-static int
-gdb_disassemble_driver (CORE_ADDR low, CORE_ADDR high, 
-			int mixed_source_and_assembly,
-			ClientData clientData, 
-			void (*print_source_fn) (ClientData, struct symtab *, int, int),
-			CORE_ADDR (*print_asm_fn) (ClientData, CORE_ADDR, struct disassemble_info *))
-{
-  CORE_ADDR pc;
-  static disassemble_info di;
-  static int di_initialized;
-
-  if (! di_initialized)
-    {
-      INIT_DISASSEMBLE_INFO_NO_ARCH (di, gdb_stdout,
-                                     (fprintf_ftype) fprintf_unfiltered);
-      di.flavour = bfd_target_unknown_flavour;
-      /* NOTE: cagney/2003-04: This all goes away, along with this
-         function, when insight starts using the "disasm.h"
-         disassembler.  */
-      di.memory_error_func = deprecated_tm_print_insn_info.memory_error_func;
-      di.print_address_func = deprecated_tm_print_insn_info.print_address_func;
-      di_initialized = 1;
-    }
-
-  di.mach = deprecated_tm_print_insn_info.mach;
-  if (TARGET_BYTE_ORDER == BFD_ENDIAN_BIG)
-    di.endian = BFD_ENDIAN_BIG;
-  else
-    di.endian = BFD_ENDIAN_LITTLE;
-
-  /* Set the architecture for multi-arch configurations. */
-  if (TARGET_ARCHITECTURE != NULL)
-    di.mach = TARGET_ARCHITECTURE->mach;
-
-  /* If disassemble_from_exec == -1, then we use the following heuristic to
-     determine whether or not to do disassembly from target memory or from the
-     exec file:
-
-     If we're debugging a local process, read target memory, instead of the
-     exec file.  This makes disassembly of functions in shared libs work
-     correctly.  Also, read target memory if we are debugging native threads.
-
-     Else, we're debugging a remote process, and should disassemble from the
-     exec file for speed.  However, this is no good if the target modifies its
-     code (for relocation, or whatever).
-
-     As an aside, it is fairly bogus that there is not a better way to
-     determine where to disassemble from.  There should be a target vector
-     entry for this or something.
-     
-  */
-
-  if (disassemble_from_exec == -1)
-    {
-      if (strcmp (target_shortname, "child") == 0
-          || strcmp (target_shortname, "procfs") == 0
-          || strcmp (target_shortname, "vxprocess") == 0
-	  || strstr (target_shortname, "thread") != NULL)
-	/* It's a child process, read inferior mem */
-        disassemble_from_exec = 0; 
-      else
-	/* It's remote, read the exec file */
-        disassemble_from_exec = 1; 
-    }
-
-  if (disassemble_from_exec)
-    di.read_memory_func = gdbtk_dis_asm_read_memory;
-  else
-    di.read_memory_func = deprecated_tm_print_insn_info.read_memory_func;
-
-  /* If just doing straight assembly, all we need to do is disassemble
-     everything between low and high.  If doing mixed source/assembly, we've
-     got a totally different path to follow.  */
-
-  if (mixed_source_and_assembly)
-    {				/* Come here for mixed source/assembly */
-      /* The idea here is to present a source-O-centric view of a function to
-         the user.  This means that things are presented in source order, with
-         (possibly) out of order assembly immediately following.  */
-      struct symtab *symtab;
-      struct linetable_entry *le;
-      int nlines;
-      int newlines;
-      struct my_line_entry *mle;
-      struct symtab_and_line sal;
-      int i;
-      int out_of_order;
-      int next_line;
-      
-      /* Assume symtab is valid for whole PC range */
-      symtab = find_pc_symtab (low); 
-
-      if (!symtab || !symtab->linetable)
-        goto assembly_only;
-
-      /* First, convert the linetable to a bunch of my_line_entry's.  */
-
-      le = symtab->linetable->item;
-      nlines = symtab->linetable->nitems;
-
-      if (nlines <= 0)
-        goto assembly_only;
-
-      mle = (struct my_line_entry *) alloca (nlines *
-					     sizeof (struct my_line_entry));
-
-      out_of_order = 0;
-      
-      /* Copy linetable entries for this function into our data structure,
-	 creating end_pc's and setting out_of_order as appropriate.  */
-
-      /* First, skip all the preceding functions.  */
-
-      for (i = 0; i < nlines - 1 && le[i].pc < low; i++) ;
-
-      /* Now, copy all entries before the end of this function.  */
-
-      newlines = 0;
-      for (; i < nlines - 1 && le[i].pc < high; i++)
-        {
-          if (le[i].line == le[i + 1].line
-              && le[i].pc == le[i + 1].pc)
-            continue;		/* Ignore duplicates */
-
-	  /* Skip any end-of-function markers.  */
-	  if (le[i].line == 0)
-	    continue;
-
-	  mle[newlines].line = le[i].line;
-          if (le[i].line > le[i + 1].line)
-            out_of_order = 1;
-          mle[newlines].start_pc = le[i].pc;
-          mle[newlines].end_pc = le[i + 1].pc;
-          newlines++;
-        }
-
-      /* If we're on the last line, and it's part of the function, then we 
-         need to get the end pc in a special way.  */
-
-      if (i == nlines - 1
-          && le[i].pc < high)
-        {
-          mle[newlines].line = le[i].line;
-          mle[newlines].start_pc = le[i].pc;
-          sal = find_pc_line (le[i].pc, 0);
-          mle[newlines].end_pc = sal.end;
-          newlines++;
-        }
-
-      /* Now, sort mle by line #s (and, then by addresses within lines). */
-
-      if (out_of_order)
-        qsort (mle, newlines, sizeof (struct my_line_entry), compare_lines);
-
-      /* Now, for each line entry, emit the specified lines (unless they have
-	 been emitted before), followed by the assembly code for that line.  */
-
-      next_line = 0;		/* Force out first line */
-      for (i = 0; i < newlines; i++)
-        {
-          /* Print out everything from next_line to the current line.  */
-
-          if (mle[i].line >= next_line)
-            {
-              if (next_line != 0)
-                print_source_fn (clientData, symtab, next_line,
-				 mle[i].line + 1);
-              else
-                print_source_fn (clientData, symtab, mle[i].line,
-				 mle[i].line + 1);
-
-              next_line = mle[i].line + 1;
-            }
-
-          for (pc = mle[i].start_pc; pc < mle[i].end_pc; )
-            {
-              QUIT;
-	      pc = print_asm_fn (clientData, pc, &di);
-            }
-        }
-    }
-  else
-    {
-    assembly_only:
-      for (pc = low; pc < high; )
-        {
-          QUIT;
-	  pc = print_asm_fn (clientData, pc, &di);
-        }
-    }
-
-  return TCL_OK;
-}
-
-/* This is the memory_read_func for gdb_disassemble_driver when we are
-   disassembling from the exec file. */
-
-static int
-gdbtk_dis_asm_read_memory (bfd_vma memaddr, bfd_byte *myaddr,
-			   unsigned int len, disassemble_info *info)
-{
-  extern struct target_ops exec_ops;
-  int res;
-
-  errno = 0;
-  res = xfer_memory (memaddr, myaddr, len, 0, 0, &exec_ops);
-
-  if (res == len)
-    return 0;
-  else if (errno == 0)
-    return EIO;
-  else
-    return errno;
-}
-
-/* This will be passed to qsort to sort the results of the disassembly */
-
-static int
-compare_lines (const PTR mle1p, const PTR mle2p)
-{
-  struct my_line_entry *mle1, *mle2;
-  int val;
-
-  mle1 = (struct my_line_entry *) mle1p;
-  mle2 = (struct my_line_entry *) mle2p;
-
-  val = mle1->line - mle2->line;
-
-  if (val != 0)
-    return val;
-
-  return mle1->start_pc - mle2->start_pc;
-}
-
-/* This implements the TCL command `gdb_loc',
-
-* Arguments:
-*    ?symbol? The symbol or address to locate - defaults to pc
-* Tcl Return:
-*    a list consisting of the following:                                  
-*       basename, function name, filename, line number, address, current pc
-*/
-
-static int
-gdb_loc (ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
-{
-  char *filename;
-  struct symtab_and_line sal;
-  char *fname;
-  CORE_ADDR pc;
-
-  if (objc == 1)
-    {
-      if (deprecated_selected_frame
-	  && (get_frame_pc (deprecated_selected_frame) != read_pc ()))
-        {
-          /* Note - this next line is not correct on all architectures.
-	     For a graphical debugger we really want to highlight the 
-	     assembly line that called the next function on the stack.
-	     Many architectures have the next instruction saved as the
-	     pc on the stack, so what happens is the next instruction 
-	     is highlighted. FIXME */
-	  pc = get_frame_pc (deprecated_selected_frame);
-	  find_frame_sal (deprecated_selected_frame, &sal);
-	}
-      else
-        {
-          pc = read_pc ();
-          sal = find_pc_line (pc, 0);
-        }
-    }
-  else if (objc == 2)
-    {
-      struct symtabs_and_lines sals;
-      int nelts;
-
-      sals = decode_line_spec (Tcl_GetStringFromObj (objv[1], NULL), 1);
-
-      nelts = sals.nelts;
-      sal = sals.sals[0];
-      free (sals.sals);
-
-      if (sals.nelts != 1)
-	{
-	  gdbtk_set_result (interp, "Ambiguous line spec", -1);
-	  return TCL_ERROR;
-	}
-      resolve_sal_pc (&sal);
-      pc = sal.pc;
-    }
-  else
-    {
-      Tcl_WrongNumArgs (interp, 1, objv, "?symbol?");
-      return TCL_ERROR;
-    }
-
-  if (sal.symtab)
-    Tcl_ListObjAppendElement (NULL, result_ptr->obj_ptr,
-			      Tcl_NewStringObj (sal.symtab->filename, -1));
-  else
-    Tcl_ListObjAppendElement (NULL, result_ptr->obj_ptr,
-			      Tcl_NewStringObj ("", 0));
-
-  fname = pc_function_name (pc);
-  Tcl_ListObjAppendElement (NULL, result_ptr->obj_ptr,
-			    Tcl_NewStringObj (fname, -1));
-
-  filename = symtab_to_filename (sal.symtab);
-  if (filename == NULL)
-    filename = "";
-
-  /* file name */
-  Tcl_ListObjAppendElement (NULL, result_ptr->obj_ptr, Tcl_NewStringObj (filename, -1));
-  /* line number */
-  Tcl_ListObjAppendElement (NULL, result_ptr->obj_ptr, Tcl_NewIntObj (sal.line));
-  /* PC in current frame */
-  Tcl_ListObjAppendElement (NULL, result_ptr->obj_ptr, 
-			    Tcl_NewStringObj (core_addr_to_string (pc), -1));
-  /* Real PC */
-  Tcl_ListObjAppendElement (NULL, result_ptr->obj_ptr, 
-			    Tcl_NewStringObj (core_addr_to_string (stop_pc), -1));
-  /* shared library */
-#ifdef PC_SOLIB
-  Tcl_ListObjAppendElement (NULL, result_ptr->obj_ptr,
-			    Tcl_NewStringObj (PC_SOLIB (pc), -1));
-#else
-  Tcl_ListObjAppendElement (NULL, result_ptr->obj_ptr,
-			    Tcl_NewStringObj ("", -1));
-#endif
-  return TCL_OK;
-}
-
-/* This implements the TCL command gdb_entry_point.  It returns the current
-   entry point address.  */
-
-static int
-gdb_entry_point (ClientData clientData, Tcl_Interp *interp,
-		 int objc, Tcl_Obj *CONST objv[])
-{
-  char *addrstr;
-
-  /* If we have not yet loaded an exec file, then we have no
-     entry point, so return an empty string.*/
-  if ((int) current_target.to_stratum > (int) dummy_stratum)
-    {
-      addrstr = (char *)core_addr_to_string (entry_point_address ());
-      Tcl_SetStringObj (result_ptr->obj_ptr, addrstr, -1);
-    }
-  else
-    Tcl_SetStringObj (result_ptr->obj_ptr, "", -1);
-
-  return TCL_OK;
-}
-
-/* Covert hex to binary. Stolen from remote.c,
-   but added error handling */
-static int
-fromhex (int a)
-{
-  if (a >= '0' && a <= '9')
-    return a - '0';
-  else if (a >= 'a' && a <= 'f')
-    return a - 'a' + 10;
-  else if (a >= 'A' && a <= 'F')
-    return a - 'A' + 10;
-
-  return -1;
-}
-
-static int
-hex2bin (const char *hex, char *bin, int count)
-{
-  int i, m, n;
-  int incr = 2;
-
-
-  if (TARGET_BYTE_ORDER == BFD_ENDIAN_LITTLE)
-    {
-      /* need to read string in reverse */
-      hex += count - 2;
-      incr = -2;
-    }
-
-  for (i = 0; i < count; i += 2)
-    {
-      if (hex[0] == 0 || hex[1] == 0)
-	{
-	  /* Hex string is short, or of uneven length.
-	     Return the count that has been converted so far. */
-	  return i;
-	}
-      m = fromhex (hex[0]);
-      n = fromhex (hex[1]);
-      if (m == -1 || n == -1)
-	return -1;
-      *bin++ = m * 16 + n;
-      hex += incr;
-    }
-
-  return i;
-}
-
-/* This implements the Tcl command 'gdb_set_mem', which
- * sets some chunk of memory.
- *
- * Arguments:
- *   gdb_set_mem addr hexstr len
- *
- *   addr:   address of data to set
- *   hexstr: ascii string of data to set
- *   len:    number of bytes of data to set
- */
-static int
-gdb_set_mem (ClientData clientData, Tcl_Interp *interp,
-	     int objc, Tcl_Obj *CONST objv[])
-{
-  CORE_ADDR addr;
-  char buf[128];
-  char *hexstr;
-  int len, size;
-
-  if (objc != 4)
-    {
-      Tcl_WrongNumArgs (interp, 1, objv, "addr hex_data len");
-      return TCL_ERROR;
-    }
-
-  /* Address to write */
-  addr = string_to_core_addr (Tcl_GetStringFromObj (objv[1], NULL));
-
-  /* String value to write: it's in hex */
-  hexstr = Tcl_GetStringFromObj (objv[2], NULL);
-  if (hexstr == NULL)
-    return TCL_ERROR;
-
-  /* Length of buf */
-  if (Tcl_GetIntFromObj (interp, objv[3], &len) != TCL_OK)
-    return TCL_ERROR;
-
-  /* Convert hexstr to binary and write */
-  if (hexstr[0] == '0' && hexstr[1] == 'x')
-    hexstr += 2;
-  size = hex2bin (hexstr, buf, strlen (hexstr));
-  if (size < 0)
-    {
-      /* Error in input */
-      gdbtk_set_result (interp, "Invalid hexadecimal input: \"0x%s\"", hexstr);
-      return TCL_ERROR;
-    }
-
-  target_write_memory (addr, buf, len);
-  return TCL_OK;
-}
-
-/* This implements the Tcl command 'gdb_update_mem', which 
- * updates a block of memory in the memory window
- *
- * Arguments:
- *   gdb_update_mem data addr form size nbytes bpr aschar
- *
- *   1 data: variable that holds table's data
- *   2 addr: address of data to dump
- *   3 mform: a char indicating format
- *   4 size: size of each element; 1,2,4, or 8 bytes
- *   5 nbytes: the number of bytes to read 
- *   6 bpr: bytes per row
- *   7 aschar: if present, an ASCII dump of the row is included.  ASCHAR
- *              used for unprintable characters.
- * 
- * Return:
- * a list of three integers: {border_col_width data_col_width ascii_col_width}
- * which can be used to set the table's column widths. */
-
-static int
-gdb_update_mem (ClientData clientData, Tcl_Interp *interp,
-		int objc, Tcl_Obj *CONST objv[])
-{
-  long dummy;
-  char index[20];
-  CORE_ADDR addr;
-  int nbytes, rnum, bpr;
-  int size, asize, i, j, bc;
-  int max_ascii_len, max_val_len, max_label_len;
-  char format, aschar;
-  char *data, *tmp;
-  char buff[128], *mbuf, *mptr, *cptr, *bptr;
-  struct ui_file *stb;
-  struct type *val_type;
-  struct cleanup *old_chain;
-
-  if (objc < 7 || objc > 8)
-    {
-      Tcl_WrongNumArgs (interp, 1, objv, "data addr format size bytes bytes_per_row ?ascii_char?");
-      return TCL_ERROR;
-    }
-
-  /* Get table data and link to a local variable */
-  data = Tcl_GetStringFromObj (objv[1], NULL);
-  if (data == NULL)
-    {
-      gdbtk_set_result (interp, "could not get data variable");
-      return TCL_ERROR;
-    }
-
-  if (Tcl_UpVar (interp, "1", data, "data", 0) != TCL_OK)
-    {
-      gdbtk_set_result (interp, "could not link table data");
-      return TCL_ERROR;
-    }
-
-  if (Tcl_GetIntFromObj (interp, objv[4], &size) != TCL_OK)
-    return TCL_ERROR;
-  else if (size <= 0)
-    {
-      gdbtk_set_result (interp, "Invalid size, must be > 0");
-      return TCL_ERROR;
-    }
-
-  if (Tcl_GetIntFromObj (interp, objv[5], &nbytes) != TCL_OK)
-    return TCL_ERROR;
-  else if (nbytes <= 0)
-    {
-      gdbtk_set_result (interp, "Invalid number of bytes, must be > 0");
-      return TCL_ERROR;
-    }
-
-  if (Tcl_GetIntFromObj (interp, objv[6], &bpr) != TCL_OK)
-    return TCL_ERROR;
-  else if (bpr <= 0)
-    {
-      gdbtk_set_result (interp, "Invalid bytes per row, must be > 0");
-      return TCL_ERROR;
-    }
-
-  tmp = Tcl_GetStringFromObj (objv[2], NULL);
-  if (tmp == NULL)
-    {
-      gdbtk_set_result (interp, "could not get address");
-      return TCL_ERROR;
-    }
-  addr = string_to_core_addr (tmp);
-
-  format = *(Tcl_GetStringFromObj (objv[3], NULL));
-  mbuf = (char *) xmalloc (nbytes + 32);
-  if (!mbuf)
-    {
-      gdbtk_set_result (interp, "Out of memory.");
-      return TCL_ERROR;
-    }
-
-  memset (mbuf, 0, nbytes + 32);
-  mptr = cptr = mbuf;
-
-  rnum = 0;
-  while (rnum < nbytes)
-    {
-      int error;
-      int num = target_read_memory_partial (addr + rnum, mbuf + rnum,
-					    nbytes - rnum, &error);
-      if (num <= 0)
-	break;
-      rnum += num;
-    }
-
-  if (objc == 8)
-    aschar = *(Tcl_GetStringFromObj (objv[7], NULL));
-  else
-    aschar = 0;
-
-  switch (size)
-    {
-    case 1:
-      val_type = builtin_type_int8;
-      asize = 'b';
-      break;
-    case 2:
-      val_type = builtin_type_int16;
-      asize = 'h';
-      break;
-    case 4:
-      val_type = builtin_type_int32;
-      asize = 'w';
-      break;
-    case 8:
-      val_type = builtin_type_int64;
-      asize = 'g';
-      break;
-    default:
-      val_type = builtin_type_int8;
-      asize = 'b';
-    }
-
-  bc = 0;			/* count of bytes in a row */
-  bptr = &buff[0];		/* pointer for ascii dump */
-
-  /* Open a memory ui_file that we can use to print memory values */
-  stb = mem_fileopen ();
-  old_chain = make_cleanup_ui_file_delete (stb);
-  
-  /* A little macro to do column indices. As a rule, given the current
-     byte, i, of a total nbytes and the bytes per row, bpr, and the size of
-     each cell, size, the row and column will be given by:
-
-     row = i/bpr
-     col = (i%bpr)/size
-  */
-#define INDEX(row,col) sprintf (index, "%d,%d",(row),(col))
-
-  /* Fill in address labels */
-  max_label_len = 0;
-  for (i = 0; i < nbytes; i += bpr)
-    {
-      char s[130];
-      sprintf (s, "%s", core_addr_to_string (addr + i));
-      INDEX ((int) i/bpr, -1);
-      Tcl_SetVar2 (interp, "data", index, s, 0);
-
-      /* The tcl code in MemWin::update_addr used to track the size
-	 of each cell. I don't see how these could change for any given
-	 update, so we don't loop over all cells. We just note the first
-	 size. */
-      if (max_label_len == 0)
-	max_label_len = strlen (s);
-    }
-
-  /* Fill in memory */
-  max_val_len   = 0;		/* Ditto the above comments about max_label_len */
-  max_ascii_len = 0;
-  for (i = 0; i < nbytes; i += size)
-    {
-      INDEX ((int) i/bpr, (int) (i%bpr)/size);
-
-      if (i >= rnum)
-	{
-	  /* Read fewer bytes than requested */
-	  tmp = "N/A";
-
-	  if (aschar)
-	    {
-	      for (j = 0; j < size; j++)
-		*bptr++ = 'X';
-	    }
-	}
-      else
-	{
-	  /* print memory to our uiout file and set the table's variable */
-	  ui_file_rewind (stb);
-	  print_scalar_formatted (mptr, val_type, format, asize, stb);
-	  tmp = ui_file_xstrdup (stb, &dummy);
-
-	  /* See comments above on max_*_len */
-	  if (max_val_len == 0)
-	    max_val_len = strlen (tmp);
-
-	  if (aschar)
-	    {
-	      for (j = 0; j < size; j++)
-		{
-		  if (isprint (*cptr))
-		    *bptr++ = *cptr++;
-		  else
-		    {
-		      *bptr++ = aschar;
-		      cptr++;;
-		    }
-		}
-	    }
-	}
-      Tcl_SetVar2 (interp, "data", index, tmp, 0);
-
-      mptr += size;
-      bc += size;
-
-      if (aschar && (bc >= bpr))
-	{
-	  /* end of row. Add it to the result and reset variables */
-	  *bptr = '\000';
-	  INDEX (i/bpr, bpr/size);
-	  Tcl_SetVar2 (interp, "data", index, buff, 0);
-
-	  /* See comments above on max_*_len */
-	  if (max_ascii_len == 0)
-	    max_ascii_len = strlen (buff);
-
-	  bc = 0;
-	  bptr = &buff[0];
-	}
-    }
-
-  /* return max_*_len so that column widths can be set */
-  Tcl_ListObjAppendElement (interp, result_ptr->obj_ptr, Tcl_NewIntObj (max_label_len + 1));
-  Tcl_ListObjAppendElement (interp, result_ptr->obj_ptr, Tcl_NewIntObj (max_val_len + 1));
-  Tcl_ListObjAppendElement (interp, result_ptr->obj_ptr, Tcl_NewIntObj (max_ascii_len + 1));
-  do_cleanups (old_chain);
-  xfree (mbuf);
-  return TCL_OK;
-#undef INDEX
-}
-
-
-/* This implements the tcl command "gdb_loadfile"
- * It loads a c source file into a text widget.
- *
- * Tcl Arguments:
- *    widget: the name of the text widget to fill
- *    filename: the name of the file to load
- *    linenumbers: A boolean indicating whether or not to display line numbers.
- * Tcl Result:
- *
- */
-
-/* In this routine, we will build up a "line table", i.e. a
- * table of bits showing which lines in the source file are executible.
- * LTABLE_SIZE is the number of bytes to allocate for the line table.
- *
- * Its size limits the maximum number of lines 
- * in a file to 8 * LTABLE_SIZE.  This memory is freed after 
- * the file is loaded, so it is OK to make this very large. 
- * Additional memory will be allocated if needed. */
-#define LTABLE_SIZE 20000
-static int
-gdb_loadfile (ClientData clientData, Tcl_Interp *interp, int objc,
-	      Tcl_Obj *CONST objv[])
-{
-  char *file, *widget;
-  int linenumbers, ln, lnum, ltable_size;
-  FILE *fp;
-  char *ltable;
-  struct symtab *symtab;
-  struct linetable_entry *le;
-  long mtime = 0;
-  struct stat st;
-  char line[10000], line_num_buf[18];
-  const char *text_argv[9];
-  Tcl_CmdInfo text_cmd;
-
- 
-  if (objc != 4)
-    {
-      Tcl_WrongNumArgs(interp, 1, objv, "widget filename linenumbers");
-      return TCL_ERROR; 
-    }
-
-  widget = Tcl_GetStringFromObj (objv[1], NULL);
-  if ( Tk_NameToWindow (interp, widget, Tk_MainWindow (interp)) == NULL)
-    {
-      return TCL_ERROR;
-    }
-
-  if (!Tcl_GetCommandInfo (interp, widget, &text_cmd))
-    {
-      gdbtk_set_result (interp, "Can't get widget command info");
-      return TCL_ERROR;
-    }
-  
-  file  = Tcl_GetStringFromObj (objv[2], NULL);
-  Tcl_GetBooleanFromObj (interp, objv[3], &linenumbers);
-
-  symtab = lookup_symtab (file);
-  if (!symtab)
-    {
-      gdbtk_set_result (interp, "File not found in symtab");
-      return TCL_ERROR;
-    }
-
-  file = symtab_to_filename ( symtab );
-  if ((fp = fopen ( file, "r" )) == NULL)
-    {
-      gdbtk_set_result (interp, "Can't open file for reading");
-      return TCL_ERROR;
-    }
-
-  if (stat (file, &st) < 0)
-    {
-      catch_errors (perror_with_name_wrapper, "gdbtk: get time stamp", "",
-                    RETURN_MASK_ALL);
-      return TCL_ERROR;
-    }
-
-  if (symtab && symtab->objfile && symtab->objfile->obfd)
-    mtime = bfd_get_mtime(symtab->objfile->obfd);
-  else if (exec_bfd)
-    mtime = bfd_get_mtime(exec_bfd);
- 
-  if (mtime && mtime < st.st_mtime)
-    {
-      gdbtk_ignorable_warning("file_times",\
-			      "Source file is more recent than executable.\n");
-    }
-  
-  
-  /* Source linenumbers don't appear to be in order, and a sort is */
-  /* too slow so the fastest solution is just to allocate a huge */
-  /* array and set the array entry for each linenumber */
-
-  ltable_size = LTABLE_SIZE;
-  ltable = (char *)malloc (LTABLE_SIZE);
-  if (ltable == NULL)
-    {
-      fclose (fp);
-      gdbtk_set_result (interp, "Out of memory.");
-      return TCL_ERROR;
-    }
-
-  memset (ltable, 0, LTABLE_SIZE);
-
-  if (symtab->linetable && symtab->linetable->nitems)
-    {
-      le = symtab->linetable->item;
-      for (ln = symtab->linetable->nitems ;ln > 0; ln--, le++)
-        {
-          lnum = le->line >> 3;
-          if (lnum >= ltable_size)
-            {
-              char *new_ltable;
-              new_ltable = (char *)realloc (ltable, ltable_size*2);
-              memset (new_ltable + ltable_size, 0, ltable_size);
-              ltable_size *= 2;
-              if (new_ltable == NULL)
-                {
-                  free (ltable);
-                  fclose (fp);
-		  gdbtk_set_result (interp, "Out of memory.");
-                  return TCL_ERROR;
-                }
-              ltable = new_ltable;
-            }
-          ltable[lnum] |= 1 << (le->line % 8);
-        }
-    }
-      
-  ln = 1;
-
-  line[0] = '\t'; 
-  text_argv[0] = widget;
-  text_argv[1] = "insert";
-  text_argv[2] = "end";
-  text_argv[5] = line;
-  text_argv[6] = "source_tag";
-  text_argv[8] = NULL;
-  
-  if (linenumbers)
-    {
-      int found_carriage_return = 1;
-      
-      line_num_buf[1] = '\t';
-       
-      text_argv[3] = line_num_buf;
-      
-      while (fgets (line + 1, 9980, fp))
-        {
-	  /* Look for DOS style \r\n endings, and if found,
-	   * strip off the \r.  We assume (for the sake of
-	   * speed) that ALL lines in the file have DOS endings,
-	   * or none do.
-	   */
-	  
-	  if (found_carriage_return)
-	    {
-	      char *p = strrchr(line, '\0') - 2;
-	      if (*p == '\r')
-		{
-		  *p = '\n';
-		  *(p + 1) = '\0';
-		} 
-	      else 
-		found_carriage_return = 0;
-	    }
-	  
-          sprintf (line_num_buf+2, "%d", ln);
-          if (ltable[ln >> 3] & (1 << (ln % 8)))
-            {
-	      line_num_buf[0] = '-';
-              text_argv[4] = "break_rgn_tag";
-            }
-          else
-            {
-	      line_num_buf[0] = ' ';
-              text_argv[4] = "";
-            }
-
-          text_cmd.proc(text_cmd.clientData, interp, 7, text_argv);
-          ln++;
-        }
-    }
-  else
-    {
-      int found_carriage_return = 1;
-            
-      while (fgets (line + 1, 9980, fp))
-        {
-	  if (found_carriage_return)
-	    {
-	      char *p = strrchr(line, '\0') - 2;
-	      if (*p == '\r')
-		{
-		  *p = '\n';
-		  *(p + 1) = '\0';
-		} 
-	      else
-		found_carriage_return = 0;
-	    }
-
-          if (ltable[ln >> 3] & (1 << (ln % 8)))
-            {
-              text_argv[3] = "- ";
-              text_argv[4] = "break_rgn_tag";
-            }
-          else
-            {
-              text_argv[3] = "  ";
-              text_argv[4] = "";
-            }
-
-          text_cmd.proc(text_cmd.clientData, interp, 7, text_argv);
-          ln++;
-	}
-    }
-
-  free (ltable);
-  fclose (fp);
-  return TCL_OK;
-}
-
-/*
- * This section contains a bunch of miscellaneous utility commands
- */
-
-/* This implements the tcl command gdb_path_conv
-
-* On Windows, it canonicalizes the pathname,
-* On Unix, it is a no op.
-*
-* Arguments:
-*    path
-* Tcl Result:
-*    The canonicalized path.
-*/
-
-static int
-gdb_path_conv (ClientData clientData, Tcl_Interp *interp,
-	       int objc, Tcl_Obj *CONST objv[])
-{
-  if (objc != 2)
-    {
-      Tcl_WrongNumArgs (interp, 1, objv, NULL);
-      return TCL_ERROR;
-    }
-
-#ifdef __CYGWIN__
-  {
-    char pathname[256], *ptr;
-
-    cygwin32_conv_to_full_win32_path (Tcl_GetStringFromObj (objv[1], NULL),
-				      pathname);
-    for (ptr = pathname; *ptr; ptr++)
-      {
-	if (*ptr == '\\')
-	  *ptr = '/';
-      }
-    Tcl_SetStringObj (result_ptr->obj_ptr, pathname, -1);
-  }
-#else
-  Tcl_SetStringObj (result_ptr->obj_ptr, Tcl_GetStringFromObj (objv[1], NULL),
-		    -1);
-#endif
-
-  return TCL_OK;
-}
-
-/*
- * This section has utility routines that are not Tcl commands.
- */
-
-static int
-perror_with_name_wrapper (PTR args)
-{
-  perror_with_name (args);
-  return 1;
-}
-
-/* Look for the function that contains PC and return the source
-   (demangled) name for this function.
-
-   If no symbol is found, it returns an empty string. In either
-   case, memory is owned by gdb. Do not attempt to free it. */
-char *
-pc_function_name (CORE_ADDR pc)
-{
-  struct symbol *sym;
-  char *funcname = NULL;
-
-  /* First lookup the address in the symbol table... */
-  sym = find_pc_function (pc);
-  if (sym != NULL)
-    funcname = GDBTK_SYMBOL_SOURCE_NAME (sym);
-  else
-    {
-      /* ... if that fails, look it up in the minimal symbols. */
-      struct minimal_symbol *msym = NULL;
-
-      msym = lookup_minimal_symbol_by_pc (pc);
-      if (msym != NULL)
-	funcname = GDBTK_SYMBOL_SOURCE_NAME (msym);
-    }
-
-  if (funcname == NULL)
-    funcname = "";
-
-  return funcname;
-}
-
-void
-gdbtk_set_result (Tcl_Interp *interp, const char *fmt,...)
-{
-  va_list args;
-  char *buf;
-
-  va_start (args, fmt);
-  xvasprintf (&buf, fmt, args);
-  va_end (args);
-  Tcl_SetObjResult (interp, Tcl_NewStringObj (buf, -1));
-  xfree(buf);
-}
-
-
-/* This implements the tcl command 'gdb_incr_addr'.
- * It does address arithmetic and outputs a proper
- * hex string.  This was originally implemented
- * when tcl did not support 64-bit values, but we keep
- * it because it saves us from having to call incr 
- * followed by format to get the result in hex.
- * Also, it may be true in the future that CORE_ADDRs
- * will have their own ALU to deal properly with
- * architecture-specific address arithmetic.
- *
- * Tcl Arguments:
- *     addr   - CORE_ADDR
- *     number - optional number to add to the address
- *	default is 1.
- *
- * Tcl Result:
- *     hex string containing the result of addr + number
- */
-
-static int
-gdb_incr_addr (ClientData clientData, Tcl_Interp *interp,
-	       int objc, Tcl_Obj *CONST objv[])
-{
-  CORE_ADDR address;
-  int number = 1;
-
-  if (objc != 2 && objc != 3)
-    {
-      Tcl_WrongNumArgs (interp, 1, objv, "CORE_ADDR [number]");
-      return TCL_ERROR;
-    }
-
-  address = string_to_core_addr (Tcl_GetStringFromObj (objv[1], NULL));
-
-  if (objc == 3)
-    {
-      if (Tcl_GetIntFromObj (interp, objv[2], &number) != TCL_OK)
-	return TCL_ERROR;
-    }
-  
-  address += number;
-
-  Tcl_SetStringObj (result_ptr->obj_ptr, (char *)core_addr_to_string (address), -1);
-  
-  return TCL_OK;
-}
-
-/* This implements the tcl command 'gdb_CAS_to_TAS'.
- * It takes a CORE_ADDR and outputs a string suitable
- * for displaying as the target address.
- *
- * Note that CORE_ADDRs are internal addresses which map
- * to target addresses in different ways depending on the 
- * architecture. The target address string is a user-readable
- * string may be quite different than the CORE_ADDR. For example,
- * a CORE_ADDR of 0x02001234 might indicate a data address of
- * 0x1234 which this function might someday output as something
- * like "D:1234".
- *
- * Tcl Arguments:
- *     address   - CORE_ADDR
- *
- * Tcl Result:
- *     string
- */
-
-static int
-gdb_CA_to_TAS (ClientData clientData, Tcl_Interp *interp,
-	       int objc, Tcl_Obj *CONST objv[])
-{
-  CORE_ADDR address;
-  Tcl_WideInt wide_addr;
-
-  if (objc != 2)
-    {
-      Tcl_WrongNumArgs (interp, 1, objv, "CORE_ADDR");
-      return TCL_ERROR;
-    }
-
-  /* Read address into a wideint, which is the largest tcl supports
-     then convert to a CORE_ADDR */
-  if (Tcl_GetWideIntFromObj (interp, objv[1], &wide_addr) != TCL_OK)
-    return TCL_ERROR;
-  address = wide_addr;
-
-  /* This is not really correct.  Using paddr_nz() will convert to hex and truncate 
-     to 32-bits when required but will otherwise not do what we really want. */
-  Tcl_SetStringObj (result_ptr->obj_ptr, paddr_nz (address), -1);
-
-  return TCL_OK;
-}
diff --git a/gdb/gdbtk/generic/gdbtk-cmds.h b/gdb/gdbtk/generic/gdbtk-cmds.h
deleted file mode 100644
index 8193dae9801..00000000000
--- a/gdb/gdbtk/generic/gdbtk-cmds.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* Tcl/Tk command interface for Insight
-   Copyright 2001 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.  */
-
-#if !defined(GDBTK_CMDS_H)
-#define GDBTK_CMDS_H 1
-
-/* This structure filled in gdbtk_call_wrapper and passed to
-   the wrapped call function.
-   It stores the command pointer and arguments 
-   run in the wrapper function. */
-struct wrapped_call_args
-  {
-    Tcl_Interp *interp;
-    Tcl_ObjCmdProc *func;
-    int objc;
-    Tcl_Obj *CONST * objv;
-    int val;
-  };
-
-/* A generic call-wrapper to catch longjmps when calling C commands from
-   tcl. ALL tcl commands should be wrapped in this call. */
-extern int gdbtk_call_wrapper (ClientData, Tcl_Interp *, int, Tcl_Obj * CONST[]);
-
-/* Returns the source (demangled) name for a function at PC. Returns empty string
-   if not found. Memory is owned by gdb. Do not free it. */
-extern char *pc_function_name (CORE_ADDR pc);
-
-/* Convenience function to sprintf something(s) into a new element in
-   a Tcl list object. */
-extern void sprintf_append_element_to_obj (Tcl_Obj * objp, char *format, ...);
-
-/* printf-like function to return error messages */
-extern void gdbtk_set_result (Tcl_Interp *interp, const char *fmt,...);
-
-/* Module init routines: Each module of commands should be declared here. */
-extern int Gdbtk_Breakpoint_Init (Tcl_Interp *interp);
-extern int Gdbtk_Stack_Init (Tcl_Interp *interp);
-extern int Gdbtk_Register_Init (Tcl_Interp *interp);
-
-#endif /* GDBTK_CMDS_H */
diff --git a/gdb/gdbtk/generic/gdbtk-hooks.c b/gdb/gdbtk/generic/gdbtk-hooks.c
deleted file mode 100644
index 39c6348e78a..00000000000
--- a/gdb/gdbtk/generic/gdbtk-hooks.c
+++ /dev/null
@@ -1,795 +0,0 @@
-/* Startup code for Insight.
-
-   Copyright 1994, 1995, 1996, 1997, 1998, 2000, 200, 2002, 2003 Free
-   Software Foundation, Inc.
-
-   Written by Stu Grossman <grossman@cygnus.com> of Cygnus Support.
-
-   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.  */
-
-#include "defs.h"
-#include "inferior.h"
-#include "symfile.h"
-#include "objfiles.h"
-#include "gdbcore.h"
-#include "tracepoint.h"
-#include "demangle.h"
-#include "gdb-events.h"
-#include "top.h"
-#include "annotate.h"
-#include "cli/cli-decode.h"
-
-#ifdef _WIN32
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#endif
-
-/* tcl header files includes varargs.h unless HAS_STDARG is defined,
-   but gdb uses stdarg.h, so make sure HAS_STDARG is defined.  */
-#define HAS_STDARG 1
-
-#include <itcl.h>
-#include <tcl.h>
-#include <tk.h>
-#include "guitcl.h"
-#include "gdbtk.h"
-
-#include <signal.h>
-#include <fcntl.h>
-#include <sys/ioctl.h>
-#include <sys/time.h>
-
-#include "gdb_string.h"
-#include "dis-asm.h"
-#include "gdbcmd.h"
-
-
-volatile int in_fputs = 0;
-
-/* Set by gdb_stop, this flag informs x_event to tell its caller
-   that it should forcibly detach from the target. */
-int gdbtk_force_detach = 0;
-
-/* From gdbtk-bp.c */
-extern void gdbtk_create_breakpoint (int);
-extern void gdbtk_delete_breakpoint (int);
-extern void gdbtk_modify_breakpoint (int);
-extern void gdbtk_create_tracepoint (int);
-extern void gdbtk_delete_tracepoint (int);
-extern void gdbtk_modify_tracepoint (int);
-
-extern void (*pre_add_symbol_hook) (char *);
-extern void (*post_add_symbol_hook) (void);
-extern void (*selected_frame_level_changed_hook) (int);
-extern int (*ui_loop_hook) (int);
-
-static void gdbtk_architecture_changed (void);
-static void gdbtk_trace_find (char *arg, int from_tty);
-static void gdbtk_trace_start_stop (int, int);
-static void gdbtk_attach (void);
-static void gdbtk_detach (void);
-static void gdbtk_file_changed (char *);
-static void gdbtk_exec_file_display (char *);
-static void gdbtk_call_command (struct cmd_list_element *, char *, int);
-static ptid_t gdbtk_wait (ptid_t, struct target_waitstatus *);
-int x_event (int);
-static int gdbtk_query (const char *, va_list);
-static void gdbtk_warning (const char *, va_list);
-static char *gdbtk_readline (char *);
-static void gdbtk_readline_begin (char *format,...);
-static void gdbtk_readline_end (void);
-static void gdbtk_pre_add_symbol (char *);
-static void gdbtk_print_frame_info (struct symtab *, int, int, int);
-static void gdbtk_post_add_symbol (void);
-static void gdbtk_register_changed (int regno);
-static void gdbtk_memory_changed (CORE_ADDR addr, int len);
-static void gdbtk_selected_frame_changed (int);
-static void gdbtk_context_change (int);
-static void gdbtk_error_begin (void);
-void report_error (void);
-static void gdbtk_annotate_signal (void);
-static void gdbtk_set_hook (struct cmd_list_element *cmdblk);
-
-/*
- * gdbtk_fputs can't be static, because we need to call it in gdbtk.c.
- * See note there for details.
- */
-
-void gdbtk_fputs (const char *, struct ui_file *);
-static int gdbtk_load_hash (const char *, unsigned long);
-
-/*
- * gdbtk_add_hooks - add all the hooks to gdb.  This will get called by the
- * startup code to fill in the hooks needed by core gdb.
- */
-
-void
-gdbtk_add_hooks (void)
-{
-  static struct gdb_events handlers;
-
-  /* Gdb event handlers */
-  handlers.breakpoint_create = gdbtk_create_breakpoint;
-  handlers.breakpoint_modify = gdbtk_modify_breakpoint;
-  handlers.breakpoint_delete = gdbtk_delete_breakpoint;
-  handlers.tracepoint_create = gdbtk_create_tracepoint;
-  handlers.tracepoint_modify = gdbtk_modify_tracepoint;
-  handlers.tracepoint_delete = gdbtk_delete_tracepoint;
-  handlers.architecture_changed = gdbtk_architecture_changed;
-  set_gdb_event_hooks (&handlers);
-
-  /* Hooks */
-  call_command_hook = gdbtk_call_command;
-  set_hook = gdbtk_set_hook;
-  readline_begin_hook = gdbtk_readline_begin;
-  readline_hook = gdbtk_readline;
-  readline_end_hook = gdbtk_readline_end;
-
-  print_frame_info_listing_hook = gdbtk_print_frame_info;
-  query_hook = gdbtk_query;
-  warning_hook = gdbtk_warning;
-
-  interactive_hook = gdbtk_interactive;
-  target_wait_hook = gdbtk_wait;
-  ui_load_progress_hook = gdbtk_load_hash;
-
-  ui_loop_hook = x_event;
-  pre_add_symbol_hook = gdbtk_pre_add_symbol;
-  post_add_symbol_hook = gdbtk_post_add_symbol;
-  file_changed_hook = gdbtk_file_changed;
-  specify_exec_file_hook (gdbtk_exec_file_display);
-
-  trace_find_hook = gdbtk_trace_find;
-  trace_start_stop_hook = gdbtk_trace_start_stop;
-
-  attach_hook            = gdbtk_attach;
-  detach_hook            = gdbtk_detach; 
-
-  register_changed_hook = gdbtk_register_changed;
-  memory_changed_hook = gdbtk_memory_changed;
-  selected_frame_level_changed_hook = gdbtk_selected_frame_changed;
-  context_hook = gdbtk_context_change;
-
-  error_begin_hook = gdbtk_error_begin;
-
-  annotate_signal_hook = gdbtk_annotate_signal;
-  annotate_signalled_hook = gdbtk_annotate_signal;
-}
-
-/* These control where to put the gdb output which is created by
-   {f}printf_{un}filtered and friends.  gdbtk_fputs is the lowest
-   level of these routines and capture all output from the rest of
-   GDB.
-
-   The reason to use the result_ptr rather than the gdbtk_interp's result
-   directly is so that a call_wrapper invoked function can preserve its result
-   across calls into Tcl which might be made in the course of the function's
-   execution.
-
-   * result_ptr->obj_ptr is where to accumulate the result.
-   * GDBTK_TO_RESULT flag means the output goes to the gdbtk_tcl_fputs proc
-   instead of to the result_ptr.
-   * GDBTK_MAKES_LIST flag means add to the result as a list element.
-
-*/
-
-gdbtk_result *result_ptr = NULL;
-
-/* If you want to restore an old value of result_ptr whenever cleanups
-   are run, pass this function to make_cleanup, along with the value
-   of result_ptr you'd like to reinstate.  */
-void
-gdbtk_restore_result_ptr (void *old_result_ptr)
-{
-  result_ptr = (gdbtk_result *) old_result_ptr;
-}
-
-/* This allows you to Tcl_Eval a tcl command which takes
-   a command word, and then a single argument. */
-int
-gdbtk_two_elem_cmd (cmd_name, argv1)
-     char *cmd_name;
-     char *argv1;
-{
-  char *command;
-  int result, flags_ptr, arg_len, cmd_len;
-
-  arg_len = Tcl_ScanElement (argv1, &flags_ptr);
-  cmd_len = strlen (cmd_name);
-  command = malloc (arg_len + cmd_len + 2);
-  strcpy (command, cmd_name);
-  strcat (command, " ");
-
-  Tcl_ConvertElement (argv1, command + cmd_len + 1, flags_ptr);
-
-  result = Tcl_Eval (gdbtk_interp, command);
-  if (result != TCL_OK)
-    report_error ();
-  free (command);
-  return result;
-}
-
-struct ui_file *
-gdbtk_fileopen (void)
-{
-  struct ui_file *file = ui_file_new ();
-  set_ui_file_fputs (file, gdbtk_fputs);
-  return file;
-}
-
-/* This handles all the output from gdb.  All the gdb printf_xxx functions
- * eventually end up here.  The output is either passed to the result_ptr
- * where it will go to the result of some gdbtk command, or passed to the
- * Tcl proc gdbtk_tcl_fputs (where it is usually just dumped to the console
- * window.
- *
- * The cases are:
- *
- * 1) result_ptr == NULL - This happens when some output comes from gdb which
- *    is not generated by a command in gdbtk-cmds, usually startup stuff.
- *    In this case we just route the data to gdbtk_tcl_fputs.
- * 2) The GDBTK_TO_RESULT flag is set - The result is supposed to go to Tcl.
- *    We place the data into the result_ptr, either as a string,
- *    or a list, depending whether the GDBTK_MAKES_LIST bit is set.
- * 3) The GDBTK_TO_RESULT flag is unset - We route the data to gdbtk_tcl_fputs
- *    UNLESS it was coming to gdb_stderr.  Then we place it in the result_ptr
- *    anyway, so it can be dealt with.
- *
- */
-
-void
-gdbtk_fputs (const char *ptr, struct ui_file *stream)
-{
-  if (gdbtk_disable_fputs)
-    return;
-  
-  in_fputs = 1;
-
-  if (stream == gdb_stdlog)
-    gdbtk_two_elem_cmd ("gdbtk_tcl_fputs_log", (char *) ptr);
-  else if (stream == gdb_stdtarg)
-    gdbtk_two_elem_cmd ("gdbtk_tcl_fputs_target", (char *) ptr);
-  else if (result_ptr != NULL)
-    {
-      if (result_ptr->flags & GDBTK_TO_RESULT)
-	{
-	  if (result_ptr->flags & GDBTK_MAKES_LIST)
-	    Tcl_ListObjAppendElement (NULL, result_ptr->obj_ptr,
-				      Tcl_NewStringObj ((char *) ptr, -1));
-	  else
-	    Tcl_AppendToObj (result_ptr->obj_ptr, (char *) ptr, -1);
-	}
-      else if (stream == gdb_stderr || result_ptr->flags & GDBTK_ERROR_ONLY)
-	{
-	  if (result_ptr->flags & GDBTK_ERROR_STARTED)
-	    Tcl_AppendToObj (result_ptr->obj_ptr, (char *) ptr, -1);
-	  else
-	    {
-	      Tcl_SetStringObj (result_ptr->obj_ptr, (char *) ptr, -1);
-	      result_ptr->flags |= GDBTK_ERROR_STARTED;
-	    }
-	}
-      else
-	{
-	  gdbtk_two_elem_cmd ("gdbtk_tcl_fputs", (char *) ptr);
-	  if (result_ptr->flags & GDBTK_MAKES_LIST)
-	    gdbtk_two_elem_cmd ("gdbtk_tcl_fputs", " ");
-	}
-    }
-  else
-    {
-      gdbtk_two_elem_cmd ("gdbtk_tcl_fputs", (char *) ptr);
-    }
-
-  in_fputs = 0;
-}
-
-/*
- * This routes all warnings to the Tcl function "gdbtk_tcl_warning".
- */
-
-static void
-gdbtk_warning (const char *warning, va_list args)
-{
-  char *buf;
-  xvasprintf (&buf, warning, args);
-  gdbtk_two_elem_cmd ("gdbtk_tcl_warning", buf);
-  free(buf);
-}
-
-
-/* Error-handling function for all hooks */
-/* Hooks are not like tcl functions, they do not simply return */
-/* TCL_OK or TCL_ERROR.  Also, the calling function typically */
-/* doesn't care about errors in the hook functions.  Therefore */
-/* after every hook function, report_error should be called. */
-/* report_error can just call Tcl_BackgroundError() which will */
-/* pop up a messagebox, or it can silently log the errors through */
-/* the gdbtk dbug command.  */
-
-void
-report_error ()
-{
-  TclDebug ('E', Tcl_GetVar (gdbtk_interp, "errorInfo", TCL_GLOBAL_ONLY));
-  /*  Tcl_BackgroundError(gdbtk_interp); */
-}
-
-/*
- * This routes all ignorable warnings to the Tcl function
- * "gdbtk_tcl_ignorable_warning".
- */
-
-void
-gdbtk_ignorable_warning (const char *class, const char *warning)
-{
-  char *buf;
-  xasprintf (&buf, "gdbtk_tcl_ignorable_warning {%s} {%s}", class, warning);
-  if (Tcl_Eval (gdbtk_interp, buf) != TCL_OK)
-    report_error ();
-  free(buf); 
-}
-
-static void
-gdbtk_register_changed (int regno)
-{
-  if (Tcl_Eval (gdbtk_interp, "gdbtk_register_changed") != TCL_OK)
-    report_error ();
-}
-
-static void
-gdbtk_memory_changed (CORE_ADDR addr, int len)
-{
-  if (Tcl_Eval (gdbtk_interp, "gdbtk_memory_changed") != TCL_OK)
-    report_error ();
-}
-
-
-/* This hook is installed as the ui_loop_hook, which is used in several
- * places to keep the gui alive (x_event runs gdbtk's event loop). Users
- * include:
- * - ser-tcp.c in socket reading code
- * - ser-unix.c in serial port reading code
- * - built-in simulators while executing
- *
- * x_event used to be called on SIGIO on the socket to the X server
- * for unix. Unfortunately, Linux does not deliver SIGIO, so we resort
- * to an elaborate scheme to keep the gui alive.
- *
- * For simulators and socket or serial connections on all hosts, we
- * rely on ui_loop_hook (x_event) to keep us going. If the user
- * requests a detach (as a result of pressing the stop button -- see
- * comments before gdb_stop in gdbtk-cmds.c), it sets the global
- * GDBTK_FORCE_DETACH, which is the value that x_event returns to
- * it's caller. It is up to the caller of x_event to act on this
- * information.
- *
- * For native unix, we simply set an interval timer which calls
- * x_event to allow the debugger to run through the Tcl event
- * loop. See comments before gdbtk_start_timer and gdb_stop_timer
- * in gdbtk.c.
- *
- * For native windows (and a few other targets, like the v850 ICE),
- * we rely on the target_wait loops to call ui_loop_hook to keep us alive. */
-int
-x_event (int signo)
-{
-  static volatile int in_x_event = 0;
-  static Tcl_Obj *varname = NULL;
-
-  /* Do nor re-enter this code or enter it while collecting gdb output. */
-  if (in_x_event || in_fputs)
-    return 0;
-
-  /* Also, only do things while the target is running (stops and redraws).
-     FIXME: We wold like to at least redraw at other times but this is bundled
-     together in the TCL_WINDOW_EVENTS group and we would also process user
-     input.  We will have to prevent (unwanted)  user input to be generated
-     in order to be able to redraw (removing this test here). */
-  if (!running_now)
-    return 0;
-
-  in_x_event = 1;
-  gdbtk_force_detach = 0;
-
-  /* Process pending events */
-  while (Tcl_DoOneEvent (TCL_DONT_WAIT | TCL_ALL_EVENTS) != 0)
-    ;
-
-  if (load_in_progress)
-    {
-      int val;
-      if (varname == NULL)
-	{
-#if TCL_MAJOR_VERSION == 8 && (TCL_MINOR_VERSION < 1 || TCL_MINOR_VERSION > 2)
-	  Tcl_Obj *varnamestrobj = Tcl_NewStringObj ("download_cancel_ok", -1);
-	  varname = Tcl_ObjGetVar2 (gdbtk_interp, varnamestrobj, NULL, TCL_GLOBAL_ONLY);
-#else
-	  varname = Tcl_GetObjVar2 (gdbtk_interp, "download_cancel_ok", NULL, TCL_GLOBAL_ONLY);
-#endif
-	}
-      if ((Tcl_GetIntFromObj (gdbtk_interp, varname, &val) == TCL_OK) && val)
-	{
-	  quit_flag = 1;
-#ifdef REQUEST_QUIT
-	  REQUEST_QUIT;
-#else
-	  if (immediate_quit)
-	    quit ();
-#endif
-	}
-    }
-  in_x_event = 0;
-
-  return gdbtk_force_detach;
-}
-
-/* VARARGS */
-static void
-gdbtk_readline_begin (char *format,...)
-{
-  va_list args;
-  char *buf;
-
-  va_start (args, format);
-  xvasprintf (&buf, format, args);
-  gdbtk_two_elem_cmd ("gdbtk_tcl_readline_begin", buf);
-  free(buf);
-}
-
-static char *
-gdbtk_readline (char *prompt)
-{
-  int result;
-
-#ifdef _WIN32
-  close_bfds ();
-#endif
-
-  result = gdbtk_two_elem_cmd ("gdbtk_tcl_readline", prompt);
-
-  if (result == TCL_OK)
-    {
-      return (xstrdup (gdbtk_interp->result));
-    }
-  else
-    {
-      gdbtk_fputs (gdbtk_interp->result, gdb_stdout);
-      gdbtk_fputs ("\n", gdb_stdout);
-      return (NULL);
-    }
-}
-
-static void
-gdbtk_readline_end ()
-{
-  if (Tcl_Eval (gdbtk_interp, "gdbtk_tcl_readline_end") != TCL_OK)
-    report_error ();
-}
-
-static void
-gdbtk_call_command (struct cmd_list_element *cmdblk,
-		    char *arg, int from_tty)
-{
-  struct cleanup *old_chain;
-
-  old_chain = make_cleanup (null_cleanup, 0);
-  running_now = 0;
-  if (cmdblk->class == class_run || cmdblk->class == class_trace)
-    {
-
-      running_now = 1;
-      if (!No_Update)
-	Tcl_Eval (gdbtk_interp, "gdbtk_tcl_busy");
-      cmd_func (cmdblk, arg, from_tty);
-      running_now = 0;
-      if (!No_Update)
-	Tcl_Eval (gdbtk_interp, "gdbtk_tcl_idle");
-    }
-  else
-    cmd_func (cmdblk, arg, from_tty);
-
-  do_cleanups (old_chain);
-}
-
-/* Called after a `set' command succeeds.  Runs the Tcl hook
-   `gdb_set_hook' with the full name of the variable (a Tcl list) as
-   the first argument and the new value as the second argument.  */
-
-static void
-gdbtk_set_hook (struct cmd_list_element *cmdblk)
-{
-  Tcl_DString cmd;
-  char *p;
-  char *buffer = NULL;
-
-  Tcl_DStringInit (&cmd);
-  Tcl_DStringAppendElement (&cmd, "gdbtk_tcl_set_variable");
-
-  /* Append variable name as sublist.  */
-  Tcl_DStringStartSublist (&cmd);
-  p = cmdblk->prefixname;
-  while (p && *p)
-    {
-      char *q = strchr (p, ' ');
-      char save = '\0';
-      if (q)
-	{
-	  save = *q;
-	  *q = '\0';
-	}
-      Tcl_DStringAppendElement (&cmd, p);
-      if (q)
-	*q = save;
-      p = q + 1;
-    }
-  Tcl_DStringAppendElement (&cmd, cmdblk->name);
-  Tcl_DStringEndSublist (&cmd);
-
-  switch (cmdblk->var_type)
-    {
-    case var_string_noescape:
-    case var_filename:
-    case var_enum:
-    case var_string:
-      Tcl_DStringAppendElement (&cmd, (*(char **) cmdblk->var
-				       ? *(char **) cmdblk->var
-				       : "(null)"));
-      break;
-
-    case var_boolean:
-      Tcl_DStringAppendElement (&cmd, (*(int *) cmdblk->var ? "1" : "0"));
-      break;
-
-    case var_uinteger:
-    case var_zinteger:
-      xasprintf (&buffer, "%u", *(unsigned int *) cmdblk->var);
-      Tcl_DStringAppendElement (&cmd, buffer);
-      break;
-
-    case var_integer:
-      xasprintf (&buffer, "%d", *(int *) cmdblk->var);
-      Tcl_DStringAppendElement (&cmd, buffer);
-      break;
-
-    default:
-      /* This case should already be trapped by the hook caller.  */
-      Tcl_DStringAppendElement (&cmd, "error");
-      break;
-    }
-
-  if (Tcl_Eval (gdbtk_interp, Tcl_DStringValue (&cmd)) != TCL_OK)
-    report_error ();
-
-  Tcl_DStringFree (&cmd);
-   
-  if (buffer != NULL)
-    {
-      free(buffer);
-    }
-}
-
-int
-gdbtk_load_hash (const char *section, unsigned long num)
-{
-  char *buf;
-  xasprintf (&buf, "Download::download_hash %s %ld", section, num);
-  if (Tcl_Eval (gdbtk_interp, buf) != TCL_OK)
-    report_error ();
-  free(buf); 
-   
-  return atoi (gdbtk_interp->result);
-}
-
-
-/* This hook is called whenever we are ready to load a symbol file so that
-   the UI can notify the user... */
-static void
-gdbtk_pre_add_symbol (char *name)
-{
-  gdbtk_two_elem_cmd ("gdbtk_tcl_pre_add_symbol", name);
-}
-
-/* This hook is called whenever we finish loading a symbol file. */
-static void
-gdbtk_post_add_symbol ()
-{
-  if (Tcl_Eval (gdbtk_interp, "gdbtk_tcl_post_add_symbol") != TCL_OK)
-    report_error ();
-}
-
-/* This hook function is called whenever we want to wait for the
-   target.  */
-
-static ptid_t
-gdbtk_wait (ptid_t ptid, struct target_waitstatus *ourstatus)
-{
-  gdbtk_force_detach = 0;
-  gdbtk_start_timer ();
-  ptid = target_wait (ptid, ourstatus);
-  gdbtk_stop_timer ();
-
-  return ptid;
-}
-
-/*
- * This handles all queries from gdb.
- * The first argument is a printf style format statement, the rest are its
- * arguments.  The resultant formatted string is passed to the Tcl function
- * "gdbtk_tcl_query".  
- * It returns the users response to the query, as well as putting the value
- * in the result field of the Tcl interpreter.
- */
-
-static int
-gdbtk_query (const char *query, va_list args)
-{
-  char *buf;
-  long val;
-
-  xvasprintf (&buf, query, args);
-  gdbtk_two_elem_cmd ("gdbtk_tcl_query", buf);
-  free(buf);
-
-  val = atol (gdbtk_interp->result);
-  return val;
-}
-
-
-static void
-gdbtk_print_frame_info (struct symtab *s, int line,
-			int stopline, int noerror)
-{
-}
-
-/*
- * gdbtk_trace_find
- *
- * This is run by the trace_find_command.  arg is the argument that was passed
- * to that command, from_tty is 1 if the command was run from a tty, 0 if it
- * was run from a script.  It runs gdbtk_tcl_tfind_hook passing on these two
- * arguments.
- *
- */
-
-static void
-gdbtk_trace_find (char *arg, int from_tty)
-{
-  Tcl_Obj *cmdObj;
-
-  cmdObj = Tcl_NewListObj (0, NULL);
-  Tcl_ListObjAppendElement (gdbtk_interp, cmdObj,
-			    Tcl_NewStringObj ("gdbtk_tcl_trace_find_hook", -1));
-  Tcl_ListObjAppendElement (gdbtk_interp, cmdObj, Tcl_NewStringObj (arg, -1));
-  Tcl_ListObjAppendElement (gdbtk_interp, cmdObj, Tcl_NewIntObj (from_tty));
-#if TCL_MAJOR_VERSION == 8 && (TCL_MINOR_VERSION < 1 || TCL_MINOR_VERSION > 2)
-  if (Tcl_GlobalEvalObj (gdbtk_interp, cmdObj) != TCL_OK)
-    report_error ();
-#else
-  if (Tcl_EvalObj (gdbtk_interp, cmdObj, TCL_EVAL_GLOBAL) != TCL_OK)
-    report_error ();
-#endif
-}
-
-/*
- * gdbtk_trace_start_stop
- *
- * This is run by the trace_start_command and trace_stop_command.
- * The START variable determines which, 1 meaning trace_start was run,
- * 0 meaning trace_stop was run.
- *
- */
-
-static void
-gdbtk_trace_start_stop (int start, int from_tty)
-{
-
-  if (start)
-    Tcl_GlobalEval (gdbtk_interp, "gdbtk_tcl_tstart");
-  else
-    Tcl_GlobalEval (gdbtk_interp, "gdbtk_tcl_tstop");
-
-}
-
-static void
-gdbtk_selected_frame_changed (int level)
-{
-#if TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION < 1
-  char *a;
-  xasprintf (&a, "%d", level);
-  Tcl_SetVar (gdbtk_interp, "gdb_selected_frame_level", a, TCL_GLOBAL_ONLY);
-  xfree (a);
-#else
-  Tcl_SetVar2Ex (gdbtk_interp, "gdb_selected_frame_level", NULL,
-		 Tcl_NewIntObj (level), TCL_GLOBAL_ONLY);
-#endif
-}
-
-/* Called when the current thread changes. */
-/* gdb_context is linked to the tcl variable "gdb_context_id" */
-static void
-gdbtk_context_change (int num)
-{
-  gdb_context = num;
-}
-
-/* Called from file_command */
-static void
-gdbtk_file_changed (char *filename)
-{
-  gdbtk_two_elem_cmd ("gdbtk_tcl_file_changed", filename);
-}
-
-/* Called from exec_file_command */
-static void
-gdbtk_exec_file_display (char *filename)
-{
-  gdbtk_two_elem_cmd ("gdbtk_tcl_exec_file_display", filename);
-}
-
-/* Called from error_begin, this hook is used to warn the gui
-   about multi-line error messages */
-static void
-gdbtk_error_begin ()
-{
-  if (result_ptr != NULL)
-    result_ptr->flags |= GDBTK_ERROR_ONLY;
-}
-
-/* notify GDBtk when a signal occurs */
-static void
-gdbtk_annotate_signal ()
-{
-  char *buf;
-
-  /* Inform gui that the target has stopped. This is
-     a necessary stop button evil. We don't want signal notification
-     to interfere with the elaborate and painful stop button detach
-     timeout. */
-  Tcl_Eval (gdbtk_interp, "gdbtk_stop_idle_callback");
-
-  xasprintf (&buf, "gdbtk_signal %s {%s}", target_signal_to_name (stop_signal),
-	     target_signal_to_string (stop_signal));
-  if (Tcl_Eval (gdbtk_interp, buf) != TCL_OK)
-    report_error ();
-  free(buf);  
-}
-
-static void
-gdbtk_attach ()
-{
-  if (Tcl_Eval (gdbtk_interp, "after idle \"update idletasks;gdbtk_attached\"") != TCL_OK)
-    {
-      report_error ();
-    }
-}
-
-static void
-gdbtk_detach ()
-{
-  if (Tcl_Eval (gdbtk_interp, "gdbtk_detached") != TCL_OK)
-    {
-      report_error ();
-    }
-}
-
-/* Called from gdbarch_update_p whenever the architecture changes. */
-static void
-gdbtk_architecture_changed (void)
-{
-  Tcl_Eval (gdbtk_interp, "gdbtk_tcl_architecture_changed");
-}
diff --git a/gdb/gdbtk/generic/gdbtk-interp.c b/gdb/gdbtk/generic/gdbtk-interp.c
deleted file mode 100644
index 1fc1b64a1ff..00000000000
--- a/gdb/gdbtk/generic/gdbtk-interp.c
+++ /dev/null
@@ -1,177 +0,0 @@
-/* Insight Definitions for GDB, the GNU debugger.
-   Written by Keith Seitz <kseitz@uglyboxes.com>
-
-   Copyright 2003 Free Software Foundation, Inc.
-
-   This file is part of Insight.
-
-   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.  */
-
-#include "defs.h"
-#include "interps.h"
-#include "ui-file.h"
-#include "ui-out.h"
-#include "cli-out.h"
-#include "gdb_string.h"
-#include "cli/cli-cmds.h"
-#include "cli/cli-decode.h"
-
-#include "tcl.h"
-#include "tk.h"
-#include "gdbtk.h"
-
-static void gdbtk_command_loop (void);
-static void hack_disable_interpreter_exec (char *, int);
-
-struct gdbtk_interp_data
-{
-  struct ui_file *_stdout;
-  struct ui_file *_stderr;
-  struct ui_file *_stdlog;
-  struct ui_file *_stdtarg;
-};
-
-static struct gdbtk_interp_data *gdbtk_data;
-
-/* See note in gdbtk_interpreter_init */
-static void
-hack_disable_interpreter_exec (char *args, int from_tty)
-{
-  error ("interpreter-exec not available when running Insight");
-}
-
-static void *
-gdbtk_interpreter_init (void)
-{
-  /* Disable interpreter-exec. It causes us big trouble right now. */
-  struct cmd_list_element *cmd = NULL;
-  struct cmd_list_element *alias = NULL;
-  struct cmd_list_element *prefix = NULL;
-
-  gdbtk_init ();
-
-  if (lookup_cmd_composition ("interpreter-exec", &alias, &prefix, &cmd))
-    {
-      set_cmd_cfunc (cmd, hack_disable_interpreter_exec);
-    }
-
-  return gdbtk_data;
-}
-
-static int
-gdbtk_interpreter_resume (void *data)
-{
-  static int started = 0;
-  struct gdbtk_interp_data *d = (struct gdbtk_interp_data *) data;
-  gdbtk_add_hooks ();
-
-  gdb_stdout = d->_stdout;
-  gdb_stderr = d->_stderr;
-  gdb_stdlog = d->_stdlog;
-  gdb_stdtarg = d->_stdtarg;
-
-  command_loop_hook = gdbtk_command_loop;
-
-  /* 2003-02-11 keiths: We cannot actually source our main Tcl file in
-     our interpreter's init function because any errors that may
-     get generated will go to the wrong gdb_stderr. Instead of hacking
-     our interpreter init function to force gdb_stderr to our ui_file,
-     we defer sourcing the startup file until now, when gdb is ready
-     to let our interpreter run. */
-  if (!started)
-    {
-      started = 1;
-      gdbtk_source_start_file ();
-    }
-
-  return 1;
-}
-
-static int
-gdbtk_interpreter_suspend (void *data)
-{
-  return 1;
-}
-
-static int
-gdbtk_interpreter_display_prompt_p (void *data)
-{
-  return 1;
-}
-
-static int
-gdbtk_interpreter_exec (void *data, const char *command_str)
-{
-  return 1;
-}
-
-/* This function is called instead of gdb's internal command loop.  This is the
-   last chance to do anything before entering the main Tk event loop. 
-   At the end of the command, we enter the main loop. */
-
-static void
-gdbtk_command_loop (void)
-{
-  extern FILE *instream;
-
-  /* We no longer want to use stdin as the command input stream */
-  instream = NULL;
-
-  if (Tcl_Eval (gdbtk_interp, "gdbtk_tcl_preloop") != TCL_OK)
-    {
-      const char *msg;
-
-      /* Force errorInfo to be set up propertly.  */
-      Tcl_AddErrorInfo (gdbtk_interp, "");
-
-      msg = Tcl_GetVar (gdbtk_interp, "errorInfo", TCL_GLOBAL_ONLY);
-#ifdef _WIN32
-      MessageBox (NULL, msg, NULL, MB_OK | MB_ICONERROR | MB_TASKMODAL);
-#else
-      fputs_unfiltered (msg, gdb_stderr);
-#endif
-    }
-
-#ifdef _WIN32
-  close_bfds ();
-#endif
-
-  Tk_MainLoop ();
-}
-
-void
-_initialize_gdbtk_interp (void)
-{
-  static const struct interp_procs procs = {
-    gdbtk_interpreter_init,             /* init_proc */
-    gdbtk_interpreter_resume,           /* resume_proc */
-    gdbtk_interpreter_suspend,	        /* suspend_proc */
-    gdbtk_interpreter_exec,             /* exec_proc */
-    gdbtk_interpreter_display_prompt_p  /* prompt_proc_p */
-  };
-  struct interp *gdbtk_interp;
-
-  gdbtk_data = 
-    (struct gdbtk_interp_data *) xmalloc (sizeof (struct gdbtk_interp_data));
-  memset (gdbtk_data, 0, sizeof (struct gdbtk_interp_data));
-  gdbtk_data->_stdout = gdbtk_fileopen ();
-  gdbtk_data->_stderr = gdbtk_fileopen ();
-  gdbtk_data->_stdlog = gdbtk_fileopen ();
-  gdbtk_data->_stdtarg = gdbtk_fileopen ();
-  gdbtk_interp = interp_new ("insight", gdbtk_data, cli_out_new (gdbtk_data->_stdout),
-			     &procs);
-  interp_add (gdbtk_interp);
-}
diff --git a/gdb/gdbtk/generic/gdbtk-main.c b/gdb/gdbtk/generic/gdbtk-main.c
deleted file mode 100644
index 32e54249d8c..00000000000
--- a/gdb/gdbtk/generic/gdbtk-main.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Main function for gdb with insight.  
-
-   Copyright 2002 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.  */
-
-
-#include "defs.h"
-#include "main.h"
-#include "gdb_string.h"
-
-int
-main (int argc, char **argv)
-{
-  struct captured_main_args args;
-  memset (&args, 0, sizeof args);
-  args.argc = argc;
-  args.argv = argv;
-  args.use_windows = 1;
-  args.interpreter_p = "insight";
-  return gdb_main (&args);
-}
diff --git a/gdb/gdbtk/generic/gdbtk-register.c b/gdb/gdbtk/generic/gdbtk-register.c
deleted file mode 100644
index 49ba9a69c06..00000000000
--- a/gdb/gdbtk/generic/gdbtk-register.c
+++ /dev/null
@@ -1,577 +0,0 @@
-/* Tcl/Tk command definitions for Insight - Registers
-   Copyright 2001, 2002 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.  */
-
-#include "defs.h"
-#include "frame.h"
-#include "regcache.h"
-#include "reggroups.h"
-#include "value.h"
-#include "target.h"
-#include "gdb_string.h"
-
-#include <tcl.h>
-#include "gdbtk.h"
-#include "gdbtk-cmds.h"
-
-/* This contains the previous values of the registers, since the last call to
-   gdb_changed_register_list.
-
-   It is an array of (NUM_REGS+NUM_PSEUDO_REGS)*MAX_REGISTER_RAW_SIZE bytes. */
-
-static int gdb_register_info (ClientData, Tcl_Interp *, int, Tcl_Obj **);
-static void get_register (int, void *);
-static void get_register_name (int, void *);
-static void get_register_size (int regnum, void *arg);
-static int map_arg_registers (Tcl_Interp *, int, Tcl_Obj **,
-			      void (*)(int, void *), void *);
-static void register_changed_p (int, void *);
-static void setup_architecture_data (void);
-static int gdb_regformat (ClientData, Tcl_Interp *, int, Tcl_Obj **);
-static int gdb_reggroup (ClientData, Tcl_Interp *, int, Tcl_Obj **);
-static int gdb_reggrouplist (ClientData, Tcl_Interp *, int, Tcl_Obj **);
-
-static void get_register_types (int regnum, void *arg);
-
-static char *old_regs = NULL;
-static int *regformat = (int *)NULL;
-static struct type **regtype = (struct type **)NULL;
-
-int
-Gdbtk_Register_Init (Tcl_Interp *interp)
-{
-  Tcl_CreateObjCommand (interp, "gdb_reginfo", gdbtk_call_wrapper,
-                        gdb_register_info, NULL);
-
-  /* Register/initialize any architecture specific data */
-  setup_architecture_data ();
-
-  register_gdbarch_swap (&old_regs, sizeof (old_regs), NULL);
-  register_gdbarch_swap (&regformat, sizeof (regformat), NULL);
-  register_gdbarch_swap (&regtype, sizeof (regtype), NULL);
-  register_gdbarch_swap (NULL, 0, setup_architecture_data);
-
-  return TCL_OK;
-}
-
-/* This implements the tcl command "gdb_reginfo".
- * It returns the requested information about registers.
- *
- * Tcl Arguments:
- *    OPTION    - "changed", "name", "size", "value" (see below)
- *    REGNUM(S) - the register(s) for which info is requested
- *
- * Tcl Result:
- *    The requested information
- *
- * Options:
- * changed
- *    Returns a list of registers whose values have changed since the
- *    last time the proc was called.
- *
- *    usage: gdb_reginfo changed [regnum0, ..., regnumN]
- *
- * name
- *    Return a list containing the names of the registers whose numbers
- *    are given by REGNUM ... .  If no register numbers are given, return
- *    all the registers' names.
- *
- *    usage: gdb_reginfo name [-numbers] [regnum0, ..., regnumN]
- *
- *    Note that some processors have gaps in the register numberings:
- *    even if there is no register numbered N, there may still be a
- *    register numbered N+1.  So if you call gdb_regnames with no
- *    arguments, you can't assume that the N'th element of the result is
- *    register number N.
- *
- *    Given the -numbers option, gdb_regnames returns, not a list of names,
- *    but a list of pairs {NAME NUMBER}, where NAME is the register name,
- *    and NUMBER is its number.
- *
- * size
- *    Returns the raw size of the register(s) in bytes.
- *
- *    usage: gdb_reginfo size [regnum0, ..., regnumN]
- *
- * value
- *    Returns a list of register values.
- *
- *    usage: gdb_reginfo value [regnum0, ..., regnumN]
- */
-static int
-gdb_register_info (ClientData clientData, Tcl_Interp *interp, int objc,
-                   Tcl_Obj **objv)
-{
-  int index;
-  void *argp;
-  void (*func)(int, void *);
-  static const char *commands[] = {"changed", "name", "size", "value", "type", 
-			     "format", "group", "grouplist", NULL};
-  enum commands_enum { REGINFO_CHANGED, REGINFO_NAME, REGINFO_SIZE, REGINFO_VALUE, 
-		       REGINFO_TYPE, REGINFO_FORMAT, REGINFO_GROUP, REGINFO_GROUPLIST };
-
-  if (objc < 2)
-    {
-      Tcl_WrongNumArgs (interp, 1, objv, "name|size|value|type|format|groups [regnum1 ... regnumN]");
-      return TCL_ERROR;
-    }
-
-  if (Tcl_GetIndexFromObj (interp, objv[1], commands, "options", 0,
-  			   &index) != TCL_OK)
-    {
-      result_ptr->flags |= GDBTK_IN_TCL_RESULT;
-      return TCL_ERROR;
-    }
-  
-  /* Skip the option */
-  objc -= 2;
-  objv += 2;
-
-  switch ((enum commands_enum) index)
-    {
-    case REGINFO_CHANGED:
-      func = register_changed_p;
-      argp = NULL;
-      break;
-
-    case REGINFO_NAME:
-      {
-	int len;
-	char *s = Tcl_GetStringFromObj (objv[0], &len);
-	if (objc != 0 && strncmp (s, "-numbers", len) == 0)
-	  {
-	    argp = (void *) 1;
-	    objc--;
-	    objv++;
-	  }
-	else
-	  argp = NULL;
-
-	func = get_register_name;
-      }
-      break;
-
-    case REGINFO_SIZE:
-      func = get_register_size;
-      argp = NULL;
-      break;
-
-    case REGINFO_VALUE:
-      func = get_register;
-      argp = NULL;
-      break;
-
-    case REGINFO_TYPE:
-      func = get_register_types;
-      argp = NULL;
-      break;
-
-    case REGINFO_FORMAT:
-      return gdb_regformat (clientData, interp, objc, objv);
-
-    case REGINFO_GROUP:
-      return gdb_reggroup (clientData, interp, objc, objv);
-
-    case REGINFO_GROUPLIST:
-      return gdb_reggrouplist (clientData, interp, objc, objv);
-
-    default:
-      return TCL_ERROR;
-    }
-
-  return map_arg_registers (interp, objc, objv, func, argp);
-}
-
-static void
-get_register_size (int regnum, void *arg)
-{
-  Tcl_ListObjAppendElement (gdbtk_interp, result_ptr->obj_ptr,
-			    Tcl_NewIntObj (REGISTER_RAW_SIZE (regnum)));
-}
-
-/* returns a list of valid types for a register */
-/* Normally this will be only one type, except for SIMD and other */
-/* special registers. */
-
-static void
-get_register_types (int regnum, void *arg)
-{ 
-  struct type *reg_vtype;
-  int i,n;
-
-  reg_vtype = register_type (current_gdbarch, regnum);
-  
-  if (TYPE_CODE (reg_vtype) == TYPE_CODE_UNION)
-    {
-      n = TYPE_NFIELDS (reg_vtype);
-      /* limit to 16 types */
-      if (n > 16) 
-	n = 16;
-      
-      for (i = 0; i < n; i++)
-	{
-	  Tcl_Obj *ar[3], *list;
-	  char *buff;
-	  xasprintf (&buff, "%lx", (long)TYPE_FIELD_TYPE (reg_vtype, i));
-	  ar[0] = Tcl_NewStringObj (TYPE_FIELD_NAME (reg_vtype, i), -1);
-	  ar[1] = Tcl_NewStringObj (buff, -1);
-	  if (TYPE_CODE (TYPE_FIELD_TYPE (reg_vtype, i)) == TYPE_CODE_FLT)
-	    ar[2] = Tcl_NewStringObj ("float", -1);
-	  else
-	    ar[2] = Tcl_NewStringObj ("int", -1);	    
-	  list = Tcl_NewListObj (3, ar);
-	  Tcl_ListObjAppendElement (gdbtk_interp, result_ptr->obj_ptr, list);
-	  xfree (buff);
-	}
-    }
-  else
-    {
-      Tcl_Obj *ar[3], *list;
-      char *buff;
-      xasprintf (&buff, "%lx", (long)reg_vtype);
-      ar[0] = Tcl_NewStringObj (TYPE_NAME(reg_vtype), -1);
-      ar[1] = Tcl_NewStringObj (buff, -1);
-      if (TYPE_CODE (reg_vtype) == TYPE_CODE_FLT)
-	ar[2] = Tcl_NewStringObj ("float", -1);
-      else
-	ar[2] = Tcl_NewStringObj ("int", -1);	    
-      list = Tcl_NewListObj (3, ar);
-      xfree (buff);
-      Tcl_ListObjAppendElement (gdbtk_interp, result_ptr->obj_ptr, list);
-    }
-}
-
-
-static void
-get_register (int regnum, void *arg)
-{
-  int realnum;
-  CORE_ADDR addr;
-  enum lval_type lval;
-  struct type *reg_vtype;
-  char raw_buffer[MAX_REGISTER_SIZE];
-  char virtual_buffer[MAX_REGISTER_SIZE];
-  int optim, format;
-  struct cleanup *old_chain = NULL;
-  struct ui_file *stb;
-  long dummy;
-  char *res;
- 
-  format = regformat[regnum];
-  if (format == 0)
-    format = 'x';
-  
-  reg_vtype = regtype[regnum];
-  if (reg_vtype == NULL)
-    reg_vtype = register_type (current_gdbarch, regnum);
-
-  if (!target_has_registers)
-    {
-      if (result_ptr->flags & GDBTK_MAKES_LIST)
-	Tcl_ListObjAppendElement (NULL, result_ptr->obj_ptr, Tcl_NewStringObj ("", -1));
-      else
-	Tcl_SetStringObj (result_ptr->obj_ptr, "", -1);
-      return;
-    }
-
-  frame_register (get_selected_frame (), regnum, &optim, &lval, 
-		  &addr, &realnum, raw_buffer);
-
-  if (optim)
-    {
-      Tcl_ListObjAppendElement (NULL, result_ptr->obj_ptr,
-				Tcl_NewStringObj ("Optimized out", -1));
-      return;
-    }
-
-  /* Convert raw data to virtual format if necessary.  */
-  if (REGISTER_CONVERTIBLE (regnum))
-    {
-      REGISTER_CONVERT_TO_VIRTUAL (regnum, reg_vtype,
-      				   raw_buffer, virtual_buffer);
-    }
-  else
-    memcpy (virtual_buffer, raw_buffer, REGISTER_VIRTUAL_SIZE (regnum));
-
-  stb = mem_fileopen ();
-  old_chain = make_cleanup_ui_file_delete (stb);
-
-  if (format == 'r')
-    {
-      /* shouldn't happen. raw format is deprecated */
-      int j;
-      char *ptr, buf[1024];
-
-      strcpy (buf, "0x");
-      ptr = buf + 2;
-      for (j = 0; j < REGISTER_RAW_SIZE (regnum); j++)
-	{
-	  int idx = TARGET_BYTE_ORDER == BFD_ENDIAN_BIG ? j
-	    : REGISTER_RAW_SIZE (regnum) - 1 - j;
-	  sprintf (ptr, "%02x", (unsigned char) raw_buffer[idx]);
-	  ptr += 2;
-	}
-      fputs_unfiltered (buf, stb);
-    }
-  else
-    {
-      if ((TYPE_CODE (reg_vtype) == TYPE_CODE_UNION)
-	  && (strcmp (FIELD_NAME (TYPE_FIELD (reg_vtype, 0)), 
-		      REGISTER_NAME (regnum)) == 0))
-	{
-	  val_print (FIELD_TYPE (TYPE_FIELD (reg_vtype, 0)), virtual_buffer, 0, 0,
-		     stb, format, 1, 0, Val_pretty_default);
-	}
-      else
-	val_print (reg_vtype, virtual_buffer, 0, 0,
-		   stb, format, 1, 0, Val_pretty_default);
-    }
-  
-  res = ui_file_xstrdup (stb, &dummy);
-
-  if (result_ptr->flags & GDBTK_MAKES_LIST)
-    Tcl_ListObjAppendElement (NULL, result_ptr->obj_ptr, Tcl_NewStringObj (res, -1));
-  else
-    Tcl_SetStringObj (result_ptr->obj_ptr, res, -1);
-
-  xfree (res);
-  do_cleanups (old_chain);
-}
-
-static void
-get_register_name (int regnum, void *argp)
-{
-  /* Non-zero if the caller wants the register numbers, too.  */
-  int numbers = (int) argp;
-  Tcl_Obj *name = Tcl_NewStringObj (REGISTER_NAME (regnum), -1);
-  Tcl_Obj *elt;
-
-  if (numbers)
-    {
-      /* Build a tuple of the form "{REGNAME NUMBER}", and append it to
-	 our result.  */
-      Tcl_Obj *array[2];
-
-      array[0] = name;
-      array[1] = Tcl_NewIntObj (regnum);
-      elt = Tcl_NewListObj (2, array);
-    }
-  else
-    elt = name;
-
-  Tcl_ListObjAppendElement (NULL, result_ptr->obj_ptr, elt);
-}
-
-/* This is a sort of mapcar function for operations on registers */
-
-static int
-map_arg_registers (Tcl_Interp *interp, int objc, Tcl_Obj **objv,
-		   void (*func) (int regnum, void *argp), void *argp)
-{
-  int regnum, numregs;
-
-  /* Note that the test for a valid register must include checking the
-     REGISTER_NAME because NUM_REGS may be allocated for the union of
-     the register sets within a family of related processors.  In this
-     case, some entries of REGISTER_NAME will change depending upon
-     the particular processor being debugged.  */
-
-  numregs = NUM_REGS + NUM_PSEUDO_REGS;
-
-  if (objc == 0)		/* No args, just do all the regs */
-    {
-      result_ptr->flags |= GDBTK_MAKES_LIST;
-      for (regnum = 0; regnum < numregs; regnum++)
-	{
-	  if (REGISTER_NAME (regnum) == NULL
-	      || *(REGISTER_NAME (regnum)) == '\0')
-	    continue;
-	  func (regnum, argp);
-	}      
-      return TCL_OK;
-    }
-
-  if (objc == 1)
-    if (Tcl_ListObjGetElements (interp, *objv, &objc, &objv ) != TCL_OK)
-      return TCL_ERROR;
-
-  if (objc > 1)
-    result_ptr->flags |= GDBTK_MAKES_LIST;
-
-  /* Else, list of register #s, just do listed regs */
-  for (; objc > 0; objc--, objv++)
-    {
-      if (Tcl_GetIntFromObj (NULL, *objv, &regnum) != TCL_OK)
-	{
-	  result_ptr->flags |= GDBTK_IN_TCL_RESULT;
-	  return TCL_ERROR;
-	}
-
-      if (regnum >= 0  && regnum < numregs
-	  && REGISTER_NAME (regnum) != NULL
-	  && *REGISTER_NAME (regnum) != '\000')
-	func (regnum, argp);
-      else
-	{
-	  Tcl_SetStringObj (result_ptr->obj_ptr, "bad register number", -1);
-	  return TCL_ERROR;
-	}
-    }
-  return TCL_OK;
-}
-
-static void
-register_changed_p (int regnum, void *argp)
-{
-  char raw_buffer[MAX_REGISTER_SIZE];
-
-  if (deprecated_selected_frame == NULL
-      || !frame_register_read (deprecated_selected_frame, regnum, raw_buffer))
-    return;
-
-  if (memcmp (&old_regs[regnum * MAX_REGISTER_SIZE], raw_buffer,
-	      REGISTER_RAW_SIZE (regnum)) == 0)
-    return;
-
-  /* Found a changed register.  Save new value and return its number. */
-
-  memcpy (&old_regs[regnum * MAX_REGISTER_SIZE], raw_buffer,
-	  REGISTER_RAW_SIZE (regnum));
-
-  Tcl_ListObjAppendElement (NULL, result_ptr->obj_ptr, Tcl_NewIntObj (regnum));
-}
-
-static void
-setup_architecture_data ()
-{
-  xfree (old_regs);
-  xfree (regformat);
-  xfree (regtype);
-
-  old_regs = xcalloc (1, (NUM_REGS + NUM_PSEUDO_REGS) * MAX_REGISTER_SIZE + 1);
-  regformat = (int *)xcalloc ((NUM_REGS + NUM_PSEUDO_REGS) , sizeof(int));
-  regtype = (struct type **)xcalloc ((NUM_REGS + NUM_PSEUDO_REGS), sizeof(struct type **));
-}
-
-/* gdb_regformat sets the format for a register */
-/* This is necessary to allow "gdb_reginfo value" to return a list */
-/* of registers and values. */
-/* Usage: gdb_reginfo format regno typeaddr format */
-
-static int
-gdb_regformat (ClientData clientData, Tcl_Interp *interp,
-	       int objc, Tcl_Obj **objv)
-{
-  int fm, regno;
-  struct type *type;
-
-  if (objc != 3)
-    {
-      Tcl_WrongNumArgs (interp, 0, objv, "gdb_reginfo regno type format");
-      return TCL_ERROR;
-    }
-
-  if (Tcl_GetIntFromObj (interp, objv[0], &regno) != TCL_OK)
-    return TCL_ERROR;
-
-  type = (struct type *)strtol (Tcl_GetStringFromObj (objv[1], NULL), NULL, 16);  
-  fm = (int)*(Tcl_GetStringFromObj (objv[2], NULL));
-
-  if (regno >= NUM_REGS + NUM_PSEUDO_REGS)
-    {
-      gdbtk_set_result (interp, "Register number %d too large", regno);
-      return TCL_ERROR;
-    }
-  
-  regformat[regno] = fm;
-  regtype[regno] = type;
-
-  return TCL_OK;
-}
-
-
-/* gdb_reggrouplist returns the names of the register groups */
-/* for the current architecture. */
-/* Usage: gdb_reginfo groups */
-
-static int
-gdb_reggrouplist (ClientData clientData, Tcl_Interp *interp,
-		  int objc, Tcl_Obj **objv)
-{
-  struct reggroup *const *groups;
-  int i = 0;
-
-  if (objc != 0)
-    {
-      Tcl_WrongNumArgs (interp, 0, objv, "gdb_reginfo grouplist");
-      return TCL_ERROR;
-    }
-
-  groups = reggroups (current_gdbarch);
-
-  while (groups[i] != NULL) {
-    if (reggroup_type (groups[i]) == USER_REGGROUP)
-      Tcl_ListObjAppendElement (NULL, result_ptr->obj_ptr, Tcl_NewStringObj (reggroup_name(groups[i]), -1));
-    i++;
-  }
-  return TCL_OK;
-}
-
-
-/* gdb_reggroup returns the names of the registers in a group. */
-/* Usage: gdb_reginfo group groupname */
-
-static int
-gdb_reggroup (ClientData clientData, Tcl_Interp *interp,
-	      int objc, Tcl_Obj **objv)
-{
-  struct reggroup *const *group;
-  char *groupname;
-  int regnum;
-
-  if (objc != 1)
-    {
-      Tcl_WrongNumArgs (interp, 0, objv, "gdb_reginfo group groupname");
-      return TCL_ERROR;
-    }
-  
-  groupname = Tcl_GetStringFromObj (objv[0], NULL);
-  if (groupname == NULL)
-    {
-      gdbtk_set_result (interp, "could not read groupname");
-      return TCL_ERROR;
-    }
-
-  for (group = reggroups (current_gdbarch); *group != NULL; group++)
-    {
-      if (strcmp (groupname, reggroup_name (*group)) == 0)
-	break;
-    }
-
-  if (*group == NULL)
-    return TCL_ERROR;
-
-  for (regnum = 0; regnum < NUM_REGS + NUM_PSEUDO_REGS; regnum++)
-    {
-      if (gdbarch_register_reggroup_p (current_gdbarch, regnum, *group))
-	Tcl_ListObjAppendElement (NULL, result_ptr->obj_ptr, Tcl_NewIntObj (regnum));
-    }
-  return TCL_OK;
-}
-
diff --git a/gdb/gdbtk/generic/gdbtk-stack.c b/gdb/gdbtk/generic/gdbtk-stack.c
deleted file mode 100644
index a5915ba74b6..00000000000
--- a/gdb/gdbtk/generic/gdbtk-stack.c
+++ /dev/null
@@ -1,620 +0,0 @@
-/* Tcl/Tk command definitions for Insight - Stack.
-   Copyright 2001, 2002, 2003 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.  */
-
-#include "defs.h"
-#include "target.h"
-#include "breakpoint.h"
-#include "linespec.h"
-#include "block.h"
-
-#include <tcl.h>
-#include "gdbtk.h"
-#include "gdbtk-cmds.h"
-#include "gdbtk-wrapper.h"
-
-static int gdb_block_vars (ClientData clientData,
-			   Tcl_Interp * interp, int objc,
-			   Tcl_Obj * CONST objv[]);
-static int gdb_get_args_command (ClientData, Tcl_Interp *, int,
-				 Tcl_Obj * CONST objv[]);
-static int gdb_get_blocks (ClientData clientData,
-			   Tcl_Interp * interp, int objc,
-			   Tcl_Obj * CONST objv[]);
-static int gdb_get_locals_command (ClientData, Tcl_Interp *, int,
-				   Tcl_Obj * CONST objv[]);
-static int gdb_get_vars_command (ClientData, Tcl_Interp *, int,
-				 Tcl_Obj * CONST objv[]);
-static int gdb_selected_block (ClientData clientData,
-			       Tcl_Interp * interp, int argc,
-			       Tcl_Obj * CONST objv[]);
-static int gdb_selected_frame (ClientData clientData,
-			       Tcl_Interp * interp, int argc,
-			       Tcl_Obj * CONST objv[]);
-static int gdb_stack (ClientData, Tcl_Interp *, int, Tcl_Obj * CONST[]);
-static void get_frame_name (Tcl_Interp *interp, Tcl_Obj *list,
-			    struct frame_info *fi);
-
-int
-Gdbtk_Stack_Init (Tcl_Interp *interp)
-{
-  Tcl_CreateObjCommand (interp, "gdb_block_variables", gdbtk_call_wrapper,
-			gdb_block_vars, NULL);
-  Tcl_CreateObjCommand (interp, "gdb_get_blocks", gdbtk_call_wrapper,
-			gdb_get_blocks, NULL);
-  Tcl_CreateObjCommand (interp, "gdb_get_args", gdbtk_call_wrapper,
-			gdb_get_args_command, NULL);
-  Tcl_CreateObjCommand (interp, "gdb_get_locals", gdbtk_call_wrapper,
-			gdb_get_locals_command, NULL);
-  Tcl_CreateObjCommand (interp, "gdb_selected_block", gdbtk_call_wrapper,
-			gdb_selected_block, NULL);
-  Tcl_CreateObjCommand (interp, "gdb_selected_frame", gdbtk_call_wrapper,
-			gdb_selected_frame, NULL);
-  Tcl_CreateObjCommand (interp, "gdb_stack", gdbtk_call_wrapper, gdb_stack, NULL);
-
-  return TCL_OK;
-}
-
-/* This implements the tcl command gdb_block_vars.
- *
- * Returns all variables valid in the specified block.
- *
- * Arguments:
- *    The start and end addresses which identify the block.
- * Tcl Result:
- *    All variables defined in the given block.
- */
-static int
-gdb_block_vars (ClientData clientData, Tcl_Interp *interp,
-		int objc, Tcl_Obj *CONST objv[])
-{
-  struct block *block;
-  int i;
-  struct symbol *sym;
-  CORE_ADDR start, end;
-
-  if (objc < 3)
-    {
-      Tcl_WrongNumArgs (interp, 1, objv, "startAddr endAddr");
-      return TCL_ERROR;
-    }
-
-  Tcl_SetListObj (result_ptr->obj_ptr, 0, NULL);
-  if (deprecated_selected_frame == NULL)
-    return TCL_OK;
-
-  start = string_to_core_addr (Tcl_GetStringFromObj (objv[1], NULL));
-  end   = string_to_core_addr (Tcl_GetStringFromObj (objv[2], NULL));
-  
-  block = get_frame_block (deprecated_selected_frame, 0);
-
-  while (block != 0)
-    {
-      if (BLOCK_START (block) == start && BLOCK_END (block) == end)
-	{
-	  ALL_BLOCK_SYMBOLS (block, i, sym)
-	    {
-	      switch (SYMBOL_CLASS (sym))
-		{
-		case LOC_ARG:		  /* argument              */
-		case LOC_REF_ARG:	  /* reference arg         */
-		case LOC_REGPARM:	  /* register arg          */
-		case LOC_REGPARM_ADDR:    /* indirect register arg */
-		case LOC_LOCAL_ARG:	  /* stack arg             */
-		case LOC_BASEREG_ARG:	  /* basereg arg           */
-		case LOC_LOCAL:	          /* stack local           */
-		case LOC_BASEREG:	  /* basereg local         */
-		case LOC_STATIC:	  /* static                */
-		case LOC_REGISTER:        /* register              */
-		case LOC_COMPUTED:	  /* computed location     */
-		case LOC_COMPUTED_ARG:	  /* computed location arg */
-		  Tcl_ListObjAppendElement (interp, result_ptr->obj_ptr,
-					    Tcl_NewStringObj (DEPRECATED_SYMBOL_NAME (sym),
-							      -1));
-		  break;
-
-		default:
-		  break;
-		}
-	    }
-
-	  return TCL_OK;
-	}
-      else if (BLOCK_FUNCTION (block))
-	break;
-      else
-	block = BLOCK_SUPERBLOCK (block);
-    }
-
-  return TCL_OK;
-}
-
-/* This implements the tcl command gdb_get_blocks
- *
- * Returns the start and end addresses for all blocks in
- * the selected frame.
- *
- * Arguments:
- *    None
- * Tcl Result:
- *    A list of all valid blocks in the selected_frame.
- */
-static int
-gdb_get_blocks (ClientData clientData, Tcl_Interp *interp,
-		int objc, Tcl_Obj *CONST objv[])
-{
-  struct block *block;
-  int i, junk;
-  struct symbol *sym;
-  CORE_ADDR pc;
-
-  Tcl_SetListObj (result_ptr->obj_ptr, 0, NULL);
-  
-  if (deprecated_selected_frame != NULL)
-    {
-      block = get_frame_block (deprecated_selected_frame, 0);
-      pc = get_frame_pc (deprecated_selected_frame);
-      while (block != 0)
-	{
-	  junk = 0;
-	  ALL_BLOCK_SYMBOLS (block, i, sym)
-	    {
-	      switch (SYMBOL_CLASS (sym))
-		{
-		default:
-		case LOC_UNDEF:		  /* catches errors        */
-		case LOC_CONST:           /* constant              */
-		case LOC_TYPEDEF:	  /* local typedef         */
-		case LOC_LABEL:	          /* local label           */
-		case LOC_BLOCK:	          /* local function        */
-		case LOC_CONST_BYTES:	  /* loc. byte seq.        */
-		case LOC_UNRESOLVED:      /* unresolved static     */
-		case LOC_OPTIMIZED_OUT:   /* optimized out         */
-		  junk = 1;
-		  break;
-
-		case LOC_ARG:		  /* argument              */
-		case LOC_REF_ARG:	  /* reference arg         */
-		case LOC_REGPARM:	  /* register arg          */
-		case LOC_REGPARM_ADDR:    /* indirect register arg */
-		case LOC_LOCAL_ARG:	  /* stack arg             */
-		case LOC_BASEREG_ARG:	  /* basereg arg           */
-		case LOC_COMPUTED_ARG:	  /* computed location arg */
-
-		case LOC_LOCAL:	          /* stack local           */
-		case LOC_BASEREG:	  /* basereg local         */
-		case LOC_STATIC:	  /* static                */
-		case LOC_REGISTER:        /* register              */
-		case LOC_COMPUTED:	  /* computed location     */
-		  junk = 0;
-		  break;
-		}
-	    }
-
-	  /* If we found a block with locals in it, add it to the list. 
-	     Note that the ranges of start and end address for blocks
-	     are exclusive, so double-check against the PC */
-	  
-	  if (!junk && pc < BLOCK_END (block))
-	    {
-	      char *addr;
-
-	      Tcl_Obj *elt = Tcl_NewListObj (0, NULL);
-	      xasprintf (&addr, "0x%s", paddr_nz (BLOCK_START (block)));
-	      Tcl_ListObjAppendElement (interp, elt,
-					Tcl_NewStringObj (addr, -1));
-	      free(addr);
-	      xasprintf (&addr, "0x%s", paddr_nz (BLOCK_END (block)));
-	      Tcl_ListObjAppendElement (interp, elt,
-					Tcl_NewStringObj (addr, -1));
-	      Tcl_ListObjAppendElement (interp, result_ptr->obj_ptr, elt);
-	      free(addr);
-	    }
-
-	  if (BLOCK_FUNCTION (block))
-	    break;
-	  else
-	    block = BLOCK_SUPERBLOCK (block);
-	}
-    }
-
-  return TCL_OK;
-}
-
-/* gdb_get_args -
- * This and gdb_get_locals just call gdb_get_vars_command with the right
- * value of clientData.  We can't use the client data in the definition
- * of the command, because the call wrapper uses this instead...
- */
-static int
-gdb_get_args_command (ClientData clientData, Tcl_Interp *interp,
-		      int objc, Tcl_Obj *CONST objv[])
-{
-  return gdb_get_vars_command ((ClientData) 1, interp, objc, objv);
-}
-
-
-static int
-gdb_get_locals_command (ClientData clientData, Tcl_Interp *interp,
-			int objc, Tcl_Obj *CONST objv[])
-{
-  return gdb_get_vars_command ((ClientData) 0, interp, objc, objv);
-}
-
-/* This implements the tcl commands "gdb_get_locals" and "gdb_get_args"
-
-* This function sets the Tcl interpreter's result to a list of variable names
-* depending on clientData. If clientData is one, the result is a list of
-* arguments; zero returns a list of locals -- all relative to the block
-* specified as an argument to the command. Valid commands include
-* anything decode_line_1 can handle (like "main.c:2", "*0x02020202",
-* and "main").
-*
-* Tcl Arguments:
-*   linespec - the linespec defining the scope of the lookup. Empty string
-*              to use the current block in the innermost frame.
-* Tcl Result:
-*   A list of the locals or args
-*/
-static int
-gdb_get_vars_command (ClientData clientData, Tcl_Interp *interp,
-		      int objc, Tcl_Obj *CONST objv[])
-{
-  struct symtabs_and_lines sals;
-  struct symbol *sym;
-  struct block *block;
-  char **canonical, *args;
-  int i, arguments;
-
-  if (objc > 2)
-    {
-      Tcl_WrongNumArgs (interp, 1, objv,
-			"[function:line|function|line|*addr]");
-      return TCL_ERROR;
-    }
-
-  arguments = (int) clientData;
-
-  /* Initialize the result pointer to an empty list. */
-
-  Tcl_SetListObj (result_ptr->obj_ptr, 0, NULL);
-
-  if (objc == 2)
-    {
-      args = Tcl_GetStringFromObj (objv[1], NULL);
-      sals = decode_line_1 (&args, 1, NULL, 0, &canonical);
-      if (sals.nelts == 0)
-	{
-	  gdbtk_set_result (interp, "error decoding line");
-	  return TCL_ERROR;
-	}
-
-      /* Resolve all line numbers to PC's */
-      for (i = 0; i < sals.nelts; i++)
-	resolve_sal_pc (&sals.sals[i]);
-
-      block = block_for_pc (sals.sals[0].pc);
-    }
-  else
-    {
-      /* Specified currently selected frame */
-      if (deprecated_selected_frame == NULL)
-	return TCL_OK;
-
-      block = get_frame_block (deprecated_selected_frame, 0);
-    }
-
-  while (block != 0)
-    {
-      ALL_BLOCK_SYMBOLS (block, i, sym)
-	{
-	  switch (SYMBOL_CLASS (sym))
-	    {
-	    default:
-	    case LOC_UNDEF:	/* catches errors        */
-	    case LOC_CONST:	/* constant              */
-	    case LOC_TYPEDEF:	/* local typedef         */
-	    case LOC_LABEL:	/* local label           */
-	    case LOC_BLOCK:	/* local function        */
-	    case LOC_CONST_BYTES:	/* loc. byte seq.        */
-	    case LOC_UNRESOLVED:	/* unresolved static     */
-	    case LOC_OPTIMIZED_OUT:	/* optimized out         */
-	      break;
-	    case LOC_ARG:	/* argument              */
-	    case LOC_REF_ARG:	/* reference arg         */
-	    case LOC_REGPARM:	/* register arg          */
-	    case LOC_REGPARM_ADDR:	/* indirect register arg */
-	    case LOC_LOCAL_ARG:	/* stack arg             */
-	    case LOC_BASEREG_ARG:	/* basereg arg           */
-	    case LOC_COMPUTED_ARG:	/* computed location arg */
-	      if (arguments)
-		Tcl_ListObjAppendElement (interp, result_ptr->obj_ptr,
-					  Tcl_NewStringObj (DEPRECATED_SYMBOL_NAME (sym), -1));
-	      break;
-	    case LOC_LOCAL:	/* stack local           */
-	    case LOC_BASEREG:	/* basereg local         */
-	    case LOC_STATIC:	/* static                */
-	    case LOC_REGISTER:	/* register              */
-	    case LOC_COMPUTED:	/* computed location     */
-	      if (!arguments)
-		Tcl_ListObjAppendElement (interp, result_ptr->obj_ptr,
-					  Tcl_NewStringObj (DEPRECATED_SYMBOL_NAME (sym), -1));
-	      break;
-	    }
-	}
-      if (BLOCK_FUNCTION (block))
-	break;
-      else
-	block = BLOCK_SUPERBLOCK (block);
-    }
-
-  return TCL_OK;
-}
-
-/* This implements the tcl command gdb_selected_block
- *
- * Returns the start and end addresses of the innermost
- * block in the selected frame.
- *
- * Arguments:
- *    None
- * Tcl Result:
- *    The currently selected block's start and end addresses
- */
-static int
-gdb_selected_block (ClientData clientData, Tcl_Interp *interp,
-		    int objc, Tcl_Obj *CONST objv[])
-{
-  char *start = NULL;
-  char *end   = NULL;
-
-  if (deprecated_selected_frame == NULL)
-    {
-      xasprintf (&start, "%s", "");
-      xasprintf (&end, "%s", "");
-    }
-  else
-    {
-      struct block *block;
-      block = get_frame_block (deprecated_selected_frame, 0);
-      xasprintf (&start, "0x%s", paddr_nz (BLOCK_START (block)));
-      xasprintf (&end, "0x%s", paddr_nz (BLOCK_END (block)));
-    }
-
-  Tcl_SetListObj (result_ptr->obj_ptr, 0, NULL);
-  Tcl_ListObjAppendElement (interp, result_ptr->obj_ptr,
-			    Tcl_NewStringObj (start, -1));
-  Tcl_ListObjAppendElement (interp, result_ptr->obj_ptr,
-			    Tcl_NewStringObj (end, -1));
-
-  free(start);
-  free(end);
-  return TCL_OK;
-}
-
-/* This implements the tcl command gdb_selected_frame
-
-* Returns the address of the selected frame
-* frame.
-*
-* Arguments:
-*    None
-* Tcl Result:
-*    The currently selected frame's address
-*/
-static int
-gdb_selected_frame (ClientData clientData, Tcl_Interp *interp,
-		    int objc, Tcl_Obj *CONST objv[])
-{
-  char *frame;
-
-  if (deprecated_selected_frame == NULL)
-    xasprintf (&frame, "%s","");
-  else
-    /* FIXME: cagney/2002-11-19: This should be using get_frame_id()
-       to identify the frame and *NOT* get_frame_base().  */
-    xasprintf (&frame, "0x%s",
-	       paddr_nz (get_frame_base (deprecated_selected_frame)));
-
-  Tcl_SetStringObj (result_ptr->obj_ptr, frame, -1);
-
-  free(frame);
-  return TCL_OK;
-}
-
-/* This implements the tcl command gdb_stack.
- * It builds up a list of stack frames.
- *
- * Tcl Arguments:
- *    start  - starting stack frame
- *    count - number of frames to inspect
- * Tcl Result:
- *    A list of function names
- */
-static int
-gdb_stack (ClientData clientData, Tcl_Interp *interp,
-	   int objc, Tcl_Obj *CONST objv[])
-{
-  int start, count;
-
-  if (objc < 3)
-    {
-      Tcl_WrongNumArgs (interp, 1, objv, "start count");
-      return TCL_ERROR;
-    }
-
-  if (Tcl_GetIntFromObj (NULL, objv[1], &start))
-    {
-      result_ptr->flags |= GDBTK_IN_TCL_RESULT;
-      return TCL_ERROR;
-    }
-  if (Tcl_GetIntFromObj (NULL, objv[2], &count))
-    {
-      result_ptr->flags |= GDBTK_IN_TCL_RESULT;
-      return TCL_ERROR;
-    }
-
-  if (target_has_stack)
-    {
-      gdb_result r;
-      struct frame_info *top;
-      struct frame_info *fi;
-
-      /* Find the outermost frame */
-      r  = GDB_get_current_frame (&fi);
-      if (r != GDB_OK)
-	return TCL_ERROR;
-
-      while (fi != NULL)
-        {
-          top = fi;
-	  r = GDB_get_prev_frame (fi, &fi);
-	  if (r != GDB_OK)
-	    fi = NULL;
-        }
-
-      /* top now points to the top (outermost frame) of the
-         stack, so point it to the requested start */
-      start = -start;
-      r = GDB_find_relative_frame (top, &start, &top);
-      
-      result_ptr->obj_ptr = Tcl_NewListObj (0, NULL);
-      if (r != GDB_OK)
-	return TCL_OK;
-
-      /* If start != 0, then we have asked to start outputting
-         frames beyond the innermost stack frame */
-      if (start == 0)
-        {
-          fi = top; 
-          while (fi && count--)
-            {
-              get_frame_name (interp, result_ptr->obj_ptr, fi);
-              r = GDB_get_next_frame (fi, &fi);
-	      if (r != GDB_OK)
-		break;
-            }
-        }
-    }
-
-  return TCL_OK;
-}
-
-/* A helper function for get_stack which adds information about
- * the stack frame FI to the caller's LIST.
- *
- * This is stolen from print_frame_info in stack.c.
- */
-static void
-get_frame_name (Tcl_Interp *interp, Tcl_Obj *list, struct frame_info *fi)
-{
-  struct symtab_and_line sal;
-  struct symbol *func = NULL;
-  register char *funname = 0;
-  enum language funlang = language_unknown;
-  Tcl_Obj *objv[1];
-
-  if (get_frame_type (fi) == DUMMY_FRAME)
-    {
-      objv[0] = Tcl_NewStringObj ("<function called from gdb>\n", -1);
-      Tcl_ListObjAppendElement (interp, list, objv[0]);
-      return;
-    }
-  if ((get_frame_type (fi) == SIGTRAMP_FRAME))
-    {
-      objv[0] = Tcl_NewStringObj ("<signal handler called>\n", -1);
-      Tcl_ListObjAppendElement (interp, list, objv[0]);
-      return;
-    }
-
-  sal =
-    find_pc_line (get_frame_pc (fi),
-		  get_next_frame (fi) != NULL
-		  && !(get_frame_type (fi) == SIGTRAMP_FRAME)
-		  && !(get_frame_type (fi) == DUMMY_FRAME));
-
-  func = find_pc_function (get_frame_pc (fi));
-  if (func)
-    {
-      struct minimal_symbol *msymbol = lookup_minimal_symbol_by_pc (get_frame_pc (fi));
-      if (msymbol != NULL
-	  && (SYMBOL_VALUE_ADDRESS (msymbol)
-	      > BLOCK_START (SYMBOL_BLOCK_VALUE (func))))
-	{
-	  func = 0;
-	  funname = GDBTK_SYMBOL_SOURCE_NAME (msymbol);
-	  funlang = SYMBOL_LANGUAGE (msymbol);
-	}
-      else
-	{
-	  funname = GDBTK_SYMBOL_SOURCE_NAME (func);
-	  funlang = SYMBOL_LANGUAGE (func);
-	}
-    }
-  else
-    {
-      struct minimal_symbol *msymbol = lookup_minimal_symbol_by_pc (get_frame_pc (fi));
-      if (msymbol != NULL)
-	{
-	  funname = GDBTK_SYMBOL_SOURCE_NAME (msymbol);
-	  funlang = SYMBOL_LANGUAGE (msymbol);
-	}
-    }
-
-  if (sal.symtab)
-    {
-      objv[0] = Tcl_NewStringObj (funname, -1);
-      Tcl_ListObjAppendElement (interp, list, objv[0]);
-    }
-  else
-    {
-#if 0
-      /* we have no convenient way to deal with this yet... */
-      if (fi->pc != sal.pc || !sal.symtab)
-	{
-	  print_address_numeric (fi->pc, 1, gdb_stdout);
-	  printf_filtered (" in ");
-	}
-      printf_symbol_filtered (gdb_stdout, funname ? funname : "??", funlang,
-			      DMGL_ANSI);
-#endif
-      objv[0] = Tcl_NewStringObj (funname != NULL ? funname : "??", -1);
-#ifdef PC_LOAD_SEGMENT
-      /* If we couldn't print out function name but if can figure out what
-         load segment this pc value is from, at least print out some info
-         about its load segment. */
-      if (!funname)
-	{
-	  Tcl_AppendStringsToObj (objv[0], " from ", PC_LOAD_SEGMENT (fi->pc),
-				  (char *) NULL);
-	}
-#endif
-#ifdef PC_SOLIB
-      if (!funname)
-	{
-	  char *lib = PC_SOLIB (get_frame_pc (fi));
-	  if (lib)
-	    {
-	      Tcl_AppendStringsToObj (objv[0], " from ", lib, (char *) NULL);
-	    }
-	}
-#endif
-      Tcl_ListObjAppendElement (interp, list, objv[0]);
-    }
-}
diff --git a/gdb/gdbtk/generic/gdbtk-varobj.c b/gdb/gdbtk/generic/gdbtk-varobj.c
deleted file mode 100644
index 70e251fffbd..00000000000
--- a/gdb/gdbtk/generic/gdbtk-varobj.c
+++ /dev/null
@@ -1,615 +0,0 @@
-/* Variable user interface layer for GDB, the GNU debugger.
-   Copyright 1999, 2000, 2001, 2002 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.  */
-
-#include "defs.h"
-#include "value.h"
-#include "gdb_string.h"
-#include "varobj.h"
-
-#include <tcl.h>
-#include "gdbtk.h"
-#include "gdbtk-cmds.h"
-
-/*
- * Public functions defined in this file
- */
-
-int gdb_variable_init (Tcl_Interp *);
-
-/*
- * Private functions defined in this file
- */
-
-/* Entries into this file */
-
-static int gdb_variable_command (ClientData, Tcl_Interp *, int,
-				 Tcl_Obj * CONST[]);
-
-static int variable_obj_command (ClientData, Tcl_Interp *, int,
-				 Tcl_Obj * CONST[]);
-
-/* Variable object subcommands */
-
-static int variable_create (Tcl_Interp *, int, Tcl_Obj * CONST[]);
-
-static void variable_delete (Tcl_Interp *, struct varobj *, int);
-
-static Tcl_Obj *variable_children (Tcl_Interp *, struct varobj *);
-
-static int variable_format (Tcl_Interp *, int, Tcl_Obj * CONST[],
-			    struct varobj *);
-
-static int variable_type (Tcl_Interp *, int, Tcl_Obj * CONST[],
-			  struct varobj *);
-
-static int variable_value (Tcl_Interp *, int, Tcl_Obj * CONST[],
-			   struct varobj *);
-
-static Tcl_Obj *variable_update (Tcl_Interp * interp, struct varobj **var);
-
-/* Helper functions for the above subcommands. */
-
-static void install_variable (Tcl_Interp *, char *);
-
-static void uninstall_variable (Tcl_Interp *, char *);
-
-/* String representations of gdb's format codes */
-static char *format_string[] =
-  {"natural", "binary", "decimal", "hexadecimal", "octal"};
-
-
-/* Initialize the variable code. This function should be called once
-   to install and initialize the variable code into the interpreter. */
-int
-gdb_variable_init (Tcl_Interp *interp)
-{
-  Tcl_Command result;
-  static int initialized = 0;
-
-  if (!initialized)
-    {
-      result = Tcl_CreateObjCommand (interp, "gdb_variable", gdbtk_call_wrapper,
-				     (ClientData) gdb_variable_command, NULL);
-      if (result == NULL)
-	return TCL_ERROR;
-
-      initialized = 1;
-    }
-
-  return TCL_OK;
-}
-
-/* This function defines the "gdb_variable" command which is used to
-   create variable objects. Its syntax includes:
-
-   gdb_variable create
-   gdb_variable create NAME
-   gdb_variable create -expr EXPR
-   gdb_variable create -frame FRAME
-   (it will also include permutations of the above options)
-
-   NAME  = name of object to create. If no NAME, then automatically create
-   a name
-   EXPR  = the gdb expression for which to create a variable. This will
-   be the most common usage.
-   FRAME = the frame defining the scope of the variable.
-*/
-static int
-gdb_variable_command (ClientData clientData, Tcl_Interp *interp,
-		      int objc, Tcl_Obj *CONST objv[])
-{
-  static const char *commands[] =
-    {"create", "list", NULL};
-  enum commands_enum
-    {
-      VARIABLE_CREATE, VARIABLE_LIST
-    };
-  int index, result;
-
-  if (objc < 2)
-    {
-      Tcl_WrongNumArgs (interp, 1, objv, "option ?arg...?");
-      return TCL_ERROR;
-    }
-
-  if (Tcl_GetIndexFromObj (interp, objv[1], commands, "options", 0,
-			   &index) != TCL_OK)
-    {
-      return TCL_ERROR;
-    }
-
-  switch ((enum commands_enum) index)
-    {
-    case VARIABLE_CREATE:
-      result = variable_create (interp, objc - 2, objv + 2);
-      break;
-
-    default:
-      return TCL_ERROR;
-    }
-
-  return result;
-}
-
-/* This function implements the actual object command for each
-   variable object that is created (and each of its children).
-
-   Currently the following commands are implemented:
-   - delete        delete this object and its children
-   - update        update the variable and its children (root vars only)
-   - numChildren   how many children does this object have
-   - children      create the children and return a list of their objects
-   - name          print out the name of this variable
-   - format        query/set the display format of this variable
-   - type          get the type of this variable
-   - value         get/set the value of this variable
-   - editable      is this variable editable?
-*/
-static int
-variable_obj_command (ClientData clientData, Tcl_Interp *interp,
-		      int objc, Tcl_Obj *CONST objv[])
-{
-  enum commands_enum
-    {
-      VARIABLE_DELETE,
-      VARIABLE_NUM_CHILDREN,
-      VARIABLE_CHILDREN,
-      VARIABLE_FORMAT,
-      VARIABLE_TYPE,
-      VARIABLE_VALUE,
-      VARIABLE_NAME,
-      VARIABLE_EDITABLE,
-      VARIABLE_UPDATE
-    };
-  static const char *commands[] =
-    {
-      "delete",
-      "numChildren",
-      "children",
-      "format",
-      "type",
-      "value",
-      "name",
-      "editable",
-      "update",
-      NULL
-    };
-  struct varobj *var;
-  char *varobj_name;
-  int index, result;
-  
-  /* Get the current handle for this variable token (name). */
-  varobj_name = Tcl_GetStringFromObj (objv[0], NULL);
-  if (varobj_name == NULL)
-    return TCL_ERROR;
-  var = varobj_get_handle (varobj_name);
-  
-
-  if (objc < 2)
-    {
-      Tcl_WrongNumArgs (interp, 1, objv, "option ?arg...?");
-      return TCL_ERROR;
-    }
-
-  if (Tcl_GetIndexFromObj (interp, objv[1], commands, "options", 0,
-			   &index) != TCL_OK)
-    return TCL_ERROR;
-
-  result = TCL_OK;
-  switch ((enum commands_enum) index)
-    {
-    case VARIABLE_DELETE:
-      if (objc > 2)
-	{
-	  int len;
-	  char *s = Tcl_GetStringFromObj (objv[2], &len);
-	  if (*s == 'c' && strncmp (s, "children", len) == 0)
-	    {
-	      variable_delete (interp, var, 1 /* only children */ );
-	      break;
-	    }
-	}
-      variable_delete (interp, var, 0 /* var and children */ );
-      break;
-
-    case VARIABLE_NUM_CHILDREN:
-      Tcl_SetObjResult (interp, Tcl_NewIntObj (varobj_get_num_children (var)));
-      break;
-
-    case VARIABLE_CHILDREN:
-      {
-	Tcl_Obj *children = variable_children (interp, var);
-	Tcl_SetObjResult (interp, children);
-      }
-      break;
-
-    case VARIABLE_FORMAT:
-      result = variable_format (interp, objc, objv, var);
-      break;
-
-    case VARIABLE_TYPE:
-      result = variable_type (interp, objc, objv, var);
-      break;
-
-    case VARIABLE_VALUE:
-      result = variable_value (interp, objc, objv, var);
-      break;
-
-    case VARIABLE_NAME:
-      {
-	char *name = varobj_get_expression (var);
-	Tcl_SetObjResult (interp, Tcl_NewStringObj (name, -1));
-	xfree (name);
-      }
-      break;
-
-    case VARIABLE_EDITABLE:
-      Tcl_SetObjResult (interp, 
-			Tcl_NewIntObj (varobj_get_attributes (var) & 0x00000001 /* Editable? */ ));
-      break;
-
-    case VARIABLE_UPDATE:
-      /* Only root variables can be updated */
-      {
-	Tcl_Obj *obj = variable_update (interp, &var);
-	Tcl_SetObjResult (interp, obj);
-      }
-      break;
-
-    default:
-      return TCL_ERROR;
-    }
-
-  return result;
-}
-
-/*
- * Variable object construction/destruction
- */
-
-/* This function is responsible for processing the user's specifications
-   and constructing a variable object. */
-static int
-variable_create (Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
-{
-  enum create_opts
-    {
-      CREATE_EXPR, CREATE_FRAME
-    };
-  static const char *create_options[] =
-    {"-expr", "-frame", NULL};
-  struct varobj *var;
-  char *name;
-  char *obj_name;
-  int index;
-  CORE_ADDR frame = (CORE_ADDR) -1;
-  int how_specified = USE_SELECTED_FRAME;
-
-  /* REMINDER: This command may be invoked in the following ways:
-     gdb_variable create [NAME] [-expr EXPR] [-frame FRAME]
-
-     NAME  = name of object to create. If no NAME, then automatically create
-     a name
-     EXPR  = the gdb expression for which to create a variable. This will
-     be the most common usage.
-     FRAME = the address of the frame defining the variable's scope
-  */
-  name = NULL;
-  if (objc)
-    name = Tcl_GetStringFromObj (objv[0], NULL);
-  if (name == NULL || *name == '-')
-    {
-      /* generate a name for this object */
-      obj_name = varobj_gen_name ();
-    }
-  else
-    {
-      /* specified name for object */
-      obj_name = strdup (name);
-      objv++;
-      objc--;
-    }
-
-  /* Run through all the possible options for this command */
-  name = NULL;
-  while (objc > 0)
-    {
-      if (Tcl_GetIndexFromObj (interp, objv[0], create_options, "options",
-			       0, &index) != TCL_OK)
-	{
-	  xfree (obj_name);
-	  result_ptr->flags |= GDBTK_IN_TCL_RESULT;
-	  return TCL_ERROR;
-	}
-
-      switch ((enum create_opts) index)
-	{
-	case CREATE_EXPR:
-	  name = Tcl_GetStringFromObj (objv[1], NULL);
-	  objc--;
-	  objv++;
-	  break;
-
-	case CREATE_FRAME:
-	  {
-	    char *str;
-	    str = Tcl_GetStringFromObj (objv[1], NULL);
-	    frame = string_to_core_addr (str);
-	    how_specified = USE_SPECIFIED_FRAME;
-	    objc--;
-	    objv++;
-	  }
-	  break;
-
-	default:
-	  break;
-	}
-
-      objc--;
-      objv++;
-    }
-
-  /* Create the variable */
-  var = varobj_create (obj_name, name, frame, how_specified);
-
-  if (var != NULL)
-    {
-      /* Install a command into the interpreter that represents this
-         object */
-      install_variable (interp, obj_name);
-      Tcl_SetObjResult (interp, Tcl_NewStringObj (obj_name, -1));
-      result_ptr->flags |= GDBTK_IN_TCL_RESULT;
-
-      xfree (obj_name);
-      return TCL_OK;
-    }
-
-  xfree (obj_name);
-  return TCL_ERROR;
-}
-
-/* Delete the variable object VAR and its children */
-/* If only_children_p, Delete only the children associated with the object. */
-static void
-variable_delete (Tcl_Interp *interp, struct varobj *var,
-		 int only_children_p)
-{
-  char **dellist;
-  char **vc;
-
-  varobj_delete (var, &dellist, only_children_p);
-
-  vc = dellist;
-  while (*vc != NULL)
-    {
-      uninstall_variable (interp, *vc);
-      xfree (*vc);
-      vc++;
-    }
-
-  xfree (dellist);
-}
-
-/* Return a list of all the children of VAR, creating them if necessary. */
-static Tcl_Obj *
-variable_children (Tcl_Interp *interp, struct varobj *var)
-{
-  Tcl_Obj *list;
-  struct varobj **childlist;
-  struct varobj **vc;
-  char *childname;
-
-  list = Tcl_NewListObj (0, NULL);
-
-  varobj_list_children (var, &childlist);
-
-  vc = childlist;
-  while (*vc != NULL)
-    {
-      childname = varobj_get_objname (*vc);
-      /* Add child to result list and install the Tcl command for it. */
-      Tcl_ListObjAppendElement (NULL, list,
-				Tcl_NewStringObj (childname, -1));
-      install_variable (interp, childname);
-      vc++;
-    }
-
-  xfree (childlist);
-  return list;
-}
-
-/* Update the values for a variable and its children. */
-/* NOTE:   Only root variables can be updated... */
-
-static Tcl_Obj *
-variable_update (Tcl_Interp *interp, struct varobj **var)
-{
-  Tcl_Obj *changed;
-  struct varobj **changelist;
-  struct varobj **vc;
-
-  /* varobj_update() can return -1 if the variable is no longer around,
-     i.e. we stepped out of the frame in which a local existed. */
-  if (varobj_update (var, &changelist) == -1)
-    return Tcl_NewStringObj ("-1", -1);
-
-  changed = Tcl_NewListObj (0, NULL);  
-  vc = changelist;
-  while (*vc != NULL)
-    {
-      /* Add changed variable object to result list */
-      Tcl_ListObjAppendElement (NULL, changed,
-				Tcl_NewStringObj (varobj_get_objname (*vc), -1));
-      vc++;
-    }
-
-  xfree (changelist);
-  return changed;
-}
-
-/* This implements the format object command allowing
-   the querying or setting of the object's display format. */
-static int
-variable_format (Tcl_Interp *interp, int objc, 
-		 Tcl_Obj *CONST objv[], struct varobj *var)
-{
-  if (objc > 2)
-    {
-      /* Set the format of VAR to given format */
-      int len;
-      char *fmt = Tcl_GetStringFromObj (objv[2], &len);
-      if (STREQN (fmt, "natural", len))
-	varobj_set_display_format (var, FORMAT_NATURAL);
-      else if (STREQN (fmt, "binary", len))
-	varobj_set_display_format (var, FORMAT_BINARY);
-      else if (STREQN (fmt, "decimal", len))
-	varobj_set_display_format (var, FORMAT_DECIMAL);
-      else if (STREQN (fmt, "hexadecimal", len))
-	varobj_set_display_format (var, FORMAT_HEXADECIMAL);
-      else if (STREQN (fmt, "octal", len))
-	varobj_set_display_format (var, FORMAT_OCTAL);
-      else
-	{
-	  gdbtk_set_result (interp, "unknown display format \"",
-			    fmt, "\": must be: \"natural\", \"binary\""
-			    ", \"decimal\", \"hexadecimal\", or \"octal\"");
-	  return TCL_ERROR;
-	}
-    }
-  else
-    {
-      /* Report the current format */
-      Tcl_Obj *fmt;
-
-      /* FIXME: Use varobj_format_string[] instead */
-      fmt = Tcl_NewStringObj (
-			      format_string[(int) varobj_get_display_format (var)], -1);
-      Tcl_SetObjResult (interp, fmt);
-    }
-
-  return TCL_OK;
-}
-
-/* This function implements the type object command, which returns the type of a
-   variable in the interpreter (or an error). */
-static int
-variable_type (Tcl_Interp *interp, int objc,
-	       Tcl_Obj *CONST objv[], struct varobj *var)
-{
-  const char *first;
-  const char *last;
-  char *string;
-  Tcl_RegExp regexp;
-
-  /* For the "fake" variables, do not return a type.
-     Their type is NULL anyway */
-  /* FIXME: varobj_get_type() calls type_print(), so we may have to wrap
-     its call here and return TCL_ERROR in the case it errors out */
-  if ((string = varobj_get_type (var)) == NULL)
-    {
-      Tcl_ResetResult (interp);
-      return TCL_OK;
-    }
-
-  first = string;
-
-  /* gdb will print things out like "struct {...}" for anonymous structs.
-     In gui-land, we don't want the {...}, so we strip it here. */
-  regexp = Tcl_RegExpCompile (interp, "{...}");
-  if (Tcl_RegExpExec (interp, regexp, string, first))
-    {
-      /* We have an anonymous struct/union/class/enum */
-      Tcl_RegExpRange (regexp, 0, &first, &last);
-      if (*(first - 1) == ' ')
-	first--;
-      string[first - string] = '\0';
-    }
-
-  Tcl_SetObjResult (interp, Tcl_NewStringObj (string, -1));
-  xfree (string);
-  return TCL_OK;
-}
-
-/* This function implements the value object command, which allows an object's
-   value to be queried or set. */
-static int
-variable_value (Tcl_Interp *interp, int objc,
-		Tcl_Obj *CONST objv[], struct varobj *var)
-{
-  char *r;
-
-  /* If we're setting the value of the variable, objv[2] will contain the
-     variable's new value. */
-  if (objc > 2)
-    {
-      /* FIXME: Do we need to test if val->error is set here?
-         If so, make it an attribute. */
-      if (varobj_get_attributes (var) & 0x00000001 /* Editable? */ )
-	{
-	  char *s;
-
-	  s = Tcl_GetStringFromObj (objv[2], NULL);
-	  if (!varobj_set_value (var, s))
-            {
-	      r = error_last_message();
-	      gdbtk_set_result (interp, "%s", r);
-	      xfree (r);
-	      return TCL_ERROR;
-            }
-	}
-
-      Tcl_ResetResult (interp);
-      return TCL_OK;
-    }
-
-  r = varobj_get_value (var);
-
-  if (r == NULL)
-    {
-      char *err = error_last_message ();
-      gdbtk_set_result (interp, "%s", err);
-      xfree (err);
-      return TCL_ERROR;
-    }
-  else
-    {
-      Tcl_SetObjResult (interp, Tcl_NewStringObj (r, -1));
-      xfree (r);
-      return TCL_OK;
-    }
-}
-
-/* Helper functions for the above */
-
-/* Install the given variable VAR into the tcl interpreter with
-   the object name NAME. */
-static void
-install_variable (Tcl_Interp *interp, char *name)
-{
-  Tcl_CreateObjCommand (interp, name, variable_obj_command,
-			NULL, NULL);
-}
-
-/* Unistall the object VAR in the tcl interpreter. */
-static void
-uninstall_variable (Tcl_Interp *interp, char *varname)
-{
-  Tcl_DeleteCommand (interp, varname);
-}
-
diff --git a/gdb/gdbtk/generic/gdbtk-wrapper.c b/gdb/gdbtk/generic/gdbtk-wrapper.c
deleted file mode 100644
index bdbf6e7c2a0..00000000000
--- a/gdb/gdbtk/generic/gdbtk-wrapper.c
+++ /dev/null
@@ -1,721 +0,0 @@
-/* longjmp-free interface between gdb and gdbtk.
-   Copyright (C) 1999, 2000, 2002 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.  */
-
-#include "defs.h"
-#include "frame.h"
-#include "value.h"
-#include "block.h"
-#include "gdbtk-wrapper.h"
-
-/*
- * Wrapper functions exported to the world
- */
-
-gdb_result GDB_value_fetch_lazy (value_ptr);
-
-gdb_result GDB_evaluate_expression (struct expression *, value_ptr *);
-
-gdb_result GDB_type_print (value_ptr, char *, struct ui_file *, int);
-
-gdb_result GDB_val_print (struct type *type, char *valaddr,
-			  CORE_ADDR address, struct ui_file *stream,
-			  int format, int deref_ref, int recurse,
-			  enum val_prettyprint pretty);
-
-gdb_result GDB_value_equal (value_ptr, value_ptr, int *);
-
-gdb_result GDB_parse_exp_1 (char **stringptr, struct block *block, int comma,
-			    struct expression **result);
-
-gdb_result GDB_evaluate_type (struct expression *exp, value_ptr * result);
-
-gdb_result GDB_block_for_pc (CORE_ADDR pc, struct block **result);
-
-gdb_result GDB_block_innermost_frame (struct block *block,
-				      struct frame_info **result);
-
-gdb_result GDB_reinit_frame_cache (void);
-
-gdb_result GDB_value_ind (value_ptr val, value_ptr * rval);
-
-gdb_result GDB_value_slice (value_ptr val, int low, int num,
-			    value_ptr * rval);
-
-gdb_result GDB_value_coerce_array (value_ptr val, value_ptr * rval);
-
-gdb_result GDB_value_struct_elt (value_ptr * argp, value_ptr * args,
-				 char *name, int *static_memfunc,
-				 char *err, value_ptr * rval);
-
-gdb_result GDB_value_cast (struct type *type, value_ptr val,
-			   value_ptr * rval);
-
-gdb_result GDB_get_frame_block (struct frame_info *fi, struct block **rval);
-
-gdb_result GDB_get_prev_frame (struct frame_info *fi,
-			       struct frame_info **result);
-
-gdb_result GDB_get_next_frame (struct frame_info *fi,
-			       struct frame_info **result);
-
-gdb_result GDB_find_relative_frame (struct frame_info *fi,
-				    int *start, struct frame_info **result);
-
-gdb_result GDB_get_current_frame (struct frame_info **result);
-
-/*
- * Private functions for this file
- */
-static gdb_result call_wrapped_function (catch_errors_ftype *,
-					 struct gdb_wrapper_arguments *);
-
-static int wrap_type_print (char *);
-
-static int wrap_evaluate_expression (char *);
-
-static int wrap_value_fetch_lazy (char *);
-
-static int wrap_val_print (char *);
-
-static int wrap_value_equal (char *);
-
-static int wrap_parse_exp_1 (char *opaque_arg);
-
-static int wrap_evaluate_type (char *opaque_arg);
-
-static int wrap_block_for_pc (char *opaque_arg);
-
-static int wrap_block_innermost_frame (char *opaque_arg);
-
-static int wrap_reinit_frame_cache (char *opaque_arg);
-
-static int wrap_value_ind (char *opaque_arg);
-
-static int wrap_value_slice (char *opaque_arg);
-
-static int wrap_value_coerce_array (char *opaque_arg);
-
-static int wrap_value_struct_elt (char *opaque_arg);
-
-static int wrap_value_cast (char *opaque_arg);
-
-static int wrap_get_frame_block (char *opaque_arg);
-
-static int wrap_get_prev_frame (char *opaque_arg);
-
-static int wrap_get_next_frame (char *opaque_arg);
-
-static int wrap_find_relative_frame (char *opaque_arg);
-
-static int wrap_get_current_frame (char *opaque_arg);
-
-static gdb_result
-call_wrapped_function (catch_errors_ftype *fn, struct gdb_wrapper_arguments *arg)
-{
-  if (!catch_errors (fn, (char *) &arg, "", RETURN_MASK_ERROR))
-    {
-      /* An error occurred */
-      return GDB_ERROR;
-    }
-
-  return GDB_OK;
-}
-
-gdb_result
-GDB_type_print (value_ptr val, char *varstring,
-		struct ui_file *stream, int show)
-{
-  struct gdb_wrapper_arguments args;
-
-  args.args[0] = (char *) val;
-  args.args[1] = varstring;
-  args.args[2] = (char *) stream;
-  args.args[3] = (char *) show;
-  return call_wrapped_function ((catch_errors_ftype *) wrap_type_print, &args);
-}
-
-static int
-wrap_type_print (char *a)
-{
-  struct gdb_wrapper_arguments **args = (struct gdb_wrapper_arguments **) a;
-  value_ptr val = (value_ptr) (*args)->args[0];
-  char *varstring = (*args)->args[1];
-  struct ui_file *stream = (struct ui_file *) (*args)->args[2];
-  int show = (int) (*args)->args[3];
-  type_print (VALUE_TYPE (val), varstring, stream, show);
-  return 1;
-}
-
-gdb_result
-GDB_val_print (struct type *type,
-	       char *valaddr,
-	       CORE_ADDR address,
-	       struct ui_file *stream,
-	       int format,
-	       int deref_ref,
-	       int recurse,
-	       enum val_prettyprint pretty)
-{
-  struct gdb_wrapper_arguments args;
-
-  args.args[0] = (char *) type;
-  args.args[1] = (char *) valaddr;
-  args.args[2] = (char *) &address;
-  args.args[3] = (char *) stream;
-  args.args[4] = (char *) format;
-  args.args[5] = (char *) deref_ref;
-  args.args[6] = (char *) recurse;
-  args.args[7] = (char *) pretty;
-
-  return call_wrapped_function ((catch_errors_ftype *) wrap_val_print, &args);
-}
-
-static int
-wrap_val_print (char *a)
-{
-  struct gdb_wrapper_arguments **args = (struct gdb_wrapper_arguments **) a;
-  struct type *type;
-  char *valaddr;
-  CORE_ADDR address;
-  struct ui_file *stream;
-  int format;
-  int deref_ref;
-  int recurse;
-  enum val_prettyprint pretty;
-
-  type = (struct type *) (*args)->args[0];
-  valaddr = (char *) (*args)->args[1];
-  address = *(CORE_ADDR *) (*args)->args[2];
-  stream = (struct ui_file *) (*args)->args[3];
-  format = (int) (*args)->args[4];
-  deref_ref = (int) (*args)->args[5];
-  recurse = (int) (*args)->args[6];
-  pretty = (enum val_prettyprint) (*args)->args[7];
-
-  val_print (type, valaddr, 0, address, stream, format, deref_ref,
-	     recurse, pretty);
-  return 1;
-}
-
-gdb_result
-GDB_value_fetch_lazy (value_ptr value)
-{
-  struct gdb_wrapper_arguments args;
-
-  args.args[0] = (char *) value;
-  return call_wrapped_function ((catch_errors_ftype *) wrap_value_fetch_lazy, &args);
-}
-
-static int
-wrap_value_fetch_lazy (char *a)
-{
-  struct gdb_wrapper_arguments **args = (struct gdb_wrapper_arguments **) a;
-
-  value_fetch_lazy ((value_ptr) (*args)->args[0]);
-  return 1;
-}
-
-gdb_result
-GDB_evaluate_expression (struct expression *exp, value_ptr *value)
-{
-  struct gdb_wrapper_arguments args;
-  gdb_result result;
-  args.args[0] = (char *) exp;
-
-  result = call_wrapped_function ((catch_errors_ftype *) wrap_evaluate_expression, &args);
-  if (result != GDB_OK)
-    return result;
-
-  *value = (value_ptr) args.result;
-  return GDB_OK;
-}
-
-static int
-wrap_evaluate_expression (char *a)
-{
-  struct gdb_wrapper_arguments **args = (struct gdb_wrapper_arguments **) a;
-
-  (*args)->result =
-    (char *) evaluate_expression ((struct expression *) (*args)->args[0]);
-  return 1;
-}
-
-gdb_result
-GDB_value_equal (val1, val2, result)
-     value_ptr val1;
-     value_ptr val2;
-     int *result;
-{
-  struct gdb_wrapper_arguments args;
-  gdb_result r;
-
-  args.args[0] = (char *) val1;
-  args.args[1] = (char *) val2;
-
-  r = call_wrapped_function ((catch_errors_ftype *) wrap_value_equal, &args);
-  if (r != GDB_OK)
-    return r;
-
-  *result = (int) args.result;
-  return GDB_OK;
-}
-
-static int
-wrap_value_equal (char *a)
-{
-  struct gdb_wrapper_arguments **args = (struct gdb_wrapper_arguments **) a;
-  value_ptr val1, val2;
-
-  val1 = (value_ptr) (*args)->args[0];
-  val2 = (value_ptr) (*args)->args[1];
-
-  (*args)->result = (char *) value_equal (val1, val2);
-  return 1;
-}
-
-gdb_result
-GDB_parse_exp_1 (char **stringptr, struct block *block,
-		 int comma, struct expression **result)
-{
-  struct gdb_wrapper_arguments args;
-  gdb_result r;
-
-  args.args[0] = (char *) stringptr;
-  args.args[1] = (char *) block;
-  args.args[2] = (char *) comma;
-
-  r = call_wrapped_function ((catch_errors_ftype *) wrap_parse_exp_1, &args);
-  if (r != GDB_OK)
-    return r;
-
-  *result = (struct expression *) args.result;
-  return GDB_OK;
-}
-
-static int
-wrap_parse_exp_1 (char *opaque_arg)
-{
-  struct gdb_wrapper_arguments **args = (struct gdb_wrapper_arguments **) opaque_arg;
-  struct block *block;
-  char **stringptr;
-  int comma;
-
-  stringptr = (char **) (*args)->args[0];
-  block = (struct block *) (*args)->args[1];
-  comma = (int) (*args)->args[2];
-
-  (*args)->result = (char *) parse_exp_1 (stringptr, block, comma);
-  return 1;
-}
-
-gdb_result
-GDB_evaluate_type (struct expression *exp, value_ptr *result)
-{
-  struct gdb_wrapper_arguments args;
-  gdb_result r;
-
-  args.args[0] = (char *) exp;
-
-  r = call_wrapped_function ((catch_errors_ftype *) wrap_evaluate_type, &args);
-  if (r != GDB_OK)
-    return r;
-
-  *result = (value_ptr) args.result;
-  return GDB_OK;
-}
-
-static int
-wrap_evaluate_type (char *opaque_arg)
-{
-  struct gdb_wrapper_arguments **args = (struct gdb_wrapper_arguments **) opaque_arg;
-  struct expression *exp;
-
-  exp = (struct expression *) (*args)->args[0];
-  (*args)->result = (char *) evaluate_type (exp);
-  return 1;
-}
-
-gdb_result
-GDB_block_for_pc (CORE_ADDR pc, struct block **result)
-{
-  struct gdb_wrapper_arguments args;
-  gdb_result r;
-
-  args.args[0] = (char *) &pc;
-
-  r = call_wrapped_function ((catch_errors_ftype *) wrap_block_for_pc, &args);
-  if (r != GDB_OK)
-    return r;
-
-  *result = (struct block *) args.result;
-  return GDB_OK;
-}
-
-static int
-wrap_block_for_pc (char *opaque_arg)
-{
-  struct gdb_wrapper_arguments **args = (struct gdb_wrapper_arguments **) opaque_arg;
-  CORE_ADDR pc;
-
-  pc = *(CORE_ADDR *) (*args)->args[0];
-  (*args)->result = (char *) block_for_pc (pc);
-  return 1;
-}
-
-gdb_result
-GDB_block_innermost_frame (struct block *block, struct frame_info **result)
-{
-  struct gdb_wrapper_arguments args;
-  gdb_result r;
-
-  args.args[0] = (char *) block;
-
-  r = call_wrapped_function ((catch_errors_ftype *) wrap_block_innermost_frame, &args);
-  if (r != GDB_OK)
-    return r;
-
-  *result = (struct frame_info *) args.result;
-  return GDB_OK;
-}
-
-static int
-wrap_block_innermost_frame (char *opaque_arg)
-{
-  struct gdb_wrapper_arguments **args = (struct gdb_wrapper_arguments **) opaque_arg;
-  struct block *block;
-
-  block = (struct block *) (*args)->args[0];
-  (*args)->result = (char *) block_innermost_frame (block);
-  return 1;
-}
-
-gdb_result
-GDB_reinit_frame_cache ()
-{
-  gdb_result r;
-
-  r = call_wrapped_function ((catch_errors_ftype *) wrap_reinit_frame_cache, NULL);
-  if (r != GDB_OK)
-    return r;
-
-  return GDB_OK;
-}
-
-static int
-wrap_reinit_frame_cache (char *opaque_arg)
-{
-  reinit_frame_cache ();
-  return 1;
-}
-
-gdb_result
-GDB_value_ind (value_ptr val, value_ptr *rval)
-{
-  struct gdb_wrapper_arguments args;
-  gdb_result r;
-
-  args.args[0] = (char *) val;
-
-  r = call_wrapped_function ((catch_errors_ftype *) wrap_value_ind, &args);
-  if (r != GDB_OK)
-    return r;
-
-  *rval = (value_ptr) args.result;
-  return GDB_OK;
-}
-
-static int
-wrap_value_ind (char *opaque_arg)
-{
-  struct gdb_wrapper_arguments **args = (struct gdb_wrapper_arguments **) opaque_arg;
-  value_ptr val;
-
-  val = (value_ptr) (*args)->args[0];
-  (*args)->result = (char *) value_ind (val);
-  return 1;
-}
-
-gdb_result
-GDB_value_slice (value_ptr val, int low, int num, value_ptr *rval)
-{
-  struct gdb_wrapper_arguments args;
-  gdb_result r;
-
-  args.args[0] = (char *) val;
-  args.args[1] = (char *) &low;
-  args.args[2] = (char *) &num;
-
-  r = call_wrapped_function ((catch_errors_ftype *) wrap_value_slice, &args);
-  if (r != GDB_OK)
-    return r;
-
-  *rval = (value_ptr) args.result;
-  return GDB_OK;
-}
-
-static int
-wrap_value_slice (char *opaque_arg)
-{
-  struct gdb_wrapper_arguments **args = (struct gdb_wrapper_arguments **) opaque_arg;
-  value_ptr val;
-  int low, num;
-
-  val = (value_ptr) (*args)->args[0];
-  low = *(int *) (*args)->args[1];
-  num = *(int *) (*args)->args[2];
-  (*args)->result = (char *) value_slice (val, low, num);
-  return 1;
-}
-
-gdb_result
-GDB_value_coerce_array (val, rval)
-     value_ptr val;
-     value_ptr *rval;
-{
-  struct gdb_wrapper_arguments args;
-  gdb_result r;
-
-  args.args[0] = (char *) val;
-
-  r = call_wrapped_function ((catch_errors_ftype *) wrap_value_coerce_array,
-			     &args);
-  if (r != GDB_OK)
-    return r;
-
-  *rval = (value_ptr) args.result;
-  return GDB_OK;
-}
-
-static int
-wrap_value_coerce_array (char *opaque_arg)
-{
-  struct gdb_wrapper_arguments **args = (struct gdb_wrapper_arguments **) opaque_arg;
-  value_ptr val;
-
-  val = (value_ptr) (*args)->args[0];
-  (*args)->result = (char *) value_coerce_array (val);
-  return 1;
-}
-
-gdb_result
-GDB_value_struct_elt (value_ptr *argp,
-		      value_ptr *args,
-		      char *name,
-		      int *static_memfunc,
-		      char *err,
-		      value_ptr *rval)
-{
-  struct gdb_wrapper_arguments argss;
-  gdb_result r;
-
-  argss.args[0] = (char *) argp;
-  argss.args[1] = (char *) args;
-  argss.args[2] = name;
-  argss.args[3] = (char *) static_memfunc;
-  argss.args[4] = err;
-  r = call_wrapped_function ((catch_errors_ftype *) wrap_value_struct_elt, &argss);
-  if (r != GDB_OK)
-    return r;
-
-  *rval = (value_ptr) argss.result;
-  return GDB_OK;
-}
-
-static int
-wrap_value_struct_elt (char *opaque_arg)
-{
-  struct gdb_wrapper_arguments **argss = (struct gdb_wrapper_arguments **) opaque_arg;
-  value_ptr *argp, *args;
-  char *name;
-  int *static_memfunc;
-  char *err;
-
-  argp = (value_ptr *) (*argss)->args[0];
-  args = (value_ptr *) (*argss)->args[1];
-  name = (*argss)->args[2];
-  static_memfunc = (int *) (*argss)->args[3];
-  err = (*argss)->args[4];
-
-  (*argss)->result = (char *) value_struct_elt (argp, args, name, static_memfunc, err);
-  return 1;
-}
-
-gdb_result
-GDB_value_cast (struct type *type, value_ptr val, value_ptr *rval)
-{
-  struct gdb_wrapper_arguments args;
-  gdb_result r;
-
-  args.args[0] = (char *) type;
-  args.args[1] = (char *) val;
-
-  r = call_wrapped_function ((catch_errors_ftype *) wrap_value_cast, &args);
-  if (r != GDB_OK)
-    return r;
-
-  *rval = (value_ptr) args.result;
-  return GDB_OK;
-}
-
-static int
-wrap_value_cast (char *opaque_arg)
-{
-  struct gdb_wrapper_arguments **args = (struct gdb_wrapper_arguments **) opaque_arg;
-  value_ptr val;
-  struct type *type;
-
-  type = (struct type *) (*args)->args[0];
-  val = (value_ptr) (*args)->args[1];
-  (*args)->result = (char *) value_cast (type, val);
-
-  return 1;
-}
-
-gdb_result
-GDB_get_frame_block (struct frame_info *fi, struct block **rval)
-{
-  struct gdb_wrapper_arguments args;
-  gdb_result r;
-
-  args.args[0] = (char *) fi;
-
-  r = call_wrapped_function ((catch_errors_ftype *) wrap_get_frame_block, &args);
-  if (r != GDB_OK)
-    return r;
-
-  *rval = (struct block *) args.result;
-  return GDB_OK;
-}
-
-static int
-wrap_get_frame_block (char *opaque_arg)
-{
-  struct gdb_wrapper_arguments **args = (struct gdb_wrapper_arguments **) opaque_arg;
-  struct frame_info *fi;
-
-  fi = (struct frame_info *) (*args)->args[0];
-  (*args)->result = (char *) get_frame_block (fi, NULL);
-
-  return 1;
-}
-
-gdb_result
-GDB_get_prev_frame (struct frame_info *fi, struct frame_info **result)
-{
-  struct gdb_wrapper_arguments args;
-  gdb_result r;
-
-  args.args[0] = (char *) fi;
-  r = call_wrapped_function ((catch_errors_ftype *) wrap_get_prev_frame, &args);
-  if (r != GDB_OK)
-    return r;
-
-  *result = (struct frame_info *) args.result;
-  return GDB_OK;
-}
-
-static int
-wrap_get_prev_frame (char *opaque_arg)
-{
-  struct gdb_wrapper_arguments **args = (struct gdb_wrapper_arguments **) opaque_arg;
-  struct frame_info *fi = (struct frame_info *) (*args)->args[0];
-
-  (*args)->result = (char *) get_prev_frame (fi);
-  return 1;
-}
-
-gdb_result
-GDB_get_next_frame (struct frame_info *fi, struct frame_info **result)
-{
-  struct gdb_wrapper_arguments args;
-  gdb_result r;
-
-  args.args[0] = (char *) fi;
-  r = call_wrapped_function ((catch_errors_ftype *) wrap_get_next_frame, &args);
-  if (r != GDB_OK)
-    return r;
-
-  *result = (struct frame_info *) args.result;
-  return GDB_OK;
-}
-
-static int
-wrap_get_next_frame (char *opaque_arg)
-{
-  struct gdb_wrapper_arguments **args = (struct gdb_wrapper_arguments **) opaque_arg;
-  struct frame_info *fi = (struct frame_info *) (*args)->args[0];
-
-  (*args)->result = (char *) get_next_frame (fi);
-  return 1;
-}
-
-gdb_result
-GDB_find_relative_frame (struct frame_info *fi, int *start,
-			 struct frame_info **result)
-{
-  struct gdb_wrapper_arguments args;
-  gdb_result r;
-
-  args.args[0] = (char *) fi;
-  args.args[1] = (char *) start;
-
-  r = call_wrapped_function ((catch_errors_ftype *) wrap_find_relative_frame, 
-			     &args);
-  if (r != GDB_OK)
-    return r;
-
-  *result = (struct frame_info *) args.result;
-  return GDB_OK;
-}
-
-static int
-wrap_find_relative_frame (char *opaque_arg)
-{
-  struct gdb_wrapper_arguments **args = (struct gdb_wrapper_arguments **) opaque_arg;
-  struct frame_info *fi = (struct frame_info *) (*args)->args[0];
-  int *start = (int *) (*args)->args[1];
-
-  (*args)->result = (char *) find_relative_frame (fi, start);
-  return 1;
-}
-
-gdb_result
-GDB_get_current_frame (struct frame_info **result)
-{
-  struct gdb_wrapper_arguments args;
-  gdb_result r;
-
-  r = call_wrapped_function ((catch_errors_ftype *) wrap_get_current_frame, 
-			     &args);
-  if (r != GDB_OK)
-    return r;
-
-  *result = (struct frame_info *) args.result;
-  return GDB_OK;
-}
-
-static int
-wrap_get_current_frame (char *opaque_arg)
-{
-  struct gdb_wrapper_arguments **args = (struct gdb_wrapper_arguments **) opaque_arg;
-
-  (*args)->result = (char *) get_current_frame ();
-  return 1;
-}
-
diff --git a/gdb/gdbtk/generic/gdbtk-wrapper.h b/gdb/gdbtk/generic/gdbtk-wrapper.h
deleted file mode 100644
index d02dc0d84e8..00000000000
--- a/gdb/gdbtk/generic/gdbtk-wrapper.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/* longjmp-free interface between gdb and gdbtk.
-   Copyright (C) 1999, 2000, 2002 Free Software Foundation, Inc.
-
-This file is part of GDB.  It contains routines to safely call common gdb
-functions without the fear of longjmp'ing.
- 
-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.  */
-
-#ifndef GDBTK_WRAPPER_H
-#define GDBTK_WRAPPER_H
-/* Use this struct used to pass arguments to wrapper routines. We assume
-   (arbitrarily) that no gdb function takes more than ten arguments. */
-struct gdb_wrapper_arguments {
-
-  /* Pointer to some result from the gdb function call, if any */
-  char *result;
-
-  /* The list of arguments. */
-  char *args[10];
-};
-
-/* FIXME: cagney/2002-01-04: GDB no longer uses or supplies the
-   value_ptr typedef.  Provide one here to keep the Insight code
-   immediatly happy.  */
-typedef struct value *value_ptr;
-
-/* Whenever any gdb function wrapper is called, its return status is: */
-typedef enum gdb_wrapper_status { GDB_OK, GDB_ERROR } gdb_result;
-
-/* This list of functions which have been wrapped. Please keep this list
-   in alphabetical order, using "GDB_" to prefix the actual name of the
-   function. */
-extern gdb_result GDB_evaluate_expression (struct expression *expr,
-					   value_ptr * val);
-extern gdb_result GDB_type_print (value_ptr val, char *varstring,
-				  struct ui_file *stream, int show);
-extern gdb_result GDB_val_print (struct type *type, char *valaddr,
-				 CORE_ADDR address, struct ui_file *stream,
-				 int format, int deref_ref, int recurse,
-				 enum val_prettyprint pretty);
-extern gdb_result GDB_value_fetch_lazy (value_ptr value);
-extern gdb_result GDB_value_equal (value_ptr val1, value_ptr val2,
-				   int *result);
-extern gdb_result GDB_parse_exp_1 (char **stringptr, struct block *block,
-				   int comma, struct expression **result);
-extern gdb_result GDB_evaluate_type (struct expression *exp,
-				     value_ptr * result);
-extern gdb_result GDB_block_for_pc (CORE_ADDR pc, struct block **result);
-extern gdb_result GDB_block_innermost_frame (struct block *block,
-					     struct frame_info **result);
-extern gdb_result GDB_reinit_frame_cache (void);
-extern gdb_result GDB_value_ind (value_ptr val, value_ptr * rval);
-extern gdb_result GDB_value_slice (value_ptr val, int low, int num,
-				   value_ptr * rval);
-extern gdb_result GDB_value_coerce_array (value_ptr val, value_ptr * rval);
-extern gdb_result GDB_value_struct_elt (value_ptr * argp, value_ptr * args,
-					char *name, int *static_memfunc,
-					char *err, value_ptr * rval);
-extern gdb_result GDB_value_cast (struct type *type, value_ptr val,
-				  value_ptr * rval);
-gdb_result GDB_get_frame_block (struct frame_info *fi, struct block **rval);
-extern gdb_result GDB_get_prev_frame (struct frame_info *fi,
-				      struct frame_info **result);
-extern gdb_result GDB_get_next_frame (struct frame_info *fi,
-				      struct frame_info **result);
-extern gdb_result GDB_find_relative_frame (struct frame_info *fi,
-					   int *start,
-					   struct frame_info **result);
-extern gdb_result GDB_get_current_frame (struct frame_info **result);
-#endif /* GDBTK_WRAPPER_H */
-
diff --git a/gdb/gdbtk/generic/gdbtk.c b/gdb/gdbtk/generic/gdbtk.c
deleted file mode 100644
index 1f4d1bbf227..00000000000
--- a/gdb/gdbtk/generic/gdbtk.c
+++ /dev/null
@@ -1,763 +0,0 @@
-/* Startup code for Insight
-   Copyright 1994, 1995, 1996, 1997, 1998, 2001, 2002, 2003
-   Free Software Foundation, Inc.
-
-   Written by Stu Grossman <grossman@cygnus.com> of Cygnus Support.
-
-   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.  */
-
-#include "defs.h"
-#include "inferior.h"
-#include "symfile.h"
-#include "objfiles.h"
-#include "gdbcore.h"
-#include "tracepoint.h"
-#include "demangle.h"
-#include "version.h"
-#include "top.h"
-#include "annotate.h"
-
-#if defined(_WIN32) || defined(__CYGWIN__)
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#endif
-
-/* tcl header files includes varargs.h unless HAS_STDARG is defined,
-   but gdb uses stdarg.h, so make sure HAS_STDARG is defined.  */
-#define HAS_STDARG 1
-
-#include <itcl.h>
-#include <itk.h>
-#include "guitcl.h"
-#include "gdbtk.h"
-
-#include <fcntl.h>
-#include <sys/stat.h>
-#include <sys/ioctl.h>
-#include <sys/time.h>
-#include <signal.h>
-
-#include "gdb_string.h"
-#include "dis-asm.h"
-#include "gdbcmd.h"
-
-#ifdef __CYGWIN32__
-#include <sys/cygwin.h>		/* for cygwin32_attach_handle_to_fd */
-#endif
-
-extern void _initialize_gdbtk (void);
-
-/* For unix natives, we use a timer to periodically keep the gui alive.
-   See comments before x_event. */
-static sigset_t nullsigmask;
-static struct sigaction act1, act2;
-static struct itimerval it_on, it_off;
-
-static void
-x_event_wrapper (int signo)
-{
-  x_event (signo);
-}
-
-/*
- * This variable controls the interaction with an external editor.
- */
-
-char *external_editor_command = NULL;
-
-extern int Tktable_Init (Tcl_Interp * interp);
-
-void gdbtk_init (void);
-
-static void gdbtk_init_1 (char *argv0);
-
-void gdbtk_interactive (void);
-
-static void cleanup_init (void *ignore);
-
-static void tk_command (char *, int);
-
-static int target_should_use_timer (struct target_ops *t);
-
-int target_is_native (struct target_ops *t);
-
-int gdbtk_test (char *);
-
-static void view_command (char *, int);
-
-/* Handle for TCL interpreter */
-Tcl_Interp *gdbtk_interp = NULL;
-
-static int gdbtk_timer_going = 0;
-
-/* linked variable used to tell tcl what the current thread is */
-int gdb_context = 0;
-
-/* This variable is true when the inferior is running.  See note in
- * gdbtk.h for details.
- */
-int running_now;
-
-/* This variable holds the name of a Tcl file which should be sourced by the
-   interpreter when it goes idle at startup. Used with the testsuite. */
-static char *gdbtk_source_filename = NULL;
-
-int gdbtk_disable_fputs = 1;
-
-static const char *argv0; 
-
-#ifndef _WIN32
-
-/* Supply malloc calls for tcl/tk.  We do not want to do this on
-   Windows, because Tcl_Alloc is probably in a DLL which will not call
-   the mmalloc routines.
-   We also don't need to do it for Tcl/Tk8.1, since we locally changed the
-   allocator to use malloc & free. */
-
-#if TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION == 0
-char *
-TclpAlloc (unsigned int size)
-{
-  return xmalloc (size);
-}
-
-char *
-TclpRealloc (char *ptr, unsigned int size)
-{
-  return xrealloc (ptr, size);
-}
-
-void
-TclpFree (char *ptr)
-{
-  free (ptr);
-}
-#endif /* TCL_VERSION == 8.0 */
-
-#endif /* ! _WIN32 */
-
-#ifdef _WIN32
-
-/* On Windows, if we hold a file open, other programs can't write to
- * it.  In particular, we don't want to hold the executable open,
- * because it will mean that people have to get out of the debugging
- * session in order to remake their program.  So we close it, although
- * this will cost us if and when we need to reopen it.
- */
-
-void
-close_bfds ()
-{
-  struct objfile *o;
-  
-  ALL_OBJFILES (o)
-    {
-      if (o->obfd != NULL)
-	bfd_cache_close (o->obfd);
-    }
-  
-  if (exec_bfd != NULL)
-    bfd_cache_close (exec_bfd);
-}
-
-#endif /* _WIN32 */
-
-
-/* TclDebug (const char *fmt, ...) works just like printf() but 
- * sends the output to the GDB TK debug window. 
- * Not for normal use; just a convenient tool for debugging
- */
-
-void
-TclDebug (char level, const char *fmt,...)
-{
-  va_list args;
-  char *buf;
-  const char *v[3];
-  char *merge;
-  char *priority;
-
-  switch (level)
-    {
-    case 'W':
-      priority = "W";
-      break;
-    case 'E':
-      priority = "E";
-      break;
-    case 'X':
-      priority = "X";
-      break;
-    default:
-      priority = "I";
-    }
-
-  va_start (args, fmt);
-
-
-  xvasprintf (&buf, fmt, args);
-  va_end (args);
-
-  v[0] = "dbug";
-  v[1] = priority;
-  v[2] = buf;
-
-  merge = Tcl_Merge (3, v);
-  if (Tcl_Eval (gdbtk_interp, merge) != TCL_OK)
-    Tcl_BackgroundError (gdbtk_interp);
-  Tcl_Free (merge);
-  free(buf);
-}
-
-
-/*
- * The rest of this file contains the start-up, and event handling code for gdbtk.
- */
-
-/*
- * This cleanup function is added to the cleanup list that surrounds the Tk
- * main in gdbtk_init.  It deletes the Tcl interpreter.
- */
-
-static void
-cleanup_init (void *ignore)
-{
-  if (gdbtk_interp != NULL)
-    Tcl_DeleteInterp (gdbtk_interp);
-  gdbtk_interp = NULL;
-}
-
-/* Come here during long calculations to check for GUI events.  Usually invoked
-   via the QUIT macro.  */
-
-void
-gdbtk_interactive ()
-{
-  /* Tk_DoOneEvent (TK_DONT_WAIT|TK_IDLE_EVENTS); */
-}
-
-/* Start a timer which will keep the GUI alive while in target_wait. */
-void
-gdbtk_start_timer ()
-{
-  static int first = 1;
-
-  if (first)
-    {
-      /* first time called, set up all the structs */
-      first = 0;
-      sigemptyset (&nullsigmask);
-
-      act1.sa_handler = x_event_wrapper;
-      act1.sa_mask = nullsigmask;
-      act1.sa_flags = 0;
-
-      act2.sa_handler = SIG_IGN;
-      act2.sa_mask = nullsigmask;
-      act2.sa_flags = 0;
-
-      it_on.it_interval.tv_sec = 0;
-      it_on.it_interval.tv_usec = 250000;	/* .25 sec */
-      it_on.it_value.tv_sec = 0;
-      it_on.it_value.tv_usec = 250000;
-
-      it_off.it_interval.tv_sec = 0;
-      it_off.it_interval.tv_usec = 0;
-      it_off.it_value.tv_sec = 0;
-      it_off.it_value.tv_usec = 0;
-    }
-
-  if (target_should_use_timer (&current_target))
-    {
-      if (!gdbtk_timer_going)
-	{
-	  sigaction (SIGALRM, &act1, NULL);
-	  setitimer (ITIMER_REAL, &it_on, NULL);
-	  gdbtk_timer_going = 1;
-	}
-    }
-  return;
-}
-
-/* Stop the timer if it is running. */
-void
-gdbtk_stop_timer ()
-{
-  if (gdbtk_timer_going)
-    {
-      gdbtk_timer_going = 0;
-      setitimer (ITIMER_REAL, &it_off, NULL);
-      sigaction (SIGALRM, &act2, NULL);
-    }
-  return;
-}
-
-/* Should this target use the timer? See comments before
-   x_event for the logic behind all this. */
-static int
-target_should_use_timer (struct target_ops *t)
-{
-  return target_is_native (t);
-}
-
-/* Is T a native target? */
-int
-target_is_native (struct target_ops *t)
-{
-  char *name = t->to_shortname;
-
-  if (STREQ (name, "exec") || STREQ (name, "hpux-threads")
-      || STREQ (name, "child") || STREQ (name, "procfs")
-      || STREQ (name, "solaris-threads") || STREQ (name, "linuxthreads")
-      || STREQ (name, "multi-thread"))
-    return 1;
-
-  return 0;
-}
-
-/* gdbtk_init installs this function as a final cleanup.  */
-
-static void
-gdbtk_cleanup (PTR dummy)
-{
-  Tcl_Eval (gdbtk_interp, "gdbtk_cleanup");
-  Tcl_Finalize ();
-}
-
-
-/* Initialize gdbtk.  This involves creating a Tcl interpreter,
- * defining all the Tcl commands that the GUI will use, pointing
- * all the gdb "hooks" to the correct functions,
- * and setting the Tcl auto loading environment so that we can find all
- * the Tcl based library files.
- */
-
-void
-gdbtk_init (void)
-{
-  struct cleanup *old_chain;
-  char *s;
-  int element_count;
-  const char **exec_path;
-  CONST char *internal_exec_name;
-
-  /* If there is no DISPLAY environment variable, Tk_Init below will fail,
-     causing gdb to abort.  If instead we simply return here, gdb will
-     gracefully degrade to using the command line interface. */
-
-#ifndef _WIN32
-  if (getenv ("DISPLAY") == NULL)
-    {
-      return;
-    }
-#endif
-
-  old_chain = make_cleanup (cleanup_init, 0);
-
-  /* First init tcl and tk. */
-  Tcl_FindExecutable (argv0);
-  gdbtk_interp = Tcl_CreateInterp ();
-
-#ifdef TCL_MEM_DEBUG
-  Tcl_InitMemory (gdbtk_interp);
-#endif
-
-  if (!gdbtk_interp)
-    error ("Tcl_CreateInterp failed");
-
-  /* We need to check if we are being run from
-     a bin directory, if not then we may have to
-     set some environment variables. */
-
-  internal_exec_name = Tcl_GetNameOfExecutable ();
-
-  Tcl_SplitPath ((char *) internal_exec_name, &element_count, &exec_path);
-
-  if (strcmp (exec_path[element_count - 2], "bin") != 0)
-    {
-      /* We check to see if TCL_LIBRARY, TK_LIBRARY,
-	 ITCL_LIBRARY, ITK_LIBRARY, TIX_LIBRARY and maybe
-	 a couple other environment variables have been
-	 set (we don't want to override the User's settings).
-	 If the *_LIBRARY variable is not set, point it at
-	 the source directory. */
-
-      static char set_libs_path_script[] = "\
-	  set srcDir [file dirname [file dirname $env(TCL_LIBRARY)]];\n\
-\
-	  if {![info exists env(TK_LIBRARY)]} {\n\
-	      set env(TK_LIBRARY) [file join $srcDir tk library]\n\
-	  }\n\
-\
-	  if {![info exists env(ITCL_LIBRARY)]} {\n\
-	      set env(ITCL_LIBRARY) [file join $srcDir itcl itcl library]\n\
-	  }\n\
-\
-	  if {![info exists env(ITK_LIBRARY)]} {\n\
-	      set env(ITK_LIBRARY) [file join $srcDir itcl itk library]\n\
-	  }\n\
-\
-	  if {![info exists env(IWIDGETS_LIBRARY)]} {\n\
-	      set env(IWIDGETS_LIBRARY)\
-                     [file join $srcDir itcl iwidgets generic]\n\
-	  }\n\
-\
-	  if {![info exists env(TIX_LIBRARY)]} {\n\
-	      set env(TIX_LIBRARY) [file join $srcDir tix library]\n\
-	  }\n\
-\
-	  if {![info exists env(GDBTK_LIBRARY)]} {\n\
-	      set env(GDBTK_LIBRARY) [file join $srcDir gdb gdbtk library]\n\
-	  }\n\
-\
-          # Append the directory with the itcl pkg index\n\
-          if {[info exists env(TCLLIBPATH)]} {\n\
-            append env(TCLLIBPATH) :[file joing $srcDir itcl]\n\
-          } else {\n\
-            set env(TCLLIBPATH) [file join $srcDir itcl]\n\
-          }\n\
-\
-          # We also need to append the iwidgets library path.\n\
-          # Unfortunately, there is no IWIDGETS_LIBRARY.\n\
-          set IWIDGETS_LIBRARY [file join $srcDir itcl iwidgets generic]\n";
-
-      Tcl_Obj *commandObj;
-
-      /* Before we can run our script we must set TCL_LIBRARY. */
-      if (Tcl_GetVar2 (gdbtk_interp, "env", "TCL_LIBRARY", TCL_GLOBAL_ONLY) == NULL)
-	{
-	  int i, count;
-	  char *src_dir = SRC_DIR;
-	  const char **src_path;
-	  const char **lib_path;
-	  Tcl_DString lib_dstring;
-
-	  Tcl_DStringInit (&lib_dstring);
-
-#ifdef __CYGWIN__
-	  /* SRC_DIR from configure is a posix path. Tcl really needs a
-	     windows path. */
-	  src_dir = (char *) alloca (cygwin_posix_to_win32_path_list_buf_size (SRC_DIR));
-	  cygwin_posix_to_win32_path_list (SRC_DIR, src_dir);
-#endif
-	  Tcl_SplitPath (src_dir, &count, &src_path);
-
-	  /* Append tcl/library to src_dir (src_dir=/foo/bar/gdb) */
-	  lib_path = (const char **) alloca ((count + 2) * sizeof (char *));
-	  for (i = 0; i < count - 1; i++)
-	    lib_path[i] = src_path[i];
-	  lib_path[i++] = "tcl";
-	  lib_path[i++] = "library";
-	  Tcl_JoinPath (i, lib_path, &lib_dstring);
-
-	  /* Set TCL_LIBRARY */
-	  Tcl_SetVar2 (gdbtk_interp, "env", "TCL_LIBRARY",
-		       Tcl_DStringValue (&lib_dstring) , TCL_GLOBAL_ONLY);
-	  Tcl_DStringFree (&lib_dstring);
-	  Tcl_Free ((char *) src_path);
-	}
-
-      commandObj = Tcl_NewStringObj (set_libs_path_script, -1);
-      Tcl_IncrRefCount (commandObj);
-      Tcl_EvalObj (gdbtk_interp, commandObj);
-      Tcl_DecrRefCount (commandObj);
-    }
-
-  Tcl_Free ((char *) exec_path);
-
-  if (Tcl_Init (gdbtk_interp) != TCL_OK)
-    error ("Tcl_Init failed: %s", gdbtk_interp->result);
-
-  /* Set up some globals used by gdb to pass info to gdbtk
-     for start up options and the like */
-  xasprintf (&s, "%d", inhibit_gdbinit);
-  Tcl_SetVar2 (gdbtk_interp, "GDBStartup", "inhibit_prefs", s, TCL_GLOBAL_ONLY);
-  free(s);
-   
-  /* Note: Tcl_SetVar2() treats the value as read-only (making a
-     copy).  Unfortunatly it does not mark the parameter as
-     ``const''. */
-  Tcl_SetVar2 (gdbtk_interp, "GDBStartup", "host_name", (char*) host_name, TCL_GLOBAL_ONLY);
-  Tcl_SetVar2 (gdbtk_interp, "GDBStartup", "target_name", (char*) target_name, TCL_GLOBAL_ONLY);
-
-  make_final_cleanup (gdbtk_cleanup, NULL);
-
-  /* Initialize the Paths variable.  */
-  if (ide_initialize_paths (gdbtk_interp, "") != TCL_OK)
-    error ("ide_initialize_paths failed: %s", gdbtk_interp->result);
-
-  if (Tk_Init (gdbtk_interp) != TCL_OK)
-    error ("Tk_Init failed: %s", gdbtk_interp->result);
-
-  if (Itcl_Init (gdbtk_interp) == TCL_ERROR)
-    error ("Itcl_Init failed: %s", gdbtk_interp->result);
-  Tcl_StaticPackage (gdbtk_interp, "Itcl", Itcl_Init,
-		     (Tcl_PackageInitProc *) NULL);
-
-  if (Itk_Init (gdbtk_interp) == TCL_ERROR)
-    error ("Itk_Init failed: %s", gdbtk_interp->result);
-  Tcl_StaticPackage (gdbtk_interp, "Itk", Itk_Init,
-		     (Tcl_PackageInitProc *) NULL);
-
-  if (Tktable_Init (gdbtk_interp) != TCL_OK)
-    error ("Tktable_Init failed: %s", gdbtk_interp->result);
-
-  Tcl_StaticPackage (gdbtk_interp, "Tktable", Tktable_Init,
-		     (Tcl_PackageInitProc *) NULL);
-  /*
-   * These are the commands to do some Windows Specific stuff...
-   */
-
-#ifdef __CYGWIN32__
-  if (ide_create_messagebox_command (gdbtk_interp) != TCL_OK)
-    error ("messagebox command initialization failed");
-  /* On Windows, create a sizebox widget command */
-#if 0
-  if (ide_create_sizebox_command (gdbtk_interp) != TCL_OK)
-    error ("sizebox creation failed");
-#endif
-  if (ide_create_winprint_command (gdbtk_interp) != TCL_OK)
-    error ("windows print code initialization failed");
-  if (ide_create_win_grab_command (gdbtk_interp) != TCL_OK)
-    error ("grab support command initialization failed");
-  /* Path conversion functions.  */
-  if (ide_create_cygwin_path_command (gdbtk_interp) != TCL_OK)
-    error ("cygwin path command initialization failed");
-  if (ide_create_shell_execute_command (gdbtk_interp) != TCL_OK)
-    error ("cygwin shell execute command initialization failed");
-#endif
-
-  /* Only for testing -- and only when it can't be done any
-     other way. */
-  if (cyg_create_warp_pointer_command (gdbtk_interp) != TCL_OK)
-    error ("warp_pointer command initialization failed");
-
-  /*
-   * This adds all the Gdbtk commands.
-   */
-
-  if (Gdbtk_Init (gdbtk_interp) != TCL_OK)
-    {
-      error ("Gdbtk_Init failed: %s", gdbtk_interp->result);
-    }
-
-  Tcl_StaticPackage (gdbtk_interp, "Insight", Gdbtk_Init, NULL);
-
-  /* Add a back door to Tk from the gdb console... */
-
-  add_com ("tk", class_obscure, tk_command,
-	   "Send a command directly into tk.");
-
-  add_com ("view", class_obscure, view_command,
-	   "View a location in the source window.");
-
-  /*
-   * Set the variable for external editor:
-   */
-
-  if (external_editor_command != NULL)
-    {
-      Tcl_SetVar (gdbtk_interp, "external_editor_command",
-		  external_editor_command, 0);
-      xfree (external_editor_command);
-      external_editor_command = NULL;
-    }
-
-#ifdef __CYGWIN32__
-  (void) FreeConsole ();
-#endif
-
-  discard_cleanups (old_chain);
-}
-
-void
-gdbtk_source_start_file (void)
-{
-  /* find the gdb tcl library and source main.tcl */
-#ifdef NO_TCLPRO_DEBUGGER
-  static char script[] = "\
-proc gdbtk_find_main {} {\n\
-    global Paths GDBTK_LIBRARY\n\
-    rename gdbtk_find_main {}\n\
-    tcl_findLibrary insight 1.0 {} main.tcl GDBTK_LIBRARY GDBTKLIBRARY\n\
-    set Paths(appdir) $GDBTK_LIBRARY\n\
-}\n\
-gdbtk_find_main";
-#else
-    static char script[] = "\
-proc gdbtk_find_main {} {\n\
-    global Paths GDBTK_LIBRARY env\n\
-    rename gdbtk_find_main {}\n\
-    if {[info exists env(DEBUG_STUB)]} {\n\
-        source $env(DEBUG_STUB)\n\
-        debugger_init\n\
-        set debug_startup 1\n\
-    } else {\n\
-        set debug_startup 0\n\
-    }\n\
-    tcl_findLibrary insight 1.0 {} main.tcl GDBTK_LIBRARY GDBTK_LIBRARY\n\
-    set Paths(appdir) $GDBTK_LIBRARY\n\
-}\n\
-gdbtk_find_main";
-#endif /* NO_TCLPRO_DEBUGGER */
-
-  /* now enable gdbtk to parse the output from gdb */
-  gdbtk_disable_fputs = 0;
-    
-  if (Tcl_GlobalEval (gdbtk_interp, (char *) script) != TCL_OK)
-    {
-      const char *msg;
-
-      /* Force errorInfo to be set up propertly.  */
-      Tcl_AddErrorInfo (gdbtk_interp, "");
-      msg = Tcl_GetVar (gdbtk_interp, "errorInfo", TCL_GLOBAL_ONLY);
-
-#ifdef _WIN32
-      /* On windows, display the error using a pop-up message box.
-	 If GDB wasn't started from the DOS prompt, the user won't
-	 get to see the failure reason.  */
-      MessageBox (NULL, msg, NULL, MB_OK | MB_ICONERROR | MB_TASKMODAL);
-      throw_exception (RETURN_ERROR);
-#else
-      /* FIXME: cagney/2002-04-17: Wonder what the lifetime of
-	 ``msg'' is - does it need a cleanup?  */
-      error (msg);
-#endif
-    }
-
-  /* Now source in the filename provided by the --tclcommand option.
-     This is mostly used for the gdbtk testsuite... */
-
-  if (gdbtk_source_filename != NULL)
-    {
-      char *s = "after idle source ";
-      char *script = concat (s, gdbtk_source_filename, (char *) NULL);
-      Tcl_Eval (gdbtk_interp, script);
-      free (gdbtk_source_filename);
-      free (script);
-    }
-}
-
-static void
-gdbtk_init_1 (char *arg0)
-{
-  argv0 = arg0;
-  init_ui_hook = NULL;
-}
-
-/* gdbtk_test is used in main.c to validate the -tclcommand option to
-   gdb, which sources in a file of tcl code after idle during the
-   startup procedure. */
-
-int
-gdbtk_test (char *filename)
-{
-  if (access (filename, R_OK) != 0)
-    return 0;
-  else
-    gdbtk_source_filename = xstrdup (filename);
-  return 1;
-}
-
-/* Come here during initialize_all_files () */
-
-void
-_initialize_gdbtk ()
-{
-  /* Current_interpreter not set yet, so we must check
-     if "interpreter_p" is set to "insight" to know if
-     insight is GOING to run. */
-  if (strcmp (interpreter_p, "insight") == 0)
-    init_ui_hook = gdbtk_init_1;
-#ifdef __CYGWIN__
-  else
-    {
-      DWORD ft = GetFileType (GetStdHandle (STD_INPUT_HANDLE));
-
-      switch (ft)
-	{
-	case FILE_TYPE_DISK:
-	case FILE_TYPE_CHAR:
-	case FILE_TYPE_PIPE:
-	  break;
-	default:
-	  AllocConsole ();
-	  cygwin32_attach_handle_to_fd ("/dev/conin", 0,
-					GetStdHandle (STD_INPUT_HANDLE),
-					1, GENERIC_READ);
-	  cygwin32_attach_handle_to_fd ("/dev/conout", 1,
-					GetStdHandle (STD_OUTPUT_HANDLE),
-					0, GENERIC_WRITE);
-	  cygwin32_attach_handle_to_fd ("/dev/conout", 2,
-					GetStdHandle (STD_ERROR_HANDLE),
-					0, GENERIC_WRITE);
-	  break;
-	}
-    }
-#endif
-}
-
-static void
-tk_command (char *cmd, int from_tty)
-{
-  int retval;
-  char *result;
-  struct cleanup *old_chain;
-
-  /* Catch case of no argument, since this will make the tcl interpreter 
-     dump core. */
-  if (cmd == NULL)
-    error_no_arg ("tcl command to interpret");
-
-  retval = Tcl_Eval (gdbtk_interp, cmd);
-
-  result = xstrdup (gdbtk_interp->result);
-
-  old_chain = make_cleanup (free, result);
-
-  if (retval != TCL_OK)
-    error (result);
-
-  printf_unfiltered ("%s\n", result);
-
-  do_cleanups (old_chain);
-}
-
-static void
-view_command (char *args, int from_tty)
-{
-  char *script;
-  struct cleanup *old_chain;
-
-  if (args != NULL)
-    {
-      xasprintf (&script,
-		 "[lindex [ManagedWin::find SrcWin] 0] location BROWSE_TAG [gdb_loc %s]",
-		 args);
-      old_chain = make_cleanup (xfree, script);
-      if (Tcl_Eval (gdbtk_interp, script) != TCL_OK)
-	{
-	  Tcl_Obj *obj = Tcl_GetObjResult (gdbtk_interp);
-	  error (Tcl_GetStringFromObj (obj, NULL));
-	}
-
-      do_cleanups (old_chain);
-    }
-  else
-    error ("Argument required (location to view)");
-}
diff --git a/gdb/gdbtk/generic/gdbtk.h b/gdb/gdbtk/generic/gdbtk.h
deleted file mode 100644
index aa4b4cb1064..00000000000
--- a/gdb/gdbtk/generic/gdbtk.h
+++ /dev/null
@@ -1,188 +0,0 @@
-/* Tcl/Tk interface routines header file.
-   Copyright 1994, 1995, 1996, 1997, 1998, 2000, 2001, 2003
-   Free Software Foundation, Inc.
-
-   Written by Stu Grossman <grossman@cygnus.com> of Cygnus Support.
-
-   This file is part of GDB.  It contains the public data that is shared between
-   the gdbtk startup code and the gdbtk commands.
-
-   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.  */
-
-#ifndef _GDBTK_H
-#define _GDBTK_H
-
-#ifdef _WIN32
-#define GDBTK_PATH_SEP ";"
-#else
-#define GDBTK_PATH_SEP ":"
-#endif
-
-/* Some versions (1.3.79, 1.3.81) of Linux don't support SIOCSPGRP the way
-   gdbtk wants to use it... */
-#ifdef __linux__
-#undef SIOCSPGRP
-#endif
-
-/*
- *  These are the version numbers for GDBTK.  There is a package require
- *  statement in main.tcl that checks the version.  If you make an incompatible
- *  change to the gdb commands, or add any new commands, be sure to bump the
- *  version number both here and in main.tcl.  This will save us the trouble of
- *  having a version of gdb find the wrong versions of the Tcl libraries.
- */
-
-#define GDBTK_MAJOR_VERSION "1"
-#define GDBTK_MINOR_VERSION "0"
-#define GDBTK_VERSION       "1.0"
-
-/*
- * These are variables that are needed in gdbtk commands. 
- */
-
-/* This variable determines where memory used for disassembly is read from.
-   If > 0, then disassembly comes from the exec file rather than the
-   target (which might be at the other end of a slow serial link).  If
-   == 0 then disassembly comes from target.  If < 0 disassembly is
-   automatically switched to the target if it's an inferior process,
-   otherwise the exec file is used.  It is defined in gdbtk.c */
-
-
-extern int disassemble_from_exec;
-
-/* This variable is true when the inferior is running.  Although it's
-   possible to disable most input from widgets and thus prevent
-   attempts to do anything while the inferior is running, any commands
-   that get through - even a simple memory read - are Very Bad, and
-   may cause GDB to crash or behave strangely.  So, this variable
-   provides an extra layer of defense.  It is defined in gdbtk.c */
-
-extern int running_now;
-
-/* These two control how the GUI behaves when tracing or loading
-   They are defined in gdbtk-cmds.c */
-
-extern int No_Update;
-extern int load_in_progress;
-
-/* This is the main gdbtk interpreter.  It is defined and initialized
-   in gdbtk.c */
-
-extern Tcl_Interp *gdbtk_interp;
-
-/*
- * This structure controls how the gdb output is fed into gdbtk_call_wrapper invoked
- * commands.  See the explanation of gdbtk_fputs in gdbtk_hooks.c for more details.
- */
-
-typedef struct gdbtk_result
-  {
-    Tcl_Obj *obj_ptr;		/* This will eventually be copied over to the 
-				   Tcl result */
-    int flags;			/* Flag vector to control how the result is
-				   used. */
-  }
-gdbtk_result;
-
-struct target_ops;
-
-/* These defines give the allowed values for the gdbtk_result.flags field. */
-
-#define GDBTK_TO_RESULT     1	/* This controls whether output from
-				   gdbtk_fputs goes to the command result, or 
-				   to gdbtk_tcl_fputs. */
-#define GDBTK_MAKES_LIST    2	/* whether gdbtk_fputs adds the 
-				   element it is outputting as a string, or
-				   as a separate list element. */
-#define GDBTK_IN_TCL_RESULT 4	/* Indicates that the result is already in the
-				   Tcl result.  You can use this to preserve
-				   error messages from functions like
-				   Tcl_GetIntFromObj.  You can also store the
-				   output of a call wrapped command directly in 
-				   the Tcl result if you want, but beware, it will
-				   not then be preserved across recursive
-				   gdbtk_call_wrapper invocations. */
-#define GDBTK_ERROR_STARTED 8	/* This one is just used in gdbtk_fputs.  If we 
-				   see some output on stderr, we need to clear
-				   the result we have been accumulating, or the 
-				   error and the previous successful output
-				   will get mixed, which would be confusing. */
-#define GDBTK_ERROR_ONLY    16	/* Indicates that all incoming I/O is
-				   to be treated as if it had arrived for gdb_stderr. This is
-				   used to help error_begin in utils.c. */
-
-/* This is a pointer to the gdbtk_result struct that
-   we are currently filling.  We use the C stack to make a stack of these
-   structures for nested calls to gdbtk commands that are invoked through
-   the gdbtk_call_wrapper mechanism.  See that function for more details. */
-
-extern gdbtk_result *result_ptr;
-
-/* If you want to restore an old value of result_ptr whenever cleanups
-   are run, pass this function to make_cleanup, along with the value
-   of result_ptr you'd like to reinstate.  */
-extern void gdbtk_restore_result_ptr (void *);
-
-/* GDB context identifier */
-extern int gdb_context;
-
-/* Internal flag used to tell callers of ui_loop_hook whether they should
-   detach from the target. See explanations before x_event and gdb_stop. */
-extern int gdbtk_force_detach;
-
-/*
- * These functions are used in all the modules of Gdbtk.
- * 
- */
-
-extern int Gdbtk_Init (Tcl_Interp * interp);
-extern void gdbtk_stop_timer (void);
-extern void gdbtk_start_timer (void);
-extern void gdbtk_ignorable_warning (const char *, const char *);
-extern void gdbtk_interactive (void);
-extern int x_event (int);
-extern int gdbtk_two_elem_cmd (char *, char *);
-extern int target_is_native (struct target_ops *t);
-extern void gdbtk_fputs (const char *, struct ui_file *);
-extern struct ui_file *gdbtk_fileopen (void);
-extern int gdbtk_disable_fputs;
-
-#ifdef _WIN32
-extern void close_bfds ();
-#endif /* _WIN32 */
-
-extern void
-  TclDebug (char level, const char *fmt,...);
-
-/* A convenience macro for getting the demangled source names,
-   regardless of the user's mangling style. */
-#define GDBTK_SYMBOL_SOURCE_NAME(symbol) \
-      (SYMBOL_DEMANGLED_NAME (symbol) != NULL \
-       ? SYMBOL_DEMANGLED_NAME (symbol)       \
-       : DEPRECATED_SYMBOL_NAME (symbol))
-
-
-/* gdbtk_add_hooks - add all the hooks to gdb.  This will get called
-   by the startup code to fill in the hooks needed by core gdb. */
-extern void gdbtk_add_hooks (void);
-
-/* Initialize Insight */
-extern void gdbtk_init (void);
-
-/* Start Insight. Insight must have already been initialized with a call
-   to gdbtk_init. */
-extern void gdbtk_source_start_file (void);
-#endif /* !_GDBTK_H */
diff --git a/gdb/gdbtk/library/ChangeLog-1997 b/gdb/gdbtk/library/ChangeLog-1997
deleted file mode 100644
index 0ec4a0b0d0d..00000000000
--- a/gdb/gdbtk/library/ChangeLog-1997
+++ /dev/null
@@ -1,1487 +0,0 @@
-Wed Dec 10 13:17:21 1997  Keith Seitz  <keiths@onions.cygnus.com>
-
-	* src.tcl (file): Insert tracepoint dots into the source window, too.
-
-	* tracedlg.tcl (build_win): Add an update to workaround a Tix/Tk bug when
-	mapping the dialog under X.
-
-	* console.tcl (insert): Add all errors to the end of the text widget.
-	(einsert): Send errors to end of text widget, not insertion pt.
-	(invoke): Send errors to end of text widget, not insertion pt.
-
-	* interface.tcl (gdbtk_tcl_readline_begin): Insert message into
-	command window so that the user sees messages like "Enter commands, one
-	per line. Enter 'end' when finished."
-
-	* actiondlg.tcl (change_other): Clear the entry on <Return>.
-	Add fencepost to avoid manipulating collect list twice which
-	could otherwise have undesired side effects.
-	Add some validation test for typed-in entries.
-	(ok): Call change_other to check the "Other" entry widget when the
-	dialog is dismissed.
-	(change): fix typo
-
-Mon Dec  8 15:07:51 1997  Keith Seitz  <keiths@onions.cygnus.com>
-
-	* tracedlg.tcl (get_data): New method which gets the data associated
-	with an action.
-	(add_all_actions): Use the new get_data method.
-
-	* actiondlg.tcl (get_selections): Add "declaration" for i so that
-	its scope is not limited to for loop.
-
-Fri Dec  5 10:01:24 1997  Keith Seitz  <keiths@pizza.cygnus.com>
-
-	* tracedlg.tcl (build_win): Add support for ranges of lines at which
-	tracepoint should be set.
-	(add_action): With ranges, use actions from first in tracepoint in the
-	range.
-	(ok): Set tracepoints for ranges, asking if it is ok to overwrite
-	any existing ones when necessary. Dismiss the dialog first -- or else
-	it could hang around forever.
-	(edit): With ranges, use actions of the first tracepoint.
-	TraceDlg::Lines: Renamed from TraceDlg::Line.
-	TraceDlg::New: New protected variable (indicates if there are any new
-	tracepoints being set with this dialog).
-	TraceDlg::Exists: New protected variable (indicates if there are any
-	existing tracepoints that may be overwritten -- so ask the user first).
-
-	* src.tcl (fill_files): Use gdb_find_file to test for the existence
-	of a file, not "file exists".
-	(do_popup): Filter the selection a little. If the selection is
-	multi-line selection, enable the tracepoint range option. Don't
-	display "add to watch" for EVERYTHING!
-	(validBPLine): Valid lines can have images on them, too.
-	(bp_line): Fallout of above: check if breakpoint exists before
-	deciding whether to clear it or set it.
-	(getVariable): Sllow LINE to be passed, so others can filter lines, too.
-	(set_tracepoint): Pass TraceDlg a list of lines -- only one line in this
-	case.
-	(tracepoint_range): New function to set tracepoint ranges.
-	(file): Use gdb_find_file to get the real filename.
-
-Wed Nov 26 15:02:43 1997  Keith Seitz  <keiths@onions.cygnus.com>
-
-	* balloon.tcl, gettext.tcl: Remove obsolete files.
-	
-	* console.tcl (invoke): Remove debug line.
-
-	* src.tcl (update): Remove debug line.
-
-	* prefs.tcl (pref_set_defaults): Turn debug mode off by deafult.
-
-Wed Nov 26 11:30:49 1997  Keith Seitz  <keiths@onions.cygnus.com>
-
-	* main.tcl: Initialize gdbtk_state(readline).
-
-	* console.tcl (invoke): Check if we are in readline mode, so that
-	we wait for the user's input and set a global with the result.
-	(activate): Add prompt argument for readline's prompt.
-	(setprompt): Add prompt argument for readline's prompt.
-
-	* interface.tcl (gdbtk_tcl_readline): hack to get readline working
-
-	* lots: Merge with foundry's 11/18/97 build.
-	
-	* console.tcl (setprompt): Get prompt from gdb.
-
-	* prefs.tcl (pref_set_defaults): Add tracepoint defaults.
-
-	* interface.tcl (gdbtk_tcl_tracepoint): New function which mimicks
-	gdbtk_tcl_breakpoint.
-
-	* src.tcl (constructor): Set default behavior of left click. Make
-	a tracepoint dot, too.
-	(fill_files): "New" function: ripped out of "location". It fills the
-	'files' combo box on the bottom of the source window.
-	(location): Use fill_files to fill the files combo box.
-	(do_bp): Add support for tracepoints.
-	(bp_line): Add support for tracepoints.
-	(set_tracepoint): New function to set a tracepoint on a given line.
-	(config_win): Add "Set tracepoint here" to right-click menu.
-
-	* actiondlg.tcl: New file to help with tracepoint data collection actions.
-
-	* tracedlg.tcl: New file to help with tracepoints.
-
-Mon Nov 17 16:49:56 1997  Martin M. Hunt  <hunt@cygnus.com>
-
-	* src.tcl (config_win): Remove stray character.
-
-Mon Nov 17 16:04:08 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* main.tcl (startup code: Use the first element from the
-	vmake-exelist list.
-	(exe_name): Likewise.
-	(gdbtk_tcl_preloop): Quote file name passed to file.
-	(download): Quote file name passed to load.
-
-Sun Nov 16 18:21:57 1997  Martin M. Hunt  <hunt@cygnus.com>
-
-	* bp.tcl (build_win): Change headers to be raised.
-	Change resizing so that the bp grid doesn't change
-	size and is always in the upper left corner.  Scrollbars
-	will appear if the window is shrunk too small.
- 	(bp_add): Set checkbutton color differently if not
-	on Windows.
-
-	* manage.tcl (manage_init): About title should only
-	have Foundry in it if we are running Foundry.
-
-Fri Nov 14 11:15:29 1997  Jeff Holcomb  <jeffh@cygnus.com>
-
-	* manage.tcl (manage_init): About window title is now "About
-	Cygnus Foundry".
-
-	* toolbar.tcl (create_menu_items): Changed "About Foundry
-	Debugger..." menu option to "About Cygnus Foundry...".
-
-Fri Nov 14 00:00:42 1997  Martin M. Hunt  <hunt@cygnus.com>
-
-	* memory.tcl (toggle_enabled): Toggle the background
-	color when Auto Update is changed.
-
-	* download_pref.tcl (save): New method. Save new
-	defaults.
-
-	* pref.tcl (build_win): Don't delete subwidget.
-	(save): New method.
-	
-	* manage.tcl (manage_init): Change preferences title.
-
-	* prefs.tcl (pref_set_defaults): Define gdb/advanced.
-	Used for testing advanced features.
-
-	* src.tcl (build_win): Set min size for top pane.
-	(mode): Set minimum size for pane2 when needed.
-
-	* toolbar.tcl (create_menu_items): Underline the
-	W in "Web", not the "e".
-
-Thu Nov 13 16:07:53 1997  Jeff Holcomb  <jeffh@cygnus.com>
-
-	* download.tcl (done): Update window and show the window for
-	at least 3 seconds.
-	(constructor): Initialize start_time and last_num.
-
-Thu Nov 13 18:17:07 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* main.tcl (ide_run_server): Call run_executable.
-	(run_executable): New procedure, mostly from old ide_run_server.
-	If ! GDBTK_IDE, just execute a run command.  In the case where
-	we've already downloaded, don't bother to do the run command after
-	idle.  If downloading is not forced, ask whether we should do it.
-	* src.tcl (config_win): Call run_executable, not gdb_cmd run.
-	* srcbar.tcl (_set_run): Likewise.
-	* toolbar.tcl (create_menu_items): Likewise.
-
-	* main.tcl: Initialize gdb_exe_set.  If IDE, arrange to receive
- 	process-ended events.
-	(gdbtk_tcl_preloop): Don't try to read the file if it doesn't
- 	exist.
-	(download): Don't try to download the file if it doesn't exist.
-  	Set gdb_download_mtime.
-	(exe_name): Just call set_exe_name.
-	(set_exe_name): New procedure.  Like old exe_name, but call
-	gdb_clear_file before running gdb file command, set gdb_exe_set,
-	and run gdb_idle_hook.
-	(receive_process_ended): New procedure.
-
-Thu Nov 13 13:35:32 1997  Martin M. Hunt  <hunt@cygnus.com>
-
-	* prefs.tcl (pref_set_defaults): Set debug off by default.
-
-	* src.tcl (config_win): Bind Ctrl+P and Ctrl+D.
-	(update_title): Change window titlebar.
-
-	* srcbar.tcl (_set_run): Change balloon help for
-	stop and run icons.
-	(create_menu_items): Add accelerator for Print Source.
-
-	* toolbar.tcl (create_buttons): Change balloon help for
-	project icon.
-	(create_menu_items): Change access keys. Add accelerator
-	for Download.
-
-Thu Nov 13 10:47:04 1997  Jeff Holcomb  <jeffh@cygnus.com>
-
-	* download.tcl (constructor): Fix text and button layout.
-	Don't allow resizing.
-
-Wed Nov 12 16:59:17 1997  Jeff Holcomb  <jeffh@cygnus.com>
-
-	* download.tcl (constructor): Patch from Ian to redo the
-	download window and also cancel support.
-	(update): Ditto.
-	(done): Ditto.
-	(cancel): New method to handle canceling the download.
-	(download_hash): Cancel support.
-
-Wed Nov 12 13:11:20 1997  Martin M. Hunt  <hunt@cygnus.com>
-
-	* memory.tcl (build_win): Change "Address" to "Addresses"
-	on menu and add separator.
-
-Tue Nov 11 11:00:25 1997  Martin M. Hunt  <hunt@cygnus.com>
-
-	* download_pref.tcl (cancel): Must reset combobox
-	because dialog no longer gets deleted.
-
-Tue Nov 11 15:40:36 1997  Tom Tromey  <tromey@cygnus.com>
-
-	* toolbar.tcl (create_menu_items): Underline "W", not "C", in
-	"Cygnus on the Web".
-
-Tue Nov 11 11:00:25 1997  Martin M. Hunt  <hunt@cygnus.com>
-
-	* variables.tcl (edit): Disable menus when in editing mode.
-
-Tue Nov 11 02:00:25 1997  Martin M. Hunt  <hunt@cygnus.com>
-	
-	* variables.tcl (selectionChanged): When selection changes,
-	cancel any editing in progress.
-	(build_win): Set background in text styles.
-	(edit): Set background colors.
-	(UnEdit): Clear selection when done.
-
-Mon Nov 10 12:22:00 1997  Martin M. Hunt  <hunt@cygnus.com>
-
-	* variables.tcl (build_win): Set background color.
-
-Mon Nov 10 05:30:00 1997  Martin M. Hunt  <hunt@cygnus.com>
-	
-	* about.tcl (build_win): Bind button one to close
-	the window.
-
-	* tclIndex: Rebuilt.
-	
-Mon Nov 10 03:00:00 1997  Martin M. Hunt  <hunt@cygnus.com>	
-
-	* download_pref.tcl (build_win): Fix reading of initial
-	baud rate.
-
-	* download.tcl (Download): Call keep_raised.
-
-	* main.tcl (ide_do_run): Catch GDB commands.
-	(ide_run_server): Catch GDB commands.
-	(ide_do_run): Don't set gdb_download_complete to 0.
-	We don't need further downloads unless executable changes
-	or Download is selected from the menubar.
-	(keep_raised): Keep a window on top.
-
-	* src.tcl (config_win): Catch GDB commands.
-
-	* toolbar.tcl (create_menu_items): Catch GDB commands.
-	(create_menu_items): Remove automatic step.
-	
-	* srcbar.tcl (_set_run): Catch GDB commands.
-
-	* stack.tcl (build_win): Change background color.
-
-	* bp.tcl: Change background color.
-	(destructor): Remove breakpoint change hook.
-	(bp_type): Fix problem with toggling temp to normal bps.
-	(build_win): Add popup menu.
-	
-	* interface.tcl (gdbtk_tcl_query): Change title and type.
-
-Mon Nov 10 00:26:25 1997  Martin M. Hunt  <hunt@cygnus.com>	
-
-	* pref.tcl (build_win): OK button wasn't working.
-
-	* main.tcl: Rework all the "automatic" downloading stuff so
-	it doesn't download and run when only the preferences are 
-	being displayed.
-
-	* src.tcl (open_src): Callback from IDE that opens
-	a source window when the bug is clicked on. Starts
-	up automatic download if necessary.
-
-	* tclIndex: Rebuilt.
-
-	* images2/bp.gif, stack.gif, up,gif, down.gif, bottom.gif:
-	Updated icons.
-	
-Sun Nov  9 19:30:33 1997  Martin M. Hunt  <hunt@cygnus.com>
-
-	* main.tcl (gdbtk_tcl_preloop): Remove uneeded if statement.
-	Remove calls to manage get_state.
-
-	* manage.tcl (manage_get_state): Remove.
-	(manage_init): Add save state to several windows.
-	(manage_create): Use ide_property instead of prefs to find window
-	geometry. 
-	(manage_delete): Restructure to fix several bugs.
-	(manage_save): Use ide_property instead of prefs. Don't
-	call pref_save.
-	(manage_register_defaults): Remove calls to manage_get_state.
-
-	* tclIndex: Rebuilt.
-	
-Sun Nov  9 16:34:44 1997  Tom Tromey  <tromey@cygnus.com>
-
-	* pref.tcl (build_win): Removed View page.
-
-	* toolbar.tcl (create_menu_items): Debugger -> "Foundry Debugger";
-	Help menu now parallels vmake.
-	* manage.tcl (manage_init): GDBTK -> "Foundry Debugger".
-
-Sun Nov  9 18:24:18 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* memory.tcl (build_win): Use a single menu, remove ``Hide
-	menubar'' entry, add ^U binding.
-	* manage.tcl (manage_init): Change name of memory window from
-	``Memory Dump'' to ``Memory''.
-
-	* srcbar.tcl (create_buttons): Remove toggle update button.
-
-	* src.tcl (update_title): Don't use colon if there is no file
-	name.
-
-	* main.tcl: If GDBTK_IDE, initialize gdb_download_complete.
-	(gdbtk_tcl_preloop): If GDBTK_IDE, call download.
-	(ide_run_server): Don't run if we already have a run request.  If
-	download is complete, run program as an idle callback.  Otherwise,
-	wait until the download is complete before running the program.
-	(ide_do_run): New procedure to support ide_run_server.
-	(download): Don't run program.  Set gdb_download_complete.
-
-	* src.tcl (name): Give an error if the file does not exist.
-	(location): Only add files that exist to the file name combobox.
-
-Sun Nov  9 11:09:39 1997  Tom Tromey  <tromey@cygnus.com>
-
-	* src.tcl (name): Use better error message.
-
-	* locals.tcl (build_win): New method.
-	* watch.tcl (build_win): Create menu.  Watch -> "Add Watch".
-	(Menu): New instance variable.
-	(selectionChanged): New method.
-	(postMenu): "Stop Watching" -> Remove.
-	* variables.tcl (build_win): Set -ignoreinvoke on Tree widget, and
-	set -command to run editEntry method.  Don't install <Double-1>
-	binding.  Put headers on Tree widget.  Run selectionChanged
-	method.
-	(editEntry): Renamed.  Now takes entry name as argument.
-	(populate): Don't set -state disabled on new items.
-	(getSelection): New method.
-	(selectionChanged): New method.
-	(build_menu_helper): New method.
-	(postMenu): View->Format.
-	(build_win): Likewise.
-
-	* variables.tcl (editXY): Only edit if entry is not empty.
-
-	* srcbar.tcl (create_menu_items): Edit -> Open.
-	(create_buttons): Likewise.
-
-Thu Nov  6 11:00:41 1997  Tom Tromey  <tromey@cygnus.com>
-
-	* manage.tcl (manage_delete): Special-case deletion of pref window.
-	(manage_create): Don't special-case deletion of pref window.
-
-Thu Nov  6 13:57:32 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* manage.tcl (manage_get_state): Return an empty string for a
-	withdrawn window and for the preferences window.
-
-	* main.tcl (exe_name): Don't do anything if the executable name
-	has not actually changed.
-
-Wed Nov  5 23:08:00 1997  Martin M. Hunt  <hunt@cygnus.com>
-
-	* main.tcl (download): Always specify exact filename
-	to load.
-
-Wed Nov  5 00:31:53 1997  Martin M. Hunt  <hunt@cygnus.com>
-	
-	* manage.tcl (manage_delete): Only delete source window if
-	user answers yes to query.
-
-	* bp.tcl: Rewrite to include pulldown menu and new look.
-
-	* register.tcl: Rewrite to include pulldown menu and new look.
-
-	* stack.tcl: Open initial size wide enough to show all text.
-
-	* src.tcl: Modified popup window. Remove option to open
-	multiple source windows because the IDE window code doesn't
-	work with it.
-
-	* srcbar.tcl (_set_run): Change balloon message for Run.
-
-	* variables.tcl, watch.tcl: Use fixed font.
-
-	* toolbar.tcl (create_menu_items): Handle Close Debugger correctly.
-
-	* mem_pref.tcl: Put focus and grab on window.
-
-	* memory.tcl: Balloon message change.
-	
-Mon Nov  3 11:04:44 1997  Tom Tromey  <tromey@cygnus.com>
-
-	* main.tcl (gdbtk_tcl_preloop): Look at main even if IDE running.
-	(ide_run_server): Open src window.
-
-	* manage.tcl (manage_init): Don't recreate initial windows when
-	running under IDE.
-
-Fri Oct 31 00:00:04 1997  Tom Tromey  <tromey@cygnus.com>
-
-	* pref.tcl (cancel): Use manage delete.
-	* toolbar.tcl (create_menu_items): Don't register debugger
-	preference window.
-	* manage.tcl (manage_register_defaults): Use idewindow, not
-	idewindow_proc.
-	(manage_delete): Don't deregister preference window.
-	(manage): Added find, create_closed methods.
-	(manage_create): Added visibility argument; changed all callers.
-	Special case destruction of pref window.
-	* main.tcl: IDE window callback proc is "manage find".  Register
-	debugger preference window.  Create closed src and pref windows
-	initially.
-	(gdbtk_tcl_preloop): Don't create source window in IDE mode.
-
-	* src.tcl (trace_variable): New method.
-	(constructor): Use variable traces to track target/exe changes.
-	(destructor): Remove variable traces.
-
-Thu Oct 30 12:50:28 1997  Martin M. Hunt  <hunt@cygnus.com>
-
-	* mem_pref.tcl: Change buttons to OK/Cancel/Apply.
-	Minor cleanup.
-
-	* memory.tcl: New look. Added menubar.
-
-Tue Oct 28 23:03:00 1997  Martin M. Hunt  <hunt@cygnus.com>
-
-	* toolbar.tcl (create_buttons):  Clean up balloon help 
-	for buttons.
-	(create_menu_items): Move print menu items to srcbar.tcl.
-	Cleanup labels.
-
-	* srcbar.tcl (create_menu_items): Add print menu items.
-	(create_buttons): Clean up balloon help for buttons.
-
-Tue Oct 28 17:26:15 1997  Martin M. Hunt  <hunt@cygnus.com>
-
-	* toolbar.tcl (create_menu_items): Add print menu items.
-	(print): New function.  Calls the proper print routine.
-
-	* src.tcl (print): New function.  Dump the contents
- 	of the text widget to a printer.
-
-Tue Oct 28 01:06:15 1997  Martin M. Hunt  <hunt@cygnus.com>
-
-	* toolbar.tcl (create_menu_items): Add new
-	preferences menu code.
-
-	* pref.tcl (build_win): Remove all old ppreferences.
-	Add Connection and View preferences.
-	(cancel): New function. Restore previous values and
-	quit.
-
-	* manage.tcl (manage_delete): Unregister preferences
-	on exit.
-	
-	* src.tcl (constructor): Add sizebox under Windows. 
-
-	* download.tcl (constructor): Remove shortcuts on buttons.
- 	Put focus on "OK" button.
-
-	* download_pref.tcl (cancel): New function. Restores
-	previous values.
-	
-Tue Oct 21 15:28:29 1997  Tom Tromey  <tromey@cygnus.com>
-
-	* main.tcl: Main window now named "Foundry Debugger".
-
-Fri Oct 24 14:03:00 1997  Martin M. Hunt  <hunt@cygnus.com>
-
-	* manage.tcl (manage_menu): Deleted.
-	(manage_delete): Notify IDE when windows are deleted.
-	(manage_raise): New function.
-	(manage_create): Notify IDE when a window is created.
-
-	* download.tcl (constructor): Put focus on download
-	window.
-
-	* toolbar.tcl (create_menu_items): Make "Window" menu
-	and IDE managed-menu, but don't put anything in it.
-
-Fri Oct 24 12:28:43 1997  Martin M. Hunt  <hunt@cygnus.com>	
-
-	* toolbar.tcl (create_menu_items): Add View menu.
-
-	* src.tcl (config_win): Add accelerators for new View
-	menu.
-
-Wed Oct 22 21:30:52 1997  Martin M. Hunt  <hunt@cygnus.com>
-
-	* download.tcl (Download): Make window local modal.
-	Raise it to top.
-
-	* srcbar.tcl (create_buttons): Change border size on
-	address and line labels.  Change balloon help. Remove
-	vertical line.
-
-Mon Oct 20 10:12:23 1997  Tom Tromey  <tromey@cygnus.com>
-
-	* toolbar.tcl (create_buttons): vmake window now named "Foundry
-	Project".
-
-Mon Oct 13 19:02:33 1997  Martin M. Hunt  <hunt@cygnus.com>
-
-	* bp.tcl (bp_modify): Change color of checkbuttons.
-
-	* download.tcl (done): Write "DONE" on progress meters.
-
-Thu Oct  9 14:33:21 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* main.tcl: Call ide_window_register restorer.
-
-Thu Oct  9 12:46:25 1997  Tom Tromey  <tromey@cygnus.com>
-
-	* src.tcl (updateBalloon): Changed name of balloon variable.
-	(showBalloon): Likewise.  Use new "balloon show" command.
-	(SrcBalloon): Removed.
-	(TimeOut): Default is 1000 (1 second).
-
-Wed Oct  1 11:33:36 1997  Tom Tromey  <tromey@cygnus.com>
-
-	* main.tcl: Use "manage get_state" as window saver.
-
-	* manage.tcl (manage): Added "restore", "get_state" options.
-	(manage_restore): New proc.
-	(manage_get_state): Likewise.
-	(manage_register_defaults): Use "manage get_state" as window
-	saver.
-
-Sun Sep 28 04:20:00 1997  Martin M. Hunt  <hunt@cygnus.com>
-
-	* bp.tcl: Clean up the spacing to make the widget look better.
-
-	* download_pref.tcl: Show the initial baud rate correctly.
-
-	* download.tcl: Cleanup correctly when deleted.
-
-	* main.tcl (gdb_tcl_preloop): Set baud rate.
-	(ide_run_server): Delay download 1 second.
-	(demo_it): Do gdb "next" commands every 2 seconds.
-
-	* manage.tcl (manage_create): Withdraw window immediately then
-	deiconify it when done.
-
-	* prefs.tcl (pref_set_defaults): Don't define stack bg color.
-
-	* register.tcl: Withdraw window immediately so we don't have
-	to watch it slowly draw. Make it look more like memory window.
-
-	* src.tcl: Fix major bug where source window got lost when
-	the source file was not found. Reconfigures more smoothly.
-
-	* srcbar.tcl (create_menu_items): Comment out "Close Debugger"
-	menu item because it was broken.
-
-	* stack.tcl: Use the same background color as the other windows.
-
-	* toolbar.tcl: Add "Automatic Step" menu item.
-	
-Fri Sep 26 21:10:11 1997  Keith Seitz  <keiths@pizza.cygnus.com>
-
-	* download.tcl (done): display bytes loaded as an integer.
-
-Fri Sep 26 13:09:47 1997  Tom Tromey  <tromey@cygnus.com>
-
-	* images2/edit.gif: Replaced.
-
-Fri Sep 26 00:42:00 1997  Martin M. Hunt  <hunt@cygnus.com>
-
-	* main.tcl (ide_run_server): Just call download.
-	(download): First set baud rate then target.  Then, depending
-	on preferences set a breakpoint at 'main' and 'exit' and run.
-	(set_baud): New function.
-	
-	* download_pref.tcl (build_win) Add checkbuttons for "Run until
-	'main'" and "Set breakpoint at 'exit'.
-	(change_baud): Set preference when baud changes.
-
-	* pref.tcl (reconfig): Correct problem with download options.
-
-	* prefs.tcl (pref_set_defaults): Define gdb/load/main, 
-	gdb/load/exit, and gdb/load/baud.
-
-	* src.tcl (location): Fix a problem where the browse tag was
-	sometimes not deleted.
-
-	* manage.tcl: Add a window title for Download Options.
-	
-Thu Sep 25 15:39:00 1997  Martin M. Hunt  <hunt@cygnus.com>	
-
-	* download_pref.tcl: New file. Creates a download options dialog.
-
-	* manage.tcl: Add download prefs window to list.
-
-	* toolbar.tcl: Add Download preferences to menu.
-
-	* pref.tcl: Add Download to tab notebook preferences.
-
-	* src.tcl: Set activebackground on popup to indicate color
-	of the breakpoint dot that will be set.
-
-Thu Sep 25 12:36:00 1997  Martin M. Hunt  <hunt@cygnus.com>	
-
-	* download.tcl (done): Make sure all indicators show download
-	completed, even if we weren't properly notified.
-
-	* manage.tcl: Better support for windows that want to set
-	their own titles.
-
-	* src.tcl (update_title): New function.  Sets titlebar
-	to indicate current filename, and under IDE, executable and
-	target.
-
-	* images2/reg.gif: Updated image.
-	
-Thu Sep 25 08:58:44 1997  Keith Seitz  <keiths@onions.cygnus.com>
-
-	* src.tcl (config_win): don't focus src window on Enter events
-
-Thu Sep 25 03:11:00 1997  Martin M. Hunt  <hunt@cygnus.com>
-
-	* main.tcl (ide_run_server): Set target and download automatically.
-	(download): Open a download window.
-
-	* download.tcl: New file. Implements a download window.
-
-	* manage.tcl (manage_init): Add download window.
-	(manage_create): If there is no title, don't try to set one and
-	don't try to set geometry.
-
-	* registers.tcl: Make it look more like memory window.
-
-	* toolbar.tcl, floatbar.tcl, srcbar.tcl: Update look of menus and toolbars 
-	to be closer to prototype.
-
-	* Makefile: Add download.tcl.
-
-	* tclIndex: Rebuilt.
-	
-	* images/memory.gif: Update.
-
-	* images/bp.gif: New file. Breakpoint icon.
-
-Wed Sep 24 07:43:47 1997  Keith Seitz  <keiths@onions.cygnus.com>
-
-	* variables.tcl (VariableWin::build_win): add double-click binding to edit
-	(editXY): new method to support above
-
-	* prefs.tcl (pref_set_defaults): add register window pref for highlight color
-
-	* register.tcl (RegWin::constructor): set highlight and normal fg
-	(build_win): build window using grid geometry manager, not grid widget
-	(dimensions): new method
-	(fixLength): new method
-	(but3): use "Menu" (protected data)
-	(edit): use entry to edit values
-	(acceptEdit): new method
-	(unedit): new method
-	(update): change to use new grid layout and change highlighting
-	(reconfig): destroy scrolled window, too
-	ScrolledWin: new protected data
-	Menu: new protected data
-	Editing: new protected data
-
-Tue Sep 23 15:15:22 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* main.tcl: If GDBTK_IDE, withdraw . before making any calls
-	across the IDE backplane.
-	* manage.tcl (manage_init): If using a floating toolbar, and
-	GDBTK_IDE, deiconify . to undo the withdrawal.
-
-Tue Sep 23 01:31:00 1997  Martin M. Hunt  <hunt@cygnus.com>
-
-	* main.tcl: Reorder calls to pref init and standard_look_and_feel.
-
-	* global_pref.tcl: Change font requester to modify both src-font
-	and global.fixed. Change to be compatible with latest libide font code.
-
-	* prefs.tcl: Changes to get working with latest libide font code.
-	
-Mon Sep 22 15:16:00 1997  Martin M. Hunt  <hunt@cygnus.com>	
-
-	* memory.tcl: Add editing.  Remove debugging lines.
-	Fix problems with resizing.
-
-	* mem_pref.tcl: Remove debugging line.
-	
-Fri Sep 19 08:22:25 1997  Keith Seitz  <keiths@onions.cygnus.com>
-
-	* variables.tcl (build_win): use preferences
-	(getAllClassMembers): new method
-	(getPath): update to support C++
-
-	* watch.tcl (build_win): augment parent class' build_win instead of replacing it
-
-	* stack.tcl (build_win): use preferences
-	(update): catch gdb_loc in case source window is not open yet
-
-	* prefs.tcl (pref_set_defaults): add new defaults for all previously
-	hard-coded fonts and colors
-
-	* global_pref.tcl (build_win): use preferences
-
-	* console.tcl (Console::constructor): use preferences
-
-	* bp.tcl (bp_add): use preferences
-	(bp_modify): use preferences
-	
-
-	* src.tcl (SrcWin::constructor): use preferences
-	(build_win): use preferences
-	(config_win): use preferences, bind <Enter> to focus source window textbox
-	so that our keypresses always work
-	(SrcBalloon): new protected variable
-	(TimeOut): new common variable
-
-Wed Sep 17 13:54:29 1997  Tom Tromey  <tromey@cygnus.com>
-
-	* toolbar.tcl (build_win): Use standard_toolbar.
-
-Wed Sep 17 13:52:00 1997  Martin M. Hunt  <hunt@cygnus.com>
-
-	* src.tcl (config_win): Set bg color back to default.
-
-Tue Sep 16 23:10:00 1997  Martin M. Hunt  <hunt@cygnus.com>	
-
-	* images2/*: Delete unused icons.
-
-Tue Sep 16 21:30:40 1997  Martin M. Hunt  <hunt@cygnus.com>
-
-	* bp.tcl (bp_add): Add some padding to space things
-	out more.  Anchor labels to the right side.
-
-	* src.tcl: Fix problem where breakpoints were disappearing
-	when files changed.
-
-Tue Sep 16 17:45:05 1997  Martin M. Hunt  <hunt@cygnus.com>
-
-	* manage.tcl: Change manage_create and manage_open to accept
-	a variable number of args. Add mem and mempref window types.
-	Fix pref save call.
-
-	* memory.tcl: New file. Implements a memory dump window.
-	Currently read-only.
-
-	* mem_pref.tcl: New file.  Implements options dialog for
-	memory dump window.
-
-	* pref.tcl, toolbar_pref.tcl, register.tcl, src_pref.tcl,
-	global_pref.tcl, about.tcl: Make "attach" a public config
-	variable.
-
-	* main.tcl: Use standard_look_and_feel.
-
-	* Makefile, tclIndex: Rebuilt.
-
-	* images/check.gif: A check mark image.
-
-	* images/stop.gif: Fix transparency.
-
-Tue Sep 16 08:13:03 1997  Keith Seitz  <keiths@onions.cygnus.com>
-
-	* src.tcl (getVariable): fix off by one error when a breakpoint
-	is set at a line
-	(hasBreakpoint): new method
-	(SrcWin): add idle hook for source balloons
-	(updateBalloon): new method
-	(showBalloon): use register_balloon
-	(register_balloon): new method
-
-Tue Sep 16 05:55:31 1997  Keith Seitz  <keiths@onions.cygnus.com>
-
-	* watch.tcl (add): use a little more robust (if more obscure) method
-	of determining validity of a variable name
-	(label): translate % to $ in names
-	
-	* variables.tcl (Variable::setType): allow for convenience variables
-	(Variable::isConvenience): new method
-	(Variable::displayHex): allow for convenience variables
-	(VariableWin::edit): do not eval $data when editing (for conv. vars)
-	(VariableWin::postMenu): use virtual method label to title popup
-	
-Fri Sep 12 12:17:13 1997  Keith Seitz  <keiths@onions.cygnus.com>
-
-	* variables.tcl (Variable::value): when no display style specified,
-	choose some reasonable default for the given type
-
-	* src.tcl (config_win): ad bindings to support variable balloons in source mode
-	(getVariable): new method
-	(cancelMotion): new method
-	(motion): new method
-	(showBalloon): new method
-	timeoutID: new protected variable
-	TimeOut: new protected variable
-
-Fri Sep 12 05:47:56 1997  Keith Seitz  <keiths@onions.cygnus.com>
-
-	* variables.tcl (getLocals): return empty list when no locals present.
-
-Thu Sep 11 14:13:19 1997  Keith Seitz  <keiths@onions.cygnus.com>
-
-	* variables.tcl (VariableWin::build_win): change popup construction
-	(VariableWin::postMenu): redo menu layout to use dynamic idices of
-	panes
-	(VariableWin::edit): new method
-	(VariableWin::UnEdit): new method
-	(VariableWin::changeValue): new method
-	(VariableWin::getPath): handle unamed unions/structs and arrays more
-	intelligently
-	VariableWin::Editing: new protected variable
-	VariableWin::EditEntry: new protected variable
-	(Variable::isOpenable): make sure we can open unions 
-	(Variable::isUnamed): new method
-	(Variable::isUnion): new method
-	(Variable::setType): handle unions and unamed structs/unions better
-	(Variable::displayHex): unions, structs only display in hex
-	(Variable::isArray):  new method
-	(Variable::isEnum): new method
-	(Variable::isEditable): new method
-	(Variable::value): enums now show symbol values, too. Analogous to char
-	and char*.
-
-	* watch.tcl (WatchWin::build_win): change popup construction
-	(WatchWin::postMenu): redo menu layout to use dynamic indices of panes
-	
-
-Wed Sep 10 20:44:12 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* manage.tcl (manage_register_defaults): Rename from
-	manage_register_default.  Take a list of windows.
-	(manage_menu): Invoke manage_register_defaults once as an idle
-	callback, rather than invoking manage_register_default in many
-	different idle callbacks.
-
-Wed Sep 10 00:49:23 1997  Martin M. Hunt  <hunt@cygnus.com>
-
-	* src.tcl (edit): Don't start editor if we're not
-	debugging anything.
-
-	* main.tcl: Keep correct colorscheme for windows.
-
-Mon Sep  8 12:10:26 1997  Martin M. Hunt  <hunt@cygnus.com>
-
-	* manage.tcl (manage_restart): Only restart toolbar once.
-
-	* global_pref.tcl: Minor fix.
-
-	* images2/vmake.gif: Fix transparency.
-	
-Mon Sep  8 13:05:11 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* interface.tcl (gdbtk_tcl_query): Use tk_messageBox rather than
-	tk_dialog.
-
-	* main.tcl: Register check and exit handlers using new commands
-	provided by gdbtk.
-
-Mon Sep  8 03:01:25 1997  Martin M. Hunt  <hunt@cygnus.com>
-
-	* global_pref.tcl (build_win): Some font fixes.
-
-Mon Sep  8 02:25:17 1997  Martin M. Hunt  <hunt@cygnus.com>
-
-	* src.tcl: Make disabled breakpoints black.
-	Make comboboxes only use scrollbars when needed.
-
-	* interface.tcl (gdbtk_tcl_breakpoint): Change to support
-	changes in gdbtk.c.  Supply breakpoint number to hooks.
-
-	* manage.tcl: Add breakpoint window.  Add support for
-	dynamically attaching/detaching toolbars.
-
-	* bp.tcl: New file.  Breakpoint window.
-	
-	* main.tcl: Change palette for debugging.
-
-	* pref.tcl: New file. Preferences dialog.
-
-	* floatbar.tcl: Add target and download buttons.
-	Add spacing.
-
-	* srcbar.tcl, toolbar.tcl: Change to use flat icons. Work with
-	floating toolbar if requested.
-
-	* prefs.tcl: Define new preferences to force toolbar
-	to float or be attached to the source windows.
-
-	* global_pref.tcl: Remove icon requester.
-
-	* toolbar_pref.tcl: Add icon combobox.  Add checkbuttons
-	for forcing toolbar to either float or be attached to src window.
-	
-	* Makefile: Add bp.tcl
-
-	* images/*: Fix transparency and add new icons.
-
-	* images2/*: Add flat icons.
-
-Fri Sep  5 20:24:07 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* main.tcl: Register an exit handler when using the IDE.
-
-Thu Sep  4 11:47:38 1997  Martin M. Hunt  <hunt@cygnus.com>
-
-	* ALL: Change preferences to use new preferences.
-	Change "dbug" calls to "debug".
-
-	* pref.tcl: New file.  Local preferences read/write.
-
-	* gettext.tcl, debug.tcl, balloon.tcl: Delete. Use
-	versions from libide instead.
-	
-Wed Sep  3 09:20:13 1997  Tom Tromey  <tromey@cygnus.com>
-
-	* main.tcl (add): Pass idewindow_no_state to idewindow_proc.
-	* manage.tcl (manage_register_default): Pass idewindow_no_state to
-	idewindow_proc.
-
-Mon Aug 25 05:59:01 1997  Martin M. Hunt  <hunt@pern.cygnus.com>
-
-	* images2/{finished.gif, finishedu.gif, nextd.gif nextu.gif,
-	stepd.gif, stepu.gif}: Use icons with straight brackets
-	instead of slanted.
-
-	* prefs.tcl (pref_set_defaults): Set default debugMode to 0.
-
-	* register.tcl (build_win): Change font to fixed and bg to white.
-
-	* src.tcl: Change all references to fonts to "src-font".
-
-	* global_pref.tcl: Change font requester to do src-font.
-
-	* srcbar.tcl: Change address and line labels to use
-	src-font and be sunken.
-
-	* stack.tcl: Chnage bg to white and fonr to src-font.
-
-Mon Aug 25 03:06:35 1997  Keith Seitz  <keiths@pizza.cygnus.com>
-
-        * src.tcl: (set_status) check if inferior is running first, and reset
-        message for status window if it is not.
- 
-
-Mon Aug 25 00:28:39 1997  Martin M. Hunt  <hunt@pern.cygnus.com>
-
-	* srcbar.tcl: Change stack images to be consistent with others.
-
-	* images2/{upu.gif,upd.gif,bottomd.gif,bottomu.gif,downu.gif,
-	downd.gif}: New stack images.
-
-	* images2/edit[ud].gif: Correct quantization and transparency.
-
-	* manage.tcl (manage_delete): Kill gdb when all source windows
-	are deleted.
-	(manage_create): Only add IDE entries on the first source window.
-
-	* src.tcl (do_popup): Don't map window if already mapped. Fixes
-	problem with tk_popup.  Change menu items.
-
-Mon Aug 25 00:24:43 1997  Keith Seitz  <keiths@pizza.cygnus.com>
-
-	* src.tcl: (set_status) change to using gdb_target_has_execution to
-	determine if the target is running
-
-Sun Aug 24 23:02:19 1997  Tom Tromey  <tromey@cygnus.com>
-
-	* toolbar.tcl (build_win): Make sure object is deleted when window
-	is destroyed.
-	(destructor): Don't destroy containing widget; just us.
-
-	* srcbar.tcl (create_menu_items): Added Exit item to menu.
-
-	* src.tcl (build_win): Use grid, not packer, to lay out main
-	window.
-	(mode): Pack new text widget into pane; don't repack the pane
-	itself.
-
-Sun Aug 24 22:06:30 1997  Keith Seitz  <keiths@pizza.cygnus.com>
-
-	* varialbes.tcl: (build_win) set hlist font to 'tix option get
-	fixed_font', change selectBackground to Hlist background, select-
-	BorderWidth to 0, selectForeground to black. Use tk_popup instead of
-	tixPopup widget.
-	(postMenu) make necessary tk_popup changes, make sure functions are
-	only allowed to be displayed in hex.
-	(isFunction) new method
-	(displayHex) functions only displayable as hex
-	(value) extract the address of functions for value
-	* watch.tcl: (constructor) remove popup menu customization
-	(build_win) change from tixPopup to tk_popup, hack the
-	hlist options to use the correct font, etc as in variables.tcl,
-	(validateEntry) always erase the contents of the entry
-	(postMenu) make all changes to use tk_popup and move the "Stop
-	watching" menu addition here
-	(label) make sure that we use "foo.bar" and "foo->bar" correctly
-	(add) fix typo preventing recognition of variables already being
-	watched
-
-Sun Aug 24 18:49:16 1997  Martin M. Hunt  <hunt@pern.cygnus.com>
-
-	* console.tcl (invoke): Don't display error messages in console window.
-	(constructor):  Enable cut-and-paste.  Fix intermittant bug.
-
-	* main.tcl (gdbtk_tcl_preloop): Don't automatically do anything
-	but issue the file command.
-	(download): Issue load command.  Called when icon is selected.
-	(set_target): Issue target command.  Called when target
-	icon is selected.
-
-	* srcbar.tcl: Add target and download buttons to toolbar.
-
-Sun Aug 24 20:30:41 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* main.tcl (gdbtk_tcl_preloop): If GDBTK_IDE, then automatically
- 	set file and target based on properties.  If using the simulator,
- 	load the executable.  Catch and ignore errors from setting the
- 	source window to show main.
-
-Sun Aug 24 14:39:23 1997  Tom Tromey  <tromey@cygnus.com>
-
-	* src.tcl (constructor): Don't set `editor'.
-	(location): Never update external editor.
-	(edit): Don't set `editor'.
-	(editor): Removed instance variable.
-
-	* images2/stepiu.gif, images2/stepid.gif, images2/nextiu.gif,
-	images2/nextid.gif: Installed new versions.
-
-	* srcbar.tcl (_toggle_updates): Pass $updatevalue to
-	updatecommand.
-	(destructor): Implemented.
-	(_set_stepi): New method.
-	(displaymode): Run _set_stepi when changed.
-	(updatevalue): Global state stored in global array.
-	(create_buttons): Create stepi, nexti buttons.  Run _set_stepi.
-	(_load_src_images): Create stepi, nexti icons.
-
-	* images2/stepiu.gif, images2/stepid.gif, images2/nextiu.gif,
-	images2/nextid.gif: New images.
-	(create_buttons): Likewise.
-
-	* src.tcl (toggle_updates): Use $value, not $a.
-
-	* src.tcl (mode): Don't change commands on (nonexistent) step/next
-	buttons.
-
-	* toolbar.tcl (create_buttons): Added watch button.
-	(_load_images): Create watch images.
-	* images2/watchd.gif, images2/watchu.gif: New files.
-	* images2/varsd.gif, images2/varsu.gif: Changed.
-
-	* images2/*: Removed old images, added many new images.
-
-	* prefs.tcl (pref_set_defaults): Default images are in images2
-	directory.
-	* src.tcl (build_win): Make a GDBSrcBar.
-	(location): address and line information now in toolbar.
-	(mode): Set -displaymode on toolbar.
-	(update): Set -running on toolbar.
-	(busy): Likewise.
-	(edit): Now a method, not a proc.
-	(toggle_updates): Added "value" argument.
-	* Makefile (TCL): Added srcbar.tcl, floatbar.tcl.
-	* toolbar.tcl (create_buttons): New method.
-	(create_menu_items): Likewise.
-	(build_win): Run create_menu_items and create_buttons.  Move most
-	of body into these methods.  Removed Exit command from File menu.
-	(_loaded_images): New common variable.
-	(_load_images): New method.
-	(create_buttons): Run it.
-	(create_menu_items): Removed Tools menu.
-	(configure): Renamed from config.
-	* srcbar.tcl: New file.  Implements toolbar attached to source
-	window.
-	* floatbar.tcl: New file.  Implements floating toolbar.
-	* manage.tcl (manage_init): toolbar-type is GDBFloatBar.
-	(manage_init): Don't create toolbar if running under IDE.
-
-Sun Aug 24 13:05:22 1997  Martin M. Hunt  <hunt@pern.cygnus.com>
-
-	* manage.tcl (manage_init): Remove idemenuname from
-	the _manage_objects array; it was redundant.
-	(manage_create): Stop notifying IDE about new transient
-	windows.
-
-Sun Aug 24 01:07:29 1997  Tom Tromey  <tromey@cygnus.com>
-
-	* about.tcl, console.tcl, global_pref.tcl, prefs.tcl,
-	register.tcl, src.tcl, src_pref.tcl, stack.tcl, toolbar.tcl,
-	toolbar_pref.tcl: Added Copyright statement.
-
-	* Makefile (tags, TAGS): New targets.
-
-	* toolbar.tcl (build_win): Quit->Exit.  Only display this item if
-	not using the IDE.
-
-Sat Aug 23 21:55:54 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* src.tcl (SrcWin update): Set command for stop icon.
-	(SrcWin busy): Likewise.
-
-	* manage.tcl: Move comments out of array initialization.
-
-Sat Aug 23 17:36:06 1997  Martin M. Hunt  <hunt@pern.cygnus.com>
-
-	* src.tcl (name): Handle case where files are part of the
-	sources, but are unreadable. 
-	(build_win): Set filename combobox size to default.
-
-	* manage.tcl: Remove breakpoint window from window list.
-	
-Sat Aug 23 16:49:53 1997  Keith Seitz  <keiths@onions.cygnus.com>
-
-	* src.tcl: remove old breakdot stuff
-	(reconfig) make sure we redraw the breakdots when font changes
-	(file) check for duplicate break-able lines
-	* variables.tcl: remove debug output
-	* watch.tcl: add entry field to enter watch expressions
-
-Sat Aug 23 17:44:45 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* manage.tcl (manage_create): Register the window if it is not
-	already registered, rather than if it is already registered.
-
-	* src.tcl (SrcWin config_win): Add special double and triple click
-	bindings to override standard text bindings in break dot area.
-
-	* prefs.tcl (pref_set_defaults): Set the global font to the Tix
-	default font.  Set the src font to the Tix default fixed font.
-	* src.tcl (SrcWin config_win): Configure the text font.
-	* console.tcl (Console constructor): Set the cont to the Tix
-	fixed font.
-
-Fri Aug 22 20:42:51 1997  Keith Seitz  <keiths@onions.cygnus.com>
-
-	* src.tcl: add breakpoint image that is text-size insensitive
-	change layout of source, assembly, and mixed windows to use
-	tabs, if possible, allowing more clickable area for toggling
-	breakpoints, etc.
-	* variables.tcl: (VariableWin::isFloat) new method
-	(VariableWin::value) make sure floats are output as floats
-	when user specifies "decimal" output
-
-Fri Aug 22 16:23:32 1997  Martin M. Hunt  <hunt@pern.cygnus.com>
-
-	* src.tcl (goto_func): Catch errors.
-
-Fri Aug 22 16:35:39 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* main.tcl: Use underscores rather than dashes in variable names.
-	(ide_run_server): Make gdb_target_name global.  Call file before
-	calling target.  Call load before calling run.
-
-Fri Aug 22 12:15:06 1997  Martin M. Hunt  <hunt@pern.cygnus.com>
-
-	* debug.tcl (dbug): Make debug window scrolled. Make it
-	work with standalone gdb.
-
-	* prefs.tcl (pref_save): Fix puts that were incorrectly
-	changed to dbug.
-
-Thu Aug 21 17:57:59 1997  Martin M. Hunt  <hunt@cygnus.com>
-
-	* ALL: Change all "puts" to "dbug".
-
-	* debug.tcl: New file. Opens a window for debugging messages.
-
-Thu Aug 21 14:30:53 1997  Keith Seitz  <keiths@onions.cygnus.com>
-
-	* watch.tcl: (add) strip commas, too
-
-Thu Aug 21 14:26:36 1997  Keith Seitz  <keiths@onions.cygnus.com>
-
-	* variables.tcl: (buid_win) use listbox's font for font measuring
-
-Thu Aug 21 02:52:35 1997  Martin M. Hunt  <hunt@pern.cygnus.com>
-
-	* src.tcl (name): Check source filenames and handle errors
-	if not found.
-
-	* variables.tcl (destructor): Display styles are not
-	objects so must be destroyed instead of deleted.
-	(name): comment out debugging line.
-
-	* main.tcl: Add stuff from standard_look_and_feel.
-
-	* prefs.tcl, manage.tcl: Minor cleanup.
-
-Thu Aug 21 00:39:35 1997  Martin M. Hunt  <hunt@pern.cygnus.com>	
-
-	* main.tcl (ide_run_server) New function.  Starts GDB when
-	asked politely.
-	(target_name): New function. Watches for changes in the target
-	name.
-	(exe_name): New function. Watches for changes in the
-	executable name.
-
-	* console.tcl (insert, einsert): Scroll so the insertion 
-	point can be seen.
-
-	* manage.tcl: SPecial hacks to create a global "console".
-	Needed because we can't have puts searching for a console
-	window everytime a puts arrives.
-	
-	* interface.tcl (gdbtk_tcl_fputs, gdbtk_tcl_fputs_error):
-	Write to the console if one exists, and do an update.
-
-	* tclIndex: Rebuilt.
-	
-Wed Aug 20 17:23:07 1997  Keith Seitz  <keiths@onions.cygnus.com>
-
-	* variables.tcl: (Variable::setType VariableWin::getPath) handle types
-	with multiple names (unsigned char, long long unsigned int) properly
-	* locals.tcl: (update) comment out debug info
-
-Wed Aug 20 16:36:49 1997  Keith Seitz  <keiths@pizza.cygnus.com>
-
-	* watch.tcl: (add) try to handle errors more gracefully
-	* variables.tcl: (value) make sure we handle bad pointer
-	dereferences nicely
-	(lots of places) switch to using 'ouput' instead of 'print'
-
-Wed Aug 20 11:43:35 1997  Martin M. Hunt  <hunt@cygnus.com>
-
-	* src.tcl (file): Handle case where source files do
-	not have any lines which generate code.
-	(set_status):  Keep status to one line.
-
-Wed Aug 20 00:00:52 1997  Tom Tromey  <tromey@sanguine.cygnus.com>
-
-	* images2/build.gif, images2/file.gif, images2/reg.gif,
-	images2/stop.gif, images2/continue.gif, images2/finish.gif,
-	images2/next.gif, images2/step.gif, images2/run.gif: New files.
-
-Tue Aug 19 14:52:59 1997  Keith Seitz  <keiths@onions.cygnus.com>
-
-	* tclIndex: rebuilt
-	* Makefile: add variables.tcl, watch.tcl, and locals.tcl
-	* manage.tcl: (manage_init): add locals window
-	* src.tcl: (do_popup): add binding for watch window
-	(addToWatch): new method
-	* locals.tcl: new file
-	* variables.tcl: new file
-	* watch.tcl: new file
-	
-
-Mon Aug 18 01:28:19 1997  Martin M. Hunt  <hunt@cygnus.com>
-
-	* manage.tcl: Change window names to have only first
-	char of each word capitalized.
-
-	* global_pref.tcl (get_file): Handle bad pathnames.
-
-Sun Aug 17 01:59:02 1997  Martin M. Hunt  <hunt@cygnus.com>
-
-	* register.tcl (destructor): Call manage delete.
-	* global_pref.tcl (destructor): Call manage delete.
-	* prefs.tcl (destructor): Call manage delete.
-	* src_pref.tcl  (destructor): Call manage delete.
-	* toolbar_pref.tcl  (destructor): Call manage delete.
-
-	* manage.tcl: (manage_delete): Remove windows that
-	have been quit, rather than killed by window manager.
-
-	* src.tcl (location): Don't call gdb_listfuncs on
-	NULL filenames.
-	
-Sun Aug 17 00:18:02 1997  Martin M. Hunt  <hunt@cygnus.com>
-
-	* src.tcl: Major changes to support file browsing.
-	Also bug fixes for assembly mode, new comboboxes
-	for filename and function selection.
-
-	* src_pref.tcl: New file.  Allows selection of
-	colors used in source display.
-
-	* prefs.tcl: Add new window type for src prefs.
-	Set default colors for source window.
-
-	* manage.tcl (manage_init): Add srcpref window type.
-	(manage_restart): Preserve window geometries on restarts.
-
-	* Makefile: Add src_pref.tcl.
-
-	* tclIndex: Rebuilt.
-
-	* toolbar.tcl: Add call to source prefs.
- 	
-	* main.tcl: Change initial "src file" call to
-	"src location".
-
-Thu Aug 14 15:49:02 1997  Martin M. Hunt  <hunt@cygnus.com>
-
-	* manage.tcl (manage_create): Some fixes for IDE windows. 
-
-Thu Aug 14 03:18:10 1997  Martin M. Hunt  <hunt@cygnus.com>
-	
-	* register.tcl, stack.tcl (destructor): Remove hook.
-
-	* manage.tcl: Mostly rewritten from scratch to be
-	more efficient and handle multiple windows of the same type.
-	(manage_open): New function opens or creates a window
-	as necessary.
-	(manage_create): Now always creates a new window.
-
-	* global_pref.tcl (build_win): Only put up font message
-	box on Unix systems.
-
-	* main.tcl: Change "manage create" calls to "manage open"
-
-	* src (destructor): Remove hooks.
-	(do_popup): Add a menu item to open another source window.
-	
-	* toolbar.tcl (build_win): Change "manage create" calls to
-	"manage open".  Bind button 3 on iconbar to "manage create".
-	
-	* prefs.tcl: Changes required for new features in manage.tcl.
-	
-	* tclIndex: Rebuilt.
-
-	* hooks.tcl (remove_hook): Fix.
-	(lremove): New function.
-	
-Tue Aug 12 16:06:04 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* main.tcl: If running in the IDE, register the source window as
-	the generic gdb window.
-
-Tue Aug 12 01:42:10 1997  Martin M. Hunt  <hunt@cygnus.com>
-
-	* global_pref.tcl (build_win): Add a font size control
-	widget, and a font preview window.   Implement scanning
-	for fixed-width fonts and a font cache.
-	(font_changed): Save all font attributes in new-style
-	font description.
-
-	* balloon.tcl: Merge in latest changes from libide.
-
-	* prefs.tcl (pref): Rename variables to make function
-	clearer.
-	(pref_init): After reading in prefs file, create
-	all named fonts.
-	(pref_set_defaults): Set default font to {courier 12 roman}.
-
-Mon Aug 11 13:47:49 1997  Martin M. Hunt  <hunt@cygnus.com>
-
-	* tclIndex: New file.
-
-	* Makefile: New file. Generates tclIndex when needed.
-
-	* manage.tcl (manage_init): Add an icon for GDB. 
-	(manage_create): Bind Map and Unmap for toolbar toplevel.
-	Tell window manager to display icon if one exists.
-	(manage_iconify): Iconify or deiconify all windows.
-	(make_icon_window): Build a window with an icon in it.
-	(bind_for_toplevel_only): Local copy, because if you build
-	GDB without IDE you won't get the one in libide.
-
-	* main.tcl: Remove all the source commands.
-
-	* toolbar.tcl: Use "-menu" configuration option for toplevel.
-
-	* images/cygnus_icon.gif: A cygnus logo with GDB on it.
-	For Unix window managers.
-	
-Fri Aug  8 16:01:20 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* manage.tcl (manage): Add menu subcommand.
-	(manage_init): Add -menu, -menuname, and -idemenuname options for
-	all the windows.
-	(manage_create): Register transient windows.
-	(manage_menu, manage_register_default): New procedures.
-	* toolbar.tcl (build_win): Call manage_menu to set up the window
-	menu.
-
-Thu Aug  7 16:51:43 1997  Martin M. Hunt  <hunt@cygnus.com>
-
-	* stack.tcl: Bind button 1 to select current
-	frame.  Add balloonhelp.
-
-Thu Aug  7 14:00:18 1997  Martin M. Hunt  <hunt@cygnus.com>
-
-	* main.tcl, manage.tcl, toolbar.tcl: Add support
-	for stack window.
-
-	* stack.tcl, images/stack.gif: New files.
-
-	* ALL: Change "::" to "@@" for itcl1.5/tcl8.0. You
-	muct now use tcl8 for gdbtk to work.
-
-Tue Aug  5 12:10:43 1997  Martin M. Hunt  <hunt@cygnus.com>
-
-	* register.tcl, global_pref.tcl: Change color "darkred"
- 	to red so it will work on windows.
-
-Tue Aug  5 12:01:26 1997  Martin M. Hunt  <hunt@cygnus.com>
-
-	* manage.tcl (manage_init): Unset prefs are now ""
-	instead of 0.
-
-Tue Aug  5 02:21:47 1997  Martin M. Hunt  <hunt@cygnus.com>
-
-	* images*/run.gif: Change to green again.
-
-Tue Aug  5 01:42:56 1997  Martin M. Hunt  <hunt@cygnus.com>
-
-	* main.tcl: Source register.tcl
-
-	* register.tcl: New file. Editable register window
-	and register preferences.
-
-	* toolbar.tcl: Add hooks for register prefs.
-
-	* manage.tcl: Add register window to list of windows.
-	Deiconify windows when requested.
-
-	* src.tcl: Minor changes.
-
-	* global_pref.tcl: Bind return key to image dir entry 
-	widget.
-
-	* prefs.tcl: Add register prefs to notebook widget.
-	Change default for pref get to {} instead of 0.
-	
-Fri Aug  1 14:21:25 1997  Martin M. Hunt  <hunt@cygnus.com>
-
-	* images/*: Smaller toolbar icons. Fix some gifs
-	to be transparent.
-
-Thu Jul 31 01:20:51 1997  Martin M. Hunt  <hunt@cygnus.com>
-
-	* src.tcl (mode): Don't try to display EDIT button
-	in any mode.
-
-Thu Jul 31 00:56:26 1997  Martin M. Hunt  <hunt@cygnus.com>
-
-	* global_pref.tcl (build_win): Add ComboBox for simple font selection.
-
-	* prefs.tcl (pref_init): Allow "option" commands in init file.
-
-	* src.tcl: Remove EDIT button. Change fonts to use global font if
-	no src font is specified.
-	
-	* toolbar.tcl: Enable Tools/Edit pulldown menu.
-
-Wed Jul 30 14:43:49 1997  Martin M. Hunt  <hunt@cygnus.com>
-
-	* about.tcl (build_win): Set bg to white for Cygnus gif.
-
-Wed Jul 30 14:39:49 1997  Martin M. Hunt  <hunt@cygnus.com>
-
-	* manage.tcl (manage_create): Fix window raising.
-
-Wed Jul 30 13:40:11 1997  Martin M. Hunt  <hunt@cygnus.com>
-
-	* initial checkin.
-
diff --git a/gdb/gdbtk/library/ChangeLog-1998 b/gdb/gdbtk/library/ChangeLog-1998
deleted file mode 100644
index e44f3fc7a2a..00000000000
--- a/gdb/gdbtk/library/ChangeLog-1998
+++ /dev/null
@@ -1,3486 +0,0 @@
-Mon Dec 21 14:12:14 1998  Keith Seitz  <keiths@cygnus.com>
-
-	* manage.tcl (manage_create): Set window geometry after window is
-	created.
-
-	* prefs.tcl (pref_save): Save out preferences for memory window, too.
-
-Thu Dec 17 08:54:37 1998  Keith Seitz  <keiths@cygnus.com>
-
-        * browser.tcl (fill_source): Strip off any function args
-        which could arise from C++ function names.
-        (search): Be careful of C++ functions with spaces in the name
-        returned from gdb_search.
-
-Tue Dec 15 13:24:42 1998  Keith Seitz  <keiths@cygnus.com>
-
-	* prefs.tcl (escape_value, unescape_value): New procs to
-	escape equal signs in preference values.
-	(pref_read): Use unescape_value whenever prefs are read.
-	(pref_save): Use escape_value whenever prefs are saved..
-
-Tue Dec 15 11:07:01 1998  Keith Seitz  <keiths@cygnus.com>
- 
-        * process.tcl (build_win): Do not export the listbox's selection
-        as the X selection so that multiple listboxes can have selections
-        highlighted at the same time.
- 
-        * stack.tcl (build_win): Ditto.
- 
-Mon Dec 14 15:53:38 1998  Keith Seitz  <keiths@cygnus.com>
- 
-        * watch.tcl (update): Catch errors to getLocals, which could error
-        if no symbol table is loaded.
- 
-        * locals.tcl (update): Ditto.
- 
-1998-11-17  Fernando Nasser  <fnasser@totem.to.cygnus.com>
-
-	* kod.tcl: fix <Double-1> command spec for listbox.
-
-1998-11-13  Martin M. Hunt  <hunt@cygnus.com>
-
-	* srctextwin.tcl (bp): Pass "asm" argument to do_bp.
-	(do_bp): Use asm argument to determine whether to
-	check for multiple bps on the same src line. Remove
-	redundant "if" statement.
-
-1998-11-12  Martin M. Hunt  <hunt@cygnus.com>
-
-	* srctextwin.tcl (do_bp): Fix multiple assembly
-	breakpoints mapping to the same line number.
-
-Thu Nov 12 15:20:15 1998  Jim Ingham   <jingham@cygnus.com>
-
-	* console.tcl (complete): I added the ability to pass from_tty 
-        from gdb_cmd to the underlying commands.  Pass 1 when the
-	command is invoked from the console.
-
-	* interface.tcl (gdbtk_tcl_tstart, gdbtk_tcl_tstop): Run the
-	src window's do_tstop method rather than manipulating the 
-	widgets by hand.
-
-	* src.tcl (build_win): Redo the packing so that the function
-	combobox doesn't push all the other combo-boxes off the screen
-	if it has a very long function name in it.
-
-	* srcbar.tcl (do_tstop): Added a mode that just changes the
-	GUI, which can be called from console hooks.
-
-	* srctextwin.tcl: Fixed some bugs I introduced in setting
-	breakpoints in the assembly & mixed mode windows.  Dropped
-	the notion of joint breakpoint images for lines that have 
-	breakpoints of two separate types.  Too fragile.
-        Also added the "dont_change_appearance" flag, used in the
-	continue_to_here method to tell the GUI not to reflect the
-	temporary disabling of all the breakpoints.
-	
-	* toolbar.tcl (insert_buttons): Added a little more error-checking.
-
-Wed Nov 11 08:40:04 1998  Fernando Nasser  <fnasser@cygnus.com>
-
-	* kod.c: adjusted sizes and packing options of widgets
-
-1998-11-10  Fernando Nasser  <fnasser@totem.to.cygnus.com>
-
-	* main.tcl: small fix to the kod code as requested by the maintainers
-	* kod.tcl: use show kod and info <kod cmd> as per spec
-
-Mon Nov  9 17:00:45 1998  Fernando Nasser  <fnasser@cygnus.com>
-
-	* kod.tcl: New file that implements the Kernel Object Display window
-	* Makefile: added kod.tcl
-	* main.tcl: test for kod support
-	* manage.tcl (manage_init): support for kod
-	* prefs.tcl (pref_save, pref_set_defaults): ibid
-	* scrtextwin.tcl (config_win, do_key): ibid
-	* toolbar.tcl (_load_images, create_window_buttons,
- 	create_view_menu): ibid
-	* tclIndex: regen
-
-Mon Nov  9 12:09:48 1998  Michael Snyder  <msnyder@cleaver.cygnus.com>
-
-	* actiondlg.tcl: Customize the stack collect string to collect
-        the FP reg plus 64 words of stack mem.  This will work for many
-        targets.  As noted in earlier comment, we need a way to configure
-        this to the specific target.
-
-Wed Nov  4 12:41:42 1998  Jim Ingham  <jingham@cygnus.com>
-
-	* actiondlg.tcl: Get the stack collect string from an instance 
-	variable.  Need to implement some way to get this from the
-	target settings...
-	* global_pref.tcl (toggle_tracing_mode): Add & remove hooks
-	when you go in and out of tracing mode.  Also reset the B1
-	behavior when you leave tracing mode
-	* interface.tcl (gdbtk_tcl_trace_find_hook): Added the trace
-	find hook, so you can switch the GUI state when the tfind
-	command is used to enter & leave browse mode.
-	* srcbar.tcl (constructor, destructor trace_find_hook): Added
-	the trace_find_hook to the source toolbar, and added the
-	necessary hooks to handle it.
-	* srctextwin.tcl (trace_find_hook): Added a trace find hook to 
-	the sourcebar as well.
-	* stack.tcl (update): protect against errors in gdb_stack.
-	Just return "NO STACK" if we couldn't get it.
-	* src_pref.tcl (constructor, cancel): Put all the saved prefs
-	in an array, on cancel, see if any have changed and only
-	rebuild the window if there have been changes.
-
-1998-11-03  Keith Seitz  <keiths@cygnus.com>
-
-	* target.tcl: Add ice target.
-	(GdbLoadPref): Add "after_attaching" preference.
-	(set_saved): Add "after_attaching" preference.
-	(write_saved): Add "after_attaching" preference.
-	(change_target): Add "after_attaching" preference.
-	(build_win): Add "after_attaching" entry to options
-	frame.
-
-	* main.tcl (set_target_name): Add ice target.
-	(set_target): If an "after_attaching" preference exists,
-	run it.
-	
-Mon Nov  2 13:24:10 1998  Jim Ingham  <jingham@cygnus.com>
-
-	* bp.tcl (update): The hook function was passing more
-	arguments than this function expected.
-
-Mon Nov  2 11:16:10 1998  Jim Ingham  <jingham@cygnus.com>
-
-	* toolbar.tcl: Added Tdump image.	
-
-Fri Oct 30 17:36:05 1998  Jim Ingham  <jingham@cygnus.com>
-
-	* src.tcl (set_execution_status): Changed status messages,
-	tracing is not the same as async debugging...
-
-Fri Oct 30 17:06:31 1998  Jim Ingham  <jingham@cygnus.com>
-
-	* bp.tcl (bp_all): Only remove tracepoints in the tracepoint
-	window, and breakpoints in the breakpoint window.
-	
-Fri Oct 30 11:22:23 1998  Jim Ingham  <jingham@cygnus.com>
-
-	* actiondlg.tcl: Added special tag "Collect Stack".  This
-	still needs to get hooked into the target database to deal
-	with targets that need to do something special to collect the
-	stack.  Also moved some repeated code into loops.
-	* main.tcl (source_file): Source in a file of gdb commands.
-	* srcbar.tcl (constructor): Added source file menu entry, and
-	made stack buttons belong to both the Trace & Control classes.
-	* srctextwin.tcl (constructor): One too many separators in the 
-	trace trace popup menu.
-	* tclIndex: regenerated.
-	* tfind_args.tcl: Added "tfind frame"
-	* toolbar.tcl (create_button): Allow a button to belong to
-	more than one class.
-	* toolbar.tcl (enable_ui): Eliminate redundant code, and allow 
-	a button to belong to more than one class.
-	* toolbar.tcl (create_trace_menu): Added save tracepoints &
-	Tfind frame menu items.
-	* tracedlg.tcl: Added deletion of actions, and fixed a
-	the whiile-stepping combobox callback for the new combobox.
-	* util.tcl (save_trace_commands): new proc. 
-	 
-1998-10-29  Michael Snyder  <msnyder@demo-laptop2.cygnus.com>
-
-	* target.tcl: add /dev/cua0 for Linux.
-
-Tue Oct 27 13:46:03 1998  Jim Ingham  <jingham@cygnus.com>
-
-	* Many little bug fixes all over in order to get tracing to work 
-        along with normal program control.
-	* toolbar.tcl: Rewrote much of the code here to put commonly
-	used code into functions, and clean up adding menus and
-	buttons.  Added the ability to disable particular menu items,
-	not just whole menus.  Added the ability to delete and insert
-	buttons on the fly.
-	* srcbar.tcl: Pushed the changes to toolbar.tcl into this file.
-	* srctextwin.tcl: Changed the code dealing with breakpoints
-	and tracepoints to use the text tags more consistently.  Use
-	only one set of menus for the whole widget, rather than having
-	a separate set for the SRC+ASM case.  Rewrote a lot of the
-	code to separate out the tracing & program control functions.
-	* interface.tcl (gdbtk_tcl_breakpoint): pass more information
-	to the scrtextwin when a breakpoint changes state, so it can
-	do the right thing without having to guess...
-	* tracedlg.tcl (build_win): get the packing right so the
-	window expands correctly.
-	* main.tcl: do_tstop -> tstop,  do_tstart -> tstart to avoid
-	confusion with the methods in ScrBar.tcl.
-	* prefs.tcl: Added two new preferences B1_Behavior to control
-	whether B1 sets breakpoints or tracepoints.
-	* src_prefs.tcl: Put in support for the B1_Behavior.
-        * global_prefs.tcl: Put back tracing checkbox.
-        * tdump.tcl: Fixed an incorrect (1 rather than 1.0) text
-	widget line specification.
-	* tfind_args.tcl (build_win): Bind return in the entry to the
-	OK button.  Clear the entry field if the Type has changed. 
-	* utils.tcl: Added comments for the debug commands.
-	* watch.tcl (build_win): Flash the OK button before invoking it.
-
-Wed Oct 28 16:19:57 1998  Martin M. Hunt  <hunt@cygnus.com>
-
-	* srctextwin.tcl: Changed the _map cache to use
-        the variable Cname instead of the kludgy upvar alias.
-
-Mon Oct 26 21:08:54 1998  Martin M. Hunt  <hunt@cygnus.com>
-
-	* srctextwin.tcl (motion): Show breakpoint balloons
-	even when not running.
-	(showBPBalloon): Check for null before displaying.
-
-Wed Oct 21 10:05:17 1998  Martin M. Hunt  <hunt@cygnus.com>
-
-	* images/kod.gif: Added temporary kernel object display icon.
-
-Wed Oct 14 17:30:07 PDT 1998  Jim Ingham  <jingham@cygnus.com>
-
-	* main.tcl (gdbtk_tcl_preloop): Fixed the code to set gdb_exe_name.
-	I seem to have dropped a variable...
-	* main.tcl (_open_file): Make the open file dialog truely
-	modal on windows.
-
-Wed Oct 14 14:29:17 1998  Martin M. Hunt  <hunt@cygnus.com>
-
-	* target.tcl: Change default runlist for remote
-	targets to download.
-	(build_win): Add user-defined list of functions for
-	initial breakpoints.
-     
-	* main.tcl (run_executable): Set user-defined initial
-	breakpoints.
-
-	* prefs.tcl (pref_set_defaults): Define new prefs 
-	gdb/load/bp_at_func and gdb/load/bp_func. These are
-	user-defined initial breakpoints.
-	
-Sat Oct 10 00:21:44 1998  Martin M. Hunt  <hunt@cygnus.com>
-
-	* help/source.html: Add new images, add description of changes
-	to breakpoints and threads support.  Fix typos.
-
-	* help/memory.html: Cleanup and add new information.
-
-	* help/breakpoint.html: Reformat.
-	
-	* help/images: Add a bunch of new GIFs.
-
-1998-10-08  Keith Seitz  <keiths@cygnus.com>
-
-	* main.tcl (run_executable): Do not call set_exe here, either.
-        (_open_file): Add some comments about using set_exe
-        here instead of in download_it and run_executable. Do not look
-        for main, either, since the file hooks will take care of that.
-
-	* interface.tcl (gdbtk_tcl_pre_add_symbol): Do not reset the
-        source windows here -- only show the user what is going on.
-        (gdbtk_tcl_post_add_symbol): Force the source windows' file
-        comboboxes to refill, since adding a symbol file may actually
-        expand the debugger's view of the world.
-        (gdbtk_tcl_file_changed): New hook proc. Called by file_changed_hook
-        in symfile.c, this hook will cause the source window to point
-        to main/entry. gdbtk_tcl_exec_file_display actually sets up
-        gdbtk for this.
-        (gdbtk_tcl_exec_file_display): Renamed from
-        gdbtk_tcl_exec_file_changed for clarity. This hook is called
-        from exec_file_display_hook in exec_file_command. This function
-        sets up gdbtk to use a new executable, including resetting the
-        debugger's state and source window(s). See comments in this file
-        for more information.
-
-	* download.tcl (download_it): Don't call set_exe here and
-        do not touch state variables gdb_target_changed -- run_executable
-        will do it. (In short, make download_it one step closer to only
-        doing the download!)
-
-1998-10-08  Keith Seitz  <keiths@cygnus.com>
-
-	* variables.tcl (UnEdit): Fix quoting problems so that arrays may be
-        inspected/edited.
-        (edit): Ditto.
-
-Wed Oct  7 16:03:00 1998  Martin M. Hunt  <hunt@cygnus.com>
-
-	* srctextwin.tcl (reconfig): Fix bindings.
-
-Wed Oct  7 13:07:00 1998  Martin M. Hunt  <hunt@cygnus.com>
-
-	* manage.tcl (manage_create): Bind ALL source windows
-	Map and Unmap events.
-	(manage_delete): Small optimization.
-	(manage_iconify): When the last source window is iconified,
-	iconify all the support windows too.  When any source
-	window is deiconified, deiconify everything.
-
-	* src.tcl (destructor): Destroy SrcTextWin too. 
-
-Tue Oct  6 23:00:08 1998  Martin M. Hunt  <hunt@cygnus.com>
-
-	* src.tcl (set_status): Display only the first line of
-	the message.
-	(build_win): Configure status window to a height of 1.
-
-	* srcbar.tcl (create_menu_items): Change "Open..."
-	menu item to call _open_file proc. Remove old
-	_open_file method.
-
-	* main.tcl (run_executable): If the run command fails
-	with a result of "No executable" then call _open_file.
-	(_open_file): New proc. Opens a file requester and 
-	sets the executable name to the selected file.
-
-	* toolbar.tcl (create_menu_items): Add "..." to Source
-	and Global prefs menu item.
-
-Mon Oct  5 21:10:30 1998 Jim Ingham    <jingham@cygnus.com>
-
-	* srctextwin.tcl (set_tracepoint):  The filename variable 
-	changed to current(filename) but this use was not updated.
-
-	* global_prefs: Added a global preference to turn on the 
-	tracing.  It only sets the tracing preference, and does
-	not cause gdb to relayout the toolbar yet...
-
-	* util.tcl: Fixed the comments for the little debug
-	thingie.
-
-	* util.tcl (auto_step): Added a way to cancel the
-	auto_stepping.  This is not currently used, but with this
-	it could be...
-
-Mon Oct  5 00:43:11 1998  Martin M. Hunt  <hunt@cygnus.com>
-
-	* srctextwin.tcl (SrcTextWin): Create a threaded image
-	with a color of [pref get gdb/src/thread_fg].
-	(bind_src_tags): Bind bp_tag <Motion> and <Leave> for
-	balloon help on breakpoints.
-	(config_win): A bunch of binding changes to support
-	balloon help breakpoints and setting multiple BPs
-	on a line. Add menu item for thread specific BPs.
-	(reconfig): Similar changes as above.
-	(register_balloon): Remove.
-	(updateBalloon): Cleanup and don't call register_balloon.
-	(do_bp): When a BP is deleted, call gdb_find_bp_at_line()
-	to see if there are any more BPs at the same line number.
-	Add "thread" BP type.
-	(bp_line): Accept an optional list of thread numbers to 
-	set BPs on. Loop through the list setting BPs on each thread.
-	(motion): Accept a window and type argument. Call 
-	showBPBalloon in type is not "var".
-	(showBPBalloon): New method.Opens a balloon with breakpoint
-	info in it.
-	(showballoon): Accept window parameter.
-	(ask_thread_bp): New. A thread selector dialog. Opens
-	a scrolled listbox with a list of threads and allows
-	the user to multiselect threads to set BPs on.
-	(do_thread_bp): New callback from ask_thread_bp()
-	listbox.
-
-	* src_pref.tcl: Replace disabled color selector with thread
-	fg selector.  Disabled color should probably always be
-	black anyways.
-
-	* util.tcl (CygScrolledListbox): Temporary simple scrolled
-	listbox. Replace with a better one soon.
-
-	* prefs.tcl (pref_set_defaults): Set default for thread fg.
-
-	* bp.tcl (bp_add): For thread BPs, set the button color
-	correctly.
-
-	* tclIndex: Rebuilt.
-
-Fri Oct  2 17:07:32 1998   Jim Ingham   <jingham@cygnus.com>
-
-	* util.tcl (debug namespace): Added helper functions
-	"trace_var", "remove_trace" & "remove_all_traces" which
-	watch a variable, and dump the stack, and its value when
-	it is touched...  They are in the "debug" namespace.
-	*tclIndex: regenerate index.
-
-Fri Oct  2 14:02:25 1998   Jim Ingham   <jingham@cygnus.com>
-
-	* main.tcl (gdbtk_tcl_preloop): Catch the error when no file
-	is given on the command line.
-
-1998-10-02  Keith Seitz  <keiths@cygnus.com>
-
-	* srcbar.tcl (_open_file): Call SrcWin::point_to_main.
-	(_set_runstop): Catch the stop in case the user
-	aborts a session.
-
-	* srctextwin.tcl (destructor): New. Remove all previously added
-	hooks.
-	
-	* src.tcl (point_to_main): New function. I got tired of typing
-	the same five lines over and over again.
-
-	* main.tcl (set_baud): Target baud preferences are stored as 
-	[target name]-baud, not [target name]/baud.
-	(run_executable): Call SrcWin::point_to_main.
-	(gdbtk_tcl_preloop): Call SrcWin::point_to_main.
-
-	* interface.tcl (gdbtk_tcl_pre_add_symbol): Use "update idletasks", not
-	just "update".
-	(gdbtk_tcl_post_add_symbol): Rewrite to have better behavior
-	for symbol files which have been loaded. Use a small hack to work
-	with gdbtk_tcl_exec_file_changed so that we look for main only
-	when a new executable is loaded.
-	(gdbtk_tcl_exec_file_changed): New proc to do some necessary
-	setup when an exec file changes.
-
-	* tclIndex: Regenerate.
-
-Fri Oct  2 11:40:05 1998  Martin M. Hunt  <hunt@cygnus.com>
-
-	* Makefile (TCL): Add modal.tcl.
-
-	* tclIndex: Rebuilt.
-
-1998-10-02  Keith Seitz  <keiths@cygnus.com>
-
-	* srcbar.tcl (_set_runstop): Catch the stop in case the user
-	aborts a session.
-
-Thu Oct  1 18:58:11 1998 Jim Ingham    <jingham@cygnus.com>
-
-	* main.tcl (gdbtk_tcl_preloop): We were using lindex on the
-	return value from info files, but if the directory had a space
-	in it, then the result was not a proper Tcl list, and so the
-	command would fail.  Use regexp instead...	
-
-Thu Oct  1 17:21:26 1998 Jim Ingham    <jingham@cygnus.com>
-
-	* download.tcl (download_it): One more place where we used
-	"Foundry_Debugger" unconditionally...  Stamped out.
-
-	* main.tcl (set_target): Don't put the "Trying to
-	communicate..." message in the window title, put it in the
-	status area, and remember to remove it when you are done.
-
-Wed Sep 30 21:32:39 1998 Jim Ingham    <jingham@cygnus.com>
-
-	* srctextwin.tcl (insertBreakTag): There was a bug in the
-        method of inserting break tags.  If a tag of the intended
-        type did not already exist, insertBreakTag would not set it.
-	This method is a little less flexible, but actually works 
-	for all our uses.
-
-Wed Sep 30 19:42:43 1998 Jim Ingham    <jingham@cygnus.com>
-
-	* src.tcl (set_execution_status): When the program has
-        terminated, most stubs detach.  Then we need to set 
-        gdb_target_changed here so gdb will know to reattack when
-        you press the Run button.
-
-	* memory.tcl (update_address): We caught the gdb_eval when you 
-	give an address expression, but then only trapped the case
-	where you gave an invalid address or non-existant symbol.
-	Trap all the other errors as well...
-
-Wed Sep 30 16:55:53 1998  Martin M. Hunt  <hunt@cygnus.com>
-
-	* bp.tcl: Add optional "thread" column and menu items
-	to turn it on and off.
-
-	* prefs.tcl (pref_set_defaults): Add gdb/bp/show_threads
-	preference used for toggling the display of the thread
-	column in the BP window.  Default is 0 (off).
-	
-1998-09-28  Keith Seitz  <keiths@cygnus.com>
-
-	* download.tcl (download_it): Don't download if there is no executable...
-
-Mon Sep 28 14:23:39 1998   Jim Ingham    <jingham@cygnus.com>
-
-	* modal.tcl: NEW FILE.  Had to fix a bug in the dialogs
-        so I made a sub-class: ModalDialog.  The bug was that
-	manage.tcl sets the WM_DELETE_WINDOW handler to be
-	"manage delete" of the window, which is wrong for these
-	windows, they need to unpost themselves first.  Override
-	this in the post method.
-	* mem_pref.tcl: Subclass & remove the code that went into
-	the ModalDialog class.
-	* target.tcl: ditto.
-        * tclIndex: regenerate for the new class.
-
-Fri Sep 25 19:01:32 1998   Jim Ingham    <jingham@cygnus.com>
-
-	* utils.tcl (freeze): Hacked the freeze method so that it comes closer
-        to working on Windows, but it still flashes.  Use a post
-	method, like that im mem_prefs.tcl or target.tcl instead.
-        * mem_pref.tcl (post): Added post method, so you can use the
-	Windows EnableWindow call without sending your app into the
-	background when the dialog is dismissed.
-        * target.tcl (post): Added the same method to this class.
-	Really should subclass these.  Will do this when we rework the 
-	class hierarchy for Itcl3.0.
-	* memory.tcl (create_prefs): Use the new post method. 
-	* main.tcl (set_target_name): Use the post method rather than
-	freeze.
-
-1998-09-25  Keith Seitz  <keiths@cygnus.com>
-        * main.tcl (set_baud): Baud rates are saved in gdb/load/target-baud,
-        not gdb/load/target/baud.
-        (set_target): Attempt to silently detach before attaching.
-
-        * target.tcl: Add gdb_target entries for Angel and ARM Remote
-        protocols.
-
-1998-09-18  Keith Seitz  <keiths@cygnus.com>
-
-	* interface.tcl (gdbtk_tcl_post_add_symbol): Force the source window
-	to 'main'; if that fails, let gdb guess based on stop_pc.
-
-1998-09-04  Keith Seitz  <keiths@cygnus.com>
-
-	* srctextwin.tcl (SrcTextWin::destructor): Define and remove
-	previously installed hooks.
-
-	* browser.tcl (get_selection): Listbox indices start at zero!
-	Clear the selection if the user clicks below the last visible
-	item in the listbox.
-
-Thu Sep  3 16:43:43 1998  Jim Ingham   <jingham@leda.cygnus.com>
-
-	* mem_prefs.tcl: Fixed the size & format radiogroups in 
-	the memory preferences so that they match the format
-	options being sent to it by the memory window.  Also 
-	greyed out the format box when float or double is selected.
-	Also made sure we didn't re-enable any disabled widgets in 
-	the idle function.
-
-Sun Aug 30 00:40:28 1998  Martin M. Hunt  <hunt@cygnus.com>
-
-	* process.tcl: New file.  Implement a process/thread selection
-	and display window.
-	
-	* srctextwin.tcl (do_key): Add entry for thread/process 
-	window.
-	(config_win): Bind "Thread List" to Control-H.
-	(FillSource): Fix bug when source is not found.
-	
-	* toolbar.tcl (create_menu_items): Add Thread List to menu
-	
-	* manage.tcl (manage_init): Add process window to
-	managed array.
-
-	* prefs.tcl (pref_save): Add "process" to window types to save.
-	
-	* Makefile: Add process.tcl
-
-	* tclIndex: Rebuilt
-	
-1998-08-28  Keith Seitz  <keiths@cygnus.com>
-
-	* variables.tcl (edit): Format data so that C arrays are not
-	mistaken for tcl commands.
-	(UnEdit): Ditto.
-
-Thu Aug 27 14:13:09 1998  Martin M. Hunt  <hunt@cygnus.com>
-
-	* main.tcl (run_executable): If the target is "sim"
-	then the pref "sim-opts" should be treated as target
-	options instead of command line arguments.
-
-Wed Aug 26 00:06:11 1998  Martin M. Hunt  <hunt@cygnus.com>
-
-	* src.tcl (mode): Set the mode widget using entryset.
-	(build_win): Use default combobox selectbackground.
-
-	* srctextwin.tcl (FillMixed): Better error handling.
-	(LoadFIle): Stop harrassing users with worthless dialog boxes.
-	
-	* main.tcl (run_executable): Set args when arguments are
-	given in the target dialog.
-
-	* helpViewer.tcl (insertHtml): Window may have been
-	closed while waiting for HTMLparse, so catch next commands
-	to prevent error message.
-
-	* images/stack.gif: Use the image from images2 because
-	it looks better.
-	
-Tue Aug 25 16:09:02 1998  Martin M. Hunt  <hunt@cygnus.com>
-
-	* src.tcl (build_win): Change fonts on comboboxes to src-font.
-
-	* global_pref.tcl: Change to new combobox.
-
-Tue Aug 25 11:41:43 1998  Martin M. Hunt  <hunt@cygnus.com>
-
-	* srctextwin.tcl (insertBreakTag): Take an index
-	instead of a linenumber. Check for bp_tag and break_tag.
-	(display_breaks): Reset all lines back to break_tag
-	after deleting bp image. Fixes caching bug.
-	(do_bp): Fix up calls to insertBreakTag.
-
-Fri Aug 21 12:44:25 1998  Martin M. Hunt  <hunt@cygnus.com>
-
-	* target.tcl (build_win): Remove tix stuff. Set maxheight
-	of comboboxes to 10.  Remove all code to count elements
-	in comboboxes because the new one does it for us.
-	(fill_rates): Remove combobox height configure code.
-	(fill_targets): Same.
-
-	* src.tcl (build_win): Change combobox -height to
-	-maxheight for combobox 1.05.
-	(name, goto_func): Use combobox entryset instead of SetSilent.
-	(SetSilent): Deleted.
-
-	* srctextwin.tcl (FillSource): Fix change mode call when
-	no source is found.
-
-1998-08-20  Keith Seitz  <keiths@cygnus.com>
-
-	* srctextwin.tcl (print): New method. Moved from src.tcl.
-
-	* srcbar.tcl (create_menu_items): Add page setup for non-ide again..
-
-	* src.tcl (build_win): Fix balloon help for new comboboxes.
-	(print): Move guts to srctextwin and invoke that method.
-
-	* target.tcl: Remove protected variable tcpmode.
-	Add "options" member for sim and exec targets. For sim, this is
-	options to pass to the simulator; for exec, command line arguments.
-	(build_win): Replace tix comboboxes with one from libgui.
-	(set_saved): Add target-options when appropriate.
-	(write_saved): Add target-options when appropriate.
-	(fill_rates): Modify to work with new combobox.
-	(fill_targets): Modify to work with new combobox.
-	(config_dialog): New method which maps/unmaps/relabels comboboxes
-	and entries for each target.
-	(change_target): Remove all code pertaining to mapping/unmapping/relabeling
-	comboboxes and entries and call config_dialog instead.
-	(change_baud): Remove all code pertaining to mapping/unmapping/relabeling
-	comboboxes and entries and call config_dialog instead.
-
-	* console.tcl (Console): Add key binding for TAB completion.
-	(find_lcp): New helper method for find_completion.
-	(find_completion): New helper method for complete.
-	(complete): New method (bound to tab key) which computes the completion
-	of the current command line.
-	(reset_tab): New method to reset the tab completion whenever a key
-	is pressed (forces complete to recompute the completions instead of
-	printing out the last list of completions).
-
-1998-08-18  Keith Seitz  <keiths@cygnus.com>
-
-	* stack.tcl (update): Use new built-in command gdb_stack for
-	backtraces.
-	Use the global gdb_selected_frame_level to figure out which
-	line in the listbox should be highlighted.
-	ALWAYS highlight the selected frame.
-	Put a fencepost arount update so that we can prevent it from
-	being called twice when change_frame is used.
-	(change_frame): Protect call to gdbtk_update so that this object is
-	not updated twice.
-
-	* srctextwin.tcl (config_win): Copy the properties of the selection tag
-	into a new "search" tag that will be used by the search widget.
-	(search): Use the defined "search" tag to highlight found text.
-	Remove all search-tagged text from the window when an empty expression
-	is entered.
-
-Mon Aug 17 14:27:54 1998  Martin M. Hunt  <hunt@cygnus.com>
-
-	* main.tcl (do_tstop): Require combobox package.
-
-	* src.tcl (build_win): Use new combobox.
-	(name): Changes for new combobox.
-	(goto_func): Changes for new combobox.
-	(FillNameCB): Changes for new combobox.
-	(FillFuncCB): Changes for new combobox.
-	(SetSilent): New method, like tixSetSilent.
-	(mode): Changes for new combobox.
-	(set_name): Changes for new combobox.
-	(reset): Changes for new combobox.
-
-	* srctextwin.tcl (FillSource): Call parent's mode method when
-	mode is changed to assembly.
-	(location): Call display_breaks only if flag is set.
-	(LoadFIle, FillAssembly, FillMixed): Set display_breaks flag.
-	(display_breaks): Set all breakpoints in a single pass.
-	(insertBreakTag): Check $stop before trying to remove tag.
-
-Mon Jul 27 12:35:31 1998  Martin M. Hunt  <hunt@cygnus.com>
-
-	* interface.tcl (gdbtk_tcl_tracepoint): Make function match C 
-	implementation by adding pass_count.
-
-Sat Jul 25 22:40:49 1998  Martin M. Hunt  <hunt@cygnus.com>
-
-	* manage.tcl (manage_init): Change "loadpref" to "targetsel" 
-	and change class name to TargetSelection. This avoids confusion
-	with the IDE GdbLoadPref class.
-	* target.tcl (TargetSelection): Change class name.
-	* main.tcl (set_target_name): Change "loadpref" to" targetsel"
-
-Fri Jul 24 14:37:49 1998  Keith Seitz  <keiths@cygnus.com>
-
-	* util.tcl (bp_exists): New procedure.
-	* srctextwin.tcl (SrcTextWin::constructor): Add public vars
-	"parent" and "ignore_var_balloons" and initialize accordingly.
-	(config_win): Add binding for browser.
-	Add binding for up/down arrows to scroll more naturally.
-	(do_key): Add browser entry.
-	* browser.tcl: Add srctextwin into browser.
-	* prefs.tcl (pref_set_defaults): Add new preferences for the func
-	browser.
-	* tclIndex: Regenerate.
-	
-Fri Jul 24 00:53:28 1998  Martin M. Hunt  <hunt@cygnus.com>
-
-	* srctextwin.tcl (SrcTextWin): Initialize LineNums.
-	(setTabs): Set tabs correctly when in assembly mode
-	or when there are no linenumbers.
-	(bind_src_tags): Remove lineNum_tag bindings.
-	(config_win): Remove lineNum_tag and line_tag. Set
-	linenumbers to break_tag and bp_tag instead.
-	(FillAssembly): Don't use lineNum_tag.
-	(FillMixed): Don't use line_tag.
-	(LoadFile): Use new protected variable LineNums.
-	(insertBreakTag): Instead of trying to calculate the
-	correct location of the new tag, simply ask the widget
-	where the old one was.
-	(do_bp): Call insertBreakTag when bps are deleted.
-
-	* src.tcl (FillNameCB): Call gdb_listfiles with [pwd].
-
-Sat Jul 18 13:27:20 1998  Martin M. Hunt  <hunt@cygnus.com>
-
-	* src.tcl (location): Change BROWSE_TAG to STACK_TAG.
-
-	* interface.tcl (gdbtk_quit): New function.  Called by
-	cleanup code in GDB.
-
-Fri Jul 17 00:03:43 1998  Martin M. Hunt  <hunt@cygnus.com>
-
-	* memory.tcl (build_win): Change address controlbox to
-	call update_address_cb.
-	(update_address_cb): New method. Handle address
-	controlbox callbacks. Set flag and call update_address.
-	(update_address): Call BadExpr on bad expressions.
-	 Use local variable "ae" to set public variable addr_exp. 
-	This fixes bug where widget forgets its address when 
-	reconfigured. Set table background white when expression
-	is OK.
-	(BadExpr): When a bad expression is entered, create a
-	messagebox and set the table bg to gray.
-
-	* mem_pref.tcl (apply): Remove mystery debug line.
-	
-Thu Jul 16 16:56:12 1998  Jim Ingham    <jingham@cygnus.com>
-
-        * download.tcl, ide.tcl, interface.tcl, main.tcl, manage.tcl
-        srcbar.tcl, toolbar.tcl: Merged the IDE changes back into devo.
-
-Mon Jul 13 14:34:45 1998  Jim Ingham    <jingham@cygnus.com>
-
-	* mem_pref.tcl (destructor): Remember to delete the variable
-        trace that implements the  entry widget checking.
-
-Fri Jul 10 19:17:53 1998  Jim Ingham    <jingham@cygnus.com>
-
-	* mem_pref.tcl: Changed the number of bytes entry widget so
-	that it only accepts +'ve integers, and protect against the
-	case where the user deletes the contents of this entry, then
-	closes the window.  Also made the entry disabled when the
-	other radio button is selected.
-
-Wed Jul  8 23:20:33 1998  Martin M. Hunt  <hunt@cygnus.com>
-
-	* srctextwin.tcl (FillSource): Fix code that
-	detects when no line numbers are available and we must use
-	assembly mode.
-
-Mon Jul  6 17:53:50 1998  Jim Ingham    <jingham@cygnus.com>
-
-	* download.tcl, helpViewer.tcl, html_library.tcl, memory.tcl,
-        register.tcl, src.tcl, srctextwin.tcl, target.tcl,
-	tracedlg.tcl, util.tcl, variables.tcl, warning.tcl, watch.tcl:
-	With the Tcl 8.0 compiler, expr commands are more efficient if 
-	you use:
-	    expr {$foo + $bar}
-        instead of:
-	    expr $foo + $bar
-        So I changed all the uses of expr to this form.
-
-
-Mon Jul  6 15:19:59 1998  Martin M. Hunt  <hunt@cygnus.com>
-
-	* srctextwin.tcl (FillSource): Call Parent's mode method
-	to combobox will be updated.
-	* src.tcl (mode): Pass along second argument to mode_set.	
-
-Wed Jul  1 15:09:47 1998  Martin M. Hunt  <hunt@cygnus.com>
-
-	* srctextwin.tcl (location): Add missing parameter
-	to FillSource call in SRC+ASM.
-
-Wed Jul  1 11:07:21 1998  Jim Ingham   <jingham@cygnus.com>
-
-	* main.tcl (gdbtk_preloop): Call gdbtk_idle on spec.  If there was an
-        error in loading an executible specified on the command line,
-	then the pre_add_symbol hook would have called gdbtk_busy but
-        the corresponding call to gdbtk_idle would not have occured.
-
-        Also changed some catch calls so they didn't use 
-        "catch {set foo [real_command]}" 
-	    but rather the more efficient: 
-	"catch {real_command} foo"
-        
-	* register.tcl: more catch cleanups
-	* src.tcl: more catch cleanups
-	* stack.tcl: more catch cleanups
-	* target.tcl: more catch cleanups
-	* tdump.tcl: more catch cleanups
-	* variables.tcl: more catch cleanups
-	* watch.tcl: more catch cleanups
-  
-Wed Jul  1 12:21:55 1998  Martin M. Hunt  <hunt@cygnus.com>
-
-	* src.tcl (build_win): Remove incorrect runstop
-	argument for srcbar.
-
-Wed Jul  1 11:25:48 1998  Martin M. Hunt  <hunt@cygnus.com>
-
-	* floatbar.tcl: Deleted.
-	* Makefile: Removed floatbar.tcl
-	* tclIndex: Rebuilt.
-
-Wed Jul  1 11:19:05 1998  Martin M. Hunt  <hunt@cygnus.com>
-
-	* toolbar.tcl (enable_ui): Now takes an argument and
-	handles disable_ui and no_inferior functions.
-	(disable_ui): Deleted.
-	(no_inferior): Deleted.
-	(constructor): Set idle, busy, and no_inferior hooks
-	to enable_ui.
-
-	* srcbar.tcl (_open_file): Fix for multiple source windows.
-
-Wed Jul  1 01:40:52 1998  Martin M. Hunt  <hunt@cygnus.com>
-	* Makefile: Added srctextwin.tcl.
-	* tclIndex: Rebuilt.
-	* src.tcl: Major rewrite to move the source text window
-	into another object implemented in srctextwin.tcl. Every function
-	changed and many moved to srctextwin.tcl.
-	* srctextwin.tcl: New file.
-	* bp.tcl (goto_bp): Fix call to source widget.
-
-	* src_pref.tcl (build_win): Add line number
-	checkbutton.  Layout needs changed.
-	* prefs.tcl (pref_set_defaults): Add linenum pref.
-	
-Thu Jun 25 17:31:30 1998  Keith Seitz  <keiths@cygnus.com>
-
-	* toolbar.tcl (create_menu_items): Add Function Browser menu item.
-
-	* tclIndex: Regenerate.
-	
-	* Makefile: Add browser.tcl.
-
-	* util.tcl (do_test): New procedure for invoking a test in the
-	testsuite from the command line.
-	(gdbtk_read_defs): New procedure for reading in the testsuite definitions
-	file
-
-	* src.tcl (build_win): Create new entry for searching the source window.
-	This "feature" shares the screen with the download indicator.
-	(download_progress): If starting a download, unmap the search widget
-	and map the download progress indicator in its place. When downloading
-	is done, do the opposite.
-	(config_win): Bind the down and up arrow keys to directly scroll the 
-	window.
-	(search): New method which searches for strings in the source window
-	and jumps to a particular line.
-	(set_state): Do not reset current_file to empty when an exe has been
-	downloaded.
-	(bp): Do not special case tracepoint debugging.
-
-	* manage.tcl (manage_init): Add elements for function browser.
-	(manage_create): If GDBTK_TEST_RUNNING is set in the environment,
-	place all windows on the screen at +0+0.
-
-	* prefs.tcl (pref_save): Add new preference category "search".
-	(pref_set_defaults): Add search preferences.
-
-	* tracedlg.tcl (TraceDlg::destructor): Destroy the actions dialog is
-	it exists.
-	(add_action): Save the object returned from the window manager when
-	the actions dialog is opened so that we can later destroy it if
-	necessary.
-	(done): Clear ActionsDlg when the actions dialog is destroyed.
-
-	* main.tcl (do_tstart): Do not disable the "Begin collection" menu
-	item when we issue a tstart.
-
-        * console.tcl (paste): New method which handles all Paste events for
-        this window.
-        (Console): Bind the middle mouse button on unix to generate a paste
-        event.
-	Override default binding for button-2 motion to allow easier pasting
-	into the window.
-        Bind the paste event to the method paste.
- 
-Wed Jun 17 13:50:48 1998  Martin M. Hunt  <hunt@cygnus.com>
-
-	* src.tcl (reconfig): Recognize tab size changes.
-
-	* src_pref.tcl (build_win): Add tab control. Remove extra frame.
-	Justify variable ballons text. Set activebackgrounds on
-	color buttons.
-
-Tue Jun  9 13:57:24 1998  Keith Seitz  <keiths@cygnus.com>
-
-	* helpViewer.tcl (HtmlViewer): Display appropriate help based on the
-	preference gdb/mode.
-
-	* help/trace: Add help files for tracing.
-
-	* main.tcl (gdbtk_tcl_preloop): Call gdbtk_update so that the
-	source window fills files into the combobox.
-
-	* srcbar.tcl (_open_file): "cd" to directory, don't add it to the
-	search list. This never gets reset anywhere, so if multiple file
-	commands are added, we could get the wrong path. Call gdb_clear_file,
-	too.
-
-	* interface.tcl (gdbtk_tcl_pre_add_symbol): Call the reset method
-	of the source window, too.
-
-	* src.tcl (reset): New method used to clear the source window
-	whenever multiple file commands are used.
-
-	* tdump.tcl (update): Erase the contents of the tdump window
-	when displaying a new dump.
-
-	* stack.tcl (update): Errors from the backtrace can contain
-	backtrace info, too, so make sure we print as much of that as
-	possible.
-
-	* register.tcl (build_win): Do not allow editing in tracing
-	mode.
-	(reg_select): Do not allow editing in tracing mode.
-	
-	* memory.tcl (update_address): Check that gdb's handling of chars and
-	char*s doesn't abort the update.
-
-	* variables.tcl (build_win): Disable editing in tracing mode.
-	(build_menu_helper): Disable editing in tracing mode.
-	(getLocals): Use the builtin functions gdb_get_locals and
-	gdb_get_args to get all local variables. Concat lists together.
-	(Variable::value): Set a default value for "radix" in case
-	the regsub fails.
-
-Tue Jun  9 00:00:18 1998  Martin M. Hunt  <hunt@cygnus.com>
-
-	* interface.tcl (gdbtk_quit): No longer use quit_hook.
-	Just call "manage save".
-	* manage.tcl (manage): Remove manage quit.
-	(manage_quit): Deleted.
-	(manage_init): Remove quit_hook.	
-	(manage_save): Use "Pref setd" instead of "pref set".
-	* prefs.tcl (pref_set_defaults): Remove quit_hook.
-	(pref_quit): Deleted.
-
-Mon Jun  8 16:15:33 1998  Martin M. Hunt  <hunt@cygnus.com>
-
-	* target.tcl (set_check_button): Check for existence of
-	button before trying to set its state.
-
-Mon Jun  8 13:31:08 1998  Martin M. Hunt  <hunt@cygnus.com>
-
-	* memory.tcl (build_win): Always Bind configure event to 
-	newsize method.  Change table widget to use incr_addr for
-	both incr and decr. Enable autorepeat.
-	(create_prefs): Set rheight (row height).
-	(newsize): Set rheight if necessary. Return if numbytes
-	is not zero.
-	(update_address): Move gdbtk_idle and gdbtk_busy calls to 
-	update_addr.
-	(update_addr): Surround with gdbtk_idle and gdbtk_busy.
-	(incr_addr): Take an argument to indicate how much
-	to increment or decrement by.
-	(decr_addr): Deleted.
-
-Fri Jun  5 00:13:49 1998  Martin M. Hunt  <hunt@cygnus.com>
-
-	* Change all references to GDBTK_IDE to IDE_ENABLED.
-
-Thu Jun  4 18:34:11 1998  Martin M. Hunt  <hunt@cygnus.com>
-
-	* memory.tcl: Complete rewrite. Added many new features
-	and made it much faster.
-
-	* mem_pref.tcl (build_win): Set listbox width.
-
-	* images/check.gif: New image. Used in version of
-	memory window without a menubar.
-
-Thu Jun  4 10:53:33 1998  Elena Zannoni  <ezannoni@kwikemart.cygnus.com>
-
-	* tclIndex: regenerated.
-	
-	Merged (most recent first):
-
-        - Elena Zannoni  <ezannoni@kwikemart.cygnus.com>
-
-	* tracedlg.tcl (ok): if the tracepoint does not exist (this can happen
-	if user is editing a tp and decides to remove it from tp window)
-	do not core dump, give an error message instead, and return.
-
-	* bp.tcl (get_actions): invoke trace dialog from tracepoint window,
-	passing filename and line as arguments, rather than address.
-
-        - Jeff Holcomb  <jeffh@cygnus.com>
-
-	* main.tcl (set_baud): Change gdb/load/$gdb_target_name/baud
-	to gdb/load/${gdb_target_name}-baud.
-
-        - Elena Zannoni  <ezannoni@kwikemart.cygnus.com>
-
-	* tdump.tcl (update): call tdump only if the current trace frame
- 	number is not -1.
-
-	* interface.tcl (gdbtk_tcl_tstart): update menus entries only, do
- 	not do actual command.
-	(gdbtk_tcl_tstopt): update menus entries only, do not do actual 
-	command.
-	(gdbtk_tcl_warning): remove tdump warning message from list of not
-	displayed messages.
-
-	* main.tcl (do_tstart): catch error output from tstart and display
- 	error dialog.
-	(do_tstop): catch error output from tstop and display error dialog.
-
-	* bp.tcl (bp_add): align properly the bpnum and passcount fields,
-	for the tracepoint window.
-
-	* main.tcl (set_exe): set file_done (new global state variable) 
-	depending whether new file was read in or not.
- 	(set_target_name): return 0 if user chose cancel from target setting
-	window displayed by 'connect'.
-	(set_target): if no target_cmd is specified call set_target_name and
-	ask user for it.
-	(async_connect): handle possible outcomes of set_target command,
-	issue appropriate messages to user.
-	Initialize file_done to 0.
-
-	* target.tcl (cancel): set gdb_target_name to CANCEL for use by
-	set_target_name.
-	Added public data 'exportcancel'.
-
-	* toolbar.tcl (do_async_connect): change menu items state only 
-	if connect was successful.
-
-	* src.tcl (bp): modify condition for SOURCE case to display tp dot
-	after connecting to target.
-
-	* actiondlg.tcl (constructor): make dialog non modal.
- 	(destructor): release grab not any longer necessary.
-	(change): make lsearch use exact pattern matching for entries
-	added to the collect list using the 'other' field. The new syntax
-	allows array elements to be specified and this messes up the
-	default glob style pattern matching.
-	(change_other): reject memranges (obsolete). Delegate validation
-	of user input to the lower levels, in gdb. I.e. keep everything
-	until the whole tracepoint is installed.
-
-	* tracedlg.tcl (gdb_add_tracepoint): call to gdb_actions is now
-	catching the errors (in case of incorrect syntax) and displaying
-	them to the user.
- 	
-	* main.tcl (set_target): Changed text of error message to mention
- 	the Target Settings dialog.
-	
-	* prefs.tcl: Set default preference for gdb/load/check to 0.
-
-	* target.tcl (build_win): disable comparison with executable for
- 	'exec' targets.
-	(set_check_button): new method. Enable/disable the check button
-	for comparing executable.
-	(change_target): call set_chack_button when target changes.
-	Set default preference gdb/load/check to 0.
-
-	* stack.tcl: set initial window width value to 40, so that window
-	looks better if opened before a stack exists.
-
-        - David Taylor  <taylor@texas.cygnus.com>
-
-	* main.tcl (async_connect): remote-compare is now compare-sections.
-
-        - Elena Zannoni  <ezannoni@kwikemart.cygnus.com>
-
-	* warning.tcl (constructor): call destructor if dialog doesn't
- 	need to be displayed.
-
-	* console.tcl (invoke): make function get input and return if in 
-	readline state,	independently from the value of Running.
-
-	* src.tcl (set_state): set state of pop up menus only for synch
-	mode.
-
-	* tdump.tcl (build_win): simplify the window, eliminating pane.
-	This fixes resize problems.
- 	(update): add call to see to display last thing outputted to the 
-	window.
-
-	* tfind_args.tcl (do_it): call the tfind_cmd procedure. 
-
-	* toolbar.tcl (create_menu_items): changed calls to tstart and tstop
- 	to use do_tstart and do_tstop.
-
-	* srcbar.tcl (runstop): do not call _set_trace in asynch case, 
-	just use _set_runstop always.
-	(_set_runstop): added handling for asynch mode cases.
-	(_set_trace): removed.
-
-	* main.tcl (do_tstart): new procedure to execute tstart command
-	update tstart/tstop button, and menu entries accordingly.
-	(do_tstop): new procedure for tstop, as above.
-	(run_executable): calls do_tstart in the asynch case.
-
-	* interface.tcl (gdbtk_tcl_tstart): new procedure to invoke
-	the tstart command
-	(gdbtk_tcl_tstop): new procedure to invoke the tstop command
-
-	* interface.tcl: (gdbtk_tcl_warning) do not display warning
-	about no current trace frame upon opening of tdump window.
-
-	* main.tcl: (run_executable) in asynch mode just call tstart, 
-	connect is now done independently.
-	(async_connect) new procedure to connect and do comarison with 
-	remote executable, in asynch mode. Sets up gui state globals.
-	(async_disconnect) new procedure to disconnect from target in 
-	asynch mode. Sets up gui state globals.
-
-	* prefs.tcl: added new preference gdb/load/check
-
-	* srcbar.tcl: (create_buttons) tfind commands now use tfind_cmd 
-	function
-
-	* target.tcl: added new preference gdb/load/check to execute an
-	automatic remote-compare command on connection to target in asynch 
-	mode
-	(set_saved) set saved value for new preference
-	(write saved) write saved value for new preference
-	(build_win) set state of 'run to main', 'break at exit', 'display 
-	dowload' to disabled for asynch mode target dialog.
-	Added new checkbutton for automatic comparison of remote exec.
-	Saved_check: new protected member
-
-	* tdump.tcl: (update) changed check for no frame, since 0 is legal 
-	trace frame number.
-
-	* toolbar.tcl: (create_menu_items): added menus items 'connect to
-	target' and 'disconnect', in async mode. Changed to call tfind_cmd 
-	to execute tfind commands
-	(do_async_connect): new method to connect to target in async mode.
-	(do_asynch_disconnect): new method to disconnect from target in 
-	async mode.
-
-	* util.tcl: (tfind_cmd): new proc to execute a tfind command on 
-	the target	
-
-Thu May 28 12:49:29 1998  Keith Seitz  <keiths@cygnus.com>
-
-	* target.tcl: Add sparclite target.
-	(fill_targets): Add sparclite target.
-
-	* main.tcl (set_target_name): Rearrange so that the default behavior
-	is to assume a remote-like target.
-
-	* src.tcl (browse_to): Helper function for BpWin::goto_bp which causes
-	the source window to show the specified location.
-
-	* bp.tcl (bp_add): Clean up repetitive code.
-	Add double-click binding which shows the breakpoint
-	in the source window.
-	(bp_select): Clean up repetitive code.
-	(goto_bp): New function.
-
-Sun May 24 14:05:27 1998  Keith Seitz  <keiths@cygnus.com>
-
-	* src.tcl (reconfig): Remove the variable balloon selection in the text
-	widget, too, when we are disabling varialbe balloons.
-
-	* target.tcl: Add a "runlist" parameter to all gdb_target entries. This list
-	controls the default behavior of the run button.
-	(GdbLoadPref): Define the run preferences based on this target.
-	(build_win): Add a "more options" dropdown pane to allow users to modify the
-	behavior of the run button.
-	(set_saved): Add run button preferences.
-	(write_saved): Add run button preferences.
-	(fill_targets): Add the "pretty name" to the combo box, not gdb's internal
-	target name.
-	(change_target): Use get_target to translate the "pretty-name" to the
-	real target name.
-	(save): Write out saved values, too.
-	(get_target): New method to translate the "pretty-name" of a target into gdb's
-	internal name/
-	(toggle_more_options): New method to handle mapping and unmapping of the
-	"more options" pane.
-	(set_run): New method. Moved from src_pref.tcl.
-	(valid_target): Moved here from main.tcl.
-	(native_debugging): Moved here from main.tcl.
-	(change_target): Don't write_saved here -- wait until dialog is closed.
-
-	* src_pref.tcl (build_win): Use libgui's Labelledframe class instead of the
-	Tix labeled frame.
-	Remove the run button frame -- this has moved into the target selection dialog.
-	(set_run): Moved to targets.tcl.
-	
-	* prefs.tcl (pref_set_defaults): Change default preferences for the run
-	button to only do a run. Target selection will reset these as appropriate.
-
-	* main.tcl (set_baud): Baud preferences are in TARGET-baud, not
-	TARGET/baud.
-	(run_executable): Remove special cases for exec targets.
-	(native_debugging,valid_target): Move to target.tcl.
-
-	* images/more.gif, images/less.gif: New images for drop frames.
-	
-	* tclIndex: Regenerate.
-	
-Wed May 20 13:43:00 1998  Martin M. Hunt  <hunt@cygnus.com>
-
-	* toolbar.tcl (create_menu_items): Remove register prefs.
-
-	* images/stop.gif: Set transparent bit.
-	
-Tue May 19 12:34:11 1998  Keith Seitz  <keiths@cygnus.com>
-
-	* bp.tcl (bp_add): Use source window's colors. Use "file tail" not
-	"lindex [file split ] end".
-	(bp_modify): Use source window's colors. Use "file tail" not
-	"lindex [file split ] end".
-	(bp_remove): Call bp_select before we delete the breakpoint.
-
-	* main.tcl (run_executable): Encapsulate all calls to debugger
-	based on new run preferences.
-
-	* manage.tcl (manage_init): Change loadpref titles to "Target Selection"
-
-	* pref.tcl (build_win): Disable Help button until it works.
-
-	* prefs.tcl (pref_set_defaults): Define new run button preferences.
-	Lose stack and bp window color preferences -- use the source window
-	ones instead. Lose left_click, too.
-
-	* src.tcl: Remove all references to _Source_Left_Click and replace with new
-	protected variable Tracing. Define new protected variable UseVariableBalloons
-	so that we don't follow the preferences blindly. Replace all preference calls
-	for these two globals.
-	(reconfig): Allow reconfiguration of variable balloons and popup menu colors.
-	(config_win): Add binding for File Menu->Open.
-	(do_key): Add open key.
-
-	* src_pref.tcl (SrcPref): Save all newly added  preferences.
-	(build_win): Add new preferences for mode, variable balloons, 
-	lots of color choices.
-	(cancel): Reset all new preferences.
-	(pick): Allow passing of button in to make things a little easier.
-	(reconfig): Keep empty -- no need for this to reconfigure itself.
-	(set_run): New method to make sure someone does not try to run _and_
-	continue a target with the run button.
-
-	* stack.tcl (build_win): Use the source window's preferences to set colors.
-
-	* target.tcl (build_win): Disable Help button until it works.
-
-Mon May 18 15:25:00 1998  Martin M. Hunt  <hunt@cygnus.com>
-
-	* html_library.tcl (HMstack): Remove stray 'g' that was
-	preventing autoloading.
-
-Mon May 18 13:17:30 1998  Keith Seitz  <keiths@cygnus.com>
-
-	* helpViewer.tcl (HtmlViewer): Initialize glossary.
-	(glossaryPost): Fill in skeleton supplied by jingham.
-	(glossaryUnpost): Ditto.
-	(lookup): New method to lookup glossary definitions.
-	(HMset_image): Add special image names.
-
-Fri May 15 00:30:06 1998  Martin M. Hunt  <hunt@cygnus.com>
-
-	* memory.tcl (update_address): Source window was never being
-	updated due to a faulty fencepost. I removed it.  Was it
-	useful?
-
-Tue May 12 11:47:11 PDT 1998  James Ingham  <jingham@leda.cygnus.com>
-
-	* helpViewer.tcl: Made the fonts for the viewer track the global
-	font preferences
-	*html_library.tcl: Use Tcl Font objects for the fonts rather than
-	building up X Font Specs.
-	
-
-Thu May  7 16:03:32 1998  Keith Seitz  <keiths@cygnus.com>
-
-	* toolbar.tcl (create_menu_items): Remove automatic stepping.
-	(create_menu_items): "Cygnus on the Web..." should point to GNUPro page...
-
-Wed May  6 20:18:34 1998  Keith Seitz  <keiths@cygnus.com>
-
-	* main.tcl (set_target_name): Recognize d10v and m32r targets.
-	(valid_target): Change test to recognize all tcp targets.
-
-	* target.tcl: Add m32r and d10v tcp targets.
-
-Wed May  6 12:52:12 1998  Keith Seitz  <keiths@cygnus.com>
-
-	* srcbar.tcl (create_menu_items): Install a page setup menu item for
-	non-ide debuggers.
-
-	* src.tcl (print): Don't call idewindow_freeze and idewindow_thaw
-	the ide is not running
-
-Wed May  6 10:41:30 1998  Elena Zannoni  <ezannoni@kwikemart.cygnus.com>
-
-	* bp.tcl (get_actions): set bpnum to be the real tracepoint number,
- 	not the selected row number.
-
-Tue May  5 04:07:12 1998  Martin M. Hunt  <hunt@cygnus.com>
-
-	* target.tcl: Add D10V and M32R target.
-
-	* prefs.tcl (pref_set_defaults): Set debugging off
-	by default.
-
-Fri May  1 15:23:57 1998  Elena Zannoni  <ezannoni@kwikemart.cygnus.com>
-
-	* main.tcl (valid_target) make 'remotetcp' a valid
-	target.
-
-Fri May  1 11:50:40 1998  Jim Ingham  <jingham@leda.cygnus.com>
-
-	* helpViewer.tcl: Added the skeleton for the Glossary entries.
- 	Fixed the zoom to top of page when rendering is complete nit.
-	Added a reconfig method to refresh the current page.
-	Compulsive reordering of methods.
-	
-Thu Apr 30 00:04:52 1998  Martin M. Hunt  <hunt@cygnus.com
-
-	* global_pref.tcl (change_icons): Remove debug line.
-
-	* toolbar.tcl: Change image names to end with _img
-	so they don't conflist with command names.
-	* srcbar.tcl: Same.
-
-Tue Apr 28 16:51:09 1998  Jim Ingham <jingham@leda.cygnus.com>
-
-	* html_library.tcl: The redefinition of tkFocusOK in this file 
-	can cause an infinite recursion loop in autoloading tkFocusOK.
-	Change proc -> ::proc to hide the definition from itcl_mkindex
-	* tclIndex: remade without the reference to tkFocusOK.  
-
-Tue Apr 28 16:51:09 1998  Jim Ingham <jingham@leda.cygnus.com>
-
-	* helpViewer.tcl: The index page now shows up properly in the
-        history list.  Also added images for the fore, back and home 
-	buttons, and removed the close button.
-
-	* manage.tcl: Moved the wm withdraw of a new toplevel before the
-	constructor is run in manage_create.  This avoids flashing.
-
-	* main.tcl: Changed the tk application name of gdbtk from tk
-	to gdbtk.
-	
-Mon Apr 27 14:18:01 1998  Elena Zannoni  <ezannoni@kwikemart.cygnus.com>
-
-	* helpViewer.tcl: (constructor) Change 'Foreward' to 'Forward' and
-	calls to 'foreward' method to calls to 'foreward' method.
-	(forward) changed method name from 'foreward'.
-
-Thu Apr 23 19:02:25 1998  Keith Seitz  <keiths@onions.cygnus.com>
-
-	* toolbar.tcl (create_menu_items): Use the new help viewer when not
-	using the IDE.
-
-	* helpViewer.tcl (HtmlViewer::constructor): Set default values for
-	previously passed-in variables.
-	(HtmlViewer::destructor): Destroy the toplevel, too.
-	(HMset_image): prepend the dir name "images" to the image path.
-
-Thu Apr 23 13:31:07 1998  Jim Ingham  <jingham@leda.cygnus.com>
-
-	* html_library.tcl: First checkin
-        * helpViewer.tcl: First checkin
-        * manage.tcl (manage): Added the help veiwer to the windows
-	list.  Aslo compulsively alphabetized the list...
-	* tclIndex Rebuilt for the new procs.
-  
-Mon Apr 20 11:14:17 1998  Keith Seitz  <keiths@onions.cygnus.com>
-
-	* global_pref.tcl (build_win): Add font selector for the status font.
-
-	* main.tcl (run_executable): Exec targets are always "loaded".
-
-Sat Apr 18 02:11:04 1998  Martin M. Hunt  <hunt@cygnus.com>
-
-	* prefs.tcl (pref_read): Remove debug line.
-
-	* util.tcl (toggle_debug_mode): When enabling or
-	disabling debugging, also enable or disable error
-	reporting and stack traces.
-
-Sat Apr 18 01:13:03 1998  Martin M. Hunt  <hunt@cygnus.com>
-	
-	* srcbar.tcl (_toggle_updates): Cleanup.
-
-	* src.tcl (do_popup): Fix problems with selections. While
-	I'm messing with this code anyway, change how it works
-	so that the popup will contain the word that is under the cursor
-	if nothing is selected.
-
-	* toolbar.tcl (create_buttons): Bind button 3 to create
-	new windows when possible.
-
-	* stack.tcl (StackWin): Fix broken deiconify call.
-
-	* images/[console.gif, reg.gif]: Update.
-
-Fri Apr 17 10:34:23 1998  Martin M. Hunt  <hunt@cygnus.com>
-
-	* src.tcl (location): Don't look up the full pathname 
-	of each file added to the combobox.
-
-Fri Apr 17 09:58:59 1998  Keith Seitz  <keiths@onions.cygnus.com>
-
-	* target.tcl (default_port): New proc. Returns a default port
-	based on host os.
-	(startup code): Use default port to determine the default port
-	to use for all hosts.
-	(build_win): Only set the target if it is valid.
-	For unix, use port names that correspond to the OS running.
-	Change gdb/load/$target-portnum to gdb/load/$target-port (typo?)
-	(get_target_list): Do not allow "exec" for cross debugging.
-	(save): Do not do dismiss dialog if the target is not valid.
-	(cancel): If exportcancel is set, set gdb_target_cmd to "CANCEL". This
-	will allow run_executable to cancel a run if the user cancels target
-	selection.
-	(exportcancel): New public data.
-	
-	* main.tcl (set_target_name): Return status to caller so that the user
-	can cancel a run request when the target selection dialog is opened.
-	Do not modify gdb_exe_changed -- it has already been set proprely.
-	(set_target): If gdb_target_cmd is empty, call set_target_name to
-	set it.
-	Allow all set_target_name commands to cancel target selection.
-	(run_executable): Allow all set_target_name commands to cancel
-	target selection.
-	Always clear bp's at main and exit, since this proc will set them
-	for all targets now.
-	Save the bp number for the breakpoint installed at main and exit so
-	that we can reliably delete them if the user cancels any subsequent
-	target selection.
-	Whenever the run is canceled, delete the breakpoints at main and exit.
-	Move setting of breakpoints at main and exit from download_it here.
-	(valid_target): New proc. Returns true if the given target is a valid,
-	runnable target.
-	(native_debugging): New proc. Returns true if this gdb is not a cross
-	gdb.
-	(startup code): Do not call set_target_name here -- let run_executable
-	do it.
-	
-	* interface.tcl (gdbtk_tcl_query): Update the display when this dialog
-	is dismissed.
-	(gdbtk_tcl_warning): Always show warnings in the debug window.
-
-	* download.tcl (download_it): Move setting breaks at main,exit to
-	run_executable in main.tcl.
-
-Thu Apr 16 11:28:01 1998  Martin M. Hunt  <hunt@cygnus.com>
-
-	* main.tcl (set_target_name): Add "prompt" parameter
-	which allows this function to be called without it always
-	prompting for the target name.  This allows it to quietly
-	initialize variables from preferences.
-	(set_target): Remove HACK_FIRST_HACK.
-	(run_executable): Check the result of [set_target].
-	If it fails, prompt for a new target and repeat.
-	(startup code): Remove HACK_FIRST_HACK.
-	Call set_target_name to initialize gdb_target_cmd from
-	preferences.
-
-	* toolbar.tcl (create_menu_items): Call set_target_name
-	for the target menu item. This will open the dialog and
-	then set the target command correctly.
-
-	* target.tcl (save): Set default target preference.
-
-Wed Apr 15 11:29:47 1998  Martin M. Hunt  <hunt@cygnus.com>
-
-	* src.tcl (reconfig): Tell toolbar to reconfig.
-
-	* global_pref.tcl (build_win): Add support for changing
-	icons. Put fonts in a labelled frame.
-	(update_file): Removed.
-	(change_icons): Callback for icon combobox.
-
-	* srcbar.tcl (_load_src_images): Remove old target and 
-	load images. Add reconfig parameter which reloads images.
-	Use global gdb_ImageDir.
-	(reconfig): New method.
-
-	* floatbar.tcl (create_buttons): Remove target image.
-	Use global gdb_ImageDir.
-	
-	* toolbar.tcl (_load_images): Use global gdb_ImageDir.
-	Add reconfig parameter which reloads images.
-	(reconfig): Don't rebuild everything, just reload images.
-	(create_menu_items): Change "Fonts" preferences menu
-	item to "Global".
-	
-	* prefs.tcl (pref_set_defaults): Save only basename in 
-	gdb/ImageDir preference.  Initialize global gdb_ImageDir.
-	(pref_read): Set gdb_ImageDir.
-	
-	* memory.tcl (build_win):  Use global gdb_ImageDir.
-
-	* manage.tcl (make_icon_window): Use global gdb_ImageDir.
-
-	* about.tcl (build_win): Use global gdb_ImageDir.
-
-	* images/icons.txt: New file; icon descriptions.
-	* images/vmake.gif: New file.
-	* images/vars.gif: New file.
-	* images/watch.gif: New file.
-	* images/bp.gif: New file.
-	* images/memory.gif: New file.
-	
-	* images2/icons.txt: New file; icon descriptions.
-
-	* toolbar_pref.tcl: Removed.
-	
-	* main.tcl (run_executable): If target is "exec" don't
-	show target dialog unless the run command fails.
-
-Wed Apr 15 13:15:22 1998  Elena Zannoni  <ezannoni@kwikemart.cygnus.com>
-
-	* interface.tcl: (gdbtk_tcl_warning) changed to selectively
-	display warnings in the GUI.
-	(show_warning) new procedure. Displays warning dialogs.
-
-Wed Apr 15 07:13:04 1998  Keith Seitz  <keiths@onions.cygnus.com>
-
-	* src.tcl (do_popup): Fix merge casualty -- revert to pre-3/22 version.
-	Don't allow tracepoint ranges to be set unless in asynch mode.
-
-Mon Apr 13 16:00:06 1998  Elena Zannoni  <ezannoni@kwikemart.cygnus.com>
-
-	* warning.tcl: new file. Implements WarningDlg class, for warning
-	dialogs.
-
-	* tclIndex: regenerated
-
-	* Makefile: added new file warning.tcl
-
-	* manage.tcl: added new window warningdlg, for ignorable warnings.
-
-	* interface.tcl: (gdbtk_tcl_warning) new procedure. Creates a warning
-	dialog.
-	(gdbtk_tcl_ignorable_warning) new procedure. Creates a warning dialog.
-	The user can choose to not have this dialog pop up again during the
-	same debugging session.
-
-Mon Apr 13 13:04:20 1998  Keith Seitz  <keiths@onions.cygnus.com>
-
-	* stack.tcl (StackWin::constructor): Withdraw toplevel before calling
-	all busy hooks; then build the window, go idle and pop the window onto
-	the screen.
-
-	* main.tcl (set_target_name): Use a regexp to match target names.
-	Add "sds" as a target.
-	(run_executable): Use gdb_immediate to run executable.
-
-Fri Apr 10 10:27:42 1998  Elena Zannoni  <ezannoni@kwikemart.cygnus.com>
-
-	* bp.tcl: changed default value of public var tracepoints to be 0.
-
-Thu Apr  9 15:21:49 1998  Martin M. Hunt  <hunt@cygnus.com>
-
-	* global_pref.tcl (destructor): Delete test fonts here instead of
-	in ok and cancel. This fixes bug when dialog was closed by
-	clicking on close gadget.
-
-	* src_pref.tcl (pick): When colors are changed, immediately
-	update the dialog.
-
-Thu Apr  9 04:03:27 1998  Martin M. Hunt  <hunt@cygnus.com>
-	
-	* target.tcl (build_win): Bind <Return> for cancel and help buttons.
-
-Wed Apr  8 10:57:14 1998  Elena Zannoni  <ezannoni@kwikemart.cygnus.com>
-
-	* tdump.tcl: (update): show stuff on window only if current 
-	trace frame is not null.
-
-	* variables.tcl: (build_win): get the current output-radix
-	(getVariables): decide the format to display a var based on Radix
-	VariableWin class: added protected member Radix
-	(value): decide display based on output-radix
-
-Wed Apr  8 06:17:42 1998  Keith Seitz  <keiths@onions.cygnus.com>
-
-	* bp.tcl (get_actions): Open the trace dialog based on a tracepoint's
-	number.
-
-	* tracedlg.tcl (title): New method to title window based on mode.
-	(TraceDlg::constructor): After the interp is idle, title this window.
-	(build_win): Add support to simply pass a tracepoint number for editing.
-
-Tue Apr  7 12:49:45 1998  Keith Seitz  <keiths@onions.cygnus.com>
-
-	* variables.tcl (VariableWin): We should deiconify after withdrawing...
-
-	* tracedlg.tcl (gdb_edit_tracepoint): Make necessary gdb_cmd changes
-	to support new API.
-	(gdb_add_tracepoint): Make necessary gdb_cmd changes to support new
-	API.
-
-	* tdump.tcl (update): Make necessary gdb_cmd changes to support new
-	API.
-	(TdumpWin::constructor): We should deiconify after we withdraw...
-	Change idle callback to an update callback.
-	(TdumpWin::destructor): Change idle callback to update callback.
-	
-	* srcbar.tcl (_open_file): Make necessary gdb_cmd changes to support new
-	API.
-	(create_buttons): Change all tracing commands to use gdb_immediate.
-
-	* main.tcl (set_target_name): Add simulator target.
-
-	* src.tcl (mode): When changing modes, clear the line to pc mappings.
-	(location): Do not set current_addr if we are not running and gdb_loc
-	thinks we're at 0x0.
-	Clear the text-window-line to pc mapping when appropriate.
-	Revert display_breaks change for SRC+ASM mode.
-	(bp): Make sure mapping of PC to src window line exists before
-	attempting to set breakpoints/tracepoints.
-	
-Fri Apr  3 13:57:42 1998  Elena Zannoni  <ezannoni@kwikemart.cygnus.com>
-
-	* src.tcl: (do_key): added actions for key bindings in trace mode.
-	(config_win): added key bindings for trace mode.
-
-	* srcbar.tcl: (_set_trace) changed balloon contents for tstart/
-	tstop button.
-
-	* toolbar.tcl: (create_menu_items): changed names of menu items
-	tstart and tstop to 'Begin Collection' and 'End Collection'.
-	Changed name of Preference menu item from 'GDB' to 'Fonts'.
-	Changed name of File menu item from 'Debugger Preferences' to
-	'Target Settings'.
-	Commented out Preference menu item 'Download'.
-	(create_buttons): tdump button, inserted text 'Td' in place of missing
-	icon.
-	
-
-Tue Mar 31 17:20:59 1998  Ian Lance Taylor  <ian@cygnus.com>
-
-	* Makefile (TCL): Add ide.tcl.
-	* tclIndex: Rebuild.
-
-Sun Mar 29 18:50:46 1998  Keith Seitz  <keiths@onions.cygnus.com>
-
-	* tracedlg.tcl (build_win): Enable tracepoints at assembly addresses.
-	(add_action): Enable tracepoints at assembly addresses.
-	(ok): Enable tracepoints at assembly addresses.
-	(edit): Enable tracepoints at assembly addresses.
-	(gdb_add_tracepoint): Enable tracepoints at assembly addresses.
-
-	* srcbar.tcl (_open_file): If main () exists, show it.
-
-	* src.tcl (display_breaks): If we are displaying breaks in assembly,
-	clear the line and file specs.
-	(location): Use display_breaks to insert breaks and traces.
-	(bp): Rewrite. Actions are based on mode of the source window.
-	(bp_line): When setting a tracepoint in assembly, pass address
-	to set_tracepoint.
-	(set_tracepoint): Open trace dialog specifying either line or
-	address at which to set trace.
-	(tracepoint_range): Rewrite. Actions are based on the mode of the
-	source window. Now able to insert ranges of traces in any mode.
-
-	* actiondlg.tcl (ActionDlg::constructor): Enable widget via address
-	specification.
-	(ActionDlg::Line): Default to empty list.
-	(ActionDlg::Address): Add new memeber to enable assembly operation.
-	
-Sun Mar 29 21:21:37 1998  Elena Zannoni  <ezannoni@kwikemart.cygnus.com>
-
-	* bp.tcl: add tracepoint number to tracepoint window.
-	(build_win)(bp_add)(bp_select)(bp_modify)(bp_delete)
-
-	* manage.tcl: (manage_init) do not open windows not related to 
-	current mode
-
-	* tdump.tcl: (reconfig) remove it
-	(config) add toplevel window, show window after it has been built.
-	(update) add calls to busy and idle hooks, add third argument to
-	gdb_cmd call
-
-Sun Mar 29 15:01:03 1998  Keith Seitz  <keiths@onions.cygnus.com>
-
-	* srcbar.tcl (_set_trace): Use gdb_immediate to execute the "tstop".
-	Call run_executable when requesting a tstart.
-	(_open_file): Convert all paths under cygwin32 to a posix-compliant
-	pathname. Add this path to the source search list.
-
-	* src.tcl (set_execution_status): Change stop messages to support
-	tracing.
-	(tracepoint_range): Clear the selection when we set a range of
-	tracepoints.
-
-	* main.tcl (set_target): Use gdb_immediate so that the console gets
-	output of target command.
-	(run_executable): Use gdb_immediate for run command.
-	Include trace support.
-
-Sat Mar 28 15:50:01 1998  Keith Seitz  <keiths@onions.cygnus.com>
-
-	* srcbar.tcl (create_menu_items): Put menu items in proper order.
-	(_open_file): Add exe file's directory to the default source
-	search path.
-
-Sat Mar 28 14:29:08 1998  Keith Seitz  <keiths@onions.cygnus.com>
-
-	* srcbar.tcl (GDBSrcBar: runstop trace): If running async'ly, set
-	the run/stop button by calling _set_trace. Otherwise use _set_runstop.
-	(create_menu_items): Add file command to open a new exe.
-	(_open_file): New method to handle requests to open a new exe.
-
-	* main.tcl (set_target): If this is the first time running,
-	then show the download prefs dialog.
-
-Sat Mar 28 16:30:55 1998  Elena Zannoni  <ezannoni@kwikemart.cygnus.com>
-
-	* tracedlg.tcl: (build_win) reinserted 'update idletasks' to
-	display Actions frame properly.
-
-	* actiondlg.tcl: (sort) moved "All Registers", "All Locals", 
-	"All Arguments" to beginning of list.
-
-	* src.tcl: (line_is_executable) new method. Used in 
-	tracepoint_range.
-
-Sat Mar 28 10:58:04 1998  Keith Seitz  <keiths@onions.cygnus.com>
-
-	* tracedlg.tcl (gdb_edit_tracepoint): Don't let gdb_cmd call busy and
-	idle hooks.
-	(gdb_add_tracepoint): Ditto.
-
-	* src.tcl (config_win): Change exit key binding from 'q' to 'x.'
-	(goto_func): That's "file tail", not "file split."
-	
-	* srcbar.tcl (_set_stepi): Don't do anything if we're debugging
-	asynchronously.
-
-Sat Mar 28 10:09:21 1998  Martin M. Hunt  <hunt@cygnus.com>
-
-	* toolbar.tcl (create_menu_items): Change "Close Debugger"
-	menu item to "Exit".
-
-Sat Mar 28 02:38:51 1998  Martin M. Hunt  <hunt@cygnus.com>
-	
-	* src_pref.tcl (build_win): Fix Save and Apply buttons.
-	Change "Save" to "OK". Use standard_button_box.
-	(save): New method, save and exit.
-	(apply): New method; save and don't exit.
-	(cancel): New method; cancel all changes.
-
-	* src.tcl (reconfig): Reconfigure colors, too.
-
-	* global_pref.tcl (Globalpref): Fix deiconify call.
-	(build_win): Use standard_button_box. Set default to OK.
-	Remove unused stuff. Cleanup display.
-	
-	* Makefile: Removed toolbar_pref.tcl.
-
-	* tclIndex: Rebuilt.
-	
-	* srcbar.tcl (create_buttons): Make toolbar always attached 
-	to source window.
-
-	* toolbar.tcl (build_win): Always display toolbar and 
-	menubar attached to source window.
-	
-	* prefs.tcl (pref_set_defaults): Removed toolbar prefs.
-
-	* manage.tcl (manage_init): Remove hack to change preferences
-	names.
-	(manage_init): Remove toolbar and toolbar prefs code.
-	(manage_create): Remove toolbar code.
-	(manage_open): Remove toolbar code.
-	(manage_find): Remove toolbar code.
-	(manage_delete): Remove toolbar code.
-	(manage_restart): Remove toolbar code.
-
-Fri Mar 27 19:52:53 1998  Keith Seitz  <keiths@onions.cygnus.com>
-
-	* toolbar.tcl (create_menu_items): Do not disable preferences.
-
-	* src.tcl (reconfig): Rewrite to not destroy window.
-	Symbolic fonts are a blessing!
-	Pass the image handles for our breakdots to makeBreakDots.
-	(file): Move breakpoint/tracepoint insertion to a separate function...
-	(display_breaks): .... this one.
-	(location): Move the block which fills combo boxes to top in
-	case an error causes us to exit early.
-	(makeBreakDot): Accept an optional image handler so that it can be
-	configured instead of created.
-
-	* global_pref.tcl (build_win): Carry around a list of all changable
-	fonts in case more granularity is needed. (Windows cannot change
-	menu font...) Disable menu font for windows.
-	(ok): Check the list of changable fonts.
-	(cancel): Check the list of changable fonts.
-	(apply): Check the list of changable fonts.
-
-	* console.tcl (reconfig): New (empty) method to handle preference
-	changes.
-
-Fri Mar 27 16:08:57 1998  Keith Seitz  <keiths@onions.cygnus.com>
-
-	* global_pref.tcl (ok): Must use preferences for comparison. Don't
-	"manage restart" unless needed.
-	(cancel): Don't configure the font -- changing the preference will do
-	it automagically.
-
-Fri Mar 27 14:21:02 1998  Keith Seitz  <keiths@onions.cygnus.com>
-
-	* toolbar.tcl (create_menu_items): Use gdbtk_quit to initiate a quit.
-
-	* src.tcl (do_key): Use gdbtk_quit to initiate a quit.
-
-	* prefs.tcl (pref_save): Set a default value for WIN.
-	Don't "manage restart".
-	(pref_set_defaults): Register a quit hook to save preferences.
-	(pref_quit): Call pref_save to save all preferences when we quit.
-
-	* manage.tcl (manage): Add "quit".
-	(manage_init): Register a gdb_quit_hook.
-	(manage_delete): Instead of guessing when and what to ask to confirm
-	a quit, call gdbtk_quit.
-	(manage_quit): New procedure. This is called from the gdb_quit_hook to save
-	window active'ness and geometries by calling manage_save.
-
-	* interface.tcl: Define "gdb_quit_hook".
-	(gdbtk_quit): New procedure to call whenever a quit is requested.
-
-	* global_pref.tcl (ok): Do not save preferences here.
-
-Fri Mar 27 12:21:07 1998  Keith Seitz  <keiths@onions.cygnus.com>
-
-	* tracedlg.tcl (TraceDlg): Wait until idle to deiconify ourselves.
-
-	* global_pref.tcl (Globalpref): Withdraw window before creating and
-	deiconify it when idle.
-	(cancel): Let the window manager destroy us.
-	(ok): Let the window manager destroy us.
-
-	* target.tcl (GdbLoadPref::constructor): Withdraw window before creating
-	and deiconfiy it when idle.
-
-	* memory.tcl (MemWin::constructor): Withdraw window before going
-	busy.
-
-	* register.tcl (RegWin::constructor): Withdraw window before going
-	busy.
-
-	* src.tcl (SrcWin::constructor): Withdraw window before creating and
-	deiconify it when idle.
-
-Fri Mar 27 10:52:30 1998  Martin M. Hunt  <hunt@cygnus.com>
-
-	* target.tcl: Fix entry for temotetcp.
-
-	* main.tcl (set_target_name): Build correct gdb_target_cmd.
-	
-Fri Mar 27 11:23:18 1998  Elena Zannoni  <ezannoni@kwikemart.cygnus.com>
-
-	* target.tcl: (build_win) added call to change_target to
-	get the correct entry widgets when the dialog is opened.
-
-Fri Mar 27 01:43:41 1998  Martin M. Hunt  <hunt@cygnus.com>
-
-	* target.tcl: Add simulator and remotetcp targets to
-	target database. Change all the gdb/load/$target/foo
-	preferences to gdb/load/$target-foo because the prefs
-	code expects gdb/section/varname.  The extra slash confuses
-	it.
-	(set_saved): Add saved_portname and saved_hostname for TCP.
-	(write_saved): Add saved_portname and saved_hostname for TCP.
-	(fill_rates): change states of hostname and portnum entry widgets.
-	(fill_targets): Add fake remotetcp entry in target list.
-	(change_baud): When switching between tcp and serial targets
-	pack or forget the appropriate widgets.
-	(build_win): Create hostname and port number entry widgets.
-	(change_target): Update hostname and portnum widgets.
- 	
-	* prefs.tcl (pref_save): Add 'load' as a section to be saved.
-	Set gdb/load/target to 'exec'.
-
-	* manage.tcl (_manage_null_handler): Deleted.
-
-	* download.tcl (download_it): Don't call IDE functions
-	unless GDTK_IDE is set.
-
-	* main.tcl (gdbtk_tcl_preloop): Get name of executable
-	if one was supplied on command line.
-	(set_target_name): Save target name as preference.
-	(run_executable): Call set_target.
-
-Fri Mar 27 00:23:46 1998  Keith Seitz  <keiths@onions.cygnus.com>
-
-	* src.tcl (location): Catch error of getting location of main.
-
-	* prefs.tcl (pref_set_defaults): Add gdb/toolbar/active.
-	Add trace for global/fixed font to update src-font.
-	(pref_read): Add code to deal with global preferences.
-	(pref_save): Add code to deal with global preferences.
-	(pref_src-font_trace): Trace function which set src-font to global/fixed.
-
-	* global_pref.tcl (build_win): Relayout font selectors and add a selections
-	for menu and default fonts.
-	Rename Save to OK and Quit to Cancel, renaming methods, too.
-	(font_changed): Add arguments to facilitate multiple fonts.
-	(reconfig): Define as empty.
-	(ok): Rewrite to facilitate multiple fonts.
-	(cancel): Rewrite to facilitate multiple fonts.
-	(apply): Rewrite to facilitate multiple fonts.
-
-	* manage.tcl (manage_restart): Call gdbtk_idle to reset the toolbar after
-	it is recreated.
-
-Thu Mar 26 23:49:26 1998  Martin M. Hunt  <hunt@cygnus.com>
-
-	* tdump.tcl, tfind_args.tcl: New files.
-
-Thu Mar 26 22:29:28 1998  Elena Zannoni  <ezannoni@kwikemart.cygnus.com>
- 
-        * tracedlg.tcl: (config) commented out grab. Made window non-modal.
-        (destructor) do not release grab.
-        (done) do not reinstall grab.
- 
-        * toolbar.tcl: (create_buttons) changed buttons for the tracepoint
-        case to open tdump window, and tracepoint window.
-        (create_menu_items) change Run menu to do tstart, tstop for tracepoint
-        case. Changed View menu to show tracepoint window for tracepoint case.
-        Changed 'Control' menu to 'Trace' menu for tracepoint case, with
-        tfind commands.
- 
-        * srcbar.tcl: (create_buttons) changed the buttons for the
-        tracepoint case to do tfind commands.
-        (_set_trace) new method. Toggles tstart/tstop button.
- 
-        * src.tcl: (config) decide defatul action for left click on
-        source based on 'mode' preference.
-        (bp_line) ditto.
-        (config_win) modify pop upmenu on source window to display only
-        'set tracepoint'.
- 
-        * prefs.tcl: (pref_set_defaults) added preference gdb/mode for
-        tracepoints or breakpoint display.
- 
-        * manage.tcl: (manage_init) added tracepoint window, args windows
-        for tfind, tdump window.
-        (manage_open) use eval in call to manage_create.
- 
-        * bp.tcl: (build_win) added PassCount to the display and modified
-        the menus for the tracepoint case to display actions.
-        (bp_add) display pass_count too in the tracepoint list.
-        (bp_select) changed indexes of menu entries to be entries names.
-        added field passcount to selection for tracepoints.
-        (bp_modify) added passcount for tracepoints.
-        (bp_delete) added passcount for tracepoints.
-        (get_actions) new method
-        Added new public member "tracepoints" to decide which kind of window
-        needs to be displayed.
- 
-        * Makefile: added new files tfind_args.tcl and tdump.tcl.
- 
-        * tclIndex: regenerated
- 
-Thu Mar 26 14:23:00 1998  Martin M. Hunt  <hunt@cygnus.com>
-
-	* main.tcl (set_target_name): Make target dialog always
-	on top.
-
-	* target.tcl (build_win): Bind Return to save.
-	(GdbLoadPref): Denter dialog on screen.
-
-Thu Mar 26 14:16:36 1998  Keith Seitz  <keiths@onions.cygnus.com>
-
-	* memory.tcl (update_address): Catch errors to update_addr so that
-	we do not error and leave the GUI busy.
-
-Thu Mar 26 13:51:58 1998  Martin M. Hunt  <hunt@cygnus.com>	
-
-	* toolbar.tcl (create_menu_items): Remove "Cygnus
-	Foundry Tour" and "Submit a PR" from the menu.
-
-	* src.tcl (file): Set title to GDB.
-
-	* manage.tcl (manage_init): Set About name.
-
-	* main.tcl (set_target): Set title to GDB.
-
-	* interface.tcl (gdbtk_tcl_query): Set title correctly.
-
-	* Makefile: Remove download_pref.tcl.
-
-Thu Mar 26 11:33:02 1998  Keith Seitz  <keiths@onions.cygnus.com>
-
-	* Makefile: Add target.tcl to list of sources.
-
-	* tclIndex: Rebuilt.
-	
-	* target.tcl (GdbLoadPref): Trace changes to gdb_loaded.
-	(target_trace): New procedure. This is invoked by a write trace
-	to gdb_loaded.
-
-	* interface.tcl (gdbtk_busy): New procedure to run all busy hooks
-	(gdbtk_update): New procedure to run all update hooks
-	(gdbtk_idle): New procedure to run all idle hooks. Also runs the
-	no inferior hooks if no inferior has been created.
-	Rename old gdb_idle_hook to gdb_update_hook for clarity.
-	Change all references of run_hooks to use gdbtk_busy, gdbtk_idle, and
-	gdtk_update.
-	
-	* download.tcl: Make busy/update/idle hook changes.
-
-	* main.tcl: Make busy/update/idle hook changes.
-	(set_exe): Clear gdb_loaded whenever a new exec file is selected.
-	
-	* manage.tcl: Make busy/update/idle hook changes.
-
-	* mem_pref.tcl: Make busy/update/idle hook changes.
-
-	* memory.tcl: Make busy/update/idle hook changes.
-
-	* register.tcl: Make busy/update/idle hook changes.
-
-	* src.tcl: Make busy/update/idle hook changes.
-
-	* stack.tcl: Make busy/update/idle hook changes.
-
-	* variables.tcl: Make busy/update/idle hook changes.
-
-	Merged with Foundry 1.0:
-        Wed Mar 25 14:22:28 1998  Keith Seitz  <keiths@onions.cygnus.com>
-
-	* register.tcl (reconfig): Call busy and idle hooks.
-
-	* memory.tcl (update_address): Call busy and idle hooks.
-
-        Wed Mar 25 11:38:49 1998  Martin M. Hunt  <hunt@cygnus.com>
-
-	* src.tcl (location): Fix typo.
-
-	Tue Mar 24 21:03:01 1998  Martin M. Hunt  <hunt@cygnus.com>
-
-	* src.tcl (location): If gdb_listfuncs returns an error, display
-	an error message that says the file was either not found or contained
-	no debugging information.
-	(location): When disassembling, put busy and idle calls before
-	and after. Set "NoRun" to indicate the busy hook should not
-	display the stop sign because the target isn't running, GDB may
-	just take a few seconds to do the disassembly.
-	(busy): Hack to support NoRun mode.
-
-	* srcbar.tcl (_set_runstop): Add another case to disable the
-	Run icon instead of changing it to a stop sign.
-
-	* main.tcl (set_exe): If the file has no debugging information,
-	display an error message and exit.  This should only happen with
-	intentionally stripped files.
-
-	Tue Mar 24 17:04:36 1998  Keith Seitz  <keiths@onions.cygnus.com>
-
-	* mem_pref.tcl (build_win): Keep track of all widgets that should be
-	disabled when busy.
-	(busy): New method which disables anything that could cause trouble.
-	(idle): New method which re-enables anything that "busy" disables.
-	(apply): Call busy and the busy hooks before doing update of memory
-	window. Then call idle and the idle callbacks when we are done.
-
-	Tue Mar 24 12:07:52 1998  Martin M. Hunt  <hunt@cygnus.com>
-
-	* src.tcl (location): Filter out .s and .S files because
-	Foundry does not yet support assembly source debugging.
-
-	Tue Mar 24 08:50:46 1998  Keith Seitz  <keiths@onions.cygnus.com>
-
-	* register.tcl (but3): Don't pop up the right-click menu if we are
-	running.
-
-	* download.tcl (download_it): Force an update so that all windows
-	are created and get their busy hooks called.
-
-	* console.tcl (invoke): Make sure we are not running.
-	(busy): New method.
-	(idle): New method.
-
-	Mon Mar 23 15:00:57 1998  Drew Moseley  <dmoseley@cygnus.com>
-
-	* src.tcl: (location): Assume we are locating main() if the target is
- 	not running and we can't figure out which function we are in.
-
-	* main.tcl (run_executable): Change to assembly mode when we try to
- 	load a blank file.  This usually means that source level debugging
- 	was not enabled when this file was compiled.
-	
-	Reverse the parameters to src method::location() method invocation so
-	they are in the correct order
-
-	Mon Mar 23 12:04:23 1998  Martin M. Hunt  <hunt@cygnus.com>
-
-	* src.tcl (update): Comment out debug lines.
-
-	* main.tcl (set_target_name): If the target name changes,
-	force a new "file" command to be issued by setting
-	gdb_exe_changed.
-
-	Sat Mar 21 00:09:37 1998  Martin M. Hunt  <hunt@cygnus.com>
-
-	* download.tcl (download_it): Remove call to run_idle_hooks.
-
-	* src.tcl (no_inferior): Call set_execution_status.
-
-	* bp.tcl (bp_modify, bp_delete): Change to take an entry 
-	number.
-	(update): Sometimes "create" calls are for existing
-	breakpoints and should be "modified" calls. Detect this
-	and pass the entry number to bp_delete or bp_modify.
-
-	Fri Mar 20 22:50:55 1998  Tom Tromey  <tromey@cygnus.com>
-
-	* console.tcl (insert): Remove all \r characters from string to be
-	inserted.
-
-	Fri Mar 20 01:55:14 1998  Keith Seitz  <keiths@cygnus.com>
- 
- 	* watch.tcl (validateEntry): Fencepost for running.
- 
- 	* variables.tcl (VariableWin): Use "add_hook_before".
- 	(idle_done): New gdb_idle_done_hook for this object.
- 	(update): Don't call enable_ui here.
- 	(enable_ui): Change cursor for this object.
- 	(disable_ui): Ditto.
- 	(no_inferior): Ditto.
- 
- 	* toolbar.tcl (GDBToolBar): Use "add_hook_before".
- 
- 	* stack.tcl (StackWin): Use "add_hook_before".
- 	(StackWin): Encapsulate creation of this object with
- 	busy and idle hooks so that the user gets some feedback and to
- 	prevent other widgets from attempting to update.
- 	(update): Add some sanity checking so that we do not update with
- 	garbage in the window.
- 	(idle_done): New gdb_idle_done_hook for this object.
- 	(change_frame): Fencepost for running.
- 	(busy): New gdb_busy_hook for this object.
- 	(no_inferior): New gdb_no_inferior_hook for this object.
- 	(cursor): New helper method to set the cursor of all subwindows.
- 
- 	* src.tcl (SrcWin): Use "add_hook_before".
- 	(toggle_updates): Use "add_hook_before".
- 	(stack): Encapsulate creation of the stack object with
- 	busy and idle hooks so that the user gets some feedback and to
- 	prevent other widgets from attempting to update.
- 	(idle_done): New gdb_idle_done_hook for this object.
- 	(set_execution_status): When Program is Terminated..., reset
- 	gdb_running.
- 	(config_win): Pull mouse pointer cursor assignments in text widget
- 	out into a separate function.
- 	(bind_src_tags): New method to set the cursor for the window's text
- 	widget tags.
- 	(disable_ui): Call bind_src_tags to change cursor to "watch".
- 	(enable_ui): Ditto.
- 	(no_inferior): Ditto.
- 	(cursor): New helper method to set the cursor of all subwindows.
- 
- 	* register.tcl (RegWin): Encapsulate creation of this object with
- 	busy and idle hooks so that the user gets some feedback and to
- 	prevent other widgets from attempting to update.
- 	Use "add_hook_before".
- 	(reg_select_up): Fencepost for running.
- 	(reg_select_down): Fencepost for running.
- 	(reg_select_right): Fencepost for running.
- 	(reg_select_left): Fencepost for running.
- 	(reg_select): Fencepost for running.
- 	(edit): Fencepost for running.
- 	(idle_done): New gdb_idle_done_hook for this object.
- 	(busy): New gdb_busy_hook for this object.
- 
- 	* memory.tcl (MemWin): Encapsulate creation of this object with
- 	busy and idle hooks so that the user gets some feedback and to
- 	prevent other widgets from attempting to update.
- 	Use "add_hook_before".
- 	(create_prefs): Fencepost for running.
- 	(idle_done): New gdb_idle_done_hook for this object.
- 	(edit): Fencepost for running.
- 	(newsize): Fencepost for running.
- 	(busy): New method to block UI while running inferior.
- 	(do_popup): Fencepost for running.
- 	(cursor): New method to change the cursor definition for this
- 	object.
- 
- 	* manage.tcl (manage_init): Use "add_hook_before".
- 
- 	* main.tcl (run_executable): Use "run_idle_hooks".
- 
- 	* ide.tcl (gdbtk_ide_init): Don't create the source window here.
- 
- 	* interface.tcl: Define new hook "gdb_idle_done_hook" -- to be called
- 	when the debugger does completely idle to allow input to objects
- 	again.
- 	(run_idle_hooks): New procedure to wrap the idle hooks.
- 	(gdbtk_tcl_idle): Split the idle callbacks into two parts: one that
- 	only updates widgets and one that tells widgets to accept input
- 	again.
- 
- 	* download.tcl (Download): Use add_hook_before instead of add_hook.
- 	(download_it): Use run_idle_hooks instead running the idle hooks
- 	directly.
- 
- 	* bp.tcl (BpWin):  Use add_hook_before instead of add_hook.
- 
-        Wed Mar 18 18:59:00 1998  Sean Mahan  <smahan@cygnus.com>
-
-	* download.tcl (download_hash): Added an 'update' so the
-	status bar would work on an MBX board.
-
-	Wed Mar 18 01:50:19 1998  Martin M. Hunt  <hunt@cygnus.com>
-
-	* prefs.tcl (pref_set_defaults): Define gdb/src/tab_size
-	to default to a tab size of 4.
-
-	* src.tcl (setTabs): Set up tabs correctly.
-
-	* download.tcl (download_it): Set correct state after
-	user cancels download.
-
-	Tue Mar 17 12:30:23 1998  Tom Tromey  <tromey@cygnus.com>
-
-	* console.tcl (throttle): New public variable.
-	(insert): Delete initial text when past the throttle limit.
-
-	Tue Mar 17 13:31:38 1998  Keith Seitz  <keiths@onions.cygnus.com>
-
-	* ide.tcl (gdb_exit_check): Do not let gdb confirm the quit if we
-	are downloading.
-
-	Tue Mar 17 13:25:22 1998  Keith Seitz  <keiths@onions.cygnus.com>
-
-	* console.tcl (insert): Force update of screen.
-
-	Mon Mar 16 10:22:00 1998  Sean Mahan  <smahan@cygnus.com>
-
-	* toolbar.tcl (create_menu_items): Added 'Submit PR' to the
-	help menu.  For PR15334
-
-	Sun Mar 15 15:01:27 1998  Tom Tromey  <tromey@cygnus.com>
-
-	* interface.tcl (gdbtk_tcl_fputs): Don't call update.
-
-	* src.tcl (build_win): Changed capitalization on balloon help.
-
-	Fri Mar 13 10:01:48 1998  Keith Seitz  <keiths@onions.cygnus.com>
-
-	* src.tcl (mode): Add a horizontal scrollbar to the assembly pane
-	of SRC+ASM mode when necessary.
-
-	Fri Mar 13 00:47:59 1998  Martin M. Hunt  <hunt@cygnus.com>
-
-	* main.tcl (run_executable): Don't force downloads for sim.
-
-	* download.tcl (download_it): Don't bother calling calling set_baud 
-	for sim.
-
-	* manage.tcl (manage_delete): Deregister the window before deleting
-	it to prevent those annoying bgerror messages.
-
-	Thu Mar 12 15:28:22 1998  Keith Seitz  <keiths@onions.cygnus.com>
-
-	* download.tcl (Download): Define a list of all sections.
-	(update_download): Loop through the list of sections, updating the
-	current section's progress and marking any previously loaded sections
-	as done, if needed.
-	(do_download_hooks): New procedure.
-	(download_hash): Use a timer to force update of GUI at regular
-	intervals -- GUI should not update 10,000 times a second.
-
-	Tue Mar 10 06:32:24 1998  Keith Seitz  <keiths@onions.cygnus.com>
-
-	* interface.tcl (gdbtk_tcl_query): Allow caller to specify the default
-	button. If none is specified, it is set to 'yes'.
-
-	* manage.tcl (manage_delete): While inferior is running, gdb_cmd returns
-	immediately, so we need to manually ask the user if he wants to quit.
-
-	Tue Mar 10 10:52:09 1998  Martin M. Hunt  <hunt@cygnus.com>
-
-	* download.tcl (download_it): Change where old breakpoints
-	are cleared.
-	(done): Set focus on "OK" or delete.
-
-	Tue Mar 10 05:23:42 1998  Keith Seitz  <keiths@onions.cygnus.com>
-
-	* src.tcl (do_key): New method to wrap all keypresses.
-	(mode): Use do_key method.
-	(config_win): Use do_key method.
-
-	Mon Mar  9 23:06:21 1998  Martin M. Hunt  <hunt@cygnus.com>
-
-	* src.tcl (download_progress): Add an optional message
-	parameter to the function for use with error messages.
-	Don't set_status twice on cancel. Call update if
-	load fails.
-
-	* download.tcl (done): If 'msg' is set, it should be
-	displayed and download has failed. Update all source
-	windows.
-	(cancel): Don't delete window here.  Let it get deleted
-	after call to method 'done'.
-	(download_it): If download failed, call done method
-	with error message. Force reissue of target command.
-	Handle set_target failures.
-
-	* main.tcl (set_target): Check result of target command
-	to see if the user cancelled the command.
-	(run_executable): Use gdb_program_has_run instead of 
-	gdb_app_running, which was removed everywhere. Force
-	download when gdb_program_has_run. If user cancels download
-	before the download starts, preserve previous state.
-
-	Mon Mar  9 15:06:21 1998  Martin M. Hunt  <hunt@cygnus.com>	
-
-	* console.tcl (invoke): After gdb_immediate() finishes
-	check to see if the window is still there.
-
-	* main.tcl: Initialize gdbtk_state(console).
-
-	* interface.tcl: Remove some unused globals. Replace gdb_console 
-	with gdbtk_state(console).
-	(gdbtk_tcl_readline_*): Don't set gdbtk_state(console) every
-	time.  Let manage.tcl do it.
-
-	* manage.tcl (manage_create): Replace gdb_console with
-	gdbtk_state(console).  Check for windows that were deleted,
-	but not actually gone yet.
-	(manage_delete): Replace gdb_console with gdbtk_state(console).
-
-	Mon Mar  9 09:08:11 1998  Keith Seitz  <keiths@onions.cygnus.com>
-
-	* watch.tcl (build_win): Tweak layout of the entry and button, 
-	switching to grid geometry manager.
-
-Thu Mar 26 01:22:23 1998  Martin M. Hunt  <hunt@cygnus.com>
-
-	* target.tcl: New file. Implements target dialog.
-	
-	* srcbar.tcl (_set_run): Remove because it was no longer used.
-
-	* util.tcl (freeze): Only call idewindow_freeze when
-	using the IDE.
-
-	* prefs.tcl (pref_set_defaults): Set default tab size to 4.
-
-	* src.tcl (location): If gdb_listfuncs cannot find
-	functions, display error message.
-	(setTabs): Set real tabs according to gdb/src/tab_size.
-
-	* main.tcl (set_exe): Check to see if file was stripped.
-	Cannot debug without some symbols.
-	(set_target_name): If target changes, set gdb_exe_changed
-	so new "file" command will be sent. When not using IDE,
-	display target requester.
-
-	* manage.tcl: Set loadpref to GdbLoadPref.
-	
-Wed Mar 25 14:13:52 1998  Elena Zannoni  <ezannoni@kwikemart.cygnus.com>
-
-	* manage.tcl (manage_init) added tracedlg and actiondlg windows.
-
-Wed Mar 25 14:08:51 1998  Elena Zannoni  <ezannoni@kwikemart.cygnus.com>
-
-        * interface.tcl (gdbtk_tcl_pre_add_symbol): New procedure.
-        (gdbtk_tcl_post_add_symbol): New procedure.
- 
-        * src.tcl (set_execution_status): Use "set_status" to write to the
-        status bar, not "set Status".
-
-Mon Mar 23 13:41:39 1998  Elena Zannoni  <ezannoni@kwikemart.cygnus.com>
-
-       * memory.tcl: Changes to support new faster gdb_get_mem().
-       (do_popup): Add "Go To" and Open New Window" to the popup
-       menu.
-
-Sat Mar 21 21:18:06 1998  Elena Zannoni  <ezannoni@kwikemart.cygnus.com>
-
-        Merged changes from Foundry (list follows in reverse chronological
- 	order)
-
-        Sean Mahan  <smahan@cygnus.com>
-	* download_pref.tcl (help): Added method to display context 
-	sensitive help.
-
-        Keith Seitz  <keiths@onions.cygnus.com>
-	* src.tcl (bp_line): Don't insert breakpoints if we're running.
-	(disable_ui): Disable selections. Workaround for TkTextDisplay bug.
-	(enable_ui): Enable selections.
-	(no_inferior): Enable selections.
-
-        Tom Tromey  <tromey@cygnus.com>
-	* toolbar.tcl (create_menu_items): Use gdb_immediate, not gdb_cmd,
-	so that output appears in console window.
-	* src.tcl (bp_line): Use gdb_immediate when running "continue".
-	(mode): Use gdb_immediate, not gdb_cmd, so that output appears in
-	console window.
-	(config_win): Likewise.
-	* srcbar.tcl (create_buttons): Use gdb_immediate, not gdb_cmd, so
-	that output appears in console window.
-	* console.tcl (lvarpush): Removed.
-	(_insertion): New method.
-	(_saved_insertion): New private variable.
-	(constructor): Don't let user use mouse to put cursor outside
-	command line.
-	* src.tcl (build_win): Use global/status font on status bar.
-	* interface.tcl (gdbtk_tcl_query): Moved vwait out of `if'
-	statement -- must vwait in all cases, not just in case when
-	question is actually asked.
-
-        Keith Seitz  <keiths@onions.cygnus.com>
-	* variables.tcl (deleteTree): Reset Locals and ChangeList, too.
-
-        Martin M. Hunt  <hunt@cygnus.com>
-	* toolbar.tcl (enable_ui): Don't always set stepi and nexti
-	buttons on.
-
-        Keith Seitz  <keiths@onions.cygnus.com>
-	* toolbar.tcl (no_inferior): Instead of enabling/disabling the
-	individual menus on Windows, disable each menu's entries.
-	(disable_ui): Ditto.
-	(enable_ui): Ditto.
-
-        Keith Seitz  <keiths@onions.cygnus.com>
-	* manage.tcl (manage_delete): Catch destruction of the src window when
-	downloading and ask user if this is what he intends.
-	(manage_init): Don't install idle, busy, and no_inferior hooks. Allow gdb
-	to exit whenever the user wants to.
-	* srcbar.tcl (cancel_download): download_cancel_ok is a global.
-
-        Martin M. Hunt  <hunt@cygnus.com>
-	* ide.tcl (receive_file_changed): Minor fix when a new
-	executable is built when GDB is running.
-
-        Martin M. Hunt  <hunt@cygnus.com>
-	* bp.tcl (bp_delete): If a selected breakpoint is deleted, 
-	set "selected" to 0.
-
-        Keith Seitz  <keiths@onions.cygnus.com>
-	* srcbar.tcl (cancel_download): New method to cancel downloads. Needed
-	to cancel download dialog-enabled downloads.
-	(_set_runstop): Call cancel_download.
-	* download.tcl (Download::constructor): Make sure to set the toolbar
- 	properly so that the Stop/Cancel button cancels a download.
-	(download_it): Force the CANCEL to all download_progress_hook's.
-	* src.tcl (download_progress): Add special section identifier for
-	canceled downloads.
-	(SrcWin::destructor): Pass the state_hook's command to remove_hook.
-
-        Sean Mahan  <smahan@cygnus.com>
-	* toolbar.tcl (create_menu_items): Help menu follows "Help Topics"
-	standard (PR 15082).
-
-        Tom Tromey  <tromey@cygnus.com>
-	* interface.tcl (gdbtk_tcl_query): Consolidate Windows case; must
-	`vwait' even when question is already being asked.
-
-        Martin M. Hunt  <hunt@cygnus.com>
-	* interface.tcl (gdbtk_tcl_query): Only use ide_messageBox
-	on Windows.
-
-        Martin M. Hunt  <hunt@cygnus.com>
-	* register.tcl: Catch several gdb_register commands
- 	so errors don't bother us.
-	* variables.tcl (destructor): Remove all hooks.
-
-        Martin M. Hunt  <hunt@cygnus.com>
-	* download.tcl (done): Don't let seconds be zero.
-	* manage.tcl (manage_disable_all): Don't ever disable "."
-
-        Martin M. Hunt  <hunt@cygnus.com>
-	* main.tcl (run_executable): Removed delete_breakpoints
-	stuff.
-	* download.tcl (download_it): Removed delete_breakpoints
-	stuff.  Clear any breakpoints at exit and main before
-	restarting.  They get set again automatically if the
-	preferences say they should.
-	(Download): Don't call freeze on download window, because
-	it stops updating when we do.
-	(update): Renamed to update_download to avoid confusion.
-	* src.tcl (mode): When changing from SRC+ASM to another
-	mode, unset "awin".
-	(bp_line): On a "Continue to Here" don't try to
-	restore breakpoints that didn't exist before.
-
-        Tom Tromey  <tromey@cygnus.com>
-	* interface.tcl (gdbtk_tcl_query): Set -parent on dialog.
-
-        Martin M. Hunt  <hunt@cygnus.com>
-	* src.tcl (build_win): Set mode combobox width to 10.
-	(goto_func): If a function name is an unmangled one,
-	it is a C++ method so don't prepend filename when
-	setting location.  This is a kludge, but we are limited
-	by the symtax the GDB command line parser will accept.
-	(location): When loading function combobox,
-	remember which names are unmangled. Change width of
-	function combobox dynamically to better accomodate
-	those long C++ names.
-
-        Martin M. Hunt  <hunt@cygnus.com>
-	* src.tcl (bp_line): When doing a "continue to here",
-	first save states of all breakpoints then restore
-	when finished.
-	(config_win): Uncomment "Continue to Here" menu item.
-
-        Martin M. Hunt  <hunt@cygnus.com>
-	* src.tcl (location): Use ide_cygwin_path on Windows
-	to change project root to the right format.
-
-        Drew Moseley  <dmoseley@cygnus.com>
-	* main.tcl: (run_executable): Modified to call download_it
-	with the parameter indicating whether to delete breakpoints.
-	If GDB is loaded ($gdb_loaded == 1) and the app is running
-	($gdb_app_running == 1) then we don't delete the breakpoints.
-	All other situations will require deleting the breakpoints.
-	This allows us to redownload and run the same executable w/o
-	losing the breakpoint information.
-	* download.tcl: (download_it): Modified this routine to
-	take a boolean parameter indicating whether to delete
-	the breakpoints before downloading.
-
-        Sean Mahan  <smahan@cygnus.com>
-	* toolbar.tcl (create_menu_items): Couldn't use 'helpdir'
-	variable so used Paths(prefix) and added help.
-
-        Martin M. Hunt  <hunt@cygnus.com>
-	* src.tcl (set_state): Turn off debugging.
-	(location): Map windows pathnames into form GDB uses
-	internally.
-	(bp_line): Use gdb_set_bp to set breakpoints on
-	a specific line in a file.
-
-        Martin M. Hunt  <hunt@cygnus.com>
-	* stack.tcl (update): Skip over any empty elements
-	in parsing the stack line to get the correct PC.
-
-        Keith Seitz  <keiths@onions.cygnus.com>
-	* download.tcl (download_it): Run gdb_busy_hook's.
-	If anything fails, make sure that the no_inferior_hook's are run.
-	Note errors that occur during downloading, ignoring the
-	"cancelled download" message. If an error occurs, set the
-	global gdb_download_error to the error message so that it can
-	be shown to the user later. Don't run the idle hooks if nothing
-	* src.tcl (download_progress): Do not rely on the value of
-	"download_cancel_ok" -- it is cleared in download_it.
-	Reorder code to take advantage of gdb_loaded and gdb_download_error
-	to determine if a download was canceled, successful, or failed due
-	to an error. Truncate the "DOWNLOAD FINISHED:" message so that it
-	will fit into the status bar given the recent font changes.
-	(busy): If gdb_loaded, set the status bar to read "Program is running."
-	Otherwise, don't touch it.
-	(config_win): Comment out "Continue to here" right-click menu item
-	until it can properly preserve breakpoint state.
-	(no_inferior): Configure the toolbar to -runstop 0. All of these
-	toolbar references should be done via the busy hook by the SrcBar
-	class itself someday...
-
-        Sean Mahan  <smahan@cygnus.com>
-	* toolbar.tcl (create_menu_items): Added ability to launch
-	the tour help file from the help menu.
-
-        Martin M. Hunt  <hunt@cygnus.com>
-	* manage.tcl, ide.tcl: Disable some debugging messages.
-
-        Martin M. Hunt  <hunt@cygnus.com>
-	* src.tcl (set_state): When loaded state changes, invalidate
-	current file.
-
-        Martin M. Hunt  <hunt@cygnus.com>
-	* src.tcl (SrcWin): Change default title to "Foundry Debugger".
-	(build_win): Change name and function combobox heights to 0.
-	Set status bar font to src-font.
-	(name): Rewrite to use _files array.  This array allows us
-	to map full pathnames with short names that are easily displayed.
-	(file): Call set_name to update name combobox.
-	(location): Call set_name to update name combobox. When setting
-	the function combobox, adjust height to a maximum of 10. CLear
-	filename combobox if there is no valid filename. When setting the
-	filename combobox, adjust height to a maximum of 10. Create
-	_files array mapping full pathnames to short names. For IDE, use
-	vmake/source-files and project-root to build full pathnames.
-	When changing mode, save current line. Don't mark current line
-	with PC_TAG if gdb_running is 0.
-	(set_name): New function. Update the name combobox, using
-	the short name from _files if available.
-	* bp.tcl (bp_modify, bp_add): Use short file name from
-	_files global array.
-
-        Keith Seitz  <keiths@onions.cygnus.com>
-	* variables.tcl (VariableWin): Add idle, busy, and no inferior hooks.
-	(selectionChanged): Use Running fencepost.
-	(updateNow): Use Running fencepost.
-	(editEntry): Use Running fencepost.
-	(postMenu): Use Running fencepost.
-	(setDisplay): Use Running fencepost.
-	(open): Use Running fencepost.
-	(close): Use Running fencepost.
-	(enable_ui): Define new procedure to install fencepost.
-	(disable_ui): Define new procedure to remove fencepost.
-	(no_inferior): Define new procedure to remove fencepost and clear tree.
-	(Running): New protected data. This is used as a fencepost in this object.
-	* main.tcl: Run gdb_no_inferior_hook's when done initializing.
-	* src.tcl (disable_ui): Disable the combo boxes, too.
-	(enable_ui): Enable the combo boxes, too.
-	* download.tcl (download_it): Run gdb_no_inferior_hooks, too.
-
-        Martin M. Hunt  <hunt@cygnus.com>
-	* main.tcl: Move IDE help initialization to ide.tcl.
-	* ide.tcl (gdbtk_ide_init): Move help system
-	initialization here.
-
-        Sean Mahan  <smahan@cygnus.com>
-	* main.tcl: Initialized help sub-system for the ide.
-
-        Tomy Hudson   <thudson@thudson5.cygnus.com>
-	* prefs.tcl: Changed COM1 back to com1 per Martins request.
-
-        Martin M. Hunt  <hunt@cygnus.com>
-	* src.tcl (file): Call gdb_loadfile to do most of the
-	work.
-
-        Tomy Hudson   <thudson@thudson5.cygnus.com>
-	* prefs.tcl: Changed "com1" to "COM1"
-
-        <dmoseley@cygnus.com>
-	* main.tcl: (run_executable): Added code to test for app_running.
-	If the app has been started and the user requests a "run", then
-	we must redownload to ensure that the global initialized data is
-	handled properly.
-	* download.tcl: (download_it): See above note.
-
-        Sean Mahan  <smahan@cygnus.com>
-	* toolbar.tcl (create_menu_items): changed "Tutorial" to "Cygnus
-	Foundry Tour" in the Help menu.
-
-        Tom Tromey  <tromey@cygnus.com>
-	* memory.tcl (mem_del): "destroy forget" is invalid; use "destroy"
-	instead.
-	* interface.tcl (gdbtk_tcl_query): Only ask each question once.
-
-        Martin M. Hunt  <hunt@cygnus.com>
-	* manage.tcl (manage_init): Initialize new global 
-	_manage_enabled_flag to 1.
-	(manage_disable_all): Only disable if
-	_manage_enabled_flag is 1.
-	(manage_enable_all): Only enable if _manage_enabled_flag
-	is not 1.
-
-        Martin M. Hunt  <hunt@cygnus.com>
-        * manage.tcl (manage_iconify): Check for toplevel
-        of "." before doing anything.
-        * main.tcl (set_target_name): Use "pref getd" in
-        case port is undefined.
-
-        Keith Seitz  <keiths@onions.cygnus.com>
-	* toolbar.tcl (GDBToolBar::constructor): Add appropriate idle, busy, and
-	no-inferior hooks for this class.
-	(create_buttons): Add all buttons to two lists so we can disable or enable
-	them according to the inferior's run state.
-	(create_menu_items): Same with the menus.
-	* srcbar.tcl (create_buttons): Add all buttons to two lists so we can disable
-	or enable them according to the inferior's run state.
-	(create_menu_items): Same with the menus.
-	(_set_run): Don't do anything to disable UI elements: the idle, busy, and
-	no_inferior hooks will take care of it.
-	(_set_runstop): Don't do anything to disable UI elements: the idle, busy, and
-	no_inferior hooks will take care of it.
-	* manage.tcl (manage): Add two new manage protocols: enable_all and
-	disable_all.
-	(manage_disable_all): New procedure to disable window manager functions
-	such as window deletions.
-	(manage_enable_all): New procedure to undo any changes made by
-	manage_disable_all.
-	(_manage_set_property): New helper procedure for above.
-	(manage_init): Install this module's idle, busy, and no_inferior hooks.
-	* src.tcl (SrcWin::constructor): Add new no_inferior hook.
-	(disable_ui): New procedure to disable ui elements.
-	(enable_ui): New procedure to enable_ui elements.
-	(no_inferior): New procedure to reset GUI.
-	(SrcWin::Running): New protected variable. A fencepost for the above
-	hooks.
-	(do_popup): Use above fencepost.
-	(showBalloon): Use above fencepost.
-	* main.tcl: Define new hook " gdb_no_inferior_hook".
-
-        Martin M. Hunt  <hunt@cygnus.com>
-	* src.tcl (SrcWin): Immediately set title name
-	to "Debugger".
-
-        Martin M. Hunt  <hunt@cygnus.com>	
-	* download_pref.tcl (LoadPref): Make window transient.
-
-        Martin M. Hunt  <hunt@cygnus.com>
-	* register.tcl (build_win): Set scrollbars to auto
-	on Unix.
-	* stack.tcl (build_win): Set scrollbars to auto
-	on Unix.
-	* memory.tcl (build_win): Restore proper resize
-	functioning on Unix.
-	* bp.tcl (build_win): Fix problem with merging Tom's
-	sizebox change.  Fix Tom's change so scrollbars aren't
-	always on on Unix, at least.
-	* interface.tcl (gdbtk_pc_changed): Called from GDB when
- 	the PC is changed with a "set $pc" command.
-	(gdb_show_command, gdb_args, gdb_stack_trace, 
-	gdb_docstring,gdb_stack_depth, gdb_stack_frame): Removed. 
-
-        Martin M. Hunt  <hunt@cygnus.com>
-	* memory.tcl (destructor): Destroy memory prefs window
- 	if one exists.
-	(create_prefs): Make prefs window transient.
-	* util.tcl (freeze): Make keep_raised an option.
-	
-        Martin M. Hunt  <hunt@cygnus.com>
-	* ide.tcl (receive_file_changed): Ignore object file 
-	changes.  On source file changes, put up a messagebox
-	warning the user. Change both messageboxes to be system
-	modal, which seems to just mean they will be on top.
-
-        Martin M. Hunt  <hunt@cygnus.com>
-	* download.tcl (download_it): Reset download_cancel flag.
-	* src.tcl: Create "tagtype" as a protected variable
- 	containing the current tag mode; PC, BROWSE, or STACK.
-	Change all functions to use it.
-	(mode): Fix problem with changing modes
-	while browsing stack functions.
-	(name): Add good filenames to the combobox history.
-	(SrcWin): Turn off automatic history in name combobox.
-	(file): If filename is not found, but is part of sources,
-	put it in combobox followed by "(not found)"
-	(location): Reorder and restructure this function to
-	be more robust when files cannot be found or mode changes
-	are required.  When stack browsing, highlight PC if it is
-	in the displayed area, and fix the off-by-1 problem
-	with PCs saved on the stack.
-	(update): Use lassign and new tagtype variable.
-	(set_execution_status): Change message formats for MIXED
-	and SRC+ASM modes.
-	(mode): Update toolbar and mode display before calling
-	location. Use tagtype so tag mode is preserved.
-	* bp.tcl (bp_type): Deselect line before changing its
-        type.
-  
-        Tom Tromey  <tromey@cygnus.com>
-	* bp.tcl (build_win): Use built-in sizebox of tixScrolledWindow.
-	* watch.tcl (console): Set Sizebox to 0.
-	* memory.tcl (build_win): Use built-in sizebox of
-	tixScrolledWindow.
-	* stack.tcl (build_win): Use built-in sizebox of
-	tixScrolledWindow.
-	* locals.tcl (build_win): Don't create sizebox.
-	* variables.tcl (build_win): Use built-in sizebox of
-	tixScrolledWindow.
-	(Sizebox): New instance variable.
-	* console.tcl (console): Use built-in sizebox of
-	tixScrolledWindow.
-	* register.tcl (build_win): Use built-in sizebox of
-	tixScrolledWindow.
-
-        Martin M. Hunt  <hunt@cygnus.com>
-	* main.tcl (set_target_name): Set port based on target
-	name.
-	(set_baud): Set baud rate based on target name.
-	* srcbar.tcl: Change shortcuts to use () instead of <>.
-	* download.tcl (download_it): Set download_verbose
-	based on target name.
-	* src.tcl (build_win): Set height to 0 for name and 
-	function comboboxes.
-	(location): In IDE, use vmake/source-files property 
-	to fill name combobox.
-
-        Keith Seitz  <keiths@onions.cygnus.com>
-	* variables.tcl (build_win): Set the variable window's 
-	default size to 40 chars.
-
-        Martin M. Hunt  <hunt@cygnus.com>
-	* src.tcl (set_state): When loaded state changes,
-	set program_has_run state to 0.
-
-        Martin M. Hunt  <hunt@cygnus.com>
-	* src.tcl (set_status): Rewrite to handle temporary
-	status messages.
-	(set_execution_status): New function. Put a message
-	about the current program status in the status bar.
-	(trace_help): New function. Trace on changing ballon
-	help messages.  Write them in the status bar.
-	* main.tcl (set_target): Comment out changing cursor.
-
-        Martin M. Hunt  <hunt@cygnus.com>
-	* variables.tcl (changeValue): Trim string before
-	comparing with "".
-
-        Keith Seitz  <keiths@onions.cygnus.com>
-	* console.tcl (constructor): Set no wrap mode.
-	* src.tcl (SrcWin::name): Make sure we ask gdb where the source file
-	is before asking the source window to open it.
-	(SrcWin::file): Do not ask gdb where the file is -- someone else
-	already has. Set the file selector to the filename only once and
-	only if successful finding the file.
-	(SrcWin::location): Add flag idicating that a file load has failed. 
-	Resolves recursive loop with SrcWin::mode and SrcWin::location.
-	Make sure the file and function selectors are filled only once.
-	(SrcWin::mode): Add error flag to indicate that a file load failed. 
-	Resolves recursive loop with SrcWin::location.
-	Make sure we exit with the proper mode set on the source window.
-	(SrcWin::current_addr): Define a default value of 0x0.
-	* console.tcl (invoke): Use new gdb_immediate command instead of 
-	gdb_cmd.
-	(insert): Add all errors to the end of the text widget.
-	Send errors to end of text widget, not insertion pt.
-	(einsert): Send errors to end of text widget, not insertion pt.
-	* interface.tcl (gdbtk_tcl_readline_begin): Insert message into
-	command window so that the user sees messages like "Enter commands, 
-	one per line. Enter 'end' when finished."
-	* main.tcl: Initialize gdbtk_state(readline).
-	
-        Tom Tromey  <tromey@cygnus.com>
-	* manage.tcl (manage_open): Force focus onto toplevel.
-	* mem_pref.tcl (build_win): Don't put <Return> binding on
-	toplevel; instead put focus on OK button.
-
-        Martin M. Hunt  <hunt@cygnus.com>
-	* main.tcl (set_target_name): Replace "com1" with
-	the port name we really want to use.
-	* bp.tcl (build_win): Use place manager for sizebox
-	so it doesn't go away when window is resized.
-	* stack.tcl (build_win): Fix stack window.
-	* memory.tcl: Back out previous changes.
-	* locals.tcl (build_win): Use place manager for sizebox
-	so it doesn't go away when window is resized.
-
-        Tom Tromey  <tromey@cygnus.com>
-	* mem_pref.tcl (build_win): Make OK button default.
-	* ide.tcl (gdbtk_ide_init): Set gdb_pretty_name.  Track changes to
-	target-pretty-name property.
-	* src.tcl (update_title): Display pretty name for target.
-	* main.tcl (set_target): Display pretty name for target.
-	(gdb_pretty_name): New global.
-	* ide.tcl (target_pretty_name_changed): New proc.
-	(receive_file_changed): Display pretty name for target.
-	* download.tcl (download_it): Display pretty name for target.
-	(console): Likewise.
-
-        Thomas Hudson  <thudson@cygnus.com>
-	* bp.tcl (build_win): Added frame and sizebox to bottom.
-	Returned geometry management to previous packing style
-	and window layout.
-	* stack.tcl (build_win): ditto
-	* memory.tcl (build_win): ditto
-	* watch.tcl (build_win): ditto
-	* locals.tcl (build_win): ditto 
-
-        Martin M. Hunt  <hunt@cygnus.com>
-	* manage.tcl (manage_iconify): Catch iconify command.
-	* download.tcl (download_it): If set_target fails,
-	set gdb_downloading to 0 and return.
-	* main.tcl (set_target): Handle target command timeouts.
-	Pop up messagebox.  Set cursor to "watch". Set title
-	on source window.  Return 0 on error.
-
-        Martin M. Hunt  <hunt@cygnus.com>
-	* manage.tcl (manage_find): Fix to return a list of windows.
-	* console.tcl (Console): Fix sizebox so it doesn't create
-	a whole blank line and it doesn't mess up Unix.
-	* register.tcl (build_win): Change "Show" to "Display".
-
-        Tomy Hudson <thudson@cygnus.com>
-	* console.tcl (build_win) Added frame and ide_sizebox to
-	bottom of window. 
-	* stack.tcl (build_win) Added frame and ide_sizebox to
-	bottom of window. 
-	* watch.tcl (build_win) Added frame and ide_sizebox to
-	bottom of window.
-	* locals.tcl (build_win) Added frame and ide_sizebox to
-	bottom of window.
-
-        Tom Tromey  <tromey@cygnus.com>
-	* memory.tcl (build_win): Updated -underline values.
-
-        Martin M. Hunt  <hunt@cygnus.com>
-	* memory.tcl (init_addr_exp): New function. Set the
-	initial address expression to the location of .data
-	if it is defined. Otherwise use $pc.
-
-        Tom Tromey  <tromey@cygnus.com>
-	* bp.tcl (build_win): Changed packing so content fills window.
-	Removed `g' and `a' frames.  Changed gridding on labels.
-	(bp_add): Changed gridding on new entries.
-	* memory.tcl (build_win): Put spaces in front of all menu labels.
-
-        Martin M. Hunt  <hunt@cygnus.com>
-	* download.tcl (download_it): Change error to messagebox.
-
-        Tom Tromey  <tromey@cygnus.com>
-	* register.tcl (reg_display_list): Initialize to empty list.
-	(init_reg_display_vars): Don't unset reg_display_list; set it to
-	empty list.
-	(delete_from_display_list): Likewise.
-
-        Martin M. Hunt  <hunt@cygnus.com>
-	* ide.tcl (ide_run_server, ide_do_run_server): Take 
-	an optional argument to indicate if program should be 
-	run or simply downloaded.
-	* console.tcl (Console): Enable scrollbars in both 
-	directions.
-	* main.tcl: Moved keep_raised, sleep, and toggle_debug_mode
-	to util.tcl.
-	(set_exe): If exe changed, set gdb_target_changed
-	to force new target command to be sent.
-	(set_target_name): Check to see if gdb_target_changed.
-	(run_executable): If exe or target changed, set gdb_loaded to
-	0, forcing a new download. If download only, try to
-	display function main in source window.
-	* util.tcl: New file.
-	* hooks.tcl: Removed. Use version in libide.
-	* Makefile: Add util.tcl.
-	* download.tcl (Download): Call freeze to make modal window.
-	(_map): Deleted.
-	(download_it): Call set_baud, then set_exe then set_target.
-	* mem_pref.tcl (build_win): Set default number of bytes
- 	to 128.
-	* memory.tcl (build_win): Enable horizontal scrollbar
-	when in resize mode.  Anchor to top-left. Use "nb" to
-	count actual number of bytes displayed, instead of "numbytes"
-	which will be 0 when in resize mode.
-	(delete_prefs): Deleted.
-	* src.tcl (mode): Update mode combobox with new mode name.
-	(location): In SRC+ASM mode if we step into a function without
-	source code, unhighlight everything in the source pane and let
-	the assembly pane show our current location.
-	(build_win): Enable scrollbars in both directions.
-	(set_state): Call update_title.
-	(update_title): Don't set title if the target or exe has changed.
-	(trace_variable):  Couldn't figure out what this did that
-	could be useful so delete it and everything that references it.
-	* watch.tcl: Add description and copyright.
-	* variables.tcl, interface.tcl, locals.tcl: Add copyright.
-	* prefs.tcl, register.tcl: Add copyright.
-
-        Tomy Hudson <thudson@cygnus.com>
-	* register.tcl (reg_select_): Modified reg_select_* movement
-	methods to use the register display list instead of
-	a straight index.  
-	
-        Tomy Hudson <thudson@cygnus.com>
-	* register.tcl (unedit): Changed input focus to $ScrolledWin.$Editing
-	in unedit. This allows arrow and tab key bindings to work
-	after an edit.
-	
-        Tomy Hudson <thudson@cygnus.com>
-	* register.tcl (build_win): Added key bindings and support
-	for tab and arrow keys, including four new methods;
-	reg_select_up,reg_select_down, reg_select_left, reg_select_right
-	* register.tcl (build_win): Added spacing frame and ide_sizebox
-	to window. Changed geometry manager to grid.
-	
-        Martin M. Hunt  <hunt@cygnus.com>
-	* stack.tcl (update): Only insert entries that have
-	length.  Break when matching entry in listbox is found.
-	* src.tcl (config_win): Fix control-v binding so
-	it doesn't paste on Windows. Cancel <Delete>
-	binding.
-
-        Martin M. Hunt  <hunt@cygnus.com>
-	* src.tcl (build_win): Force focus from toplevel
-	down to text window.
-	(mode): Restructure code to be clearer. Set focus
-	when done.
-
-        Tomy Hudson <thudson@cygnus.com>
-	* src.tcl (mode): Modified key bindings for MIXED mode
-	to be the same as ASSEMBLY mode
-
-        Martin M. Hunt  <hunt@cygnus.com>
-	* manage.tcl (manage_init): set bp-save to 1.
-	* variables.tcl (changeValue): If new value is null,
-	cancel edit.
-
-        Tomy Hudson <thudson@cygnus.com>
-	* memory.tcl (do_popup): Added method do_popup. Changed binding of
-	button-3 to invoke popup menu.
-	 
-        Tomy Hudson <thudson@cygnus.com>
-	* src.tcl (do_popup): Removed check for space in variable name
-	that disabled popup menu items. Only check now is for "".
-	         
-        Tomy Hudson <thudson@cygnus.com>
-	* src.tcl (do_popup): Removed variable name from
-	popup menu items. Added check for sane variable in selection
-	to disable menu items when appropriate.
-	
-        Martin M. Hunt  <hunt@cygnus.com>
-	* bp.tcl (bp_delete): Destroy widgets in deleted
-	line.
-	* srcbar.tcl (_set_run): Enable View menu items
-	when download is finished.
-	* download_pref.tcl (LoadPref): Call loadprefs
-	with gdbrunning set to 1.
-
-        Tom Tromey  <tromey@cygnus.com>
-	* ide.tcl (gdbtk_ide_init): Use property vmake/exelist, not
-	vmake-exelist.
-
-        Martin M. Hunt  <hunt@cygnus.com>
-	* variables.tcl (build_menu_helper): Comment-out 
-	Update menu.
-	(getVariables): Change variable name so it doesn't
-	get confused with window variables.
-	(postMenu): Comment-out Update entries.
-	(UnEdit): Unbind keys when unediting.
-	* memory.tcl (create_prefs): When prefs are already
-	open, raise and focus the window.
-	* bp.tcl (bp_type): Deselect current line when type changes.
-
-        Martin M. Hunt  <hunt@cygnus.com>
-	* toolbar.tcl (create_menu_items): Call open_url for
-	web connections.
-	* src.tcl (name): When new file load fails, remove it
-	from combobox. When load succeeds, clear status message.
-	(location): Change how files are loaded into combobox.
-	Call new gdb_listfiles function.
-
-        Martin M. Hunt  <hunt@cygnus.com>
-	* manage.tcl (manage_create): Give newly created windows
-	the focus on all platforms.
-	* mem_pref.tcl (destructor): Notify parent when exiting.
-	* srcbar.tcl (_set_run): Better state handling on
-	pulldowns and icons.
-	* src.tcl (build_win): Start with toolbar in right state.
-	* memory.tcl (MemWin): Withdraw window until finished.
-	(delete_prefs): New function.
-
-        Martin M. Hunt  <hunt@cygnus.com>
-	* manage.tcl: For IDE, iconify all windows when source
-	window is iconified.
-	* mem_pref.tcl: Take out all the modal stuff.
-	Leave this window non-modal.
-	* download.tcl: Fix references to source window.
-	(Download): Make window modal and always on top.
-	* memory.tcl (destructor):  Kill mem prefs window too.	
-	* variables.tcl (changeValue): Clean up.
-	* register.tcl (acceptEdit): Change error messagebox.	
-
-        Martin M. Hunt  <hunt@cygnus.com>
-	* src.tcl (set_state): Disable items in breakpoint
- 	popups.
-	(config_win): Change capitalization in popups.
-
-        Martin M. Hunt  <hunt@cygnus.com>
-	* main.tcl: Major rewrite. Simplify. Move IDE
-	functions to new file. Add state variables and
-	hooks. Add copyright.
-	* ide.tcl: New file. IDE functions.
-	* download.tcl (download_it): Use new state variables.
-	* src.tcl: Use new state variables.
- 	(constructor): Add state hook.
-	(set_state): Hook to enable/disable menus and icons.
-	* srcbar.tcl (runstop): Renamed from "running"
-	(running): Public variable to control icons.
-	(_set_runstop): Change Running man to stop sign.
-	(_set_run): Enable/disable icons depending on debugger 
-	state.
-	* manage.tcl (create_closed): Deleted function.
-	(manage_create): Remove visibility argumnet.
-	(manage_delete): Remove special case for debugger prefs.
-	* prefs.tcl (pref_set_defaults): Remove gdb/advanced.
-	* hooks.tcl: Add copyright.
-	* Makefile: Add ide.tcl.
-
-        Tom Tromey  <tromey@cygnus.com>
-	* download_pref.tcl (LoadPref): Inherit from GdbLoadPref.
-	(constructor): Rewritten.
-	(build_win): Removed.
-	(change_baud): Removed.
-	(save): Removed.
-	(cancel): Removed.
-	(config): Removed.
-	(reconfig): Removed.
-
-        Martin M. Hunt  <hunt@cygnus.com>
-	* main.tcl (target_name_changed): Append correct
-	port name to target name.
-	(gdbtk_ide_init): Don't initialize IDE preferences.
-	Append port name to target name.
-	* toolbar.tcl (create_menu_items): Add Debugger Preferences
-	to File menu.
-	* pref.tcl: Remove all ide preferences functions.
-	* prefs.tcl (pref_set_defaults): Define gdb/load/port.
-	* download_pref.tcl: Added serial port selection.
-
-        Martin M. Hunt  <hunt@cygnus.com>
-	* register.tcl (acceptEdit): Remove leading spaces from
-	values.
-	* src.tcl (config_win): New tag bp_tag. Like break_tag
-	except used when a bp is set on that line. Bind new menu
-	to bp_tag.
-	(insertBreakTag):  Accept tag type.  Remove old tag.
-	(do_bp): When a breakpoint is set, use bp_tag.
-
-        Tom Tromey  <tromey@cygnus.com>
-	* pref.tcl (pref_ide_proc): Withdraw the toplevel, not the
-	window.
-
-        Tom Tromey  <tromey@cygnus.com>
-	* tclIndex: Rebuilt.
-	* mem_pref.tcl (build_win): Use standard_button_box.
-	(_map): New method.
-	(constructor): Run _map on <Map> event.
-	* pref.tcl (pref_ide_proc): Use idewindow_check_freeze.
-	(pref_modal_dialog): Use idewindow_freeze and idewindow_thaw.
-	* hooks.tcl: Removed.
-	* Makefile (TCL): Removed hooks.tcl.
-
-        Tom Tromey  <tromey@cygnus.com>
-	* main.tcl (ide_run_server): Quote call to ide_do_run_server.
-
-        Tom Tromey  <tromey@cygnus.com>
-	* download_pref.tcl (build_win): Make OK button default.  Invoke
-	when Return pressed.
-	* download_pref.tcl (build_win): Don't allow pref window to
-	resize.  Use standard_button_box to lay out buttons.
-	* pref.tcl (pref_ide_proc): Handle window freezing.
-	(pref_modal_dialog): Freeze and thaw window around the grab.
-	(build_win): Use standard_button_box to lay out buttons.  Don't
-	allow pref window to resize.
-
-        Ian Lance Taylor  <ian@cygnus.com>
-	* src.tcl (src_ide_proc): Download the file in an idle callback.
-	Execute the idewindow command even if the download was cancelled.
-	* library/main.tcl (ide_run_server): Do everything in an idle
-	callback.
-	(ide_do_run_server): New procedure.
-
-        Martin M. Hunt  <hunt@cygnus.com>
-	* src.tcl (bp_line): Use hasBP instead of validBPLine.
-	Allow type TC even if BP set.
-	(validBPLine): Renamed to hasBP.
-
-        Tom Tromey  <tromey@cygnus.com>
-	* manage.tcl (manage_open): Special case "about" window when
-	running under IDE.
-
-        Martin M. Hunt  <hunt@cygnus.com>
-	* main.tcl (set_target): Set the target again if the 
-	executable has changed and executed a "file" command.
-	* memory.tcl (update_address): Accept numerical entries
-	and catch errors.
-	* download.tcl (Download): Cancel button should call
-	cancel method.
-	* main.tcl (run_executable): Fixed messageBox.
-
-        Tom Tromey  <tromey@cygnus.com>
-	* floatbar.tcl (constructor): Added.
-	* srcbar.tcl (constructor): Added.
-	* toolbar.tcl (_ide_title): New instance variable.
-	(create_menu_items): Pass _ide_title to idewindmenu.
-
-        Martin M. Hunt  <hunt@cygnus.com>
-	* main.tcl (toggle_debug_mode): Fix typo and print
-	debug message before disabling it.
-
-        Martin M. Hunt  <hunt@cygnus.com>
-	* manage.tcl (manage_delete): Don't remove a window
-	from the active list until after it has already deleted
-	itself.
-	* toolbar.tcl (create_menu_items): Change Console shortcut
- 	to Ctrl+N.
-	* src.tcl (config_win): Change Console shortcut to Ctrl+N.
-	
-        Martin M. Hunt  <hunt@cygnus.com>	
-	* src.tcl: (do_bp): Catch errors.
-	(validBPLine): Valid lines have a "-" or an image.
-	
-        Martin M. Hunt  <hunt@cygnus.com>
-	* main.tcl (ide_run_server): Don't run executable if
-	download was cancelled.  Reset cancelled flag.
-	(run_executable): Call download_it.
-	(download): Renamed download_it and moved to download.tcl.
-	(set_target): Don't set target if the name hasn't changed
-	from the last time.
-	* register.tcl (reg_select): Catch errors.
-	(delete_from_display_list): Enable menu item.
-	* src.tcl (build_win): Add progress bar for downloads.
-	(download_progress): New function. Callback to update
-	progress meter.
-	(src_ide_proc): Don't open src window if download
-	cancelled.
-	* toolbar.tcl (create_menu_items): Call download_it.
-	* srcbar.tcl (_set_run): New mode. Sets run button to stop
-	sign during downloads.
-	* prefs.tcl (pref_set_defaults): Define gdb/load/verbose.
-	* interface.tcl: Define new hook download_progress_hook.
-	* floatbar.tcl (create_buttons): Call download_it.
-	* download_pref.tcl: Add download dialog prefs.
-	* download.tcl (Download): Change back to old dialog
-	with each section listed seperately.
-	(download_hash): Use a hook.
-	(download_it): New function. Replaces old "download"
-	from main.tcl. Now deletes all breakpoints before 
-	downloading and handles cancels correctly.
-
-        Martin M. Hunt  <hunt@cygnus.com>
-	* main.tcl (download): Don't quote the executable name
-	with single quotes.
-
-        Tom Tromey  <tromey@cygnus.com>
-	* src.tcl (src_ide_proc): Exit gdb when destroy request seen.
-
-        Ian Lance Taylor  <ian@cygnus.com>
-	* main.tcl (gdbtk_ide_init): Use src_ide_proc for the source
-	window, rather than idewindow_proc.  Remove extraneous line.
-	* src.tcl (src_ide_proc): New procedure, replacing open_src.  Only
-	download if we are opening the source window.
-	(src_no_save): New procedure.
-	* main.tcl (gdbtk_ide_init): Initialize gdb_checking_for_exit.
-	Register gdb_exit_check as the exit check procedure.
-	(gdb_exit_check): New procedure.
-	* interface.tcl (gdbtk_tcl_query): If gdb_checking_for_exit, use a
-	system modal message box.
-	* src.tcl (build_win): Create a FocusIn binding to push focus down
-	from the top level.
-	* console.tcl: Change all control, alt, and unadorned character
-	bindings to use bind_plain_key.
-	* memory.tcl: Likewise.
-	* src.tcl: Likewise.
-	* variables.tcl: Likewise.
-	* src.tcl: Use bind_plain_key rather than explicitly ignoring Alt
-	bindings.
-	* src.tcl (print): Call idewindow_freeze and idewindow_thaw around
-	call to print menu.
-	* srcbar.tcl (create_menu_items): Likewise, around call to page
-	setup menu.
-	* main.tcl (gdbtk_ide_init): Use an underscore in generic window
-	name, to set the accelerator key.
-	(ide_run_server): Likewise.
-	* toolbar.tcl (create_buttons): Likewise.
-
-        Martin M. Hunt  <hunt@cygnus.com>
-	* register.tcl (acceptEdit): If no value is entered,
-	set the cell to 0.
-
-        Ian Lance Taylor  <ian@cygnus.com>
-	* src.tcl (config_win): Add ignored Alt bindings for all the
-	unmodified key bindings.
-	* download.tcl (constructor): Withdraw the window before doing
-	anything.  Set the width of the label.  Don't try to center the
-	window.  Pass toplevels to wm transient.  Run keep_raised after
-	500.  Don't call update.
-	(done): Use after rather than a busy loop.
-	(destructor): Cancel the after if it is defined.
-	(after_id): New protected variable.
-	* main.tcl (download): If download is already running, don't do
-	anything.  If .load0.load exists, delete it before calling manage
-	create.
-	* main.tcl (gdbtk_ide_init): Use pref_ide_proc rather than
-	idewindow_proc when registering the preference window.
-	* download_pref.tcl (save, cancel): Call pref_ide_finished.
-	* pref.tcl (save, cancel): Likewise.
-	(pref_ide_proc): New procedure.
-	(pref_no_save): New procedure.
-	(pref_modal_dialog): New procedure.
-	(pref_ide_finished): New procedure.
-	* tclIndex: Rebuild.
-	* main.tcl (gdbtk_ide_init): Initialize gdb_download_cancelled.
-	(run_executable): Put a trace on gdb_download_cancelled.  Change
-	the dialog box message.  If the user cancels the download, clear
-	gdb_run_pending and just return without running.
-	(ide_do_run): Remove the traces on gdb_download_cancelled.  If the
-	user cancelled the download, just clear gdb_run_pending.
-	(target_name_changed): Clear gdb_download_cancelled.  Call
-	set_exe_name.
-	(download): If the executable is not up to date, ask whether the
-	user is really really sure.  If the user cancels the download
-	using the dialog button, set gdb_download_cancelled, and don't set
-	the breakpoints or gdb_download_complete.
-	(set_exe_name): Clear gdb_download_cancelled.
-	(receive_file_changed): Ask whether we should download the new
-	executable.
-	* src.tcl (open_src): Don't download the file if
-	gdb_download_cancelled is set.
-	* interface.tcl (gdbtk_tcl_query): Pass -modal task to
-	tk_messageBox.
-	* main.tcl (set_exe_name): Tell the src window to go back to
-	looking at main if the file changes.
-	* src.tcl (update): Catch errors when calling gdb_loc.
-	* main.tcl (gdbtk_ide_init): Handle file-created, file-changed,
-	file-removed, and file-deleted events rather than process-ended
-	events.
-	(set_exe_name): Call gdb_clear_file even if the file does not
-	exist.  Likewise for setting gdb_download_complete to zero.
-	(receive_file_changed): Rename from receive_process_ended.  Only
-	check the executable mtime if the tail of the file name matches
-	the executable name.
-
-        Ian Lance Taylor  <ian@cygnus.com>
-	* srcbar.tcl (create_menu_items): Change ``Print Setup...'' to
-	``Page Setup...''.  Pass -parent to ide_winprint page_setup.
-	* src.tcl (print): Pass -parent to send_printer.
-
-        Ian Lance Taylor  <ian@cygnus.com>
-	* main.tcl: Move initialization code to end of file, after all
-	procedures have been defined.
-	(gdbtk_ide_init): New procedure to handle IDE initialization.
-	(gdbtk_tcl_preloop): Don't do anything if using the IDE.
-	(ide_run_server): Error if file does not exist.  Use
-	idewindow_activate_by_name, rather than manage open.  Do
-	everything after idle.
-	(run_executable): Clean up a bit.  Consistently use ide_do_run.
-	(target_name_changed): Rename from target_name.  Rename parameter
-	num to propset.
-	(download): Error if the file does not exist.  Call set_exe_name.
-	Don't set gdb_download_mtime.  Don't check whether gdb_run_pending
-	is 2.
-	(exe_name_changed): Rename from exe_name.
-	(set_exe_name): Set gdb_exe_mtime.  Quote filename passed to
-	gdb_cmd.
-	(receive_process_ended): Don't check the data argument.  Check
-	gdb_exe_set rather than gdb_download_complete.  Check
-	gdb_exe_mtime rather than gdb_download_mtime.
-	* src.tcl (open_src): Set the location to main as well as
-	downloading the file.  Don't set gdb_run_pending to 2.
-
-
-Tue Feb 10 17:50:37 1998  Keith Seitz  <keiths@onions.cygnus.com>
-
-	* bp.tcl (build_win): Do not set the disabled foreground for menus. Insert
-	all tracepoints, too.
-	(bp_add): Handle tracepoints.
-	(bp_type): Handle tracepoints.
-	(update): Handle tracepoints.
-	(bp_all): Do tracepoints, too.
-	(Index_to_bptype): New protected variable to index type of break (breakpoint
-	or tracepoint) against index in window.
-	(bp_select): Disable/Enable menu items based on type.
-	(bp_able): Handle tracepoints.
-
-	* src.tcl (do_bp): Handle disabled tracepoints.
-
-	* actiondlg.tcl (change_other): Handle memranges and use info address to
-	validate entries.
-
-	* tracedlg.tcl (edit): Handle memranges when formatting data for
-	action dialog.
-
-Mon Jan 26 11:44:39 1998  Keith Seitz  <keiths@onions.cygnus.com>
-
-	* src.tcl (fill_files): Don't check for file's existance -- let
-	SrcWin::name do that.
-
-	* actiondlg.tcl (change): Add everything that is specified, not
-	just the things about which we know.
-
-Sun Jan 25 01:01:32 1998  Martin M. Hunt  <hunt@cygnus.com>
-
-	* stack.tcl (update): Only insert entries that have
-	length.  Break when matching entry in listbox is found.
-
-	* src.tcl (fill_files): Don't call lsort.  New listfiles
-	command sorts for us.
-
-	* variables.tcl (changeValue): If new value is null,
-        cancel edit. 
-	(build_menu_helper): Comment-out Update menu.
-        (getVariables): Change variable name so it doesn't
-        get confused with window variables.
-        (postMenu): Comment-out Update entries.
-        (UnEdit): Unbind keys when unediting.
-	
-Thu Jan 22 10:38:19 1998  Keith Seitz  <keiths@cygnus.com>
-
-	* toolbar.tcl (create_menu_items): Disable preferences.
-	
-	* prefs.tcl (pref_set_defaults): Attach the toolbar to the source window
-	by deafult.
-	* src.tcl (SrcWin::build_win): Turn off history for the file selector.
-	(SrcWin::name): Use SOURCEWIN_set_status to upate status.
-	Make sure we ask gdb where the source file is before asking
-	the source window to open it.
-	(SrcWin::file): Do not ask gdb where the file is -- someone else already has.
-	Set the file selector to the filename only once and only if
-	successful finding the file.
-	(SrcWin::fill_files): Sort the files before inserting into file selector.
-	(SrcWin::location): Add flag idicating that a file load has failed. Resolves
-	recursive loop with SrcWin::mode and SrcWin::location.
-	Make sure the file and function selectors are filled only once.
-	Use SOURCEWIN_set_status and SOURCEWIN_reset_status as appropriate.
-	(SrcWin::set_status): Add verbatim flag to allow a generic message to be
-	displayed.
-	(SrcWin::mode): Add error flag to indicate that a file load failed. Resolves
-	recursive loop with SrcWin::location.
-	Make sure we exit with the proper mode set on the source window.
-	(SrcWin::reset_status): New procedure.
-	(SrcWin::current_addr): Define a default value of 0x0.
-	(SrcWin::Status): New protected variable.
-	(SrcWin::bp_line): Check if breakpoint set in assembly-mode, too.
-	(SOURCEWIN_set_status): New procedure to temporarily set the status bar.
-	(SOURCEWIN_reset_status): New procedure which is called after the status bar
-	should be reset.
-	(SOURCEWIN_reinit): New procedure to reinitialize the source window. (To be
-	called when new symbol files are added and like).
-
-	* interface.tcl (gdbtk_tcl_query): Properly set the name of the
-	query dialog.
-	(gdbtk_tcl_pre_add_symbol): Hook called from gdbtk.c to inform user that
-	we are reading symbols.
-	(gdbtk_tcl_post_add_symbol): Hook called from gdbtk.c to inform user that
-	are finished reading symbols.
-
-	* src.tcl (SOURCEWIN_reinit): New procedure which updates the source window with
-	a default file, fills the file selectors, etc.
-	(SOURCEWIN_set_status): New procedure which can be used to set the status bar
-	on the source window.
-	(set_status): Add flag for setting the status as-is.
-
-	* main.tcl: Call SOURCEWIN_reinit to setup the source window on startup.
-
-
-Fri Jan 16 09:11:30 1998  Keith Seitz  <keiths@onions.cygnus.com>
-
-	* src.tcl (SOURCEWIN_set_status): New procedure to allow anyone to set the
-	status bar text at the bottom of the source window.
-	(fill_files): Use a little more full-proof method (if slower) for eliminating
-	duplicates int the files combobox.
-
-	* interface.tcl (gdbtk_tcl_pre_add_symbol): New procedure called prior to
-	a symbol file is loaded.
-	(gdbtk_tcl_post_add_symbol): New procedure called after a symbol file is
-	loaded.
-
-Thu Jan 15 12:41:27 1998  Keith Seitz  <keiths@onions.cygnus.com>
-
-	* console.tcl (invoke): Use new gdb_immediate command instead of gdb_cmd.
-
-Wed Dec 31 16:50:26 1998  Keith Seitz  (keiths@onions.cygnus.com)
- 
-        * actiondlg.tcl (change): handle '$' in register names.
-
diff --git a/gdb/gdbtk/library/ChangeLog-1999 b/gdb/gdbtk/library/ChangeLog-1999
deleted file mode 100644
index 1494f6a54b5..00000000000
--- a/gdb/gdbtk/library/ChangeLog-1999
+++ /dev/null
@@ -1,1083 +0,0 @@
-1999-12-15  Fernando Nasser  <fnasser@rtl.cygnus.com>
-
-	* variables.tcl: UnEdit any fields open to edit before colapsing
-	a tree branch (it was generating a Tcl exception and stack dump).
-
-1999-09-29  James Ingham  <jingham@leda.cygnus.com>
-
-	* prefs.tcl (pref_read): Convert env(HOME) to a win32 path BEFORE
-	handing it to file join, so we won't look for a network drive.
-
-1999-09-23  James Ingham  <jingham@leda.cygnus.com>
-
-	* toolbar.tcl (GDBToolBar): Typo.
-	(new_menu): Changed this to allow menus to be altered as well as
-	added.
-	(menu_exists): New method.
-	(clear_menu): New method.
-	(_load_src_images): Moved here from srcbar.tcl.  Added Attach &
-	Detach classes.  This is all still kind of ill-factored.
-	(In instance data): Made menu data arrays rather than dynamically
-	constructed variables.
-
-	* srcwin.itb (SrcWin::set_execution_status): Let gdb print the PC, 
-	since Tcl's conversion may not be wide enough.
-
-	* srctextwin.ith: initialize the Cname variable.
-
-	* srctextwin.itb (SrcTextWin::location):
-	(SrcTextWin::location): Change address compare to a string
- 	compare.  These are always both hex in the same format, but on a
- 	64 bit host the conversion would fail.
-	(SrcTextWin::showBalloon): Catch all errors in the balloon help
- 	but also report them to the debug window.
-	(SrcTextWin::LoadFromCache): Erase and reload dirty cached windows.
-
-	* srcbar.tcl (create_run_menu): Add "Attach", "Detach" and "Kill"
-	for native targets.
-	(do_attach): Attach to a native target.
-	(do_detach): Detach from a native target.
-	(do_kill): Kill a native target.
-
-	* memwin.itb (MemWin::toggle_enabled): Toggle the state of the
-	widget, as well as the color, so people can't edit when the window 
-	doesn't contain valid memory.
-	(MemWin::update_address): Set the state to normal if we have
-	loaded valid memory.
-	(MemWin::BadExpr): Set the state to disabled on error.
-	(MemWin::incr_addr): Set the state to normal if a step succeeds.
-
-	* managedwin.itb (ManagedWin::open_dlg): New function.  Preferred
- 	function when you know you are opening a dialog.
-	(ManagedWin::_open): new function, contains the common bits of
-	opening windows & dialogs.
-	(ManagedWin::open): Use the _open function.
-	(ManagedWin::_create): Don't use Icon windows with modal dialogs.
-
-	* interface.tcl (gdbtk_cleanup): Set a shutting_down flag.
-	(gdbtk_tcl_fputs): Restore the fputs hook.  This is trivial to do, 
-	and ensures that no one will delete the hook behind our backs.
-	(gdbtk_tcl_fputs_error): ditto.
-	(_open_file): Make file parameter optional, and don't query if it
-	is provided.
-	(gdbtk_attached): New function.  Called from attach hook.
-	(gdbtk_detached): New function.  Called from detach hook.
-
-	* helpviewer.ith (HtmlViewer): Add the attach dialog to the list
-	of topics.
-
-	* srcbar.tcl (do_kill): Added the Kill menu item for killing the
-	inferior on native targets.
-
-1999-09-16  James Ingham  <jingham@leda.cygnus.com>
-
-	* prefs.tcl (pref_set_defaults): define the wrap preference for
-	the console window.
-
-	* console.itb (Console::_paste): Add the "delete selection"
-	semantics so we can use this for all the Paste events.
-	(Console::_delete): New method, centralize delete handling so we
-	can protect against things like delete deleting a selection up in
-	the history region of the window.
-	(Console::_build_win): Change bindings to use _paste & _delete.
-	(Console::_build_win): wrap if told to by the wrap parameter.
-
-	* console.ith: Declare _delete.
-
-1999-09-16  Stan Shebs  <shebs@andros.cygnus.com>
-
-	* targetselection.itb (TargetSelection::init_target_db): Remove
- 	references to D10V target, use only standard remote for D10V.
-
-1999-09-15  James Ingham  <jingham@leda.cygnus.com>
-
-	* console.itb (Console::_paste): Fix another "set foo [catch ...]"
-	idiom.
-	(Console::_build_win): Remove the extraneous posting of the
-	<<Paste>> event in handling B2-Release.  Just call _paste.
-
-1999-09-10  James Ingham <jingham@leda.cygnus.com>
-        From Mumit Khan  <khan@xraylith.wisc.edu>
-
-        * prefs.tcl (pref_set_defaults): Add main_names preference.
-        * interface.tcl (gdbtk_locate_main): New proc.
-        (run_executable): Use.
-        * srcwin.itb (SrcWin::_build_win): Use.
-        (SrcWin::location): Likewise.
-        (SrcWin::point_to_main): Likewise.
-
-1999-08-27  James Ingham  <jingham@leda.cygnus.com>
-
-	* srctextwin.itb (SrcTextWin::FillAssembly): Use the new
-	gdb_load_disassembly.  
-	(SrcTextWin::FillMixed): Use the new gdb_load_disassembly.
-
-	* interface.tcl (gdbtk_idle): Call gdbtk_restore_fputs at idle
-	time.  This puts the gdbtk_fputs hook back in place, just in case
-	an error left it pointing to null.
-
-1999-08-11  Tom Tromey  <tromey@cygnus.com>
-
-	* kod.itb (KodWin::build_win): Don't use Tix.
-	(Various): Changed as a result of build_win change.
-	(KodWin::destructor): Unset new globals.  Also unset
-	kodActivePane.
-
-	* kod.ith (labh): Removed variable.
-
-	* kod.ith (set_os): Declare.
-	* kod.itb (KodWin::build_win): Don't use Tix labelled frame
-	widget or Tix paned widget.  Removed size boxes from Windows
-	code.
-	(KodWin::constructor): Add `$this set' to gdb_set_hook.
-	(KodWin::destructor): Remove from hook.
-	(KodWin::set_os): New method.
-
-	* toolbar.tcl (GDBToolBar::destructor): Remove from gdb_set_hook.
-	(GDBToolBar::constructor): Add to gdb_set_hook.
-	(set_hook): New method.
-	(create_view_menu): Don't put kod onto menu.
-
-	* kod.itb (KodWin::display_object): Don't put `Details' message in
-	label; this messes up resize and doesn't really add anything.
-
-	* images/kod.gif, images2/kod.gif: Removed.
-	* toolbar.tcl (create_window_buttons): Removed kod button.
-	(add_menu_command): Don't load kod image.
-
-	* kod.itb: Renamed from kod.tcl.  Restructured to follow new itcl
-	conventions.
-	* kod.ith: New file.
-
-	* toolbar.tcl (create_window_buttons): Use gdb_kod_cmd, not
-	gdb_kod_name.
-	(create_view_menu): Likewise.
-	* interface.tcl (initialize_gdbtk): Don't mention gdb_kod_name.
-
-	* targetselection.itb (TargetSelection::init_target_db): Added
-	Cisco targets.  From Martin Hunt.
-
-	* kod.tcl (build_win): Use correct capitalization for buttons.
-
-1999-08-10  James Ingham  <jingham@leda.cygnus.com>
-
-	* srctextwin.itb (SrcTextWin::constructor): Add the disassembly
-	flavor hook.
-	(SrcTextWin::disassembly_changed): New method, fix up all the
-	windows when the disassembly flavor changes.
-	(SrcTextWin::_mtime_changed): We were setting the filename:dirty
-	to 1 regardless of the result of the mtime check...  Doh!
-	(SrcTextWin::reconfig): The setTabs call was assuming ALL windows
-	were source windows.
-	(SrcTextWin::do_tag_popup): Remove the balloon when the breakpoint 
-	popups are posted as well.
-	(SrcTextWin::do_source_popup): Also handle the case where there is 
-	a selection, but the point is not over it.
-
-	* srctextwin.itb (SrcTextWin::destructor): Remove it when the
-	object goes away. 
-
-	* regwin.itb (RegWin::constructor): Add the disassembly_flavor_hook.
-	(RegWin::destructor): Remove it when the widget is destroyed.
-	(RegWin::disassembly_changed): New method, tell the widget it
-	needs to redisplay itself with the new register names.
-	(RegWin::reconfig): Actually do the reconstruction if the register 
-	set names have changed.
-	* regwin.ith: Add declarations for the new methods.
-
-	* interface.tcl (gdbtk_tcl_disassembly_hook): New hook to support
-	changing the disassembly flavor.
-
-	* srctextwin.itb (SrcTextWin::getVariable): Use a selection in
-	preference to the word around the hit point, if there is one.
-	(SrcTextWin::do_source_popup): Really dismiss the balloon when you 
-	popup a menu...
-
-1999-08-05  James Ingham  <jingham@leda.cygnus.com>
-
-	* srctextwin.itb (SrcTextWin::showBalloon): Fix ShowBalloon.  We
-	can't use "info line" to tell us whether we should post a balloon
-	over the current line, since gdb only considers the first line of
-	a statement executible, not the continuation lines.  Instead, show 
-	any line in the currently selected function.  Sigh...
-
-1999-08-06  Tom Tromey  <tromey@cygnus.com>
-
-	* interface.tcl (gdb_set_hook): New hook.
-
-1999-08-02  Tom Tromey  <tromey@cygnus.com>
-
-	* managedwin.ith (window_name): Removed extraneous comma.
-
-1999-07-27  Keith Seitz  <keiths@cygnus.com>
-
-	* variables.tcl: Rewrite to use new variable rewrite.
-	* locals.tcl: Ditto.
-	* watch.tcl: Ditto.
-	* srctextwin.itb (updateBalloon): Use new variable rewrite.
-	* blockframe.ith, blockframe.itb: New block and frame classes.
-	* data.ith, data,itb: New stack and queue classes (data structures).
-	* tclIndex: Rebuilt.
-
-1999-07-20  Jason Molenda  (jsm@bugshack.cygnus.com)
-
-	* prefs.tcl (pref_set_defaults): Set tab_size to the univeral
-	standard of 8, not 4.
-
-1999-07-16  Stan Shebs  <shebs@andros.cygnus.com>
-
-	* All files (*.tcl, *.itb, *.ith): Add GPL notices, regularize
-	copyright and header comments.
-
-1999-06-29  James Ingham  <jingham@leda.cygnus.com>
-
-	* bpwin.itb (BpWin::bp_store): New proc, store away the current
-	breakpoint list into a gdb command file.
-	(BpWin::bp_restore): restore a breakpoint list from a command file.
-	(BpWin::build_win): Add menu items for store & restore breakpoints.
-
-1999-06-24  Keith Seitz  <keiths@cygnus.com>
-
-        * srcwin.itb (SrcWin::destructor): Its "gdb_clear_file_hook",
-        not "gdb_clear_file".
-
-1999-06-23  James Ingham  <jingham@leda.cygnus.com>
-
-	* srctextwin.itb (SrcTextWin::_mtime_changed): Catch the call to
-	mtime.  This will fail when you are in assembly mode, and the file 
-	is actually a function address.
-	(SrcTextWin::motion): Catch the call to showBalloon.  There are
-	various things that can go wrong here, and we certainly don't want 
-	the user to hear about them.
-
-1999-06-15  Keith Seitz  <keiths@cygnus.com>
-
-	* interface.tcl (gdbtk_stop_idle_callback): Catch calls to
-	remove hook, since it could already be gone if we got a signal.
-
-	* srcwin.itb (busy): If there is no target and the
-	debugger is native, we should also let the user know
-	that his program is running.
-
-1999-06-11  James Ingham  <jingham@leda.cygnus.com>
-
-	* interface.tcl (gdbtk_tcl_exec_file_display): Only call clear
-	file if there is a file loaded in the source window.  This avoids
-	some flashing at startup.
-
-1999-06-10  Keith Seitz  <keiths@cygnus.com>
-
-	* srctextwin.itb (do_source_popup): Clear the varBalloon tag
-	before mapping a popup onto the screen.
-	(showBalloon): The "-pc" option was removed from gdb_variable.
-	Provide equivalent functionality, and display popups again.
-	
-	* interface.tcl (set_target): Don't call the target dialog
-	if there gdb_target_cmd is empty and we are a native debugger.
-	Don't set a default target -- force the gui to ask the first
-	time!
-	(run_executable): Set options after we have a target, not before.
-
-	* watch.tcl (destructor): Don't call no_inferior -- the window's
-	already been destroyed. Instead, run through our list of variables
-	and delete them.
-
-1999-06-10  James Ingham  <jingham@leda.cygnus.com>
-
-	* srctextwin.itb (SrcTextWin::clear_file): Don't try to set the
-	text view back to the gdbtk_scratch_widget, this is very fragile. 
-	(SrcTextWin::LoadFromCache): initialize the mtime correctly when
-	you add a window to the cache.
-	(SrcTextWin::LoadFromCache): don't add the ,asm,lib to the scratch 
-	widget pane name.
-
-	* interface.tcl (gdbtk_tcl_exec_file_display): Only run
-	gdbtk_clear_file if the filename is not null.  This avoids source
-	window flashing.
-
-	* srctextwin.itb (SrcTextWin::_mtime_changed): Set a dirty flag
-	when the mtime has changed so that you can know to reload the
-	source. 
-	(SrcTextWin::LoadFromCache): Look at the dirty flag, and reload
-	from disk if it is set.
-
-1999-06-10  Keith Seitz  <keiths@cygnus.com>
-
-	* watch.tcl (clear_file): New method.
-	* variables.tcl (constructor): Register gdb_clear_file hook.
-	(destructor): Unregister gdb_clear_file hook.
-	(clear_file): New method.
-	* targetselection.itb (init_target_db): Add Picobug monitor.
-	(fill_targets): Don't explicitly list every TCP target: deduce
-	it from the target database.
-	(native_debugging): Compare host and target triples.
-	* srcwin.ith (clear_file): Add declaration.
-	* srcwin.itb (constructor): Register gdb_clear_file hook.
-	(destructor): Unregister gdb_clear_file hook.
-	(clear_file): New method.
-	* srctextwin.ith (LoadFile): Add arg "mtime_changed".
-	(clear_file): Add declaration.
-	(_mtime_changed): Add declaration.
-	(_initialize_srctextwin): Add declaration.
-	(_clear_cache): Add declaration.
-	* srctextwin.itb (constructor): Move all initialization
-	to _intialize_srctextwin so that we can easily re-initialize.
-	(Stwc): Change layout to explicitly list panes
-	and mtimes.
-	(ClearTags): Catch calls removing tags. Needed when
-	loading new executables.
-	(_mtime_changed): New method.
-	(FillSource): Immitate command line gdb, checking
-	if a file has changed since it was last used. If it has, load
-	it into the cache.
-	(LoadFile): Add parameter to inform whether a file's
-	mtime has changed. Reload the cache if it has.
-	(clear_file): New method.
-	(_initialize_srctextwin): New method.
-	(_clear_cache): New method. Stubbed.
-	* main.tcl: Move initialization of state to initialize_gdbtk in
-	interface.tcl
-	* interface.tcl (gdbtk_tcl_exec_file_display): Don't reset source
-	windows or globals here -- the clear file hook will do that.
-	(set_exe_name): Always say the exe has changed, in case
-	the user reloads the same exe (which he's recompiled).
-	(set_exe): Don't call gdb_clear_file.
-	(set_target): Return string result codes.
-	(clear_file_hook): New hook.
-	(gdbtk_clear_file): New proc.
-	(initialize_gdbtk): New proc. Moved initialization of
-	globals (yich) here from main.tcl
-	* download.itb (download_it): When running set_target,
-	use new string return codes.
-
-	* interface.tcl (gdbtk_attach_target): New proc. Moved
-	contents of run_executable dealing with attaching to
-	a target here.
-	(run_executable): Use gdbtk_attach_target.
-	(connect): Remove and merge with gdbtk_attach_target.
-	* srcbar.tcl (do_connect): Use gdbtk_attach_target to
-	attach to the target.
-
-	* tclIndex: Regenerate.
-
-1999-06-07  James Ingham  <jingham@leda.cygnus.com>
-
-	* memwin.ith (numbytes): Change the default to 0, which means
-	"depends on window size".  This is really the useful value.
-
-	* memwin.itb (MemWin::newsize): Move getting the rheight to AFTER
-	the update idletasks.  Otherwise the bbox call will return "" when
-	the window is being constructed.
-	(MemWin::reconfig): Set rheight back to "" to force it to be
-	recomputed.  Both font changes and switch to "depends on window
-	size" could invalidate this.
-
-1999-06-08  Keith Seitz  <keiths@cygnus.com>
-
-	* srcwin.itb (set_execution_status): Do not try to second
-	guess gdb_target_has_execution with gdb_running. Make
-	gdb_running follow it. We'll have to fix those targets
-	that do not set inferior_pid as they crawl out of the woodwork.
-
-1999-06-07  James Ingham  <jingham@leda.cygnus.com>
-
-	* prefs.tcl (pref_set_defaults): Set the initial height and with
-	of the browser to 0 so the packer & gridder can get this right on
-	systems with different fonts.  Fixes CR 100619.
-
-	* browserwin.itb (BrowserWin::_build_win): Don't set the height
-	and width of the file_box and func_box.  This keeps them from
-	floating correctly when there is not stored default.
-
-1999-06-04  James Ingham  <jingham@leda.cygnus.com>
-
-	* regwin.itb (RegWin::acceptEdit): Call gdbtk_update after
-	changing the register value so that the locals and watch window
-	will get updated if any of these variables are in registers. Fixes
-	CR 100670.
-
-1999-05-25  Keith Seitz  <keiths@cygnus.com>
-
-	* variables.tcl (getLocals): Don't pass any args to 
-	gdb_get_{locals, args} so that the currently selected frame is used.
-	(context_switch): New method.
-	* locals.tcl (getVariablesBlankPath): Don't catch call to getLocals.
-	getLocals will do it and return {} if an error occurs.
-	Always pass the frame of the variable to the variable backend,
-	assuming that the selected frame is the proper frame to use.
-	(update): Recognize context switches a little better.
-
-	* variables.tcl (cursor): New method.
-	(enable_ui): Use "cursor".
-	(disable_ui): Ditto.
-	(no_inferior): Ditto.
-	(open): Change toplevel's cursor when opening variables.
-
-1999-05-03  Martin Hunt  <hunt@cygnus.com>
-
-	* toolbar.tcl (create_help_menu): Open About window as transient.
-
-	* main.tcl: Open About window as transient.
-
-	* about.tcl (About): Set window title.
-
-1999-04-27  James Ingham  <jingham@cygnus.com>
-
-	* srcpref.itb (build_win): Pack the frame containing the
-	disassembly flavor chooser.  Redid some of the other packing to
-	look a bit nicer too.
-
-	* srcpref.itb (save): Call apply and then close rather than
-	duplicating the apply code.
-	
-1999-04-26  James Ingham  <jingham@cygnus.com>
-
-	* modal.tcl (ModalDialog): Add the "expire" variable, and cancel
-	the dialog after the given time if set.
-
-	* managedwin.ith (destructor): Use the new quit_if_last method to
-	decide whether to quit the app or not.  This way you can manage
-	create a splash screen and not quit the app when you take it down.
-	(quit_if_last): Add default implementation - returns 1.
-
-	* about.tcl (quit_if_last): Add the quit_if_last to the About box, 
-	returning 0.
-
-	* main.tcl: Added a line to open a splash screen, but commented it
-	out for devo.
-
-1999-04-22  Keith Seitz  <keiths@cygnus.com>
-
-	* targetselection.itb (port_list): ManagedWin has a proc named
-	"open". We really want the tcl command "::open" to open a port.
-
-1999-04-15  Martin Hunt  <hunt@cygnus.com>
-
-	* prefs.tcl (pref_set_defaults): New pref, gdb/use_icons.
-	This is set if Unix should use gdbtk_icon.gif as an icon.  Some
-	window managers, such as olvwm, have problems with it.
-	* managedwin.itb (ManagedWin::_create): Don't create icon
-	for Unix, unless gdb/use_icons is set.
-	* globalpref.itb (GlobalPref::build_win): Add a checkbutton to set
-	pref gdb/use_icons.
-
-	* managedwin.itb (ManagedWin::window_name): If iconname is
-	not specified, use window name.
-	(ManagedWin::_create): For Unix, call make_icon_window.
-	(ManagedWin::make_icon_window): New function.  Makes a unix
-	icon.
-
-	* main.tcl: Set initial target to "exec" if running in
-	test mode.
-
-	* bpwin.itb (BpWin::constructor): Set icon name to "BPs".
-	* regwin.itb (BpWin::build_win): Set icon name to "Regs".
-	* srcwin.itb (SrcWin::_update_title): Set icon name to basename 
-	of filename.
-	* variables.tcl (VariableWin::build_win): Set icon name to "Locals".
-
-1999-04-12  Keith Seitz  <keiths@cygnus.com>
-
-	* variables.tcl (populate): Update the value of the parent variable's
-	children before stuffing them into the window. This makes sure
-	that the value of the variable is always current.
-
-1999-04-09  James Ingham  <jingham@cygnus.com>
-
-	* memwin.itb (MemWin::incr_addr): Fix the increment-decrement
-	control.  It would allow you to scroll into negative addresses,
-	which causes some simulators to crash.  It would also increment
-	improperly in cases where the address value in hex corresponded to 
-	a negative signed int.
-
-1999-04-07  Martin Hunt  <hunt@cygnus.com>
-
-	* interface.tcl (gdbtk_signal): Don't set gdb_running to 0.
-
-1999-04-06  Martin Hunt  <hunt@cygnus.com>
-
-	* targetselection.itb (TargetSelection::getname): Call init_target_db.
-	(TargetSelection::init_target_db): Add target mon2000. Set
-	most remote targets to default to downloading. Add new
-	baudrates for remote target. Other misc target fixes.
-	(save) Use "pref setd" in case pref is not created yet.
-	(TargetSelection::config_dialog): Gray out port number when
-	in exec mode.
-
-	* targetselection.ith: Add public proc init_target_db.
-	
-	* srcwin.itb (SrcWin::set_execution_status): Don't print anything
-	if gdb_running is 0.
-
-	* srctextwin.itb (SrcTextWin::motion): Show variable values
-	even when not debugging. Needed so users can examine values after
-	a segfault.
-
-	* interface.tcl (set_target): If the target name is "",
-	use the default target name.
-	(run_executable): Set gdb_running correctly. Don't
-	allow downloading to "exec".
-	(gdbtk_signal): New function called from gdbtk_annotate_signal.
-	Sets gdb_running to 0 and pops up a dialog with the
-	signal name and description.
-
-	* main.tcl: Set initial target name to "". Set gdb_target_changed
-	so a dialog will always be forced the first time.
-	
-	* download.itb (Download::download_it): Set gdb_loaded before
-	notifying src windows the download is done. Catch the notifications
-	in case the dialog has been closed.
-
-	* console.itb (Console::destructor): Set gdbtk_state(console)
-	to "" instead of unsetting it.
-
-1999-04-02  James Ingham  <jingham@cygnus.com>
-
-	* memwin.itb (MemWin::build_win): Remove the -validate option from 
-	the memory spinner.  It was not appropriate, since you can type
-	expressions into the window.
-
-1999-04-02  Keith Seitz  <keiths@cygnus.com>
-
-	* tclIndex: Rebuilt.
-	* toolbar.tcl (create_control_buttons): Use SrcWin's
-	inferior method to centralize control of inferior state.
-	(create_control_buttons): Ditto.
-	(source): Move SrcBar's public variable "source" here,
-	so that the toolbar can use that info, too.
-	* srcwin.itb (SrcWin::inferior): New public method
-	to consildate inferior control and dispatch to proper
-	handlers.
-	* srcwin.ith (SrcWin::inferior): Add declaration.
-	* srctextwin.itb (SrcTextWin::do_key): Use parent SrcWin's inferior
-	method to handle inferior state changes (run, step, next, etc).
-	* interface.tcl: Add procs to centralize inferior control:
- 	gdbtk_step, gdbtk_next, gdbtk_stepi, gdbtk_nexti, gdbtk_run,
-	gdbtk_continue, gdbtk_finish, gdbtk_stop.
-	New stop button code (see comments before gdbtk_stop):
-	(gdbtk_stop_idle_callback): Idle callback for stop button.
-	(gdbtk_detach): New proc to forcibly detach from target.
-	* main.tcl: Initialize data used by stop button.
-	* srcbar.tcl (create_run_menu): Call SrcWin's inferior
-	method with button commands.
-	(source): Move "source" to Toolbar class.
-
-1999-03-29  Keith Seitz  <keiths@cygnus.com>
-
-	* browserwin.itb (BrowserWin::do_all_bp): Fix quoting of break
-	command.
-	(BrowserWin::_toggle_bp): Ditto.
-
-1999-03-19  Keith Seitz  <keiths@cygnus.com>
-
-	* download.itb (Download::download_it): Configure SrcWin's toolbar,
-	too, to a downloading state.
-	* srcbar.tcl (runstop): Change states from numbers to
-	strings to avoid confusion.
-	(_set_runstop): Change states from numbers to strings to
-	avoid confusion.
-	* srcwin.ith (toolbar): New public method.
-	* srcwin.itb: Change all references of runstop to use new strings
-	introduced into GDBSrcBar::_set_runstop.
-	(SrcWin::toolbar): New public method to configure the state of the toolbar.
-	* tclIndex: Regenerate.
-
-1999-03-18  Martin Hunt  <hunt@cygnus.com>
-
-	* interface.tcl (set_target_name): Remove first argument.
-	If prompt is not set, still update gdb_target_cmd.
-	(set_target): Call set_target_name with prompt argument
-	set correctly.
-	(run_executable): Check for no exe name. Catch problems
-	with bad target names and prompt for new one.
-
-	* main.tcl: Set target name from prefs.  If it is "",
-	the set "gdb_target_changed" to force it to be changed
-	later.
-
-	* prefs.tcl (pref_set_defaults): Don't set target default
-	to "exec".  Leave the default unset.
-	
-	* srcbar.tcl (create_menu_items): Update args to
-	set_target_name.
-	
-1999-03-18  Keith Seitz  <keiths@cygnus.com>
-
-	* prefs.tcl (pref_read): Change unix preference filename
-	to ".gdbtkinit". This bogosity has been around long enough.
-
-1999-03-16  Martin Hunt  <hunt@cygnus.com>
-
-	* managedwin.itb (ManagedWin::_create): When running under
-	testsuite, don't resize.
-
-1999-03-13  James Ingham  <jingham@cygnus.com>
-
-	* browserwin.itb (BrowserWin::search): If all the files are
-	selected in the file box, then don't pass the files argument.
-	This makes the function browser a little quicker.  The main
-	slowdown, however, is sorting the resultant list.  Maybe do this
-	in C to get this quicker?
-
-	* memwin.itb (MemWin::edit): Comment out the line that reads back
-	in the newly set memory value.  Because of the chain of calls,
-	on Windows this causes some evil race that results in GDBTk
-	filling all the visible cells with the new value.  I don't
-	understand it yet, so this is just a temporary fix.
-
-1999-03-12  James Ingham  <jingham@cygnus.com>
-
-	* memwin.ith (MemWin): Add saved_addr to the class.  This is where 
-	we store the old address before we change addresses, so that we
-	can get back to a good state in case of errors.
-
-	* memwin.itb (MemWin::update_addr): gdb_get_mem does not always
-	return an error code when it hits an error.  Catch that here.
-	(MemWin::update_address): Store away the old address, so we can
-	restore it if there is an error.
-	(MemWin::BadExpr): Restore the saved address in case of errors.
-	
-
-1999-03-09  James Ingham  <jingham@cygnus.com>
-
-	* Rebuilt tclIndex.
-
-1999-03-08  James Ingham  <jingham@cygnus.com>
-
-	* srctextwin.itb (SrcTextWin::constructor): pc(funcname) was
-	changed to pc(func), but the initialization was not changed...
-
-	* download.ith (dont_remember_size): Download window should not
-	remember its size.
-
-	* interface.tcl (connect): Handle the case where set_target
-	returns 3...
-
-	* debugwin.itb (DebugWinDOpts::build_win): Replace $this delete
-	with delete object $this.
-	* tfind_args.tcl (build_win): Ditto...
-	* helpviewer.itb (HtmlViewer::_buildwin): Ditto...	
-
-	* srcbar.tcl (GDBSrcBar): Reorder the Source & the page setup &
-	print menus...
-
-1999-03-04  Martin Hunt  <hunt@cygnus.com>
-
-	* download.ith: New file.
-	* download.itb: New file.  Implements itcl3 class and replaces
-	download.tcl.
-	
-	* srcbar.tcl (create_menu_items): Call create_run_menu
-	without arguments.
-	(create_run_menu): Add Disconnect and Connect to Run menu
-	instead of file menu. Change download_it to Download::download_it.
-
-	* srctextwin.itb (do_key): Change binding to call 
-	Download::download_it.
-	
-	* debugwin.itb (DebugWinDOpts::build_win): Add ProcessWIn to list
-	of classes for filter.
-
-	* interface.tcl (set_target): No need to set window title.
-	(run_executable): Change download_it to Download::download_it
-
-1999-03-04  James Ingham  <jingham@cygnus.com>
-
-	* modal.tcl (ModalDialog): Handle WM_DELETE_WINDOW by calling the
-	cancel method.  Also set unpost_notification to different values
-	in unpost & the destructor, so if the object dies irregularly, you 
-	know not to try to double destruct it.
-
-1999-03-03  James Ingham  <jingham@cygnus.com>
-
-	* warning.tcl (WarningDlg::constructor):Destroy with unpost.
-
-	* util.tcl (get_disassembly_flavor, set_disassembly_flavor,
- 	init_disassembly_flavor): Added these functions for the Intel P2
- 	disassembly flavors.
-	(list_element_strcmp): New function for lsort -command on lists.
-
-	* tracedlg.tcl (TraceDlg): Change combobox callback to reflect new 
-	after behavior.
-
-	* targetselction.itb (TargetSelection::save): If the target
-	is not valid, tell the user rather than simple refusing to go
-	away.
- 	Also move stuff around to isolate the instance dependant stuff as
-	much as possible
-	Also replace delete with unpost.
-
-	* targetselection.ith (TargetSelection): Make as much of the
-	initialization stuff Class functions as possible.  Then only
-	initialize it once.
-
-	* srcwin.ith (_update_title): initialize need_files.
-
-	* srcwin.itb (SrcWin::_build_win): I changed the combobox so it
-	ran its code in an idle handler, so we can take out all the after
-	idle... cruft here.
-
-	* srctextwin.ith (SrcTextWin): Added textheight variable so you
-	can adjust the height of the text display.
-
-	* srctextwin.itb (SrcTextWin::build_win): Don't hardcode the size
-	of the text window, set it with the textheight option instead.  
-	Also replace childsite with "component text" wherever required.
-
-	* srcpref.itb (SrcPref::build_win, set_flavor): Added the Intel
- 	disassembly flavor combobox.  Added set_flavor method to support
-	this.
-	* srcpref.ith: Added declaration for set_flavor, and
-	disassembly_flavor instance variable.
-
-	* modal.tcl (ModalDialog::post, unpost): Added unpost method to
-	provide a more regular way to dismiss the dialogs.  Just
-	destroying them was leading to funny destruction order bugs.
-	Added cancel method, which is what client code should call to
-	"force close" the dialog, so child classes can override, and do
-	some cleanup.
-
-	* memwin.itb (MemWin::destructor): Call the cancel method of the
-	Preferences dialog (if it is posted) rather than just destroying
-	it.
-
-	* mempref.itb (MemPref::ok): call unpost, since this is a modal
-	dialog.
-
-	* managedwin.itb (ManagedWin::reveal): Used to be called raise.
-	Don't reuse Tcl or Tk commands unless there is a really good
-	reason to...
-	(ManagedWin::destroy_toplevel): renamed from delete, which
-	conflicts both with the Itcl1.5 delete method, and the Itcl3.0
-	delete command...  Also, don't use this as the way to destroy
-	ManagedWins, rather destroy the object and let the object take
-	care of removing its toplevel.
-	(ManagedWin::_create): Group all the windows with 
-	. for WindowManagers that properly handle this.
-	(ManagedWin::_create): Use dont_remember_size
-	rather than the instance variable.  Also, windows which don't
-	remember size are not necessarily transient.
-	(ManagedWin::_create): Only call post if the
-	ManagedWin also isa ModalDialog.  It is clearer what is going on.
-	* managedwin.ith: Carry through the name changes.
-	
-	* main.tcl: call init_disassembly_flavor for Intel assembly
-	flavors.
-
-	*main.tcl: Group . with .  This is half of the work required to
-	play nice with WindowMaker.  The other half waits till we can get
-	gdb to pass the command-line arguments to Tcl.
-
-	* interface.tcl: Add file_changed_hook to the hooks.  The browser
-	window watches this and refreshes the file box if it changes.
-
-	* globalpref.ith (GlobalPref): This should be a modal dialog.
-	* globalpref.itb (GlobalPref::build_win): call update idletasks,
-	not update.  Since we are calling update, there is no reason to
-	delay calling resize_font_item_height.
-	* globalpref.itb: Replace destroy toplevel with unpost.
-
-	* debugwin.itb (DebugWin::build_win): Replace childsite with
-	"component text"
-
-	* console.itb (Console::_build_win): Replace childsite with
-	"component text"
-
-	* browserwin.itb: Rewritten pretty completely.
-	* prefs.tcl (pref_set_defaults): add the browser preferences.
-
-	* prefs.tcl (pref_set_defaults): add the intel disassembly flavor
-	preference.
-
-	* about.tcl (About): This should be a modal dialog.
-
-1999-03-02  James Ingham  <jingham@cygnus.com>
-
-	* globalpref.itb (GlobalPref::make_font_item): Don't do the
- 	resize_font_item_height here, since an update can cause the resize
- 	before all the windows are built.  Delay to the end of build_win
- 	instead.
-
-1999-02-24  James Ingham  <jingham@cygnus.com>
-
-	* toolbar.tcl (remove_button): Specify the row in the toolbar from 
-	which you are removing the item.  On Windows, there are two rows
-	in the standard toolbar...
-
-1999-02-22  Martin Hunt  <hunt@cygnus.com>
-
-	* warning.tcl (WarningDlg::constructor): Remove extra quote
-	that was causing loading of this module to fail.
-
-	* managedwin.itb (ManagedWin::_create): If the pack fails
-	(for example because the warning dialog reliazed it should
-	ignore the warning) print a warning debug message and return.
-	Also, while testing, tell the window manager to position
-	the window without asking the user for the position.
-
-1999-02-18  Martin Hunt  <hunt@cygnus.com>
-
-	* srctextwin.itb (SrcTextWin::FillAssembly): As a last resort, 
-	if the disassembly fails for some reason, switch to the scratch
-	pane and write in a message about not being able to disassemble.
-
-1999-02-18  Martin Hunt  <hunt@cygnus.com>
-	
-	* helpviewer.ith (HtmlViewer): Add thread and function
-	browser windows to help index.
-
-	* help/index.toc: Removed.
-
-1999-02-18  Martin Hunt  <hunt@cygnus.com>
-	
-	* help/thread.html: New file.  Thread window online help.
-	* help/index.html: Add thread.html, and alphabetize list.	
-	* help/source.html: Add index for thread_bp.
-	
-1999-02-17  Martin Hunt  <hunt@cygnus.com>
-
-	* globalpref.itb (GlobalPref::build_win): Add a checkbutton to 
-	allow use of an internet browser to read help files.
-	
-	* prefs.tcl (pref_set_defaults): Add preference gdb/help/browser.
-	Default is to use builtin html help.
-
-	* helpviewer.itb (HtmlViewer::open_help): New public proc.
-	Depending on preferences, opens help in external browser or
-	internal htmlviewer.
-
-	* toolbar.tcl (create_help_menu): Use HtmlViewer::open_help.
-
-1999-02-17  Martin Hunt  <hunt@cygnus.com>
-	
-	* managedwin.itb (ManagedWin::_create): Restore some lines that
-	were accidently checked in commented out.
-
-1999-02-17  Keith Seitz  <keiths@cygnus.com>
-
-	* help/index.html: Add function browser.
-	* help/browser.html: New help file.
-
-1999-02-12  Martin Hunt  <hunt@cygnus.com>
-
-	* managedwin.itb (ManagedWin::_create): If a window class defines a
-	public variable "nosize" the size will not be set, only the position.
-	* browserwin.ith (toggle_all_bp): Add public variable "nosize".	
-
-1999-02-12  Martin Hunt  <hunt@cygnus.com>
-	
-	* process.ith: New file.
-	* process.itb: New file. Converted process.tcl to new itcl class.
-	* process.tcl: Deleted.
-	
-	* warning.tcl (WarningDlg::constructor): Set the window name.
-
-1999-02-11  Martin Hunt  <hunt@cygnus.com>
-	
-	* variables.tcl (editEntry): Check that $variable is not empty.
-
-	* warning.tcl (WarningDlg::constructor): Put focus on the
-	"OK" button and bind it to <Return>.
-
-	* watch.tcl (add): If the user attempts to add a non-existent
-	variable to the watch-window, display an ignorable warning.
-
-	* interface.tcl (gdbtk_tcl_ignorable_warning): -transient
-	should not take an argument.
-	(set_target_name): Ditto.
-	* srcbar.tcl (create_menu_items): Ditto.
-	* memwin.itb (MemWin::create_prefs): Ditto.
-	* managedwin.itb (ManagedWin::_create): Ditto.	
-
-1999-02-11  James Ingham  <jingham@cygnus.com>
-
-	Move the Intel disassembly mode changes into devo.
-	
-	* main.tcl: Init the disassembly flavor bits.
- 	* prefs.tcl: Define disassembly-flavor
-	* srcpref.ith: Add current_disassembly_flavor instance variable
-	and set_flavor method.
-	* srcpref.itb (build_win): Add the disassembly_flavor combobox.
-	              (apply): set the flavor, if applicable.
-	              (set_flavor): New method.
-	* util.tcl: Add 3 new functions - get_disassembly_flavor,
-	list_disassembly_flavor and init_disassembly_flavor.
-
-1999-02-10  Martin Hunt  <hunt@cygnus.com>
-
-	* srcwin.itb, download.tcl, main.tcl, srcbar.tcl: Removed old 
-	IDE stuff.
-
-	* toolbar.tcl (create_help_menu): Updated Cygnus URL and
-	removed old IDE stuff.
-	(create_ide_buttons): Removed. 
-
-1999-02-10  Martin Hunt  <hunt@cygnus.com>
-	
-	* managedwin.itb (ManagedWin::_create): Bind Alt-F4 to
-	always close the window.
-
-1999-02-10  Martin Hunt  <hunt@cygnus.com>
-	
-	* main.tcl: Removed old debugging preferences.
-	* prefs.tcl (pref_set_defaults): Ditto.
-	
-1999-02-09  Martin Hunt  <hunt@cygnus.com>
-
-	* managedwin.itb (ManagedWin::_create): Simplify raise
-	and post now that all windows use new manager.
-
-	* warning.tcl (WarningDlg): Rewrite of entire class to use
-	new itcl 3.0 class. Also now uses a "class name" to keep
-	track of which messages should be ignored. Uses tk_messageBox
-	of the message doesn't have -ignorable set.
-
-	* interface.tcl: Removed IDE stuff.
-	(gdbtk_tcl_ignorable_warning): Accept "class" argument and
-	use it when creating a WarningDlg.  Use new ManagedWin::open.
-	
-	* srctextwin.itb (SrcTextWin::set_tp_at_line): Fix TraceDlg
-	open command to use ManagedWin::open.
-
-	* srcpref.itb (SrcPref::build_win): Comment out line number
-	option.  It wasn't very useful and did not become effective
-	until GDBtk was restarted.
-
-1999-02-09  James Ingham  <jingham@cygnus.com>
-
-	* srctextwin.itb (build_win): Set the paned window background to
-	white so it looks better when you switch windows.
-
-	* mempref.itb (build_win): Use the libgui combobox for the bytes per
-	line field.
-	
-	* mempref.itb: remove some global declarations that I missed when
-	I converted all the variables to instance data.
-
-	* variables.tcl (change_value): Catch one more place where $this
-	was being passed as a window name.
-
-	* TODO: Added some more items, and removed some that had been fixed.
-
-Mon Feb  8 12:27:16 1999  Keith Seitz  <keiths@cygnus.com>
-
-	* interface.tcl (set_target_name): Fix switch syntax
-	error and getd the options preference in case it's not set.
-
-
-Thu Feb  4 11:55:43 1999  Keith Seitz  <keiths@cygnus.com>
-
-	* targetselection.itb (_init_db): Add MIPS target.
-	(fill_targets): Ditto.
-
-Thu Feb  4 07:56:12 1999  Keith Seitz  <keiths@cygnus.com>
-
-	* targetselection.itb: Set "TargetSelection::target_trace"
-	as the correct trace for gdb_loaded.
-	* targetselection.ith: Make "target_trace" a public proc.
-
-1999-02-03  Martin Hunt  <hunt@cygnus.com>
-
-	* help/console.html: Cleaned up and added history and editing 
-	commands.
-
-	* stackwin.itb (StackWin::build_win): Remove balloon help.
-
-	* console.itb (Console::_search_history): New function.
-	Does a pattern match on history buffer.
-	(Console::_rsearch_history): New function. Does a pattern
-	match on history buffer in the reverse direction.
-	(Console::_build_win): Bind Control-Up, Control-Down,
-	Shift-Up, and Shift-Down to search history instead of mess
-	up the console window. Bind Control-o to break to disable it.
-
-	* help/stack.html: Cleanup.
-
-	* help/source.html: Add a bunch of missing quotation marks.
-
-1999-02-03  Martin Hunt  <hunt@cygnus.com>
-	
-	* memwin.itb: Change from tixControl widget to iwidgets::spinint.
-	Fix problems with error dialogs.
-
-1999-02-02  Martin Hunt  <hunt@cygnus.com>
-
-	* srctextwin.itb (SrcTextWin::do_source_popup): Even after fixing the
-	obvious syntax errors in this function, it didn't work. So I
-	simplified the logic. Now it will attempt to use whatever is selected.
-	If multiple lines are selected and tracing is enabled, it will set
-	tracepoints, otherwise it will try to extract a variable name from single
-	lines only.
-
-	* main.tcl: Only open debugwin if GDBTK_DEBUG > 1.
-
-	* toolbar.tcl (create_view_menu): Only add "Debug WIndow" menu
-	item if GDBTK_DEBUG is set.
-	
-1999-02-02  Martin Hunt  <hunt@cygnus.com>
-	
-	* browserwin.itb (BrowserWin::_fill_source): Add lib argument
-	from gdb_loc to the call to $Source location.
-	(BrowserWin::_goto_func): Ditto.
-
-1999-02-01  James Ingham  <jingham@cygnus.com>
-
-	* browserwin.itb (BrowserWin::_fill_source): Add a null lib
-	argument to the call to $Source location.
-
-1999-02-01  Martin Hunt  <hunt@cygnus.com>
-
-	* prefs.tcl (pref_save): Change the list of sections back into
-	a list.
-
-1999-02-01  Martin Hunt  <hunt@cygnus.com>	
-
-	* srctextwin.itb (SrcTextWin::FillMixed): Simplify line formatting.
-	(SrcTextWin::continue_to_here): Call gdb_set_bp with new type arg.
-	(SrcTextWin::set_bp_at_line): Call gdb_set_bp with new type arg.
-	Use "catch" command and display error if there is one.
-
-1999-02-01  Martin Hunt  <hunt@cygnus.com>
-	
-	* srcwin.itb (SrcWin::goto_func): Dont attach filename if
-        there isn't a valid one.
-
-Fri Jan 29 20:01:30 1999  Fernando Nasser  <fnasser@rtl.cygnus.com>
-
-	* main.tcl: Restored kod code lost with merge
-	* prefs.tcl: Ditto.
-	* srctextwin.tcl: Ditto.
-	* toolbar.tcl: Ditto
-	* kod.tcl: Adapted to the new branch.
-	
-1999-01-28  Martin Hunt  <hunt@cygnus.com>
-
-        * srcwin.itb (SrcWin::_build_win): Only call gdb_loc once.
-        (SrcWin::location): Update linespec for gdb_loc to include
-        the "lib" arg.
-
-        * srctextwin.itb (SrcTextWin::LoadFromCache): Add "lib"
-        argument. This is used to create a unique cache key so
-        we don't confuse the disassembly of a function in a shared
-        lib with the disassembly of its trampoline. Also updated 
-        UnLoadFromCache, LoadFIle, FillSource, FillMixed, and FillAssembly
-        to pass this argument around.
-
-        * helpviewer.ith (HtmlViewer::constructor): Declare we have a 
-        constructor.
-        (PageStack::constructor): Delete this declaration.
-        
-        * helpviewer.itb (HtmlViewer::constructor): initialize args before 
-        calling _buildwin
-        
-        * main.tcl: Only open initial debug window if GDBTK_DEBUG
-        is set.
-        
-        * help/debug.html: Add help for GDBTK_DEBUG
-
-Wed Jan 27 07:18:05 1999  Keith Seitz  <keiths@cygnus.com>
-
-        * interface.tcl (gdbtk_pc_changed): Removed.
-        (gdbtk_register_changed): New procedure.
-        (gdbtk_memory_changed): New procedure.
-
diff --git a/gdb/gdbtk/library/ChangeLog-2000 b/gdb/gdbtk/library/ChangeLog-2000
deleted file mode 100644
index 5d16d82673d..00000000000
--- a/gdb/gdbtk/library/ChangeLog-2000
+++ /dev/null
@@ -1,409 +0,0 @@
-2000-12-13  Fernando Nasser  <fnasser@redhat.com>
-
-	* variables.tcl (constructor): Use the  file_changed_hook to remove
-	all variables if the exec file changes.  This prevents the Watch
-	Window to dump core because the "types" are not valid anymore.
-
-2000-12-13  Fernando Nasser  <fnasser@redhat.com>
-
-	* session.tcl (session_save): Save target name.
-	(session_load): Restore target name.
-
-2000-12-08  Tom Tromey  <tromey@redhat.com>
-
-	* managedwin.itb (ManagedWin::startup): Only open source window
-	if it doesn't already exist.
-
-	* toolbar.tcl (create_help_menu): Remove `Cygnus' item.
-
-	* console.itb (Console::invoke): Trim trailing newlines from
-	text.
-
-2000-12-07  Tom Tromey  <tromey@redhat.com>
-
-	* managedwin.itb (ManagedWin::reveal): Don't set focus.
-
-	* tclIndex: Rebuilt.
-	* interface.tcl (set_exe_name): Save session.
-	(gdbtk_quit_check): Save session.
-	* session.tcl: New file.
-	* srcbar.tcl (create_menu_items): Add menu items to recall old
-	sessions.
-
-	* bpwin.itb (BpWin::goto_bp): Handle multiple source windows.
-	* srctextwin.itb (SrcTextWin::get_file): New method.
-	(SrcTextWin::set_tag_to_stack): New method.
-	* srctextwin.ith (get_file): Declare.
-	* srcwin.ith (update_hook_init, window_list, pc_window): New
-	common variables.
-	(_choose_window, choose_and_update, is_fixed, get_file): Declare.
-	* srcwin.itb (SrcWin::_choose_window): New method.
-	(SrcWin::choose_and_update): Likewise.
-	(SrcWin::_update): Renamed from update.  Now private.  Added `loc'
-	argument.
-	(SrcWin::get_file): New method.
-	(SrcWin::is_fixed): Likewise.
-	(SrcWin::constructor): Only add update hook once.  Append this
-	object to window list.
-	(SrcWin::destructor): Don't add update hook.  Remove this object
-	from window list.  Clear pc_window if necessary.
-	(SrcWin::get_top): New method.
-	(SrcWin::_set_tag_to_stack): New method.
-	(SrcWin::choose_and_display): New method.
-
-	* srctextwin.itb (SrcTextWin::do_source_popup): Added "Set
-	Breakpoint" to popup menu.
-
-	* srcwin.itb (SrcWin::edit): Use uplevel, not eval, to evaluate
-	external editor expression.
-
-2000-12-06  Tom Tromey  <tromey@redhat.com>
-
-	* targetselection.itb (TargetSelection::build_win): Add option to
-	start xterm.
-	* interface.tcl (run_executable): Call tty::create if requested.
-	* tty.tcl: New file.
-
-2000-12-02  Tom Tromey  <tromey@redhat.com>
-
-	* console.ith (_set_wrap): Declare.
-	(_update_option): Likewise.
-	* console.itb (Console::constructor): Install preference hooks
-	(commented out pending a bug fix).
-	(Console::destructor): Remove preference hooks.
-	(Console::_set_wrap): New method.
-	(Console::_update_option): New method.
-	(Console::_build_win): Use _set_wrap.
-
-2000-12-01  Larry Smith <lsmith@redhat.com>
-
-        * console.itb (invoke): Added logic to allow user to build
-        up multiline "tk" commands based on results from checking
-        command with [info complete $cmd]s.
-
-2000-11-30  Tom Tromey  <tromey@cygnus.com>
-
-	* srctextwin.ith (enable_disable_at_line): Declare.
-	* srctextwin.itb (SrcTextWin::build_popups): Create popup for
-	disabled breakpoint.  Add "disable" to breakpoint menu.
-	(enable_disable_at_line): New method.
-	(SrcTextWin::do_bp): Don't remove the tag we are adding -- remove
-	the "opposite" tag.
-
-2000-11-30  Tom Tromey  <tromey@cygnus.com>
-
-	* prefs.tcl (pref_save): Put version number into file.  Added
-	`session' to list of top-level keys.  Allow keys with many `/'s.
-	(pref_read): Recognize version number.
-	(escape_value): Generate URL-style encoding.
-	(unescape_value): Added `version' argument.  Handle URL decoding.
-
-2000-11-29  Larry Smith <lsmith@redhat.com>
-
-        * regwin.itb (build_win,but3): Added "Double" menu entry to
-        permit selection of "f" format for register display.
-
-2000-11-06  Fernando Nasser  <fnasser@cygnus.com>
-
-	* interface.tcl (show_warning): Add missing argument to ide_messageBox
-	and add comments explaining why we use it for windows.
-
-2000-11-01  Larry Smith  <lsmith@redhat.com>
-
-        * console.itb (_build_win): Added code to remove horizontal
-        scrollbar by setting -hscrollmode none, which enables the
-        console widget to wrap text properly.
-        * globalpref.itb (build_win): added checkbutton to enable
-        wrapping text in the console window.
-
-2000-10-31  Larry Smith  <lsmith@redhat.com>
-
-        * targetselection.ith (run_method): Add variable for
-        "Run Program" and "Continue..." buttons
-        * targetselection.itb (build_win): put "Run Program" and
-        "Continue From..." buttons into a frame and save them in new
-        run_method variable.
-        * change targetselection.itb (change_target) disables "Run
-        Program" and "Continue..." buttons when the target is "exec",
-        enables them for all others.
-
-2000-10-26  Larry Smith  <lsmith@redhat.com>
-
-        * targetselection.itb: Run Program and Continue From Last Stop
-        are now radio buttons rather than checkbuttons
-
-2000-10-26  Mo DeJong  <mdejong@redhat.com>
-
-	* attachdlg.itb (list_pids): Use "ps axw" to get pid list
-	when running under Linux. Use string match instead of
-	regexp match is ps filter entry.
-	* attachdlg.ith (list_pids): Change default argument to "*".
-
-2000-10-23  Fernando Nasser  <fnasser@cygnus.com>
-
-	* util.tcl (find_iwidgets_library): Use the directories that were
-	actually searched in the error message.
-
-2000-10-13  Fernando Nasser  <fnasser@cygnus.com>
-
-	With Steven Johnson <sbjohnson@ozemail.com.au>
-	This change fixes part of the possible scenarios where a race condition
-	would cause core dumps if there were commands changing registers or
-	other target resources in a startup script.
-	The remaining scenarios are fixed by a patch to generic/gdbtk-hooks.c
-	* interface.tcl (gdbtk_update_safe): New function. Like gdbtk_update
-	but does nothing if target is running.
-	(gdbtk_register_changed): Call the above safe version.
-	(gdbtk_memory_changed): Likewise.
-
-2000-10-11  Fernando Nasser  <fnasser@cygnus.com>
-
-	* srctextwin.itb (build_popups): Fix typos that caused duplicate
-	"Jump to Here" menu entries in the breakpoint-set right-click pop-up
-	menu.
-
-2000-10-04  Fernando Nasser  <fnasser@totem.to.cygnus.com>
-
-	* download.itb (download_it): Fix previous changes for non-windows
-	hosts.
-	* srctextwin.itb (LoadFromCache): Ditto.
-
-2000-10-04  Fernando Nasser  <fnasser@totem.to.cygnus.com>
-
-	* download.itb (download_it): Convert filename to native before
-	passing it to a Tcl command.
-	* srctextwin.itb (_mtime_changed): Ditto.
-	(LoadFromCache): Ditto.
-
-2000-09-18  Fernando Nasser  <fnasser@cygnus.com>
-
-	* watch.tcl (build_win): Use code when setting callback.
-
-2000-08-10  Fernando Nasser  <fnasser@cygnus.com>
-
-	* targetselection.itb (change_baud): Fix typo (ETH, not ETX).
-
-2000-08-10  Fernando Nasser  <fnasser@cygnus.com>
-
-	* targetselection.itb (init_target_db): Add 115200 baud option to
-	target remote.
-
-2000-08-10  Fernando Nasser  <fnasser@cygnus.com>
-
-	* targetselection.itb (change_baud): Don't set baud for ETX.
-
-2000-08-10  Fernando Nasser  <fnasser@cygnus.com>
-
-	* srctextwin.itb (jump_to_here): New method. Implements the
-	"Jump to Here" popup menu option.
-	(build_popups): Add the "Jump to Here" option to the popup menu.
-	* srctextwin.ith: Add declaration of jump_to_here().
-
-2000-08-09  Fernando Nasser  <fnasser@cygnus.com>
-
-	* srctextwin.itb (FillSource): Add comments.
-	* srcwin.itb (set_execution_status): Fix typo in SRC+ASM message.
-	It is gdb_cmd, not gb_cmd.
-
-2000-08-08  Fernando Nasser  <fnasser@cygnus.com>
-
-	* srctextwin.itb (LoadFromCache): Do not cache if cannot stat the file.
-	This lead to problems trying to access a incomplete cache entry later.
-
-2000-06-06  Fernando Nasser  <fnasser@cygnus.com>
-
-        * util.tcl (find_iwidgets_library): Add missing global declaration
-        which caused a stack trace instead of the proper error message.
-
-2000-05-04  Fernando Nasser  <fnasser@cygnus.com>
-
-	* regwin.itb (build_win, update): Safer test for editable.
-
-2000-05-01  Fernando Nasser  <fnasser@cygnus.com>
-
-        * variables.tcl (edit): Make changes to a variable which is a register
-        to be reflected on the register window by running the update hook.
-
-2000-05-01  Fernando Nasser  <fnasser@cygnus.com>
-
-	* regwin.itb (build_win): Adjust size of columns independently, force
-	typed registers to raw mode and check if values can be edited.
-	Also, add "Add to Watch" option to the menu.
-	(update): Similar changes to similar code.
-	(init_reg_display_vars): Initialize new variables used above.
-	(reg_select): Deactivate menu options when action is not possible.
-	(but3): Ditto.
-	(edit): Do not edit if it is not editable.
-	(acceptEdit): Fix bug is error message box display.
-	(addToWatch): New mwthod.  Add a register to the Watch window.
-	* regwin.ith: Add addToWatch to the class.
-	* tclIndex: Regenerate.
-
-2000-04-27  James Ingham  <jingham@leda.cygnus.com>
-
-	These changes allow Insight to handle the case where there are
-	symbols for the source files, but the source files are not in the
-	location pointed to by the symbol.
-	
-	* srctextwin.itb (SrcTextWin::setTabs): Make the "asm" type for
-	the source display "S" not "", which is not very clear.
-        (SrcTextWin::configWin): ditto.
-	(SrcTextWin::FillAssembly): Handle all return values from
-	LoadFromCache.
-	* (SrcTextWin::LoadFile): Handle "couldn't find file" return from
-	LoadFromCache.
-	* (SrcTextWin::LoadFromCache): If the source file could not be
-	found, return -1 rather than choking.
-	Also change "asm" type for source from "" to "S".
-	* srctextwin.ith: Change the defaults for the "asm" type from ""
-	to "S" for Source display.  This is just cosmetic, but clearer.
-	
-2000-04-13  Tom Tromey  <tromey@cygnus.com>
-
-	* console.itb (Console::_complete): Dequoted first argument to
-	switch.  Window name is `$_twin', not `_twin'.
-
-2000-04-10  Tom Tromey  <tromey@cygnus.com>
-
-	* srctextwin.itb (SrcTextWin::build_popups): Don't set actibe
-	background on popup menu item.
-
-2000-04-08  Tom Tromey  <tromey@cygnus.com>
-
-	* console.itb (Console::_build_win): Make Control-a, Control-u,
-	and Control-w bindings show the insertion point.
-
-2000-04-05  James Ingham  <jingham@leda.cygnus.com>
-
-	* regwin.itb (RegWin::build_win): Enable the "Display all
-	registers" menu at startup if any registers have been removed. 
-	(RegWin::save_reg_display_vars): Handle cases where the register
-	set is not contiguous.
-	(RegWin::destructor): Actually save away the removed registers.
-	The latter two are Steve Johnson's change.
-
-	* regwin.ith (RegWin): Added "all_regs_shown" and
-	"disp_all_menu_item" to handle tracking whether any registers have 
-	been removed from the display.
-	
-
-2000-04-03  Steve Johnson  <sbjohnson@ozemail.com.au>
-
-	* regwin.itb (dimensions): Use rows from preference file rather
-	than hard-coding a preference.
-	* prefs.tcl (pref_set_defaults): Add gdb/reg/rows preference.
-
-2000-04-03  James Ingham  <jingham@leda.cygnus.com>
-
-	* util.tcl (find_iwidgets_library): Follow links in determining
-	the location of the executable.
-
-2000-03-30  Fernando Nasser  <fnasser@totem.to.cygnus.com>
-
-	* variables.tcl (edit): Remove call to close, which caused editing
-	of variables to fail.
-	Note: I don't know why we would need to do this here as it seems
-	that the "delete entry" operation will do that.
-	Perhaps this was to account to some old widget bug.
-	But we cannot call close here because it calls UnEdit,
-	which unsets some of the edit state.
-        (open): Make sure to abort any ongoing edit.  This was causing problems
-	when someone tried to expand an structure while editing its pointer.
-
-2000-03-28  James Ingham  <jingham@leda.cygnus.com>
-
-	* managedwin.itb (ManagedWin::startup): Open the SrcWin, this does 
-	two things, 1) Makes sure that there IS a SrcWin, and 2) brings
-	the first such window to the foreground...
-
-2000-03-28  Jim Blandy  <jimb@redhat.com>
-
-	Handle the fact that there are holes in the register numbering.
-	* regwin.itb (RegWin::init_reg_display_vars): Ask gdb_regnames to
- 	provide the register numbers, too; don't just assume that the Nth
- 	element is register N.
-
-2000-03-27  James Ingham  <jingham@leda.cygnus.com>
-
-	* interface.tcl (gdbtk_quit): Let the window manager store away
-	the list of active windows before quitting.
-	(gdbtk_tcl_preloop): Open all the windows that were active in the
-	former session.
-	* prefs.tcl (pref_set_defaults): Set the default value of the
-	"gdb/window/active" pref.  Stores the list of active windows.
-	* managedwin.itb (ManagedWin::pickle): New method - store away
-	instructions to recreate this window.
-	(ManagedWin::shutdown): New Method - run through the active windows
-	pickling them all.
-	(ManagedWin::startup): Restore all the saved active windows.
-	* managedwin.ith: Declare pickle, shutdown & startup.
-	* tclIndex: regenerate.
-
-2000-03-10  James Ingham  <jingham@leda.cygnus.com>
-
-	* targetselection.ith (get_target_list): Should be a proc, since
-	it does nothing instance-specific.
-
-	* util.tcl (keep_raised): For some reason raising a window, then
-	deiconifying it is MUCH faster on "e" & WindowMaker under XFree.  
-	Go figure.  Other WM's don't seem to care, so do it this way...
-	* managedwin.itb (ManagedWin::reveal): Ditto...
-
-2000-03-10  Elena Zannoni  <ezannoni@kwikemart.cygnus.com>
-
-	* srcbar.tcl (do_attach): Just call gdbtk_attach_native.
-        (do_connect): Replace gdbtk_attach_target call with
-        gdbtk_attach_remote call.
-
-	* interface.tcl (gdbtk_attach_native): Renamed from do_attach method
-        and moved from srcbar.tcl.
-        (gdbtk_attach_remote): New proc. Renamed from gdb_attach_target, 
-	to better distinguish from the native version.
-        (run_executable): Change gdbtk_attach_target call into
-        gdbtk_attach_remote.
-
-        * srctextwin.itb: Add keyboard accelerator for Attach command.
-
-        * tclIndex: Rebuild.
-
-2000-03-09  Elena Zannoni  <ezannoni@kwikemart.cygnus.com>
-
-	From: James Ingham <jingham@leda.cygnus.com>: 
-	* attachdlg.itb (build_win): Pack the dialog better, so that when
- 	window is resized components are not hidden.
-
-2000-03-02  Elena Zannoni  <ezannoni@kwikemart.cygnus.com>
-
-        * attachdlg.itb: Give a name to the window.
-
-2000-03-01  James Ingham  <jingham@leda.cygnus.com>
-
-	* interface.tcl (_open_file): The window which had the focus could 
-	get deleted by the vwait implicit in the tk_getOpenFile call.  So
-	check and make sure it is still around before raising it...
-
-2000-02-23  Keith R Seitz  <kseitz@nwlink.com>
-
-        * srctextwin.ith (_highlightAsmLine): Define new method.
-        * srctextwin.itb (_highlightAsmLine): New method.
-        (FillAssembly, FillMixed): Use _highlightAsmLine to highlight
-        the current assembly line.	
-
-Fri Feb  4 23:19:03 2000  Andrew Cagney  <cagney@b1.cygnus.com>
-
-	* gdb/gdbtcl2: Directory renamed to gdb/gdbtk/library.
-	
-2000-01-12  Fernando Nasser  <fnasser@totem.to.cygnus.com>
-
-	* targetselection.itb (init_target_db): Add the word "serial" to
-	the Angel target to make the distinction clear from the UDP connection.
-
-2000-01-05  Fernando Nasser  <fnasser@totem.to.cygnus.com>
-
-	From Dave Vogel (dave@lightsurf.com):
-	* targetselection.itb (init_target_db, config_dialog): Add support
-	for selecting a target running the Angel monitor (RDI protocol)
-	over an UDP connection.
-	* interface.tcl (set_target_name): Set hostname when target is RDI
-	over UDP (see previous entry).
-
diff --git a/gdb/gdbtk/library/Makefile b/gdb/gdbtk/library/Makefile
deleted file mode 100644
index c1e653b7944..00000000000
--- a/gdb/gdbtk/library/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-
-TCL := $(wildcard *.tcl *.itcl *.ith *.itb)
-
-TCLSH = tclsh
-
-tclIndex: $(TCL) Makefile
-	echo "package require Itcl; auto_mkindex `pwd` $(TCL)" | $(TCLSH)
-
-tags: TAGS
-TAGS: $(TCL)
-	etags --lang=none --regex='/[ \t]*\(proc\|method\|itcl_class\)[ \t]+\([^ \t]+\)/\1/' $(TCL)
diff --git a/gdb/gdbtk/library/about.tcl b/gdb/gdbtk/library/about.tcl
deleted file mode 100644
index af703081638..00000000000
--- a/gdb/gdbtk/library/about.tcl
+++ /dev/null
@@ -1,43 +0,0 @@
-# About window for GDBtk.
-# Copyright 1997, 1998, 1999, 2000, 2001 Red Hat, Inc.
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License (GPL) 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.
-
-
-# ----------------------------------------------------------------------
-# Implements About window
-# ----------------------------------------------------------------------
-
-itcl::class About {
-  inherit ManagedWin ModalDialog
-  constructor {args} {
-    global gdb_ImageDir
-    set f [frame $itk_interior.f]
-    label $f.image1 -bg #ee0000 -image \
-      [image create photo -file [file join $gdb_ImageDir insight.gif]]
-    message $f.m -bg #ee0000 -fg white -text [gdb_cmd {show version}] \
-      -aspect 500 -relief flat
-    pack $f.image1 $f.m $itk_interior.f -fill both -expand yes
-    pack  $itk_interior
-    bind $f.image1 <1> [code $this unpost]
-    bind $f.m <1> [code $this unpost]
-    window_name "About Red Hat Insight"
-  }
-
-  # Don't quit if this is the last window.  The only way that this can
-  # happen is if we are the splash screen. 
-
-  method quit_if_last {} { 
-    return 0
-  }
-
-}
-
diff --git a/gdb/gdbtk/library/actiondlg.tcl b/gdb/gdbtk/library/actiondlg.tcl
deleted file mode 100644
index f3ff6a2480b..00000000000
--- a/gdb/gdbtk/library/actiondlg.tcl
+++ /dev/null
@@ -1,810 +0,0 @@
-# Tracepoint actions dialog for Insight.
-# Copyright 1997, 1998, 1999, 2001 Red Hat, Inc.
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License (GPL) 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.
-
-
-itcl::class ActionDlg {
-  inherit ManagedWin
-
-  # ------------------------------------------------------------------
-  # CONSTRUCTOR
-  # ------------------------------------------------------------------
-  constructor {args} {
-    global _TStepCount _TOtherVariable
-
-    eval itk_initialize $args
-
-    set Registers [gdb_reginfo name]
-    if {$Line != ""} {
-      set Locals  [gdb_get_locals "$File:$Line"]
-      set Args    [gdb_get_args "$File:$Line"]
-    } else {
-      set Locals  [gdb_get_locals "*$Address"]
-      set Args    [gdb_get_args "*$Address"]
-    }
-    set Variables [concat $Locals $Args]
-    foreach a $Registers {
-      lappend Variables "\$$a"
-    }
-    
-    if {[llength $Args] > 0} {
-      lappend Variables "All Arguments"
-    }
-    if {[llength $Locals] > 0} {
-      lappend Variables  "All Locals" 
-    } 
-    lappend Variables "All Registers"
-    lappend Variables "Collect Stack"
-
-    build_win
-
-    # Set a default return status, in case we are destroyed
-    set _TOtherVariable {}
-
-    # Fill the listboxes with any default data
-    if {"$Data" != {}} {
-      change 1 $Data
-    }
-  }
-
-  # ------------------------------------------------------------------
-  #  DESTRUCTOR - destroy window containing widget
-  # ------------------------------------------------------------------
-  destructor {
-
-    # Remove this window and all hooks
-    # grab release $this
-
-    # Note that this is okay: the callback (TraceDlg::done, usually) will
-    # ignore stray "cancel" callbacks
-    eval $Callback cancel
-  }
-
-  # ------------------------------------------------------------------
-  # METHOD: build_win - build the Trace dialog box (cache this?)
-  # ------------------------------------------------------------------
-  method build_win {} {
-    global _TStepCount _TOtherVariable
-
-    set f $itk_interior
-
-    # The two frames of this dialog
-    set bbox [frame $f.bbox];            # for holding OK,CANCEL buttons
-    set data [frame $f.data];            # for everything else
-
-    # Setup the button box
-    button $bbox.ok     -text OK -command "$this ok"
-    button $bbox.cancel -text CANCEL -command "$this cancel"
-    pack $bbox.ok $bbox.cancel -side left -padx 10 -expand yes
-
-    # The "Data Collection" Frame
-    set top [frame $data.top]
-    set bot [frame $data.bot]
-
-    set boxes  [frame $top.boxes]
-    set cFrame [frame $boxes.cFrame]
-    set vFrame [frame $boxes.vFrame]
-    set bFrame [frame $boxes.bframe]
-    set oFrame [frame $top.uFrame]
-    pack $cFrame $bFrame $vFrame -side left -expand yes -padx 5
-
-    # While stepping
-    if {$WhileStepping} {
-      set step_frame [frame $top.stepf]
-      label $step_frame.whilelbl -text {While Stepping,   Steps:}
-      set WhileSteppingEntry [entry $step_frame.steps          \
-				-textvariable _TStepCount      \
-				-width 5]
-      pack $step_frame.whilelbl $WhileSteppingEntry -side left  
-    }
-
-    # The Collect listbox
-    label $cFrame.lbl -text {Collect:}
-    set CollectLB [iwidgets::scrolledlistbox $cFrame.lb -hscrollmode dynamic \
-		     -vscrollmode dynamic                                    \
-		     -selectioncommand [code $this toggle_button_state 0]    \
-		     -dblclickcommand [code $this change 0]                  \
-		     -selectmode extended                                    \
-		     -exportselection false]
-    [$CollectLB component listbox] configure -background gray92
-    pack $cFrame.lbl $cFrame.lb -side top -expand yes -pady 2
-
-    # The Variables listbox
-    label $vFrame.lbl -text {Variables:}
-    set VariablesLB [iwidgets::scrolledlistbox $vFrame.lb -hscrollmode dynamic \
-		       -vscrollmode dynamic                                    \
-		       -selectioncommand [code $this toggle_button_state 1]    \
-		       -dblclickcommand [code $this change 1]                  \
-		       -selectmode extended                                    \
-		       -exportselection false]
-    [$VariablesLB component listbox] configure -background gray92
-    pack $vFrame.lbl $vFrame.lb -side top -expand yes -pady 2
-
-    # The button frame
-    set AddButton [button $bFrame.add -text {<<< Collect}   \
-		     -command "$this change 1" -state disabled]
-    set RemoveButton [button $bFrame.del -text {Ignore >>>} \
-			-command "$this change 0" -state disabled]
-    pack $bFrame.add $bFrame.del -side top -expand yes -pady 5
-
-    # The other frame (type-in)
-    label $oFrame.lbl -text {Other:}
-    set OtherEntry [entry $oFrame.ent -textvariable _TOtherVariable]
-    pack $oFrame.lbl $OtherEntry -side left
-    bind $OtherEntry <Return> "$this change_other"
-
-    # Pack these frames
-    if {$WhileStepping} {
-      pack $step_frame -side top
-    }
-
-    pack $boxes $oFrame -side top -padx 5 -pady 5
-    pack $top $bot -side top
-
-    # Fill the list boxes
-    fill_listboxes
-
-    # Pack the main frames
-    # after idle
-    pack $f.data $bbox -side top -padx 4 -pady 2 \
-      -expand yes -fill x
-    
-    # !!???
-    if {$WhileStepping} {
-      $WhileSteppingEntry delete 0 end
-      $WhileSteppingEntry insert 0 $Steps
-    }
-  }
-
-  method toggle_button_state {add} {
-
-    # This is invoked whenever a <1> event is generated in
-    # the listbox...
-    if {$add} {
-      set a [$VariablesLB getcurselection]
-      if {"$a" != ""} {
-	$AddButton configure -state normal
-	$RemoveButton configure -state disabled
-      }
-    } else {
-      set a [$CollectLB getcurselection]
-      if {"$a" != ""} {
-	$AddButton configure -state disabled
-	$RemoveButton configure -state normal
-      }
-    }
-  }
-
-
-  # ------------------------------------------------------------------
-  # METHOD: fill_listboxes - fills the two listboxes
-  # ------------------------------------------------------------------
-  method fill_listboxes {{last {}}} {
-
-    # Fill the Collect listbox with the variables being collected
-    if {[info exists Collect]} {
-      fill_collect $last
-    }
-
-    fill_variables $last
-  }      
-
-  # ------------------------------------------------------------------
-  # METHOD: change - change a selected variable
-  # ------------------------------------------------------------------
-  method change {add {select {}}} {
-    if {"$select" == {}} {
-      set selections [get_selections $add]
-      set lb        [lindex $selections 0]
-      set last      [lindex $selections 1]
-      set selection [lindex $selections 2]
-      set noname 1
-    } else {
-      # This usually (only) occurs when we open this dialog for editing
-      # some existing action.
-      set lb   {}
-      set last {}
-      set noname 0
-      set selection $select
-    }
-    
-    $RemoveButton configure -state disabled
-    $AddButton configure -state disabled
-
-    # Remove all the selections from one list
-    # and add them to the other list
-    if {$add} {
-      set list1 $Variables
-      set list2 $Collect
-    } else {
-      set list1 $Collect
-      set list2 $Variables
-    }
-
-    foreach a $selection {
-      if {$noname} {
-	set name [$lb get $a]
-      } else {
-	set name $a
-      }
-
-      if {"$name" == "All Locals" || "$name" == {$loc}} {
-	set name "All Locals"
-	set lists [all_locals $add]
-	set list1 [lindex $lists 0]
-	set list2 [lindex $lists 1]
-      } elseif {"$name" == "All Registers" || "$name" == {$reg}} {
-	set name "All Registers"
-	set lists [all_regs $add]
-	set list1 [lindex $lists 0]
-	set list2 [lindex $lists 1]
-      } elseif {"$name" == "All Arguments" || "$name" == {$arg}} {
-	set name "All Arguments"
-	set lists [all_args $add]
-	set list1 [lindex $lists 0]
-	set list2 [lindex $lists 1]
-      } else {
-	set i [lsearch -exact $list1 $name]
-	set list1 [lreplace $list1 $i $i]
-
-	# Check if this is something we want to keep on a list
-	if {[lsearch $Args $name] != -1 || [lsearch $Registers [string trim $name \$]] != -1 || [lsearch $Locals $name] != -1 || $add} {
-	  lappend list2 $name
-	}
-      }
-
-      if {$add} {
-	set Collect $list2
-	set Variables $list1
-      } else {
-	set Collect $list1
-	set Variables $list2
-      }
-    }
-
-    # Update boxes (!! SLOW !!)
-    fill_collect $last
-    fill_variables $last
-  }
-
-  # ------------------------------------------------------------------
-  # METHOD: fill_collect - fill the collect box
-  # ------------------------------------------------------------------
-  method fill_collect {{last {}}} {
-
-    $CollectLB delete 0 end
-    set Collect [sort $Collect]
-    foreach a $Collect {
-      $CollectLB insert end $a
-    }
-    if {"$last" != ""} {
-      $CollectLB see $last
-    }
-  }
-
-  # ------------------------------------------------------------------
-  # METHOD: fill_variables - fill the variables box
-  # ------------------------------------------------------------------
-  method fill_variables {{last {}}} {
-
-    $VariablesLB delete 0 end
-    set Variables [sort $Variables]
-    foreach a $Variables {
-      $VariablesLB insert end $a
-    }
-
-    if {"$last" != ""} {
-      $VariablesLB see $last
-    }
-  }
-
-  # ------------------------------------------------------------------
-  # METHOD: sort - sort a list of variables, placing regs and
-  #                special identifiers (like "All Locals") at end
-  # ------------------------------------------------------------------
-  method sort {list} {
-    
-    set special_names {
-      "All Arguments" args \
-	"All Locals" locs \
-	"All Registers" regs \
-	"Collect Stack" stack
-    }
-
-    foreach {name var} $special_names {
-      set i [lsearch $list $name]
-      if {$i != -1} {
-	set $var 1
-	set list [lreplace $list $i $i]
-      } else {
-	set $var 0
-      }
-    }
-
-    # Extract all the locals, regs, args, globals
-    set types_list {Args Locals Registers } 
-    foreach type $types_list {
-      set used_$type {}
-
-      foreach a [set $type] {
-	set i [lsearch $list $a]
-	if {$i != -1} {
-	  lappend used_$type $a
-	  set list [lreplace $list $i $i]
-	}
-      }
-      set used_$type [lsort [set used_$type]]
-    }
-
-    set globals [lsort $list]
-
-    # Sort the remaining list in order: args, locals, globals, regs
-    set list [concat $used_Args $used_Locals $globals $used_Registers]
-
-    set list2 {}
-
-    foreach {name var} $special_names {
-      if {[set $var]} {
-	lappend list2 $name
-      }
-    }
-
-    set list [concat $list2 $list]
-    return $list
-  }
-  
-  # ------------------------------------------------------------------
-  # METHOD: all_args - add/remove all args
-  # ------------------------------------------------------------------
-  method all_args {add} {
-
-    if {$add} {
-      set list1 $Variables
-      set list2 $Collect
-    } else {
-      set list1 $Collect
-      set list2 $Variables
-    }
-
-#    foreach var $Args {
-#      set i [lsearch $list1 $var]
-#      if {$i != -1} {
-#	set list1 [lreplace $list1 $i $i]
-#	lappend list2 $var
-#      }
-#    }
-
-    lappend list2 "All Arguments"
-    set i [lsearch $list1 "All Arguments"]
-    if {$i != -1} {
-      set list1 [lreplace $list1 $i $i]
-    }
-
-    return [list $list1 $list2]
-  }
-
-  # ------------------------------------------------------------------
-  # METHOD: all_locals - add/remove all locals
-  # ------------------------------------------------------------------
-  method all_locals {add} {
-
-    if {$add} {
-      set list1 $Variables
-      set list2 $Collect
-    } else {
-      set list1 $Collect
-      set list2 $Variables
-    }
-
-#    foreach var $Locals {
-#      set i [lsearch $list1 $var]
-#      if {$i != -1} {
-#	set list1 [lreplace $list1 $i $i]
-#	lappend list2 $var
-#      }
-#    }
-
-    lappend list2 "All Locals"
-    set i [lsearch $list1 "All Locals"]
-    if {$i != -1} {
-      set list1 [lreplace $list1 $i $i]
-    }
-
-    return [list $list1 $list2]
-  }
-
-  # ------------------------------------------------------------------
-  # METHOD: all_regs - add/remove all registers
-  # ------------------------------------------------------------------
-  method all_regs {add} {
-
-    if {$add} {
-      set list1 $Variables
-      set list2 $Collect
-    } else {
-      set list1 $Collect
-      set list2 $Variables
-    }
-
-#    foreach var $Registers {
-#      set i [lsearch $list1 "\$$var"]
-#      if {$i != -1} {
-#	set list1 [lreplace $list1 $i $i]
-#	lappend list2 "\$$var"
-#      }
-#    }
-
-    lappend list2 "All Registers"
-    set i [lsearch $list1 "All Registers"]
-    if {$i != -1} {
-      set list1 [lreplace $list1 $i $i]
-    }
-
-    return [list $list1 $list2]
-  }
-
-  # ------------------------------------------------------------------
-  # METHOD: change_other - add/remove a user defined type
-  # ------------------------------------------------------------------
-  method change_other {} {
-    set other [$OtherEntry get]
-    
-    if {"$other" != ""} {
-      set added 0
-
-      # Check if this is a local/register/arg
-      set i [lsearch $Locals "$other"]
-      if {$i != -1} {
-	set i [lsearch $Collect "$other"]
-	set added 1
-	if {$i != -1} {
-	  # It's a local on the collection list
-	  debug "local on collection list"
-	  set add 0
-	  set list1 [lreplace $Collect $i $i]
-	  set list2 [concat $Variables "$other"]
-	} else {
-	  # It's a local on the variables list
-	  debug "local on variable list"
-	  set add 1
-	  set i [lsearch $Variables "$other"]
-	  set list1 [lreplace $Variables $i $i]
-	  set list2 [concat $Collect "$other"]
-	}
-      }
-
-      set i [lsearch $Registers [string trim "$other" \$]]
-      if {$i != -1} {
-	set i [lsearch $Collect "$other"]
-	set added 1
-	if {$i != -1} {
-	  # It's a register on the collection list
-	  debug "register on collection list"
-	  set add 0
-	  set list1 [lreplace $Collect $i $i]
-	  set list2 [concat $Variables "$other"]
-	} else {
-	  # It's a register on the variables list
-	  debug "register on variable list"
-	  set add 1
-	  set i [lsearch $Variables "$other"]
-	  set list1 [lreplace $Variables $i $i]
-	  set list2 [concat $Collect "$other"]
-	}
-      }
-
-      set i [lsearch $Args $other]
-      if {$i != -1} {
-	set i [lsearch $Collect "$other"]
-	set added 1
-	if {$i != -1} {
-	  # It's an arg on the collection list
-	  debug "arg on collection list"
-	  set add 0
-	  set list1 [lreplace $Collect $i $i]
-	  set list2 [concat $Variables "$other"]
-	} else {
-	  # It's an arg on the variables list
-	  debug "arg on variable list"
-	  set add 1
-	  set i [lsearch $Variables "$other"]
-	  set list1 [lreplace $Variables $i $i]
-	  set list2 [concat $Collect "$other"]
-	}
-      }
-      
-      # Check for special tags
-      if {!$added} {
-	if {"[string tolower $other]" == "all locals"} {
-	  set i [lsearch $Variables "All Locals"]
-	  if {$i != -1} {
-	    # It's "All Locals" on the variables list
-	    set add 1
-	    set lists [all_locals 1]
-	    set list1 [lindex $lists 0]
-	    set list2   [lindex $lists 1]
-	  } else {
-	    # It's "All Locals" on the Collect list
-	    set add 0
-	    set lists [all_locals 0]
-	    set list1 [lindex $lists 0]
-	    set list2 [lindex $lists 1]
-	  }
-	} elseif {"[string tolower $other]" == "all registers"} {
-	  set i [lsearch $Variables "All Registers"]
-	  if {$i != -1} {
-	    # It's "All Registers" on the Variables list
-	    set add 1
-	    set lists [all_regs 1]
-	    set list1 [lindex $lists 0]
-	    set list2 [lindex $lists 1]
-	  } else {
-	    set add 0
-	    set lists [all_regs 0]
-	    set list1 [lindex $lists 0]
-	    set list2 [lindex $lists 1]
-	  }
-	} elseif {"[string tolower $other]" == "all arguments"} {
-	  set i [lsearch $Variables "All Arguments"]
-	  if {$i != -1} {
-	    # It's "All Arguments" on the Variables list
-	    set add 1
-	    set lists [all_args 1]
-	    set list1 [lindex $lists 0]
-	    set list2 [lindex $lists 1]
-	  } else {
-	    set add 0
-	    set lists [all_args 0]
-	    set list1 [lindex $lists 0]
-	    set list2 [lindex $lists 1]
-	  }
-	} elseif {"[string tolower $other]" == "collect stack"} {
-	  set i [lsearch $Variables "Collect Stack"]
-	  if {$i != -1} {
-	    # It's "All Arguments" on the Variables list
-	    set add 1
-	    set lists [all_args 1]
-	    set list1 [lindex $lists 0]
-	    set list2 [lindex $lists 1]
-	  } else {
-	    set add 0
-	    set lists [all_args 0]
-	    set list1 [lindex $lists 0]
-	    set list2 [lindex $lists 1]
-	  }
-	} else {
-	  # Check if this entry is on the Collect list
-	  set i [lsearch $Collect $other]
-	  if {$i != -1} {
-	    # It's on the list -- remove it
-	    set add 0
-	    set list1 [lreplace $Collect $i $i]
-	    set list2 $Variables
-	  } else {
-	    # It's not on the list -- add it
-
-	    set other [string trim $other \ \r\t\n]
-
-            # accept everything, send to gdb to validate
-	    set ok 1
-
-            # memranges will be rejected right here
-
-	    if {[string range $other 0 1] == "\$("} {
-              tk_messageBox -type ok -icon error \
-                  -message "Expression syntax not supported"
-              set ok 0
-	    }
-	      
-            # do all syntax checking later
-	     if {$ok} {
-	      #debug "Keeping \"$other\""
-	      # We MUST string out all spaces...
-	      if {[regsub -all { } $other {} expression]} {
-		set other $expression
-	      }
-	      set add 1
-	      set list1 $Variables
-	      set list2 [concat $Collect "$other"]
-	    } else {
-	      #debug "Discarding \"$other\""
-	    }
-	  }
-	}
-      }
-
-      # Clear the entry
-      $OtherEntry delete 0 end
-
-      if {$add} {
-	set Variables $list1
-	set Collect $list2
-      } else {
-	set Variables $list2
-	set Collect $list1
-      }
-      fill_listboxes
-    }
-  }
-
-
-  # ------------------------------------------------------------------
-  # METHOD: get_selections - get all the selected variables
-  #         pass 0 to get the selections from the collect box
-  #         Returns a list of: listbox in which the selections were
-  #         obtained, last element selected on the list, and all the
-  #         selected elements
-  # ------------------------------------------------------------------
-  method get_selections {vars} {
-    
-    if {$vars} {
-      set widget $VariablesLB
-    } else {
-      set widget $CollectLB
-    }
-
-    set elements [$widget curselection]
-    set list {}
-    set i 0
-    foreach i $elements {
-      lappend list [$widget get $i]
-    }
-
-    return [list $widget $i $elements]
-  }
-
-  # ------------------------------------------------------------------
-  # METHOD: cancel - cancel the dialog and do not set the trace
-  # ------------------------------------------------------------------
-  method cancel {} {
-    ::delete object $this
-  }
-
-  method remove_special {list items} {
-    
-    foreach item $items {
-      set i [lsearch $list $item]
-      if {$i != -1} {
-	set list [lreplace $list $i $i]
-      } else {
-	set i [lsearch $list \$$item]
-	if {$i != -1} {
-	  set list [lreplace $list $i $i]
-	}
-      }
-    }
-
-    return $list
-  }
-
-  # ------------------------------------------------------------------
-  # METHOD: ok - validate the tracepoint and install it
-  # ------------------------------------------------------------------
-  method ok {} {
-    global _TStepCount
-
-    # Add anything in the OtherEntry
-    change_other
-
-    # Check that we are collecting data
-    if {[llength $Collect] == 0} {
-      # No data!
-      set msg "No data specified for the given action."
-      set answer [tk_messageBox -type ok -title "Tracepoint Error" \
-		    -icon error \
-		    -message $msg]
-      case $answer {
-	cancel {
-	  cancel
-	}
-	ok {
-	  return
-	}
-      }
-    }
-
-    set i [lsearch $Collect "All Locals"]
-    if {$i != -1} {
-      set data [lreplace $Collect $i $i]
-      set data [concat $data {$loc}]
-
-      # Remove all the locals from the list
-      set data [remove_special $data $Locals]
-    } else {
-      set data $Collect
-    }
-
-    set i [lsearch $data "All Registers"]
-    if {$i != -1} {
-      set data [lreplace $data $i $i]
-      set data [concat $data {$reg}]
-
-      # Remove all the locals from the list
-      set data [remove_special $data $Registers]
-    }
-
-    set i [lsearch $data "All Arguments"]
-    if {$i != -1} {
-      set data [lreplace $data $i $i]
-      set data [concat $data {$arg}]
-
-      # Remove all the locals from the list
-      set data [remove_special $data $Args]
-    }
-
-   set i [lsearch $data "Collect Stack"]
-    if {$i != -1} {
-      set data [lreplace $data $i $i]
-      set data [concat $data [collect_stack]]
-
-    }
-
-    # Remove repeats
-    set d {}
-    foreach i $data {
-      if {![info exists check($i)]} {
-	set check($i) 1
-	lappend d $i
-      }
-    }
-
-    if {$WhileStepping} {
-      set steps $_TStepCount
-    } else {
-      set steps 0
-    }
-
-    if {"$Data" != {}} {
-      set command "modify"
-    } else {
-      set command "add"
-    }
-
-    debug "DATA = $data"
-    eval $Callback $command $steps [list $data]
-    ::delete object $this
-  }
-
-
-  method collect_stack {} {
-    return $StackCollect
-  }
-	  
-  method cmd {line} {
-    $line
-  }
-
-  # PUBLIC DATA
-  public variable File
-  public variable Line {}
-  public variable WhileStepping 0
-  public variable Number
-  public variable Callback
-  public variable Data {}
-  public variable Steps {}
-  public variable Address {}
-
-  # PROTECTED DATA
-  protected variable WhileSteppingEntry
-  protected variable CollectLB
-  protected variable VariablesLB
-  protected variable Variables {}
-  protected variable Collect {}
-  protected variable Locals
-  protected variable Args
-  protected variable Registers
-  protected variable Others {}
-  protected variable AddButton
-  protected variable RemoveButton
-  protected variable OtherEntry
-  protected variable StackCollect {*(char*)$sp@64}
-}
diff --git a/gdb/gdbtk/library/attachdlg.itb b/gdb/gdbtk/library/attachdlg.itb
deleted file mode 100644
index c67adabd0d3..00000000000
--- a/gdb/gdbtk/library/attachdlg.itb
+++ /dev/null
@@ -1,232 +0,0 @@
-# Attach Dialog for Insight.
-# Copyright 1999, 2002, 2003 Red Hat, Inc.
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License (GPL) 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.
-
-
-itcl::body AttachDlg::constructor {args} {
-  eval itk_initialize $args
-  window_name "Attach To Process"
-  build_win
-}
-
-itcl::body AttachDlg::build_win {} {
-  # Frame
-  itk_component add pid {
-    iwidgets::labeledframe $itk_interior.f -labeltext "Choose Process" \
-      -relief groove -borderwidth 2 -ipadx 6 -ipady 4
-  }
-
-  # Listbox of processes
-  itk_component add choose_pid {
-    iwidgets::scrolledlistbox [$itk_component(pid) childsite].pid \
-      -visibleitems 30x15 -hscrollmode dynamic -vscrollmode dynamic\
-      -exportselection 0 -selectioncommand [code $this select_pid] \
-      -foreground $::Colors(textfg) -textbackground $::Colors(textbg) \
-      -dblclickcommand [code $this doit] 
-  }
-
-  # Filter entryfield
-  itk_component add pid_filter {
-    iwidgets::entryfield [$itk_component(pid) childsite].filt \
-      -labeltext "Filter:" \
-      -foreground $::Colors(textfg) -textbackground $::Colors(textbg) \
-      -focuscommand [code $this clear_pid_selection] \
-      -command [code $this filter_pid_selection]
-  }
-  $itk_component(pid_filter) insert 0 *
-
-  # seperator
-  itk_component add pid_sep {
-    frame [$itk_component(pid) childsite].sep \
-      -height 2 -borderwidth 1 -relief sunken
-  }
-
-  # PID_ENTRY: this is the PID entry box.  You can enter the pid
-  # by hand here, or click on the listbox to have it entered for you.
-  itk_component add pid_entry {
-    iwidgets::entryfield [$itk_component(pid) childsite].lab \
-      -labeltext "PID:" -validate numeric \
-      -foreground $::Colors(textfg) -textbackground $::Colors(textbg) \
-      -focuscommand [code $this clear_pid_selection]
-  }
-  pack $itk_component(choose_pid) -fill x -side top -pady 4
-  pack $itk_component(pid_filter) -fill x -side top -pady 4
-  pack $itk_component(pid_sep) -fill x -side top -pady 8
-  pack $itk_component(pid_entry) -fill x -side bottom -pady 4
-  
-  itk_component add symbol_label {
-    iwidgets::labeledframe $itk_interior.sym -labeltext "Choose Exec file" \
-      -labelpos nw -relief groove -borderwidth 2 \
-      -ipadx 8 -ipady 6 
-  }
-
-  itk_component add symbol_file {
-    iwidgets::entryfield [$itk_interior.sym childsite].f -labeltext "File:" \
-      -foreground $::Colors(textfg) -textbackground $::Colors(textbg) 
-  }
-  pack $itk_component(symbol_file) -pady 4 -padx 4 -fill x
-
-  # can't use the -state in the entryfield, 'cause that affects the
-  # label as well...
-  #$itk_component(symbol_file) component entry configure -state disabled  
-  $itk_component(symbol_file) configure -state normal
-  $itk_component(symbol_file) insert 0 $::gdb_exe_name
-  #$itk_component(symbol_file) configure -state disabled
-  
-  itk_component add symbol_browse {
-    button [$itk_component(symbol_file) childsite].br -text "Choose..." \
-      -command [code $this choose_symbol_file]
-  }
-  pack $itk_component(symbol_browse) -pady 4 -padx 4 -ipadx 4
-
-  itk_component add button_box {
-    frame $itk_interior.b
-  }
-  
-  itk_component add cancel {
-    button $itk_component(button_box).cancel -text "Cancel" \
-      -command [code $this cancel]
-  }
-
-  itk_component add ok {
-    button $itk_component(button_box).ok -text "OK" -command [code $this doit]
-  }
-  
-#  if {$::gdb_exe_name == ""} {
-#    $itk_component(ok) configure -state disabled
-#  }  
-
-  ::standard_button_box $itk_component(button_box)
-
-  pack $itk_component(button_box) -side bottom -fill x -pady 4 -padx 4
-  pack $itk_component(symbol_label) -side bottom -fill x -pady 4 -padx 4
-  pack $itk_component(pid) -fill both -expand 1 -pady 4 -padx 4
-
-  after idle [list update idletasks;  $this list_pids]
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  doit - This accepts the attach command.
-# ------------------------------------------------------------------
-
-itcl::body AttachDlg::doit {} {
-  set AttachDlg::last_button 1
-  set AttachDlg::last_pid [$itk_component(pid_entry) get]
-  set AttachDlg::symbol_file [$itk_component(symbol_file) get]
-  unpost
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  cancel - unpost the dialog box without attaching.
-# ------------------------------------------------------------------
-
-itcl::body AttachDlg::cancel {} {
-  set AttachDlg::last_button 0
-  set AttachDlg::last_pid {}
-  unpost
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  choose_symbol_file - Query for a new symbol file.
-# ------------------------------------------------------------------
-
-itcl::body AttachDlg::choose_symbol_file {} {
-  set file [tk_getOpenFile -parent . -title "Load New Executable"]
-  if {$file != ""} {
-    $itk_component(symbol_file) configure -state normal
-    $itk_component(symbol_file) clear
-    $itk_component(symbol_file) insert 0 $file
-#    $itk_component(symbol_file) configure -state disabled
-    $itk_component(ok) configure -state active
-  }
-}
-
-
-# ------------------------------------------------------------------
-#  METHOD:  list_pids - List the available processes.  Right now,
-#           this just spawns ps, which means we have to deal with
-#           all the different ps flags & output formats.  At some
-#           point we should steal some C code to do it by hand.
-# ------------------------------------------------------------------
-
-itcl::body AttachDlg::list_pids {{pattern *}} {
-  global tcl_platform
-
-  switch $tcl_platform(os) {
-    Linux {
-      set ps_cmd "ps axw"
-    }
-    default {
-      set ps_cmd "ps w"
-    }
-  }
-  if {[catch {::open "|$ps_cmd" r} psH]} {
-    set errTxt "Could not exec ps: $psH
-You will have to enter the PID by hand."
-    ManagedWin::open WarningDlg -message [list $errTxt]
-    return
-  }
-  gets $psH header
-
-  set nfields [llength $header]
-  set nfields_m_1 [expr {$nfields - 1}]
-  set regexp {^ *([^ ]*) +}
-  for {set i 1} {$i < $nfields_m_1} {incr i} {
-    append regexp {[^ ]* +}
-  }
-  append regexp {(.*)$}
-  
-  $itk_component(choose_pid) clear
-  set pid_list {}
-
-  while {[gets $psH line] >= 0} {
-    regexp $regexp $line dummy PID COMMAND
-    if {[string match $pattern $COMMAND]} {
-      lappend pid_list [list $PID $COMMAND]
-      $itk_component(choose_pid) insert end $COMMAND
-    }
-  }
-
-  close $psH
-  $itk_component(choose_pid) selection set 0
-  select_pid
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  select_pid - Grab the selected element from the PID listbox
-#           and insert the associated PID into the entry form.
-# ------------------------------------------------------------------
-
-itcl::body AttachDlg::select_pid {} {
-  set hit [$itk_component(choose_pid) curselection]
-  if {$hit != ""} {
-    $itk_component(pid_entry) clear
-    $itk_component(pid_entry) insert 0 [lindex [lindex $pid_list $hit] 0]
-  }
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  clear_pid_selection - Clear the current PID selection.
-# ------------------------------------------------------------------
-
-itcl::body AttachDlg::clear_pid_selection {} {
-  $itk_component(choose_pid) selection clear 0 end
-  $itk_component(pid_entry) selection range 0 end
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  filter_pid_selection - Filters the pid box.
-# ------------------------------------------------------------------
-
-itcl::body AttachDlg::filter_pid_selection {} {
-  list_pids [$itk_component(pid_filter) get]
-}
diff --git a/gdb/gdbtk/library/attachdlg.ith b/gdb/gdbtk/library/attachdlg.ith
deleted file mode 100644
index 71ee4876eb0..00000000000
--- a/gdb/gdbtk/library/attachdlg.ith
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# attachdlg.ith - itcl declarations for class AttachDlg
-# ----------------------------------------------------------------------
-# Implements Attach to process window
-#
-# ----------------------------------------------------------------------
-#   Copyright (C) 1999 Cygnus Solutions
-#
-itcl::class AttachDlg {
-  inherit ModalDialog ManagedWin
-
-  public {
-    method constructor {args}
-    proc last_button {} {return $last_button}
-    proc pid {} {return $last_pid}
-    proc symbol_file {} {return $symbol_file}
-  }
-
-  protected {
-    method build_win {args}
-    method cancel {}
-    method choose_symbol_file {}
-    method doit {}
-    method list_pids {{pattern *}}
-    method select_pid {}
-    method clear_pid_selection {}
-    method filter_pid_selection {}
-
-    variable pid_list
-
-    common  last_button 0
-    common last_pid {}
-    common symbol_file
-  }
-}
diff --git a/gdb/gdbtk/library/blockframe.itb b/gdb/gdbtk/library/blockframe.itb
deleted file mode 100644
index 09977af732c..00000000000
--- a/gdb/gdbtk/library/blockframe.itb
+++ /dev/null
@@ -1,227 +0,0 @@
-# Block and frame class implementations for GDBtk.
-# Copyright 1997, 1998, 1999 Cygnus Solutions
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License (GPL) 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.
-
-# ------------------------------------------------------------------
-#                            Block
-# ------------------------------------------------------------------
-itcl::body Block::constructor {start end args} {
-
-  # Record runtime info about this block
-  set _start $start
-  set _end $end
-  set _variables [_findVariables]
-  eval configure $args
-}
-
-# Destroy ourself. 
-itcl::body Block::destructor {} {
-
-  # Each block is responsible for destroying its
-  # variables and removing them from the list of
-  # of all variables for this frame
-  foreach var $_variables {
-    $var delete
-  }
-}
-
-# Return a list of variables defined in this block
-# This list is determined when we are created.
-itcl::body Block::variables {} {
-  return $_variables
-}
-
-# Find the new variables for this block.
-itcl::body Block::_findVariables {} {
-
-  # Find the new variables for this block.
-  set variables [gdb_block_variables $_start $_end]
-
-  # Create variables.
-  set vars {}
-  foreach variable $variables {
-    # Be paranoid: catch errors constructing variable.
-    set err [catch {gdb_variable create -expr $variable} obj]
-    if {!$err} {
-      lappend vars $obj
-    }
-  }
-
-  return $vars
-}
-
-itcl::body Block::update {} {
-
-  set changed {}
-  foreach var $_variables {
-    set changed [concat $changed [$var update]]
-  }
-
-  return $changed
-}
-
-itcl::body Block::info {} {
-
-  return [list $_start $_end]
-}
-
-# ------------------------------------------------------------------
-#                             Frame
-# ------------------------------------------------------------------
-itcl::body Frame::constructor {addr} {
-
-  set _addr $addr
-
-  # Create all blocks in the selected frame
-  set _blocks {}
-  _createBlocks [gdb_get_blocks]
-
-}
-
-itcl::body Frame::destructor {} {
-  # destroy our own blocks
-  foreach block $_blocks {
-    _removeBlock $block
-  }
-}
-
-itcl::body Frame::_removeBlock {blockObj} {
-
-  set i [lsearch $_blocks $blockObj]
-  if {$i != -1} {
-    set _blocks [lreplace $_blocks $i $i]
-    delete object $blockObj
-  }
-}
-
-itcl::body Frame::_addBlock {block} {
-
-  set start [lindex $block 0]
-  set end [lindex $block 1]
-  set b [Block \#auto $start $end]
-  lappend _blocks $b
-
-  return $b
-}
-
-itcl::body Frame::_createBlocks {blocks} {
-
-  foreach block $blocks {
-    set b [_addBlock $block]
-  }
-}
-
-itcl::body Frame::update {} {
-
-  set vars {}
-  foreach block $_blocks {
-    set vars [concat $vars [$block update]]
-  }
-
-  return $vars
-}
-
-itcl::body Frame::variables {} {
-
-  set vars {}
-  foreach block $_blocks {
-    set vars [concat $vars [$block variables]]
-  }
-
-  return $vars
-}
-
-itcl::body Frame::new {} {
-  # find any new variables. So get a list of all blocks,
-  # eliminate duplicates, and get those variables.
-
-  set blocks [gdb_get_blocks]
-  set new {}
-
-  foreach block $blocks {
-    set b [_findBlock $block]
-    if {$b == ""} {
-      # Found a new block. Create it get its variables
-      set b [_addBlock $block]
-      set new [concat $new [$b variables]]
-    }
-  }
-
-  return $new
-}
-
-itcl::body Frame::deleteOld {} {
-
-  foreach block [_oldBlocks] {
-    _removeBlock $block
-  }
-}
-
-itcl::body Frame::_oldBlocks {} {
-
-  set blocks [gdb_get_blocks]
-  set oldObjs $_blocks
-
-  foreach block $blocks {
-    set obj [_findBlock $block]
-    if {$obj != ""} {
-      # Found it.. Remove it from old
-      set i [lsearch $oldObjs $obj]
-      set oldObjs [lreplace $oldObjs $i $i]
-    }
-  }
-
-  return $oldObjs
-}
-  
-itcl::body Frame::old {} {
-
-  # All the variables in the blocks in old are now gone...
-  # We don't remove blocks here, since the frontend viewer
-  # might want to keep these variables around for a little while
-  # longer.
-  set vars {}
-  set old [_oldBlocks]
-  foreach block $old {
-    set vars [concat $vars [$block variables]]
-  }
-
-  return $vars
-}
-
-itcl::body Frame::_findBlock {block} {
-
-  foreach b $_blocks {
-    set info [$b info]
-    if {$info == $block} {
-      return $b
-    }
-  }
-
-  return ""
-}
-
-itcl::body Frame::_findBlockIndex {block} {
-
-  set i 0
-  foreach b $_blocks {
-    set info [$b info]
-    if {$info == $block} {
-      return $i
-    }
-    incr i
-  }
-
-  return -1
-}
-
-
diff --git a/gdb/gdbtk/library/blockframe.ith b/gdb/gdbtk/library/blockframe.ith
deleted file mode 100644
index e2fdb8feca7..00000000000
--- a/gdb/gdbtk/library/blockframe.ith
+++ /dev/null
@@ -1,63 +0,0 @@
-# Class definitions for blocks and frames for GDBtk.
-# Copyright 1997, 1998, 1999 Cygnus Solutions
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License (GPL) 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.
-
-itcl::class Block {
-
-  public {
-    method constructor {start end args}
-    method destructor {}
-    method variables {}
-    method update {}
-    method info {}
-  }
-
-  private {
-    # Start and end address for this block
-    variable _start
-    variable _end
-
-    # List of variables (new) variables defined in this block
-    variable _variables
-
-    method _findVariables {}
-  }
-}
-
-itcl::class Frame {
-
-  public {
-    method constructor {addr}
-    method destructor {}
-    method variables {}
-    method update {}
-    method new {}
-    method old {}
-    method deleteOld {}
-    method address {} { return $_addr }
-  }
-
-  private {
-    method _createBlocks {blocks}
-    method _addBlock {block}
-    method _findBlock {block}
-    method _findBlockIndex {block}
-    method _removeBlock {blockObj}
-    method _oldBlocks {}
-
-    # Our address
-    variable _addr
-
-    # A list of all blocks
-    variable _blocks
-  }
-}
diff --git a/gdb/gdbtk/library/bpwin.itb b/gdb/gdbtk/library/bpwin.itb
deleted file mode 100644
index 6ab96c71305..00000000000
--- a/gdb/gdbtk/library/bpwin.itb
+++ /dev/null
@@ -1,728 +0,0 @@
-# Breakpoint window for Insight.
-# Copyright 1997, 1998, 1999, 2001, 2002, 2003 Red Hat, Inc.
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License (GPL) 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.
-
-
-# ------------------------------------------------------------------
-#  CONSTRUCTOR:  create the main breakpoint window
-# ------------------------------------------------------------------
-itcl::body BpWin::constructor {args} {
-  window_name "Breakpoints" "BPs"
-  
-  if {[pref getd gdb/bp/menu] != ""} {
-    set mbar 0
-  }
-  set show_threads [pref get gdb/bp/show_threads]
-  debug "Ready to build"
-  build_win
-  eval itk_initialize $args 
-
-  # The scrolledframe uses a canvas, which doesn't properly
-  # calculate an initial size, so we must set a default
-  # window size here. ManagedWin could override this still
-  # if there is a user preference for the geometry.
-  wm geometry $_top 350x165
-  debug "done building"
-}
-
-# ------------------------------------------------------------------
-#  DESTRUCTOR:  destroy the breakpoint window
-# ------------------------------------------------------------------
-itcl::body BpWin::destructor {} {}
-
-
-# ------------------------------------------------------------------
-#  METHOD:  build_win - build the main breakpoint window
-# ------------------------------------------------------------------
-itcl::body BpWin::build_win {} {
-  global _bp_en _bp_disp tcl_platform
-  set bg1 $::Colors(bg)
-
-  set hsmode dynamic
-  set vsmode dynamic
-
-  # FIXME: The iwidgets scrolled frame is pretty useless.
-  # When we get BLT, use its hiertable to do this.
-  itk_component add sframe {
-    iwidgets::scrolledframe $itk_interior.sf \
-      -hscrollmode $hsmode -vscrollmode $vsmode
-  }
-
-  set twin [$itk_component(sframe) childsite]
-
-  # write header
-  if {$tracepoints} {
-    label $twin.num0 -text "Num" -relief raised -bd 2 -anchor center \
-      -font global/fixed
-  } 
-  label $twin.thread0 -text "Thread" -relief raised -bd 2 -anchor center \
-    -font global/fixed
-  label $twin.addr0 -text "Address" -relief raised -bd 2 -anchor center \
-    -font global/fixed
-  label $twin.file0 -text "File" -relief raised -bd 2 -anchor center \
-    -font global/fixed
-  label $twin.line0 -text "Line" -relief raised -bd 2 -anchor center \
-    -font global/fixed
-  label $twin.func0 -text "Function" -relief raised -bd 2 -anchor center \
-    -font global/fixed
-
-  if {$tracepoints} {
-    label $twin.pass0 -text "PassCount" -relief raised -borderwidth 2 \
-      -anchor center -font global/fixed
-    grid x $twin.num0 $twin.addr0 $twin.file0 $twin.line0 $twin.func0 $twin.pass0 \
-      -sticky new
-  } else {
-    if {$show_threads} {
-      grid x $twin.thread0 $twin.addr0 $twin.file0 $twin.line0 $twin.func0 -sticky new
-      # Let the File and Function columns expand; no others.
-      grid columnconfigure $twin 3 -weight 1
-      grid columnconfigure $twin 5 -weight 1
-    } else {
-      grid x $twin.addr0 $twin.file0 $twin.line0 $twin.func0 -sticky new
-      # Let the File and Function columns expand; no others.
-      grid columnconfigure $twin 2 -weight 1
-      grid columnconfigure $twin 4 -weight 1
-    }
-  }
-
-
-  # The last row must always suck up all the leftover vertical
-  # space.
-  set next_row 1
-  grid rowconfigure $twin $next_row -weight 1
-
-  if { $mbar } {
-    menu $itk_interior.m -tearoff 0
-    [winfo toplevel $itk_interior] configure -menu $itk_interior.m
-    if { $tracepoints == 0 } {
-      $itk_interior.m add cascade -menu $itk_interior.m.bp -label "Breakpoint" -underline 0
-    } else {
-      $itk_interior.m add cascade -menu $itk_interior.m.bp -label "Tracepoint" -underline 0
-    }
-    set m [menu $itk_interior.m.bp]
-    if { $tracepoints == 0 } {
-      $m add radio -label "Normal" -variable _bp_disp($selected) \
-	-value donttouch -underline 0 -state disabled
-      $m add radio -label "Temporary" -variable _bp_disp($selected) \
-	-value delete -underline 0 -state disabled
-    } else {
-      $m add command -label "Actions" -underline 0 -state disabled
-    }
-
-    $m add separator
-    $m add radio -label "Enabled" -variable _bp_en($selected) -value 1 \
-      -underline 0 -state disabled
-    $m add radio -label "Disabled" -variable _bp_en($selected) -value 0 \
-      -underline 0 -state disabled
-    $m add separator
-    $m add command -label "Remove" -underline 0 -state disabled
-    $itk_interior.m add cascade -menu $itk_interior.m.all -label "Global" \
-      -underline 0
-    set m [menu $itk_interior.m.all]
-    $m add check -label " Show Threads" \
-      -variable [pref varname gdb/bp/show_threads] \
-      -underline 1 -command "$this toggle_threads"
-    $m add separator
-    $m add command -label "Disable All" -underline 0 \
-      -command "$this bp_all disable"
-    $m add command -label "Enable All" -underline 0 \
-      -command "$this bp_all enable"
-    $m add separator
-    $m add command -label "Remove All" -underline 0 \
-      -command "$this bp_all delete"
-    $m add separator
-    $m add command -label "Store Breakpoints..." -underline 0 \
-      -command [code $this bp_store]
-    $m add command -label "Restore Breakpoints..." -underline 3 \
-      -command [code $this bp_restore]
-  }
-
-  set Menu [menu $itk_interior.pop -tearoff 0]
-  
-  if { $tracepoints == 0 } {
-    $Menu add radio -label "Normal" -variable _bp_disp($selected) \
-      -value donttouch -underline 0
-    $Menu add radio -label "Temporary" -variable _bp_disp($selected) \
-      -value delete -underline 0
-  } else {
-    $Menu add command -label "Actions" -underline 0 
-  }
-  $Menu add separator
-  $Menu add radio -label "Enabled" -variable _bp_en($selected) -value 1 -underline 0
-  $Menu add radio -label "Disabled" -variable _bp_en($selected) -value 0 -underline 0
-  $Menu add separator
-  $Menu add command -label "Remove" -underline 0
-  $Menu add cascade -menu $Menu.all -label "Global" -underline 0
-  set m [menu $Menu.all]
-  $m add check -label " Show Threads" -variable [pref varname gdb/bp/show_threads] \
-    -underline 1 -command "$this toggle_threads"
-  $m add separator
-  $m add command -label "Disable All" -underline 0 -command "$this bp_all disable"
-  $m add command -label "Enable All" -underline 0 -command "$this bp_all enable"
-  $m add separator
-  $m add command -label "Remove All" -underline 0 -command "$this bp_all delete"
-
-  if { $tracepoints == 0 } {
-    # insert all breakpoints
-    foreach i [gdb_get_breakpoint_list] {
-      set e [BreakpointEvent \#auto -action create -number $i]
-      bp_add $e
-      delete object $e
-    }
-  } else {
-    # insert all tracepoints
-    foreach i [gdb_get_tracepoint_list] {
-      set e [TracepointEvent \#auto -action create -number $i]
-      bp_add $e 1
-      delete object $e
-    }
-  }
-
-  pack $itk_component(sframe) -side left -expand true -fill both
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  bp_add - add a breakpoint entry
-# ------------------------------------------------------------------
-itcl::body BpWin::bp_add {bp_event {tracepoint 0}} {
-  global _bp_en _bp_disp tcl_platform _files
-
-  set number [$bp_event get number]
-  set thread [$bp_event get thread]
-  set disposition [$bp_event get disposition]
-  set file [$bp_event get file]
-
-  if {$tracepoint} {
-    set diposition tracepoint
-    set bptype tracepoint
-  } else {
-    set bptype breakpoint
-  }
-
-  debug "bp_add bpnum=$number thread=$thread show=$show_threads"
-  set i $next_row
-  set _bp_en($i) [$bp_event get enabled]
-  set _bp_disp($i) $disposition
-  set temp($i) ""
-  switch $disposition {
-    donttouch { set color [pref get gdb/src/bp_fg] }
-    delete { 
-      set color [pref get gdb/src/temp_bp_fg]
-      set temp($i) delete
-    }
-    tracepoint {
-      set color [pref get gdb/src/trace_fg]
-    }
-    default { set color yellow }
-  }
-  
-  if {$thread != "-1"} {set color [pref get gdb/src/thread_fg]}
-
-  if {$tcl_platform(platform) == "windows"} {
-    checkbutton $twin.en$i -relief flat -variable _bp_en($i) \
-      -activebackground $bg1 -command "$this bp_able $i" -fg $color 
-  } else {
-    checkbutton $twin.en$i -relief flat -variable _bp_en($i) \
-      -command "$this bp_able $i" -activebackground $bg1 \
-      -selectcolor $color -highlightbackground $bg1
-  }
-
-  if {$tracepoints} {
-    label $twin.num$i -text "$number " -relief flat -anchor w -font global/fixed
-  }
-  label $twin.addr$i -text "[gdb_CA_to_TAS [$bp_event get address]] " -relief flat -anchor w -font global/fixed -bg $bg1
-  if {[info exists _files(short,$file)]} {
-    set file $_files(short,$file)
-  } else {
-    # FIXME.  Really need to do better than this.
-    set file [::file tail $file]
-  }
-  if {$show_threads} {
-    if {$thread == "-1"} {set thread "ALL"}
-    label $twin.thread$i -text "$thread " -relief flat -anchor w -font global/fixed
-  }
-  label $twin.file$i -text "$file " -relief flat -anchor w -font global/fixed 
-  label $twin.line$i -text "[$bp_event get line] " -relief flat -anchor w -font global/fixed
-  label $twin.func$i -text "[$bp_event get function] " -relief flat -anchor w -font global/fixed 
-  if {$tracepoints} {
-    label $twin.pass$i -text "[$bp_event get pass_count] " -relief flat -anchor w -font global/fixed
-  }
-
-  if {$mbar} {
-    set zz [list addr file func line]
-    if {$tracepoints} {lappend zz num pass}
-    if {$show_threads} {lappend zz thread}
-    foreach thing $zz {
-      bind $twin.${thing}${i} <1> "$this bp_select $i"
-      bind $twin.${thing}${i} <Double-1> "$this goto_bp $i"
-      bind $twin.${thing}${i} <3> [code $this _select_and_popup $i %X %Y]
-    }
-  }
-
-  if {$tracepoints} {
-    grid $twin.en$i $twin.num$i $twin.addr$i $twin.file$i $twin.line$i \
-      $twin.func$i $twin.pass$i -sticky new -ipadx 4 -ipady 2
-  } else {
-    if {$show_threads} {
-      grid $twin.en$i $twin.thread$i $twin.addr$i $twin.file$i $twin.line$i \
-	$twin.func$i -sticky new -ipadx 4 -ipady 2
-    } else {
-      grid $twin.en$i $twin.addr$i $twin.file$i $twin.line$i \
-	$twin.func$i -sticky new -ipadx 4 -ipady 2
-    }
-  }
-
-  # This used to be the last row.  Fix it vertically again.
-  grid rowconfigure $twin $i -weight 0
-
-  set index_to_bpnum($i) $number
-  set Index_to_bptype($i) $bptype
-  incr i
-  set next_row $i
-  grid rowconfigure $twin $i -weight 1
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  bp_store - stores away the breakpoints in a file of gdb
-#                      commands
-# ------------------------------------------------------------------
-itcl::body BpWin::bp_store {} {
-  set out_file [tk_getSaveFile]
-  if {$out_file == ""} {
-    return
-  }
-  if {[catch {::open $out_file w} outH]} {
-    tk_messageBox -message "Could not open $out_file: $outH"
-    return
-  }
-  foreach breakpoint [gdb_get_breakpoint_list] {
-    # This is an lassign
-    foreach {file function line_no address type \
-	       enable_p disp ignore cmds thread hit_count user_spec} \
-      [gdb_get_breakpoint_info $breakpoint] {
-	break
-      }
-
-    if {$user_spec != ""} {
-      set bp_specifier $user_spec
-    } elseif {$file != ""} {
-      set filename [file tail $file]
-      set bp_specifier $filename:$line_no
-    } else {
-      set bp_specifier *$address
-    }
-
-    # FIXME: doesn't handle watchpoints.
-    if {[string compare $disp "delete"] == 0} {
-      puts $outH "tbreak $bp_specifier"
-    } else {
-      puts $outH "break $bp_specifier"
-    }
-      
-    if {!$enable_p} {
-      puts $outH "disable \$bpnum"
-    }
-    if {$ignore > 0} {
-      puts $outH "ignore \$bpnum $ignore"
-    }
-  }
-  close $outH
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  bp_restore - restore the breakpoints from a file of gdb
-#                      commands
-# ------------------------------------------------------------------
-itcl::body BpWin::bp_restore {} {
-  set inH [tk_getOpenFile]
-  if {$inH == ""} {
-    return
-  }
-  bp_all delete
-  if {[catch {gdb_cmd "source $inH"} err]} {
-    tk_messageBox -message "Error sourcing in BP file $inH: \"$err\""
-  }
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  bp_select - select a row in the grid
-# ------------------------------------------------------------------
-itcl::body BpWin::bp_select { r } {
-  global _bp_en _bp_disp
-
-  set zz [list addr file func line]
-  if {$tracepoints} {lappend zz num pass}
-  if {$show_threads} {lappend zz thread}
-  
-  if {$selected} {
-    set i $selected
-    
-    foreach thing $zz {
-      $twin.${thing}${i}  configure -fg $::Colors(fg) -bg $bg1
-    }
-  }
-
-  # if we click on the same line, unselect it and return
-  if {$selected == $r} {
-    set selected 0
-
-    if {$tracepoints == 0} {
-      $itk_interior.m.bp entryconfigure "Normal" -state disabled
-      $itk_interior.m.bp entryconfigure "Temporary" -state disabled
-    } else {
-      $itk_interior.m.bp entryconfigure "Actions" -state disabled
-    }
-    $itk_interior.m.bp entryconfigure "Enabled" -state disabled
-    $itk_interior.m.bp entryconfigure "Disabled" -state disabled
-    $itk_interior.m.bp entryconfigure "Remove" -state disabled
-    
-    return
-  }
-
-  foreach thing $zz {
-    $twin.${thing}${r} configure -fg $::Colors(sfg) -bg $::Colors(sbg)
-  }
-  
-  if {$tracepoints == 0} {
-    $itk_interior.m.bp entryconfigure "Normal" -variable _bp_disp($r) \
-      -command "$this bp_type $r" -state normal
-    $itk_interior.m.bp entryconfigure "Temporary" -variable _bp_disp($r) \
-      -command "$this bp_type $r" -state normal
-    $Menu entryconfigure "Normal" -variable _bp_disp($r)      \
-      -command "$this bp_type $r" -state normal
-    $Menu entryconfigure "Temporary" -variable _bp_disp($r)      \
-      -command "$this bp_type $r" -state normal
-  } else {
-    $itk_interior.m.bp entryconfigure "Actions" -command "$this get_actions $r" -state normal
-    $Menu entryconfigure "Actions" -command "$this get_actions $r" -state normal
-  }
-  $itk_interior.m.bp entryconfigure "Enabled" -variable _bp_en($r)   \
-    -command "$this bp_able $r" -state normal
-  $itk_interior.m.bp entryconfigure "Disabled" -variable _bp_en($r)   \
-    -command "$this bp_able $r" -state normal
-  $itk_interior.m.bp entryconfigure "Remove" -command "$this bp_remove $r" -state normal
-  $Menu entryconfigure "Enabled" -variable _bp_en($r)        \
-    -command "$this bp_able $r" -state normal
-  $Menu entryconfigure "Disabled" -variable _bp_en($r)        \
-    -command "$this bp_able $r" -state normal
-  $Menu entryconfigure "Remove" -command "$this bp_remove $r" -state normal
-  
-  set selected $r
-}
-
-# ------------------------------------------------------------------
-#  NAME:         private method BpWin::_select_and_popup
-#  DESCRIPTION:  Select the given breakpoint and popup the options
-#                menu at the given location.
-#
-#  ARGUMENTS:    None
-#  RETURNS:      Nothing
-# ------------------------------------------------------------------
-itcl::body BpWin::_select_and_popup {bp X Y} {
-  if {$selected != $bp} {
-    bp_select $bp
-  }
-  tk_popup $Menu $X $Y
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  bp_modify - modify a breakpoint entry
-# ------------------------------------------------------------------
-itcl::body BpWin::bp_modify {bp_event {tracepoint 0}} {
-  global _bp_en _bp_disp tcl_platform _files
-
-  set number [$bp_event get number]
-  set thread [$bp_event get thread]
-  set disposition [$bp_event get disposition]
-  set file [$bp_event get file]
-
-  if {$tracepoint} {
-    set disposition tracepoint
-    set bptype tracepoint
-  } else {
-    set bptype breakpoint
-  }
-
-  set found 0
-  for {set i 1} {$i < $next_row} {incr i} {
-    if { $number == $index_to_bpnum($i)
-	 && "$Index_to_bptype($i)" == "$bptype"} {
-      incr found
-      break
-    }
-  }
-
-  if {!$found} {
-    debug "ERROR: breakpoint number $number not found!"
-    return
-  }
-
-  if {$_bp_en($i) != [$bp_event get enabled]} {
-    set _bp_en($i) [$bp_event get enabled]
-  }
-
-  if {$_bp_disp($i) != $disposition} {
-    set _bp_disp($i) $disposition
-  }
-
-  switch $disposition {
-    donttouch { set color [pref get gdb/src/bp_fg] }
-    delete { 
-      set color [pref get gdb/src/temp_bp_fg]
-    }
-    tracepoint { set color [pref get gdb/src/trace_fg] }
-    default { set color yellow}
-  }
-
-  if {$thread != "-1"} {set color [pref get gdb/src/thread_fg]}
-
-  if {$tcl_platform(platform) == "windows"} then {
-    $twin.en$i configure -fg $color 
-  } else {
-    $twin.en$i configure -selectcolor $color
-  }
-  if {$tracepoints} {
-    $twin.num$i configure  -text "$number "
-  }
-  $twin.addr$i configure -text "[gdb_CA_to_TAS [$bp_event get address]] "
-  if {[info exists _files(short,$file)]} {
-    set file $_files(short,$file)
-  } else {
-    # FIXME.  Really need to do better than this.
-    set file [::file tail $file]
-  }
-  if {$show_threads} {
-    if {$thread == "-1"} {set thread "ALL"}
-    $twin.thread$i configure -text "$thread "
-  }
-  $twin.file$i configure -text "$file "
-  $twin.line$i configure  -text "[$bp_event get line] "
-  $twin.func$i configure  -text "[$bp_event get function] "
-  if {$tracepoints} {
-    $twin.pass$i configure  -text "[$bp_event get pass_count] "
-  }
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  bp_able - enable/disable a breakpoint
-# ------------------------------------------------------------------
-itcl::body BpWin::bp_able { i } {
-  global _bp_en
-  
-  bp_select $i
-
-  switch $Index_to_bptype($i) {
-    breakpoint {set type {}}
-    tracepoint {set type "tracepoint"}
-  }
-
-  if {$_bp_en($i) == "1"} {
-    set command "enable $type $temp($i) "
-  } else {
-    set command "disable $type "
-  }
-
-  append command  "$index_to_bpnum($i)"
-  gdb_cmd "$command"
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  bp_remove - remove a breakpoint
-# ------------------------------------------------------------------
-itcl::body BpWin::bp_remove { i } {
-
-  bp_select $i
-
-  switch $Index_to_bptype($i) {
-    breakpoint { set type {} }
-    tracepoint { set type "tracepoint" }
-  }
-
-  gdb_cmd "delete $type $index_to_bpnum($i)"
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  bp_type - change the breakpoint type (disposition)
-# ------------------------------------------------------------------
-itcl::body BpWin::bp_type { i } {
-  
-  if {$Index_to_bptype($i) != "breakpoint"} {
-    return
-  }
-
-  set bpnum $index_to_bpnum($i)
-  #debug "bp_type $i $bpnum"
-  set bpinfo [gdb_get_breakpoint_info $bpnum]
-  lassign $bpinfo file func line pc type enabled disposition \
-    ignore_count commands cond thread hit_count user_spec
-  bp_select $i
-  switch $disposition {
-    delete {  
-      gdb_cmd "delete $bpnum"
-      gdb_cmd "break *$pc"
-    }
-    donttouch {
-      gdb_cmd "delete $bpnum"
-      gdb_cmd "tbreak *$pc"
-    }
-    default { debug "Unknown breakpoint disposition: $disposition" }
-  }
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  bp_delete - delete a breakpoint
-# ------------------------------------------------------------------
-itcl::body BpWin::bp_delete {bp_event} {
-  set number [$bp_event get number]
-  for {set i 1} {$i < $next_row} {incr i} {
-    if { $number == $index_to_bpnum($i) } {
-      if {$tracepoints} {
-	grid forget $twin.en$i $twin.num$i $twin.addr$i $twin.file$i \
-	  $twin.line$i $twin.func$i $twin.pass$i
-	destroy $twin.en$i $twin.num$i $twin.addr$i $twin.file$i \
-	  $twin.line$i $twin.func$i $twin.pass$i
-      } else {
-	if {$show_threads} {
-	  grid forget $twin.thread$i
-	  destroy $twin.thread$i
-	}
-	grid forget $twin.en$i $twin.addr$i $twin.file$i $twin.line$i $twin.func$i
-	destroy $twin.en$i $twin.addr$i $twin.file$i $twin.line$i $twin.func$i
-      }
-      if {$selected == $i} {
-	set selected 0
-      }
-      return
-    }
-  }
-}
-
-# ------------------------------------------------------------------
-#  PUBLIC METHOD:  breakpoint - Update widget when a breakpoint
-#                   event is received from the backend.
-# ------------------------------------------------------------------
-itcl::body BpWin::breakpoint {bp_event} {
-
-  set action [$bp_event get action]
-  #debug "bp update $action [$bp_event get number] [$bp_event get type]"
-
-  switch $action {
-    modify  { bp_modify $bp_event 0 }
-    create  { bp_add $bp_event 0 }
-    delete  { bp_delete $bp_event }
-    default { dbug E "Unknown breakpoint action: $action" }
-  }
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  tracepoint - Update widget when a tracepoint event
-#            is received from the backend.
-# ------------------------------------------------------------------
-itcl::body BpWin::tracepoint {tp_event} {
-
-  set action [$tp_event get action]
-  #debug "tp update $action [$tp_event get number]"
-
-  switch $action {
-    modify  { bp_modify $tp_event 1 }
-    create  { bp_add $tp_event 1 }
-    delete  { bp_delete $tp_event }
-    default { dbug E "Unknown tracepoint action: $action" }
-  }
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  bp_all - perform a command on all breakpoints
-# ------------------------------------------------------------------
-itcl::body BpWin::bp_all { command } {
-
-  if {!$tracepoints} {
-    # Do all breakpoints
-    foreach bpnum [gdb_get_breakpoint_list] {
-      if { $command == "enable"} {
-	for {set i 1} {$i < $next_row} {incr i} {
-	  if { $bpnum == $index_to_bpnum($i)
-	       && "$Index_to_bptype($i)" == "breakpoint"} {
-	    gdb_cmd "enable $temp($i) $bpnum"
-	    break
-	  }
-	}
-      } else {
-	gdb_cmd "$command $bpnum"
-      }
-    }
-  } else {
-    # Do all tracepoints
-    foreach bpnum [gdb_get_tracepoint_list] {
-      if { $command == "enable"} {
-	for {set i 1} {$i < $next_row} {incr i} {
-	  if { $bpnum == $index_to_bpnum($i)
-	       && "$Index_to_bptype($i)" == "tracepoint"} {
-	    gdb_cmd "enable tracepoint $bpnum"
-	    break
-	  }
-	}
-      } else {
-	gdb_cmd "$command tracepoint $bpnum"
-      }
-    }
-  }
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  get_actions - pops up the add trace dialog on a selected 
-#                         tracepoint
-# ------------------------------------------------------------------
-itcl::body BpWin::get_actions {bpnum} {
-  set bpnum $index_to_bpnum($bpnum)
-  set bpinfo [gdb_get_tracepoint_info $bpnum]
-  lassign $bpinfo file func line pc enabled pass_count \
-    step_count thread hit_count actions
-
-  set filename [::file tail $file]
-  ManagedWin::open TraceDlg -File $filename -Lines $line
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  toggle_threads - callback when show_threads is toggled
-# ------------------------------------------------------------------
-itcl::body BpWin::toggle_threads {} {
-  set show_threads [pref get gdb/bp/show_threads]
-  reconfig
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  reconfig - used when preferences change
-# ------------------------------------------------------------------
-itcl::body BpWin::reconfig {} {
-  if {[winfo exists $itk_interior.f]} { destroy $itk_interior.f }
-  if {[winfo exists $itk_interior.m]} { destroy $itk_interior.m }
-  if {[winfo exists $itk_interior.sbox]} { destroy $itk_interior.sbox }
-  if {[winfo exists $itk_interior.sf]} { destroy $itk_interior.sf }
-  if {[winfo exists $itk_interior.pop]} { destroy $itk_interior.pop }
-  build_win
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  goto_bp - show bp in source window
-# ------------------------------------------------------------------
-itcl::body BpWin::goto_bp {r} {
-  set bpnum $index_to_bpnum($r)
-  if {$tracepoints} {
-    set bpinfo [gdb_get_tracepoint_info $bpnum]
-  } else {
-    set bpinfo [gdb_get_breakpoint_info $bpnum]
-  }
-  set pc [lindex $bpinfo 3]
-
-  SrcWin::choose_and_display BROWSE_TAG [gdb_loc *$pc]
-}
diff --git a/gdb/gdbtk/library/bpwin.ith b/gdb/gdbtk/library/bpwin.ith
deleted file mode 100644
index 81c7c731f7a..00000000000
--- a/gdb/gdbtk/library/bpwin.ith
+++ /dev/null
@@ -1,59 +0,0 @@
-# Breakpoint window class definition for Insight
-# Copyright 1997, 1998, 1999, 2001 Red Hat, Inc.
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License (GPL) 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.
-
-
-itcl::class BpWin {
-  inherit EmbeddedWin GDBWin
-
-  public {
-    variable tracepoints 0
-
-    method constructor {args}
-    method destructor {}
-    method bp_select {r}
-    method bp_able { i } 
-    method bp_remove { i }
-    method bp_restore {}
-    method bp_store {}
-    method bp_type { i }
-    method bp_all { command }
-    method get_actions {bpnum}
-    method toggle_threads {}
-    method reconfig {} 
-    method goto_bp {r}
-
-    # GDB Events
-    method breakpoint {event}
-    method tracepoint {event}
-  }
-
-  private {
-    variable twin
-    variable next_row 0
-    variable index_to_bpnum
-    variable Index_to_bptype
-    variable temp
-    variable mbar 1
-    variable selected 0
-    variable bg1
-    variable Menu
-    variable show_threads	;#cached copy of [pref get gdb/bp/show_threads]
-    
-    method build_win {}
-    method bp_add {bp_event {tracepoint 0}}
-    method bp_modify {bp_event {tracepoint 0}} 
-    method bp_delete {bp_event}
-    method _select_and_popup {bp X Y}
-  }
-
-}
diff --git a/gdb/gdbtk/library/browserwin.itb b/gdb/gdbtk/library/browserwin.itb
deleted file mode 100644
index 35c40b18a6a..00000000000
--- a/gdb/gdbtk/library/browserwin.itb
+++ /dev/null
@@ -1,731 +0,0 @@
-# Browswer window for Insight.
-# Copyright 1998, 1999, 2001, 2002, 2003 Red Hat, Inc.
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License (GPL) 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.
-
-
-# ----------------------------------------------------------------------
-# Implements Browser window for Insight
-#
-# ----------------------------------------------------------------------
-
-option add *BrowserWin.textBackground  $::Colors(textbg)
-
-# ------------------------------------------------------------------
-#  CONSTRUCTOR - create new browser window
-# ------------------------------------------------------------------
-itcl::body BrowserWin::constructor {args} {
-  debug
-  #eval itk_initialize $args 
-  window_name "Function Browser"
-
-  set _layout [pref get gdb/browser/layout]
-  set Current(filename) {}
-  set Current(function) {}
-  _build_win
-
-  eval itk_initialize $args
-  add_hook file_changed_hook [code $this _fill_file_box]
-}
-
-# ------------------------------------------------------------------
-#  DESTRUCTOR - destroy window containing widget
-# ------------------------------------------------------------------
-itcl::body BrowserWin::destructor {} {
-  debug
-  if {$filter_trace_after != ""} {
-    after cancel $filter_trace_after
-  }
-
-  remove_hook file_changed_hook [code $this _fill_file_box]
-  trace vdelete [pref varname gdb/search/last_symbol] \
-    w [code $this _filter_trace_proc]
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  _build_win - build the main browser window
-# ------------------------------------------------------------------
-itcl::body BrowserWin::_build_win {} {
-  debug
-
-  # popup menu
-  itk_component add popup {
-    menu $itk_interior.pop -tearoff 0
-  } {}
-  set pop $itk_component(popup)
-  $pop add command -label "Toggle Layout" -command [code $this _switch_layout]
-  $pop add command -label "Help" -command "open_help browser.html"
-  $pop add separator
-  $pop add command -label "Close" -command "destroy [winfo toplevel $itk_interior]"
-  bind [winfo toplevel $itk_interior] <3> "tk_popup $itk_component(popup) %X %Y"
-
-  # Four Main Frames: filter, files, functions, and view (source)
-  # Their layout depends on _layout
-
-  if {$_layout == 1} {
-    set p [cyg::panedwindow $itk_interior.p -orient vertical -height 5i \
-	     -width 5i]
-    $p add left
-    set p2 [cyg::panedwindow [$p childsite left].p]
-   
-    $p2 add file
-    _build_file_frame [$p2 childsite file]
-
-    $p2 add filter
-    set f [frame [$p2 childsite filter].f]
-    _build_filter_frame $f
-    _build_function_frame $f
-    pack $f -fill both -expand yes
-    pack $p2 -fill both -expand yes
-
-    $p add view
-    _build_view_frame [$p childsite view]
-
-  } else {
-    set p [cyg::panedwindow $itk_interior.p -height 5i -width 5i]
-    $p add top
-    set f [frame [$p childsite top].f]
-    _build_filter_frame $f
-
-    set browser [cyg::panedwindow $f.p -orient vertical]
-    $browser add file
-    _build_file_frame [$browser childsite file]
-    $browser add function
-    _build_function_frame [$browser childsite function]
-
-    pack $browser -fill both -expand yes
-    pack $f -fill both -expand yes
-
-    $p add view
-    _build_view_frame [$p childsite view]
-  }
-  
-  # Fill file box
-  _fill_file_box
-
-  pack $p -fill both -expand yes
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  _filter_trace_proc
-#           This is called when something is entered in the filter
-#           box.  The actual filtering is done in an after to avoid
-#           flashing too much if the user is typing quickly.
-# ------------------------------------------------------------------
-itcl::body BrowserWin::_filter_trace_proc {v1 v2 mode} {
-  if {$filter_trace_after != ""} {
-    after cancel $filter_trace_after
-  }
-  set filter_trace_after [after 100 [code $this _filter_trace_after]]
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  _filter_trace_after
-#           This is a wrapper around search, needed to pass to trace
-# ------------------------------------------------------------------
-itcl::body BrowserWin::_filter_trace_after {} {
-  set filter_trace_after ""
-  search
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  _search_src
-#           Search for text or jump to a specific line
-#           in source window, going in the specified DIRECTION.
-# ------------------------------------------------------------------
-itcl::body BrowserWin::_search_src {direction} {
-  set exp [$itk_component(view_search) get]
-  $itk_component(view_src) search $exp $direction
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  search
-#           Search for functions matching regexp/pattern
-#           in specified files
-# ------------------------------------------------------------------
-itcl::body BrowserWin::search {} {
-
-  set files [$itk_component(file_box) getcurselection]
-
-  if {[llength $files] == 0} {
-    return
-  }
-
-  _freeze_me
-
-  set filt_pat [format $filter_regexp($cur_filter_mode) \
-		  [pref get gdb/search/last_symbol]]
-
-  if {[llength $files] == [$itk_component(file_box) size]} {
-    set err [catch {gdb_search functions $filt_pat \
-		    -filename 1} matches]
-  } else {
-    set err [catch {gdb_search functions $filt_pat \
-		      -files $files -filename 1} matches]
-  }
-
-  if {$err} {
-    debug "ERROR searching for [pref get gdb/search/last_symbol]: $matches"
-    _thaw_me
-    return
-  }
-
-  $itk_component(func_box) delete 0 end
-
-  set i -1
-  catch {unset index_to_file}
-
-  foreach func [lsort -command "list_element_strcmp 0" $matches] {
-    $itk_component(func_box) insert end [lindex $func 0]
-    set index_to_file([incr i]) [lindex $func 1]
-  }
-  _thaw_me
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  _process_file_selection
-#            This fills the func combo, and the more window if it
-#            is currently open with the hit in the File combobox.
-# ------------------------------------------------------------------
-itcl::body BrowserWin::_process_file_selection {y} {
-
-  set curIndex [$itk_component(file_box) nearest $y]
-  set curSelection [$itk_component(file_box) curselection]
-
-  # We got a button-release - First make sure the click selected the item...
-
-  if {[lsearch $curIndex $curSelection] >= 0} {
-    _fill_source [$itk_component(file_box) get $curIndex] 0
-  } else {
-    # If the item was deselected, go back to the first one in the list...
-    # It would be better to keep a stack of the clicked items, and go to the
-    # last one on the stack.  But in extended mode, this is tricky.  FIXME
-
-    if {[llength $curSelection] > 0} {
-      _fill_source [$itk_component(file_box) get [lindex $curSelection 0]] 0
-    } else {
-      _fill_source ""
-    }
-  }
-
-  search
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  _process_func_selection
-#            This points the  more window to the hit in the Func combobox
-#            if it is currently open.
-# ------------------------------------------------------------------
-itcl::body BrowserWin::_process_func_selection {y} {
-
-  set curIndex [$itk_component(func_box) nearest $y]
-  set curSelection [$itk_component(func_box) curselection]
-
-  # We got a button-release - First make sure the click selected the item...
-
-  if {[lsearch $curIndex $curSelection] >= 0} {
-    set funcName [$itk_component(func_box) get $curIndex]
-    set fileName $index_to_file($curIndex)
-    _fill_source $funcName 1 $fileName
-  }
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  do_all_bp
-#           Toggle a bp at every selected function in FuncLB
-# ------------------------------------------------------------------
-itcl::body BrowserWin::do_all_bp {onp} {
-
-  set funcs [$itk_component(func_box) getcurselection]
-  _freeze_me
-
-  foreach f $funcs {
-    if {[catch {gdb_loc $f} linespec]} {
-      dbug W "Could not gdb_loc \"$f\""
-      return
-    }
-    set bpnum [bp_exists $linespec]
-    if {$bpnum == -1 && $onp} {
-
-      # FIXME: gdb_set_bp is the preferred method, but it requires
-      # a file and line number. This doesn't work very well for
-      # templates...
-      gdb_cmd "break $f"
-    } elseif {!$onp} {
-      catch {gdb_cmd "delete $bpnum"}
-    }
-  }
-  _thaw_me
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  _toggle_bp
-#           Toggle bp at function specified by the given Y
-#           coordinate in the listbox
-# ------------------------------------------------------------------
-itcl::body BrowserWin::_toggle_bp {y} {
-
-  set f [$itk_component(func_box) get [$itk_component(func_box) nearest $y]]
-  if {$f != ""} {
-    if {[catch {gdb_loc $f} linespec]} {
-      return
-    }
-    set bpnum [bp_exists $linespec]
-    if {$bpnum == -1} {	
-      # FIXME: gdb_set_bp is the preferred method, but it requires
-      # a file and line number. This doesn't work very well for
-      # templates...
-      gdb_cmd "break $f"
-    } else {
-      catch {gdb_cmd "delete $bpnum"}
-    }
-  }
-}
-
-# ------------------------------------------------------------------  
-#  METHOD:  _select
-#           Un/Highlight all files in the files list
-# ------------------------------------------------------------------  
-itcl::body BrowserWin::_select {highlight} {
-  if {$highlight} {
-    $itk_component(file_box) selection set 0 end
-  } else {
-    $itk_component(file_box) selection clear 0 end
-  }
-  search
-}
-
-# ------------------------------------------------------------------  
-#  METHOD:  _set_filter_mode
-#           React to changes in the filter mode
-# ------------------------------------------------------------------  
-itcl::body BrowserWin::_set_filter_mode {w mode} {
-  if {[string compare $mode $cur_filter_mode] != 0} {
-    set cur_filter_mode $mode
-    pref set gdb/search/filter_mode $mode
-    search
-  }
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  _file_hide_h
-#           Run when the "Hide .h files" preference is chosen.
-# ------------------------------------------------------------------
-itcl::body BrowserWin::_file_hide_h {} {
-  _fill_file_box
-  search
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  _fill_source
-#           Helper function to fill the srctextwin
-#           when needed.
-# ------------------------------------------------------------------
-itcl::body BrowserWin::_fill_source {f {funcp 1} {filename ""}} {
-  if {($funcp && [string compare $f $Current(function)]) \
-	|| [string compare $f $Current(filename)]} {
-    if {!$funcp} {
-      if {$filename == ""} {
-	set f $f:1
-      } else {
-	set f $f:$filename
-      }
-    }
-
-    if {[catch {gdb_loc $f} linespec]} {
-      return
-    }
-
-    lassign $linespec foo funcname name line addr pc_addr lib
-    set file_changed [string compare $Current(filename) $name]
-
-    if {$file_changed} {
-      # Set the file name label:
-      $itk_component(view_name) configure -text $name:
-      _freeze_me
-    }
-
-    # fill srctextwin
-    $itk_component(view_src) location BROWSE_TAG $name $funcname \
-      $line $addr $pc_addr lib
-
-    if {$file_changed} {
-      _thaw_me
-    }
-
-    set Current(function) $funcname
-    # fill func combo
-    if {$file_changed} {
-      set Current(filename) $name
-      _fill_funcs_combo $name
-    }
-    # Set current function in combo box
-    $itk_component(view_func) entryset $f
-  }
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  mode
-#           Function called by srctextwin when the display
-#           mode changes
-# ------------------------------------------------------------------
-itcl::body BrowserWin::mode {w {mode ""} {go 1}} {
-  if {$mode != ""} {
-    $itk_component(view_src) mode_set $mode $go
-    $itk_component(view_mode) entryset $mode
-  }
-}
-
-# ------------------------------------------------------------------
-# METHOD:  _goto_func
-#          Callback for the function combo box which
-#          sets the srctextwin looking at the given function (VAL)
-# ------------------------------------------------------------------
-itcl::body BrowserWin::_goto_func {w {val ""}} {
-  if {$val != ""} {
-    set mang 0
-    if {[info exists _mangled_func($val)]} {
-      set mang $_mangled_func($val)
-    }
-    if {$mang} {
-      set loc $val
-    } else {
-      set fn [lindex [::file split $Current(filename)] end]
-      set loc $fn:$val
-    }
-    debug "GOTO \"$loc\""
-    if {![catch {gdb_loc $loc} result]} {
-      lassign $result foo funcname name line addr pc_addr lib
-      $itk_component(view_src) location BROWSE_TAG $name $funcname \
-	$line $addr $pc_addr lib
-    } else {
-      dbug W "gdb_loc returned \"$result\""
-    }
-  }
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  _fill_file_box
-#           This private method fills the file listbox
-# ------------------------------------------------------------------
-itcl::body BrowserWin::_fill_file_box {} {
-  # It would be cool if gdb_listfiles took a regexp to match,
-  # but it doesn't...
-
-  $itk_component(file_box) clear
-  set allFiles [gdb_listfiles]
-
-  if {[pref get gdb/browser/hide_h]} {
-    foreach file $allFiles {
-      if {[string compare [file extension $file] ".h"]} {
-	$itk_component(file_box) insert end $file
-      }
-    }
-  } else {
-    foreach file $allFiles {
-      $itk_component(file_box) insert end $file
-    } 
-  }
-  search
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  _fill_funcs_combo
-#           This private method fills the functions combo box
-#           with all the functions in NAME.
-# ------------------------------------------------------------------
-itcl::body BrowserWin::_fill_funcs_combo {name} {
-
-  $itk_component(view_func) list delete 0 end
-  if {$name != ""} {
-    set maxlen 10
-    if {[catch {gdb_listfuncs $name} listfuncs]} {
-      tk_messageBox -icon error -default ok \
-	-title "GDB" -type ok \
-	-message "This file can not be found or does not contain\ndebugging information."
-      return
-    }
-    foreach f [lsort $listfuncs] {
-      lassign $f func mang
-      if {$func == "global constructors keyed to main"} {continue}
-      set _mangled_func($func) $mang
-      $itk_component(view_func) list insert end $func
-      if {[string length $func] > $maxlen} {
-	set maxlen [string length $func]
-      }
-    }
-    # limit size to 40 chars because if we don't set a reasonable limit
-    # then the combobox can be wider than the screen
-    if {$maxlen > 40} {set maxlen 40}
-
-    $itk_component(view_func) configure -width [expr {$maxlen + 1}]
-  }
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  _build_filter_frame
-#	This private method builds the filter frame
-# ------------------------------------------------------------------
-itcl::body BrowserWin::_build_filter_frame {parent} {
-  
-  itk_component add filter {
-    iwidgets::labeledframe $parent.filter -labeltext "Function Filter" \
-      -relief groove -borderwidth 2 -ipadx 6 -ipady 4
-  }
-
-  # Set up the contents of the Filter frame
-  if {$_layout == 2} {
-    itk_component add filt_label {
-      label [$itk_component(filter) childsite].lbl -text "Show if function " \
-	-font global/fixed
-    }
-  }
-
-  itk_component add filt_type {
-    combobox::combobox [$itk_component(filter) childsite].type -height 4 \
-      -width 15 -editable 0 \
-      -command [code $this _set_filter_mode] \
-      -font global/fixed
-  } { 
-    rename -background -textbackground textBackground Background
-  }
-
-  # Fill the filter mode combo-box
-  foreach elem $filter_modes {
-    $itk_component(filt_type) list insert end $elem
-  }
-
-  set cur_filter_mode [pref get gdb/search/filter_mode]
-  if {[lsearch $filter_modes $cur_filter_mode] < 0} {
-    set cur_filter_mode [lindex $filter_modes 0]
-  }
-  $itk_component(filt_type) entryset $cur_filter_mode
-
-  itk_component add filt_entry {
-    entry [$itk_component(filter) childsite].ent -font global/fixed \
-      -textvariable [pref varname gdb/search/last_symbol] 
-  } {}
-  bind_plain_key $itk_component(filt_entry) Return [list $this search]
-
-  # Watch keystrokes into the entry box and filter on them...
-  trace variable [pref varname gdb/search/last_symbol] w \
-    [code $this _filter_trace_proc]
-
-  if {$_layout == 2} {
-    pack $itk_component(filt_label) -side left 
-  }
-  pack $itk_component(filt_type) -side left -padx 4 -fill y -pady 5
-  pack $itk_component(filt_entry) -side right -fill both -expand 1 \
-    -padx 6 -pady 5
-
-  pack $itk_component(filter) -fill x -anchor n -pady 3
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  _build_file_frame
-#	This private method builds the files frame
-# ------------------------------------------------------------------
-itcl::body BrowserWin::_build_file_frame {parent} {
-
-  # Labeled Frame
-  itk_component add file_frame {
-    iwidgets::labeledframe $parent.file -labeltext "Files" \
-      -relief groove -borderwidth 2 -ipadx 6 -ipady 4
-  }
-
-  # Listbox with files
-  itk_component add file_box {
-    iwidgets::scrolledlistbox  [$itk_component(file_frame) childsite].listbox \
-      -selectmode extended -exportselection false \
-      -hscrollmode dynamic -vscrollmode dynamic -foreground $::Colors(textfg) \
-      -textbackground $::Colors(textbg)
-  } {}
-
-  bind [$itk_component(file_box) component listbox] <ButtonRelease-1> \
-    [code $this _process_file_selection %y]
-
-  itk_component add file_sep {
-    frame [$itk_component(file_frame) childsite].sep -relief raised -height 2 \
-      -borderwidth 1
-  }
-
-  itk_component add file_hide {
-    checkbutton [$itk_component(file_frame) childsite].hide \
-      -text "Hide .h files" \
-      -variable [pref varname gdb/browser/hide_h] \
-      -command [code $this _file_hide_h]
-  }
-
-  itk_component add file_all {
-    button [$itk_component(file_frame) childsite].sel \
-      -text "Select All" \
-      -command [code $this _select 1]
-  }
-
-  # pack all the pieces
-  grid $itk_component(file_box) -column 0 -row 0 -columnspan 2 \
-    -sticky news
-  grid $itk_component(file_sep) -column 0 -row 1 -columnspan 2 \
-    -sticky ew -pady 8
-  grid $itk_component(file_hide) -column 0 -row 2 -padx 5 -sticky w
-  grid $itk_component(file_all) -column 1 -row 2 -padx 5 -sticky e
-
-  grid columnconfigure [$itk_component(file_frame) childsite] 0 -weight 1
-  grid rowconfigure [$itk_component(file_frame) childsite] 0 -weight 1
-
-  # finally pack the main frame
-  pack $itk_component(file_frame) -side left -fill both -expand yes
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  _build_function_frame
-#	This private method builds the functions frame
-# ------------------------------------------------------------------
-itcl::body BrowserWin::_build_function_frame {parent} {
-
-  # Labeled Frame
-  itk_component add func_frame {
-    iwidgets::labeledframe $parent.file -labeltext "Function" \
-      -relief groove -borderwidth 2 -ipadx 6 -ipady 4
-  }
-
-  # Functions Listbox
-  itk_component add func_box {
-    iwidgets::scrolledlistbox [$itk_component(func_frame) childsite].listbox \
-      -selectmode extended -hscrollmode dynamic -vscrollmode dynamic \
-      -exportselection false -foreground $::Colors(textfg) \
-      -textbackground $::Colors(textbg)
-  } {}
-	    
-  bind [$itk_component(func_box) component listbox] <ButtonRelease-1> \
-    [code $this _process_func_selection %y]
-  bind $itk_component(func_box) <3> [code $this _toggle_bp %y]
-
-  itk_component add func_sep {
-    frame [$itk_component(func_frame) childsite].sep -relief raised \
-      -height 2 -borderwidth 1
-  }
-	
-  itk_component add func_add_bp {   
-    button [$itk_component(func_frame) childsite].abp -text "Set BP" \
-      -command [code $this do_all_bp 1]
-  }
-
-  itk_component add func_remove_bp {
-    button [$itk_component(func_frame) childsite].rbp -text "Delete BP" \
-      -command [code $this do_all_bp 0]
-  }
-
-  # pack all the pieces
-  grid $itk_component(func_box) -column 0 -row 0 -columnspan 2 -sticky news
-  grid $itk_component(func_sep) -row 1 -column 0 -columnspan 2 \
-    -sticky ew -pady 8
-  grid $itk_component(func_remove_bp) -row 2 -column 0 -padx 5 -sticky w
-  grid $itk_component(func_add_bp) -row 2 -column 1  -padx 5 -sticky e
-
-  grid columnconfigure [$itk_component(func_frame) childsite] 0 -weight 1
-  grid rowconfigure [$itk_component(func_frame) childsite] 0 -weight 1
-
-  # finally pack the main frame
-  pack $itk_component(func_frame) -fill both -expand yes
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  _build_view_frame
-#	This private method builds the view frame
-# ------------------------------------------------------------------
-itcl::body BrowserWin::_build_view_frame {parent} {
-  itk_component add view {
-    frame $parent.view
-  }
-
-  itk_component add view_src {
-    SrcTextWin $itk_component(view).src -Tracing 0 \
-      -parent $this -ignore_var_balloons 0
-  } {
-    rename -background -textbackground textBackground Background
-  }
-
-  itk_component add view_bottom {
-    frame $itk_component(view).bottom
-  }
-
-  itk_component add view_name {
-    label $itk_component(view).name -font global/fixed
-  }
-
-  itk_component add view_func {
-    combobox::combobox $itk_component(view_bottom).combo -maxheight 15\
-      -font global/fixed -command [code $this _goto_func]
-  } {
-    rename -background -textbackground textBackground Background
-  }
-  
-  itk_component add view_mode {
-    combobox::combobox $itk_component(view_bottom).mode -width 9 \
-      -font global/fixed -command [code $this mode]
-  } {
-    rename -background -textbackground textBackground Background
-  }
-
-  itk_component add view_search {
-    entry $itk_component(view_bottom).search -borderwidth 2 \
-      -font global/fixed -width 10 -background $::Colors(textbg)
-  } {}
-
-  # Pack all the components of view into the frame:
-  pack $itk_component(view_func) -side left -anchor w
-  pack $itk_component(view_mode) -side left -padx 5
-  pack $itk_component(view_search) -side right -padx 5 -expand 1 -anchor e
-  pack $itk_component(view_name) -side top -fill x -padx 5 -pady 3
-  pack $itk_component(view_bottom) -side bottom -fill x -pady 3 -padx 5
-  pack $itk_component(view_src) -fill both -expand 1 -padx 5 -pady 3
-  
-  # Fill combo boxes
-  $itk_component(view_mode) list insert end SOURCE
-  $itk_component(view_mode) list insert end ASSEMBLY
-  $itk_component(view_mode) list insert end MIXED
-  # don't allow SRC+ASM mode... $itk_component(view_mode) insert end SRC+ASM
-  $itk_component(view_mode) entryset [$itk_component(view_src) mode_get]
-
-  # Key bindings
-  bind_plain_key $itk_component(view_search) Return \
-    [code $this _search_src forwards]
-  bind_plain_key $itk_component(view_search) Shift-Return \
-    [code $this _search_src backwards]
-
-  pack  $itk_component(view) -fill both -expand yes
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  _switch_layout
-#           Switch between different layouts
-#
-# ------------------------------------------------------------------
-itcl::body BrowserWin::_switch_layout {} {
-  # only 2 right now, so toggle
-  if {$_layout == 1} {
-    set _layout 2
-  } else {
-    set _layout 1
-  }
-  pref set gdb/browser/layout $_layout
-  destroy $itk_interior.p
-  destroy $itk_component(popup)
-  set Current(filename) {}
-  set Current(function) {}
-  if {$filter_trace_after != ""} {
-    after cancel $filter_trace_after
-  }
-  trace vdelete [pref varname gdb/search/last_symbol] \
-    w [code $this _filter_trace_proc]
-  _build_win
-}
diff --git a/gdb/gdbtk/library/browserwin.ith b/gdb/gdbtk/library/browserwin.ith
deleted file mode 100644
index d10011907de..00000000000
--- a/gdb/gdbtk/library/browserwin.ith
+++ /dev/null
@@ -1,77 +0,0 @@
-# Browser window class definition for Insight.
-# Copyright 1998, 1999, 2003 Red Hat, Inc.
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License (GPL) 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.
-
-itcl::class BrowserWin {
- inherit EmbeddedWin
-
-  public {
-    method constructor {args}
-    method destructor {}
-    method mode {w {mode ""} {go 1}}
-    method search {}
-    method test_get {var}
-    method do_all_bp {onp}
-
-  }
-
-  private {
-    method _build_win {}
-    method _file_hide_h {}
-    method _fill_file_box {}
-    method _fill_funcs_combo {name}
-    method _fill_source {f {funcp 1} {filename ""}}
-    method _filter_trace_proc {v1 v2 mode}
-    method _filter_trace_after {}
-    method _goto_func {w {val ""}}
-    method _process_file_selection {y}
-    method _process_func_selection {y}
-    method _search_src {direction}
-    method _select {highlight}
-    method _set_filter_mode {w mode}
-    method _toggle_bp {y}
-    method _build_filter_frame {parent}
-    method _build_file_frame {parent}
-    method _build_function_frame {parent}
-    method _build_view_frame {parent}
-    method _switch_layout
-
-    variable cur_filter_mode
-    variable Current;
-    variable labelUpdateCode ""
-    variable index_to_file
-    variable _mangled_func
-    variable filter_trace_after ""
-    variable _layout
-
-    common componentToRow
-    array set componentToRow {
-      filter      0
-      browser     1
-      view        2
-      view_hidden 3
-    }
-    
-    common filter_modes [list "starts with" \
-			   "contains" \
-			   "ends with" \
-			   "matches regexp"]
-    common filter_regexp
-    array set filter_regexp {
-      "starts with" ^%s
-      "contains" %s
-      "ends with" %s$
-      "matches regexp" %s
-    }
-  }
-}
-
diff --git a/gdb/gdbtk/library/console.itb b/gdb/gdbtk/library/console.itb
deleted file mode 100644
index 6a1a58cc9b9..00000000000
--- a/gdb/gdbtk/library/console.itb
+++ /dev/null
@@ -1,747 +0,0 @@
-# Console window for Insight
-# Copyright 1998, 1999, 2000, 2001, 2002, 2003 Red Hat, Inc.
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License (GPL) 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.
-
-
-itcl::body Console::constructor {args} {
-  global gdbtk_state
-  window_name "Console Window"
-
-  debug "$args"
-  _build_win
-  eval itk_initialize $args
-  add_hook gdb_no_inferior_hook [list $this idle dummy]
-  
-  # There are a bunch of console prefs that have no UI
-  # for the user to modify them.  In the event that the user
-  # really wants to change them, they will have to be modified
-  # in prefs.tcl or by editing .gdbtkinit.  When these prefs
-  # gain a prefs UI, the user may change them dynamically
-  # and the console window will need notification that they
-  # have changed.  Add them to the following list and
-  # Console::_update_option.
-  foreach option {gdb/console/wrap} {
-    pref add_hook $option [code $this _update_option]
-  }
-
-  set gdbtk_state(console) $this
-}
-
-itcl::body Console::destructor {} {
-  global gdbtk_state
-  set gdbtk_state(console) ""
-  remove_hook gdb_no_inferior_hook [list $this idle dummy]
-}
-
-itcl::body Console::_build_win {} {
-  iwidgets::scrolledtext $itk_interior.stext \
-    -vscrollmode dynamic -textbackground white
-
-  set _twin [$itk_interior.stext component text]
-
-  _set_wrap [pref get gdb/console/wrap]
-
-  $_twin tag configure prompt_tag -foreground [pref get gdb/console/prompt_fg]
-  $_twin tag configure err_tag -foreground [pref get gdb/console/error_fg]
-  $_twin tag configure log_tag -foreground [pref get gdb/console/log_fg]
-  $_twin tag configure target_tag -foreground [pref get gdb/console/target_fg]
-  $_twin configure -font [pref get gdb/console/font] \
-    -bg $::Colors(textbg) -fg $::Colors(textfg)
-  
-  #
-  # bind editing keys for console window
-  #
-  bind $_twin <Return> "$this invoke; break"
-  bind_plain_key $_twin Control-m "$this invoke; break"
-  bind_plain_key $_twin Control-j "$this invoke; break"
-
-  # History control.
-  bind_plain_key $_twin Control-p "[code $this _previous]; break"
-  bind $_twin <Up> "[code $this _previous]; break"
-  bind_plain_key $_twin Control-n "[code $this _next]; break"
-  bind $_twin <Down> "[code $this _next]; break"
-  bind $_twin <Meta-less> "[code $this _first]; break"
-  bind $_twin <Home> "[code $this _first]; break"
-  bind $_twin <Meta-greater> "[code $this _last]; break"
-  bind $_twin <End> "[code $this _last]; break"
-  bind_plain_key $_twin Control-o "[code $this _operate_and_get_next]; break"
-
-  # Tab completion
-  bind_plain_key $_twin KeyPress-Tab "[code $this _complete]; break"
-  
-  # Don't let left arrow or ^B go over the prompt
-  bind_plain_key $_twin Control-b {
-    if {[%W compare insert <= {cmdmark + 1 char}]} {
-      break
-    }
-  }
-  bind $_twin <Left> [bind $_twin <Control-b>]
-
-  # Don't let Control-h, Delete, or Backspace back up over the prompt.
-  bind_plain_key $_twin Control-h "[code $this _delete]; break"
-
-  bind $_twin <BackSpace> "[code $this _delete]; break"
-  
-  bind $_twin <Delete> "[code $this _delete 1]; break"
-
-  # Control-a moves to start of line.
-  bind_plain_key $_twin Control-a {
-    %W mark set insert {cmdmark + 1 char}
-    %W see {insert linestart}
-    break
-  }
-
-  # Control-u deletes to start of line.
-  bind_plain_key $_twin Control-u {
-    %W delete {cmdmark + 1 char} insert
-    %W see {insert linestart}
-  }
-
-  # Control-w deletes previous word.
-  bind_plain_key $_twin Control-w {
-    if {[%W compare {insert -1c wordstart} > cmdmark]} {
-      %W delete {insert -1c wordstart} insert
-      %W see insert
-    }
-  }
-
-  bind $_twin <Control-Up> "[code $this _search_history]; break"
-  bind $_twin <Shift-Up> "[code $this _search_history]; break"
-  bind $_twin <Control-Down> "[code $this _rsearch_history]; break"
-  bind $_twin <Shift-Down> "[code $this _rsearch_history]; break"
-
-  # Don't allow key motion to move insertion point outside the command
-  # area.  This is done by fixing up the insertion point after any key
-  # movement.  We only need to do this after events we do not
-  # explicitly override.  Note that since the edit line is always the
-  # last line, we can't possibly go past it, so we don't bother
-  # checking that.  Note also that we check for a binding which is
-  # simply `;'; this lets us handle keys already bound via
-  # bind_plain_key.
-  foreach event [bind Text] {
-    if {[string match *Key* $event]
-	&& ([bind $_twin $event] == ""
-	    || [bind $_twin $event] == ";")} {
-      bind $_twin $event [bind Text $event]
-      bind $_twin $event {+
-	if {[%W compare insert <= {cmdmark + 1 char}]} {
-	  %W mark set insert {cmdmark + 1 char}
-	}
-	break
-      }
-    }
-  }
-
-  # Don't allow mouse to put cursor outside command line.  For some
-  # events we do this by noticing when the cursor is outside the
-  # range, and then saving the insertion point.  For others we notice
-  # the saved insertion point.
-  set pretag pre-$_twin
-  bind $_twin <1> [format {
-    if {[%%W compare [tk::TextClosestGap %%W %%x %%y] <= cmdmark]} {
-      %s _insertion [%%W index insert]
-    } else {
-      %s _insertion {}
-    }
-  } $this $this]
-  bind $_twin <B1-Motion> [format {
-    if {[%s _insertion] != ""} {
-      %%W mark set insert [%s _insertion]
-    }
-  } $this $this $this]
-  # FIXME: has inside information.
-  bind $_twin <ButtonRelease-1> [format {
-    tk::CancelRepeat
-    if {[%s _insertion] != ""} {
-      %%W mark set insert [%s _insertion]
-    }
-    %s _insertion {}
-    break
-  } $this $this $this]
-
-  # Don't allow inserting text outside the command line.  FIXME:
-  # requires inside information.
-  # Also make it a little easier to paste by making the button
-  # drags a little "fuzzy".
-  bind $_twin <B2-Motion> {
-    if {!$tk_strictMotif} {
-      if {($tk::Priv(x) - 2 < %x < $tk::Priv(x) + 2) \
-	    || ($tk::Priv(y) - 2 < %y < $tk::Priv(y) + 2)} {
-	set tk::Priv(mouseMoved) 1
-      }
-      if {$tk::Priv(mouseMoved)} {
-	%W scan dragto %x %y
-      }
-    }
-    break
-  }
-  bind $_twin <ButtonRelease-2> [format {
-    if {!$tk::Priv(mouseMoved) || $tk_strictMotif} {
-      %s
-      break
-    }
-  } [code $this _paste 1]]
-  bind $_twin <<Paste>> "[code $this _paste 0]; break"
-  bind $_twin <<PasteSelection>> "[code $this _paste 0]; break"
-  bind_plain_key $_twin Control-c "event generate $_twin <<Copy>>"
-  bind_plain_key $_twin Control-v "[code $this _paste 1]; break"
-
-  _setprompt
-  pack $itk_interior.stext -expand yes -fill both
-    
-  focus $_twin
-
-}
-
-itcl::body Console::idle {event} {
-  set _running 0
-  $_top configure -cursor {}
-}
-
-# ------------------------------------------------------------------
-#  METHOD: busy - busy event handler
-# ------------------------------------------------------------------
-itcl::body Console::busy {event} {
-  set _running 1
-  $_top configure -cursor watch
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  insert - insert new text in the text widget
-# ------------------------------------------------------------------
-itcl::body Console::insert {line {tag ""}} {
-  if {$_needNL} {
-    $_twin insert {insert linestart} "\n"
-  }
-  # Remove all \r characters from line.
-  set line [join [split $line \r] {}]
-  $_twin insert {insert -1 line lineend} $line $tag
-
-  set nlines [lindex [split [$_twin index end] .] 0]
-  if {$nlines > $throttle} {
-    set delta [expr {$nlines - $throttle}]
-    $_twin delete 1.0 ${delta}.0
-  }
-
-  $_twin see insert
-  set _needNL 0
-  ::update idletasks
-}
-
-# ------------------------------------------------------------------
-#  NAME:         ConsoleWin::_operate_and_get_next
-#  DESCRIPTION:  Invokes the current command and, if this
-#                command came from the history, arrange for
-#                the next history command to be inserted once this
-#                command is finished.
-#
-#  ARGUMENTS:    None
-#  RETURNS:      Nothing
-# ------------------------------------------------------------------
-itcl::body Console::_operate_and_get_next {} {
-  if {$_histElement >= 0} {
-    # _pendingHistElement will be used after the new history element
-    # is pushed.  So we must increment it.
-    set _pendingHistElement [expr {$_histElement + 1}]
-  }
-  invoke
-}
-
-#-------------------------------------------------------------------
-#  METHOD:  _previous - recall the previous command
-# ------------------------------------------------------------------
-itcl::body Console::_previous {} {
-  if {$_histElement == -1} {
-    # Save partial command.
-    set _partialCommand [$_twin get {cmdmark + 1 char} {cmdmark lineend}]
-  }
-  incr _histElement
-  set text [lindex $_history $_histElement]
-  if {$text == ""} {
-    # No dice.
-    incr _histElement -1
-    # FIXME flash window.
-  } else {
-    $_twin delete {cmdmark + 1 char} {cmdmark lineend}
-    $_twin insert {cmdmark + 1 char} $text
-  }
-}
-
-#-------------------------------------------------------------------
-#  METHOD:  _search_history - search history for match
-# ------------------------------------------------------------------
-itcl::body Console::_search_history {} {
-  set str [$_twin get {cmdmark + 1 char} {cmdmark lineend}]
-
-  if {$_histElement == -1} {
-    # Save partial command.
-    set _partialCommand $str
-    set ix [lsearch $_history ${str}*]
-  } else {
-    set str $_partialCommand
-    set num [expr $_histElement + 1]
-    set ix [lsearch [lrange $_history $num end] ${str}*]
-    incr ix $num
-  }
-
-  set text [lindex $_history $ix]
-  if {$text != ""} {
-    set _histElement $ix
-    $_twin delete {cmdmark + 1 char} {cmdmark lineend}
-    $_twin insert {cmdmark + 1 char} $text
-  }
-}
-
-#-------------------------------------------------------------------
-#  METHOD:  _rsearch_history - search history in reverse for match
-# ------------------------------------------------------------------
-itcl::body Console::_rsearch_history {} {
-  if {$_histElement != -1} {
-    set str $_partialCommand
-    set num [expr $_histElement - 1]
-    set ix $num
-    while {$ix >= 0} {
-      if {[string match ${str}* [lindex $_history $ix]]} {
-	break
-      }
-      incr ix -1
-    }
-
-    set text ""
-    if {$ix >= 0} {
-      set text [lindex $_history $ix]
-      set _histElement $ix
-    } else {
-      set text $_partialCommand
-      set _histElement -1
-    }
-    $_twin delete {cmdmark + 1 char} {cmdmark lineend}
-    $_twin insert {cmdmark + 1 char} $text
-  }
-}
-
-#-------------------------------------------------------------------
-#  METHOD:  _next - recall the next command (scroll forward)
-# ------------------------------------------------------------------
-itcl::body Console::_next {} {
-  if {$_histElement == -1} {
-    # FIXME flash window.
-    return
-  }
-  incr _histElement -1
-  if {$_histElement == -1} {
-    set text $_partialCommand
-  } else {
-    set text [lindex $_history $_histElement]
-  }
-  $_twin delete {cmdmark + 1 char} {cmdmark lineend}
-  $_twin insert {cmdmark + 1 char} $text
-}
-
-#-------------------------------------------------------------------
-#  METHOD:  _last - get the last history element
-# ------------------------------------------------------------------
-itcl::body Console::_last {} {
-  set _histElement 0
-  _next
-}
-
-#-------------------------------------------------------------------
-#  METHOD:  _first - get the first (earliest) history element
-# ------------------------------------------------------------------
-itcl::body Console::_first {} {
-  set _histElement [expr {[llength $_history] - 1}]
-  _previous
-}
-
-
-
-#-------------------------------------------------------------------
-#  METHOD:  _setprompt - put a prompt at the beginning of a line
-# ------------------------------------------------------------------
-itcl::body Console::_setprompt {{prompt {}}} {
-  if {$prompt == ""} {
-    #set prompt [pref get gdb/console/prompt]
-    set prompt [gdb_prompt]
-  } elseif {$prompt == "none"} {
-    set prompt ""
-  }
-  
-  $_twin delete {insert linestart} {insert lineend}
-  $_twin insert {insert linestart} $prompt prompt_tag
-  $_twin mark set cmdmark "insert -1 char"
-  $_twin see insert
-
-  if {$_pendingHistElement >= 0} {
-    set _histElement $_pendingHistElement
-    set _pendingHistElement -1
-    _next
-  }
-}
-
-#-------------------------------------------------------------------
-#  METHOD:  gets - get a line of input from the console
-# ------------------------------------------------------------------
-itcl::body Console::gets {} {
-  set _input_mode 1
-#  _setprompt "(input) "
-  _setprompt none
-  $_twin delete insert end
-  $_twin mark set cmdmark {insert -1 char}
-
-  bind_plain_key $_twin Control-d "$this invoke 1; break"
-  bind_plain_key $_twin Control-c "[code $this _cancel]; break"
-
-  vwait [scope _input_result]
-  set _input_mode 0
-  bind_plain_key $_twin Control-c "event generate $_twin <<Copy>>"
-  activate
-  if {$_input_error} {
-    set _input_error 0
-    return -code error ""
-  }
-  return $_input_result
-}
-
-#-------------------------------------------------------------------
-#  METHOD:  cancel - cancel input when ^C is hit
-# ------------------------------------------------------------------
-itcl::body Console::_cancel {} {
-  if {$_input_mode} {
-    set _needNL 1
-    $_twin mark set insert {insert lineend}
-    $_twin insert {insert lineend} "^C\n"
-    incr _invoking
-    set _input_error 1
-    set _input_result ""
-  }
-}
-
-#-------------------------------------------------------------------
-#  METHOD:  activate - run this after a command is run
-# ------------------------------------------------------------------
-itcl::body Console::activate {{prompt {}}} {
-  if {$_invoking > 0} {
-    incr _invoking -1
-    _setprompt $prompt
-  }
-}
-
-#-------------------------------------------------------------------
-#  METHOD:  invoke - invoke a command
-# ------------------------------------------------------------------
-itcl::body Console::invoke {{controld 0}} {
-  global gdbtk_state
-
-  set text [$_twin get {cmdmark + 1 char} end ]
-
-  if { "[string range $text 0 1]" == "tk" } {
-    if {! [info complete $text] } {
-      $_twin insert {insert lineend} " \\\n"
-      $_twin see insert
-      return
-    }
-  }
-
-  incr _invoking
-
-  set text [string trimright $text \n]
-  if {$text == ""} {
-    set text [lindex $_history 0]
-    $_twin insert {insert lineend} $text
-  }
-  $_twin mark set insert {insert lineend}
-  $_twin insert {insert lineend} "\n"
-
-  set ok 0
-  if {$_running} {
-    if {[string index $text 0] == "!"} {
-      set text [string range $text 1 end]
-      set ok 1
-    }
-  }
-
-  if {$_input_mode} {
-    if {!$controld} {append text \n}
-    set _input_result $text
-    set _needNL 1
-    return
-  }
-  
-  # Only push new nonempty history items.
-  if {$text != "" && [lindex $_history 0] != $text} {
-    lvarpush _history $text
-  }
-  
-  set index [$_twin index insert]
-  
-  # Clear current history element, and current partial element.
-  set _histElement -1
-  set _partialCommand ""
-  
-  # Need a newline before next insert.
-  set _needNL 1
-  
-  # run command
-  if {$gdbtk_state(readline)} {
-    set gdbtk_state(readline_response) $text
-    return
-  }
-
-  if {!$_running || $ok} {
-    set result [catch {gdb_immediate "$text" 1} message]
-  } else {
-    set result 1
-    set message "The debugger is busy."
-  }
-
-  # gdb_immediate may take a while to finish.  Exit if
-  # our window has gone away.
-  if {![winfo exists $_twin]} { return }
-
-  if {$result} {
-    global errorInfo
-    dbug W "Error: $errorInfo\n"
-    $_twin insert end "Error: $message\n" err_tag
-  } elseif {$message != ""} {
-    $_twin insert $index "$message\n"
-  }
-  
-  # Make the prompt visible again.
-  activate
-  
-  # Make sure the insertion point is visible.
-  $_twin see insert
-}
-
-#-------------------------------------------------------------------
-#  PRIVATE METHOD:  _delete - Handle a Delete of some sort.
-# ------------------------------------------------------------------
-itcl::body Console::_delete {{right 0}} {
-
-  # If we are deleting to the right, and we have this turned off,
-  # delete to the right.
-  
-  if {$right && ![pref get gdb/console/deleteLeft]} {
-    set right 0
-  }
-  
-  if {!$right} {
-    set insert_valid [$_twin compare insert > {cmdmark + 1 char}]
-    set delete_loc "insert-1c"
-  } else {
-    set insert_valid [$_twin compare insert > cmdmark]
-    set delete_loc "insert"
-  }
-  
-  # If there is a selection on the command line, delete it,
-  # If there is a selection above the command line, do a
-  # regular delete, but don't delete the prompt.
-  # If there is no selection, do the delete.
-  
-  if {![catch {$_twin index sel.first}]} {
-    if {[$_twin compare sel.first <= cmdmark]} {
-      if {$insert_valid} {
-	$_twin delete $delete_loc
-      }
-    } else {
-      $_twin delete sel.first sel.last
-    }
-  } elseif {$insert_valid} {
-    $_twin delete $delete_loc
-  }
-}
-
-#-------------------------------------------------------------------
-#  PRIVATE METHOD:  _insertion - Set or get saved insertion point
-# ------------------------------------------------------------------
-itcl::body Console::_insertion {args} {
-  if {! [llength $args]} {
-    return $_saved_insertion
-  } else {
-    set _saved_insertion [lindex $args 0]
-  }
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  _paste - paste the selection into the console window
-# ------------------------------------------------------------------
-itcl::body Console::_paste {{check_primary 1}} {
-  set sel {}
-
-  if {!$check_primary || [catch {selection get} sel] || $sel == ""} {
-    if {[catch {selection get -selection CLIPBOARD} sel] || $sel == ""} {
-      return
-    }
-  }
-
-  #if there is a selection, insert over it:
-  if {![catch {$_twin index sel.first}] 
-      && [$_twin compare sel.first > {cmdmark + 1 char}]} {
-    set point [$_twin index sel.first]
-    $_twin delete sel.first sel.last
-    $_twin insert $point $sel
-  } else {
-    $_twin insert insert $sel
-  }
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  _find_lcp - Return the longest common prefix in SLIST.
-#              Can be empty string.
-# ------------------------------------------------------------------
-itcl::body Console::_find_lcp {slist} {
-  # Handle trivial cases where list is empty or length 1
-  if {[llength $slist] <= 1} {return [lindex $slist 0]}
-
-  set prefix [lindex $slist 0]
-  set prefixlast [expr [string length $prefix] - 1]
-
-  foreach str [lrange $slist 1 end] {
-    set test_str [string range $str 0 $prefixlast]
-    while {[string compare $test_str $prefix] != 0} {
-      incr prefixlast -1
-      set prefix [string range $prefix 0 $prefixlast]
-      set test_str [string range $str 0 $prefixlast]
-    }
-    if {$prefixlast < 0} break
-  }
-  return $prefix
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  _find_completion - Look through COMPLETIONS to generate
-#             the suffix needed to do command
-# ------------------------------------------------------------------
-itcl::body Console::_find_completion {cmd completions} {
-  # Get longest common prefix
-  set lcp [_find_lcp $completions]
-  set cmd_len [string length $cmd]
-  # Return suffix beyond end of cmd
-  return [string range $lcp $cmd_len end]
-}
-
-# ------------------------------------------------------------------
-#  METHOD: _complete - Command line completion
-# ------------------------------------------------------------------
-itcl::body Console::_complete {} {
-
-  set command_line [$_twin get {cmdmark + 1 char} {cmdmark lineend}]
-  set choices [gdb_cmd "complete $command_line" 1]
-  set choices [string trimright $choices \n]
-  set choices [split $choices \n]
-
-  # Just do completion if this is the first tab
-  if {!$_saw_tab} {
-    set _saw_tab 1
-    set completion [_find_completion $command_line $choices]
-
-    # Here is where the completion is actually done.  If there
-    # is one match, complete the command and print a space.
-    # If two or more matches, complete the command and beep.
-    # If no match, just beep.
-    switch [llength $choices] {
-      0 {}
-      1 {
-	$_twin insert end "$completion "
-	set _saw_tab 0
-	return
-      }
-
-      default {
-	$_twin insert end $completion
-      }
-    }
-    bell
-    $_twin see end
-    bind $_twin <KeyPress> [code $this _reset_tab]
-  } else {
-    # User hit another consecutive tab.  List the choices.
-    # Note that at this point, choices may contain commands
-    # with spaces.  We have to lop off everything before (and
-    # including) the last space so that the completion list
-    # only shows the possibilities for the last token.
-    set choices [lsort $choices]
-    if {[regexp ".* " $command_line prefix]} {
-      regsub -all $prefix $choices {} choices
-    }
-    if {[llength choices] != 0} {
-      insert "\nCompletions:\n[join $choices \ ]\n"
-      $_twin see end
-      bind $_twin <KeyPress> [code $this _reset_tab]
-    }
-  }
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  _reset_tab - Helper method for tab completion. Used
-#             to reset the tab when a key is pressed.
-# ------------------------------------------------------------------
-itcl::body Console::_reset_tab {} {
-  bind $_twin <KeyPress> {}
-  set _saw_tab 0
-}
-
-
-# ------------------------------------------------------------------
-#  METHOD:  _set_wrap - Set wrap mode
-# ------------------------------------------------------------------
-itcl::body Console::_set_wrap {wrap} {
-  if { $wrap } {
-    set hsm none
-    set wv char
-  } else {
-    set hsm dynamic
-    set wv none
-  }
-
-  $itk_interior.stext configure -hscrollmode $hsm
-  $_twin configure -wrap $wv
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  _update_option - Update in response to preference change
-# ------------------------------------------------------------------
-itcl::body Console::_update_option {name value} {
-  switch -- $name {
-    gdb/console/wrap {
-      _set_wrap $value
-    }
-
-    gdb/console/prompt_fg {
-      $_twin tag configure prompt_tag -foreground $value
-    }
-
-    gdb/console/error_fg {
-      $_twin tag configure err_tag -foreground $value
-    }
-  }
-}
-
-# ------------------------------------------------------------------
-#  NAME:         public method Console::test
-#  DESCRIPTION:  Executes the given command
-#
-#  ARGUMENTS:    Command to run
-#  RETURNS:      Return value of command
-#
-#  NOTES:        This will only run if env(GDBTK_TEST_RUNNING)==1.
-#                FOR TESTING ONLY
-# ------------------------------------------------------------------
-itcl::body Console::test {args} {
-  global env
-
-  if {[info exists env(GDBTK_TEST_RUNNING)] && $env(GDBTK_TEST_RUNNING) == 1} {
-    return [eval $args]
-  }
-}
-
diff --git a/gdb/gdbtk/library/console.ith b/gdb/gdbtk/library/console.ith
deleted file mode 100644
index a574f068703..00000000000
--- a/gdb/gdbtk/library/console.ith
+++ /dev/null
@@ -1,77 +0,0 @@
-# Console window class definition for GDBtk.
-# Copyright 1998, 1999, 2000, 2001, 2002 Red Hat, Inc.
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License (GPL) 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.
-
-
-# ----------------------------------------------------------------------
-# Implements a console display widget using primitive widgets as the building
-# blocks.  
-# ----------------------------------------------------------------------
-
-itcl::class Console {
-  inherit EmbeddedWin GDBEventHandler
-
-  public {
-    #Approximate maximum number of lines allowed in widget
-    variable throttle 2000
-
-    method constructor {args}
-    method destructor {}   
-    method insert {line {tag ""}}
-    method invoke {{controld 0}}
-    method _insertion {args}
-    method activate {{prompt {}}}
-    method test {args}
-    method gets {}
-
-    #
-    # GDB Events
-    #
-    method busy {event}
-    method idle {event}
-  }
-
-  private {
-    variable _twin
-    variable _invoking 0
-    variable _needNL 1
-    variable _history {}
-    variable _histElement -1
-    variable _partialCommand ""
-    variable _saved_insertion ""
-    variable _running 0
-    variable _saw_tab 0
-    variable _pendingHistElement -1
-    variable _input_mode 0
-    variable _input_result ""
-    variable _input_error 0
-
-    method _build_win {}
-    method _cancel {}
-    method _complete {}
-    method _delete {{left 0}}
-    method _find_completion {cmd completions}
-    method _find_lcp {slist}
-    method _first {}
-    method _last {}
-    method _next {}
-    method _operate_and_get_next {}
-    method _paste {{check_primary 1}}
-    method _previous {}
-    method _reset_tab {}
-    method _search_history {}
-    method _rsearch_history {}
-    method _setprompt {{prompt {}}}
-    method _set_wrap {wrap}
-    method _update_option {name value}
-  }
-}
diff --git a/gdb/gdbtk/library/debugwin.itb b/gdb/gdbtk/library/debugwin.itb
deleted file mode 100644
index baeadab300e..00000000000
--- a/gdb/gdbtk/library/debugwin.itb
+++ /dev/null
@@ -1,468 +0,0 @@
-# Debug window for GDBtk.
-# Copyright 1998, 1999, 2000, 2001, 2002 Red Hat, Inc.
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License (GPL) 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.
-
-
-# -----------------------------------------------------------------------------
-# NAME:		DebugWin::constructor
-#	
-# SYNOPSIS:	constructor::args
-#
-# DESC:		Creates the debug window  
-#
-# ARGS:		None are used yet.
-# -----------------------------------------------------------------------------
-itcl::body DebugWin::constructor {args} {
-  debug $args
-  window_name "Insight Debug" "Debug"
-
-  build_win
-}
-
-# -----------------------------------------------------------------------------
-# NAME:		DebugWin::destructor
-#	
-# SYNOPSIS:	Not called by hand
-#
-# DESC:		Destroys the debug window
-#
-# ARGS:		None
-# -----------------------------------------------------------------------------
-itcl::body DebugWin::destructor {} {
-  # notify debug code that window is going away
-  ::debug::debugwin ""
-}
-
-# -----------------------------------------------------------------------------
-# NAME:		DebugWin::build_win
-#
-# SYNOPSIS:	build_win
-#	
-# DESC:		Creates the Debug Window. Reads the contents of the debug log
-#		file, if it exists. Notifies the debug functions in ::debug
-#		to send output here.
-# -----------------------------------------------------------------------------
-itcl::body DebugWin::build_win {} {
-  global gdb_ImageDir GDBTK_LIBRARY
-
-  set top [winfo toplevel $itk_interior]
-  
-  # initialize the gdbtk_de array
-  if {![info exists ::gdbtk_de]} {
-    set ::gdbtk_de(ALL) 1
-    set ::gdbtk_de(ERRORS_ONLY) 0
-    set ::gdbtk_de(others) 0
-    set ::gdbtk_de(filter_var) ALL
-  }
-
-  # create menubar
-  set menu [menu $itk_interior.m  -tearoff 0]
-  $menu add cascade -menu $menu.file -label "File" -underline 0
-  set m [menu $menu.file] 
-  $m add command -label "Clear" -underline 1 \
-    -command [code $this _clear]
-  $m add command -label "Mark Old" -underline 1 \
-    -command [code $this _mark_old]
-  $m add separator
-  $m add command -label "Save" -underline 0 \
-    -command [code $this _save_contents]
-  $m add separator
-  $m add command -label "Close" -underline 0 \
-    -command "::debug::debugwin {};delete object $this"
-  $menu add cascade -menu $menu.trace -label "Trace"
-  set m [menu $menu.trace]
-  $m add radiobutton -label Start -variable ::debug::tracing -value 1
-  $m add radiobutton -label Stop -variable ::debug::tracing -value 0
-  $menu add cascade -menu $menu.rs -label "ReSource"
-  set m [menu $menu.rs]
-  foreach f [lsort [glob [file join $GDBTK_LIBRARY *.itb]]] {
-    $m add command -label "Source [file tail $f]"\
-      -command [list source $f]
-  }
-  $m add separator
-  $m add command -label "Source ALL" -command [code $this _source_all]
-
-  $menu add cascade -menu $menu.opt -label "Options"
-  set m [menu $menu.opt]
-  $m add command -label "Display" -underline 0 \
-    -command [list ManagedWin::open DebugWinDOpts -over $this]
-  if {!$::debug::initialized} {
-    $menu entryconfigure 1 -state disabled
-    $menu add cascade -label "     Tracing Not Initialized" -foreground red \
-      -activeforeground red
-  }
-  $menu add cascade -menu $menu.help -label "Help" -underline 0
-  set m [menu $menu.help]
-  $m add command -label "Debugging Functions" -underline 0 \
-    -command {open_help debug.html}
-
-  $top configure -menu $menu
-  
-  iwidgets::scrolledtext $itk_interior.s -hscrollmode static \
-    -vscrollmode static -wrap none -textbackground black -foreground white
-  set _t [$itk_interior.s component text]
-  pack $itk_interior.s -expand 1 -fill both
-
-  # define tags
-  foreach color $_colors {
-    $_t tag configure [lindex $color 0] -foreground [lindex $color 1]
-  }
-  $_t tag configure trace -foreground gray
-  $_t tag configure args -foreground blue
-  $_t tag configure marked -background grey20
-
-  loadlog
-
-  # now notify the debug functions to use this window
-  ::debug::debugwin $this
-
-  # override the window delete procedure so the messages are
-  # turned off first.
-  wm protocol $top WM_DELETE_WINDOW "::debug::debugwin {};destroy $top"
-}
-
-# -----------------------------------------------------------------------------
-# NAME:		DebugWin::puts
-#	
-# SYNOPSIS:	puts {level cls func msg}
-#
-# DESC:		Writes debugging information into the DebugWin. A filter
-#		will be applied to determine if the message should be
-#		displayed or not.  
-#
-# ARGS:		level - priority level. See debug::dbug for details.
-#		cls   - class name of caller, for example "SrcWin"
-#		func  - function name of caller
-#		msg   - message to display
-# -----------------------------------------------------------------------------
-itcl::body DebugWin::puts {level cls func msg} {
-  # filter. check if we should display this message
-  # for now we always let high-level messages through
-  if {$level == "I"} {
-
-    # errors and warnings only
-    if {$::gdbtk_de(ERRORS_ONLY)} { return }
-
-    # ALL classes except those set
-    if {$::gdbtk_de(ALL)} {
-      if {[info exists ::gdbtk_de($cls)]} {
-	if {$::gdbtk_de($cls)} {
-	  return
-	}
-      } elseif {$::gdbtk_de(others)} {
-	return
-      }
-    }
-
-    # ONLY the classes set
-    if {!$::gdbtk_de(ALL)} {
-      if {[info exists ::gdbtk_de($cls)]} {
-	if {!$::gdbtk_de($cls)} {
-	  return
-	}
-      } elseif {!$::gdbtk_de(others)} {
-	return
-      }
-    }
-  }
-
-  if {$func != ""} {
-    append cls ::$func
-  }
-  $_t insert end "($cls) " {} "$msg\n" $level
-  $_t see insert
-}
-
-# -----------------------------------------------------------------------------
-# NAME:		DebugWin::put_trace
-#	
-# SYNOPSIS:	put_trace {enter level func ar}
-#	
-# DESC:		Writes trace information into the DebugWin. A filter
-#		will be applied to determine if the message should be
-#		displayed or not.
-#
-# ARGS:		enter - 1 if this is a function entry, 0 otherwise.
-#		level - stack level
-#		func  - function name
-#		ar    - function arguments
-# -----------------------------------------------------------------------------
-itcl::body DebugWin::put_trace {enter level func ar} {
-  set x [expr {$level * 2 - 2}]
-  if {$enter} {
-    $_t insert end "[string range $_bigstr 0 $x]$func " trace "$ar\n" args
-  } else {
-    $_t insert end "[string range $_bigstr 0 $x]<- $func " trace "$ar\n" args
-  }
-  $_t see insert
-}
-
-# -----------------------------------------------------------------------------
-# NAME:		DebugWin::loadlog
-#
-# SYNOPSIS:	loadlog
-#	
-# DESC:		Reads the contents of the debug log file, if it exists, into 
-#		the DebugWin. 
-# -----------------------------------------------------------------------------
-itcl::body DebugWin::loadlog {} {
-  $_t delete 0.0 end
-  # Now load in log file, if possible.
-  # this is rather rude, using the logfile variable in the debug namespace
-  if {$::debug::logfile != "" && $::debug::logfile != "stdout"} {
-    flush $::debug::logfile
-    seek $::debug::logfile 0 start
-    while {[gets $::debug::logfile line] >= 0} {
-      while {[catch {set f [lindex $line 0]} f]} {
-	# If the lindex failed its because the remainder of the
-	# list is on the next line.  Get it.
-	if {[gets $::debug::logfile line2] < 0} {
-	  break
-	}
-	append line \n $line2
-      }
-      if {$f == "T"} {
-	put_trace [lindex $line 1] [lindex $line 2] [lindex $line 3] \
-	  [lindex $line 4]
-      } else {
-	puts $f [lindex $line 1] [lindex $line 2] [lindex $line 3]
-      }
-    }
-  }
-}
-
-# -----------------------------------------------------------------------------
-# NAME:		DebugWin::_source_all
-#
-# SYNOPSIS:	_source_all
-#	
-# DESC:		Re-sources all the .itb files.
-# -----------------------------------------------------------------------------
-itcl::body DebugWin::_source_all {} {
-  foreach f [glob [file join $::GDBTK_LIBRARY *.itb]] {
-    source $f
-  }
-}
-
-# -----------------------------------------------------------------------------
-# NAME:		DebugWin::_clear
-#
-# SYNOPSIS:	_clear
-#	
-# DESC:		Clears out the content of the debug window.
-# -----------------------------------------------------------------------------
-itcl::body DebugWin::_clear {} {
-  $_t delete 1.0 end
-}
-
-# -----------------------------------------------------------------------------
-# NAME:		DebugWin::_mark_old
-#
-# SYNOPSIS:	_mark_old
-#	
-# DESC:		Changes the background of the current contents of the window.
-# -----------------------------------------------------------------------------
-itcl::body DebugWin::_mark_old {} {
-  $_t tag add marked 1.0 "end - 1c"
-}
-
-# -----------------------------------------------------------------------------
-# NAME:		DebugWin::_save_contents
-#
-# SYNOPSIS:	_save_contents
-#	
-# DESC:		Changes the background of the current contents of the window.
-# -----------------------------------------------------------------------------
-itcl::body DebugWin::_save_contents {} {
-  set file [tk_getSaveFile -title "Choose debug window dump file" \
-	      -parent [winfo toplevel $itk_interior]]
-  if {$file == ""} {
-    return
-  }
-
-  if {[catch {::open $file w} fileH]} {
-    tk_messageBox -type ok -icon error -message \
-      "Can't open file: \"$file\". \n\nThe error was:\n\n\"$fileH\""
-    return
-  }
-  ::puts $fileH [$_t get 1.0 end]
-
-}
-
-###############################################################################
-# -----------------------------------------------------------------------------
-# NAME:		DebugWinDOpts::constructor
-#
-# SYNOPSIS:	constructor
-#	
-# DESC:		Creates the Debug Window Options Dialog.
-# -----------------------------------------------------------------------------
-itcl::body DebugWinDOpts::constructor {args} {
-    window_name "Debug Window Options"
-    build_win
-    eval itk_initialize $args 
-}
-
-###############################################################################
-# -----------------------------------------------------------------------------
-# NAME:		DebugWinDOpts::destructor
-#
-# SYNOPSIS:	Not called by hand
-#	
-# DESC:		Destroys the Debug Window Options Dialog.
-# -----------------------------------------------------------------------------
-itcl::body DebugWinDOpts::destructor {} {
-}
-
-
-# -----------------------------------------------------------------------------
-# NAME:		DebugWinDOpts::build_win
-#
-# SYNOPSIS:	build_win
-#	
-# DESC:		Creates the Debug Window Options Dialog. This dialog allows the
-#		user to select which information is displayed in the debug 
-#		window and (eventually) how it looks.
-# -----------------------------------------------------------------------------
-itcl::body DebugWinDOpts::build_win {} {
-  wm title [winfo toplevel $itk_interior] "Debug Display Options"
-  # initialize here so we can resource this file and update the list
-  set _classes {DebugWin RegWin SrcBar SrcWin ToolBar WatchWin EmbeddedWin \
-		  ManagedWin GDBWin StackWin SrcTextWin global \
-		  BpWin TargetSelection ModalDialog ProcessWin \
-		  GDBEventHandler MemWin VarTree}
-  set _classes [concat [lsort $_classes] others]
-
-  set f [frame $itk_interior.f]
-  set btns [frame $itk_interior.buttons]
-
-  iwidgets::Labeledframe $f.display -labelpos nw -labeltext {Classes}
-  set fr [$f.display childsite]
-  radiobutton $fr.0 -text "Messages from ALL classes EXCEPT those selected below" \
-    -variable ::gdbtk_de(filter_var) -value ALL -command [code $this _all]
-  radiobutton $fr.1 -text "Messages from ONLY those classes selected below" \
-    -variable ::gdbtk_de(filter_var) -value ONLY -command [code $this _all]
-  radiobutton $fr.2 -text "Only WARNINGS and ERRORS" \
-    -variable ::gdbtk_de(filter_var) -value ERRORS -command [code $this _all]
-
-  grid $fr.0 -sticky w -padx 5 -pady 5
-  grid $fr.1 -sticky w -padx 5 -pady 5
-  grid $fr.2 -sticky w -padx 5 -pady 5
-
-  iwidgets::Labeledframe $f.classes 
-  set fr [$f.classes childsite]
-
-  set i 0
-  foreach cls $_classes {
-    if {![info exists ::gdbtk_de($cls)]} {
-      set ::gdbtk_de($cls) 0
-    }
-    checkbutton $fr.$i -text $cls -variable ::gdbtk_de($cls)
-    incr i
-  }
-
-  set k [expr 3*(int($i/3))]
-  set more [expr $i - $k]
-  set j 0
-  while {$j < $k} {
-    grid $fr.$j $fr.[expr $j+1] $fr.[expr $j+2] -sticky w -padx 5 -pady 5
-    incr j 3
-  }
-  switch $more {
-    1 { grid $fr.$j x x -sticky w -padx 5 -pady 5}
-    2 { grid $fr.$j $fr.[expr $j+1] x -sticky w -padx 5 -pady 5}
-  }
-
-  pack $f.display -side top -expand 1 -fill both
-  pack $f.classes -side top -expand 1 -fill both
-
-  button $btns.ok -text [gettext OK] -width 7 -command [code $this _apply 1] \
-    -default active
-  button $btns.apply -text "Apply to All"  -width 7 \
-    -command [code $this _apply 0]
-  if {$::debug::logfile == "" || $::debug::logfile == "stdout"} {
-    $btns.apply configure -state disabled
-  }
-  button $btns.help -text [gettext Help] -width 10 -command [code $this help] \
-    -state disabled
-  standard_button_box $btns
-  bind $btns.ok <Return> "$btns.ok flash; $btns.ok invoke"
-  bind $btns.apply <Return> "$btns.apply flash; $btns.apply invoke"
-  bind $btns.help <Return> "$btns.help flash; $btns.help invoke"
-  
-  pack $btns $f -side bottom -expand 1 -fill both -anchor e
-  focus $btns.ok
-}
-
-# -----------------------------------------------------------------------------
-# NAME:		DebugWinDOpts::_all
-#
-# SYNOPSIS:	_all
-#	
-# DESC:		Callback for selecting ALL classes. If the user selects ALL,
-#		deselect all the individual class checkbuttons.
-# -----------------------------------------------------------------------------
-itcl::body DebugWinDOpts::_all {} {
-  switch $::gdbtk_de(filter_var) {
-    ALL {
-      set ::gdbtk_de(ALL) 1
-      set ::gdbtk_de(ERRORS_ONLY) 0
-      #enable class buttons
-      set num 0
-      foreach class $_classes {
-	[$itk_interior.f.classes childsite].$num configure -state normal
-	incr num
-      }
-    }
-    ONLY {
-      set ::gdbtk_de(ALL) 0
-      set ::gdbtk_de(ERRORS_ONLY) 0
-      #enable class buttons
-      set num 0
-      foreach class $_classes {
-	[$itk_interior.f.classes childsite].$num configure -state normal
-	incr num
-      }
-    }
-    ERRORS {
-      set ::gdbtk_de(ALL) 0
-      set ::gdbtk_de(ERRORS_ONLY) 1
-      # disable class buttons
-      set num 0
-      foreach class $_classes {
-	[$itk_interior.f.classes childsite].$num configure -state disabled
-	incr num
-      }
-    }
-  }
-}
-
-
-# -----------------------------------------------------------------------------
-# NAME:		DebugWinDOpts::_apply
-#
-# SYNOPSIS:	_apply
-#	
-# DESC:		Callback for the "Apply" button. Loads the contents of the
-#		log file through the new filter into the debug window. The
-#		button is disabled if there is no log file.
-# -----------------------------------------------------------------------------
-itcl::body DebugWinDOpts::_apply { done } {
-  set dw [ManagedWin::find DebugWin]
-  debug $dw
-  if {$dw != ""} {
-    $dw loadlog
-  }
-  if {$done} {
-    delete object $this
-  }
-}
diff --git a/gdb/gdbtk/library/debugwin.ith b/gdb/gdbtk/library/debugwin.ith
deleted file mode 100644
index df173745f01..00000000000
--- a/gdb/gdbtk/library/debugwin.ith
+++ /dev/null
@@ -1,92 +0,0 @@
-# Debug window class definition for GDBtk.
-# Copyright 1998, 1999 Cygnus Solutions
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License (GPL) 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.
-
-
-# -----------------------------------------------------------------------------
-# NAME:
-#	class DebugWin
-#
-# DESC:
-#	This class implements a debug output window to display internal
-#	debugging information. It can handle debugging messages, tracing,
-#	and eventually profiling.
-#
-# NOTES:
-#	This window is for developers.
-#
-# -----------------------------------------------------------------------------
-itcl::class DebugWin {
-  inherit ManagedWin
-
-  private {
-    variable _t
-    variable _colors {
-      {I green}
-      {W yellow}
-      {E orange}
-      {X red}
-    }
-    variable _bigstr "                                                                                                                                                                                                             "
-    method build_win {}
-    method _source_all {}
-    method _clear {}
-    method _mark_old {}
-    method _save_contents {}
-  }
-
-  protected {
-    method _ignore_on_save {} { return 1 }
-  }
-
-  public {
-    method constructor {args}
-    method destructor {}
-    method puts {level cls func msg}
-    method put_trace {enter level func ar}
-    method loadlog {}
-  }
-}
-
-# -----------------------------------------------------------------------------
-# NAME:
-#	class DebugWinDOpts
-#
-# DESC:
-#	This class implements a debug options dialog for the DebugWin.
-#	Currently this consists os a selection dialog to choose which
-#	messages to print. Eventually it could also include a filter
-#	for different priorities and color selections.
-#
-# NOTES:
-#	This window is for developers.
-#
-# -----------------------------------------------------------------------------
-itcl::class DebugWinDOpts {
-  inherit ManagedWin
-
-  public {
-    method constructor {args} {}
-    method destructor {}
-  }
-
-  protected {
-    method _ignore_on_save { return 1 }
-  }
-
-  private {
-    variable _classes
-    method build_win {}
-    method _all {}
-    method _apply {done}
-  }
-}
diff --git a/gdb/gdbtk/library/download.itb b/gdb/gdbtk/library/download.itb
deleted file mode 100644
index afe3c1d599c..00000000000
--- a/gdb/gdbtk/library/download.itb
+++ /dev/null
@@ -1,284 +0,0 @@
-# Download class implementation for Insight.
-# Copyright 1999, 2001 Red Hat, Inc.
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License (GPL) 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.
-
-
-# ----------------------------------------------------------------------
-# Download window and associated procs
-#
-# ----------------------------------------------------------------------
-
-itcl::body Download::constructor {args} {
-  global gdb_pretty_name
-  debug $args
-  eval itk_initialize $args
-  window_name "Download Status" "Download"
-  add_hook download_progress_hook "$this update_download"
-
-  label $itk_interior.dload -text "Downloading $filename to $gdb_pretty_name"
-
-  label $itk_interior.stat
-  set f [frame $itk_interior.f]
-
-  set i 0
-  while {$i <$num_sections} {
-    iwidgets::feedback $f.meter$i -steps $num_steps -fraction 0.0
-    grid forget [$f.meter$i component percentage]
-    label $f.sec$i -text [lindex $section(names) $i] -anchor w
-    label $f.num$i -text $bytes($i) -anchor e
-    grid $f.sec$i $f.meter$i $f.num$i -padx 4 -pady 4 -sticky news
-    incr i
-  }
-  grid columnconfigure $f 1 -weight 1
-
-  button $itk_interior.cancel -text Cancel -command "$this cancel" \
-    -state active -width 10
-
-  pack $itk_interior.dload -padx 5 -pady 5 -side top -fill x -expand yes
-  pack $itk_interior.stat -padx 5 -pady 5 -expand yes
-  pack $itk_interior.f -padx 5 -pady 5 -fill x -expand yes
-
-  pack $itk_interior.cancel -padx 5 -pady 5 -side bottom
-  ::update idletasks
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  update_download - update the download meters
-# ------------------------------------------------------------------
-itcl::body Download::update_download { sec num tot } {
-
-  # Loop through all the sections, marking each as either done or
-  # updating its meter. This will mark all previous sections prior to
-  # SEC as complete. 
-  foreach s $section(names) {
-    set i $section($s)
-
-    if {$s == $sec} {
-      set f [expr {$num / $bytes($i)}]
-      $itk_interior.f.meter$i configure -fraction $f
-      break
-    } else {
-      $itk_interior.f.meter$i configure -fraction 1.0
-    }
-  }
-
-  ::update
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  done - notification that the download is really complete
-# ------------------------------------------------------------------
-itcl::body Download::done { {msg ""} } {
-  bell
-
-  if {$msg == ""} {
-    # download finished
-    set secs [expr {[clock seconds] - $::download_start_time}]
-    if {$secs == 0} { incr secs }
-    $itk_interior.cancel config -state disabled
-    set bps [expr {8 * $total_bytes / $secs / 1000}]
-    $itk_interior.stat config -text "$total_bytes bytes in $secs seconds ($bps kbps)"
-    
-    # set all indicators to FULL
-    foreach sec $section(names) {
-      set i $section($sec)
-      $itk_interior.f.meter$i configure -fraction 1.0
-    }
-  } else {
-    # download failed
-    if {$msg != "CANCEL"} {
-      $itk_interior.stat config -text $msg
-    }
-  }
-  
-  # enable OK button
-  $itk_interior.cancel config -state active -text OK -command "delete object $this"
-  ::update
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  cancel - cancel the download
-# ------------------------------------------------------------------
-itcl::body Download::cancel {} {
-  debug "canceling the download"
-  set ::download_cancel_ok 1
-}
-
-# ------------------------------------------------------------------
-#  DESTRUCTOR - destroy window containing widget
-# ------------------------------------------------------------------
-itcl::body Download::destructor {} {
-  remove_hook download_progress_hook "$this update_download"
-}
-
-itcl::body Download::do_download_hooks {} {
-  set ::download_timer(ok) 1
-}
-
-itcl::body Download::download_hash { section num } {
-  global download_timer
-  debug "sec=$section num=$num tot=$total_bytes ok=$::download_cancel_ok"
-  ::update
-  # Only run the timer at discrete times...
-  if {[info exists download_timer(timer)]} {
-    after cancel $download_timer(timer)
-  }
-  
-  set download_timer(timer) [after 100 Download::do_download_hooks]
-  if {![info exists download_timer(ok)] || $download_timer(ok)} {
-    run_hooks download_progress_hook $section $num $total_bytes
-    ::update
-    unset download_timer(timer)
-    set download_timer(ok) 0
-  }
-  
-  return $::download_cancel_ok
-}
-
-# Download the executable. Return zero for success, and non-zero for error.
-itcl::body Download::download_it { } {
-  global gdb_exe_name gdb_downloading gdb_loaded
-  global gdb_target_name gdb_pretty_name
-  global gdb_running
-  global tcl_platform
-
-  debug "exe=$gdb_exe_name downloading=$gdb_downloading"
-  debug "    loaded=$gdb_loaded target=$gdb_target_name running=$gdb_running"
-
-  if {$gdb_downloading || $gdb_exe_name == ""} {
-    return 0
-  }
-
-  set gdb_downloading 1
-  set gdb_loaded 0
-  # Make sure the source window has had time to be created
-  ::update
-
-  gdbtk_busy
-
-  # Only places that load files should do set_exe
-  #set_exe
-  switch [set_target] {
-    ERROR {
-      # target command failed
-      set gdb_downloading 0
-      gdbtk_idle
-      return 0
-    }
-    CANCELED {
-      # command cancelled by user
-      set gdb_downloading 0
-      if {$gdb_running} {
-	# Run the idle hooks (free the UI)
-	gdbtk_update
-	gdbtk_idle
-      } else {
-	gdbtk_idle
-      }
-      return 1
-    }
-  }
-
-  if {[string compare $tcl_platform(platform) "windows"] == 0} {
-    set f [ide_cygwin_path to_win32 $gdb_exe_name]
-  } else {
-    set f $gdb_exe_name
-  }
-  if {! [file exists $f]} {
-    tk_messageBox -icon error -title GDB -type ok \
-      -message "Request to download non-existent executable $gdb_exe_name"
-    set gdb_downloading 0
-    gdbtk_idle
-    return 0
-  }
-
-  debug "downloading $gdb_exe_name"
-
-  set target $gdb_target_name
-
-  # get load info and total up number of bytes
-  if {[catch {gdb_load_info $gdb_exe_name} val]} {
-    set result "$gdb_exe_name: $val"
-    tk_dialog .load_warn "" "$result"  error 0 Ok
-    return 0
-  }
-  set i 0
-  set total_bytes 0
-  set section(names) {}
-  foreach x $val {
-    set s [lindex $x 0]
-    lappend section(names) $s
-    set section($s) $i
-    set b [lindex $x 1]
-    set bytes($i) [expr {double($b)}]
-    incr total_bytes $b
-    incr i
-  }
-  set num_sections $i
-
-  set ::download_cancel_ok 0
-  set ::download_start_time [clock seconds]
-
-  if {[pref getd gdb/load/$target-verbose] == "1"} {
-    # open a detailed download dialog window
-    set download_dialog [ManagedWin::open Download -transient -filename $gdb_exe_name]
-  } else {
-    # raise source windows
-    foreach src [ManagedWin::find SrcWin] {
-      $src reveal
-      $src toolbar downloading
-    }
-    set download_dialog ""
-  }
-
-  set download_error ""
-  debug "starting load"
-  ::update idletasks
-  if {[catch {gdb_cmd "load $gdb_exe_name"} errTxt]} {
-    debug "load returned $errTxt"
-    if {[regexp -nocase cancel $errTxt]} {
-      set download_error "CANCEL"
-    } else {
-      set download_error $errTxt
-    }
-    set ::download_cancel_ok 1
-  }
-
-  debug "Done loading"
-
-  set gdb_downloading 0
-  if {$::download_cancel_ok} {
-    set gdb_loaded 0
-    if {$download_dialog != ""} {
-      catch {$download_dialog done $download_error}
-    }
-  } else {
-    set gdb_loaded 1
-    if {$download_dialog != ""} {
-      catch {$download_dialog done}
-    }
-  }
-
-  foreach src [ManagedWin::find SrcWin] {
-    if {$download_error == "CANCEL"} {
-      $src download_progress CANCEL 1 1
-    } else {
-      $src download_progress DONE 0 $total_bytes $download_error
-    }
-  }
-
-  set ::download_cancel_ok 0
-  set download_dialog ""
-
-  gdbtk_idle
-  return 0
-}
diff --git a/gdb/gdbtk/library/download.ith b/gdb/gdbtk/library/download.ith
deleted file mode 100644
index f50c3fef3b5..00000000000
--- a/gdb/gdbtk/library/download.ith
+++ /dev/null
@@ -1,42 +0,0 @@
-# Download class definition for Insight
-# Copyright 1999, 2001 Red Hat, Inc.
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License (GPL) 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.
-
-
-itcl::class Download {
-  inherit ManagedWin
-  
-  protected {
-    common total_bytes
-    common section
-    common bytes
-    common num_sections
-    common num_steps 100
-
-    method _ignore_on_save {} { return 1 }
-    proc dont_remember_size {} { return 1}
-  }
-  public {
-    variable filename
-
-    method constructor {args} 
-    method destructor {}
-    method update_download { sec num tot }
-    method done { {msg ""} }
-    method cancel {}
-
-    proc download_it { }
-    proc do_download_hooks {}
-    proc download_hash { section num }
-    
-  }
-}
diff --git a/gdb/gdbtk/library/editor.tcl b/gdb/gdbtk/library/editor.tcl
deleted file mode 100644
index b569a31a430..00000000000
--- a/gdb/gdbtk/library/editor.tcl
+++ /dev/null
@@ -1,47 +0,0 @@
-# Editor
-# Copyright 2001 Red Hat, Inc.
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License (GPL) 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.
-
-# ----------------------------------------------------------------------
-# Implements a set of editor commands
-# ----------------------------------------------------------------------
-
-namespace eval Editor {
-  namespace export edit
-
-  proc edit {loc_info} {
-    global external_editor_command
-
-    if {[info exists external_editor_command]} {
-      if {[catch {uplevel \#0 "$external_editor_command edit $loc_info"} \
-	     err]} {
-	tk_dialog .warn-sn "Edit" $err error 0 Ok
-      }
-      return
-    }
-
-    lassign $loc_info baseName fnName fileName lineNum addr pc
-
-    set newCmd [pref get gdb/editor]
-    if {! [string compare $newCmd ""]} {
-      tk_dialog .warn "Edit" "No editor command specified" error 0 Ok
-    }
-
-    # Replace %s with file name and %d with line number.
-    regsub -all -- %s $newCmd $fileName newCmd
-    regsub -all -- %d $newCmd $lineNum newCmd
-
-    if {[catch "exec $newCmd &" err]} {
-      tk_dialog .warn "Edit" $err error 0 Ok
-    }
-  }
-}
diff --git a/gdb/gdbtk/library/ehandler.itb b/gdb/gdbtk/library/ehandler.itb
deleted file mode 100644
index e949c988317..00000000000
--- a/gdb/gdbtk/library/ehandler.itb
+++ /dev/null
@@ -1,31 +0,0 @@
-# GDBEventHandler class implementation for Insight.
-# Copyright 2001 Red Hat, Inc.
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License (GPL) 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.
-
-# ------------------------------------------------------------
-#  PUBLIC PROC:  dispatch - Dispatch the given event to all
-#                 event handlers. The name of the handler
-#                 method to call is stored in the event's
-#                 "handler" method.                  
-# ------------------------------------------------------------
-itcl::body GDBEventHandler::dispatch {event} {
-
-  set handler [$event handler]
-
-  # invoke event handlers
-  foreach w [itcl_info objects -isa GDBEventHandler] {
-    dbug I "posting event \"$handler\" to \"$w\""
-    if {[catch {$w $handler $event}]} {
-      dbug E "On $handler event, $w errored:\n$::errorInfo"
-    }
-  }
-}
diff --git a/gdb/gdbtk/library/ehandler.ith b/gdb/gdbtk/library/ehandler.ith
deleted file mode 100644
index 9eef9e12835..00000000000
--- a/gdb/gdbtk/library/ehandler.ith
+++ /dev/null
@@ -1,48 +0,0 @@
-# GDBEventHandler class definition for Insight.
-# Copyright 2001 Red Hat, Inc.
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License (GPL) 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.
-
-itcl::class GDBEventHandler {
-
-  constructor {args} {}
-  destructor {}
-
-  # Dispatching proc. ALL events should be funneled through this
-  # procedure.
-  public proc dispatch {event}
-
-  #
-  # Events
-  #
-
-  # See gdbevent.ith for descriptions of event
-  public {
-    # Breakpiont/tracepoint events
-    method breakpoint {event} {}
-    method tracepoint {event} {}
-
-    # Set variable
-    method set_variable {event} {}
-
-    # Busy event
-    method busy {event} {}
-
-    # Idle event
-    method idle {event} {}
-
-    # Update event
-    method update {event} {}
-
-    # Architecture changed event
-    method arch_changed {event} {}
-  }
-}
diff --git a/gdb/gdbtk/library/embeddedwin.ith b/gdb/gdbtk/library/embeddedwin.ith
deleted file mode 100644
index b1e54effd9c..00000000000
--- a/gdb/gdbtk/library/embeddedwin.ith
+++ /dev/null
@@ -1,25 +0,0 @@
-# EmbeddedWin class definition for GDBtk.
-# Copyright 1998, 1999, 2001 Red Hat
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License (GPL) 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.
-
-
-itcl::class EmbeddedWin {
-  inherit ManagedWin
-
-  constructor {args} {
-    debug "$args"
-  }
-  
-  destructor {
-    debug
-  }
-}
diff --git a/gdb/gdbtk/library/gdbevent.itb b/gdb/gdbtk/library/gdbevent.itb
deleted file mode 100644
index 12df232ab31..00000000000
--- a/gdb/gdbtk/library/gdbevent.itb
+++ /dev/null
@@ -1,205 +0,0 @@
-# GDB event class implementations for Insight.
-# Copyright 2001 Red Hat, Inc.
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License (GPL) 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.
-
-# ------------------------------------------------------------
-#  PUBLIC METHOD:  get - Retrieve data about the event
-# ------------------------------------------------------------
-itcl::body BreakpointEvent::get {what} {
-
-  switch $what {
-    action       { return $action }
-    number       { return $number }
-    file         { return $_file }
-    function     { return $_function }
-    line         { return $_line }
-    address      { return $_address }
-    type         { return $_type }
-    enabled      { return $_enabled }
-    disposition  { return $_disposition }
-    ignore_count { return $_ignore_count }
-    commands     { return $_commands }
-    condition    { return $_condition }
-    thread       { return $_thread }
-    hit_count    { return $_hit_count }
-    user_specification { return $_user_specification }
-
-    default { error "unknown event data \"$what\": should be: action|number|file|function|line|address|type|enabled|disposition|ignore_count|commands|condition|thread|hit_count|user_specification" }
-  }
-}
-
-# ------------------------------------------------------------
-#  PRIVATE METHOD:  _init - Initialize all private data
-# ------------------------------------------------------------
-itcl::body BreakpointEvent::_init {} {
-  if {[catch {gdb_get_breakpoint_info $number} bpinfo]} {
-    set _file         {}
-    set _function     {}
-    set _line         {}
-    set _address      {}
-    set _type         {}
-    set _enabled      {}
-    set _disposition  {}
-    set _ignore_count {}
-    set _commands     {}
-    set _condition    {}
-    set _thread       {}
-    set _hit_count    {}
-    set _user_specification {}
-  } else {
-    lassign $bpinfo \
-      _file         \
-      _function     \
-      _line         \
-      _address      \
-      _type         \
-      _enabled      \
-      _disposition  \
-      _ignore_count \
-      _commands     \
-      _condition    \
-      _thread       \
-      _hit_count    \
-      _user_specification
-  }
-}
-
-# When the breakpoint number for the event changes,
-# update the private data in the event.
-itcl::configbody BreakpointEvent::number {
-  _init
-}
-
-# ------------------------------------------------------------
-#  PUBLIC METHOD:  get - Retrieve data about the event
-# ------------------------------------------------------------
-itcl::body TracepointEvent::get {what} {
-
-  switch $what {
-    action     { return $action }
-    number     { return $number }
-    file       { return $_file }
-    function   { return $_function }
-    line       { return $_line }
-    address    { return $_address }
-    enabled    { return $_enabled }
-    pass_count { return $_pass_count }
-    step_count { return $_step_count }
-    thread     { return $_thread }
-    hit_count  { return $_hit_count }
-    actions    { return $_actions }
-
-    default { error "unknown event data \"$what\": should be: action|number|file|function|line|address|pass_count|step_count|thread|hit_count|actions" }
-  }
-}
-
-# ------------------------------------------------------------
-#  PRIVATE METHOD:  _init - Initialize all private data
-# ------------------------------------------------------------
-itcl::body TracepointEvent::_init {} {
-  if {[catch {gdb_get_tracepoint_info $number} tpinfo]} {
-    set _file         {}
-    set _function     {}
-    set _line         {}
-    set _address      {}
-    set _enabled      {}
-    set _pass_count   {}
-    set _step_count   {}
-    set _thread       {}
-    set _hit_count    {}
-    set _actions      {}
-  } else {
-    lassign $tpinfo \
-      _file         \
-      _function     \
-      _line         \
-      _address      \
-      _enabled      \
-      _pass_count   \
-      _step_count   \
-      _thread       \
-      _hit_count    \
-      _actions
-  }
-}
-
-# When the tracepoint number for the event changes,
-# update the private data in the event.
-itcl::configbody TracepointEvent::number {
-  _init
-}
-
-# ------------------------------------------------------------
-#  PUBLIC METHOD:  get - Retrieve data about the event
-# ------------------------------------------------------------
-itcl::body TracepointEvent::get {what} {
-
-  switch $what {
-    action     { return $action }
-    number     { return $number }
-    file       { return $_file }
-    function   { return $_function }
-    line       { return $_line }
-    address    { return $_address }
-    enabled    { return $_enabled }
-    pass_count { return $_pass_count }
-    step_count { return $_step_count }
-    thread     { return $_thread }
-    hit_count  { return $_hit_count }
-    actions    { return $_actions }
-
-    default { error "unknown event data \"$what\": should be: action|number|file|function|line|address|pass_count|step_count|thread|hit_count|actions" }
-  }
-}
-
-# ------------------------------------------------------------
-#  PUBLIC METHOD:  get - Retrieve data about the event
-# ------------------------------------------------------------
-itcl::body SetVariableEvent::get {what} {
-
-  switch $what {
-    variable { return $variable }
-    value    { return $value }
-
-    default { error "unknown event data \"$what\": should be: variable|value" }
-  }
-}
-
-# ------------------------------------------------------------
-#  CONSTRUCTOR: Create an UpdateEvent
-# ------------------------------------------------------------
-itcl::body UpdateEvent::constructor {args} {
-  if {[catch {gdb_loc} loc]} {
-    dbug E "could not get current location: $loc"
-  } else {
-    lassign $loc _compile_filename _function _full_filename \
-      _line _frame_pc _pc _shlib
-  }
-}
-
-# ------------------------------------------------------------
-#  PUBLIC METHOD:  get - Retrieve data about the event
-# ------------------------------------------------------------
-itcl::body UpdateEvent::get {what} {
-
-  switch $what {
-    compile_filename { return $_compile_filename }
-    full_filename    { return $_full_filename }
-    function         { return $_function }
-    line             { return $_line }
-    frame_pc         { return $_frame_pc }
-    pc               { return $_pc }
-    shlib            { return $_shlib }
-
-    default { error "unknown event data \"$what\": should be: variable|value" }
-  }
-}
diff --git a/gdb/gdbtk/library/gdbevent.ith b/gdb/gdbtk/library/gdbevent.ith
deleted file mode 100644
index a594ef54a2d..00000000000
--- a/gdb/gdbtk/library/gdbevent.ith
+++ /dev/null
@@ -1,220 +0,0 @@
-# GDBEvent class definitions for Insight.
-# Copyright 2001 Red Hat, Inc.
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License (GPL) 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.
-
-# For reasons unknown to me, I cannot put any of the constructors
-# in the implementation files. The very first instance of the class
-# will call the (empty) constructor in here instead of the one
-# defined in the implementation file. Sigh.
-
-itcl::class GDBEvent {
-  public method get {what} { return "" }
-  public method handler {} { return "unknown" }
-}
-
-# BREAKPOINT EVENT
-#
-# This event is created/dispatched whenever a breakpoint is created,
-# deleted, or modified.
-#
-# action ....... what type of BP event ("create", "delete", "modify")
-# number ....... gdb's internal token for the BP
-# file ......... filename in which event occurred
-# function ..... function in which event occurred
-# line ......... line number in file
-# address ...... address of BP
-# type ......... breakpoint type ("breakpoint", "hw breakpoint", "step resume", etc)
-# enabled ...... BP enabled?
-# disposition .. BP's disposition ("delete", "delstop", "disable", "donttouch")
-# ignore_count . BP's ignore count
-# commands ..... list of commands to run when BP hit
-# condition .... BP condition
-# thread ....... thread in which BP is set (or -1 for all threads) 
-# hit_count .... number of times BP has been hit
-# user_specification
-#             .. text the user initially used to set this breakpoint
-itcl::class BreakpointEvent {
-  inherit GDBEvent
-
-  public variable action {}
-  public variable number {}
-
-  #constructor {args} {}
-  constructor {args} {
-    eval configure $args
-
-    # If creating/modifying a breakpoint, then get
-    # all info about it and save it away.
-    _init
-  }
-  #destructor { dbug I "" }
-
-  public method get {what}
-  public method handler {} { return "breakpoint" }
-
-  private variable _file         {}
-  private variable _function     {}
-  private variable _line         {}
-  private variable _address      {}
-  private variable _type         {}
-  private variable _enabled      {}
-  private variable _disposition  {}
-  private variable _ignore_count {}
-  private variable _commands     {}
-  private variable _condition    {}
-  private variable _thread       {}
-  private variable _hit_count    {}
-  private variable _user_specification {}
-
-  private method _init {}
-}
-
-# TRACEPOINT EVENT
-#
-# This event is created/dispatched whenever a tracepoint is created,
-# deleted, or modified.
-#
-# action ....... what type of BP event ("create", "delete", "modify")
-# number ....... gdb's internal token for the BP
-# file ......... filename in which event occurred
-# function ..... function in which event occurred
-# line ......... line number in file
-# address ...... address of BP
-# enabled ...... BP enabled?
-# pass_count ...
-# step_count ...
-# thread ....... thread in which BP is set (or -1 for all threads) 
-# hit_count .... number of times BP has been hit
-# actions ...... a list of actions to be performed when the tracepoint is hit
-itcl::class TracepointEvent {
-  inherit GDBEvent
-
-  public variable action {}
-  public variable number {}
-
-  # For reasons unknown to me, I cannot put this in the implementation
-  # file. The very first instance of the class will call this empty
-  # constructor instead of the one defined in the implementation file.
-  #constructor {args} {}
-  constructor {args} {
-    eval configure $args
-
-    # If creating/modifying a tracepoint, then get
-    # all info about it and save it away.
-    _init
-  }
-  #destructor { dbug I "" }
-  public method get {what}
-  public method handler {} { return "tracepoint" }
-
-  private variable _file       {}
-  private variable _function   {}
-  private variable _line       {}
-  private variable _address    {}
-  private variable _enabled    {}
-  private variable _pass_count {}
-  private variable _step_count {}
-  private variable _thread     {}
-  private variable _hit_count  {}
-  private variable _actions    {}
-
-  private method _init {}
-}
-
-# SET VARIABLE EVENT
-#
-# This event is created/dispatched whenever a "set" command successfully
-# completes in gdb's command interpreter.
-#
-# variable ..... the variable that was changed
-# value ........ the variable's new value
-itcl::class SetVariableEvent {
-  inherit GDBEvent
-
-  public variable variable
-  public variable value
-
-  constructor {args} {
-    eval configure $args
-  }
-  #destructor { dbug I "" }
-  public method get {what}
-  public method handler {} { return "set_variable" }
-}
-
-# BUSY EVENT
-#
-# This event is created/dispatched whenever the GUI or GDB is "busy".
-# This could happen when the inferior is executing or when the GUI
-# is, for example, fetching memory from the target.
-
-itcl::class BusyEvent {
-  inherit GDBEvent
-
-  public method handler {} { return "busy" }
-}
-
-# IDLE EVENT
-#
-# This event is created/dispatched whenever the GUI and GDB is not
-# "busy". Receipt of this event means that the GUI should be put into
-# a state to accept input by the user.
-
-itcl::class IdleEvent {
-  inherit GDBEvent
-
-  public method handler {} { return "idle" }
-}
-
-# UPDATE EVENT
-#
-# This event is created/dispatched whenever the target's state
-# has changed. When an UpdateEvent is received, widgets should
-# update their contents to reflect the inferior's new state.
-#
-# Right now, this just holds the output of gdb_loc...
-#
-# compile_filename - Filename stored in the symtab
-# full_filename    - Full filename of file, if found in source search dir
-# function         - Function name
-# line             - Line number
-# frame_pc         - Frame's PC
-# pc               - Real stop PC
-# shlib            - Shared library stopped in
-#
-# FIXME: Should probably put frame_pc and pc into different
-# types of update events...
-itcl::class UpdateEvent {
-  inherit GDBEvent
-
-  constructor {args} {}
-  public method get {what}
-  public method handler {} { return "update" }
-
-  private variable _compile_filename {}
-  private variable _function         {}
-  private variable _full_filename    {}
-  private variable _line             {}
-  private variable _frame_pc         {}
-  private variable _pc               {}
-  private variable _shlib            {}
-}
-
-# ARCHITECTURE CHANGED EVENT
-#
-# This event is posted whenever the target architecture changes
-
-itcl::class ArchChangedEvent {
-  inherit GDBEvent
-
-  public method handler {} { return "arch_changed" }
-}
diff --git a/gdb/gdbtk/library/gdbmenubar.itcl b/gdb/gdbtk/library/gdbmenubar.itcl
deleted file mode 100644
index 0820cdc4853..00000000000
--- a/gdb/gdbtk/library/gdbmenubar.itcl
+++ /dev/null
@@ -1,315 +0,0 @@
-# GDBMenuBar
-# Copyright 2000 Red Hat, Inc.
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License (GPL) 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.
-
-# ----------------------------------------------------------------------
-# Implements a GDB menubar.
-#
-#   PUBLIC ATTRIBUTES:
-#
-#
-#   METHODS:
-#
-#     configure ....... used to change public attributes
-#
-#   PRIVATE METHODS
-#
-#   X11 OPTION DATABASE ATTRIBUTES
-#
-#
-# ----------------------------------------------------------------------
-
-itcl::class GDBMenuBar {
-  inherit itk::Widget
-
-  # ------------------------------------------------------------------
-  #  CONSTRUCTOR - create widget
-  # ------------------------------------------------------------------
-  constructor {args} {
-
-    set Menu [menu $itk_interior.m -tearoff 0]
-
-    eval itk_initialize $args
-  }
-
-  # ------------------------------------------------------------------
-  #  DESTRUCTOR - destroy window containing widget
-  # ------------------------------------------------------------------
-  destructor {
-
-    #destroy $this
-  }
-
-  # ------------------------------------------------------------------
-  #  METHOD:  show - attach menu to the toplevel window
-  # ------------------------------------------------------------------
-  public method show {} {
-      [winfo toplevel $itk_interior] configure -menu $Menu
-  }
-
-  # ------------------------------------------------------------------
-  #  METHOD:  set_class_state - standard method to control state by class
-  # ------------------------------------------------------------------
-  public method set_class_state {enable_list} {
-    debug "Enable list is: $enable_list"
-
-    foreach {type state} $enable_list {
-      # debug $type
-      if {[info exists menu_classes($type)]} {
-        set class_list $menu_classes($type)
-        if {[llength $class_list]} {
-          # debug "$type $state \{$class_list\}"
-          foreach menu $class_list {
-            # debug "$type $menu $state"
-            menubar_change_menu_state $menu $state
-          }
-        }
-      }
-    }
-  }
-
-  ####################################################################
-  # Methods that deal with menus.
-  #
-  # The next set of methods control the menubar associated with the
-  # toolbar.  Currently, only sequential addition of submenu's and menu
-  # entries is allowed.  Here's what you do.  First, create a submenu
-  # with the "new_menu" command.  This submenu is the targeted menu. 
-  # Subsequent calls to add_menu_separator, and add_menu_command add
-  # separators and commands to the end of this submenu.
-  # If you need to edit a submenu, call clear_menu and then add all the
-  # items again.
-  #
-  # Each menu command also has a class list.  Transitions between states
-  #  of gdb will enable and disable different classes of menus.
-  #
-  # FIXME - support insert_command, and also cascade menus, whenever
-  # we need it...
-  ####################################################################
-
-  # ------------------------------------------------------------------
-  #  METHOD:  add - Add something.
-  #                 It can be a menubutton for the main menu,
-  #                 a separator or a command.
-  #
-  #  type - what we want to add
-  #  args - arguments appropriate to what is being added
-  #
-  #  RETURNS: the cascade menu widget path.
-  # ------------------------------------------------------------------
-  method add {type args} {
-
-    switch $type {
-      menubutton {
-        eval menubar_new_menu $args
-      }
-      command {
-        eval menubar_add_menu_command $args
-      }
-      separator {
-        menubar_add_menu_separator
-      }
-      cascade {
-	eval menubar_add_cascade $args
-      }
-      default {
-        error "Invalid item type: $type"
-      }
-    }
-
-    return $current_menu
-  }
-
-  # ------------------------------------------------------------------
-  #  NAME:         private method GDBMenuBar::menubar_add_cascade
-  #  DESCRIPTION:  Create a new cascading menu in the current menu
-  #
-  #  ARGUMENTS:    menu_name - the name of the menu to be created
-  #                label     - label to be displayed for the menu
-  #                underline - which element to underline for shortcuts
-  #  RETURNS:      Nothing
-  # ------------------------------------------------------------------
-  private method menubar_add_cascade {menu_name label underline} {
-    set m [menu $current_menu.$menu_name -tearoff false]
-    $current_menu add cascade -menu $m -label $label \
-      -underline $underline
-    set current_menu $m
-  }
-
-  # ------------------------------------------------------------------
-  #  PRIVATE METHOD:  menubar_new_menu - Add a new menu to the main
-  #                      menu.
-  #                      Also target this menu for subsequent
-  #                      menubar_add_menu_command calls.
-  #
-  #  name - the token for the new menu
-  #  label - The label used for the label
-  #  underline - the index of the underlined character for this menu item.
-  #
-  # ------------------------------------------------------------------
-  private method menubar_new_menu {name label underline args} {
-
-    set current_menu $Menu.$name
-    $Menu add cascade -menu  $current_menu -label $label \
-      -underline $underline
-    eval menu $current_menu -tearoff 0 $args
-
-    # Save the index number of this menu. It is always the last one.
-    set menu_list($name) [$Menu index end]
-    set menu_list($name,label) $label
-    set item_number -1
-  }
-
-  # ------------------------------------------------------------------
-  #  PRIVATE METHOD:  menubar_add_menu_command - Adds a menu command item
-  #                   to the currently targeted submenu of the main menu.
-  #
-  #  class - The class of the command, used for disabling entries.
-  #  label - The text for the command.
-  #  command - The command for the menu entry
-  #  args  - Passed to the menu entry creation command (eval'ed) 
-  # ------------------------------------------------------------------
-  private method menubar_add_menu_command {class label command args} {
-
-    eval $current_menu add command -label \$label -command \$command \
-	  $args
-      
-    incr item_number
-
-    switch $class {
-      None {}
-      default {
-        foreach elem $class {
-	  lappend menu_classes($elem) [list $current_menu $item_number]
-	}
-      }
-    }
-  }
-
-  # ------------------------------------------------------------------
-  #  PRIVATE METHOD:  menubar_add_menu_separator - Adds a menu separator
-  #                   to the currently targeted submenu of the main menu.
-  # 
-  # ------------------------------------------------------------------
-  private method menubar_add_menu_separator {} {
-    incr item_number
-    $current_menu add separator
-  }
-
-  # ------------------------------------------------------------------
-  #  METHOD:  exists - Report whether a menu keyed by NAME exists.
-  # 
-  #  name - the token for the menu sought
-  #
-  #  RETURNS: 1 if the menu exists, 0 otherwise.
-  # ------------------------------------------------------------------
-  method exists {name} {
-    return [info exists menu_list($name)]
-
-  }
-
-  # ------------------------------------------------------------------
-  #  METHOD:  clear - Deletes the items from one of the
-  #                   main menu cascade menus. Also makes this menu
-  #                   the target menu.
-  # 
-  #  name - the token for the new menu
-  #
-  #  RETURNS: then item number of the menu, or "" if the menu is not found.
-  #
-  #  FIXME: Does not remove the deleted menus from their class lists.
-  # ------------------------------------------------------------------
-  method clear {name} {
-    if {[info exists menu_list($name)]} {
-      set current_menu [$Menu entrycget $menu_list($name) -menu]
-      $current_menu delete 0 end
-      set item_number -1
-      return $current_menu
-    } else {
-      return ""
-    }
-  }
-
-  # ------------------------------------------------------------------
-  #  METHOD:  delete - Deletes one of the main menu
-  #                    cascade menus. Also makes the previous menu the
-  #                    target menu.
-  # 
-  #  name - the token for the new menu
-  #
-  #  RETURNS: then item number of the menu, or "" if the menu is not found.
-  #
-  #  FIXME: Does not remove the deleted menus from their class lists.
-  # ------------------------------------------------------------------
-  method delete {name} {
-    if {[info exists menu_list($name)]} {
-      $Menu delete $menu_list($name,label)
-      set current_menu {}
-      unset menu_list($name,label)
-      unset menu_list($name)
-    }
-  }
-
-  # ------------------------------------------------------------------
-  # PRIVATE METHOD:  menubar_change_menu_state - Does the actual job of
-  #                  enabling menus...
-  #
-  # INPUT:  Pass normal or disabled for the state.
-  # ------------------------------------------------------------------
-  private method menubar_change_menu_state {menu state} {
-
-    [lindex $menu 0] entryconfigure [lindex $menu 1] -state $state
-  }
-
-  # ------------------------------------------------------------------
-  # METHOD:  menubar_set_current_menu - Change the current_menu pointer.
-  #          Returns the current value so it can be restored.
-  # ------------------------------------------------------------------
-  method menubar_set_current_menu {menup} {
-    set saved_menu $current_menu
-    set current_menu $menup
-    return $saved_menu
-  }
-
-  ####################################################################
-  #
-  #  PRIVATE DATA
-  #
-  ####################################################################
-
-  # This array holds the menu classes.  The key is the class name,
-  # and the value is the list of menus belonging to this class.
-  private variable menu_classes
-
-  # This array holds the pathname that corresponds to a menu name
-  private variable menu_list
-
-  private variable item_number -1
-  private variable current_menu {}
-
-  ####################################################################
-  #
-  #  PROTECTED DATA
-  #
-  ####################################################################
-
-  # The menu Tk widget
-  protected variable Menu
-
-  ####################################################################
-  #
-  #  PUBLIC DATA
-  #
-  ####################################################################
-
-  # None
-}
diff --git a/gdb/gdbtk/library/gdbtoolbar.itcl b/gdb/gdbtk/library/gdbtoolbar.itcl
deleted file mode 100644
index 1d3a78703a0..00000000000
--- a/gdb/gdbtk/library/gdbtoolbar.itcl
+++ /dev/null
@@ -1,396 +0,0 @@
-# GDBToolBar
-# Copyright 2000 Red Hat, Inc.
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License (GPL) 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.
-
-# ----------------------------------------------------------------------
-# Implements a toolbar.
-#
-#   PUBLIC ATTRIBUTES:
-#
-#
-#   METHODS:
-#
-#     configure ....... used to change public attributes
-#
-#   PRIVATE METHODS
-#
-#   X11 OPTION DATABASE ATTRIBUTES
-#
-#
-# ----------------------------------------------------------------------
-
-itcl::class GDBToolBar {
-  inherit itk::Widget
-
-  # ------------------------------------------------------------------
-  #  CONSTRUCTOR - create widget
-  # ------------------------------------------------------------------
-  constructor {args} {
-
-    # Make a subframe so that the menu can't accidentally conflict
-    # with a name created by some subclass.
-    set ButtonFrame [frame $itk_interior.t]
-
-    pack $ButtonFrame $itk_interior -fill both -expand true
-
-    eval itk_initialize $args
-  }
-
-  # ------------------------------------------------------------------
-  #  DESTRUCTOR - destroy window containing widget
-  # ------------------------------------------------------------------
-  destructor {
-
-    #destroy $this
-  }
-
-  # ------------------------------------------------------------------
-  #  METHOD:  show - show the toolbar
-  # ------------------------------------------------------------------
-  public method show {} {
-
-    if {[llength $button_list]} {
-      eval standard_toolbar $ButtonFrame $button_list
-    }
-  }
-
-  # ------------------------------------------------------------------
-  #  METHOD:  set_class_state - standard method to control state by class
-  # ------------------------------------------------------------------
-  public method set_class_state {enable_list} {
-    debug "Enable list is: $enable_list"
-
-    foreach {type state} $enable_list {
-      # debug $type
-      if {[info exists button_classes($type)]} {
-        set class_list $button_classes($type)
-        if {[llength $class_list]} {
-          # debug "$type $state \{$class_list\}"
-	  foreach button $class_list {
-            # debug "$type $button $state"
-	    itemconfigure $button -state $state
-	  }
-        }
-      }
-    }
-  }
-
-  ####################################################################
-  # Methods that deal with buttons.
-  ####################################################################
-
-  # ------------------------------------------------------------------
-  #  METHOD:  add - Add something.
-  #                 It can be a button a separator or a label.
-  #
-  #  type - what we want to add
-  #  args - arguments appropriate to what is being added
-  #
-  # ------------------------------------------------------------------
-  method add {type args} {
-
-    switch $type {
-      button {
-        eval toolbar_add_button $args
-      }
-      label {
-        eval toolbar_add_label $args
-      }
-      separator {
-        toolbar_add_button_separator
-      }
-      custom {
-        eval toolbar_add_custom $args
-      }
-      default {
-        error "Invalid item type: $type"
-      }
-    }
-  }
-
-  # ------------------------------------------------------------------
-  #  PRIVATE METHOD:  toolbar_add_button - Creates a button, and inserts
-  #                      it at the end of the button list.  Call this when
-  #                      the toolbar is being set up, but has not yet been
-  #                      made.
-  # ------------------------------------------------------------------
-  private method toolbar_add_button {name class command balloon args} {
-    
-    lappend button_list \
-            [eval _register_button 1 \$name \$class \$command \$balloon $args]
-    
-  }
-
-  # ------------------------------------------------------------------
-  #  PRIVATE METHOD:  toolbar_add_label - Create a label to be inserted
-  #                        in the toolbar.
-  # ------------------------------------------------------------------
-
-  private method toolbar_add_label {name text balloon args} {
-    set lname $ButtonFrame.$name
-    set Buttons($name) $lname
-    set Buttons($lname,align) $button_align
-    eval label $lname -text \$text $args
-    balloon register $lname $balloon
-    lappend button_list $lname    
-  }
-
-  # ------------------------------------------------------------------
-  #  PRIVATE METHOD:  toolbar_add_custom - Create a user defined widget
-  #                   to be inserted in the toolbar.
-  # ------------------------------------------------------------------
-
-  private method toolbar_add_custom {name createCmd balloon args} {
-    set wname $ButtonFrame.$name
-    set Buttons($name) $wname
-    set Buttons($wname,align) $button_align
-
-    eval $createCmd $wname $args
-    balloon register $wname $balloon
-
-    lappend button_list $wname
-  }
-
-  # ------------------------------------------------------------------
-  #  PRIVATE METHOD:  toolbar_add_button_separator - 
-  # ------------------------------------------------------------------
-
-  private method toolbar_add_button_separator {} {
-    lappend button_list -
-  }
- 
-  # ------------------------------------------------------------------
-  #  PRIVATE METHOD:  _register_button - Creates all the bookkeeping
-  #           for a button,  without actually inserting it in the toolbar.
-  #           If the button will not be immediately inserted (INS == 0),
-  #           sets its bindings and appearences to the same of a
-  #           standard_toolbar button.
-  # ------------------------------------------------------------------
-  private method _register_button {ins name class command balloon args} {
-    set bname $ButtonFrame.$name
-    set Buttons($name) $bname
-    set Buttons($bname,align) $button_align
-
-    eval button $bname -command \$command $args
-    balloon register $bname $balloon
-    foreach elem $class {
-      switch $elem {
-	None {}
-	default { 
-	  lappend button_classes($elem) $name
-	}
-      }
-    }
-
-   # If the button is not going to be inserted now...
-   if {! $ins} {
-     # This is a bit of a hack, but I need to bind the standard_toolbar bindings
-     # and appearances to these externally, since I am not inserting them in 
-     # the original toolbar...
-     # FIXME:  Have to add a method to the libgui toolbar to do this.
-
-     # Make sure the button acts the way we want, not the default Tk way.
-     $bname configure -takefocus 0 -highlightthickness 0 \
-                      -relief flat -borderwidth 1	
-     set index [lsearch -exact [bindtags $bname] Button]
-     bindtags $bname [lreplace [bindtags $bname] $index $index ToolbarButton]
-    }
-
-    return $bname
-  }
- 
-  # ------------------------------------------------------------------
-  #  METHOD:  create - Creates all the bookkeeping for a button,
-  #           without actually inserting it in the toolbar.
-  # ------------------------------------------------------------------
-  method create {name class command balloon args} {
-
-    return [eval _register_button 0 \$name \$class \$command \$balloon $args]
-  }
-
-  # ------------------------------------------------------------------
-  #  METHOD:  itemconfigure - 
-  # ------------------------------------------------------------------
-  
-  method itemconfigure {button args} {
-    eval $Buttons($button) configure $args
-  }
-
-  # ------------------------------------------------------------------
-  #  METHOD:  itembind - 
-  # ------------------------------------------------------------------
-  
-  method itembind {button key cmd} {
-    eval [list bind $Buttons($button) $key $cmd]
-  }
-
-  # ------------------------------------------------------------------
-  #  METHOD:  itemballoon - 
-  # ------------------------------------------------------------------
-  
-  method itemballoon {button text} {
-    eval [list balloon register $Buttons($button) $text]
-  }
-
-  # ------------------------------------------------------------------
-  #  PRIVATE METHOD:  toolbar_insert_button - Inserts button "name" before
-  #           button "before".
-  #           The toolbar must be made, and the buttons must have been
-  #           created before you run this.
-  # ------------------------------------------------------------------
-  private method toolbar_insert_button {name before} {
-
-    if {[string first "-" $name] == 0} {
-      set name [string range $name 1 end]
-      set add_sep 1
-    } else {
-      set add_sep 0
-    }
-
-    if {![info exists Buttons($name)] || ![info exists Buttons($before)]} {
-      error "toolbar_insert_buttons called with non-existant button"
-    }
-
-    set before_col [gridCGet $Buttons($before) -column]
-    set before_row [gridCGet $Buttons($before) -row]
-
-    set slaves [grid slaves $ButtonFrame]
-
-    set incr [expr 1 + $add_sep]
-    foreach slave $slaves {
-      set slave_col [gridCGet $slave -column]
-      if {$slave_col >= $before_col} {
-	grid configure $slave -column [expr $slave_col + $incr]
-      }
-    }
-    if {$add_sep} {
-      grid $Buttons(-$name) -column $before_col -row $before_row
-    }
-
-    # Now grid our button.  Have to put in the pady since this button
-    # may not have been originally inserted by the libgui toolbar
-    # proc.
-
-    grid $Buttons($name) -column [expr $before_col + $add_sep] \
-      -row $before_row -pady 2
-    
-  }
-
-  # ------------------------------------------------------------------
-  #  PRIVATE METHOD:  toolbar_remove_button -
-  # ------------------------------------------------------------------
-
-  private method toolbar_remove_button {name} {
-
-    if {[string first "-" $name] == 0} {
-      set name [string range $name 1 end]
-      set remove_sep 1
-    } else {
-      set remove_sep 0
-    }
-
-    if {![info exists Buttons($name)] } {
-      error "toolbar_remove_buttons called with non-existant button $name"
-    }
-
-    set name_col [gridCGet $Buttons($name) -column]
-    set name_row [gridCGet $Buttons($name) -row]
-    
-    grid remove $Buttons($name)
-    if {$remove_sep} {
-      set Buttons(-$name) [grid slaves $ButtonFrame \
-			     -column [expr $name_col - 1] \
-			    -row $name_row]
-      grid remove $Buttons(-$name)
-    }
-
-    set slaves [grid slaves $ButtonFrame -row $name_row]
-    foreach slave $slaves {
-      set slave_col [gridCGet $slave -column]
-      if {($slave_col > $name_col)
-          && ! ([info exists Buttons($slave,align)]
-              && $Buttons($slave,align) == "right")} {
-	grid configure $slave -column [expr $slave_col - 1 - $remove_sep]
-      }
-    }    
-  }
-
-  # ------------------------------------------------------------------
-  #  METHOD:  toolbar_button_right_justify - 
-  # ------------------------------------------------------------------
-  
-  method toolbar_button_right_justify {} {
-    lappend button_list --
-    set button_align "right"
-  }
-
-  # ------------------------------------------------------------------
-  #  METHOD:  toolbar_swap_button_lists - 
-  # ------------------------------------------------------------------
-
-  method toolbar_swap_button_lists {in_list out_list} {
-    # Now swap out the buttons...
-    set first_out [lindex $out_list 0]
-    if {[info exists Buttons($first_out)] && [grid info $Buttons($first_out)] != ""} {
-      foreach button $in_list {
-	toolbar_insert_button $button $first_out
-      }
-      foreach button $out_list {
-	toolbar_remove_button $button
-      }
-    } elseif {[info exists Buttons($first_out)]} {
-      debug "Error in swap_button_list - $first_out not gridded..."
-    } else {
-      debug "Button $first_out is not in button list"
-    }
-  }
-
-  ####################################################################
-  #
-  #  PRIVATE DATA
-  #
-  ####################################################################
-
-  # This is the list of buttons that are being built up
-  #
-  private variable button_list {}
-
-  # This is an array of buttons names -> Tk Window names
-  # and also of Tk Window names -> column position in grid
-  private variable Buttons
-
-  # This array holds the button classes.  The key is the class name,
-  # and the value is the list of buttons belonging to this class.
-  private variable button_classes
-
-  # Tell if we are inserting buttons left or right justified
-  private variable button_align "left"
-
-  #The frame to contain the buttons:
-  private variable ButtonFrame
-
-  ####################################################################
-  #
-  #  PROTECTED DATA
-  #
-  ####################################################################
-
-  # None.
-
-  ####################################################################
-  #
-  #  PUBLIC DATA
-  #
-  ####################################################################
-
-  # None.
-}
diff --git a/gdb/gdbtk/library/gdbwin.ith b/gdb/gdbtk/library/gdbwin.ith
deleted file mode 100644
index 661578d1946..00000000000
--- a/gdb/gdbtk/library/gdbwin.ith
+++ /dev/null
@@ -1,25 +0,0 @@
-# GDBwin class definition for Insight.
-# Copyright 1998, 1999, 2001 Red Hat, Inc.
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License (GPL) 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.
-
-
-itcl::class GDBWin {
-  inherit GDBEventHandler
-
- constructor {args} {
-    debug "$args"
-  }
-
-  destructor {
-    debug
-  }
-}
diff --git a/gdb/gdbtk/library/globalpref.itb b/gdb/gdbtk/library/globalpref.itb
deleted file mode 100644
index af727e33c23..00000000000
--- a/gdb/gdbtk/library/globalpref.itb
+++ /dev/null
@@ -1,476 +0,0 @@
-# Global preference class implementation for Insight.
-# Copyright 1997, 1998, 1999, 2002, 2003 Red Hat
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License (GPL) 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.
-
-
-# ----------------------------------------------------------------------
-# Implements Global preferences dialog
-#
-# ----------------------------------------------------------------------
-
-# ------------------------------------------------------------------
-#  METHOD:  _init - set up the tracing labels info
-# ------------------------------------------------------------------
-itcl::body GlobalPref::_init {} {
-  if {$inited} {
-    return
-  }
-  
-  set inited 1
-  
-  array set tracing_labels {
-    0 "Tracing features disabled"
-    1 "Tracing features enabled"
-    max_len 0
-  }
-  
-  foreach elem [array names tracing_labels] {
-    set len [string length $tracing_labels($elem)]
-    set tracing_labels(max_len) \
-      [expr $len > $tracing_labels(max_len) ? $len : $tracing_labels(max_len) ]
-  }
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  init_var - initialize preference variables
-# ------------------------------------------------------------------
-itcl::body GlobalPref::_init_var {} {
-  set vlist {gdb/ImageDir gdb/console/wrap gdb/mode gdb/use_icons gdb/compat}
-
-  foreach var $vlist {
-    set _saved($var) [pref get $var]
-    set _new($var) $_saved($var)
-  }
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  constructor - create the Global Preferences object
-# ------------------------------------------------------------------
-itcl::body GlobalPref::constructor {args} {    
-  window_name "Global Preferences"
-  _init
-  _init_var
-  _build_win
-  eval itk_initialize $args
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  destructor - destroy the Global Preferences object
-# ------------------------------------------------------------------
-itcl::body GlobalPref::destructor {} {
-  foreach thunk $_fonts {
-    font delete test-$thunk-font
-  }
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  _build_win - build the dialog
-# ------------------------------------------------------------------
-itcl::body GlobalPref::_build_win {} {
-  global tcl_platform GDBTK_LIBRARY
-  debug
-  frame $itk_interior.f
-  frame $itk_interior.x
-  set frame $itk_interior.f
-  
-  # Icons
-  frame $frame.icons
-  label $frame.icons.lab -text "Icons "
-  combobox::combobox $frame.icons.cb -editable 0 -maxheight 10\
-    -command [code $this _change_icons] -bg $::Colors(textbg)
-  
-  # get list of icon directories
-  set curdir [pwd]
-  set _icondirlist ""
-  cd $GDBTK_LIBRARY
-  foreach foo [glob -- *] {
-    if {[file isdirectory $foo] && [file exists [file join $foo "icons.txt"]]} {
-      lappend _icondirlist $foo
-    }
-  }
-
-  set width 14
-  # load combobox
-  foreach dir $_icondirlist {
-    if {![string compare $dir $_saved(gdb/ImageDir)]} {
-      set cdir 1
-    } else {
-      set cdir 0
-    }
-    set foo [file join $dir "icons.txt"]
-    if {[catch {::open $foo r} fid]} {
-      # failed
-      dbug E "couldn't open $foo:$fid"
-      if {$cdir} {$frame.icons.cb entryset "unknown icons"}
-      $frame.icons.cb list insert end "unknown icons"
-    } else {
-      if {[gets $fid txt] >= 0} {
-	if {$cdir} {$frame.icons.cb entryset $txt}
-	if {[string length $txt] > $width} {set width [string length $txt]}
-	$frame.icons.cb list insert end $txt
-      } else {
-	if {$cdir} {$frame.icons.cb entryset "unknown icons"}
-	$frame.icons.cb list insert end "unknown icons"
-      }
-      close $fid
-    }
-  }
-  $frame.icons.cb configure -width $width
-  cd $curdir
-
-  # searching for fixed font families take a long time
-  # therefore, we cache the font names.  The font cache
-  # can be saved in the init file. A way should be provided
-  # to rescan the font list, without deleting the entry from the
-  # init file.
-  set font_cache [pref get gdb/font_cache]
-
-  # get list of fonts, removing some that typically
-  # are not useful or cause tk problems
-  set fam [lremove [font families] "open look glyph"]
-  set fam [lremove $fam "open look cursor"]
-  set fam [lremove $fam "song ti"]
-  set fam [lremove $fam "clearlyu"]
-  set fam [lremove $fam "clearlyu alternate glyphs"]
-  set fam [lremove $fam "clearlyu arabic extra"]
-  set fam [lremove $fam "clearlyu ligature"]
-  set fam [lremove $fam "clearlyu pua"]
-  set fam [lremove $fam "fangsong ti"]
-  set fam [lremove $fam "newspaper"]
-  set fam [lremove $fam "palatino linotype"]
-  set fam [lsort $fam]
-  
-  if {$font_cache == ""} {
-    if {$tcl_platform(platform) == "unix"} {
-      toplevel .c
-      wm title .c "Scanning for fonts"
-      message .c.m -width 3i -text "Scanning system for fonts\n\nPlease wait..." \
-	-relief flat -padx 30 -pady 30 \
-	-bg [pref get gdb/global_prefs/message_bg] \
-	-fg [pref get gdb/global_prefs/message_fg]
-      ::update
-      pack .c.m
-      focus .c
-      ::raise .c
-      ::update
-    }
-
-    foreach fn $fam {
-      if {[font metrics [list $fn] -fixed] == 1} {
-	lappend font_cache $fn
-      }
-    }
-    pref set gdb/font_cache $font_cache
-    if {[winfo exists .c]} { destroy .c }
-  }
-  
-  Labelledframe $frame.d -text "Fonts"
-  set f [$frame.d get_frame]
-
-  _make_font_item $f fixed "Fixed Font:" $font_cache
-
-  if {$tcl_platform(platform) != "windows"} {
-    # Cannot change the windows menu font ourselves
-    _make_font_item $f menu "Menu Font:" $fam
-  }
-
-  _make_font_item $f default "Default Font:" $fam
-  _make_font_item $f status  "Status Bar Font:" $fam
-
-
-  iwidgets::Labeledframe $frame.misc -labelpos nw -labeltext "Misc"
-  set f [$frame.misc childsite]
-
-  # This is the tracing preference
-  set tracing_cb [pref get gdb/mode]
-  if { ![info exists tracing_labels($tracing_cb)]} {
-    dbug E "Got unknown mode value: $tracing_cb"
-    set tracing_labels($tracing_cb) "Unknown gdb mode..."
-  }
-
-  checkbutton $f.tracing -variable [scope _new(gdb/mode)] \
-    -text $tracing_labels($tracing_cb) \
-    -command [code $this _toggle_tracing $f.tracing] \
-    -width $tracing_labels(max_len) -anchor w
-
-  # use_icons
-  if {$tcl_platform(platform) == "unix"} {
-    checkbutton $f.use_icons  \
-      -text "Use builtin image as icon." -variable [scope _new(gdb/use_icons)]
-  }
-
-  # console wrap
-  checkbutton $f.consolewrap -text "wrap text in console window" \
-    -variable [scope _new(gdb/console/wrap)]
-
-  grid $f.tracing -sticky w -padx 5 -pady 5
-
-  if {$tcl_platform(platform) == "unix"} {
-    grid $f.use_icons -sticky w -padx 5 -pady 5
-  }
-  grid $f.consolewrap -sticky w -padx 5 -pady 5
-
-  if {$tcl_platform(platform) == "unix"} {
-    # Compatibility frame
-    iwidgets::Labeledframe $frame.compat -labelpos nw -labeltext "OS Compatibility"
-    set fc [$frame.compat childsite]
-    radiobutton $fc.0 -text "GNOME" -value "GNOME" -variable [scope _new(gdb/compat)]
-    radiobutton $fc.1 -text "KDE" -value "KDE" -variable [scope _new(gdb/compat)]
-    radiobutton $fc.2 -text "default" -value "default" -variable [scope _new(gdb/compat)]
-    grid $fc.0 -sticky w -padx 5 -pady 5
-    grid $fc.1 -sticky w -padx 5 -pady 5
-    grid $fc.2 -sticky w -padx 5 -pady 5
-    grid [label $fc.warn -text "Restart required for all\nchanges to take effect"] -sticky w
-  }
-
-  # pack it all
-  pack $frame.icons.lab $frame.icons.cb -side left
-  grid $frame.icons x -sticky w -pady 10
-  grid $frame.d -columnspan 2 -sticky w
-  if {$tcl_platform(platform) == "unix"} {
-    grid $frame.compat $frame.misc -sticky we
-  } else {
-    grid $frame.misc x -sticky we
-  }
-
-  # make buttons
-  button $itk_interior.x.ok -text OK -underline 0 -width 7 -command [code $this _ok]
-  button $itk_interior.x.apply -text Apply -width 7 -underline 0 -command [code $this _apply]
-  button $itk_interior.x.cancel -text Cancel -width 7 -underline 0 -command [code $this _cancel]
-  pack $itk_interior.x.ok $itk_interior.x.apply $itk_interior.x.cancel -side left
-  standard_button_box $itk_interior.x
-
-  pack $itk_interior.x -fill x -padx 5 -pady 5 -side bottom
-  pack $itk_interior.f -fill both -expand yes -padx 5 -pady 5
-
-  bind $itk_interior.x.ok <Return> \
-    "$itk_interior.x.ok flash; $itk_interior.x.ok invoke"
-  focus $itk_interior.x.ok
-
-  # We don't want the window flashing around as we change the fonts...
-
-  ::update idletasks
-
-  _resize_font_item_height
-  pack propagate $itk_interior.f 0
-
-}
-# ------------------------------------------------------------------
-#  PRIVATE METHOD:  _make_font_item
-# ------------------------------------------------------------------
-itcl::body GlobalPref::_make_font_item {f name label font_list} {
-  
-  # create ComboBox with font name
-  lappend _fonts $name
-  
-  set _original($name,family) [font actual global/$name -family]
-  set _original($name,size) [font actual global/$name -size]
-  font create test-$name-font -family $_original($name,family) \
-    -size $_original($name,size)
-  label $f.${name}x -text $label
-
-  combobox::combobox $f.${name}n -editable 0 -value $_original($name,family) \
-    -command [code $this _change_font $name] -bg $::Colors(textbg)
-
-  foreach a $font_list {
-    $f.${name}n list insert end $a
-  }
-  
-  itk_component add $name-size {
-    iwidgets::spinint $f.${name}s -labeltext "Size:" -range {6 18} -step 1 \
-      -fixed 2 -width 2 -textvariable [scope _size($name)] -wrap 0 \
-      -increment [code $this _change_size up $name] \
-      -decrement [code $this _change_size down $name] \
-      -textbackground $::Colors(textbg)
-  } {}
-  label $f.${name}l -text ABCDEFabcdef0123456789 -font test-$name-font
-  set _size($name) $_original($name,size)
-
-  grid $f.${name}x $f.${name}n $f.${name}s $f.${name}l -sticky we -padx 5 -pady 5
-  grid columnconfigure $f 3 -weight 1
-}
-
-# ------------------------------------------------------------------
-#  PRIVATE METHOD:  _resize_font_item_height
-# ------------------------------------------------------------------
-itcl::body GlobalPref::_resize_font_item_height {} {
-  foreach font $_fonts {
-    set master [$itk_interior.f.d get_frame]
-    set row [gridCGet $master.${font}l -row]
-    grid rowconfigure $master $row -minsize [lindex [grid bbox $master 0 $row 3 $row ] 3]
-  } 
-}
-
-# ------------------------------------------------------------------
-#  PRIVATE METHOD:  _change_icons
-# ------------------------------------------------------------------
-itcl::body GlobalPref::_change_icons {w args} {
-  set index [$w curselection]
-  if {$index != ""} {
-    set _new(gdb/ImageDir) [lindex $_icondirlist $index]
-  }
-}
-
-# ------------------------------------------------------------------
-#  NAME:         private method GlobalPref::_change_font
-#  DESCRIPTION:  Change the given font's family
-#
-#  ARGUMENTS:
-#                font           - the font whose family is to be
-#                                 changed
-#                stupid         - the comobox widget which changed
-#                implementation - the new value of the combobox
-#  RETURNS:      Nothing
-#
-#  NOTES:        The combobox has a really non-standard callback
-#                mechanism: it always adds two args to the callback.
-# ------------------------------------------------------------------
-itcl::body GlobalPref::_change_font {font stupid implementation} {
-  font configure test-$font-font -family $implementation
-}
-
-# ------------------------------------------------------------------
-#  NAME:         private method GlobalPref::_change_size
-#  DESCRIPTION:  Change the given font's size
-#
-#  ARGUMENTS:
-#                direction  - the direction of the change (up/down)
-#                font       - the font that is changing
-#  RETURNS:      Nothing
-#
-#  NOTES:        See comments for purpose of "direction". Sigh.
-# ------------------------------------------------------------------
-itcl::body GlobalPref::_change_size {direction font} {
-
-  # Almost as stupid as the comobox, the iwidgets::spinint class
-  # will not treat its -increment and -decrement commands
-  # as command callbacks. Instead it OVERRIDES all behavior.
-  # Thus, we need to call the stupid spinint's callback.
-  $itk_component($font-size) $direction
-  font configure test-$font-font -size $_size($font)
-}
-
-
-itcl::body GlobalPref::_toggle_tracing {win} {
-  debug
-  $win configure -text $tracing_labels($_new(gdb/mode))
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  _ok - called to accept settings and close dialog
-# ------------------------------------------------------------------
-itcl::body GlobalPref::_ok {} {
-  _apply 1
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  _apply - apply current settings to the screen
-# ------------------------------------------------------------------
-itcl::body GlobalPref::_apply {{deleteMe 0}} {
-  debug
-  set changed_something 0
-
-  # If you are not destroying the window, then make sure to
-  # propagate the geometry info from the font frame, so that changing 
-  # the fonts IN the window don't cause some of the buttons to 
-  # get obscured...
-
-  if {!$deleteMe} {
-    pack propagate $itk_interior.f 1
-  }
-
-  foreach thunk $_fonts {
-    set font [font configure test-$thunk-font]
-    if {[pref get global/font/$thunk] != $font} {
-      pref set global/font/$thunk $font
-    }
-  }
-
-  foreach var [array names _new] {
-    if {$_new($var) != [pref get $var]} {
-      debug "$var = $_new($var)"
-
-      if {$var == "gdb/mode"} { 
-	if {!$_new(gdb/mode)} { pref set gdb/B1_behavior 1 }
-      } elseif {$var == "gdb/ImageDir"} {
-	set ::gdb_ImageDir [file join $::GDBTK_LIBRARY $_new($var)]
-      }
-      pref set $var $_new($var)
-      set changed_something 1
-    }
-  }
-
-  if {$changed_something} {
-    if {$deleteMe} { unpost }
-    ManagedWin::restart
-    return
-  }
-  if {$deleteMe} { 
-    unpost 
-  } else {
-    after idle " 
-      update idletasks
-      [code $this _resize_font_item_height]
-      pack propagate $itk_interior.f 0
-    "
-  }    
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  _cancel - forget current settings -- reset to original
-#                    state and close preferences
-# ------------------------------------------------------------------
-itcl::body GlobalPref::_cancel {} {
-  debug
-  set changed_something 0
-
-  # Reset fonts if different
-  foreach thunk $_fonts {
-    set family [font configure global/$thunk -family]
-    set size   [font configure global/$thunk -size]
-    if {$_original($thunk,family) != $family || $_original($thunk,size) != $size} {
-      pref set global/font/$thunk \
-	[list -family $_original($thunk,family) -size $_original($thunk,size)]
-      set changed_something 1
-    }
-  }
-
-  foreach var [array names _saved] {
-    if {$_saved($var) != [pref get $var]} {
-      debug "$var = $_saved($var)"
-
-      if {$var == "gdb/mode"} { 
-	if {!$_saved(gdb/mode)} { pref set gdb/B1_behavior 1 }
-      } elseif {$var == "gdb/ImageDir"} {
-	set ::gdb_ImageDir [file join $::GDBTK_LIBRARY $_saved($var)]
-      }
-      pref set $var $_saved($var)
-      set changed_something 1
-    }
-  }
-
-  if {$changed_something} {
-    ManagedWin::restart
-  }
-  unpost
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  cancel - override modal dialog cancel method.
-#                    The cancel method is actually called when
-#		     the window is closed. Name needs fixed.
-# ------------------------------------------------------------------
-itcl::body GlobalPref::cancel {} {
-  # when the window is closed, we want the preferences selected to
-  # be applied.
-  _apply 1
-}
diff --git a/gdb/gdbtk/library/globalpref.ith b/gdb/gdbtk/library/globalpref.ith
deleted file mode 100644
index d002c2392c8..00000000000
--- a/gdb/gdbtk/library/globalpref.ith
+++ /dev/null
@@ -1,47 +0,0 @@
-# Global preference class definition for GDBtk.
-# Copyright 1998, 1999 Cygnus Solutions
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License (GPL) 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.
-
-
-itcl::class GlobalPref {
-  inherit ManagedWin ModalDialog
-
-  private {
-    variable _new
-    variable _saved
-    variable _icondirlist ""
-    variable _original	;# Original font settings
-    variable _size      ;# Array tracking spinint values
-    variable _fonts	;# List of all available fonts for editing
-    common tracing_labels
-    common inited 0
-
-    method _init {}
-    method _init_var {}
-    method _build_win {}
-    method _make_font_item {f name label font_list}
-    method _resize_font_item_height {}
-    method _change_icons {w args}
-    method _change_font {font stupid implementation}
-    method _change_size {direction font}
-    method _ok {}
-    method _apply {{deleteMe 0}}
-    method _cancel {}
-    method cancel {}
-    method _toggle_tracing {win}
-  }
-
-  public {
-    method constructor {args}
-    method destructor {}
-  }
-}
diff --git a/gdb/gdbtk/library/help/breakpoint.html b/gdb/gdbtk/library/help/breakpoint.html
deleted file mode 100644
index 443237a6970..00000000000
--- a/gdb/gdbtk/library/help/breakpoint.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-<HEAD>
-   <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-   <META NAME="GENERATOR" CONTENT="Mozilla/4.06 [en] (X11; I; Linux 2.0.35 i686) [Netscape]">
-   <TITLE>Breakpoint Window Help</TITLE>
-</HEAD>
-<BODY>
-
-<H1>The Breakpoint Window</H1>
-The Breakpoint Window lists all the various breakpoints that exist in the
-program. It facilitates modifying breakpoints (make them temporary or normal,
-disabled or enabled) and removing breakpoints.
-<UL>
-<LI><A HREF="#menus_bp">Breakpoint Menu</A></LI>
-<LI><A HREF="#menus_global">Global Menu</A></LI>
-<LI><A HREF="#display">Breakpoint Display</A></LI>
-</UL>
-
-<HR SIZE=4 WIDTH="100%">
-
-<H2>
-<A NAME="menus_bp"></A>Breakpoint Menu</H2>
-The Breakpoint Menu operates on the selected breakpoint only.&nbsp; If
-no breakpoint is selected the menu items will be disabled. The type and
-state of a breakpoint may be changed by selecting the desired type or state
-from the menu.
-<DL>
-<DT>Normal</DT>
-<DD>The selected breakpoint is a normal breakpoint</DD>
-<DT>Temporary</DT>
-<DD>Indicates that the breakpoint is temporary</DD>
-<DT>Enabled</DT>
-<DD>The breakpoint is active and will stop the debugger when it is hit.</DD>
-<DT>Disabled</DT>
-<DD>The breakpoint is being ignored. A disabled breakpoint will never get hit.</DD>
-<DT>Remove</DT>
-<DD>Deletes the breakpoint</DD>
-</DL>
-
-<HR SIZE=4 WIDTH="100%">
-<H2>
-<A NAME="menus_global"></A>Global Menu</H2>
-Items on the Global Menu affect all defined breakpoints. Users may:
-<DL>
-<DT>Show Threads</DT>
-<DD>Toggle on/off the thread column</DD>
-<DT>Enable All</DT>
-<DD>Enable all breakpoints</DD>
-<DT>Disable All</DT>
-<DD>Disable all breakpoints</DD>
-<DT>Remove All</DT>
-<DD>Delete all breakpoints</DD>
-</DL>
-
-<HR SIZE=4 WIDTH="100%">
-
-<H2><A NAME="display"></A>Breakpoint Display</H2>
-The Breakpoint Display is a table of breakpoints. The first column of the
-table (unlabeled) shows a checkbutton, indicating whether the breakpoint
-is enabled (checked) or disabled (unchecked). Disabled breakpoints are
-ignored and will not cause the program to stop.
-<P>To use the Breakpoint Menu or the Breakpoint Pop-up Menu, first use
-the left mouse button to select a breakpoint from the list, then make the
-menu selection.
-
-<H4>Modifying Breakpoints</H4>
-To&nbsp;<A NAME="display_state"></A>enable a breakpoint, simply click the
-checkbutton in the first column of the desired breakpoint so that it is
-selected (checked). To disable a breakpoint, "uncheck" the checkbutton.
-<P>To change a breakpoint's&nbsp;<A NAME="display_temp"></A>type, select
-the desired type from either the Breakpoint Menu or the Breakpoint Pop-up
-Menu.
-<P>To remove a&nbsp;<A NAME="display_remove"></A>breakpoint, use the left
-mouse button to select the breakpoint to remove and use either the Breakpoint
-Menu or the Breakpoint Pop-up Menu to select "remove". To re-install a
-breakpoint, use the <A HREF="source.html#setting_a_breakpoint">Source Window
-Display</A>.
-
-<H4><A NAME="display_popup"></A>Breakpoint Pop-up Menu</H4>
-The Breakpoint Pop-up Menu is accessed by using the mouse cursor to select
-a breakpoint from the Breakpoint Display and then clicking the right button
-on the mouse. The Pop-up allows expert users quicker access to the functions
-of the Breakpoint Menu:
-<DL>
-<DT>Normal</DT>
-<DD>The selected breakpoint is a normal breakpoint</DD>
-<DT>Temporary</DT>
-<DD>Indicates that the breakpoint is temporary</DD>
-<DT>Enabled</DT>
-<DD>The breakpoint is active and will stop the debugger when it is hit.</DD>
-<DT>Disabled</DT>
-<DD>The breakpoint is being ignored. A disabled breakpoint will never get hit.</DD>
-<DT>Remove</DT>
-<DD>Deletes the breakpoint</DD>
-<DT>Global, Show Threads</DT>
-<DD>Toggle on/off the thread column</DD>
-<DT>Global, Enable All</DT>
-<DD>Enable all breakpoints</DD>
-<DT>Global, Disable All</DT>
-<DD>Disable all breakpoints</DD>
-<DT>Global, Remove All</DT>
-<DD>Delete all breakpoints</DD>
-</DL>
-
-</BODY>
-</HTML>
diff --git a/gdb/gdbtk/library/help/browser.html b/gdb/gdbtk/library/help/browser.html
deleted file mode 100644
index df9203beedc..00000000000
--- a/gdb/gdbtk/library/help/browser.html
+++ /dev/null
@@ -1,77 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>Function Browser Help</TITLE>
-</HEAD>
-<BODY>
-<H1>The Function Browser</H1>
-<img src="images/browser1.png" alt="layout1" width=164 height=171 align="right" border=0>
-<img src="images/browser2.png" alt="layout2" width=164 height=170 align="right" border=0>
-
-<h2>Overview</h2>
-<p>The Function Browser may be used to search for specific functions
-in the executable, allowing the user to easily browse through source
-code and set and clear breakpoints at anywhere in the executable
-with ease. Its powerful regular expression searches allow the user
-to easily set breakpoints on multiple functions at once.</p>
-<p>The Function Browser has two different layouts. Both layouts contain the same four sections;
-Files, Function Filter, Functions, and Source Display.</p>
-
-<h3>Files</h3>
-<p>The Files section displays a list of all the source files.  The files are
-read from the debug information in the program being debugged. To see
-the list of functions in a file, click on it.  The function list should appear
-in the Functions Display and the source should appear in the Source Display.
-You can select multiple files by using the Control or Shift keys while
-clicking the left mouse button. When multiple files are selected, all the functions in those files
-are displayed in the Functions Display.
-</p>
-<p>At the bottom of the Files Display, you should see a checkbutton labelled "Hide .h files"
-and a button labelled "Select All". Checking "Hide .h files" will remove all
-files ending in ".h" from the Files Display. Clicking "Select All" will select all files
-in the Files Display.</p>
-
-<h3>Function Filter</h3>
-<p>Above the Function Display you should see a section labelled "Function Filter".
-The purpose of this section is to apply a filter to the list of functions in the Functions Display.
-For example, if you click "Select All" in the Files Display, then many hundreds of functions
-could appear in the Functions Display.  To see all functions containing the string "print", for example, click on the combobox in the Function Filter and select "contains".
-Then type "print" into the box to the right and hit the enter or return key. You should see the Function
-Display updated with a list of all functions containing "print".</p>
-
-<p>Insight remember what the last filter you used was and will always open the Function
-Browser window with the last filter settings.
-</p>
-
-<h3>Function Display</h3>
-<p>The Function Display contains the list of functions in the files that have been
-selected in the Files Display, after running them through any filter settings in the Filter Display.
-There are two buttons at the bottom of the display that allow you so set or delete breakpoints on every function
-in the Function Display in one operation.
-</p>
-<p>For example, to set a breakpoint of every function name containing "print", follow the example in the Function Filter section to
-get a list of all functions containing "print". Then simply click the "Set BP" button.</p>
-
-<h3>Source Display</h3>
-<p>The Source Display shows the source code for any file selected in the File Display.  If a function
-is selected in the Function Display, the first line of that function containing
-executable code will be highlighted.  If no source file is found, then the function will be
-displayed disassembled.</p>
-
-<p>At the bottom of the window are two comboboxes and a text field.  The combobox on the far left
-contains the function name or file location to display.  Normally this is just output for your information, however
-you can type the name of any function into this box to see its source.
-</p>
-<p>To the right of this is another combobox that allows you to toggle between source and assembly.
-</p>
-<p>To the far right is an empty field.   You can type a string in it and hit enter to
-search the current source file for any string.</p>
-<p>In the source window itself, you can set breakpoints just like the source window.</p>
-<h3>Popup Menu</h3>
-<p>If you click the right mouse button while over the File Browser, you should get a simple menu
-with three options; <i>Toggle Layout</i>, <i>Help</i>, and <i>Close</i>. <i>Toggle Layout</i>
-switches you between the two different Browser Window layouts. Choose the one you like best;
-Insight will remember it between sessions. <i>Help</i> pops up this help window. <i>Close</i> closes the Function Browser.
-</p>
-
-</BODY>
-</HTML>
diff --git a/gdb/gdbtk/library/help/console.html b/gdb/gdbtk/library/help/console.html
deleted file mode 100644
index d0fdfba52e1..00000000000
--- a/gdb/gdbtk/library/help/console.html
+++ /dev/null
@@ -1,74 +0,0 @@
-<HTML>
-  <HEAD>
-    <TITLE>Console Window Help</TITLE>
-  </HEAD>
-  <BODY>
-    <CENTER><H2>The Console Window</H2></CENTER>
-
-    <P>The Console Window provides the traditional command-line interface to GDB.
-      It is very similar to the command-line you get when GDB is run with "-nw".</P>
-
-    <UL>
-      <LI><A HREF="#display">Console Display</A></LI>
-      <LI><A HREF="#editing">Editing Commands</A></LI>
-      <LI><A HREF="#history">History Commands</A></LI>
-      <LI><A HREF="#display_hlp">Getting Help</A></LI>
-    </UL>
-
-    <H4><A NAME="display">Console Display</A></H4>
-    The Console Display is simply a scrolled window in which the debugger prompt
-    appears. By default, the prompt is set to "(gdb) ", but it may be changed via a
-    command line option.
-    
-    <P>To execute commands in the console window, simply enter
-      the command in the display. If the debugger is busy, the message "Error: The
-      debugger is busy." appears informing the user that the command was not accepted.</P>
-    
-    <P>Whenever a command is executed, the debugger's windows will update to display
-      any new state information. Any output from the command is also echoed to the Console
-      Window for ease of use. If an error occurs, an error message is printed to the Console
-      Window. All error messages appear in the Console Window using a red typeface.
-    </P>
-    
-    <BR>
-
-    <H4><A NAME="editing">Editing Commands</A></H4>
-    <P>The Console Window shell has many powerful features to help edit commands.</P>
-    <UL>
-      <LI> Return or Enter causes the command to be executed.
-
-      <LI> Control-A moves the cursor to the beginning of the line.</LI>
-      <LI> Control-E moves the cursor to the end of the line.</LI>
-      <LI> Control-D or DELETE delete the character to the right of the cursor.</LI>
-      <LI> BACKSPACE deletes the character to the left of the cursor.</LI>
-      <LI> Control-B or LeftArrow moves the cursor to the left.</LI>
-      <LI> Control-F or RightArrow moves the cursor to the right.</LI>
-      <LI> Control-K deletes everything to the right of the cursor.</LI>
-      <LI> Control-U deletes the text between the cursor and the start of the line.</LI>
-      <LI> Control-W deletes the previous word</LI>
-      <LI> END deletes the whole line.</LI>
-      <LI> The mouse may also be used to position the cursor and cut and paste.</LI>
-    </UL>
-    
-    <H4><A NAME="history">History Commands</A></H4>
-    <UL>
-      <LI> Conrol-P or UpArrow recalls the previous command.</LI>
-      <LI> Conrol-N or DownArrow recalls the next command.</LI>
-      <LI> Shift-UpArrow or Control-UpArrow will search through previous commands
-	for commands that start with the same characters as the current line.  For
-	example, if you type "pr" and hit Shift-UpArrow, it may find commands in the
-	history such as "print foo" or "print sol[x]".  Each time you search it will
-	go back further in the history.  If nothing is on the current line, it
-	acts just like Control-P or UpArrow.</LI>
-      <LI> Shift-DownArrow or Control-DownArrow work in the opposite direction of 
-	Shift-UpArrow and Control-DownArrow. </LI>
-  </UL>
-    
-    <BR>
-
-    <H4><A NAME="display_hlp">Getting Help</A></H4>
-    The Console Window has its own online help system. To access the help system, enter
-    "help" at the prompt and follow the on-screen instructions. For more help, please
-    consult the <!-- What is this really called? --> <I>GDB User's Guide</I>.
-  </BODY>
-</HTML>
diff --git a/gdb/gdbtk/library/help/debug.html b/gdb/gdbtk/library/help/debug.html
deleted file mode 100644
index 528a868ff5f..00000000000
--- a/gdb/gdbtk/library/help/debug.html
+++ /dev/null
@@ -1,133 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>Internal Debugging Help</TITLE>
-</HEAD>
-<BODY>
-<H2>Insight Internal Debugging Functions</H2>
-<H3>Overview</H3>
-<P> This describes the basic internal functions for debugging Insight.
-This information is for Insight developers trying to debug Insight, 
-not for users trying to debug other programs.</P>
-
-<H3>Environment Variables</H3>
-<P><b>GDBTK_DEBUG</b> - Setting this variable controls the Debug
-window.</P>
-<P><b>GDBTK_DEBUG</b> may have the following values:</P>
-<DL>
-<DT>0 or unset</DT>
-<DD>The Debug window is not opened and not listed on the menu. (You
-may still open it by typing Ctrl-U in the source window.)</DD>
-<DT>1</DT>
-<DD>The Debug window is listed on the menu, but not opened.</DD>
-<DT>2</DT>
-<DD>The Debug window is opened at startup.</DD>
-</DL>
-
-<HR>
-<P><b>GDBTK_TRACE</b> - This variable determines if tracing is enabled.
-Tracing may only be enabled at GDBTK startup.  Changing <b>GDBTK_TRACE</b> 
-while GDBTK is running has no effect.</P>
-<P><b>GDBTK_TRACE</b> may have the following values:</P>
-<DL>
-<DT>0 or unset</DT>
-<DD>Tracing is not enabled.</DD>
-<DT>1</DT>
-<DD>Tracing is enabled, but not started.  To start tracing, you need to do
-so in the Debug Window or from the console. (The command to do this is "tk
-::debug::trace_start).</DD>
-<DT>2</DT>
-<DD>Tracing is enabled and started immediately.</DD>
-</DL>
-
-<P><b>GDBTK_DEBUGFILE</b> - This variable contains an optional filename
-where GDBTK will write all debugging information. This information will include
-the output of all "debug" and "dbug" commands, as well as tracing, if it is 
-enabled. The value of
-<b>GDBTK_DEBUGFILE</b> will not change what is displayed in the Debug
-Window, with one exception; when the Debug Window is opened, it will read
-the contents of <b>GDBTK_DEBUGFILE</b> (if it is set and not "stdout").
-<P><b>GDBTK_DEBUGFILE</b> may have the following values:</P>
-<DL>
-<DT>unset</DT>
-<DD>No information will be logged.</DD>
-<DT><i>filename</i></DT>
-<DD>Debugging information will be logged to <i>filename</i>.
-<DT>"stdout"</DT>
-<DD>Debugging information will be written to stdout</DD>
-</DL>
-<HR>
-<H3>Tcl Debugging Functions</H3>
-<P> All debugging functions have been moved into debug.tcl in the ::debug 
-namespace. "debug" and "dbug" are imported into the global namespace.</P>
-<P> The following are the standard debug message functions.</P>
-<pre>
-# -----------------------------------------------------------------------------
-# NAME:		debug::debug
-#
-# SYNOPSIS:	debug { {msg ""} }
-#
-# DESC:		Writes a message to the proper output. The priority of the
-#		message is assumed to be "I" (informational). This function
-#		is provided for compatibility with the previous debug function.
-#		For higher priority messages, use dbug.
-#
-# ARGS:		msg - Message to be displayed.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# NAME:		debug::dbug
-#
-# SYNOPSIS:	dbug { level msg }
-#
-# DESC:		Writes a message to the proper output. Unlike debug, this
-#		function take a priority level.
-#
-# ARGS:		msg   - Message to be displayed.
-#		level - One of the following:
-#				"I" - Informational only 
-#				"W" - Warning
-#				"E" - Error
-#				"X" - Fatal Error
-# ----------------------------------------------------------------------------
-</pre>
-<P> These next functions are used to trace variables, which should not be
-confused with the functions tracing.<P>
-<pre>
-# ----------------------------------------------------------------------------
-# NAME:		debug::trace_var
-# SYNOPSIS:	debug::trace_var {varName mode}
-# DESC:		Sets up variable trace.  When the trace is activated,
-#		debugging messages will be displayed.
-# ARGS:		varName - the variable name
-#		mode - one of more of the following letters
-#			r - read
-#			w - write
-#			u - unset
-# ----------------------------------------------------------------------------
-# ----------------------------------------------------------------------------
-# NAME:		debug::remove_trace
-# SYNOPSIS:	debug::remove_trace {var mode}
-# DESC:		Removes a trace set up with "trace_var".
-# ----------------------------------------------------------------------------
-# ----------------------------------------------------------------------------
-# NAME:		debug::remove_all_traces
-# SYNOPSIS:	debug::remove_all_traces
-# DESC:		Removes all traces set up with "trace_var".
-# ----------------------------------------------------------------------------
-</pre>
-<P> The following two functions may be used to start and stop tracing
-programmatically.</P>
-<pre>
-# -----------------------------------------------------------------------------
-# NAME:		::debug::trace_start
-# SYNOPSIS:	::debug::trace_start
-# DESC:		Starts logging of function trace information.
-# -----------------------------------------------------------------------------
-# -----------------------------------------------------------------------------
-# NAME:		::debug::trace_stop
-# SYNOPSIS:	::debug::trace_stop
-# DESC:		Stops logging of function trace information.
-# -----------------------------------------------------------------------------
-</pre>
-</BODY>
-</HTML>
diff --git a/gdb/gdbtk/library/help/gbl_pref.html b/gdb/gdbtk/library/help/gbl_pref.html
deleted file mode 100644
index 2760750c4e9..00000000000
--- a/gdb/gdbtk/library/help/gbl_pref.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>Global Preferences Help</TITLE>
-</HEAD>
-<BODY>
-<H1>Global Preferences</H1>
-<H3>Overview</H3>
-<P>Not yet done.</P>
-
-<P>Global Preferences topics:
-<UL>
-    <LI><UL><A HREF="#">stuff</A>
-            <LI><A HREF="#">stuff</A>
-            <LI><A HREF="#">stuff</A>
-        </UL>
-</UL></P>
-
-<H3><A NAME="">stuff</A></H3>
-</BODY>
-</HTML>
diff --git a/gdb/gdbtk/library/help/help.html b/gdb/gdbtk/library/help/help.html
deleted file mode 100644
index 7cf93c3cedd..00000000000
--- a/gdb/gdbtk/library/help/help.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>Help Window Help</TITLE>
-</HEAD>
-<BODY>
-<H1>The Help Window</H1>
-<H2>Overview</H2>
-<P>This is some nice text which describes the help window, its role
-in deugging, and perhaps some of the nifty things people can do with
-this window.</P>
-
-<P>Help Window topics:
-<UL>
-    <LI><A HREF="#menus">Menus</A>
-    <UL>
-        <LI><A HREF="#menus_file">File Menu</A></LI>
-        <LI><A HREF="#menus_topics">Topics Menu</A></LI>
-        </LI>
-    <LI><A HREF="#display">Help Display</A>
-    <UL>
-            <LI><A HREF="#display_nav">Navigating the Help Window</A></LI>
-            <LI><A HREF="#display_link">Definition and Page Links</A></LI>
-        </UL></LI>
-</UL></P>
-
-<H2><A NAME="menus">Menus</A></H2>
-<H3><A NAME="menus_file">File Menu</A></H3>
-<H3><A NAME="menus_topics">Topics Menu</A></H3>
-
-<H3><A NAME="display">Help Display</A></H3>
-<H3><A NAME="display_nav">Navigating the Help Window</A></H3>
-<H3><A NAME="display_link">Definition and Page Links</A></H3>
-</BODY>
-</HTML>
diff --git a/gdb/gdbtk/library/help/images/browser1.png b/gdb/gdbtk/library/help/images/browser1.png
deleted file mode 100644
index c005cc3fce3..00000000000
--- a/gdb/gdbtk/library/help/images/browser1.png
+++ /dev/null
diff --git a/gdb/gdbtk/library/help/images/browser2.png b/gdb/gdbtk/library/help/images/browser2.png
deleted file mode 100644
index 8fdddf8c307..00000000000
--- a/gdb/gdbtk/library/help/images/browser2.png
+++ /dev/null
diff --git a/gdb/gdbtk/library/help/images/frame_info.gif b/gdb/gdbtk/library/help/images/frame_info.gif
deleted file mode 100644
index 3da109f84b6..00000000000
--- a/gdb/gdbtk/library/help/images/frame_info.gif
+++ /dev/null
diff --git a/gdb/gdbtk/library/help/images/insightbwr.png b/gdb/gdbtk/library/help/images/insightbwr.png
deleted file mode 100644
index 67618b56fef..00000000000
--- a/gdb/gdbtk/library/help/images/insightbwr.png
+++ /dev/null
diff --git a/gdb/gdbtk/library/help/images/mem_menu.gif b/gdb/gdbtk/library/help/images/mem_menu.gif
deleted file mode 100644
index bf874f3d4ff..00000000000
--- a/gdb/gdbtk/library/help/images/mem_menu.gif
+++ /dev/null
diff --git a/gdb/gdbtk/library/help/images/mem_popup.gif b/gdb/gdbtk/library/help/images/mem_popup.gif
deleted file mode 100644
index a1387146934..00000000000
--- a/gdb/gdbtk/library/help/images/mem_popup.gif
+++ /dev/null
diff --git a/gdb/gdbtk/library/help/images/mem_pref.gif b/gdb/gdbtk/library/help/images/mem_pref.gif
deleted file mode 100644
index 4fc8a5aaa6e..00000000000
--- a/gdb/gdbtk/library/help/images/mem_pref.gif
+++ /dev/null
diff --git a/gdb/gdbtk/library/help/images/reg.png b/gdb/gdbtk/library/help/images/reg.png
deleted file mode 100644
index 251227da79e..00000000000
--- a/gdb/gdbtk/library/help/images/reg.png
+++ /dev/null
diff --git a/gdb/gdbtk/library/help/images/reg_menu.png b/gdb/gdbtk/library/help/images/reg_menu.png
deleted file mode 100644
index 54e117b948e..00000000000
--- a/gdb/gdbtk/library/help/images/reg_menu.png
+++ /dev/null
diff --git a/gdb/gdbtk/library/help/images/src_bal.gif b/gdb/gdbtk/library/help/images/src_bal.gif
deleted file mode 100644
index 51871bcc7f1..00000000000
--- a/gdb/gdbtk/library/help/images/src_bal.gif
+++ /dev/null
diff --git a/gdb/gdbtk/library/help/images/src_bp_bal.gif b/gdb/gdbtk/library/help/images/src_bp_bal.gif
deleted file mode 100644
index 1f6205ac2e5..00000000000
--- a/gdb/gdbtk/library/help/images/src_bp_bal.gif
+++ /dev/null
diff --git a/gdb/gdbtk/library/help/images/src_bpop.gif b/gdb/gdbtk/library/help/images/src_bpop.gif
deleted file mode 100644
index c9e4d099d28..00000000000
--- a/gdb/gdbtk/library/help/images/src_bpop.gif
+++ /dev/null
diff --git a/gdb/gdbtk/library/help/images/src_menu.gif b/gdb/gdbtk/library/help/images/src_menu.gif
deleted file mode 100644
index 8fba6aea810..00000000000
--- a/gdb/gdbtk/library/help/images/src_menu.gif
+++ /dev/null
diff --git a/gdb/gdbtk/library/help/images/src_pop.gif b/gdb/gdbtk/library/help/images/src_pop.gif
deleted file mode 100644
index 8794c0a5908..00000000000
--- a/gdb/gdbtk/library/help/images/src_pop.gif
+++ /dev/null
diff --git a/gdb/gdbtk/library/help/images/src_stat.gif b/gdb/gdbtk/library/help/images/src_stat.gif
deleted file mode 100644
index eab58188edc..00000000000
--- a/gdb/gdbtk/library/help/images/src_stat.gif
+++ /dev/null
diff --git a/gdb/gdbtk/library/help/images/src_thread.gif b/gdb/gdbtk/library/help/images/src_thread.gif
deleted file mode 100644
index 99203ccd8c8..00000000000
--- a/gdb/gdbtk/library/help/images/src_thread.gif
+++ /dev/null
diff --git a/gdb/gdbtk/library/help/images/src_toolbar.gif b/gdb/gdbtk/library/help/images/src_toolbar.gif
deleted file mode 100644
index d6801b3edf5..00000000000
--- a/gdb/gdbtk/library/help/images/src_toolbar.gif
+++ /dev/null
diff --git a/gdb/gdbtk/library/help/images/watch.png b/gdb/gdbtk/library/help/images/watch.png
deleted file mode 100644
index 3145de979ec..00000000000
--- a/gdb/gdbtk/library/help/images/watch.png
+++ /dev/null
diff --git a/gdb/gdbtk/library/help/index.html b/gdb/gdbtk/library/help/index.html
deleted file mode 100644
index 9d7177cf259..00000000000
--- a/gdb/gdbtk/library/help/index.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-  <title>Insight Index</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-  <meta name="GENERATOR" content="Quanta Plus">
-</head>
-<body>
-<img src="images/insightbwr.png" width=300 height=120 border=0>
-<UL>
-<LI><A HREF="breakpoint.html">Breakpoint Window</A></LI>
-<LI><A HREF="console.html">Console Window</A></LI>
-<LI><A HREF="browser.html">Function Browser</A></LI>
-<LI><A HREF="locals.html">Locals Window</A></LI>
-<LI><A HREF="memory.html">Memory Window</A></LI>
-<LI><A HREF="register.html">Register Window</A></LI>
-<LI><A HREF="session.html">Sessions</A></LI>
-<LI><A HREF="source.html">Source Window</A></LI>
-<LI><A HREF="stack.html">Stack Window</A></LI>
-<LI><A HREF="target.html">Target Window</A></LI>
-<LI><A HREF="thread.html">Thread Window</A></LI>
-<LI><A HREF="watch.html">Watch Window</A></LI>
-</UL>
-<hr>
-<h2>For Developers Only</h2>
-<ul>
-<li><a href="debug.html">"Internal Debugging Functions</a></li>
-</ul>
-<hr>
-<br>
-<a href="http://sources.redhat.com/insight/" name="Insight Home Page">Insight Home Page</a>
-<br><br><hr><br>
-<A HREF="license.html">GNU General Public License</A>
-</body>
-</html>
diff --git a/gdb/gdbtk/library/help/license.html b/gdb/gdbtk/library/help/license.html
deleted file mode 100644
index 6ce6c431ca3..00000000000
--- a/gdb/gdbtk/library/help/license.html
+++ /dev/null
@@ -1,305 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>GNU General Public License</TITLE>
-</HEAD><BODY>
-<B>The GNU General Public License
-<P></P>
-</B>Version 2, June 1991
-<P></P>
-Copyright © 1989, 1991 Free Software Foundation, Inc.
-<BR>59 Temple Place / Suite 330, Boston, MA  02111-1307,  USA
-<P></P>
-Everyone is permitted to copy and distribute verbatim copies of this license
-document, but changing it is not allowed.
-<P></P>
-<B>Preamble
-<P></P>
-</B>The licenses for most software are designed to take away your freedom to share
-and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and
-change free software to make sure the software is free for all its users. This General Public
-License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some
-other Free Software Foundation software is covered by the GNU Library General Public License instead.) You can apply it to your programs,
-too.
-<P></P>
-When we speak of free software, we are referring to freedom, not price. Our
-General Public Licenses are designed to make sure that you have the freedom to
-distribute copies of free software (and charge for this service if you wish),
-that you receive source code or can get it if you want it, that you can change the
-software or use pieces of it in new free programs; and that you know you can
-do these things.
-<P></P>
-To protect your rights, we need to make restrictions that forbid anyone to
-deny you these rights or to ask you to surrender the rights. These restrictions
-translate to certain responsibilities for you if you distribute copies of the
-software, or if you modify it.
-<P></P>
-For example, if you distribute copies of such a program, whether gratis or for
-a fee, you must give the recipients all the rights that you have. You must
-make sure that they, too, receive or can get the source code. And you must show
-them these terms so they know their rights.
-<P></P>
-We protect your rights with two steps: (1) copyright the software, and (2)
-offer you this license which gives you legal permission to copy, distribute and/or
-modify the software.
-<P></P>
-Also, for each author's protection and ours, we want to make certain that everyone understands that
-there is no warranty for this free software. If the software is modified by
-someone else and passed on, we want its recipients to know that what they have is
-not the original, so that any problems introduced by others will not reflect on
-the original authors' reputations.
-<P></P>
-Finally, any free program is threatened constantly by software patents. We
-wish to avoid the danger that redistributors of a free program will individually
-obtain patent licenses, in effect making the program proprietary. To prevent
-this, we have made it clear that any patent must be licensed for everyone's free use or not licensed at all. The precise terms and conditions for
-copying, distribution and modification follow.
-<P></P>
-<B>TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-<P></P>
-</B>0. This License applies to any program or other work which contains a notice
-placed by the copyright holder saying it may be distributed under the terms of this
-General Public License. The `Program”, below, refers to any such program or work, and a `work based on the Program' means either the Program or any derivative work under copyright law: that is
-to say, a work containing the Program or a portion of it, either verbatim or
-with modifications and/or translated into another language. (Hereinafter,
-translation is included without limitation in the term `modification'.) Each licensee is addressed as `you'.
-<P></P>
-Activities other than copying, distribution and modification are not covered
-by this License; they are outside its scope. The act of running the Program is
-not restricted, and the output from the Program is covered only if its contents
-constitute a work based on the Program (independent of having been made by
-running the Program). Whether that is true depends on what the Program does.
-<P></P>
-<OL><LI> You may copy and distribute verbatim copies of the Program's source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate copyright notice and
-disclaimer of warranty; keep intact all the notices that refer to this License
-and to the absence of any warranty; and give any other recipients of the Program
-a copy of this License along with the Program. 
-<P></P>
-</OL>You may charge a fee for the physical act of transferring a copy, and you may
-at your option offer warranty protection in exchange for a fee.
-<P></P>
-<OL START="2"><LI> You may modify your copy or copies of the Program or any portion of it, thus
-forming a work based on the Program, and copy and distribute such modifications
-or work under the terms of Section 1 above, provided that you also meet all of
-these conditions: 
-<P></P>
-</OL>a) You must cause the modified files to carry prominent notices stating that you
-changed the files and the date of any change.
-<P></P>
-b) You must cause any work that you distribute or publish, that in whole or in
-part contains or is derived from the Program or any part thereof, to be licensed
-as a whole at no charge to all third parties under the terms of this License.
-<P></P>
-c) If the modified program normally reads commands interactively when run, you
-must cause it, when started running for such interactive use in the most ordinary
-way, to print or display an announcement including an appropriate copyright
-notice and a notice that there is no warranty (or else, saying that you provide a
-warranty) and that users may redistribute the program under these conditions,
-and telling the user how to view a copy of this License. (Exception: if the
-Program itself is interactive but does not normally print such an announcement,
-your work based on the Program is not required to print an announcement.)
-<P></P>
-These requirements apply to the modified work as a whole. If identifiable
-sections of that work are not derived from the Program, and can be reasonably
-considered independent and separate works in themselves, then this License, and its
-terms, do not apply to those sections when you distribute them as separate
-works. But when you distribute the same sections as part of a whole which is a work
-based on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the entire whole,
-and thus to each and every part regardless of who wrote it. 
-<P></P>
-Thus, it is not the intent of this section to claim rights or contest your
-rights to work written entirely by you; rather, the intent is to exercise the
-right to control the distribution of derivative or collective works based on the
-Program. 
-<P></P>
-In addition, mere aggregation of another work not based on the Program with
-the Program (or with a work based on the Program) on a volume of a storage or
-distribution medium does not bring the other work under the scope of this License.
-<P></P>
-<OL START="3"><LI> You may copy and distribute the Program (or a work based on it, under Section
-2) in object code or executable form under the terms of Sections 1 and 2 above
-provided that you also do one of the following:
-<P></P>
-</OL>a) Accompany it with the complete corresponding machine-readable source code,
-which must be distributed under the terms of Sections 1 and 2 above on a medium
-customarily used for software interchange; or,
-<P></P>
-b) Accompany it with a written offer, valid for at least three years, to give any
-third party, for a charge no more than your cost of physically performing
-source distribution, a complete machine-readable copy of the corresponding source
-code, to be distributed under the terms of Sections 1 and 2 above on a medium
-customarily used for software interchange; or,
-<P></P>
-c) Accompany it with the information you received as to the offer to distribute
-corresponding source code. (This alternative is allowed only for noncommercial
-distribution and only if you received the program in object code or executable
-form with such an offer, in accord with Subsection b above.)
-<P></P>
-The source code for a work means the preferred form of the work for making
-modifications to it. For an executable work, complete source code means all the
-source code for all modules it contains, plus any associated interface definition
-files, plus the scripts used to control compilation and installation of the
-executable. However, as a special exception, the source code distributed need not
-include anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the operating
-system on which the executable runs, unless that component itself accompanies the
-executable.
-<P></P>
-If distribution of executable or object code is made by offering access to
-copy from a designated place, then offering equivalent access to copy the source
-code from the same place counts as distribution of the source code, even though
-third parties are not compelled to copy the source along with the object code.
-<P></P>
-<OL START="4"><LI> You may not copy, modify, sublicense, or distribute the Program except as
-expressly provided under this License. Any attempt otherwise to copy, modify,
-sublicense or distribute the Program is void, and will automatically terminate your
-rights under this License. However, parties who have received copies, or
-rights, from you under this License will not have their licenses terminated so long
-as such parties remain in full compliance.
-<P></P>
-<LI> You are not required to accept this License, since you have not signed it.
-However, nothing else grants you permission to modify or distribute the Program or
-its derivative works. These actions are prohibited by law if you do not accept
-this License. Therefore, by modifying or distributing the Program (or any work
-based on the Program), you indicate your acceptance of this License to do so,
-and all its terms and conditions for copying, distributing or modifying the
-Program or works based on it.
-<P></P>
-<LI> Each time you redistribute the Program (or any work based on the Program), the
-recipient automatically receives a license from the original licensor to copy,
-distribute or modify the Program subject to these terms and conditions. You
-may not impose any further restrictions on the recipients' exercise of the rights granted herein.
-<P></P>
-</OL>You are not responsible for enforcing compliance by third parties to this
-License.
-<P></P>
-<OL START="7"><LI> If, as a consequence of a court judgment or allegation of patent infringement
-or for any other reason (not limited to patent issues), conditions are imposed
-on you (whether by court order, agreement or otherwise) that contradict the
-conditions of this License, they do not excuse you from the conditions of this
-License. If you cannot distribute so as to satisfy simultaneously your obligations
-under this License and any other pertinent obligations, then as a consequence
-you may not distribute the Program at all. For example, if a patent license
-would not permit royalty-free redistribution of the Program by all those who
-receive copies directly or indirectly through you, then the only way you could
-satisfy both it and this License would be to refrain entirely from distribution of
-the Program.
-<P></P>
-</OL>If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply and the
-section as a whole is intended to apply in other circumstances. 
-<P></P>
-It is not the purpose of this section to induce you to infringe any patents or
-other property right claims or to contest validity of any such claims; this
-section has the sole purpose of protecting the integrity of the free software
-distribution system, which is implemented by public license practices. Many people
-have made generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that system; it is up
-to the author/donor to decide if he or she is willing to distribute software
-through any other system and a licensee cannot impose that choice. 
-<P></P>
-This section is intended to make thoroughly clear what is believed to be a
-consequence of the rest of this License.
-<P></P>
-<OL START="8"><LI> If the distribution and/or use of the Program is restricted in certain
-countries either by patents or by copyrighted interfaces, the original copyright
-holder who places the Program under this License may add an explicit geographical
-distribution limitation excluding those countries, so that distribution is
-permitted only in or among countries not thus excluded. In such case, this License
-incorporates the limitation as if written in the body of this License.
-<P></P>
-<LI> The Free Software Foundation may publish revised and/or new versions of the
-General Public License from time to time. Such new versions will be similar in
-spirit to the present version, but may differ in detail to address new problems
-or concerns. 
-<P></P>
-</OL>Each version is given a distinguishing version number. If the Program
-specifies a version number of this License which applies to it and `any later version', you have the option of following the terms and conditions either of that
-version or of any later version published by the Free Software Foundation. If the
-Program does not specify a version number of this License, you may choose any
-version ever published by the Free Software Foundation.
-<P></P>
-<OL><LI> If you wish to incorporate parts of the Program into other free programs whose
-distribution conditions are different, write to the author to ask for
-permission. For software which is copyrighted by the Free Software Foundation, write to
-the Free Software Foundation; we sometimes make exceptions for this. Our
-decision will be guided by the two goals of preserving the free status of all
-derivatives of our free software and of promoting the sharing and reuse of software
-generally.
-<P></P>
-</OL>NO WARRANTY
-<P></P>
-<OL><LI> BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE
-PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED
-IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM `AS IS' WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL
-NECESSARY SERVICING, REPAIR OR CORRECTION.
-<P></P>
-<LI> IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY
-COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE
-PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL,
-SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR
-INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF
-THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER
-PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-<P></P>
-</OL>END OF TERMS AND CONDITIONS
-<P></P>
-<B>How to Apply These Terms to Your New Programs
-<P></P>
-</B>If you develop a new program, and you want it to be of the greatest possible
-use to the public, the best way to achieve this is to make it free software
-which everyone can redistribute and change under these terms. 
-<P></P>
-To do so, attach the following notices to the program. It is safest to attach
-them to the start of each source file to most effectively convey the exclusion
-of warranty; and each file should have at least the `copyright' line and a pointer to where the full notice is found.
-<P></P>
-<I>one line for the program's name and a brief idea of what it does.
-<BR></I>Copyright (C) 19<I>yy</I> <I>name of author</I>
-<BR>
-<BR>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.
-<BR>
-<BR>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.
-<BR>
-<BR>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.
-<P></P>
-Also add information on how to contact you by electronic and paper mail. 
-<P></P>
-If the program is interactive, make it output a short notice like the
-following example when it starts in an interactive mode:
-<P></P>
-Gnomovision version 69, Copyright (C) 19yy name of author Gnomovision comes
-with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain
-conditions; type `show c' for details.
-<P></P>
-The hypothetical commands <B>show w</B> and <B>show c</B> should show the appropriate parts of the General Public License. Of course,
-the commands you use may be called something other than show w and show c; they can be mouse clicks or menu items—whatever suits your program. 
-<P></P>
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a `copyright disclaimer' for the program, if necessary. The following is a sample (when copying, alter
-the names).
-<P></P>
-Yoyodyne, Inc., hereby disclaims all copyright interest in the program `Gnomovision' (which makes passes at compilers) written by James Hacker.
-<BR>
-<BR>signature of Ty Coon, 1 April 1989 
-<BR>Ty Coon, President of Vice
-<P></P>
-This General Public License does not permit incorporating your program into
-proprietary programs. If your program is a subroutine library, you may consider
-it more useful to permit linking proprietary applications with the library. If
-this is what you want to do, use the GNU Library General Public License instead of this License.
-<P></P>
-</BODY>
-</HTML>
diff --git a/gdb/gdbtk/library/help/locals.html b/gdb/gdbtk/library/help/locals.html
deleted file mode 100644
index 5612b7de296..00000000000
--- a/gdb/gdbtk/library/help/locals.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>Local Variables Help</TITLE>
-</HEAD>
-<BODY>
-<H1>The Local Variables Window</H1>
-<H2>Overview</H2>
-<p>The Local Variables Window displays all local variables in scope. It may be used to
-visualize and edit local variables. To open the Local Variables window, click on
-small house icon on the toolbar, or select "Local Variables" under the View 
-pulldown menu.</p>
-
-<H3>Locals Display</H3>
-
-<p>Pointers, structures, and classes appear in the display with small expansion
-box before their names. To dereference pointers or
-view the members of classes or structures, click
-the closed expansion box (which appears as a small plus sign, "+") to "expand"
-the listing. The expansion box changes to a minus sign, "-", indicating that the
-display is now open. Pointers, structures and classes may be expanded recursively
-to allow multiple pointer dereferences and embedded structure viewing.</p>
-
-<P>The Locals Display updates after every execution of the program and highlights
-in green those variables whose values have changed.</P>
-
-<P>The Locals Window will, by default, display all pointers in hexadecimal and all
-other variables in decimal. To change the display format for a variable, select
-the Format option from the popup-menu.</P>
-
-<H3>Editing a Variable</H3>
-<p>To edit a variable, either double-click the left mouse button on the value of the variable in
-the display or select the Edit option from the pop-up menu. To abort editing a variable's value, 
-simply press the escape key on the keyboard. The variable's original value is restored.</p>
-
-<H3>Local Variable Pop-up Menu</H3>
-<p>The pop-up menu provides quick access to the functions of the Local Variables Window.
-To use the pop-up menu, click the right mouse button while over a variable.</p>
-<DL>
-    <dt>Format<dd>Change the display format of the variable.</dd></dt>
-    <dt>Edit<dd>Edit the variable's value.</dd></dt>
-    <dt>Delete<dd>Remove the variable from the display.</dd></dt>
-    <dt>Dump Memory<dd>Open a Memory Window with the variable's value as an aaddress.</dd></dt>
-    <dt>Help<dd>Open this help page.</dd></dt>
-    <dt>Close<dd>Close the Local Variables Window.</dd></dt>
-</DL>
-</BODY>
-</HTML>
diff --git a/gdb/gdbtk/library/help/memory.html b/gdb/gdbtk/library/help/memory.html
deleted file mode 100644
index 492974f5478..00000000000
--- a/gdb/gdbtk/library/help/memory.html
+++ /dev/null
@@ -1,238 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-<HEAD>
-   <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-   <META NAME="GENERATOR" CONTENT="Mozilla/4.06 [en] (X11; I; Linux 2.0.35 i686) [Netscape]">
-   <TITLE>Memory Window Help</TITLE>
-</HEAD>
-<BODY>
-
-<H1>
-The Memory Window</H1>
-The Memory Window allows users to display and edit the contents of memory.
-The Memory Window Preferences controls all of the display characteristics
-of the Memory Window.
-<BR>&nbsp;
-<LI>
-<A HREF="#menus">Address Menu</A></LI>
-
-<LI>
-<A HREF="#display">Memory Display</A></LI>
-
-<LI>
-<A HREF="#prefs">Memory Window Preferences</A></LI>
-
-<H2>
-
-<HR WIDTH="100%"></H2>
-
-<H2>
-<A NAME="menus"></A>Address Menu</H2>
-<IMG SRC="images/mem_menu.gif" HEIGHT=66 WIDTH=160>
-<P>This pulldown menu contains the following three items.
-<DL>
-<DT>
-<A NAME="menus_auto"></A>Auto Update</DT>
-
-<DD>
-When selected, causes the Memory Window to update the display every.&nbsp;
-If it is not selected, the display will be frozen until it is selected
-or "Update Now" is selected.</DD>
-
-<DT>
-<A NAME="menus_now"></A>Update Now</DT>
-
-<DD>
-Forces the Memory Window to update the display immediately.</DD>
-
-<DT>
-<A NAME="menus_prefs"></A>Preferences</DT>
-
-<DD>
-Opens the <A HREF="#prefs">Memory Window Preferences</A> dialog.</DD>
-</DL>
-
-<H2>
-
-<HR WIDTH="100%"></H2>
-
-<H2>
-<A NAME="display"></A>Memory Display</H2>
-Like the <A HREF="register.html">Register Window</A>, the Memory Window
-display is organized into a spreadsheet. The address of any cell in the
-Display can be determined by appending the row and column headers for the
-cell. Optionally, an ASCII display of the memory appears at the right.
-Any non-ASCII-representable byte in memory will appear in the ASCII Display
-as a control character (a dot, ".", by default). The <A HREF="#pref">Memory
-Preferences Dialog</A> may be used to alter the appearance of the Memory
-Window.
-<P><A NAME="display_nav"></A>To navigate the Memory Window, use the mouse
-and click the cell of interest. As an alternative, pressing the arrow keys
-on the keyboard will focus successive cells, from left to right, top to
-bottom. The focus will wrap from left to right, so hitting the right arrow
-key will keep advancing the address of the cell selected.
-<H4>
-<A NAME="display_edit"></A>Editing Memory</H4>
-To edit memory, simply enter the new value of the memory into the cell
-and press the enter key on the keyboard. As with the
-<A HREF="register.html">Register
-Window</A>, be careful of the input format used to enter data -- the debugger
-is capable of parsing binary, octal, decimal, and hexadecimal values. All
-entries will be padded with leading zeroes, if necessary.&nbsp; After you
-hit enter, the memory window will automatically shift focus to the next
-cell.
-<P>To edit part of the value of a cell, you can use the mouse to poistion
-the cursor to the exact part of the value you want to change.&nbsp; You
-can also use the backspace key to delete part of the value without deleting
-the whole value.
-<P>Another way to edit memory is to edit the ASCII window.&nbsp; To do
-this, select a cell using the mouse.&nbsp; Then type in a new string.
-<H4>
-<A NAME="display_popup"></A>Memory Pop-up Menu</H4>
-Clicking the right mouse button while the mouse cursor lies within the
-bounds of any cell brings up the following menu:
-<P><IMG SRC="images/mem_popup.gif" HEIGHT=100 WIDTH=220>
-<DL>
-<DT>
-Auto Update</DT>
-
-<DL>
-<DT>
-When selected, the Memory Window will track changes in memory shown in
-the Display.&nbsp; When not selected, the Memory Window is "frozen", representing
-a "snapshot" of memory.</DT>
-</DL>
-
-<DT>
-Update Now</DT>
-
-<DL>
-<DT>
-&nbsp;Forces the Memory Window to update the display immediately.</DT>
-</DL>
-
-<DT>
-Go To <I>address</I></DT>
-
-<DD>
-The Memory Window Display is updated to show memory starting at address
-<I>address</I>.</DD>
-
-<DT>
-Open New Window at <I>address</I></DT>
-
-<DD>
-A new Memory Window is opened, displaying memory at address <I>address</I></DD>
-
-<DT>
-Preferences...</DT>
-
-<DD>
-Opens the Memory Window Preferences for editing the appearance of the Memory
-Window Display.</DD>
-</DL>
-
-<H2>
-
-<HR WIDTH="100%"></H2>
-
-<H2>
-<A NAME="prefs"></A>Memory Window Preferences</H2>
-Memory Window Preference Dialog governs the appearance of the Memory Window:
-the total number of bytes displayed, the size of each cell, ASCII control
-character.
-<P><IMG SRC="images/mem_pref.gif" HEIGHT=417 WIDTH=330>
-<H4>
-<A NAME="prefs_size"></A>Size of the Display Cells</H4>
-This attribute controls how many bytes appear in each cell. Valid cell
-sizes in the Memory Window may be:
-<DL>
-<DT>
-Byte</DT>
-
-<DD>
-Each cell is exactly one byte</DD>
-
-<DT>
-Half Word</DT>
-
-<DD>
-Cells are displayed with two bytes</DD>
-
-<DT>
-Word</DT>
-
-<DD>
-Each cell contains four bytes</DD>
-
-<DT>
-Double Word</DT>
-
-<DD>
-Cells contain eight bytes</DD>
-
-<DT>
-Float</DT>
-
-<DD>
-Each cell contains four bytes, displayed as a floating point number</DD>
-
-<DT>
-Double Float</DT>
-
-<DD>
-Cells are displayed as floating point, eight bytes each</DD>
-</DL>
-
-<H4>
-<A NAME="prefs_fmt"></A>Format of the Display Cells</H4>
-The Format option of the Memory Preferences Dialog governs how the debugger
-represents the memory. Possible representations include:
-<DL>
-<DT>
-Binary</DT>
-
-<DD>
-The values are shown as binary numbers</DD>
-
-<DT>
-Signed Decimal</DT>
-
-<DD>
-The values are shown as signed decimal numbers</DD>
-
-<DT>
-Octal</DT>
-
-<DD>
-Each cell is represented as an octal number</DD>
-
-<DT>
-Unsigned Decimal</DT>
-
-<DD>
-Values are displayed as unsigned decimals</DD>
-
-<DT>
-Hex</DT>
-
-<DD>
-Memory is displayed as a hexadecimal number. This is the default.</DD>
-</DL>
-
-<H4>
-<A NAME="prefs_bytes"></A>Size of the Memory Window</H4>
-The size of the memory window determines how much memory is actually presented
-to the user. The total number of bytes shown can either be determined by
-the size of the window, in which case resizing the Memory Window will cause
-more or less memory to be displayed, or fixed at some specified number
-of bytes. By default, the Memory Window shows 128 bytes of memory.
-<H4>
-<A NAME="prefs_misc"></A>Miscellaneous</H4>
-Miscellaneous memory preferences include the option to display the ASCII
-representation of the memory, including what character to use for non-ASCII
-bytes (the "control" character). Additionally, users may specify the number
-of bytes per row, either four, eight, sixteen, or thirty-two. The default
-is sixteen bytes per row.
-</BODY>
-</HTML>
diff --git a/gdb/gdbtk/library/help/register.html b/gdb/gdbtk/library/help/register.html
deleted file mode 100644
index 06513445eee..00000000000
--- a/gdb/gdbtk/library/help/register.html
+++ /dev/null
@@ -1,48 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>Register Window Help</TITLE>
-</HEAD>
-<BODY>
-<H1>The Register Window</H1>
-<P>The Register Window lists registers and their contents for
-the selected stack frame. It permits viewing the contents of registers
-in different formats, editing register values, and some display
-customizations.</P>
-
-<img src="images/reg.png" alt="register window" width=387 height=370 align="middle" border=0>
-
-<p>In the image above, you can see all the registers on the left and their values on the right.
-At the top is an option menu to allow you to choose what group of registers to display.
-The groups names are preset according to the architecture being debugged. The default is "all".
-Registers highlighted in green have recently changed.
-</p>
-<P>The Register Window will update the register contents in the display
-to match the stack frame currently being viewed in the <A HREF="source.html">
-Source Window</A> and <A HREF="stack.html">Stack Window</A>.</P>
-<p>Each time the program stops, the register window will automatically update.
-Registers that have changed since the last stop will be displayed in green.</p>
-
-
-
-<H3>The Register Pop-up Menu</H3>
-<img src="images/reg_menu.png" alt="register popup menu" width=396 height=388 border=0>
-<P>
-To activate the pop-up menu, click the right mouse button over a register.
-This will allow you change the way the register is displayed, or to remove
-it from the display.  Or you can add the register to the watch window.
-For integer registers, you can also open a memory window at the
-location pointed to by the register.</P>
-
-<H3>Editing a Register</H3>
-<P>
-To edit a register, simply click on it with the left mouse button.  Type
-in the new value and hit enter.  You can enter a decimal, hex, or float number and
-the type will be converted if possible. You may also enter an expression to be evaluated.
-For example, to set  $r3 to the same as $r4, edit $r3 and enter "$r4" as the value.  In the same
-way, you can set $pc to "main".
-The value of the register is set to the current value of the expression; it will not be reevaluated
-if the expression's value later changes.
-</P>
-<P>Press the escape key on the keyboard to cancel your edit.</P>
-</BODY>
-</HTML>
diff --git a/gdb/gdbtk/library/help/session.html b/gdb/gdbtk/library/help/session.html
deleted file mode 100644
index 6c770e8f022..00000000000
--- a/gdb/gdbtk/library/help/session.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<html>
-<head>
-<title>Sessions</title>
-</head>
-<body>
-
-<center><h2>Sessions</h2></center>
-
-Insight will save your session for you automatically.  The ``session''
-is essentially a group of settings which are keyed by the name of the
-inferior which you are debugging.<p>
-
-Insight will show a list of the five most recent previous sessions on
-the <tt>File</tt> menu.  Choosing an item from this list will cause
-Insight to load the indicated executable and restore all the settings
-saved in the session.<p>
-
-The settings stored in a session are:
-<ul>
-<li> The name of the executable.
-
-<li> The inferior's command-line arguments.
-
-<li> The target.
-
-<li> The path used when searching for source files.
-
-<li> The current working directory.
-
-<li> The breakpoints and watchpoints, including conditions, actions,
-     and the like.
-</ul>
-<p>
-
-More items may be added to this list as the need arises.<p>
-
-At present there is no way to disable session saving.<p>
-
-</body>
-</html>
diff --git a/gdb/gdbtk/library/help/source.html b/gdb/gdbtk/library/help/source.html
deleted file mode 100644
index c37091a9460..00000000000
--- a/gdb/gdbtk/library/help/source.html
+++ /dev/null
@@ -1,416 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-<HEAD>
-   <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-   <META NAME="GENERATOR" CONTENT="Mozilla/4.06 [en] (X11; I; Linux 2.0.35 i686) [Netscape]">
-   <TITLE>Source Window Help</TITLE>
-</HEAD>
-<BODY>
-
-<CENTER>
-<H1>The Source Window</H1></CENTER>
-
-<BR>The Source Window is the primary interface between the user and
-the debugger; it is automatically opened when the debugger starts. The
-Source Window displays the status of the program, controls execution of
-the program, and allows visualization of the program execution.
-
-<H3><A HREF="#menus">Menus</A></H3>
-
-<UL>
-<LI><A HREF="#menus_file">File Menu</A></LI>
-<LI><A HREF="#menus_run">Run Menu</A></LI>
-<LI><A HREF="#menus_view">View Menu</A></LI>
-<LI><A HREF="#menus_control">Control Menu</A></LI>
-<LI><A HREF="#menus_prefs">Preferences Menu</A></LI>
-</UL>
-
-<H3><A HREF="#toolbar">Toolbar</A></H3>
-
-<UL>
-<LI><A HREF="#toolbar_exec">Execution Control Buttons</A></LI>
-<LI><A HREF="#toolbar_window">Window Buttons</A></LI>
-<LI><A HREF="#toolbar_frame">Frame Control</A></LI>
-</UL>
-
-<H3><A HREF="#display">Source Window Display</A></H3>
-
-<UL>
-<LI><A HREF="#setting_a_breakpoint">Setting a Breakpoint</A></LI>
-<LI><A HREF="#viewing_breakpoints">Viewing Breakpoints</A></LI>
-<LI><A HREF="#display_balloon">Variable Balloons</A></LI>
-<LI><A HREF="#display_popup">Source Pop-up Menus</A></LI>
-</UL>
-
-<H3><A HREF="#status">Source Window Status Bars</A></H3>
-
-<UL>
-<LI><A HREF="#status_bar">Program Status Bar</A></LI>
-<LI><A HREF="#status_mode">Source Display Status Bar</A></LI>
-</UL>
-
-<H3><A HREF="#search">Search Entry</A></H3>
-
-<HR>
-<H2><A NAME="menus"></A>Menus</H2>
-
-<IMG SRC="images/src_menu.gif">
-<H4><A NAME="menus_file"></A>File Menu</H4>
-
-<DL>
-<DT>Open</DT>
-<DD>Opens a file selection dialog to select the executable to debug</DD>
-<DT>Target Settings...</DT>
-<DD>Opens the <A HREF="target.html">Target Selection Dialog</A> to edit target
-settings</DD>
-<DT>Page Setup</DT>
-<DD>(Windows only) Opens the Windows Page Setup dialog to configure printing</DD>
-<DT>Print</DT>
-<DD>(Windows only) Print the contents of the Source Window Display</DD>
-<DT>Exit</DT>
-<DD>Exits the debugger</DD>
-</DL>
-
-<H4><A NAME="menus_run"></A>Run Menu</H4>
-<DL>
-<DT>Download</DT>
-<DD>Initiates download of the executable onto the target via the protocol specified
-in the <A HREF="target.html">Target Selection Dialog</A></DD>
-<DT>Run</DT>
-<DD>Runs or re-runs the program</DD>
-</DL>
-
-<H4><A NAME="menus_view"></A>View Menu</H4>
-<DL>
-<DT>Stack</DT>
-<DD>Open a <A HREF="stack.html">Stack Window</A></DD>
-<DT>Registers</DT>
-<DD>Open a <A HREF="register.html">Register Window</A></DD>
-<DT>Memory</DT>
-<DD>Open a <A HREF="memory.html">Memory Window</A></DD>
-<DT>Watch Expressions</DT>
-<DD>Open a <A HREF="watch.html">Watch Window</A></DD>
-<DT>Local Variables</DT>
-<DD>Open a <A HREF="locals.html">Locals Window</A></DD>
-<DT>Breakpoints</DT>
-<DD>Open a <A HREF="breakpoint.html">Breakpoint Window</A></DD>
-<DT>Console</DT>
-<DD>Open a <A HREF="console.html">Console Window</A></DD>
-<DT>Function Browser</DT>
-<DD>Open a window allowing the user to easily search for functions and 
-set breakpoints.</DD>
-<DT>Thread List</DT>
-<DD>Open a window that displays all current threads and allows the user
-to change active threads</DD>
-</DL>
-
-<H4><A NAME="menus_control"></A>Control Menu</H4>
-<DL>
-<DT><A HREF="#step_button">Step</A></DT>
-<DD>Step program until it reaches a different source line</DD>
-<DT><A HREF="#next_button">Next</A></DT>
-<DD>Step program, proceeding through subroutine calls</DD>
-<DT><A HREF="#finish_button">Finish</A></DT>
-<DD>Execute until the current stack frame returns</DD>
-<DT><A HREF="#continue_button">Continue</A></DT>
-<DD>Continue program being debugged, after signal or breakpoint</DD>
-<DT><A HREF="#stepi_button">Step Asm Inst</A></DT>
-<DD>Step one instruction exactly</DD>
-<DT><A HREF="#nexti_button">Next Asm Inst</A></DT>
-<DD>Step one instruction, but proceed through subroutine calls</DD>
-<DT>Automatic Step</DT>
-<DD>Automatically step the program every two seconds</DD>
-</DL>
-
-<H4><A NAME="menus_prefs"></A>Preferences Menu</H4>
-<DL>
-<DT>Global</DT>
-<DD>Opens the <A HREF="gbl_pref.html">Global Preferences Dialog</A> and allows
-editing of global settings</DD>
-<DT>Source</DT>
-<DD>Opens the <A HREF="src_pref.html">Source Preferences Dialog</A> and allows
-editing of Source Window settings</DD>
-</DL>
-
-<HR>
-
-<H2><A NAME="toolbar"></A>Toolbar</H2>
-<IMG SRC="images/src_toolbar.gif">
-The Source Window toolbar consists of three functional sections: execution
-control buttons, debugger window buttons, and stack frame control buttons.
-
-<BR>
-<H4><A NAME="toolbar_exec"></A>Execution Control Buttons</H4>
-These convenience buttons provide on-screen access to the most important
-debugger execution control functions:
-<DL>
-<DT><A NAME="run_button"></A><IMG SRC="../images/run.gif"> or 
-<IMG SRC="../images2/run.gif"> Run </DT>
-<DD>The Run Button will start execution of the program, including target selection
-and downloading, if necessary. If the program is already running, the Run
-Button will start the program from the beginning (re-run it).</DD>
-
-<DT><A NAME="stop_button"></A><IMG SRC="../images/stop.gif"> or
-<IMG SRC="../images2/stop.gif"> Stop</DT>
-<DD>The Stop Button will interrupt execution of the program (provided this
-feature is supported by the underlying debugging protocol and hardware)
-or cancel downloads. It is also used as an indication that the debugger
-is busy.</DD>
-<DT><A NAME="step_button"></A><IMG SRC="../images/step.gif"> or <IMG SRC="../images2/step.gif">Step</DT>
-<DD>Step the program until it reaches a different source line</DD>
-<DT><A NAME="next_button"></A><IMG SRC="../images/next.gif"> or <IMG SRC="../images2/next.gif">Next</DT>
-<DD>Step the program, proceeding through subroutine calls</DD>
-<DT><A NAME="finish_button"></A><IMG SRC="../images/finish.gif"> or <IMG SRC="../images2/finish.gif"> Finish</DT>
-<DD>Execute until the current stack frame returns</DD>
-<DT><A NAME="continue_button"></A><IMG SRC="../images/continue.gif"> or <IMG SRC="../images2/continue.gif"> Continue</DT>
-<DD>Continue the program being debugged, after signal or breakpoint</DD>
-<DT><A NAME="stepi_button"></A><IMG SRC="../images/stepi.gif"> or <IMG SRC="../images2/stepi.gif"> Step Asm Inst</DT>
-<DD>Step one instruction exactly. This function is only available when the
-Source Window is displaying assembler code.</DD>
-<DT><A NAME="nexti_button"></A><IMG SRC="../images/nexti.gif"> or <IMG SRC="../images2/nexti.gif"> Next Asm Inst</DT>
-<DD>Step one instruction, but proceed through subroutine calls. This function
-is only available when the Source Window is displaying assembler code.</DD>
-</DL>
-
-<H4>
-<A NAME="toolbar_window"></A>Window Buttons</H4>
-The Debugger Window buttons give instant access to the Debugger's auxiliary
-windows:
-<DL>
-<DT><A NAME="register_button"></A><IMG SRC="../images/reg.gif"> or <IMG SRC="../images2/reg.gif"> Registers</DT>
-<DD>Open a <A HREF="register.html">Register Window</A></DD>
-<DT><A NAME="memory_button"></A><IMG SRC="../images/memory.gif"> or <IMG SRC="../images2/memory.gif"> Memory</DT>
-<DD>Open a <A HREF="memory.html">Memory Window</A></DD>
-<DT><A NAME="stack_button"></A><IMG SRC="../images/stack.gif"> or <IMG SRC="../images2/stack.gif"> Stack</DT>
-<DD>Open a <A HREF="stack.html">Stack Window</A></DD>
-<DT><A NAME="watch_button"></A><IMG SRC="../images/watch.gif"> or <IMG SRC="../images2/watch.gif"> Watch Expressions</DT>
-<DD>Open a <A HREF="watch.html">Watch Window</A></DD>
-<DT><A NAME="locals_button"></A><IMG SRC="../images/vars.gif"> or <IMG SRC="../images2/vars.gif"> Local Variables</DT>
-<DD>Open a <A HREF="locals.html">Locals Window</A></DD>
-<DT><A NAME="breakpoints_button"></A><IMG SRC="../images/bp.gif"> or <IMG SRC="../images2/bp.gif"> Breakpoints</DT>
-<DD>Open a <A HREF="breakpoint.html">Breakpoint Window</A></DD>
-<DT><A NAME="console_button"></A><IMG SRC="../images/console.gif"> or <IMG SRC="../images2/console.gif"> Console</DT>
-<DD>Open a <A HREF="console.html">Console Window</A></DD>
-</DL>
-
-<H4><A NAME="toolbar_frame"></A>Frame Control</H4>
-The Frame Control area of the toolbar displays information about the PC
-of the current frame, and the frame control buttons may be used to navigate
-through the call stack. Whenever any of these buttons are used, both the
-Source Window Display and the <A HREF="stack.html">Stack Window</A> will
-show the selected frame.
-<DL>
-<DT><IMG SRC="images/frame_info.gif" > Frame Information Display</DT>
-<DD>The left half of the frame information display shows the value of the PC
-in the current frame. The right half shows the line number of the PC in
-the source file, if available.</DD>
-
-<DT><A NAME="up_button"></A><IMG SRC="../images/up.gif"> or <IMG SRC="../images2/up.gif"> Up</DT>
-<DD>Select and view the stack frame that called this one</DD>
-
-<DT><A NAME="down_button"></A><IMG SRC="../images/down.gif"> or <IMG SRC="../images2/down.gif"> Down</DT>
-<DD>Select and view the stack frame called by this one</DD>
-
-<DT><A NAME="bottom_button"></A><IMG SRC="../images/bottom.gif"> or <IMG SRC="../images2/bottom.gif"> Bottom</DT>
-<DD>Select and view the bottom-most stack frame</DD>
-</DL>
-
-<HR>
-
-<H2><A NAME="display"></A>Source Display</H2>
-The Source Display is used for many things: browsing source code, setting
-and clearing breakpoints, and a few other special functions. Executable
-lines (those for which executable code was generated by the compiler) are
-denoted with a marker (a dash, "-") in the first column of the display.
-<P>The debugger highlights the PC in the current frame in either green,
-indicating that the PC is in the bottom-most frame (i.e., it is being executed)
-or gold, indicating that the PC is contained in a frame that is not currently
-executing (because it has called another function). A blue highlight is
-used by the debugger to indicate a browsing position: the PC is contained
-in a frame that is not executing or on the call stack. All highlight colors
-are user selectable in the <A HREF="src_pref.html">Source Preferences</A>.
-
-<BR>
-<H4><A NAME="setting_a_breakpoint"></A>Setting a Breakpoint</H4>
-Moving the mouse pointer over the "hot spot" of an executable line will
-change the mouse cursor to a large dot. Clicking the left mouse button
-will then toggle a breakpoint at this line. If no breakpoint exists, one
-will be installed and the dash in the left margin will change into a red
-breakdot. If a breakpoint exists, it will be removed and the red breakdot
-will revert back to a dash. The executable line marker shows the status
-of each line: an empty marker (the dash) indicates that no breakpoints
-are set at the line. A colored breakdot indicates that a breakpoint exists
-at the line (see <A HREF="#display_popup">Source Pop-up Menus</A> for more
-information on setting different types of breakpoints and their representations
-in the Source Display).
-<P>Black breakdots in the Source Window display indicate that the breakpoint
-has been disabled. To re-enable the breakpoint, click the enable/disable
-checkbox in the Breakpoint Window (see <A HREF="breakpoint.html#display_state">
-Enabling/Disabling Breakpoints</A>).
-
-<BR>
-<H4><A NAME="viewing_breakpoints"></A>Viewing Breakpoints</H4>
-You can find out more information about a breakpoint by moving the cursor
-over a breakpoint.  A balloon window will pop up with additional information.
-To get a list of all the active breakpoints, you will need to open a 
-<A HREF="breakpoint.html">breakpoint window</A>.
-<IMG SRC="images/src_bp_bal.gif">
-
-<BR>
-<H4><A NAME="display_balloon"></A>Variable Balloons</H4>
-If the program to be debugged has started and is stopped, the display
-will show the value of variables in variable
-balloons. To activate a variable balloon, simply hold the mouse cursor
-over the name of a variable in the Source Display for a second or two:
-the debugger displays the name of the variable, its type, and its value
-in a pop-up balloon.
-<IMG SRC="images/src_bal.gif">
-
-<BR>
-<H4><A NAME="display_popup"></A>Source Pop-up Menus</H4>
-The Source Display has two pop-up menus. One is activated by clicking the
-right mouse button when the mouse cursor is over an executable line marker's
-hot spot. This pop-up menu looks like this:
-<P><IMG SRC="images/src_bpop.gif">
-<DL>
-<DT>Continue to Here</DT>
-<DD>Continue program execution until it reaches this point. All breakpoints
-will be ignored.  Be aware that if the program never executes the line you selected,
-it will run until completion.</DD>
-<DT>Set Breakpoint</DT>
-<DD>Set a breakpoint at this line. This has the same effect as left clicking
-on this line. Breakpoints are shown as red breakdots in the Source Window
-Display.</DD>
-<DT>Set Temporary Breakpoint</DT>
-<DD>Set a temporary breakpoint at this line. Temporary breakpoints are shown
-as orange breakdots in the Source Window Display. The remove themselves automatically
-the first time they are hit.</DD>
-<A NAME="thread_bp"></A>
-<DT>Set Breakpoint on Thread(s)...</DT>
-<DD>GDB allows the user to set a breakpoint on a particular thread or threads. This
-menu item will display a dialog with a list of threads.  The user can select a list
-of threads that will have breakpoints set at the selected line number.  A warning
-will be displayed if there are no active threads.</DD>
-<IMG SRC="images/src_thread.gif">
-</DL>
-
-The other pop-up menu is activated by clicking the right mouse button anywhere
-else in the Source Display. It is only available when a variable or number
-in the display lies below the mouse cursor or is selected (by clicking
-the left mouse button and dragging the mouse to highlight the variable/number).
-The pop-up menu looks like this:
-<P><IMG SRC="images/src_pop.gif">
-<DL>
-<DT><A NAME="add_to_watch"></A>Add <I>expr</I> to Watch</DT>
-<DD>Adds the selected expression to the <A HREF="watch.html">Watch Window</A>,
-opening it, if necessary.</DD>
-<DT>Dump Memory at <I>expr</I></DT>
-<DD>Opens a new <A HREF="memory.html">Memory Window</A> at the selected expression.
-If the expression is a variable, then the Memory Window is opened with
-memory addresses starting at the value of the variable.</DD>
-<DT>Open Another SOurce Window</DT>
-<DD>GDB allows multiple source windows to co-exist. You can, for example, have
-one window in source mode and one in assembly mode.  Or you can use one window
-to browse the stack or other files.</DD>
-</DL>
-
-<H4><A NAME="status"></A>Source Window Status Bars</H4>
-The Source Window has two status bars which inform the user of the status
-of the program (the "status bar") and the status of the Source Window.
-<P>The&nbsp;<A NAME="status_bar"></A>Program Status Bar (or simply "Status
-Bar") displays the status of the program. Common messages seen here include:
-<DL>
-<DT>No program loaded.</DT>
-<DD>No program has been loaded into target memory.</DD>
-<DT>Program is ready to run.</DT>
-<DD>A program has been loaded into target memory and may be executed. Start
-the program by hitting <A HREF="#run_button">Run</A>.</DD>
-<DT>Program stopped at <I>line/address</I></DT>
-<DD>The program stopped at line <I>line</I> or address <I>address</I>. Execution
-may continue by hitting any of the <A HREF="#toolbar_exec">execution control
-buttons</A> on the toolbar.</DD>
-<DT>Program terminated. 'Run' will restart.</DT>
-<DD>The program exited. Pressing <A HREF="#run_button">Run</A> will restart
-it.</DD>
-</DL>
-
-The Status Bar also displays some help information. For instance, the Status
-Bar will show the function of a button on the toolbar or the Source Display
-Status Bar as well as any keyboard shortcut for any button in the Source
-Window.
-
-<BR>
-<H4><A NAME="status_mode"></A>Source Display Status Bar</H4>
-<IMG SRC="images/src_stat.gif">
-The Source Display Status Bar shows the current state of the Source Window:
-the name of the file displayed in the Display, the name of the function
-in the Display which contains the PC for the current frame (if any), and
-the display mode.
-<P>The <A NAME="file_selector"></A>Source File Selector is a dropdown
-menu which contains the names of all the files that were compiled into
-the program being debugged.
-<P>Normally, the File Selector displays the name of the file currently
-being viewed, but any file from the dropdown menu may be selected for browsing.
-Simply select the file to view from the available choices (or type it directly
-into the File Selector) and the Source Window will load that file into
-the Display. To return to the PC of the program, simply press the
-<A HREF="#bottom_button">Bottom
-Frame Control Button</A>.
-<P>The <A NAME="function_selector"></A>Source Function Selector displays
-the name of the function containing the Source Window's PC, if one exists,
-but it may be used to browse any function in the current file. Simply type
-the name of the desired function into the Function Selector or select it
-from the dropdown menu. The Source Window's PC is updated to point at this
-function. To return to the PC of the program, simply press the
-<A HREF="#bottom_button">Bottom
-Frame Control Button</A>.
-<P>The <A NAME="mode_selector"></A>Source Display Mode Selector displays
-the viewing mode of the current file/function shown in the Source Window
-Display.
-<P>The function of the "step" keyboard shortcut will differ depending on
-the mode the Source Window Display. "Stepping" in Source Mode (or in the
-Source Pane of SRC+ASM Mode) will cause a source-level step. "Stepping"
-in Assembly or Mixed Mode (or in the Assembly Pane of the SRC+ASM Mode)
-will cause the debugger to step exactly one machine instruction. This also
-applies to the shortcut for "next".
-<P>The Display Mode Selector may be used to change the view of the current
-source file. The available display modes are
-<DL>
-<DT>SOURCE</DT>
-<DD>The contents of the Display are shown as source code. If source code is
-not available (either because no debugging information is available or
-the source file is not found), the Source Window will temporarily set the Display
-Mode to "ASSEMBLY".</DD>
-<DT>ASSEMBLY</DT>
-<DD>A disassembly of the target's memory is shown in the Display. Even assembly
-source files show a disassembly of target memory; to see the assembly source
-code, use the SOURCE mode. Note that the debugger can only display assembly
-code on a function-by-function basis. It cannot display all the instructions
-generated from a single source file.</DD>
-<DT>MIXED</DT>
-<DD>The Display shows source code mixed with the assembler instructions which
-were generated for those lines by the compiler for the current function.
-Note that the addresses of the assembly lines is not necessarily monotonically
-increasing. If the source file associated with the function cannot be found,
-the Source Window will revert to ASSEMBLY mode.</DD>
-<DT>SRC+ASM</DT>
-<DD>The Source Window Display is divided into two panes: an assembly pane and
-a source pane. Breakpoints may be set/cleared in either pane.</DD>
-</DL>
-
-<HR>
-
-<H2><A NAME="search"></A>Search Entry</H2>
-The Search Entry facilitates searching for text in the Source Window Display.
-Simply enter the text to be found into the Search Entry and press the Enter
-key on the keyboard to search forwards in the Source Window Display (hold
-down the Shift key to search backwards). If a match is found, it is highlighted
-in the Source Window and the Program Status Bar displays information about
-where the match was found.
-<P>The Search Entry can also jump the Source Window to a specific line.
-Enter the line number preceded by an "at" sign (@) into the Search Entry
-and press enter. If entered line number is greater than the total number
-of lines in the Source Window Display, the Display will jump to the end
-of the current file.
-</BODY>
-</HTML>
diff --git a/gdb/gdbtk/library/help/src_pref.html b/gdb/gdbtk/library/help/src_pref.html
deleted file mode 100644
index e8547964653..00000000000
--- a/gdb/gdbtk/library/help/src_pref.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>Source Window Preferences Help</TITLE>
-</HEAD>
-<BODY>
-<H1>Source Window Preferences</H1>
-<H3>Overview</H3>
-<P>Not yet done.</P>
-
-<P>Source Preferences topics:
-<UL>
-    <LI><UL><A HREF="#">stuff</A>
-            <LI><A HREF="#">stuff</A>
-            <LI><A HREF="#">stuff</A>
-        </UL>
-</UL></P>
-
-<H3><A NAME="">stuff</A></H3>
-</BODY>
-</HTML>
diff --git a/gdb/gdbtk/library/help/stack.html b/gdb/gdbtk/library/help/stack.html
deleted file mode 100644
index 9229c17fa12..00000000000
--- a/gdb/gdbtk/library/help/stack.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<HTML>
-  <HEAD>
-    <TITLE>Stack Window Help</TITLE>
-  </HEAD>
-  <BODY>
-
-    <CENTER>
-      <H2>The Stack Window</H2>
-    </CENTER>
-    
-
-    <BR>The Stack Window allows users to view the call stack and jump between
-    levels of the stack.
-    
-    <UL>
-      <LI><A HREF="#display">Stack Display</A></LI>
-      <LI><A HREF="#display_nav">Navigating the Stack Window</A></LI>
-      <LI><A HREF="#display_lvl">Changing the Stack Level</A></LI>
-    </UL>
-    
-    <H2><A NAME="display">Stack Display</A></H2>
-    The Stack Display consists of a listbox which displays levels of the call stack
-    on per line. Each line contains the level number (useful when using the 
-    <A HREF="console.html">Console Window</A>) and a description of the function executing
-    in that level. Typically, the function name and either the address of the function
-    or the file and line number where the function is defined are displayed. The
-    Stack Window may also be used to jump between levels of the stack.
-    <BR>
-
-    <H2><A NAME="display_nav">Navigating the Stack Window</A></H2>
-    Navigation of the Stack Window is accomplished by clicking on the desired level
-    with the left mouse button. The <A HREF="source.html#display">Source Window
-      Display</A> updates to show the selected frame. All other secondary windows,
-    <A HREF="register.html">Registers</A>, <A HREF="watch.html">Watch</A>, and
-    <A HREF="locals.html">Locals</A> update their displays for the selected frame.
-    <BR>
-    
-    <H2><A NAME="display_lvl">Changing Stack Levels</A></H2>
-    To switch frames, simply click the left mouse button on the desired frame and the
-    debugger will switch contexts, updating all windows. The selected frame is highlighted
-    (in gold, by default).
-    
-    <P>As an alternative, changing stack levels may be accomplished via the
-      <A HREF="source.html#toolbar_frame">Frame Control Buttons</A> on the Source Window's
-      Toolbar. These buttons may be used to change frames one level at a time (either
-      immediately up or immediately down) or to jump to the bottom-most stack frame.
-      See <A HREF="source.html#toolbar_frame">Source Frame Control Buttons</A> for more
-      information.</P>
-  </BODY>
-</HTML>
diff --git a/gdb/gdbtk/library/help/target.html b/gdb/gdbtk/library/help/target.html
deleted file mode 100644
index c60ed47a251..00000000000
--- a/gdb/gdbtk/library/help/target.html
+++ /dev/null
@@ -1,102 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>Target Selection Help</TITLE>
-</HEAD>
-<BODY>
-<H1>The Target Selection Dialog</H1>
-<h2>Overview</h2>
-<P>The Target Selection Dialog allows users to specify the debug target,
-the interface used to connect to the target, and some useful run
-options.</P>
-
-<P>
-<h3><A HREF="#select">Selecting a Target</A></h3>
-<UL>
-<LI><A HREF="#select">Specifying a Target</A></LI>
-<LI><A HREF="#select_int">Choosing a Connection Interface</A></LI>
-</UL>
-
-<h3><A HREF="#options">Options</A></h3>
-<UL>
-<LI><A HREF="#options_run_until_main">Run until 'main'</A></LI>
-<LI><A HREF="#options_bp_at_exit">Set breakpoint at 'exit'</A></LI>
-<LI><A HREF="#options_download_dialog">Display Download Dialog</A></LI>
-</UL>
-
-<h3><A HREF="#more_options">More Options</A></h3>
-<UL>
-<LI><A HREF="#more_options_attach">Attach to Target</A></LI>
-<LI><A HREF="#more_options_load">Download Program</A></LI>
-<LI><A HREF="#more_options_run">Run Program</A></LI>
-<LI><A HREF="#more_options_cont">Continue from Last Stop</A></LI>
-</UL></P>
-
-<H3><A NAME="select">Selecting a Target</A></H3>
-Selecting a target involves choosing a target for debugging and setting connection
-interface options for the target.
-
-<P>Common targets include: "Exec" for native debuggers, "Remote/Serial" for establishing
-a connection to a target board via a serial line, "Remote/TCP" for TCP connections,
-and "Simulator" for connections to the simulator. There may be more depending on the
-configuration of the debugger being used.</P>
-
-<P>In general, "remote" targets are always serial connections which require the user
-to specify the serial port and baud rate to be used for the connection and
-"remote/tcp" targets are always TCP connections which require specifying the hostname
-and port number of the machine to which to connect. Depending upon configuration,
-there may be numerous serial- and TCP-based connections. These always follow the
-naming convention <I>target</I>/Serial and <I>target</I>/TCP.</P>
-
-<P>To select a target, choose one of the available targets
-from the dropdown menu in the Connection Frame. Then <A NAME="#select_int">specify
-the interface options</A> for this target: selecting the baudrate and serial port
-from the dropdown menus (serial targets only) or entering the hostname and port number
-(TCP targets only).</P>
-
-<H3><A NAME="options">Options</A></H3>
-Three run options which may be selected include:
-<DL>
-    <DT><A NAME="options_run_until_main">Run until 'main'</A>
-        <DD>Sets a breakpoint at main()
-    <DT><A NAME="options_bp_at_exit">Set breakpoint at 'exit'</A>
-        <DD>Sets a breakpoint at exit()
-    <DT><A NAME="options_download_dialog">Display Download Dialog</A>
-        <DD>Displays a dialog showing the progress of the download to
-            the target section by section
-</DL>
-<BR>
-<H3><A NAME="more_options">More Options</A></H3>
-Several additional run options may be set for each target from the Target Selection
-Dialog. These options govern the behavior of the debugger's
-<A NAME="source.html#run_button">Run Button</A>. The debugger automatically selects
-default values for these options whenever a target is selected with the dropdown menu
-in the Connection Frame. To modify this default behavior, click the small triangle
-next to "More Options" at the bottom of the dialog. The Run Options for the current
-target are displayed, allowing modification of the actions for the target. When the
-"OK" button is selected, these settings are saved and will be used as the default
-for the target in future sessions.
-
-<DL>
-    <DT><A NAME="more_options_attach">Attach to Target</A>
-        <DD>Establish a connection to the target board.
-    <DT><A NAME="more_options_load">Download Program</A>
-        <DD>Download the program to the target board.
-    <DT><A NAME="more_options_run">Run Program</A>
-        <DD>Run the program on the target board, creating a new
-            "process". This option may not be specified along with
-            the continue option. See note below.
-    <DT><A NAME="more_options_cont">Continue from Last Stop</A>
-        <DD>Continue the program on the target board from where
-            it last stopped. This option may not be specified
-            along with the "run" option. See note below.
-</DL>
-
-<P>Note that all remote targets typically do not "run" programs. Since target
-boards are usually incapable of creating a new "process", these targets
-seldom "Run". The defaults for all remote targets reflect this distinction: they
-are all set to "Continue".</P>
-
-<P>Only one of the options "Run Program" and "Continue from Last Stop" may be used.
-Typically, the default behavior of this setting should not be altered.</P>
-</BODY>
-</HTML>
diff --git a/gdb/gdbtk/library/help/thread.html b/gdb/gdbtk/library/help/thread.html
deleted file mode 100644
index dacc0646125..00000000000
--- a/gdb/gdbtk/library/help/thread.html
+++ /dev/null
@@ -1,46 +0,0 @@
-<HTML>
-  <HEAD>
-    <TITLE>Thread Window Help</TITLE>
-  </HEAD>
-  <BODY>
-
-    <CENTER>
-      <H2>The Thread Window</H2>
-    </CENTER>
-    
-
-    <BR>The Thread Window displays a list of threads and/or processes. The exact
-    contents are OS-specific.
-    
-    <UL>
-      <LI><A HREF="#display">Thread Display</A></LI>
-      <LI><A HREF="#current">Changing the Current Thread</A></LI>
-      <LI><A HREF="#bp">Setting Breakpoints on Thread(s)</A></LI>
-    </UL>
-    
-    <H2><A NAME="display">Thread Display</A></H2>
-    The Thread Display consists of a listbox which displays information on
-    threads and/or processes that are part of the executable being debugged.
-    The first column is the GDB thread number, which is used internally by GDB
-    to track the thread. The rest of the columns are OS-dependent.  The output is identical
-    to the output of the console command "info threads".
-    <BR>
-
-    <H2><A NAME="current">Changing the Current Thread</A></H2>
-    The source window can only display the current location and source for one thread
-    at a time. That thread is called the "current thread". 
-    To change the current thread, simply click the left mouse button on the desired 
-    line and the
-    debugger will switch contexts, updating all windows. The current thread will 
-    be highlighted.
-    <BR>
-
-    <H2><A NAME="bp">Setting Breakpoints on Thread(s)</A></H2>
-    Normally if you set a breakpoint on a line or function, every thread that hits
-    that location will stop execution and return to the debugger.  To set a breakpoint
-    or a specific thread or threads, you need to use the source window.  See 
-    <A HREF="source.html#thread_bp">Set Breakpoint on Threads</A>
-
-
-  </BODY>
-</HTML>
diff --git a/gdb/gdbtk/library/help/trace/console.html b/gdb/gdbtk/library/help/trace/console.html
deleted file mode 100644
index fdce956afec..00000000000
--- a/gdb/gdbtk/library/help/trace/console.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>Console Window Help</TITLE>
-</HEAD>
-<BODY>
-<H1>The Console Window</H1>
-<H3>Overview</H3>
-<P>The Console Window is perhaps the most powerful tool in the debugger. It
-provides functionality equivalent to almost all of the debugger's secondary
-windows, macro definitions, and other more advanced features.</P>
-
-<P>Console Window topics:
-<UL>
-    <LI><UL><A HREF="#display">Console Display</A>
-            <LI><A HREF="#display_cmd">Executing Commands</A>
-            <LI><A HREF="#display_hlp">Getting Help</A>
-        </UL>
-</UL></P>
-
-<H3><A NAME="display">Console Display</A></H3>
-The Console Display is simply a scrolled window in which the debugger prompt
-appears. By default, the prompt is set to "(gdb) ", but it may be changed via a
-command line option.
-
-<P>To <A NAME="display_cmd">execute commands</A> in the console window, simply enter
-the command in the display. If the debugger is busy, the message "Error: The
-debugger is busy." appears informing the user that the command was not accepted.</P>
-
-<P>Whenever a command is executed, the debugger's windows will update to display
-any new state information. Any output from the command is also echoed to the Console
-Window for ease of use. If an error occurs, an error message is printed to the Console
-Window. All error messages appear in the Console Window using a red colored typeface.
-</P>
-
-<P>The Console Window responds to special character commands just as a shell window
-does: it has a history mechanism which allows the user to scan previously used commands
-by pressing the up and down arrow keys on the keyboard, jumping to the beginning or
-end of a line by entering Ctrl-A or Ctrl-E, erasing a line by pressing Ctrl-K, and
-more. Users familiar with GNU Emacs will recognize these keys as commonly used
-keystrokes from that editor.</P>
-
-<H3><A NAME="display_hlp">Getting Help</A></H3>
-The Console Window has its own online help system. To access the help system, enter
-"help" at the prompt and follow the on-screen instructions. For more help, please
-consult the <!-- What is this really called? --> <I>GDB User's Guide</I>.
-</BODY>
-</HTML>
diff --git a/gdb/gdbtk/library/help/trace/gbl_pref.html b/gdb/gdbtk/library/help/trace/gbl_pref.html
deleted file mode 100644
index 2760750c4e9..00000000000
--- a/gdb/gdbtk/library/help/trace/gbl_pref.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>Global Preferences Help</TITLE>
-</HEAD>
-<BODY>
-<H1>Global Preferences</H1>
-<H3>Overview</H3>
-<P>Not yet done.</P>
-
-<P>Global Preferences topics:
-<UL>
-    <LI><UL><A HREF="#">stuff</A>
-            <LI><A HREF="#">stuff</A>
-            <LI><A HREF="#">stuff</A>
-        </UL>
-</UL></P>
-
-<H3><A NAME="">stuff</A></H3>
-</BODY>
-</HTML>
diff --git a/gdb/gdbtk/library/help/trace/help.html b/gdb/gdbtk/library/help/trace/help.html
deleted file mode 100644
index 3a3640da1a1..00000000000
--- a/gdb/gdbtk/library/help/trace/help.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>Help Window Help</TITLE>
-</HEAD>
-<BODY>
-<H1>The Help Window</H1>
-<H2>Overview</H2>
-<P>This is some nice text which describes the help window, its role
-in deugging, and perhaps some of the nifty things people can do with
-this window.</P>
-
-<P>Help Window topics:
-<UL>
-    <LI><UL><A HREF="#menus">Menus</A>
-            <LI><A HREF="#menus_file">File Menu</A>
-            <LI><A HREF="#menus_topics">Topics Menu</A>
-        </UL>
-    <LI><UL><A HREF="#display">Help Display</A>
-            <LI><A HREF="#display_nav">Navigating the Help Window</A>
-            <LI><A HREF="#display_link">Definition and Page Links</A>
-        </UL>
-</UL></P>
-
-<H2><A NAME="menus">Menus</A></H2>
-<H3><A NAME="menus_file">File Menu</A></H3>
-<H3><A NAME="menus_topics">Topics Menu</A></H3>
-
-<H3><A NAME="display">Help Display</A></H3>
-<H3><A NAME="display_nav">Navigating the Help Window</A></H3>
-<H3><A NAME="display_link">Definition and Page Links</A></H3>
-</BODY>
-</HTML>
diff --git a/gdb/gdbtk/library/help/trace/index.toc b/gdb/gdbtk/library/help/trace/index.toc
deleted file mode 100644
index 3559d66350e..00000000000
--- a/gdb/gdbtk/library/help/trace/index.toc
+++ /dev/null
@@ -1,10 +0,0 @@
-{Source Window} {source.html} {The Source Window}
-{Register Window} {register.html} {The Register Window}
-{Memory Window} {memory.html} {The Memory Window}
-{Locals Window} {locals.html} {The Locals Window}
-{Watch Window} {watch.html} {The Watch Window}
-{Tracepoint Window} {tp.html} {The Tracepoint Window}
-{Console Window} {console.html} {The Console Window}
-{Stack Window} {stack.html} {The Stack Window}
-{TDump Window} {tdump.html} {The Tracepoint Dump Window}
-{GPL} {license.html} {The GNU Public License}
diff --git a/gdb/gdbtk/library/help/trace/license.html b/gdb/gdbtk/library/help/trace/license.html
deleted file mode 100644
index b43da4cb3a4..00000000000
--- a/gdb/gdbtk/library/help/trace/license.html
+++ /dev/null
@@ -1,305 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>GNU General Public License</TITLE>
-</HEAD><BODY>
-<B>The GNU General Public License
-<P></P>
-</B>Version 2, June 1991
-<P></P>
-Copyright © 1989, 1991 Free Software Foundation, Inc.
-<BR>59 Temple Place / Suite 330, Boston, MA  02111-1307,  USA
-<P></P>
-Everyone is permitted to copy and distribute verbatim copies of this license
-document, but changing it is not allowed.
-<P></P>
-<B>Preamble
-<P></P>
-</B>The licenses for most software are designed to take away your freedom to share
-and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and
-change free software to make sure the software is free for all its users. This General Public
-License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some
-other Free Software Foundation software is covered by the GNU Library General Public License instead.) You can apply it to your programs,
-too.
-<P></P>
-When we speak of free software, we are referring to freedom, not price. Our
-General Public Licenses are designed to make sure that you have the freedom to
-distribute copies of free software (and charge for this service if you wish),
-that you receive source code or can get it if you want it, that you can change the
-software or use pieces of it in new free programs; and that you know you can
-do these things.
-<P></P>
-To protect your rights, we need to make restrictions that forbid anyone to
-deny you these rights or to ask you to surrender the rights. These restrictions
-translate to certain responsibilities for you if you distribute copies of the
-software, or if you modify it.
-<P></P>
-For example, if you distribute copies of such a program, whether gratis or for
-a fee, you must give the recipients all the rights that you have. You must
-make sure that they, too, receive or can get the source code. And you must show
-them these terms so they know their rights.
-<P></P>
-We protect your rights with two steps: (1) copyright the software, and (2)
-offer you this license which gives you legal permission to copy, distribute and/or
-modify the software.
-<P></P>
-Also, for each author's protection and ours, we want to make certain that everyone understands that
-there is no warranty for this free software. If the software is modified by
-someone else and passed on, we want its recipients to know that what they have is
-not the original, so that any problems introduced by others will not reflect on
-the original authors' reputations.
-<P></P>
-Finally, any free program is threatened constantly by software patents. We
-wish to avoid the danger that redistributors of a free program will individually
-obtain patent licenses, in effect making the program proprietary. To prevent
-this, we have made it clear that any patent must be licensed for everyone's free use or not licensed at all. The precise terms and conditions for
-copying, distribution and modification follow.
-<P></P>
-<B>TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-<P></P>
-</B>0. This License applies to any program or other work which contains a notice
-placed by the copyright holder saying it may be distributed under the terms of this
-General Public License. The `Program”, below, refers to any such program or work, and a `work based on the Program' means either the Program or any derivative work under copyright law: that is
-to say, a work containing the Program or a portion of it, either verbatim or
-with modifications and/or translated into another language. (Hereinafter,
-translation is included without limitation in the term `modification'.) Each licensee is addressed as `you'.
-<P></P>
-Activities other than copying, distribution and modification are not covered
-by this License; they are outside its scope. The act of running the Program is
-not restricted, and the output from the Program is covered only if its contents
-constitute a work based on the Program (independent of having been made by
-running the Program). Whether that is true depends on what the Program does.
-<P></P>
-<OL><LI> You may copy and distribute verbatim copies of the Program's source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate copyright notice and
-disclaimer of warranty; keep intact all the notices that refer to this License
-and to the absence of any warranty; and give any other recipients of the Program
-a copy of this License along with the Program. 
-<P></P>
-</OL>You may charge a fee for the physical act of transferring a copy, and you may
-at your option offer warranty protection in exchange for a fee.
-<P></P>
-<OL START="2"><LI> You may modify your copy or copies of the Program or any portion of it, thus
-forming a work based on the Program, and copy and distribute such modifications
-or work under the terms of Section 1 above, provided that you also meet all of
-these conditions: 
-<P></P>
-</OL>a) You must cause the modified files to carry prominent notices stating that you
-changed the files and the date of any change.
-<P></P>
-b) You must cause any work that you distribute or publish, that in whole or in
-part contains or is derived from the Program or any part thereof, to be licensed
-as a whole at no charge to all third parties under the terms of this License.
-<P></P>
-c) If the modified program normally reads commands interactively when run, you
-must cause it, when started running for such interactive use in the most ordinary
-way, to print or display an announcement including an appropriate copyright
-notice and a notice that there is no warranty (or else, saying that you provide a
-warranty) and that users may redistribute the program under these conditions,
-and telling the user how to view a copy of this License. (Exception: if the
-Program itself is interactive but does not normally print such an announcement,
-your work based on the Program is not required to print an announcement.)
-<P></P>
-These requirements apply to the modified work as a whole. If identifiable
-sections of that work are not derived from the Program, and can be reasonably
-considered independent and separate works in themselves, then this License, and its
-terms, do not apply to those sections when you distribute them as separate
-works. But when you distribute the same sections as part of a whole which is a work
-based on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the entire whole,
-and thus to each and every part regardless of who wrote it. 
-<P></P>
-Thus, it is not the intent of this section to claim rights or contest your
-rights to work written entirely by you; rather, the intent is to exercise the
-right to control the distribution of derivative or collective works based on the
-Program. 
-<P></P>
-In addition, mere aggregation of another work not based on the Program with
-the Program (or with a work based on the Program) on a volume of a storage or
-distribution medium does not bring the other work under the scope of this License.
-<P></P>
-<OL START="3"><LI> You may copy and distribute the Program (or a work based on it, under Section
-2) in object code or executable form under the terms of Sections 1 and 2 above
-provided that you also do one of the following:
-<P></P>
-</OL>a) Accompany it with the complete corresponding machine-readable source code,
-which must be distributed under the terms of Sections 1 and 2 above on a medium
-customarily used for software interchange; or,
-<P></P>
-b) Accompany it with a written offer, valid for at least three years, to give any
-third party, for a charge no more than your cost of physically performing
-source distribution, a complete machine-readable copy of the corresponding source
-code, to be distributed under the terms of Sections 1 and 2 above on a medium
-customarily used for software interchange; or,
-<P></P>
-c) Accompany it with the information you received as to the offer to distribute
-corresponding source code. (This alternative is allowed only for noncommercial
-distribution and only if you received the program in object code or executable
-form with such an offer, in accord with Subsection b above.)
-<P></P>
-The source code for a work means the preferred form of the work for making
-modifications to it. For an executable work, complete source code means all the
-source code for all modules it contains, plus any associated interface definition
-files, plus the scripts used to control compilation and installation of the
-executable. However, as a special exception, the source code distributed need not
-include anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the operating
-system on which the executable runs, unless that component itself accompanies the
-executable.
-<P></P>
-If distribution of executable or object code is made by offering access to
-copy from a designated place, then offering equivalent access to copy the source
-code from the same place counts as distribution of the source code, even though
-third parties are not compelled to copy the source along with the object code.
-<P></P>
-<OL START="4"><LI> You may not copy, modify, sublicense, or distribute the Program except as
-expressly provided under this License. Any attempt otherwise to copy, modify,
-sublicense or distribute the Program is void, and will automatically terminate your
-rights under this License. However, parties who have received copies, or
-rights, from you under this License will not have their licenses terminated so long
-as such parties remain in full compliance.
-<P></P>
-<LI> You are not required to accept this License, since you have not signed it.
-However, nothing else grants you permission to modify or distribute the Program or
-its derivative works. These actions are prohibited by law if you do not accept
-this License. Therefore, by modifying or distributing the Program (or any work
-based on the Program), you indicate your acceptance of this License to do so,
-and all its terms and conditions for copying, distributing or modifying the
-Program or works based on it.
-<P></P>
-<LI> Each time you redistribute the Program (or any work based on the Program), the
-recipient automatically receives a license from the original licensor to copy,
-distribute or modify the Program subject to these terms and conditions. You
-may not impose any further restrictions on the recipients' exercise of the rights granted herein.
-<P></P>
-</OL>You are not responsible for enforcing compliance by third parties to this
-License.
-<P></P>
-<OL START="7"><LI> If, as a consequence of a court judgment or allegation of patent infringement
-or for any other reason (not limited to patent issues), conditions are imposed
-on you (whether by court order, agreement or otherwise) that contradict the
-conditions of this License, they do not excuse you from the conditions of this
-License. If you cannot distribute so as to satisfy simultaneously your obligations
-under this License and any other pertinent obligations, then as a consequence
-you may not distribute the Program at all. For example, if a patent license
-would not permit royalty-free redistribution of the Program by all those who
-receive copies directly or indirectly through you, then the only way you could
-satisfy both it and this License would be to refrain entirely from distribution of
-the Program.
-<P></P>
-</OL>If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply and the
-section as a whole is intended to apply in other circumstances. 
-<P></P>
-It is not the purpose of this section to induce you to infringe any patents or
-other property right claims or to contest validity of any such claims; this
-section has the sole purpose of protecting the integrity of the free software
-distribution system, which is implemented by public license practices. Many people
-have made generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that system; it is up
-to the author/donor to decide if he or she is willing to distribute software
-through any other system and a licensee cannot impose that choice. 
-<P></P>
-This section is intended to make thoroughly clear what is believed to be a
-consequence of the rest of this License.
-<P></P>
-<OL START="8"><LI> If the distribution and/or use of the Program is restricted in certain
-countries either by patents or by copyrighted interfaces, the original copyright
-holder who places the Program under this License may add an explicit geographical
-distribution limitation excluding those countries, so that distribution is
-permitted only in or among countries not thus excluded. In such case, this License
-incorporates the limitation as if written in the body of this License.
-<P></P>
-<LI> The Free Software Foundation may publish revised and/or new versions of the
-General Public License from time to time. Such new versions will be similar in
-spirit to the present version, but may differ in detail to address new problems
-or concerns. 
-<P></P>
-</OL>Each version is given a distinguishing version number. If the Program
-specifies a version number of this License which applies to it and `any later version', you have the option of following the terms and conditions either of that
-version or of any later version published by the Free Software Foundation. If the
-Program does not specify a version number of this License, you may choose any
-version ever published by the Free Software Foundation.
-<P></P>
-<OL START="a"><LI> If you wish to incorporate parts of the Program into other free programs whose
-distribution conditions are different, write to the author to ask for
-permission. For software which is copyrighted by the Free Software Foundation, write to
-the Free Software Foundation; we sometimes make exceptions for this. Our
-decision will be guided by the two goals of preserving the free status of all
-derivatives of our free software and of promoting the sharing and reuse of software
-generally.
-<P></P>
-</OL>NO WARRANTY
-<P></P>
-<OL START="b"><LI> BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE
-PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED
-IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM `AS IS' WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL
-NECESSARY SERVICING, REPAIR OR CORRECTION.
-<P></P>
-<LI> IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY
-COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE
-PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL,
-SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR
-INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF
-THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER
-PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-<P></P>
-</OL>END OF TERMS AND CONDITIONS
-<P></P>
-<B>How to Apply These Terms to Your New Programs
-<P></P>
-</B>If you develop a new program, and you want it to be of the greatest possible
-use to the public, the best way to achieve this is to make it free software
-which everyone can redistribute and change under these terms. 
-<P></P>
-To do so, attach the following notices to the program. It is safest to attach
-them to the start of each source file to most effectively convey the exclusion
-of warranty; and each file should have at least the `copyright' line and a pointer to where the full notice is found.
-<P></P>
-<I>one line for the program's name and a brief idea of what it does.
-<BR></I>Copyright (C) 19<I>yy</I> <I>name of author</I>
-<BR>
-<BR>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.
-<BR>
-<BR>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.
-<BR>
-<BR>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.
-<P></P>
-Also add information on how to contact you by electronic and paper mail. 
-<P></P>
-If the program is interactive, make it output a short notice like the
-following example when it starts in an interactive mode:
-<P></P>
-Gnomovision version 69, Copyright (C) 19yy name of author Gnomovision comes
-with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain
-conditions; type `show c' for details.
-<P></P>
-The hypothetical commands <B>show w</B> and <B>show c</B> should show the appropriate parts of the General Public License. Of course,
-the commands you use may be called something other than show w and show c; they can be mouse clicks or menu items—whatever suits your program. 
-<P></P>
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a `copyright disclaimer' for the program, if necessary. The following is a sample (when copying, alter
-the names).
-<P></P>
-Yoyodyne, Inc., hereby disclaims all copyright interest in the program `Gnomovision' (which makes passes at compilers) written by James Hacker.
-<BR>
-<BR>signature of Ty Coon, 1 April 1989 
-<BR>Ty Coon, President of Vice
-<P></P>
-This General Public License does not permit incorporating your program into
-proprietary programs. If your program is a subroutine library, you may consider
-it more useful to permit linking proprietary applications with the library. If
-this is what you want to do, use the GNU Library General Public License instead of this License.
-<P></P>
-</BODY>
-</HTML>
\ No newline at end of file
diff --git a/gdb/gdbtk/library/help/trace/locals.html b/gdb/gdbtk/library/help/trace/locals.html
deleted file mode 100644
index d0b1d2940e0..00000000000
--- a/gdb/gdbtk/library/help/trace/locals.html
+++ /dev/null
@@ -1,83 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>Locals Window Help</TITLE>
-</HEAD>
-<BODY>
-<H1>The Locals Window</H1>
-<H2>Overview</H2>
-<P>The Locals Window displays all local variables in scope. It may be used to
-visualize local variables. Local variables need to be collected
-before they can be viewed. See <A HREF="tracedlg.html#t_actions_add">Adding
-an Action</A> in the Tracepoint Dialog for more information.</P>
-
-<P>Locals Window topics:
-<UL>
-    <LI><UL><A HREF="#menus">Variable Menu</A>
-            <LI><A HREF="#menus_fmt">Format</A>
-        </UL>
-    <LI><UL><A HREF="#display">Locals Display</A>
-            <LI><A HREF="#display_deref">Dereferencing Pointers</A>
-            <LI><A HREF="#display_struct">Viewing a Structure or Class</A>
-            <LI><A HREF="#display_popup">Locals Pop-up Menu</A>
-        </UL>
-</UL></P>
-
-<H3><A NAME="menus">Variable Menu</A></H3>
-The Variable Menu gives on-screen access to the funtions of the Locals Window.
-To use any of these functions, first use the left mouse button to select a
-variable from the display. Then select:
-
-<DL>
-    <DT><A NAME="menus_fmt">Format</A>
-        <DD>Change the display format of the variable
-</DL>
-
-<H3><A NAME="display">Locals Display</A></H4>
-The Locals Window Display consists of a scrolled listbox which contains all
-local variables, one per line. Locals which were not collected at the current
-tracepoint will display a memory-access error. To use any of the functions of
-the Locals Window, use the left mouse button to select any element from the
-Display.
-
-<P>Pointers, structures, and classes appear in the display with small exapansion
-box before their names. To <A NAME="display_deref">dereference pointers</A> or
-<A NAME="display_struct">view the members of classes or structures</A>, click
-the closed expansion box (which appears as a small plus sign, "+") to "expand"
-the listing. The expansion box changes to a minus sign, "-", indicating that the
-display is now open. Pointers, structures and classes may be expanded recursively
-to allow multiple pointer dereferences and embedded structure viewing.
-
-<P>The Locals Display updates as the trace buffer is navigated, highlighting
-in blue those variables whose values have changed.</P>
-
-<P>The Locals Window will, by default, display all pointers in hexadecimal and all
-other variables in decimal. To change the default display of variables, use the
-"set output-radix" command in the console window. (Type "help set output-radix" in the
-console window for help. To make this change permanent, it must be added to the user's
-init file -- .gdbinit under unix and gdb.ini under Windows.) To change the display
-format for a variable, select the Format option from either the Variable Menu or the
-<A HREF="#display_popup">Locals Pop-up Menu</A>.
-<BR>
-
-<H4><A NAME="display_popup">Locals Pop-up Menu</A></H4>
-The Locals Pop-up Menu provides quick access to the functions of the Locals Window.
-To use the Locals Pop-up Menu, first select a variable from the Display (by clicking
-the left mouse button on it) and click the right mouse button, choosing from the
-pop-up:
-<DL>
-    <DT>Format
-        <DD>Change the display format of the variable. The variable may be displayed
-            as:
-            <DL>
-                <DT>Hex
-                    <DD>hexadecimal (base 16)
-                <DT>Decimal
-                    <DD>decimal (base 10)
-                <DT>Binary
-                    <DD>binary (base 2)
-                <DT>Octal
-                    <DD>octal (base 8)
-            </DL>
-</DL>
-</BODY>
-</HTML>
diff --git a/gdb/gdbtk/library/help/trace/memory.html b/gdb/gdbtk/library/help/trace/memory.html
deleted file mode 100644
index ad1cb36b9d1..00000000000
--- a/gdb/gdbtk/library/help/trace/memory.html
+++ /dev/null
@@ -1,142 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>Memory Window Help</TITLE>
-</HEAD>
-<BODY>
-<H1>The Memory Window</H1>
-<H2>Overview</H2>
-<P>The Memory Window allows users to display the contents of collected
-memory. The Memory Window Preferences controls all of the display
-characteristics of the Memory Window.</P>
-
-<P>Memory Window topics:
-<UL>
-    <LI><UL><A HREF="#menus">Address Menu</A>
-            <LI><A HREF="#menus_auto">Auto Update</A>
-            <LI><A HREF="#menus_now">Update Now</A>
-            <LI><A HREF="#menus_prefs">Preferences</A>
-        </UL>
-    <LI><UL><A HREF="#display">Memory Display</A>
-            <LI><A HREF="#display_nav">Navigating the Memory Window</A>
-            <LI><A HREF="#display_popup">Memory Pop-up Menu</A>
-        </UL>
-    <LI><UL><A HREF="#prefs">Memory Window Preferences</A>
-            <LI><A HREF="#prefs_size">Size of the Display Cell</A>
-            <LI><A HREF="#prefs_fmt">Format of the Display Cell</A>
-            <LI><A HREF="#prefs_bytes">Size of the Memory Window</A>
-            <LI><A HREF="#prefs_misc">Miscellaneous</A>
-        </UL>
-</UL></P>
-
-<H3><A NAME="menus">Address Menu</A></H3>
-<DL>
-    <DT><A NAME="menus_auto">Auto Update</A>
-        <DD>When selected, casues the Memory Window to update the Display.
-    <DT><A NAME="menus_now">Update Now</A>
-        <DD>Forces the Memory Window to update the Display.
-    <DT><A NAME="menus_prefs">Preferences</A>
-        <DD>Opens the Memory Window Preferences dialog.
-</DL>
-
-<H3><A NAME="display">Memory Display</A></H3>
-Like the <A HREF="register.html">Register Window</A>, the Memory Window
-Display is organized into a spreadsheet. The address of any cell in the
-Display can be determined by appeding the row and column headers for the
-cell. Optionally, an ASCII display of the memory appears at the right.
-Any non-ASCII-representable byte in memory will appear in the ASCII Display
-as a control character (a dot, ".", by default). The <A HREF="#pref">Memory
-Preferences Dialog</A> may be used to alter the appearance of the
-Memory Window. Any uncollected memory will appear as "N/A", indicating that
-this memory was not collected when the trace experiment was run.
-
-<P><A NAME="display_nav">To navigate the Memory Window</A>, use the mouse
-and click the cell of interest. As an alternative, pressing the TAB key on
-the keyboard will focus successive cells, from left to right, top to bottom.
-The focus will wrap from the bottom of the Display to the top.</P>
-<BR>
-
-<H4><A NAME="display_popup">Memory Pop-up Menu</A></H4>
-Clicking the right mouse button while the mouse cursor lies within the
-bounds of any cell will allow users to:
-<DL>
-    <DT>Auto Update
-        <DD>When selected, the Memory Window will track changes in
-            memory shown in the Display. Cells in which changes have
-            occured will be highlighted. When not selected, the Memory
-            Window is "frozen", representing a "snapshot" of memory.
-    <DT>Update Now
-        <DD>Causes the Memory Window to update all the cells shown.
-    <DT>Go To <I>address</I>
-        <DD>The Memory Window Display is updated to show memory starting
-            at address <I>address</I>.
-    <DT>Open New Window at <I>address</I>
-        <DD>A new Memory Window is opened, displaying memory at address
-            <I>address</I>
-    <DT>Memory Preferences...
-        <DD>Opens the Memory Window Preferences for editing the appearance
-            of the Memory Window Display.
-</DL>
-<BR>
-
-<H3><A NAME="prefs">Memory Window Preferences</A></H3>
-Memory Window Preference Dialog governs the appearance of the Memory Window:
-the total number of bytes displayed, the size of each cell, ASCII control
-character.
-<BR>
-
-<H4><A NAME="prefs_size">Size of the Display Cells</A></H4>
-This attribute controls how many bytes appear in each cell. Valid cell
-sizes in the Memory Window may be:
-<DL>
-    <DT>Byte
-        <DD>Each cell is exactly one byte
-    <DT>Half Word
-        <DD>Cells are displayed with two bytes
-    <DT>Word
-        <DD>Each cell contains four bytes
-    <DT>Double Word
-        <DD>Cells contain eight bytes
-    <DT>Float
-        <DD>Each cell contains four bytes, displayed as a floating point
-            number
-    <DT>Double Float
-        <DD>Cells are displayed as floating point, eight bytes each
-</DL>
-<BR>
-
-<H4><A NAME="prefs_fmt">Format of the Display Cells</A></H4>
-The Format option of the Memory Preferences Dialog governs how the debugger
-represents the memory. Possible representations include:
-
-<DL>
-    <DT>Binary
-        <DD>The values are shown as binary numbers
-    <DT>Signed Decimal
-        <DD>The values are shown as signed decimal numbers
-    <DT>Octal
-        <DD>Each cell is represented as an octal number
-    <DT>Unsigned Decimal
-        <DD>Values are displayed as unsigned decimals
-    <DT>Hex
-        <DD>Memory is displayed as a hexadecimal number. This is
-            the default.
-</DL>
-<BR>
-
-<H4><A NAME="prefs_bytes">Size of the Memory Window</A></H4>
-The size of the memory window determines how much memory is actually
-presented to the user. The total number of bytes shown can either be
-determined by the size of the window, in which case resizing the Memory
-Window will cause more or less memory to be displayed, or fixed at some
-specified number of bytes. By default, the Memory Window shows 128 bytes
-of memory.
-<BR>
-
-<H4><A NAME="prefs_misc">Miscellaneous</A></H4>
-Miscellaneous memory preferences include the option to display the ASCII
-representation of the memory, including what character to use for non-ASCII
-bytes (the "control" character). Additionally, users may specify the number
-of bytes per row, either four, eight, sixteen, or thirty-two. The default is
-sixteen bytes per row.
-</BODY>
-</HTML>
diff --git a/gdb/gdbtk/library/help/trace/reg_pref.html b/gdb/gdbtk/library/help/trace/reg_pref.html
deleted file mode 100644
index b21a5747df2..00000000000
--- a/gdb/gdbtk/library/help/trace/reg_pref.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>Register Window Preferences Help</TITLE>
-</HEAD>
-<BODY>
-<H1>Register Window Preferences</H1>
-<H3>Overview</H3>
-<P>Not yet done.</P>
-
-<P>Register Window Preferences topics:
-<UL>
-    <LI><UL><A HREF="#">stuff</A>
-            <LI><A HREF="#">stuff</A>
-            <LI><A HREF="#">stuff</A>
-        </UL>
-</UL></P>
-
-<H3><A NAME="">stuff</A></H3>
-</BODY>
-</HTML>
diff --git a/gdb/gdbtk/library/help/trace/register.html b/gdb/gdbtk/library/help/trace/register.html
deleted file mode 100644
index d0735593a12..00000000000
--- a/gdb/gdbtk/library/help/trace/register.html
+++ /dev/null
@@ -1,105 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>Register Window Help</TITLE>
-</HEAD>
-<BODY>
-<H1>The Register Window</H1>
-<H2>Overview</H2>
-<P>The Register Window lists all the registers and their contents for
-the selected stack frame. It permits viewing the contents of registers
-in different formats and some display customizations.</P>
-
-<P>Any register that was not collected will be displayed as having a value
-of "0x0". To collect registers, add them to the collection action in the
-<A HREF="tracedlg.html">Tracepoint Dialog</A>.
-
-<P>The Register Window will update the register contents in the display
-to match the stack frame currently being viewed in the <A HREF="source.html">
-Source Window</A> and <A HREF="stack.html">Stack Winodw</A>.</P>
-
-<P>Register Window topics:
-<UL>
-    <LI><UL><A HREF="#menus">Register Menu</A>
-            <LI><A HREF="#menus_fmt">Format</A>
-            <LI><A HREF="#menus_remove">Remove from Display</A>
-            <LI><A HREF="#menus_all">Display All Registers</A>
-        </UL>
-    <LI><UL><A HREF="#display">Register Display</A>
-            <LI><A HREF="#display_nav">Navigating the Register Display</A>
-            <LI><A HREF="#display_popup">Register Pop-up Menu</A>
-            <LI><A HREF="#display_format">Changing the Display Format of
-                a Register</A>
-            <LI><A HREF="#display_remove">Removing a Register
-                 from the display</A>
-            <LI><A HREF="#display_all">Displaying all Registers</A>
-        </UL>
-</UL></P>
-
-<H3><A NAME="menus">Register Menu</A></H3>
-The Register Menu provides on-screen access to the functionality of the
-Register Window. To use any item from this menu, first use the mouse and
-select (click the left mouse button) on any register cell. Users may then
-select:
-<BR>
-<DL>
-    <DT><A NAME="menus_fmt"><A HREF="#display_format">Format</A></A>
-        <DD>Change the display format of the selected register
-    <DT><A NAME="menus_remove"><A HREF="#display_remove">Remove
-        from Display</A></A>
-        <DD>Remove the selected register from the Register
-            Window Display
-    <DT><A NAME="menus_all"><A HREF="#display_all">Display All
-        Registers</A></A>
-        <DD>Display all registers in the Display. This item
-            is only available when a register was previously
-            removed from the Display.
-</DL>
-
-<H3><A NAME="display">Register Display</A></H3>
-The Register Display contains name and value pairs for each register
-available on the target hardware. These "cells" are layed out as a
-spreadsheet for ease of use.
-
-<P><A NAME="display_nav"></A>To navigate the Register Display, use either
-the mouse and left mouse button or the arrow keys on the keyboard to
-highlight the appropriate cell. Users may then use the <A HREF="#menus">
-Register Menu</A> or use the Register Pop-up Menu to access special display
-options for the Register Window.</P>
-<BR>
-
-<H4><A NAME="display_popup">The Register Pop-up Menu</A></H4>
-All of the special functions of the register window are accessed through
-the Register Pop-up Menu. To use the Menu, simply select a register (see
-<A HREF="#display_nav">Navigating the Register Display</A>) and click the
-right mouse button. The Menu offers:
-<DL>
-    <DT><A NAME="display_format">Format</A>
-        <DD><DL>Change the display format of the register. Valid display types
-            are:
-                <DT>Hex
-                    <DD>The register's contents are displayed in
-                        hexadecimal (base 16).
-                <DT>Decimal
-                    <DD>The value is shown as
-                        a decimal number (base 10).
-                <DT>Natural
-                    <DD>The register is displayed in its natural format.
-                <DT>Binary
-                    <DD>The contents of the register are displayed 
-                        as a binary number (base 2).
-                <DT>Octal
-                    <DD>The register's contents are shown in octal (base 8).
-                <DT>Raw
-                    <DD>The raw contents of the register are shown.
-             </DL>
-    <DT><A NAME="display_remove">Remove</A>
-        <DD>Remove the selected register from the display. To display
-            the removed register again, select the "Display All Registers"
-            option from the Register Menu or the Register Pop-up Menu.
-    <DT><A NAME="display_all">Display All Registers</A>
-        <DD>Causes the Register Window Display to show all registers,
-            including those which were previously "removed". This menu
-            item is only available when removed registers exist.
-</DL>
-</BODY>
-</HTML>
diff --git a/gdb/gdbtk/library/help/trace/source.html b/gdb/gdbtk/library/help/trace/source.html
deleted file mode 100644
index 9ec0005227b..00000000000
--- a/gdb/gdbtk/library/help/trace/source.html
+++ /dev/null
@@ -1,371 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>Source Window Help</TITLE>
-</HEAD>
-<BODY>
-<CENTER><H1>The Source Window</H1></CENTER>
-<H3>Overview</H3>
-<BR>
-The Source Window is the primary interface between the user and the
-debugger; it is automatically opened when the debugger starts.
-The Source Window displays the status of the trace experiment, controls
-navigation of the trace buffer, and allows visualization of the program
-execution.
-
-<P>Source Window topics:
-<UL>
-    <LI><UL><A HREF="#menus">Menus</A>
-            <LI><A HREF="#menus_file">File Menu</A>
-            <LI><A HREF="#menus_run">Run Menu</A>
-            <LI><A HREF="#menus_view">View Menu</A>
-            <LI><A HREF="#menus_trace">Trace Menu</A>
-            <LI><A HREF="#menus_prefs">Preferences Menu</A>
-        </UL>
-    <LI><UL><A HREF="#toolbar">Toolbar</A>
-            <LI><A HREF="#toolbar_exec">Trace Control Buttons</A>
-            <LI><A HREF="#toolbar_window">Window Buttons</A>
-            <LI><A HREF="#toolbar_frame">Frame Control</A>
-        </UL>
-    <LI><UL><A HREF="#display">Source Window Display</A>
-            <LI><A HREF="#display_balloon">Variable Balloons</A>
-            <LI><A HREF="#display_popup">Source Pop-up Mens</A>
-        </UL>
-    <LI><UL><A HREF="#status">Source Window Status Bars</A>
-            <LI><A HREF="#status_bar">Program Status Bar</A>
-            <LI><A HREF="#status_mode">Source Display Status Bar</A>
-        </UL>
-    <LI><A HREF="#search">Search Entry</A>
-</UL></P>
-
-<H3><A NAME="menus">Menus</A></H3>
-<H4><A NAME="menus_file">File Menu</A></H4>
-The File menu contains the following items:
-<DL>
-    <DT>Open
-        <DD>Opens a file selection dialog to select the executable to debug
-    <DT>Target Settings...
-        <DD>Opens the <A HREF="target.html">Target Selection Dialog</A>
-            to edit target settings
-    <DT>Page Setup
-        <DD>(Windows only) Opens the Windows Page Setup dialog to
-            configure printing
-    <DT>Print
-        <DD>(Windows only) Print the contents of the Source Window Display
-    <DT>Exit
-        <DD>Exits the debugger
-</DL>
-
-<H4><A NAME="menus_run">Run Menu</A></H4>
-The Run menu contains the following items:
-<DL>
-    <DT>Connect to target
-        <DD>Establish a connection to a target. This option will open
-            the <A HREF="target.html">Target Selection Dialog</A> if no
-            previous connection has been established in the current
-            session.
-    <DT>Begin Collection
-        <DD>Start collecting trace data on the target
-    <DT>End Collection
-        <DD>Stop collecting trace data on the target
-    <DT>Disconnect
-        <DD>Disconnect the debugger from the target
-</DL>
-
-<H4><A NAME="menus_view">View Menu</A></H4>
-The View menu contains the following items:
-<DL>
-    <DT>Stack
-        <DD>Open a <A HREF="stack.html">Stack Window</A>
-    <DT>Registers
-        <DD>Open a <A HREF="register.html">Register Window</A>
-    <DT>Memory
-        <DD>Open a <A HREF="memory.html">Memory Window</A>
-    <DT>Watch Expressions
-        <DD>Open a <A HREF="watch.html">Watch Window</A>
-    <DT>Local Variables
-        <DD>Open a <A HREF="locals.html">Locals Window</A>
-    <DT>Tracepoints
-        <DD>Open a <A HREF="tp.html">Tracepoint Window</A>
-    <DT>Tdump
-        <DD>Open a <A HREF="tdump.html">Tracepoint Dump Window</A>
-    <DT>Console
-        <DD>Open a <A HREF="console.html">Console Window</A>
-</DL>
-
-<H4><A NAME="menus_trace">Trace Menu</A></H4>
-The Trace Menu contains the following items:
-<DL>
-    <DT>Next Hit
-        <DD>Update all displays with the next tracepoint in the
-            tracepoint buffer
-    <DT>Previous Hit
-        <DD>Go to the previous tracepoint in the buffer
-    <DT>First Hit
-        <DD>View the first tracepoint in the buffer
-    <DT>Next Line Hit
-        <DD>Go to the next tracepoint in the buffer in the same
-            frame as the current tracepoint
-    <DT>Next Hit Here
-        <DD>Jump to the next reference of the current tracepoint
-            in the buffer
-    <DT>Tfind Line...
-        <DD>Opens a dialog allowing the user to specify which source
-            line to inpect in the tracepoint buffer
-    <DT>Tfind PC...
-        <DD>Opens a dialog allowing the user to specify the PC of the
-            tracepoint to view
-    <DT>Tfind Tracepoint...
-        <DD>Opens a dialog allowing the user to specify which tracepoint
-            to view (by number). This option is most commonly used in
-            conjunction with the <A HREF="console.html">Console Window</A>.
-</DL>
-
-<H4><A NAME="menus_prefs">Preferences Menu</A></H4>
-The Preferences menu contains the following items:
-<DL>
-    <DT>Global
-        <DD>Opens the <A HREF="gbl_pref.html">Global Preferences Dialog</A>
-            and allows editing of global settings
-    <DT>Source
-        <DD>Opens the <A HREF="src_pref.html">Source Preferences Dialog</A>
-            and allows editing of Source Window settings
-    <DT>Register
-        <DD>Opens the <A HREF="reg_pref.html">Register Preferences Dialog</A>
-            and allows editing of Register Window settings
-</DL>
-
-<H3><A NAME="toolbar">Toolbar</A></H3>
-The Source Window toolbar consists of three functional sections: trace
-control buttons, debugger window buttons, and stack frame control buttons.
-<BR>
-
-<H4><A NAME="toolbar_exec">Tracing Control Buttons</A></H4>
-These convenience buttons provide on-screen access to the most important
-debugger tracing control functions:
-<DL>
-    <DT><A NAME="run_button"><IMG SRC="%run"> TStart</A> or
-        <A NAME="stop_button"><IMG SRC="%stop"></A> TStop
-         <DD>The TStart Button causes the target to start collecting trace data
-         <DD>The TStop Button causes the target to stop collecting trace data
-    <DT>Next Hit
-        <DD>Update all displays with the next tracepoint in the
-            tracepoint buffer
-    <DT>Previous Hit
-        <DD>Go to the previous tracepoint in the buffer
-    <DT>First Hit
-        <DD>View the first tracepoint in the buffer
-    <DT>Next Line Hit
-        <DD>Go to the next tracepoint in the buffer in the same
-            frame as the current tracepoint
-    <DT>Next Hit Here
-        <DD>Jump to the next reference of the current tracepoint
-            in the buffer
-</DL>
-
-<H4><A NAME="toolbar_window">Window Buttons</A></H4>
-The Debugger Window buttons give instant access to the Debugger's
-auxillary windows:
-<DL>
-    <DT><A NAME="register_button"><IMG SRC="%register"></A> Registers
-        <DD>Open a <A HREF="register.html">Register Window</A>
-    <DT><A NAME="memory_button"><IMG SRC="%memory"></A> Memory
-        <DD>Open a <A HREF="memory.html">Memory Window</A>
-    <DT><A NAME="stack_button"><IMG SRC="%stack"></A> Stack
-        <DD>Open a <A HREF="stack.html">Stack Window</A>
-    <DT><A NAME="watch_button"><IMG SRC="%watch"></A> Watch Expressions
-        <DD>Open a <A HREF="watch.html">Watch Window</A>
-    <DT><A NAME="locals_button"><IMG SRC="%locals"></A> Local Variables
-        <DD>Open a <A HREF="locals.html">Locals Window</A>
-    <DT><A NAME="tracepoints_button">Tracepoints</A>
-        <DD>Open a <A HREF="tp.html">Tracepoint Window</A>
-    <DT>Tracepoint Dump Window
-        <DD>Open a <A HREF="tdump.html">Tdump Window</A>
-    <DT><A NAME="console_button"><IMG SRC="%console"></A> Console
-        <DD>Open a <A HREF="console.html">Console Window</A>
-</DL>
-
-<H4><A NAME="toolbar_frame">Frame Control</A></H4>
-The Frame Control area of the toolbar displays information about the PC of
-the current frame, and the frame control buttons may be used to navigate
-through the call stack. Whenever any of these buttons are used, both the
-Source Window Display and the <A HREF="stack.html">Stack Window</A> will
-show the selected frame. In order to use the Stack Window in tracing mode,
-the stack pointer must be collected.
-<DL>
-    <!-- is this a problem for windows? no file join? -->
-    <DT><IMG SRC="images/frame_info.gif"> Frame Information Display
-        <DD>The left half of the frame information display shows the
-            value of the PC in the current frame. The right half shows
-            the line number of the PC in the source file, if available.
-    <DT><A NAME="up_button"><IMG SRC="%up"></A> Up
-        <DD>Select and view the stack frame that called this one
-    <DT><A NAME="down_button"><IMG SRC="%down"></A> Down
-        <DD>Select and view the stack frame called by this one
-    <DT><A NAME="bottom_button"><IMG SRC="%bottom"></A> Bottom
-        <DD>Select and view the bottom-most stack frame
-</DL>
-
-<H3><A NAME="display">Source Display</A></H3>
-The Source Display is used for many things: browsing source code, setting,
-editing, and deleting tracepoints, and a few other special functions.
-Executable lines (those for which executable code was generated by the
-compiler) are denoted with a marker (a dash, "-") in the first column of
-the display.
-
-<P>The debugger highlights the PC in the current frame in either green,
-indicating that the PC is in the current tracepoint, or gold, indicating
-that the PC is contained in a frame that is not the current tracepoint, i.e.,
-as part of a stack backtrace. A blue highlight is used by the debugger to
-indicate a browsing position. All highlight colors
-are user-selectable in the <A HREF="src_pref.html">Source Preferences</A>.</P>
-<BR>
-
-<H4><A NAME="setting_a_tracepoint">Setting a Tracepoint</A></H4>
-Moving the mouse pointer over the "hot spot" of an executable line will change
-the mouse cursor to a large dot. Clicking the left mouse button will then allow
-tracepoint to be inserted at this line. If no tracepoint exists, the
-<A HREF="tracedlg.html">Add Tracepoint Dialog</A> will appear. If a tracepoint
-is installed, the dash in the left margin will change into a magenta breakdot.
-If a tracepoint exists, the <A HREF="tracedlg.html">Edit Tracepoint Dialog</A>
-appears, allowing either modification of the tracepoint or deletion of the
-tracepoint. If the tracepoint is deleted, the breakdot will revert to a dash.</P>
-
-<P>The executable line marker shows the status of each line: an empty marker
-(the dash) indicates that no tracepoint is set at the line. A colored breakdot
-indicates that a tracepoint exists at the line.</P>
-
-<P>The display will attempt to show the value of variables in
-<A NAME="display_balloon">variable balloons</A>. To activate a
-variable balloon, simply hold the mouse cursor over the name of
-a variable in the Source Display for a second or two: the debugger displays the
-name of the variable, its type, and its value in a pop-up balloon. If the
-variable was not collected, the Variable Balloon will show a memory-access error.</P>
-<BR>
-
-<H4><A NAME="display_popup">Source Pop-up Menus</A></H4>
-The Source Display has two pop-up menus. One is activated by clicking the
-right mouse button when the mouse cursor is over an executable line marker's
-hot spot. This pop-up menu provides access to:
-<DL>
-    <DT>Set Tracepoint
-        <DD>Opens the <A HREF="#tracedlg">Add/Edit Tracepoint Dialog</A>,
-            which allows new tracepoints to be set and modification and
-            deletion of existing tracepoints.
-</DL>
-
-<P>The other pop-up menu is activated by clicking the right mouse button
-anywhere else in the Source Display. It is only available when a variable
-or number in the display lies below the mouse cursor or is selected
-(by clicking the left mouse button and dragging the mouse to highlight
-the variable/number). The pop-up menu allows users to:
-<DL>
-    <DT><A NAME="add_to_watch">Add <I>expr</I> to Watch</A>
-        <DD>Adds the selected expression to the <A HREF="watch.html">Watch
-            Window</A>, opening it, if necessary.
-    <DT>Dump Memory at <I>expr</I>
-        <DD>Opens a new <A HREF="memory.html">Memory Window</A> at the
-            selected expression. If the expression is a variable, then
-            the Memory Window is opened with memory addresses starting
-            at the value of the variable.
-    <DT>Set Tracepoint Range
-        <DD>This option is only available when a range of lines is highlighted
-            in the Source Display. It allows tracepoints with the same
-            properties to be set at every executable line in the range. If
-            any tracepoints exist in the range already, the debugger will
-            ask if the properties of the existing tracepoint should be
-            replaced with the properties of the range.
-</DL>
-</P>
-
-<H4><A NAME="status">Source Window Status Bars</A></H4>
-The Source Window has two status bars which inform the user of the
-status of the program (the "status bar") and the status of the Source
-Window.
-
-<P>The <A NAME="status_bar">Program Status Bar</A> (or simply "Status Bar")
-displays the status of the program. Common messages seen here include:
-<DL>
-    <DT>No program loaded.
-        <DD>No program has been loaded into target memory.
-    <DT>Inspecting trace at <I>line/address</I>
-        <DD>The debugger is inspecting the tracepoint at line
-            <I>line</I> or address <I>address</I>. Use the
-            <A HREF="#toolbar_exec">Tracing Control Buttons</A>
-            to navigate through the trace buffer.
-</DL>
-<P>The Status Bar also displays some help information. For instance,
-the Status Bar will show the function of a button on the toolbar or
-the Source Display Status Bar as well as any keyboard shortcut for this
-button.</P>
-<BR>
-
-<H4><A NAME="status_mode">Source Display Status Bar</A></H4>
-current state of the Source Window: the name of the file displayed in
-the Display, the name of the function in the Display which contains
-the PC for the current frame (if any), and the display mode.
-
-<P>The <A NAME="file_selector">Source File Selector</A> is a dropdown
-menu which contains the names of all the files that were compiled into
-the program being debugged.</P>
-
-<P>Normally, the File Selector displays the name of the file currently being
-viewed, but any file from the dropdown menu may be selected for browsing.
-Simply select the file to view from the available choices (or type it directly
-into the File Selector) and the Source Window will load that file into
-the Display. To return to the current tracepoint, simply press the
-<A HREF="#bottom_button">Bottom Frame Control Button</A>.</P>
-
-<P>The <A NAME="function_selector">Source Function Selector</A> displays the
-name of the function containing the Source Window's PC, if one exists, but it
-may be used to browse any function in the current file. Simply type the name
-of the desired function into the Function Selector or select it from the
-dropdown menu. The Source Window's PC is updated to point at this function.
-To return to the current tracepoint, simply press the
-<A HREF="#bottom_button">Bottom Frame Control Button</A>.</P>
-
-<P>The <A NAME="mode_selector">Source Display Mode Selector</A> displays
-the viewing mode of the current file/function shown in the Source
-Window Display.</P>
-
-<P>The Display Mode Selector may be used to change the view of the current
-source file. The available display modes are
-<DL>
-    <DT>SOURCE
-        <DD>The contents of the Display are shown as source code.
-            If source code is not available (either because no debugging
-            information is available or the source file is not found),
-            the Source Window will revert the Display Mode to "ASSEMBLY".
-    <DT>ASSEMBLY
-        <DD>A disassembly of the target's memory is shown in the Display.
-            Even assembly source files show a disassembly of target memory;
-            to see the assembly source code, use the SOURCE mode. Note that the
-            debugger can only display assmebly code on a function-by-function
-            basis. It cannot display all the instructions generated from a single
-            source file.
-    <DT>MIXED
-        <DD>The Display shows source code mixed with the assembler
-            instructions which were generated for those lines by the 
-            compiler for the current funtion. Note that the addresses
-            of the assembly lines is not necessarily monotonically
-            increasing. If the source file associated with the function
-            cannot be found, the Source Window will revert to ASSEMBLY mode.
-    <DT>SRC+ASM
-        <DD>The Source Window Display is divided into two panes: an
-            assembly pane and a source pane. Tracepoints may be set/cleared
-            in either pane.
-</DL>
-<BR>
-
-<H3><A NAME="search">Search Entry</A></H3>
-The Search Entry facilitates searching for text in the Source Window Display. Simply enter the
-text to be found into the Search Entry and press the Enter key on the keyboard to search
-forwards in the Source Window Display (hold down ths Shift key to search backwards). If
-a match is found, it is highlighted in the Source Window and the Program Status Bar
-displays information about where the match was found.
-
-<P>The Search Entry can also jump the Source Window to a specific line. Enter the line
-number preceeded by an at-sign (@) into the Search Entry and press enter. If entered
-line number is greater than the total number of lines in the Source Window Display,
-the Display will jump to the end of the current file.</P>
-</BODY>
-</HTML>
diff --git a/gdb/gdbtk/library/help/trace/src_pref.html b/gdb/gdbtk/library/help/trace/src_pref.html
deleted file mode 100644
index e8547964653..00000000000
--- a/gdb/gdbtk/library/help/trace/src_pref.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>Source Window Preferences Help</TITLE>
-</HEAD>
-<BODY>
-<H1>Source Window Preferences</H1>
-<H3>Overview</H3>
-<P>Not yet done.</P>
-
-<P>Source Preferences topics:
-<UL>
-    <LI><UL><A HREF="#">stuff</A>
-            <LI><A HREF="#">stuff</A>
-            <LI><A HREF="#">stuff</A>
-        </UL>
-</UL></P>
-
-<H3><A NAME="">stuff</A></H3>
-</BODY>
-</HTML>
diff --git a/gdb/gdbtk/library/help/trace/stack.html b/gdb/gdbtk/library/help/trace/stack.html
deleted file mode 100644
index 25bbf0b54f4..00000000000
--- a/gdb/gdbtk/library/help/trace/stack.html
+++ /dev/null
@@ -1,51 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>Stack Window Help</TITLE>
-</HEAD>
-<BODY>
-<H1>The Stack Window</H1>
-<H3>Overview</H3>
-<P>The Stack Window allows users to view the call stack and jump between
-levels of the stack. To use the Stack Window in tracepoint mode, the
-stack pointer must be collected. See
-<A HREF="tracedlg.html#t_actions_add">Adding an Action</A> in the Tracepoint
-Dialog for more information on collecting registers.</P>
-
-<P>Stack Window topics:
-<UL>
-    <LI><UL><A HREF="#display">Stack Display</A>
-            <LI><A HREF="#display_nav">Navigating the Stack Window</A>
-            <LI><A HREF="#display_lvl">Changing the Stack Level</A>
-        </UL>
-</UL></P>
-
-<H3><A NAME="display">Stack Display</A></H3>
-The Stack Display consists of a listbox which displays levels of the call stack
-one per line. Each line contains the level number (useful when using the <A
-HREF="console.html">Console Window</A>) and a description of the function executing
-in that level. Typically, the function name and either the address of the function
-or the file and line number where the function is defined are displayed. The
-Stack Window may also be used to jump between levels of the stack.
-<BR>
-
-<H4><A NAME="display_nav">Navigating the Stack Window</A></H4>
-Navigation of the Stack Window is accomplished by clicking on the desired level
-with the left mouse button. The <A HREF="source.html#display">Source Window
-Display</A> updates to show the selected frame. All other secondary windows,
-<A HREF="register.html">Registers</A>, <A HREF="watch.html">Watch</A>, and
-<A HREF="locals.html">Locals</A> update their displays for the selected frame.
-<BR>
-
-<H4><A NAME="display_lvl">Changing Stack Levels</A></H4>
-To switch frames, simply click the left mouse button on the desired frame and the
-debugger will switch contexts, updating all windows. The selected frame is highlighted
-(in gold, by default).
-
-<P>As an alternative, changing stack levels may be accomplished via the
-<A HREF="source.html#toolbar_frame">Frame Control Buttons</A> on the Source Window's
-Toolbar. These buttons may be used to change frames one level at a time (either
-immediately up or immediately down) or to jump to the bottom-most stack frame.
-See <A HREF="source.html#toolbar_frame">Source Frame Control Buttons</A> for more
-information.</P>
-</BODY>
-</HTML>
diff --git a/gdb/gdbtk/library/help/trace/target.html b/gdb/gdbtk/library/help/trace/target.html
deleted file mode 100644
index 83c6420a138..00000000000
--- a/gdb/gdbtk/library/help/trace/target.html
+++ /dev/null
@@ -1,68 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>Target Selection Help</TITLE>
-</HEAD>
-<BODY>
-<H1>The Target Selection Dialog</H1>
-<H3>Overview</H3>
-<P>The Target Selection Dialog allows users to specify the debug target,
-the interface used to connect to the target, and some useful run
-options.</P>
-
-<P>Target Selection topics:
-<UL>
-    <LI><UL><A HREF="#select">Selecting a Target</A>
-            <LI><A HREF="#select_tar">Specifying a Target</A>
-            <LI><A HREF="#select_int">Choosing a Connection Interface</A>
-        </UL>
-    <LI><UL><A HREF="#options">Run Options</A>
-            <LI><A HREF="#options_run_until_main">Run until 'main'</A>
-            <LI><A HREF="#options_bp_at_exit">Set breakpoint at 'exit'</A>
-            <LI><A HREF="#options_download_dialog">Display Download Dialog</A>
-            <LI><A HREF="#options_compare_to_remote_executable">Compare to
-            remote executable</A>
-        </UL>
-</UL></P>
-
-<H3><A NAME="select">Selecting a Target</A></H3>
-Selecting a target involves choosing a target for debugging and setting connection
-interface options for the target. 
-
-<P>Common targets include: "exec" for native debuggers, "remote" for establishing
-a connection to a target board via a serial line, "remotetcp" for TCP connections,
-and "sim" for connections to the simulator. There may be more depending on the
-configuration of the debugger being used.</P>
-
-<P>In general, "remote" targets are always serial connections which require the user
-to specify the serial port and baud rate to be used for the connection and
-"remotetcp" targets are always TCP connections which require specifying the hostname
-and port number of the machine to which to connect. Depending upon configuration,
-there may be numerous serial- and TCP-based connections. These always follow the
-naming convention <I>target</I> and <I>target</I>tcp.</P>
-
-<P>To <A NAME="select_tar"> select a target</A>, choose one of the available targets
-from the dropdown menu in the Connection Frame. Then <A NAME="#select_int">specify
-the interface options</A> for this target: selecting the baudrate and serial port
-from the dropdown menus (serial targets only) or entering the hostname and port number
-(TCP targets only).</P>
-
-<H3><A NAME="options">Run Options</A></H3>
-Three run options which may be selected include:
-<DL>
-    <DT><A NAME="options_run_until_main">Run until 'main'
-        <DD>Sets a breakpoint at main(). This has no effect when using
-            GDB in tracing mode.
-    <DT><A NAME="options_bp_at_exit">Set breakpoint at 'exit'
-        <DD>Sets a breakpoint at exit(). This has no effect when using
-            GDB in tracing mode.
-    <DT><A NAME="options_download_dialog">Display Download Dialog
-        <DD>Displays a dialog showing the progress of the download to
-            the target section by section. This has no effect when using
-            GDB in tracing mode.
-    <DT><A NAME="options_compare_to_remote_executable">
-        Compare to remote executable</A>
-        <DD>When attaching to a tracing target, compare the host's and target's
-            executable by computing the checksum of each loadable section.
-</DL>
-</BODY>
-</HTML>
diff --git a/gdb/gdbtk/library/help/trace/tdump.html b/gdb/gdbtk/library/help/trace/tdump.html
deleted file mode 100644
index 1850cb00373..00000000000
--- a/gdb/gdbtk/library/help/trace/tdump.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>Trace Dump Window Help</TITLE>
-</HEAD>
-<BODY>
-<H1>The TDump Window</H1>
-<H3>Overview</H3>
-<P>The Tdump Window displays all of the information contained in the
-trace buffer for the current tracepoint. To view the contents of the
-trace buffer for a specific tracepoint, use the <A HREF="source.html#toolbar_exec">
-Tracing Control Buttons</A> on the <A HREF="source.html#toolbar">Source Window Toolbar
-</A>, or jump to the tracepoint using one of the Tfind Dialogs accessible
-through the Source Window's <A HREF="source.html#menus_trace">Trace Menu</A>.
-</P>
-</BODY>
-</HTML>
diff --git a/gdb/gdbtk/library/help/trace/tp.html b/gdb/gdbtk/library/help/trace/tp.html
deleted file mode 100644
index 471e1d545e9..00000000000
--- a/gdb/gdbtk/library/help/trace/tp.html
+++ /dev/null
@@ -1,111 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>Tracepoint Window Help</TITLE>
-</HEAD>
-<BODY>
-<H1>The Tracepoint Window</H1>
-<H3>Overview</H3>
-<P>The Tracepoint Window lists all the various tracepoints that exist in
-the program. It facilitates modifying tracepoints (make them
-temporary or normal, disabled or enabled) and removing tracepoints.</P>
-
-<P>Tracepoint Window topics:
-<UL>
-    <LI><UL><A HREF="#menus">Menus</A>
-            <LI><A HREF="#menus_bp">Tracepoint Menu</A>
-            <LI><A HREF="#menus_global">Global Menu</A>
-        </UL>
-    <LI><UL><A HREF="#display">Tracepoint Display</A>
-            <LI><A HREF="#display_state">Enabling/Disabling Tracepoints</A>
-            <LI><A HREF="#display_remove">Removing Tracepoints</A>
-            <LI><A HREF="#display_popup">Tracepoint Pop-up Menu</A>
-        </UL>
-</UL></P>
-
-<H3><A NAME="menus">Menus</A></H3>
-The Tracepoint Window contains two menus, one which deals specifically with
-the individual tracepoints selected in the window, and one whose commands
-affect all tracepoints.
-<BR>
-
-<H4><A NAME="menus_bp">Tracepoint Menu</A></H4>
-The Tracepoint Menu operates on the selected tracepoint only. The
-state of a tracepoint may be changed by selecting the desired state
-from the menu:
-<DL>
-    <DT>Actions
-        <DD><A HREF="tracedlg.html">Display the Tracepoint Dialog</A> for
-            this tracepoint.
-    <DT>Enabled
-        <DD>The tracepoint is active and will stop the debugger
-            when it is hit.
-    <DT>Disabled
-        <DD>The tracepoint is being ignored. A disabled tracepoint
-            will never get hit.
-    <DT>Remove
-        <DD>Deletes the tracepoint
-</DL>
-<BR>
-
-<H4><A NAME="menus_global">Global Menu</A></H4>
-Items on the Global Menu affect all defined tracepoints. Users may:
-<DL>
-    <DT>Enable All
-        <DD>Enable all tracepoints
-    <DT>Disable All
-        <DD>Disable all tracepoints
-    <DT>Remove All
-       <DD>Delete all tracepoints
-</DL>
-<BR>
-
-<H4><A NAME="display">Tracepoint Display</A></H4>
-The Tracepoint Display is a table of tracepoints. The first column of the
-table (unlabeled) shows a checkbutton, indicating whether the tracepoint
-is enabled (checked) or disabled (unchecked). Disabled tracepoints are
-ignored and will not cause any actions to be performed on the target.
-
-<P>To use the Tracepoint Menu or the Tracepoint Pop-up Menu, first use
-the left mouse button to select a tracepoint from the list, then make the
-menu selection.</P>
-
-<H3>Modifying Tracepoints</H3>
-To <A NAME="display_state">enable</A> a tracepoint, simply click the
-checkbutton in the first column of the desired tracepoint so that it is
-selected (checked). To disable a tracepoint, "uncheck" the checkbutton.
-
-<P>To remove a <A NAME="display_remove">tracepoint</A>, use the left mouse
-button to select the tracepoint to remove and use either the tracepoint Menu
-or the Tracepoint Pop-up Menu to select "remove". To re-install a tracepoint,
-use the <A HREF="source.html#setting_a_tracepoint">Source Window Display</A>.
-</P>
-<BR>
-
-<H4><A NAME="display_popup">Tracepoint Pop-up Menu</A></H4>
-The Tracepoint Pop-up Menu is accessed by using the mouse cursor to select
-a tracepoint from the Tracepoint Display and then clicking the right button
-on the mouse. The Pop-up allows expert users quicker access to the functions
-of the Tracepoint Menu:
-<DL>
-    <DT>Actions
-        <DD>Display the <A HREF="tracedlg.html">Tracepoint Dialog</A> for
-            the selected tracepoint. This allows the tracepoint's actions
-            to viewed or edited.
-    <DT>Enabled
-        <DD>The tracepoint is active and will causes actions to be
-            performed on the target when it is hit
-    <DT>Disabled
-        <DD>The tracepoint is being ignored. A disabled tracepoint
-            will never perform any actions or be recorded in the trace
-            buffer.
-    <DT>Remove
-        <DD>Deletes the tracepoint
-    <DT>Global, Enable All
-        <DD>Enable all tracepoints
-    <DT>Global, Disable All
-        <DD>Disable all tracepoints
-    <DT>Global, Remove All
-       <DD>Delete all tracepoints
-</DL>
-</BODY>
-</HTML>
diff --git a/gdb/gdbtk/library/help/trace/tracedlg.html b/gdb/gdbtk/library/help/trace/tracedlg.html
deleted file mode 100644
index 0ad9504471b..00000000000
--- a/gdb/gdbtk/library/help/trace/tracedlg.html
+++ /dev/null
@@ -1,134 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>Tracepoint Dialogs Help</TITLE>
-</HEAD>
-<BODY>
-<H1>Tracepoint Dialogs</H1>
-<H3>Overview</H3>
-<P>There are two Tracepoint Dialogs which help users set tracepoints:
-The Tracepoint Dialog is used to view and add actions and The Actions
-Dialog is used to edit a particular action specified in the
-tracepoint's Action List.</P>
-
-<P>Tracepoint Dialogs topics:
-<UL>
-    <LI><A HREF="#tracedlg">The Tracepoint Dialog</A>
-        <UL>
-            <LI><A HREF="#t_experiment">Experiment Frame</A>
-            <LI><A HREF="#t_actions">Actions Frame</A>
-                 <UL>
-                     <LI><A HREF="#t_actions_passcount">Number of Passes</A>
-                     <LI><A HREF="#t_actions_add">Adding Actions</A>
-                     <LI><A HREF="#t_actions_modify">Modifying Actions</A>
-                 </UL>
-         </UL>
-     <LI><A HREF="#actionsdlg">The Actions Dialog</A>
-         <UL>
-             <LI><A HREF="#a_variables">Variables List</A>
-             <LI><A HREF="#a_collect">Collection List</A>
-             <LI><A HREF="#a_other">Other Entry</A>
-         </UL>
-</UL></P>
-
-<H3><A NAME="tracedlg">The Tracepoint Dialog</H3>
-The Tracepoint Dialog is the gateway to viewing and editing
-the properties of any tracepoint. The same dialog is used
-to add new tracepoints and edit and delete existing tracepoints,
-for both single tracepoints and ranges of tracepoints.
-
-<H4><A NAME="t_experiment">Experiment Frame</A></H4>
-The Experiment Frame displays information about the tracepoint's
-location in the program and its status. Specifically,
-<DL>
-    <DT>Number
-        <DD>The internal number for this tracepoint. New tracepoints
-            all have the number "-1". This number may be used to
-            refer to specific tracepoints when using the
-            <A HREF="console.html">Console Window</A>
-    <DT>Hit Count
-        <DD>The number of times the tracepoint has been hit
-    <DT>Thread
-        <DD>The thread in which the tracepoint exists. This
-            feature is not currently implemented.
-    <DT>Function
-        <DD>The function in which the tracepoint is set
-    <DT>File
-        <DD>The file in which the tracepoint is set
-    <DT>Line(s)
-        <DD>The line at which the tracepoint is set or the
-            lines which the tracepoint range affects
-</DL>
-<BR>
-
-<H4><A NAME="t_actions">Actions Frame</A></H4>
-The Actions Frame displays the user-settable properties of the
-tracepoint, including all actions and a pass count.
-
-<P>A pass count specifies the number of times that the tracepoint
-can be hit on the target before the tracing experiment ceases. A
-pass count of five means that this tracepoint will issue a silent
-"tstop" when it is hit the fifth time (after it has performed all
-it actions). A pass count of zero (0) means that the tracepoint
-will never causes the trace experiment to terminate on the target.</P>
-
-<P>To <A NAME="t_actions_add">add an action</A> for the tracepoint,
-select the appropriate action from the Action ComboBox and click
-"Add". The <A HREF="#actionsdlg">Action Dialog</A> appears to
-allow editing the action's properties.</P>
-
-<P>Currently, there are two actions: collect and while-stepping.
-Any number of collect actions may be added to specify that the
-target should collect variables, registers, and memory when
-it is hit. The while-stepping action may be used to collect
-data for a specified number of machine instructions. Only one
-while-stepping action may be specified for any tracepoint.</P>
-
-<P>To <A NAME="t_actions_modify">modify the actions</A> associated
-with a tracepoint, double-click the left mouse button on the action
-listed in the Action Frame, and the <A HREF="#actionsdlg">Actions
-Dialog</A> will appear.</P>
-
-<P>To accept the tracepoint as displayed, click the OK button. To abort
-installing or editing the tracepoint, click the CANCEL button. To delete
-the tracepoint (if it is not a new tracepoint), click the DELETE button.</P>
-
-<H3><A NAME="actionsdlg">The Actions Dialog</A></H3>
-The Actions Dialog is used to edit an action for the tracepoint. It
-consists of two lists, one containing all (uncollected) local variables
-(including function arguments) and registers, and one containing everything
-being collected.
-
-<P>The <A NAME="#a_variables">Variables List</A> lists all uncollected local variables,
-function arguments, and registers  and may also display the special indentifiers
-"All Locals", "All Arguments", and "All Registers". Global variables (and file static
-variables) do not appear on the Variable List.</P>
-
-<P>To move a variable from the Variables List to the Collection List, double-click
-the variable in the Variables List or select the variable in the Variable
-List and press the "<<< Collect" button. To specify a range of variables to be
-collected, select them in the Variables list and click the "<<< Collect" button.</P>
-
-<P><A NAME="a_collect">The Collection List displays all data being collected
-by the action, including the special types "All Locals", "All Registers", and
-"All Arguments", which specify that every local variable, every register, and
-every function argument will be collected, respectively. Specifying a local
-variable, for example, and "All Locals" will cause only the special identifier
-"All Locals" to be sent to the target. Analogously, "All Registers" and "All
-Arguments" also override any register or function argument specifically listed
-in the Collection List.</P>
-
-<P>To remove data from the Collection List, double-click any of the entries listed
-in the List, or select a range of data to be removed and press the "Ignore >>>"
-button. All local variables, function arguments, registers, and special identifiers
-will be returned to the Variable List, while any expression (memory ranges, globals)
-will simply "disappear". To add these again, use the <A HREF="#a_other">Other Entry</A>
-at the bottom of the display.</P>
-
-<P>The <A NAME="#a_other">Other Entry</A> can be used to move any variable listed in
-either the Collection List or the Variable List to the other list. It can also
-be used to specify expressions for collection, such as memory ranges and global variables.
-Simply enter the name of the global variable or the expression and press the enter key on
-the keyboard. If the expression is valid, it will be added/removed from the Collection
-List.</P>
-</BODY>
-</HTML>
diff --git a/gdb/gdbtk/library/help/trace/watch.html b/gdb/gdbtk/library/help/trace/watch.html
deleted file mode 100644
index 373ad183a96..00000000000
--- a/gdb/gdbtk/library/help/trace/watch.html
+++ /dev/null
@@ -1,118 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>Watch Window Help</TITLE>
-</HEAD>
-<BODY>
-<H1>The Watch Window</H1>
-<H3>Overview</H3>
-<P>The Watch Window may be used to inspect any collected expression, including
-global variables, static variables, local variables, function arguments,
-and registers.</P>
-
-<P>Watch Window topics:
-<UL>
-    <LI><UL><A HREF="#menus">Watch Menu</A>
-            <LI><A HREF="#menus_fmt">Format</A>
-            <LI><A HREF="#menus_remove">Remove</A>
-        </UL>
-    <LI><UL><A HREF="#new">Adding Watch Expressions</A>
-            <LI><A HREF="#new_ent">In the Watch Window</A>
-            <LI><A HREF="#new_src">In the Source Window</A>
-            <LI><A HREF="#new_cast">Casting Pointers</A>
-        </UL>
-    <LI><UL><A HREF="#display">Watch Display</A>
-            <LI><A HREF="#display_deref">Dereferencing Pointers</A>
-            <LI><A HREF="#display_struct">Viewing a Structure or Class</A>
-            <LI><A HREF="#display_popup">Watch Pop-up Menu</A>
-        </UL>
-</UL></P>
-
-<H3><A NAME="menus">Watch Menu</A></H3>
-The Watch Menu gives on-screen access to the funtions of the Watch Window.
-To use any of these functions, first use the left mouse button to select an
-expression from the display. Then select:
-
-<DL>
-    <DT><A NAME="menus_fmt">Format</A>
-        <DD>Change the display format of the expression
-    <DT><A NAME="menus_remove">Remove</A>
-        <DD>Remove the expression from the Watch Window
-</DL>
-
-<H3><A NAME="new">Adding Watch Expressions</A></H3>
-<A NAME="new_ent">To add an expression to the Watch Window</A>, simply enter
-the expression into the entry at the bottom of the window and press return
-or click the "Add Watch" button. The expression is validated and added to the
-Watch Window Display.
-
-<P><A NAME="new_src">To add an expression to the Watch Window from the
-<A HREF="source.html">Source Window</A></A>, use the
-"<A HREF="source.html#add_to_watch">Add to Watch</A>" option of the
-<A HREF="source.html#display_popup">Source Window Pop-up Menu</A>.</P>
-
-<P>Any legal expression may be added to the Watch Window, which will
-evaluate each of its expressions everytime the program runs. Be cautious
-adding expressions which cause assignments, such as "<CODE>i++</CODE>".</P>
-
-<P>Adding a register to the Watch Window can be advantages when debugging
-via a slow serial line. In this case, keeping the entire Register Window open
-may be inefficient. Consider adding the register to the Watch Window. Simply
-enter the name of the register preceded with a dollar sign ($) into the
-Entry. For example, to watch the PC register, enter "<CODE>$pc</CODE>" into
-the Watch Window Entry. The program counter is added to the Display.</P>
-
-<P><A NAME="new_cast">To cast pointers</A>, simply enter the cast into the
-Watch Window Entry at the bottom of the window. Use the same syntax for the
-cast that the source file uses. If the source file uses C, the a simple
-cast of "<CODE>ptr</CODE>" of type "<CODE>void *</CODE>" can be cast to type
-"<CODE>my_struct</CODE>" by entering "<CODE>(my_struct *) ptr</CODE>" into
-the Entry.</P>
-
-<H3><A NAME="display">Watch Display</A></H3>
-The Watch Window Display consists of a scrolled listbox which contains all
-watch expressions, one per line. To use any of the functions of the Watch
-Window, use the left mouse button to select any element from the Display.
-
-<P>Pointers, structures, and classes appear in the display with a small
-exapansion box before their names. To <A NAME="display_deref">dereference
-pointers</A> or <A NAME="display_struct">view the members of classes or
-structures</A>, click the closed expansion box (which appears as a small
-plus sign, "+") to "expand" the listing. The expansion box changes to a
-minus sign, "-", indicating that the display is now open. Pointers,
-structures and classes may be expanded recursively to allow multiple pointer
-dereferences and embedded structure viewing.
-
-<P>The Locals Display updates as the trace buffer is navigated, highlighting
-in blue those variables whose values have changed.</P>
-
-<P>The Watch Window will, by default, display all pointers in hexadecimal and all
-other variables in decimal. To change the default display of variables, use the
-"set output-radix" command in the console window. (Type "help set output-radix" in the
-console window for help. To make this change permanent, it must be added to the user's
-init file -- .gdbinit under unix and gdb.ini under Windows.) To change the display
-format for a variable, select the Format option from either the Variable Menu or the
-<A HREF="#display_popup">Watch Pop-up Menu</A>.
-<BR>
-
-<H4><A NAME="display_popup">Watch Pop-up Menu</A></H4>
-The Watch Pop-up Menu provides quick access to the functions of the Watch Window.
-To use the Locals Pop-up Menu, first select an expression from the Display (by
-clicking the left mouse button on it) and click the right mouse button, choosing
-from the pop-up:
-<DL>
-    <DT>Format
-        <DD>Change the display format of the expression. The expression may be
-            displayed as:
-            <DL>
-                <DT>Hex
-                    <DD>hexadecimal (base 16)
-                <DT>Decimal
-                    <DD>decimal (base 10)
-                <DT>Binary
-                    <DD>binary (base 2)
-                <DT>Octal
-                    <DD>octal (base 8)
-            </DL>
-</DL>
-</BODY>
-</HTML>
diff --git a/gdb/gdbtk/library/help/watch.html b/gdb/gdbtk/library/help/watch.html
deleted file mode 100644
index 01e253b1883..00000000000
--- a/gdb/gdbtk/library/help/watch.html
+++ /dev/null
@@ -1,86 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>Watch Window Help</TITLE>
-</HEAD>
-<BODY>
-<H1>The Watch Window</H1>
-<img src="images/watch.png" alt="Watch Window Image" width=545 height=308 border=0>
-<H2>Overview</H2>
-
-<P>The Watch Window may be used to inspect and edit any expression, including
-global variables, static variables, local variables, function arguments,
-and registers. All expressions in scope are displayed with the expression in
-blue, the expression type in red, and the expression value in black.  When an
-expression value changes, it is displayed in green. Expressions that are not
-in scope are all gray.</P>
-
-
-<H3>Adding Watch Expressions</H3>
-<p>To add an expression to the Watch Window, simply enter
-the expression into the entry at the bottom of the window and press return
-or click the "Add Watch" button. The expression is validated and added to the
-Watch Window Display.</p>
-
-<P>To add an expression to the Watch Window from the
-<A HREF="source.html">Source Window</A>, use the
-"<A HREF="source.html#add_to_watch">Add to Watch</A>" option of the
-<A HREF="source.html#display_popup">Source Window Pop-up Menu</A>.</P>
-
-<P>Any legal expression may be added to the Watch Window, which will
-evaluate each of its expressions everytime the program runs. Be cautious
-adding expressions which cause assignments, such as "<CODE>i++</CODE>".</P>
-
-<P>Adding a register to the Watch Window can be advantages when debugging
-via a slow serial line. In this case, keeping the entire Register Window open
-may be inefficient. Consider adding the register to the Watch Window. Simply
-enter the name of the register preceded with a dollar sign ($) into the
-Entry. For example, to watch the PC register, enter "<CODE>$pc</CODE>" into
-the Watch Window Entry. The program counter is added to the Display.</P>
-
-<P>To cast pointers, simply enter the cast into the
-Watch Window Entry at the bottom of the window. Use the same syntax for the
-cast that the source file uses. If the source file uses C, the a simple
-cast of "<CODE>ptr</CODE>" of type "<CODE>void *</CODE>" can be cast to type
-"<CODE>my_struct</CODE>" by entering "<CODE>(my_struct *) ptr</CODE>" into
-the Entry.</P>
-
-<H3>Watch Display</H3>
-<p>The Watch Window Display consists of a scrolled listbox which contains all
-watch expressions, one per line. To use any of the functions of the Watch
-Window, use the left mouse button to select any element from the Display.</p>
-
-<P>Pointers, structures, and classes appear in the display with a small
-exapansion box before their names. To dereference
-pointers or view the members of classes or
-structures, click the closed expansion box (which appears as a small
-plus sign, "+") to "expand" the listing. The expansion box changes to a
-minus sign, "-", indicating that the display is now open. Pointers,
-structures and classes may be expanded recursively to allow multiple pointer
-derefernces and embedded structure viewing.</P>
-
-<P>The Watch Display updates after every execution of the program and
-highlights in green those expressions whose values have changed.</P>
-
-<P>The Watch Window will, by default, display all pointers and registers in
-hexadecimal and all other expressions in decimal. To change the display
-format for an expression, select the Format option from the pop-up menu.</P>
-
-<H3>Editing an Expression</H3>
-<p>To edit an expression, either double-click the left mouse button on the expression
-in the Display or select the Edit option from the popup-menu. To abort editing 
-an expression's value, simply press
-the escape key on the keyboard. The expression's original value is restored.</p>
-
-<H3>Watch Pop-up Menu</H3>
-<p>The pop-up menu provides quick access to the functions of the Watch Window.
-To use the pop-up menu, click the right mouse button while over a variable.</p>
-<DL>
-    <dt>Format<dd>Change the display format of the variable.</dd></dt>
-    <dt>Edit<dd>Edit the variable's value.</dd></dt>
-    <dt>Delete<dd>Remove the variable from the display.</dd></dt>
-    <dt>Dump Memory<dd>Open a Memory Window with the variable's value as an aaddress.</dd></dt>
-    <dt>Help<dd>Open this help page.</dd></dt>
-    <dt>Close<dd>Close the Local Variables Window.</dd></dt>
-</DL>
-</BODY>
-</HTML>
diff --git a/gdb/gdbtk/library/helpviewer.tcl b/gdb/gdbtk/library/helpviewer.tcl
deleted file mode 100644
index c7237255200..00000000000
--- a/gdb/gdbtk/library/helpviewer.tcl
+++ /dev/null
@@ -1,98 +0,0 @@
-# Open a viewer for HTML help info
-# Copyright 2002, Red Hat, Inc.
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License (GPL) 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.
-
-# ------------------------------------------------------------------------------
-# NAME:		public proc open_help
-# SYNOPSIS:	open_help file
-# DESC:		Opens html help file using an appropriate
-#		browser.
-# ------------------------------------------------------------------------------
-
-proc open_help {hfile} {
-  debug $hfile
-  # create full pathname link
-  set link file://[file join $::GDBTK_LIBRARY help $hfile]
-
-  # windows is easy
-  if {$::tcl_platform(platform) == "windows"} {
-    ide_shell_execute open $link
-    return
-  }
-
-  #
-  # for Unix, we never know what is installed
-  #
-
-  # set list of viewer apps to try
-  switch [pref get gdb/compat] {
-    "KDE" {
-      set apps {htmlview khelpcenter mozilla}
-    }
-    "GNOME" {
-      set apps {htmlview mozilla gnome-help khelpcenter}
-    }      
-    default {
-      set apps {htmlview mozilla gnome-help khelpcenter netscape}
-    }
-  }
-
-  # If the user has previously entered a browser name, append it
-  # to the list. Should it go first or last? 
-  set bname [pref get gdb/help/browsername]
-  if {$bname != ""} {
-    lappend apps $bname
-  }
-  
-  # now loop through list checking each application
-  foreach app $apps {
-    debug "app=$app"
-    if {[catch "exec $app $link &" result]} {
-      debug "$app failed: $result"
-    } else {
-      return
-    }
-  }
-  
-  # if we reached here, nothing worked, so prompt for a name
-  set text "No help browser was found on your system.\n\
-Please enter the name of an HTML viewer application."
-  while {[set app [prompt_helpname  $text]] != "0"} {
-    if {$app != ""} {
-      if {[catch "exec $app $link &" result]} {
-	dbug W "$app failed: $result"
-	set text "Could not run application $app.\n\
-Please enter the name of an HTML viewer application."
-      } else {
-	pref set gdb/help/browsername $app
-	return
-      }
-    }
-  }
-}
-
-# displays an entry dialog and asks for the name of an application
-# returns 0 on cancel
-#         name on success
-proc prompt_helpname {text} {
-  iwidgets::promptdialog .pd -title "Browser Query" -modality application \
-    -labeltext  $text
-  if {[.pd activate]} {
-    set app [string trim [.pd get]]
-    destroy .pd
-    return $app
-  }
-  destroy .pd
-  debug "cancelled"
-  return 0
-}
-
diff --git a/gdb/gdbtk/library/images/Movie_off.gif b/gdb/gdbtk/library/images/Movie_off.gif
deleted file mode 100644
index 7fce569189e..00000000000
--- a/gdb/gdbtk/library/images/Movie_off.gif
+++ /dev/null
diff --git a/gdb/gdbtk/library/images/Movie_on.gif b/gdb/gdbtk/library/images/Movie_on.gif
deleted file mode 100644
index 51e29d679b2..00000000000
--- a/gdb/gdbtk/library/images/Movie_on.gif
+++ /dev/null
diff --git a/gdb/gdbtk/library/images/bottom.gif b/gdb/gdbtk/library/images/bottom.gif
deleted file mode 100644
index 82fe7ab0d2a..00000000000
--- a/gdb/gdbtk/library/images/bottom.gif
+++ /dev/null
diff --git a/gdb/gdbtk/library/images/bp.gif b/gdb/gdbtk/library/images/bp.gif
deleted file mode 100644
index 55a153d3e94..00000000000
--- a/gdb/gdbtk/library/images/bp.gif
+++ /dev/null
diff --git a/gdb/gdbtk/library/images/check.gif b/gdb/gdbtk/library/images/check.gif
deleted file mode 100644
index 37ff7d3ce81..00000000000
--- a/gdb/gdbtk/library/images/check.gif
+++ /dev/null
diff --git a/gdb/gdbtk/library/images/console.gif b/gdb/gdbtk/library/images/console.gif
deleted file mode 100644
index e9412b20540..00000000000
--- a/gdb/gdbtk/library/images/console.gif
+++ /dev/null
diff --git a/gdb/gdbtk/library/images/continue.gif b/gdb/gdbtk/library/images/continue.gif
deleted file mode 100644
index c3babce52ee..00000000000
--- a/gdb/gdbtk/library/images/continue.gif
+++ /dev/null
diff --git a/gdb/gdbtk/library/images/down.gif b/gdb/gdbtk/library/images/down.gif
deleted file mode 100644
index 0a591f4ac29..00000000000
--- a/gdb/gdbtk/library/images/down.gif
+++ /dev/null
diff --git a/gdb/gdbtk/library/images/edit.gif b/gdb/gdbtk/library/images/edit.gif
deleted file mode 100644
index bc033dbc066..00000000000
--- a/gdb/gdbtk/library/images/edit.gif
+++ /dev/null
diff --git a/gdb/gdbtk/library/images/finish.gif b/gdb/gdbtk/library/images/finish.gif
deleted file mode 100644
index d717238c335..00000000000
--- a/gdb/gdbtk/library/images/finish.gif
+++ /dev/null
diff --git a/gdb/gdbtk/library/images/gdbtk_icon.gif b/gdb/gdbtk/library/images/gdbtk_icon.gif
deleted file mode 100644
index 46f69e62852..00000000000
--- a/gdb/gdbtk/library/images/gdbtk_icon.gif
+++ /dev/null
diff --git a/gdb/gdbtk/library/images/help.gif b/gdb/gdbtk/library/images/help.gif
deleted file mode 100644
index 061e2c600cc..00000000000
--- a/gdb/gdbtk/library/images/help.gif
+++ /dev/null
diff --git a/gdb/gdbtk/library/images/home.gif b/gdb/gdbtk/library/images/home.gif
deleted file mode 100644
index ac71cd53388..00000000000
--- a/gdb/gdbtk/library/images/home.gif
+++ /dev/null
diff --git a/gdb/gdbtk/library/images/icons.txt b/gdb/gdbtk/library/images/icons.txt
deleted file mode 100644
index 2a15b5b4994..00000000000
--- a/gdb/gdbtk/library/images/icons.txt
+++ /dev/null
@@ -1 +0,0 @@
-Basic Icon Set
diff --git a/gdb/gdbtk/library/images/insight.gif b/gdb/gdbtk/library/images/insight.gif
deleted file mode 100644
index fa5cfe19617..00000000000
--- a/gdb/gdbtk/library/images/insight.gif
+++ /dev/null
diff --git a/gdb/gdbtk/library/images/less.gif b/gdb/gdbtk/library/images/less.gif
deleted file mode 100644
index 045025a8062..00000000000
--- a/gdb/gdbtk/library/images/less.gif
+++ /dev/null
diff --git a/gdb/gdbtk/library/images/memory.gif b/gdb/gdbtk/library/images/memory.gif
deleted file mode 100644
index 1f62949d7d5..00000000000
--- a/gdb/gdbtk/library/images/memory.gif
+++ /dev/null
diff --git a/gdb/gdbtk/library/images/more.gif b/gdb/gdbtk/library/images/more.gif
deleted file mode 100644
index 67cb020014e..00000000000
--- a/gdb/gdbtk/library/images/more.gif
+++ /dev/null
diff --git a/gdb/gdbtk/library/images/next.gif b/gdb/gdbtk/library/images/next.gif
deleted file mode 100644
index 99d1ea62ea7..00000000000
--- a/gdb/gdbtk/library/images/next.gif
+++ /dev/null
diff --git a/gdb/gdbtk/library/images/next_check.gif b/gdb/gdbtk/library/images/next_check.gif
deleted file mode 100644
index 4488f04c76b..00000000000
--- a/gdb/gdbtk/library/images/next_check.gif
+++ /dev/null
diff --git a/gdb/gdbtk/library/images/next_frame.gif b/gdb/gdbtk/library/images/next_frame.gif
deleted file mode 100644
index 1bbc97932c5..00000000000
--- a/gdb/gdbtk/library/images/next_frame.gif
+++ /dev/null
diff --git a/gdb/gdbtk/library/images/next_hit.gif b/gdb/gdbtk/library/images/next_hit.gif
deleted file mode 100644
index d65295c099a..00000000000
--- a/gdb/gdbtk/library/images/next_hit.gif
+++ /dev/null
diff --git a/gdb/gdbtk/library/images/next_line.gif b/gdb/gdbtk/library/images/next_line.gif
deleted file mode 100644
index 96b374f65e3..00000000000
--- a/gdb/gdbtk/library/images/next_line.gif
+++ /dev/null
diff --git a/gdb/gdbtk/library/images/nexti.gif b/gdb/gdbtk/library/images/nexti.gif
deleted file mode 100644
index d2b65d4a551..00000000000
--- a/gdb/gdbtk/library/images/nexti.gif
+++ /dev/null
diff --git a/gdb/gdbtk/library/images/open.gif b/gdb/gdbtk/library/images/open.gif
deleted file mode 100644
index 173290a2b9d..00000000000
--- a/gdb/gdbtk/library/images/open.gif
+++ /dev/null
diff --git a/gdb/gdbtk/library/images/prev_hit.gif b/gdb/gdbtk/library/images/prev_hit.gif
deleted file mode 100644
index 17ed5686ff9..00000000000
--- a/gdb/gdbtk/library/images/prev_hit.gif
+++ /dev/null
diff --git a/gdb/gdbtk/library/images/reg.gif b/gdb/gdbtk/library/images/reg.gif
deleted file mode 100644
index 8efac2fd28f..00000000000
--- a/gdb/gdbtk/library/images/reg.gif
+++ /dev/null
diff --git a/gdb/gdbtk/library/images/rewind.gif b/gdb/gdbtk/library/images/rewind.gif
deleted file mode 100644
index 60b3d6135b1..00000000000
--- a/gdb/gdbtk/library/images/rewind.gif
+++ /dev/null
diff --git a/gdb/gdbtk/library/images/run.gif b/gdb/gdbtk/library/images/run.gif
deleted file mode 100644
index 6f45f3a2a4d..00000000000
--- a/gdb/gdbtk/library/images/run.gif
+++ /dev/null
diff --git a/gdb/gdbtk/library/images/run_expt.gif b/gdb/gdbtk/library/images/run_expt.gif
deleted file mode 100644
index 1c5c37cbef3..00000000000
--- a/gdb/gdbtk/library/images/run_expt.gif
+++ /dev/null
diff --git a/gdb/gdbtk/library/images/src.gif b/gdb/gdbtk/library/images/src.gif
deleted file mode 100644
index a1890ef8759..00000000000
--- a/gdb/gdbtk/library/images/src.gif
+++ /dev/null
diff --git a/gdb/gdbtk/library/images/stack.gif b/gdb/gdbtk/library/images/stack.gif
deleted file mode 100644
index e17824a3592..00000000000
--- a/gdb/gdbtk/library/images/stack.gif
+++ /dev/null
diff --git a/gdb/gdbtk/library/images/step.gif b/gdb/gdbtk/library/images/step.gif
deleted file mode 100644
index 776c8c3466a..00000000000
--- a/gdb/gdbtk/library/images/step.gif
+++ /dev/null
diff --git a/gdb/gdbtk/library/images/stepi.gif b/gdb/gdbtk/library/images/stepi.gif
deleted file mode 100644
index d721c13e548..00000000000
--- a/gdb/gdbtk/library/images/stepi.gif
+++ /dev/null
diff --git a/gdb/gdbtk/library/images/stop.gif b/gdb/gdbtk/library/images/stop.gif
deleted file mode 100644
index d863aba7859..00000000000
--- a/gdb/gdbtk/library/images/stop.gif
+++ /dev/null
diff --git a/gdb/gdbtk/library/images/tdump.gif b/gdb/gdbtk/library/images/tdump.gif
deleted file mode 100644
index 87db34c06c6..00000000000
--- a/gdb/gdbtk/library/images/tdump.gif
+++ /dev/null
diff --git a/gdb/gdbtk/library/images/tp.gif b/gdb/gdbtk/library/images/tp.gif
deleted file mode 100644
index 6ddf743a3fa..00000000000
--- a/gdb/gdbtk/library/images/tp.gif
+++ /dev/null
diff --git a/gdb/gdbtk/library/images/up.gif b/gdb/gdbtk/library/images/up.gif
deleted file mode 100644
index df280098ebd..00000000000
--- a/gdb/gdbtk/library/images/up.gif
+++ /dev/null
diff --git a/gdb/gdbtk/library/images/vars.gif b/gdb/gdbtk/library/images/vars.gif
deleted file mode 100644
index 608fa9337b8..00000000000
--- a/gdb/gdbtk/library/images/vars.gif
+++ /dev/null
diff --git a/gdb/gdbtk/library/images/watch.gif b/gdb/gdbtk/library/images/watch.gif
deleted file mode 100644
index 077444d5fe1..00000000000
--- a/gdb/gdbtk/library/images/watch.gif
+++ /dev/null
diff --git a/gdb/gdbtk/library/images/watch_movie.gif b/gdb/gdbtk/library/images/watch_movie.gif
deleted file mode 100644
index 855f703ac3f..00000000000
--- a/gdb/gdbtk/library/images/watch_movie.gif
+++ /dev/null
diff --git a/gdb/gdbtk/library/images2/Movie_off.gif b/gdb/gdbtk/library/images2/Movie_off.gif
deleted file mode 100644
index 7fce569189e..00000000000
--- a/gdb/gdbtk/library/images2/Movie_off.gif
+++ /dev/null
diff --git a/gdb/gdbtk/library/images2/Movie_on.gif b/gdb/gdbtk/library/images2/Movie_on.gif
deleted file mode 100644
index 51e29d679b2..00000000000
--- a/gdb/gdbtk/library/images2/Movie_on.gif
+++ /dev/null
diff --git a/gdb/gdbtk/library/images2/bottom.gif b/gdb/gdbtk/library/images2/bottom.gif
deleted file mode 100644
index 1190cd2d2ad..00000000000
--- a/gdb/gdbtk/library/images2/bottom.gif
+++ /dev/null
diff --git a/gdb/gdbtk/library/images2/bp.gif b/gdb/gdbtk/library/images2/bp.gif
deleted file mode 100644
index 55a153d3e94..00000000000
--- a/gdb/gdbtk/library/images2/bp.gif
+++ /dev/null
diff --git a/gdb/gdbtk/library/images2/check.gif b/gdb/gdbtk/library/images2/check.gif
deleted file mode 100644
index 37ff7d3ce81..00000000000
--- a/gdb/gdbtk/library/images2/check.gif
+++ /dev/null
diff --git a/gdb/gdbtk/library/images2/console.gif b/gdb/gdbtk/library/images2/console.gif
deleted file mode 100644
index e9412b20540..00000000000
--- a/gdb/gdbtk/library/images2/console.gif
+++ /dev/null
diff --git a/gdb/gdbtk/library/images2/continue.gif b/gdb/gdbtk/library/images2/continue.gif
deleted file mode 100644
index 99c0673cdec..00000000000
--- a/gdb/gdbtk/library/images2/continue.gif
+++ /dev/null
diff --git a/gdb/gdbtk/library/images2/down.gif b/gdb/gdbtk/library/images2/down.gif
deleted file mode 100644
index 09ae742f225..00000000000
--- a/gdb/gdbtk/library/images2/down.gif
+++ /dev/null
diff --git a/gdb/gdbtk/library/images2/edit.gif b/gdb/gdbtk/library/images2/edit.gif
deleted file mode 100644
index 6ff9082861e..00000000000
--- a/gdb/gdbtk/library/images2/edit.gif
+++ /dev/null
diff --git a/gdb/gdbtk/library/images2/finish.gif b/gdb/gdbtk/library/images2/finish.gif
deleted file mode 100644
index 3e4a077185c..00000000000
--- a/gdb/gdbtk/library/images2/finish.gif
+++ /dev/null
diff --git a/gdb/gdbtk/library/images2/function.gif b/gdb/gdbtk/library/images2/function.gif
deleted file mode 100644
index c61f38a2724..00000000000
--- a/gdb/gdbtk/library/images2/function.gif
+++ /dev/null
diff --git a/gdb/gdbtk/library/images2/gdbtk_icon.gif b/gdb/gdbtk/library/images2/gdbtk_icon.gif
deleted file mode 100644
index 46f69e62852..00000000000
--- a/gdb/gdbtk/library/images2/gdbtk_icon.gif
+++ /dev/null
diff --git a/gdb/gdbtk/library/images2/help.gif b/gdb/gdbtk/library/images2/help.gif
deleted file mode 100644
index 1e127d6c0bb..00000000000
--- a/gdb/gdbtk/library/images2/help.gif
+++ /dev/null
diff --git a/gdb/gdbtk/library/images2/home.gif b/gdb/gdbtk/library/images2/home.gif
deleted file mode 100644
index ac71cd53388..00000000000
--- a/gdb/gdbtk/library/images2/home.gif
+++ /dev/null
diff --git a/gdb/gdbtk/library/images2/icons.txt b/gdb/gdbtk/library/images2/icons.txt
deleted file mode 100644
index eefb6d2c6e3..00000000000
--- a/gdb/gdbtk/library/images2/icons.txt
+++ /dev/null
@@ -1 +0,0 @@
-Windows-style Icon Set
diff --git a/gdb/gdbtk/library/images2/insight.gif b/gdb/gdbtk/library/images2/insight.gif
deleted file mode 100644
index fa5cfe19617..00000000000
--- a/gdb/gdbtk/library/images2/insight.gif
+++ /dev/null
diff --git a/gdb/gdbtk/library/images2/less.gif b/gdb/gdbtk/library/images2/less.gif
deleted file mode 100644
index 045025a8062..00000000000
--- a/gdb/gdbtk/library/images2/less.gif
+++ /dev/null
diff --git a/gdb/gdbtk/library/images2/memory.gif b/gdb/gdbtk/library/images2/memory.gif
deleted file mode 100644
index 1f62949d7d5..00000000000
--- a/gdb/gdbtk/library/images2/memory.gif
+++ /dev/null
diff --git a/gdb/gdbtk/library/images2/more.gif b/gdb/gdbtk/library/images2/more.gif
deleted file mode 100644
index 67cb020014e..00000000000
--- a/gdb/gdbtk/library/images2/more.gif
+++ /dev/null
diff --git a/gdb/gdbtk/library/images2/next.gif b/gdb/gdbtk/library/images2/next.gif
deleted file mode 100644
index 9675812ce9c..00000000000
--- a/gdb/gdbtk/library/images2/next.gif
+++ /dev/null
diff --git a/gdb/gdbtk/library/images2/next_check.gif b/gdb/gdbtk/library/images2/next_check.gif
deleted file mode 100644
index 4488f04c76b..00000000000
--- a/gdb/gdbtk/library/images2/next_check.gif
+++ /dev/null
diff --git a/gdb/gdbtk/library/images2/next_frame.gif b/gdb/gdbtk/library/images2/next_frame.gif
deleted file mode 100644
index 1bbc97932c5..00000000000
--- a/gdb/gdbtk/library/images2/next_frame.gif
+++ /dev/null
diff --git a/gdb/gdbtk/library/images2/next_hit.gif b/gdb/gdbtk/library/images2/next_hit.gif
deleted file mode 100644
index d65295c099a..00000000000
--- a/gdb/gdbtk/library/images2/next_hit.gif
+++ /dev/null
diff --git a/gdb/gdbtk/library/images2/next_line.gif b/gdb/gdbtk/library/images2/next_line.gif
deleted file mode 100644
index 96b374f65e3..00000000000
--- a/gdb/gdbtk/library/images2/next_line.gif
+++ /dev/null
diff --git a/gdb/gdbtk/library/images2/nexti.gif b/gdb/gdbtk/library/images2/nexti.gif
deleted file mode 100644
index d05248fc6e1..00000000000
--- a/gdb/gdbtk/library/images2/nexti.gif
+++ /dev/null
diff --git a/gdb/gdbtk/library/images2/open.gif b/gdb/gdbtk/library/images2/open.gif
deleted file mode 100644
index 173290a2b9d..00000000000
--- a/gdb/gdbtk/library/images2/open.gif
+++ /dev/null
diff --git a/gdb/gdbtk/library/images2/prev_hit.gif b/gdb/gdbtk/library/images2/prev_hit.gif
deleted file mode 100644
index 17ed5686ff9..00000000000
--- a/gdb/gdbtk/library/images2/prev_hit.gif
+++ /dev/null
diff --git a/gdb/gdbtk/library/images2/reg.gif b/gdb/gdbtk/library/images2/reg.gif
deleted file mode 100644
index 9f314a9bcf8..00000000000
--- a/gdb/gdbtk/library/images2/reg.gif
+++ /dev/null
diff --git a/gdb/gdbtk/library/images2/rewind.gif b/gdb/gdbtk/library/images2/rewind.gif
deleted file mode 100644
index 60b3d6135b1..00000000000
--- a/gdb/gdbtk/library/images2/rewind.gif
+++ /dev/null
diff --git a/gdb/gdbtk/library/images2/run.gif b/gdb/gdbtk/library/images2/run.gif
deleted file mode 100644
index 3a91e8efd37..00000000000
--- a/gdb/gdbtk/library/images2/run.gif
+++ /dev/null
diff --git a/gdb/gdbtk/library/images2/run_expt.gif b/gdb/gdbtk/library/images2/run_expt.gif
deleted file mode 100644
index 1c5c37cbef3..00000000000
--- a/gdb/gdbtk/library/images2/run_expt.gif
+++ /dev/null
diff --git a/gdb/gdbtk/library/images2/src.gif b/gdb/gdbtk/library/images2/src.gif
deleted file mode 100644
index 2b78909b2e9..00000000000
--- a/gdb/gdbtk/library/images2/src.gif
+++ /dev/null
diff --git a/gdb/gdbtk/library/images2/stack.gif b/gdb/gdbtk/library/images2/stack.gif
deleted file mode 100644
index e17824a3592..00000000000
--- a/gdb/gdbtk/library/images2/stack.gif
+++ /dev/null
diff --git a/gdb/gdbtk/library/images2/step.gif b/gdb/gdbtk/library/images2/step.gif
deleted file mode 100644
index 00caaf8fccd..00000000000
--- a/gdb/gdbtk/library/images2/step.gif
+++ /dev/null
diff --git a/gdb/gdbtk/library/images2/stepi.gif b/gdb/gdbtk/library/images2/stepi.gif
deleted file mode 100644
index a7217659018..00000000000
--- a/gdb/gdbtk/library/images2/stepi.gif
+++ /dev/null
diff --git a/gdb/gdbtk/library/images2/stop.gif b/gdb/gdbtk/library/images2/stop.gif
deleted file mode 100644
index 92ce1afa7d8..00000000000
--- a/gdb/gdbtk/library/images2/stop.gif
+++ /dev/null
diff --git a/gdb/gdbtk/library/images2/target.gif b/gdb/gdbtk/library/images2/target.gif
deleted file mode 100644
index 9aa9c3ac25c..00000000000
--- a/gdb/gdbtk/library/images2/target.gif
+++ /dev/null
diff --git a/gdb/gdbtk/library/images2/tdump.gif b/gdb/gdbtk/library/images2/tdump.gif
deleted file mode 100644
index 87db34c06c6..00000000000
--- a/gdb/gdbtk/library/images2/tdump.gif
+++ /dev/null
diff --git a/gdb/gdbtk/library/images2/tp.gif b/gdb/gdbtk/library/images2/tp.gif
deleted file mode 100644
index 6ddf743a3fa..00000000000
--- a/gdb/gdbtk/library/images2/tp.gif
+++ /dev/null
diff --git a/gdb/gdbtk/library/images2/up.gif b/gdb/gdbtk/library/images2/up.gif
deleted file mode 100644
index 262dbbf21c8..00000000000
--- a/gdb/gdbtk/library/images2/up.gif
+++ /dev/null
diff --git a/gdb/gdbtk/library/images2/vars.gif b/gdb/gdbtk/library/images2/vars.gif
deleted file mode 100644
index 608fa9337b8..00000000000
--- a/gdb/gdbtk/library/images2/vars.gif
+++ /dev/null
diff --git a/gdb/gdbtk/library/images2/watch.gif b/gdb/gdbtk/library/images2/watch.gif
deleted file mode 100644
index 077444d5fe1..00000000000
--- a/gdb/gdbtk/library/images2/watch.gif
+++ /dev/null
diff --git a/gdb/gdbtk/library/images2/watch_movie.gif b/gdb/gdbtk/library/images2/watch_movie.gif
deleted file mode 100644
index 855f703ac3f..00000000000
--- a/gdb/gdbtk/library/images2/watch_movie.gif
+++ /dev/null
diff --git a/gdb/gdbtk/library/interface.tcl b/gdb/gdbtk/library/interface.tcl
deleted file mode 100644
index 10daac377c5..00000000000
--- a/gdb/gdbtk/library/interface.tcl
+++ /dev/null
@@ -1,1824 +0,0 @@
-# Interface between GDB and Insight.
-# Copyright 1997, 1998, 1999, 2001, 2002 Red Hat, Inc.
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License (GPL) 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.
-
-
-# This variable is reserved for this module.  Ensure it is an array.
-global gdbtk_state
-set gdbtk_state(busyCount) 0
-
-# *** DEPRECATED: Use GDBEventHandler::breakpoint instead.
-# This is run when a breakpoint changes.  The arguments are the
-# action, the breakpoint number, and the breakpoint info.
-#define_hook gdb_breakpoint_change_hook
-
-# *** DEPRECATED: Use GDBEventHandler::set_variable instead.
-# This is run when a `set' command successfully completes in gdb.  The
-# first argument is the gdb variable name (as a Tcl list).  The second
-# argument is the new value.
-#define_hook gdb_set_hook
-
-# ------------------------------------------------------------
-#  PROC:  gdbtk_tcl_set_variable - A "set" command was issued
-#          in gdb to change an internal variable. Notify
-#          gui.
-# ------------------------------------------------------------
-proc gdbtk_tcl_set_variable {var val} {
-  set e [SetVariableEvent \#auto -variable $var -value $val]
-  GDBEventHandler::dispatch $e
-  delete object $e
-}
-
-####################################################################
-#                                                                  #
-#                        GUI STATE HOOKS                           #
-#                                                                  #
-####################################################################
-# !!!!!   NOTE   !!!!!
-# For debugging purposes, please put debug statements at the very
-# beginning and ends of all GUI state hooks.
-
-# *** DEPRECATED: Use GDBEventHandler::busy instead.
-# GDB_BUSY_HOOK
-#   This hook is used to register a callback when the UI should
-#   be disabled because the debugger is either busy or talking
-#   to the target.
-#
-#   All callbacks should disable ALL user input which could cause
-#   any state changes in either the target or the debugger.
-#define_hook gdb_busy_hook
-
-# *** DEPRECATED: Use GDBEventHandler::idle instead.
-# GDB_IDLE_HOOK
-#   This hook is used to register a callback when the UI should
-#   be enabled because the debugger is no longer busy.
-#
-#   All callbacks should enable user input. These callbacks
-#   should also be as fast as possible to avoid any significant
-#   time delays when enabling the UI.
-define_hook gdb_idle_hook
-
-# *** DEPRECATED: Use GDBEventHandler::update instead.
-# GDB_UPDATE_HOOK
-#   This hook is used to register a callback to update the widget
-#   when debugger state has changed.
-#define_hook gdb_update_hook
-
-# GDB_NO_INFERIOR_HOOK
-#   This hook is used to register a callback which should be invoked
-#   whenever there is no inferior (either at startup time or when
-#   an inferior is killed).
-#
-#   All callbacks should reset their windows to a known, "startup"
-#   state.
-define_hook gdb_no_inferior_hook
-
-# GDB_DISPLAY_CHANGE_HOOK
-# This is run when a display changes.  The arguments are the action,
-# the breakpoint number, and (optionally) the value.
-define_hook gdb_display_change_hook
-
-# GDB_TRACE_FIND_HOOK
-#    This hook is run by the trace find command.  It is used to switch
-#    from control to browse mode when the user runs tfind commands...
-#
-define_hook gdb_trace_find_hook
-
-# ------------------------------------------------------------------
-#  gdbtk_tcl_preloop - This function is called after gdb is initialized
-#  but before the mainloop is started.  It sets the app name, and
-#  opens the first source window.
-# ------------------------------------------------------------------
-
-proc gdbtk_tcl_preloop { } {
-  global gdb_exe_name gdb_current_directory
-
-  set_baud
-
-  tk appname gdbtk
-  # If there was an error loading an executible specified on the command line
-  # then we will have called pre_add_symbol, which would set us to busy,
-  # but not the corresponding post_add_symbol.  Do this here just in case...
-  after idle gdbtk_idle 
-  ManagedWin::startup
-
-  if {$gdb_exe_name != ""} {
-    # At startup, file_changed_hook is called too late for us, so we
-    # must notice the initial session by hand.  If the arguments exist
-    # -- if the user used `gdb --args' -- then we want the new
-    # arguments and pwd to override what is set in the session.
-    set current_args [gdb_get_inferior_args]
-    set current_dir $gdb_current_directory
-    Session::notice_file_change
-    if {[string length $current_args] > 0} {
-      gdb_set_inferior_args $current_args
-      gdb_cmd "cd $current_dir"
-    }
-  }
-  
-  gdbtk_update
-}
-
-
-# ------------------------------------------------------------------
-#  PROCEDURE:  gdbtk_busy - Dispatch a busy event
-#
-#         Use this procedure from within GUI code to indicate that
-#         the debugger is busy, either running the inferior or
-#         talking to the target.
-# ------------------------------------------------------------------
-proc gdbtk_busy {} {
-
-  set e [BusyEvent \#auto]
-  GDBEventHandler::dispatch $e
-  delete object $e
-
-  # Force the screen to update
-  update
-}
-
-# ------------------------------------------------------------------
-#   PROCEDURE:  gdbtk_update - run all update hooks
-#
-#          Use this procedure to force all widgets to update
-#          themselves. This hook is usually run after command
-#          that could change target state.
-# ------------------------------------------------------------------
-proc gdbtk_update {} {
-
-  set e [UpdateEvent \#auto]
-  GDBEventHandler::dispatch $e
-  delete object $e
-  
-  # Force the screen to update
-  update
-}
-
-# ------------------------------------------------------------------
-#   PROCEDURE:  gdbtk_update_safe - run all update hooks in a safe way
-#
-#          Use this procedure to force all widgets to update
-#          themselves. This hook is usually run after command
-#          that could change target state.
-#          Like gdbtk_update but safe to be used in "after idle"
-#          which is used in update hooks.
-# ------------------------------------------------------------------
-proc gdbtk_update_safe {} {
-  global gdb_running
-
-  # Fencepost: Do not update if we are running the target
-  # We get here because script commands may have changed memory or
-  # registers and "after idle" events registered as a consequence
-  # If we try to update while the target is running we are doomed.
-  if {!$gdb_running} {
-    gdbtk_update
-  }
-}
-
-# ------------------------------------------------------------------
-#   PROCEDURE: gdbtk_idle - dispatch IdleEvent
-#
-#          Use this procedure to free the UI for more user input.
-#          This should only be run AFTER all communication with
-#          the target has halted, otherwise the risk of two (or
-#          more) widgets talking to the target arises.
-# ------------------------------------------------------------------
-proc gdbtk_idle {} {
-  global gdb_running
-
-  # Put the unfiltered hook back in place, just in case
-  # somebody swapped it out, and then died before they
-  # could replace it.
-  gdb_restore_fputs
-
-  set err [catch {run_hooks gdb_idle_hook}]
-  if {$err} {
-    dbug E "Error running gdb_idle_hook: $::errorInfo"
-  }
-
-  set e [IdleEvent \#auto]
-  GDBEventHandler::dispatch $e
-  delete object $e
-
-  if {!$gdb_running} {
-    set err [catch {run_hooks gdb_no_inferior_hook} txt]
-    if {$err} { 
-      dbug E "no_inferior_hook error: $txt" 
-    }
-  }
-
-  # Force the screen to update
-  update
-}
-
-define_hook download_progress_hook
-
-# ------------------------------------------------------------------
-#  PROCEDURE:  gdbtk_quit_check - Ask if the user really wants to quit.
-# ------------------------------------------------------------------
-proc gdbtk_quit_check {} {
-  global gdb_downloading gdb_running gdb_exe_name
-  
-  if {$gdb_downloading} {
-    set msg "Downloading to target,\n really close the debugger?"
-    if {![gdbtk_tcl_query $msg no]} {
-      return 0
-    }
-  } elseif {$gdb_running} {
-    # While we are running the inferior, gdb_cmd is fenceposted and
-    # returns immediately. Therefore, we need to ask here. Do we need
-    # to stop the target, too?
-    set msg "A debugging session is active.\n"
-    append msg "Do you still want to close the debugger?"
-    if {![gdbtk_tcl_query $msg no]} {
-      return 0
-    }
-  }
-  
-  return 1
-}
-
-# ------------------------------------------------------------------
-#  PROCEDURE:  gdbtk_quit - Quit the debugger
-#         Call this procedure anywhere the user can request to quit.
-#         This procedure will ask all the right questions before
-#         exiting.
-# ------------------------------------------------------------------
-proc gdbtk_quit {} {
-  if {[gdbtk_quit_check]} {
-    gdbtk_force_quit
-  }
-}
-
-# ------------------------------------------------------------------
-#  PROCEDURE:  gdbtk_force_quit - Quit the debugger immediately
-# ------------------------------------------------------------------
-proc gdbtk_force_quit {} {
-  # If we don't delete source windows, GDB hooks will
-  # try to update them as we exit
-  foreach win [ManagedWin::find SrcWin] {
-    delete object $win
-  }
-  # Calling gdb_force_quit is probably not necessary here
-  # because it should have been called when the source window(s)
-  # were deleted, but just in case...
-  gdb_force_quit
-}
-
-# ------------------------------------------------------------------
-#  PROCEDURE:  gdbtk_cleanup - called by GDB immediately
-#         before exiting.  Last chance to cleanup!
-# ------------------------------------------------------------------
-proc gdbtk_cleanup {} {
-  global gdb_exe_name
-
-  # Save the session
-  if {$gdb_exe_name != ""} {
-    Session::save
-  }
-
-  # This is a sign that it is too late to be doing updates, etc...
-  set ::gdb_shutting_down 1
-
-  # Shutdown the window manager and save all preferences
-  # This way a "quit" in the console window will cause
-  # preferences to be saved.
-  ManagedWin::shutdown
-  pref_save
-}
-
-# ------------------------------------------------------------------
-# PROC: gdbtk_tcl_query -
-# ------------------------------------------------------------------
-proc gdbtk_tcl_query {message {default yes}} {
-  global gdb_checking_for_exit gdbtk_state tcl_platform
-
-  # FIXME We really want a Help button here.  But Tk's brain-damaged
-  # modal dialogs won't really allow it.  Should have async dialog
-  # here.
-
-  set title "GDB"
-  set modal "task"
-
-  # If we are checking whether to exit gdb, we want a system modal
-  # box.  Otherwise it may be hidden by some other program, and the
-  # user will have no idea what is going on.
-  if {[info exists gdb_checking_for_exit] && $gdb_checking_for_exit} {
-    set modal "system"
-  }
-  
-  if {$tcl_platform(platform) == "windows"} {
-    # On Windows, we want to only ask each question once.
-    # If we're already asking the question, just wait for the answer
-    # to come back.
-    set ans [list answer $message]
-    set pending [list pending $message]
-
-    if {[info exists gdbtk_state($pending)]} {
-      incr gdbtk_state($pending)
-    } else {
-      set gdbtk_state($pending) 1
-      set gdbtk_state($ans) {}
-
-      ide_messageBox [list set gdbtk_state($ans)] -icon warning \
-	-default $default -message $message -title $title \
-	-type yesno -modal $modal -parent .
-    }
-
-    vwait gdbtk_state($ans)
-    set r $gdbtk_state($ans)
-    if {[incr gdbtk_state($pending) -1] == 0} {
-      # Last call waiting for this answer, so clear it.
-      unset gdbtk_state($pending)
-      unset gdbtk_state($ans)
-    }
-  } else {
-    # On Unix, apparently it doesn't matter how many times we ask a
-    # question.
-    set r [tk_messageBox -icon warning -default $default \
-	     -message $message -title $title \
-	     -type yesno -parent .]
-  }
-
-  update idletasks
-  return [expr {$r == "yes"}]
-}
-
-# ------------------------------------------------------------------
-# PROC: gdbtk_tcl_warning -
-# ------------------------------------------------------------------
-proc gdbtk_tcl_warning {message} {
-  debug "$message"
-
-# ADD a warning message here if the gui must NOT display it
-# add the message at the beginning of the switch followed by - 
-
-  switch -regexp $message {
-        "Unable to find dynamic linker breakpoint function.*" {return}
-        default {show_warning $message}
-       }
-}
-
-# ------------------------------------------------------------------
-# PROC: show_warning -
-# ------------------------------------------------------------------
-proc show_warning {message} {
-  global tcl_platform
-
-  # FIXME We really want a Help button here.  But Tk's brain-damaged
-  # modal dialogs won't really allow it.  Should have async dialog
-  # here.
-  set title "GDB"
-  set modal "task"
-
-# On Windows, we use ide_messageBox which runs the Win32 MessageBox function
-# in another thread.  This permits a program which handles IDE requests from
-# other programs to not return from the request until the MessageBox completes.
-# This is not possible without using another thread, since the MessageBox
-# function call will be running its own event loop, and will be higher on the
-# stack than the IDE request.
-#
-# On Unix tk_messageBox runs in the regular Tk event loop, so
-# another thread is not required.
-
- 
-  if {$tcl_platform(platform) == "windows"} {
-      ide_messageBox [list set r] -icon warning \
-        -default ok -message $message -title $title \
-        -type ok -modal $modal -parent .
-  } else {
-    set r [tk_messageBox -icon warning -default ok \
-             -message $message -title $title \
-             -type ok -parent .]
-  }
-} 
-
-# ------------------------------------------------------------------
-# PROC: gdbtk_tcl_ignorable_warning -
-# ------------------------------------------------------------------
-proc gdbtk_tcl_ignorable_warning {class message} {
-  catch {ManagedWin::open WarningDlg -center -transient \
-	   -message [list $message] -ignorable $class}
-}
-
-# ------------------------------------------------------------------
-# PROC: gdbtk_tcl_fputs -
-# ------------------------------------------------------------------
-proc gdbtk_tcl_fputs {message} {
-  global gdbtk_state
-  # Restore the fputs hook, in case anyone forgot to put it back...
-  gdb_restore_fputs
-
-  if {$gdbtk_state(console) != ""} {
-    $gdbtk_state(console) insert $message
-  }
-}
-
-# ------------------------------------------------------------------
-# PROC: echo -
-# ------------------------------------------------------------------
-proc echo {args} {
-  gdbtk_tcl_fputs [concat $args]\n
-}
-
-# ------------------------------------------------------------------
-# PROC: gdbtk_tcl_fputs_error - write an error message
-# ------------------------------------------------------------------
-proc gdbtk_tcl_fputs_error {message} {
-  if {$::gdbtk_state(console) != ""} {
-    $::gdbtk_state(console) insert $message err_tag
-    update
-  }
-}
-
-# ------------------------------------------------------------------
-# PROC: gdbtk_tcl_fputs_log - write a log message
-# ------------------------------------------------------------------
-proc gdbtk_tcl_fputs_log {message} {
-  if {$::gdbtk_state(console) != ""} {
-    $::gdbtk_state(console) insert $message log_tag
-    update
-  }
-}
-
-# ------------------------------------------------------------------
-# PROC: gdbtk_tcl_fputs_target - write target output
-# ------------------------------------------------------------------
-proc gdbtk_tcl_fputs_target {message} {
-  if {$::gdbtk_state(console) == ""} {
-    ManagedWin::open Console -force
-  }
-  $::gdbtk_state(console) insert $message target_tag
-  update
-}
-
-
-# ------------------------------------------------------------------
-# PROC: gdbtk_tcl_fputs_target_err - write target error output
-# ------------------------------------------------------------------
-proc gdbtk_tcl_fputs_target_err {message} {
-  if {$::gdbtk_state(console) == ""} {
-    ManagedWin::open Console -force
-  }  
-  $::gdbtk_state(console) insert $message err_tag
-}
-
-# ------------------------------------------------------------------
-# PROC: gdbtk_tcl_flush -
-# ------------------------------------------------------------------
-proc gdbtk_tcl_flush {} {
-  debug [info level 0]
-}
-
-# ------------------------------------------------------------------
-# PROC: gdbtk_tcl_start_variable_annotation -
-# ------------------------------------------------------------------
-proc gdbtk_tcl_start_variable_annotation {valaddr ref_type stor_cl
-					  cum_expr field type_cast} {
-  debug [info level 0]
-}
-
-# ------------------------------------------------------------------
-# PROC: gdbtk_tcl_end_variable_annotation -
-# ------------------------------------------------------------------
-proc gdbtk_tcl_end_variable_annotation {} {
-  debug [info level 0]
-}
-
-# ------------------------------------------------------------------
-# PROC: gdbtk_tcl_breakpoint - A breakpoint was changed -- notify
-#                               gui.
-# ------------------------------------------------------------------
-proc gdbtk_tcl_breakpoint {action bpnum} {
-#  debug "BREAKPOINT: $action $bpnum"
-  set e [BreakpointEvent \#auto -action $action -number $bpnum]
-  GDBEventHandler::dispatch $e
-  delete object $e
-}
-
-# ------------------------------------------------------------------
-# PROC: gdbtk_tcl_tracepoint - A tracepoint was changed -- notify
-#                               gui.
-# ------------------------------------------------------------------
-proc gdbtk_tcl_tracepoint {action tpnum} {
-#  debug "TRACEPOINT: $action $tpnum"
-  set e [TracepointEvent \#auto -action $action -number $tpnum]
-  GDBEventHandler::dispatch $e
-  delete object $e
-}
-
-# ------------------------------------------------------------------
-# PROC: gdbtk_tcl_trace_find_hook -
-# ------------------------------------------------------------------
-proc gdbtk_tcl_trace_find_hook {arg from_tty} {
-#  debug "$arg $from_tty"
-  run_hooks gdb_trace_find_hook $arg $from_tty
-}
-
-################################################################
-#
-# Handle `readline' interface.
-#
-
-# Run a command that is known to use the "readline" interface.  We set
-# up the appropriate buffer, and then run the actual command via
-# gdb_cmd.  Calls into the "readline" callbacks just return values
-# from our list.
-
-# ------------------------------------------------------------------
-# PROC: gdb_run_readline_command -
-# ------------------------------------------------------------------
-proc gdb_run_readline_command {command args} {
-  global gdbtk_state
-  debug "$command $args"
-  set gdbtk_state(readlineArgs) $args
-  set gdbtk_state(readlineShowUser) 1
-  gdb_cmd $command
-}
-
-# ------------------------------------------------------------------
-# PROC: gdb_run_readline_command_no_output
-# Run a readline command, but don't show the commands to the user.
-# ------------------------------------------------------------------
-proc gdb_run_readline_command_no_output {command args} {
-  global gdbtk_state
-  debug "$command $args"
-  set gdbtk_state(readlineArgs) $args
-  set gdbtk_state(readlineShowUser) 0
-  gdb_cmd $command
-}
-
-# ------------------------------------------------------------------
-# PROC: gdbtk_tcl_readline_begin -
-# ------------------------------------------------------------------
-proc gdbtk_tcl_readline_begin {message} {
-  global gdbtk_state
-#  debug
-  set gdbtk_state(readline) 0
-  if {$gdbtk_state(console) != "" && $gdbtk_state(readlineShowUser)} {
-    $gdbtk_state(console) insert $message
-  }
-}
-
-# ------------------------------------------------------------------
-# PROC: gdbtk_tcl_readline -
-# ------------------------------------------------------------------
-proc gdbtk_tcl_readline {prompt} {
-  global gdbtk_state
-#  debug "prompt=$prompt"
-  if {[info exists gdbtk_state(readlineArgs)]} {
-    # Not interactive, so pop the list, and print element.
-    set cmd [lvarpop gdbtk_state(readlineArgs)]
-    if {$gdbtk_state(console) != "" && $gdbtk_state(readlineShowUser)} {
-      $gdbtk_state(console) insert $cmd
-    }
-  } else {
-    # Interactive.
-#    debug "interactive"
-    set gdbtk_state(readline) 1
-    $gdbtk_state(console) activate $prompt
-    vwait gdbtk_state(readline_response)
-    set cmd $gdbtk_state(readline_response)
-#    debug "got response: $cmd"
-    unset gdbtk_state(readline_response)
-    set gdbtk_state(readline) 0
-  }
-  return $cmd
-}
-
-# ------------------------------------------------------------------
-# PROC: gdbtk_tcl_readline_end -
-# ------------------------------------------------------------------
-proc gdbtk_tcl_readline_end {} {
-  global gdbtk_state
-#  debug
-  catch {unset gdbtk_state(readlineArgs)}
-  catch {unset gdbtk_state(readlineActive)}
-}
-
-# ------------------------------------------------------------------
-# PROC: gdbtk_tcl_busy - this is called immediately before gdb 
-#    executes a command.
-#
-# ------------------------------------------------------------------
-proc gdbtk_tcl_busy {} {
-  global gdbtk_state
-  if {[incr gdbtk_state(busyCount)] == 1} {
-    gdbtk_busy
-  }
-}
-
-################################################################
-#
-# 
-#
-
-# ------------------------------------------------------------------
-# PROC: gdbtk_tcl_idle - this is called immediately after gdb 
-#    executes a command.
-# ------------------------------------------------------------------
-proc gdbtk_tcl_idle {} {
-  global gdbtk_state
-  if {$gdbtk_state(busyCount) > 0
-      && [incr gdbtk_state(busyCount) -1] == 0} {
-    gdbtk_update
-    gdbtk_idle
-  }
-}
-
-# ------------------------------------------------------------------
-# PROC: gdbtk_tcl_tstart -
-# ------------------------------------------------------------------
-proc gdbtk_tcl_tstart {} {
-  set srcwin [lindex [manage find src] 0]
-  $srcwin.toolbar do_tstop 0
-  
-}
-
-# ------------------------------------------------------------------
-# PROC: gdbtk_tcl_tstop -
-# ------------------------------------------------------------------
-proc gdbtk_tcl_tstop {} {
-  set srcwin [lindex [manage find src] 0]
-  $srcwin.toolbar do_tstop 0
-  
-}
-
-
-# ------------------------------------------------------------------
-# PROC: gdbtk_tcl_display -
-#
-# A display changed.  ACTION is `enable', `disable', `delete',
-# `create', or `update'.  VALUE is only meaningful in the `update'
-# case.
-# ------------------------------------------------------------------
-proc gdbtk_tcl_display {action number {value {}}} {
-  # Handle create explicitly.
-  if {$action == "create"} {
-    manage create_if_never data
-  }
-  run_hooks gdb_display_change_hook $action $number $value
-}
-
-# ------------------------------------------------------------------
-#  PROCEDURE: gdbtk_register_changed
-#         This hook is called from value_assign to inform us that
-#         the user has changed the contents of a register.
-# ------------------------------------------------------------------
-proc gdbtk_register_changed {} {
-  after idle gdbtk_update_safe
-}
-
-# ------------------------------------------------------------------
-#  PROCEDURE: gdbtk_memory_changed
-#         This hook is called from value_assign to inform us that
-#         the user has changed the contents of memory (including
-#         the program's variables).
-# ------------------------------------------------------------------
-proc gdbtk_memory_changed {} {
-  after idle gdbtk_update_safe
-}
-
-####################################################################
-#                                                                  #
-#                           FILE HOOKS                             #
-#                                                                  #
-#    There are a number of hooks that are installed in gdb to      #
-#    aid with file-like commands (selecting an exectuable and      #
-#    loading symbols):                                             #
-#         - exec_file_display_hook                                 #
-#            Called in exec_file_command. The tcl hook is          #
-#            "gdbtk_tcl_exec_file_display"                         #
-#         - file_changed_hook                                      #
-#            Called in file_command. The tcl hook is               #
-#            "gdbtk_tcl_file_changed"                              #
-#         - pre_add_symbol_hook                                    #
-#            Called in symbol_file_add before loading. The tcl     #
-#            hook is "gdbtk_tcl_pre_add_symbol"                    #
-#         - post_add_symbol_hook                                   #
-#            Called in symbol_file_add when finished loading       #
-#            a symbol file. The tcl hook is                        #
-#            "gdbtk_tcl_post_add_symbol"                           #
-#                                                                  #
-#  Together, these hooks should give the gui enough information    #
-#  to cover the two most common uses of file commands:             #
-#  1. executable with symbols                                      #
-#  2. separate executable and symbol file(s)                       #
-#                                                                  #
-####################################################################
-define_hook file_changed_hook
-
-# ------------------------------------------------------------------
-#  PROCEDURE:  gdbtk_tcl_pre_add_symbol
-#         This hook is called before any symbol files
-#         are loaded so that we can inform the user.
-# ------------------------------------------------------------------
-proc gdbtk_tcl_pre_add_symbol {file} {
-
-  gdbtk_busy
-
-  # Display some feedback to the user
-  set srcs [ManagedWin::find SrcWin]
-  foreach w $srcs {
-    $w set_status "Reading symbols from $file..."
-  }
-  update idletasks
-}
-
-# ------------------------------------------------------------------
-#   PROCEDURE: gdbtk_tcl_post_add_symbol
-#          This hook is called after we finish reading a symbol
-#          file, so the source windows' combo boxes need filling.
-# ------------------------------------------------------------------
-proc gdbtk_tcl_post_add_symbol {} {
-
-  set srcs [ManagedWin::find SrcWin]
-  foreach w $srcs {
-    $w fillNameCB
-  }
-  gdbtk_idle
-}
-
-# ------------------------------------------------------------------
-#  PROCEDURE: gdbtk_tcl_file_changed
-#         This hook is called whenever the exec file changes.
-#         This is called AFTER symbol reading, so it is
-#         ok to point to main when we get called.
-# ------------------------------------------------------------------
-proc gdbtk_tcl_file_changed {filename} {
-
-  if {$filename == ""} {
-    gdb_clear_file
-    catch {run_hooks gdb_clear_file_hook}
-    set ::gdb_exe_name ""
-    set ::gdb_loaded 0
-    set ::gdb_running 0
-    gdbtk_update
-  } else {
-    SrcWin::point_to_main
-    run_hooks file_changed_hook
-  }
-}
-
-# ------------------------------------------------------------------
-#  PROCEDURE: gdbtk_tcl_exec_file_display 
-#         This hook is called from exec_file_command. It's purpose
-#         is to setup the gui for a new file. Note that we cannot
-#         look for main, since this hook is called BEFORE we
-#         read symbols. If the user used the "file" command,
-#         gdbtk_tcl_file_changed will set the source window to
-#         look at main. If the user used "exec-file" and "add-symbol"
-#         commands, then we cannot look for main.
-# ------------------------------------------------------------------
-proc gdbtk_tcl_exec_file_display {filename} {
-  global gdb_exe_changed
-
-  # DO NOT CALL set_exe here! 
-
-  # Clear out the GUI, don't do it if filename is "" so that
-  # you avoid distracting flashes in the source window.
-
-  if {$filename != ""} {
-    gdbtk_clear_file
-  }
-
-  # set_exe calls file command with the filename in
-  # quotes, so we need to strip them here.
-  # We need to make sure that we turn filename into
-  # an absolute path or sessions won't work.
-  if {[file tail $filename] == $filename} {
-    # want full pathname
-    set filename [file join $::gdb_current_directory $filename]
-  }
-  set_exe_name $filename
-  set gdb_exe_changed 0
-
-  SrcWin::point_to_main
-}
-
-# ------------------------------------------------------------------
-#  PROCEDURE: gdbtk_locate_main 
-#         This proc tries to locate a suitable main function from
-#         a list of names defined in the gdb/main_names preference; 
-#         returns the linespec (see below) if found, or a null string
-#         if not.
-#
-#  The return linespec looks like this:
-#  0: basename of the file
-#  1: function name
-#  2: full filename
-#  3: source line number
-#  4: address
-#  5: current PC - which will often be the same as address, but not when
-#  we are browsing, or walking the stack.
-#  6: shared library name if the pc is in a shared lib
-#
-# ------------------------------------------------------------------
-proc gdbtk_locate_main {{init ""}} {
-  global _main_cache gdb_exe_name
-  debug
-
-  if {$init == "" && $_main_cache != ""} {
-    #debug "returning $_main_cache from cache"
-    return $_main_cache
-  }
-  set _main_cache {}
-
-  set main_names [pref get gdb/main_names]
-  foreach main $main_names {
-    if {![catch {gdb_loc $main} linespec]} {
-      set _main_cache $linespec
-      break
-    }
-  }
-  if {$_main_cache == {} 
-      && ![catch gdb_entry_point entry_point]
-      && ![catch {gdb_loc "*$entry_point"} linespec]} {
-    set _main_cache $linespec
-  }
-  
-  # need to see if result is valid
-  lassign $_main_cache file func ffile line addr rest
-  if {$addr == 0x0 && $func == {}} { set _main_cache {} }
-
-  #debug "returning $_main_cache"
-  return $_main_cache
-}
-
-##############################################
-#  The rest of this file is an assortment of Tcl wrappers
-#  for various bits of gdb functionality.
-#
-#############################################
-
-# ------------------------------------------------------------------
-# PROC: set_exe_name - Update the executable name
-# ------------------------------------------------------------------
-proc set_exe_name {exe} {
-  global gdb_exe_name gdb_exe_changed
-  #debug "exe=$exe  gdb_exe_name=$gdb_exe_name"
-
-  set gdb_exe_name $exe
-  set gdb_exe_changed 1    
-}
-
-
-# ------------------------------------------------------------------
-# PROC: set_exe -
-# ------------------------------------------------------------------ 
-proc set_exe {} {
-  global gdb_exe_name gdb_exe_changed gdb_target_changed gdb_loaded file_done
-#  debug "gdb_exe_changed=$gdb_exe_changed gdb_exe_name=$gdb_exe_name"
-  if {$gdb_exe_changed} {
-    set gdb_exe_changed 0
-    if {$gdb_exe_name == ""} { return }
-    set err [catch {gdb_cmd "file '$gdb_exe_name'" 1} msg]
-    if {$err} {
-      dbug E "$msg"
-      set l [split $msg :]
-      set errtxt [join [lrange $l 1 end] :]
-      set msg "Error loading \"$gdb_exe_name\":\n"
-      append msg $errtxt
-      tk_messageBox -title "Error" -message $msg -icon error \
-	-type ok
-      set gdb_exe_name {}
-      set file_done 0
-      return
-    } elseif {[string match {*no debugging symbols found*} $msg]} {
-      tk_messageBox -icon error -default ok \
-	-title "GDB" -type ok \
-	-message "This executable has no debugging information."
-    }
-
-    # force new target command
-    set gdb_target_changed 1
-    set gdb_loaded 0
-    set file_done 1
-  }
-}
-
-# ------------------------------------------------------------------
-#  _open_file - open a file dialog to select a file for debugging.
-#  If filename is not "", then open this file.
-# ------------------------------------------------------------------
-
-proc _open_file {{file ""}} {
-  global gdb_running gdb_downloading tcl_platform
-  
-  if {$gdb_running || $gdb_downloading} {
-    # We are already running/downloading something..
-    if {$gdb_running} {
-      set msg "A debugging session is active.\nAbort session and load new file?"
-    } else {
-      set msg "A download is in progress.\nAbort download and load new file?"
-    }
-    if {![gdbtk_tcl_query $msg no]} {
-      return 0
-    }
-  }
-
-  if {[string compare $file ""] == 0} {
-    set curFocus [focus]
-    
-    # Make sure that this is really a modal dialog...
-    # FIXME: Add a disable_all to ide_grab_support.
-    
-    ide_grab_support disable_except {}
-    
-    set file [tk_getOpenFile -parent . -title "Load New Executable"]
-  
-    ide_grab_support enable_all
-    
-    # If no one had the focus before, leave it that way (since I
-    # am not sure how this could happen...  Also, the vwait in 
-    # tk_getOpenFile could have allowed the curFocus window to actually
-    # be destroyed, so make sure it is still around.
-    
-    if {$curFocus != "" && [winfo exists $curFocus]} {
-      raise [winfo toplevel $curFocus]
-      focus $curFocus
-    }
-  } elseif {![file exists $file]} {
-    tk_messageBox -message "File \"$file\" does not exist"
-    return 0
-  }
-    
-
-  if {$file == ""} {
-    return 0
-  }
-  # Add the base dir for this file to the source search path.
-  set root [file dirname $file]
-  if {$tcl_platform(platform) == "windows"} {
-    set root [ide_cygwin_path to_posix $root]
-    set file [ide_cygwin_path to_posix $file]
-  }
-  
-  catch {gdb_cmd "cd $root"}
-
-  # Clear out gdb's internal state, so that it will allow us
-  # (the gui) to ask the user questions.
-  gdb_clear_file
-
-  # The gui needs to set this...
-  set_exe_name $file
-  
-  # set_exe needs to be called anywhere the gui does a file_command...
-  if {[set_exe] == "cancel"} {
-    gdbtk_update
-    gdbtk_idle
-    return 0
-  }
-
-  return 1
-}
-
-# ------------------------------------------------------------------
-#  _close_file - close the current executable and prepare for
-#    another executable.
-# ------------------------------------------------------------------
-proc _close_file {} {
-
-  # If there is already an inferior, ask him if he wants to close
-  # the file. If there is already an exec file loaded (and not run)
-  # also ask, but don't ask twice.
-  set okay 1
-  if {[gdb_target_has_execution]} {
-    set okay [gdbtk_tcl_query "Program is already running.\nClose file anyway?"]
-  } elseif {$::gdb_exe_name != ""} {
-    set okay [gdbtk_tcl_query "Program already loaded.\nClose file anyway?"]
-  } else {
-    # No exec file yet
-    return
-  }
-
-  if {$okay} {
-    Session::save
-    gdb_clear_file
-    gdbtk_tcl_file_changed ""
-
-    # Print out a little message to all console windows
-    foreach cw [ManagedWin::find Console] {
-      $cw insert "No executable file now.\n"
-    }
-  }
-}
-
-# ------------------------------------------------------------------
-# PROC: set_target_name - Update the target name.  
-#
-# This function will prompt for a new target and update
-# all variables.
-#
-# If $prompt is 0 it will just update gdb_target_cmd from gdb_target.
-#
-# RETURN:
-#     1 if successful, 
-#     0 if the not (the user canceled the target selection dialog)
-# ------------------------------------------------------------------
-proc set_target_name {{prompt 1}} {
-  global gdb_target_name gdb_target_changed gdb_exe_changed
-  global gdb_target_cmd gdb_pretty_name
-#  debug
-  set cmd_tmp $gdb_target_cmd
-  set name_tmp $gdb_target_name
-
-#  debug "gdb_target_name=$gdb_target_name; name_tmp=$name_tmp"
-  if {$prompt} {
-    set win [ManagedWin::open TargetSelection -exportcancel 1 -center \
-	       -transient]
-    # need to call update here so the target selection dialog can take over
-    update idletasks
-  }
-
-#  debug "gdb_target_name=$gdb_target_name"
-  if {$gdb_target_name == "CANCEL"} {
-    set gdb_target_cmd $cmd_tmp
-    set gdb_target_name $name_tmp
-    return 0
-  }
-  set target $gdb_target_name
-  set targ [TargetSelection::getname $target cmd]
-  set gdb_target_cmd $cmd_tmp
-  set gdb_pretty_name [TargetSelection::getname $target pretty-name]
-
-#  debug "target=$target pretty_name=$gdb_pretty_name"
-  set targ_opts ""
-  switch -regexp -- $gdb_target_name {
-    sim|ice {
-      set targ $gdb_target_name
-      set targ_opts [pref getd gdb/load/${gdb_target_name}-opts]
-    }
-    default {
-      set port [pref getd gdb/load/$target-port]
-      if {$port == ""} {
-	set port [pref get gdb/load/default-port]
-      }
-      set portnum [pref getd gdb/load/$target-portname]
-      if {$portnum == ""} {
-	set portnum [pref get gdb/load/default-portname]
-      }
-      set hostname [pref getd gdb/load/$target-hostname]
-      if {$hostname == ""} {
-	set hostname [pref getd gdb/load/default-hostname]
-      }
-      # replace "com1" with the real port name
-      set targ [lrep $targ "com1" $port]
-      # replace "tcpX" with hostname:portnum
-      set targ [lrep $targ "tcpX" ${hostname}:${portnum}]
-      # replace "ethX" with hostname
-      set targ [lrep $targ "ethX" e=${hostname}]
-    }
-  }
-  
-#  debug "targ=$targ gdb_target_cmd=$gdb_target_cmd"
-  if {$gdb_target_cmd != $targ || $gdb_target_changed} {
-    set gdb_target_changed 1
-    set gdb_target_cmd "$targ $targ_opts"
-  }
-  return 1
-}
-
-# ------------------------------------------------------------------
-# PROC: set_target - Change the target
-# ------------------------------------------------------------------
-proc set_target {} {
-  global gdb_target_cmd gdb_target_changed gdb_pretty_name gdb_target_name
-  #debug "gdb_target_changed=$gdb_target_changed gdb_target_cmd=\"$gdb_target_cmd\""
-  #debug "gdb_target_name=$gdb_target_name"
-  if {$gdb_target_cmd == "" && ![TargetSelection::native_debugging]} {
-    if {$gdb_target_name == ""} {
-      set prompt 1
-
-      # get the default
-      #set gdb_target_name [pref getd gdb/load/target]
-    } else {
-      set prompt 0
-    }
-    if {![set_target_name $prompt]} {
-      set gdb_target_name ""
-      return CANCELED
-    }
-  }
-  
-  if {$gdb_target_changed} {
-    set srcWin [lindex [ManagedWin::find SrcWin] 0]
-
-    $srcWin set_status "Trying to communicate with target $gdb_pretty_name" 1
-    update
-    catch {gdb_cmd "detach"}
-    debug "CONNECTING TO TARGET: $gdb_target_cmd"
-    gdbtk_busy
-    set err [catch {gdb_immediate "target $gdb_target_cmd"} msg ]
-    $srcWin set_status
-    gdbtk_idle
-
-    if {$err} {
-      if {[string first "Program not killed" $msg] != -1} {
-	return CANCELED
-      }
-      update
-      set dialog_title "GDB"
-      set debugger_name "GDB"
-      tk_messageBox -icon error -title $dialog_title -type ok \
-	-message "$msg\n\n$debugger_name cannot connect to the target board\
-using [lindex $gdb_target_cmd 1].\nVerify that the board is securely connected and, if\
-necessary,\nmodify the port setting with the debugger preferences."
-      return ERROR
-    }
-    
-    if {![catch {pref get gdb/load/$gdb_target_name-after_attaching} aa] && $aa != ""} {
-      if {[catch {gdb_cmd $aa} err]} {
-	catch {[ManagedWin::find Console] insert $err err_tag}
-      }
-    }
-    set gdb_target_changed 0
-    return TARGET_CHANGED
-  }
-  return TARGET_UNCHANGED
-}
-
-# ------------------------------------------------------------------
-# PROC: run_executable -
-#
-# This procedure is used to run an executable.  It is called when the 
-# run button is used.
-# ------------------------------------------------------------------
-proc run_executable { {auto_start 1} } {
-  global gdb_loaded gdb_downloading gdb_target_name
-  global gdb_exe_changed gdb_target_changed gdb_program_has_run
-  global gdb_running gdb_exe_name tcl_platform
-
-#  debug "auto_start=$auto_start gdb_target_name=$gdb_target_name"
-
-  set gdb_running_saved $gdb_running
-  set gdb_running 0
-
-  # No executable was specified.  Prompt the user for one.
-  if {$gdb_exe_name == ""} {
-    if {[_open_file]} {
-      run_executable $auto_start
-      return
-    } else {
-      # The user canceled the load of a new executable.
-      return
-    }
-  }
-
-  if {$gdb_downloading} { return }
-  if {[pref get gdb/control_target]} {
-    # Breakpoint mode
-    set_exe
-
-    # Attach
-    if {$gdb_target_name == "" || [pref get gdb/src/run_attach]} {
-      set r [gdbtk_attach_remote]
-      if {$r == "ATTACH_CANCELED" || $r == "ATTACH_ERROR"} {
-	return
-      }
-    }
-
-    # Download
-    if {[pref get gdb/src/run_load] && $gdb_target_name != "exec"} {
-      debug "Downloading..."
-      set gdb_loaded 0
-      
-      # if the app has not been downloaded or the app has already
-      # started, we need to redownload before running
-      if {!$gdb_loaded} {
-	if {[Download::download_it]} {
-	  # user cancelled the command
-#	  debug "user cancelled the command $gdb_running"
-	  set gdb_loaded 0
-	  gdbtk_update
-	  gdbtk_idle
-	}
-	if {!$gdb_loaded} {
-	  # The user cancelled the download after it started
-#	  debug "User cancelled the download after it started $gdb_running"
-	  gdbtk_update
-	  gdbtk_idle
-	  return
-	}
-      }
-    }
-
-    # _Now_ set/clear breakpoints
-    if {[pref get gdb/load/exit] && ![TargetSelection::native_debugging]} {
-      debug "Setting new BP at exit"
-      catch {gdb_cmd "clear exit"}
-      catch {gdb_cmd "break exit"}
-    }
-      
-    if {[pref get gdb/load/main]} {
-      set main "main"
-      if {[set linespec [gdbtk_locate_main]] != ""} {
-        set main [lindex $linespec 1]
-      }
-      debug "Setting new BP at $main"
-      catch {gdb_cmd "clear $main"}
-      catch {gdb_cmd "break $main"}
-    }
-
-    # set BP at user-specified function
-    if {[pref get gdb/load/bp_at_func]} {
-      foreach bp [pref get gdb/load/bp_func] {
-	debug "Setting BP at $bp"
-	catch {gdb_cmd "clear $bp"}
-	catch {gdb_cmd "break $bp"}
-      }
-    }
-
-    # This is a hack.  If the target is "sim" the opts are appended
-    # to the target command. Otherwise they are assumed to be command line
-    # args.  What about simulators that accept command line args?
-    if {$gdb_target_name != "sim"} {
-      # set args
-      set gdb_args [pref getd gdb/load/$gdb_target_name-opts]
-      if { $gdb_args != ""} {
-	debug "set args $gdb_args"
-	gdb_set_inferior_args $gdb_args
-      }
-    }
-
-    # If the user requested it, start an xterm for use as the
-    # inferior's tty.
-    if {$tcl_platform(platform) != "windows"
-	&& [pref getd gdb/process/xtermtty] == "yes"} {
-      tty::create
-    }
-
-    # 
-    # Run
-
-    if {$auto_start} {
-      if {[pref get gdb/src/run_run]} {
-	debug "Runnning target..."
-	set run run
-      } else {
-	debug "Continuing target..."
-	set run cont
-      }
-      if {$gdb_target_name == "exec"} {
-	set run run
-      }
-      if {[catch {gdb_immediate $run} msg]} {
-	dbug W "msg=$msg"
-	gdbtk_idle
-	if {[string match "*help target*" $msg]} {
-	  set_target_name
-	  run_executable $auto_start
-	  return
-	}
-	if {[string match "No executable*" $msg]} {
-	  # No executable was specified.  Prompt the user for one.
-	  if {[_open_file]} {
-	    run_executable $auto_start
-	  } else {
-	    debug "CANCELLED"
-	  }
-	  return
-	}
-	set gdb_running $gdb_running_saved
-      } else {
-	debug RUNNING
-	set gdb_running 1
-      }
-    } else {
-      SrcWin::point_to_main
-    }
-
-    gdbtk_update
-    gdbtk_idle
-  } elseif {[pref get gdb/mode]} {
-    # tracepoint -- need to tstart
-    set gdb_running 1
-    tstart
-  }
-  return
-}
-
-# ------------------------------------------------------------------
-#  PROC: gdbtk_attach_remote - attach to the target
-#        This proc returns the following status messages:
-#
-#        ATTACH_ERROR: An error occurred connecting to target.
-#        ATTACH_CANCELED: The attach was canceled.
-#        ATTACH_TARGET_CHANGED: Successfully attached, target changed.
-#        ATTACH_TARGET_UNCHANGED: Successfully attached, target unchanged.
-#        UNKNOWN: An unknown error occurred.
-# ------------------------------------------------------------------
-proc gdbtk_attach_remote {} {
-  global gdb_loaded
-
-  debug "Attaching...."
-  set r UNKNOWN
-  while {1} {
-
-    switch [set_target] {
-
-      ERROR {
-	# target command failed, ask for a new target name
-	if {![set_target_name]} {
-	  # canceled again
-	  set r ATTACH_ERROR
-	  break
-	}
-      }
-
-      TARGET_CHANGED {
-	# success -- target changed
-	set gdb_loaded 0
-	set r ATTACH_TARGET_CHANGED
-	break
-      }
-
-      CANCELED {
-	# command cancelled by user
-	set r ATTACH_CANCELED
-	break
-      }
-
-      TARGET_UNCHANGED {
-	# success -- target NOT changed (i.e., rerun)
-	set r ATTACH_TARGET_UNCHANGED
-	break
-      }
-    }
-  }
-
-#  debug "Attach returning: \"$r\""
-  return $r
-}
-
-# ------------------------------------------------------------------
-# PROC:  gdbtk_connect: connect to a remote target 
-#                      in asynch mode if async is 1
-# ------------------------------------------------------------------
-proc gdbtk_connect {{async 0}} {
-  global file_done
-
-  debug "async=$async"
-
-  gdbtk_busy
-
-  set result [gdbtk_attach_remote]
-  switch $result {
-    ATTACH_ERROR {
-      set successful 0
-    }
-
-    ATTACH_TARGET_CHANGED {
-	if {[pref get gdb/load/check] && $file_done} {
-	  set err [catch {gdb_cmd "compare-sections"} errTxt]
-	  if {$err} {
-	    set successful 0
-	    tk_messageBox -title "Error" -message $errTxt \
-	      -icon error -type ok
-	    break
-	  }
-	}
-
-	tk_messageBox -title "GDB" -message "Successfully connected" \
-	  -icon info -type ok
-	set successful 1
-    }
-
-    ATTACH_CANCELED {
-	tk_messageBox -title "GDB" -message "Connection Canceled" -icon info \
-	  -type ok
-	set successful 0
-    }
-
-    ATTACH_TARGET_UNCHANGED {
-	tk_messageBox -title "GDB" -message "Successfully connected" \
-	  -icon info -type ok
-	set successful 1
-    }
-
-    default {
-	dbug E "Unhandled response from gdbtk_attach_remote: \"$result\""
-	set successful 0
-    }
-  }
-
-  gdbtk_idle
-
-  # Whenever we attach, we need to do an update
-  if {$successful} {
-    gdbtk_attached
-  }
-  return $successful
-}
-
-# ------------------------------------------------------------------
-#  PROC: gdbtk_step - step the target
-# ------------------------------------------------------------------
-proc gdbtk_step {} {
-  catch {gdb_immediate step}
-}
-
-# ------------------------------------------------------------------
-#  PROC: gdbtk_next
-# ------------------------------------------------------------------
-proc gdbtk_next {} {
-  catch {gdb_immediate next}
-}
-
-# ------------------------------------------------------------------
-#  PROC: gdbtk_finish
-# ------------------------------------------------------------------
-proc gdbtk_finish {} {
-  catch {gdb_immediate finish}
-}
-
-# ------------------------------------------------------------------
-#  PROC: gdbtk_continue
-# ------------------------------------------------------------------
-proc gdbtk_continue {} {
-  catch {gdb_immediate continue}
-}
-
-# ------------------------------------------------------------------
-#  PROC: gdbtk_stepi
-# ------------------------------------------------------------------
-proc gdbtk_stepi {} {
-  catch {gdb_immediate stepi}
-}
-
-# ------------------------------------------------------------------
-#  PROC: gdbtk_nexti
-# ------------------------------------------------------------------
-proc gdbtk_nexti {} {
-  catch {gdb_immediate nexti}
-}
-
-# ------------------------------------------------------------------
-#  PROC: gdbtk_attached
-# ------------------------------------------------------------------
-#
-# This is called AFTER gdb has successfully done an attach.  Use it to 
-# bring the GUI up to a current state...
-proc gdbtk_attached {} {
-  gdbtk_update
-}
-
-# ------------------------------------------------------------------
-#  PROC: gdbtk_detached
-# ------------------------------------------------------------------
-#
-# This is called AFTER gdb has successfully done an detach.  Use it to 
-# bring the GUI up to a current state...
-proc gdbtk_detached {} {
-  if {!$::gdb_shutting_down} {
-    run_hooks gdb_no_inferior_hook
-  }
-}
-
-# ------------------------------------------------------------------
-#  PROC: gdbtk_stop
-# ------------------------------------------------------------------
-#
-# The stop button is tricky. In order to use the stop button,
-# the debugger must be able to keep gui alive while target_wait is
-# blocking (so that the user can interrupt or detach from it).
-# 
-# The best solution for this is to capture gdb deep down where it
-# can block. For _any_ target board, this will be in either
-# serial or socket code. These places call ui_loop_hook to 
-# keep us alive. For native unix, we use an interval timer.
-# Simulators either call ui_loop_hook directly (older sims, at least)
-# or they call gdb's os_poll_quit callback, where we insert a call
-# to ui_loop_hook. Some targets (like v850ice and windows native)
-# require a call to ui_loop_hook directly in target_wait. See comments
-# before gdb_stop and x_event to find out more about how this is accomplished.
-#
-# The stop button's behavior:
-# Pressing the stop button should attempt to stop the target. If, after
-# some time (like 3 seconds), gdb fails to fall out of target_wait (i.e.,
-# the gui's idle hooks are run), then open a dialog asking the user if
-# he'd like to detach.
-proc gdbtk_stop {} {
-  global _gdbtk_stop
-
-  if {$_gdbtk_stop(timer) == ""} {
-    add_hook gdb_idle_hook gdbtk_stop_idle_callback
-    set _gdbtk_stop(timer) [after 3000 gdbtk_detach]
-    catch {gdb_stop}
-  }
-}
-
-# ------------------------------------------------------------------
-#  PROC: gdbtk_stop_idle_callback
-# ------------------------------------------------------------------
-# This callback normally does nothing. When the stop button has
-# been pressed, though, and gdb has successfully stopped the target,
-# this callback will clean up after gdbtk_stop, removing the "Detach"
-# dialog (if it's open) and gettingg rid of any outstanding timers
-# and hooks.
-proc gdbtk_stop_idle_callback {} {
-  global _gdbtk_stop gdbtk_state
-
-  # Check if the dialog asking if user wants to detach is open
-  # and unpost it if it exists.
-  if {$_gdbtk_stop(msg) != ""} {
-    set ans [list answer $_gdbtk_stop(msg)]
-    set gdbtk_state($ans) no
-  }
-
-  if {$_gdbtk_stop(timer) != ""} {
-    # Cancel the timer callback
-    after cancel $_gdbtk_stop(timer)
-    set _gdbtk_stop(timer) ""
-    catch {remove_hook gdb_idle_hook gdbtk_stop_idle_callback}
-  }
-}
-
-# ------------------------------------------------------------------
-#  PROC: gdbtk_detach
-# ------------------------------------------------------------------
-# This proc is installed as a timer event when the stop button
-# is pressed. If target_wait doesn't return (we were unable to stop
-# the target), then this proc is called.
-#
-# Open a dialog box asking if the user would like to detach. If so,
-# try to detach. If not, do nothing and go away.
-proc gdbtk_detach {} {
-  global _gdbtk_stop
-
-  set _gdbtk_stop(msg) "No response from target. Detach from target\n(and stop debugging it)?"
-  if {[gdbtk_tcl_query  $_gdbtk_stop(msg) no]} {
-    catch {gdb_stop detach}
-  }
-
-  set _gdbtk_stop(timer) ""
-  set _gdbtk_stop(msg) ""
-  remove_hook gdb_idle_hook gdbtk_stop_idle_callback
-}
-
-# ------------------------------------------------------------------
-#  PROC: gdbtk_run
-# ------------------------------------------------------------------
-proc gdbtk_run {} {
-  if {$::gdb_running == 1} {
-    set msg "A program is currently being debugged.\n"
-    append msg "Do you want to restart?"
-    if {![gdbtk_tcl_query $msg no]} {
-      # NO
-      return
-    }
-  }
-  run_executable
-}
-
-# ------------------------------------------------------------------
-# PROC:  gdbtk_attach_native: attach to a running target
-# ------------------------------------------------------------------
-proc gdbtk_attach_native {} {
-    ManagedWin::open_dlg AttachDlg ;#-transient
-
-    debug "ManagedWin got [AttachDlg::last_button] [AttachDlg::pid]"
-
-    if {[AttachDlg::last_button]} {
-	set pid [AttachDlg::pid]
-	set symbol_file [AttachDlg::symbol_file]
-	if {$symbol_file != "" && ![_open_file $symbol_file]} {
-	    ManagedWin::open WarningDlg -transient \
-		    -message "Could not load symbols from $symbol_file."
-	    return
-	}
-	
-	if {[catch {gdb_cmd "attach $pid"} result]} {
-	    ManagedWin::open WarningDlg -transient \
-		    -message [list "Could not attach to $pid:\n$result"]
-	    return
-	}
-    }
-}
-
-# ------------------------------------------------------------------
-# PROC: set_baud -  Tell GDB the baud rate.
-# ------------------------------------------------------------------
-proc set_baud {} {
-  global gdb_target_name
-  #set target [ide_property get target-internal-name]
-  set baud [pref getd gdb/load/${gdb_target_name}-baud]
-  if {$baud == ""} {
-    set baud [pref get gdb/load/baud]
-  }
-#  debug "setting baud to $baud"
-  catch {gdb_cmd "set remotebaud $baud"}
-}
-
-# ------------------------------------------------------------------
-# PROC: do_state_hook -
-# ------------------------------------------------------------------
-proc do_state_hook {varname ind op} {
-  run_hooks state_hook $varname
-}
-
-# ------------------------------------------------------------------
-# PROC: gdbtk_disconnect -
-# ------------------------------------------------------------------
-proc gdbtk_disconnect {{async 0}} {
-   global gdb_loaded gdb_target_changed
-   catch {gdb_cmd "detach"}
-   # force a new target command to do something
-   set gdb_loaded 0
-   set gdb_target_changed 1
-   set gdb_running 0
-   gdbtk_idle
-   gdbtk_update
- }
-
-# ------------------------------------------------------------------
-# PROC: tstart -
-# ------------------------------------------------------------------
-proc tstart {} {
-   if {[catch {gdb_cmd "tstart"} errTxt]} {
-     tk_messageBox -title "Error" -message $errTxt -icon error \
-       -type ok
-    gdbtk_idle
-     return 0
-   }
-  return 1
-}
-
-# ------------------------------------------------------------------
-# PROC: tstop -
-# ------------------------------------------------------------------
-proc tstop {} {
-
-   if {[catch {gdb_cmd "tstop"} errTxt]} {
-     tk_messageBox -title "Error" -message $errTxt -icon error \
-       -type ok
-     gdbtk_idle
-     return 0
-   }
-   return 1
- }
-
-# ------------------------------------------------------------------
-# PROC: source_file -
-# ------------------------------------------------------------------
-proc source_file {} {
-  set file_name [tk_getOpenFile -title "Choose GDB Command file"]
-  if {$file_name != ""} {
-    gdb_cmd "source $file_name"
-  }
-}
-
-
-# -----------------------------------------------------------------------------
-# NAME:		gdbtk_signal
-#
-# SYNOPSIS:	gdbtk_signal {name longname}
-#
-# DESC:		This procedure is called from GDB when a signal	
-#		is generated, for example, a SIGSEGV.
-#
-# ARGS:		name - The name of the signal, as returned by
-#			target_signal_to_name().
-#		longname - A description of the signal.
-# -----------------------------------------------------------------------------
-proc gdbtk_signal {name {longname ""}} {
-  dbug W "caught signal $name $longname"
-  set longname
-  set message "Program received signal $name, $longname"
-  set srcs [ManagedWin::find SrcWin]
-  foreach w $srcs {
-    $w set_status $message
-  }
-  gdbtk_tcl_ignorable_warning signal $message
-  update idletasks
-}
-
-# Hook for clearing out executable state. Widgets should register a callback
-# for this hook if they have anything that may need cleaning if the user
-# requests to re-load an executable.
-define_hook gdb_clear_file_hook
-
-# -----------------------------------------------------------------------------
-# NAME:       gdbtk_clear_file
-#
-# SYNOPSIS:   gdbtk_clear_file
-#
-# DESC:       This procedure is called when the user requests a new exec
-#             file load. It runs the gdb_clear_file_hook, which tells
-#             all widgets to clear state. It CANNOT call gdb_clear_file,
-#             since this hook runs AFTER we load a new exec file (i.e.,
-#             gdb_clear_file would clear the file name).
-#
-# ARGS:       none
-# -----------------------------------------------------------------------------
-proc gdbtk_clear_file {} {
-  global gdb_target_name
-
-  debug
-  # Give widgets a chance to clean up
-  catch {run_hooks gdb_clear_file_hook}
-
-  # Save the target name in case the user has already selected a
-  # target. No need to force the user to select it again.
-  set old_target $gdb_target_name
-
-  # Finally, reset our state
-  initialize_gdbtk
-
-  set gdb_target_name $old_target
-}
-
-# ------------------------------------------------------------------
-#  PROC: intialize_gdbtk - (re)initialize gdbtk's state
-# ------------------------------------------------------------------
-proc initialize_gdbtk {} {
-  global gdb_exe_changed gdb_target_changed gdb_running gdb_downloading \
-    gdb_loaded gdb_program_has_run file_done gdb_pretty_name gdb_exec \
-    gdb_target_cmd download_dialog gdb_pretty_name gdb_exe_name _gdbtk_stop \
-    gdb_target_name gdb_target_changed gdbtk_state gdb_kod_cmd gdb_shutting_down
-
-  # initialize state variables
-  set gdb_exe_changed 0
-  set gdb_target_changed 0
-  set gdb_running 0
-  set gdb_downloading 0
-  set gdb_loaded 0
-  set gdb_program_has_run 0
-  set file_done 0
-  set gdb_pretty_name {}
-  set gdb_exec {}
-  set gdb_target_cmd ""
-  set gdb_running 0
-  set gdb_shutting_down 0
-
-  set download_dialog ""
-
-  # gdb_pretty_name is the name of the GDB target as it should be
-  # displayed to the user.
-  set gdb_pretty_name ""
-
-  # gdb_exe_name is the name of the executable we are debugging.  
-  set gdb_exe_name ""
-
-  # Initialize readline
-  if {![info exists gdbtk_state(readline)]} {
-    # Only do this once...
-    set gdbtk_state(readline) 0
-    set gdbtk_state(console) ""
-    set gdbtk_state(readlineShowUser) 1
-  }
-
-  # flush cache for gdbtk_locate_main
-  gdbtk_locate_main 1
-
-  # check for existence of a kod command and get it's name and
-  # text for menu entry
-  set gdb_kod_cmd ""
-  set msg ""
-  if {![catch {gdb_cmd "show os"} msg] && ($msg != "")} {
-    set line1 [string range $msg 0 [expr [string first \n $msg] -1]]
-    if {[regexp -- \"(.*)\" $line1 dummy cmd]} {
-      set gdb_kod_cmd $cmd
-    }
-  }
-#  debug "kod_cmd=$gdb_kod_cmd"
-
-  # setup stop button
-  set _gdbtk_stop(timer) ""
-  set _gdbtk_stop(msg) ""
-
-  # gdb_target_name is the name of the GDB target; that is, the argument
-  # to the GDB target command.
-  set gdb_target_name ""
-
-  # By setting gdb_target_changed, we force a target dialog
-  # to be displayed on the first "run"
-  set gdb_target_changed 1
-}
-
-# The architecture changed. Inform the UI.
-proc gdbtk_tcl_architecture_changed {} {
-  set e [ArchChangedEvent \#auto]
-  GDBEventHandler::dispatch $e
-  delete object $e
-}
-
-proc gdbtk_console_read {} {
-  if {$::gdbtk_state(console) == ""} {
-    ManagedWin::open Console -force
-  } else {
-    raise [namespace tail $::gdbtk_state(console)]
-  }
-  set result [$::gdbtk_state(console) gets]
-  debug "result=$result"
-  return $result
-}
diff --git a/gdb/gdbtk/library/kod.itb b/gdb/gdbtk/library/kod.itb
deleted file mode 100644
index 3140733d483..00000000000
--- a/gdb/gdbtk/library/kod.itb
+++ /dev/null
@@ -1,474 +0,0 @@
-# Kernel Object Display Window for Insight.
-# Copyright (C) 1998, 1999, 2001 Red Hat, Inc.
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License (GPL) 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.
-#
-#   AUTHOR:  Fernando Nasser <fnasser@cygnus.com>
-#
-
-
-# ------------------------------------------------------------------
-#  CONSTRUCTOR - create new process window
-# ------------------------------------------------------------------
-itcl::body KodWin::constructor {args} {
-  #
-  #  Create a window with the same name as this object
-  #
-  global gdb_kod_cmd
-
-  # initialize local variables
-  set LevelCmd(0) "info $gdb_kod_cmd "
-  debug "Level 0 kod command is $LevelCmd(0)"
-
-  gdbtk_busy
-  build_win
-  gdbtk_idle
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  build_win - build the main KOD window
-# ------------------------------------------------------------------
-itcl::body KodWin::build_win {} {
-  # FIXME: rename this variable.
-  global kodActivePane
-
-  debug "Will build KOD window"
-
-  cyg::PanedWindow $itk_interior.pw -orient horizontal
-  $itk_interior.pw add titlepane
-  # We would like to use a fixed pane for the buttons.  However,
-  # this feature of PanedWindow doesn't work.
-  # $itk_interior.pw add buttonpane -resizable 0
-  $itk_interior.pw add pane1
-  $itk_interior.pw add pane2
-
-  # Now a frame for what is being listed, headers and list
-  set tp [$itk_interior.pw childsite titlepane]
-  Labelledframe $tp.tf -text "No Kernel Objects Known" \
-    -anchor nw
-  set titl $tp.tf
-  set lf [$tp.tf get_frame]
-
-  set p1 [$itk_interior.pw childsite pane1]
-  set p2 [$itk_interior.pw childsite pane2]
-  $p1 configure -height 120 -bd 2
-  $p2 configure -height 120 -bd 2
-  Labelledframe $p1.d1 -text "Details" -anchor nw
-  Labelledframe $p2.d2 -text "Details" -anchor nw
-  set d1 [$p1.d1 get_frame]
-  set d2 [$p2.d2 get_frame]
-  pack $p1.d1 $p2.d2 -side top -expand yes -fill both -padx 5 -pady 5
-  set pl1 $p1.d1
-  set pl2 $p2.d2
-
-  # Setup the button box
-  set bf [frame $tp.bf]
-  set BTop [button $bf.top -height 1 -text Top -command [code $this top]]
-  set BUp  [button $bf.up   -height 1   -text Up -command [code $this up]]
-  set BClear [button $bf.clear  -height 1 -text Clear \
-		-command [code $this clear]]
-  set BDisplay [button $bf.display -height 1 -text Display \
-		  -command [code $this display]]
-  set kodActivePane pane1
-  set BPane1 [radiobutton $bf.pane1 -variable kodActivePane \
-		-height 1 -text "Pane 1" -value pane1]
-  set BPane2 [radiobutton $bf.pane2 -variable kodActivePane \
-		-height 1 -text "Pane 2" -value pane2]
-  balloon register $bf.top "Return to List of Kernel Objects"
-  balloon register $bf.up "Return to previous List of Objects"
-  balloon register $bf.clear "Clear Object Detail Panes\nand Active setting"
-  balloon register $bf.display \
-    "Display Object or\nList of Objects of this type"
-  balloon register $bf.pane1 "Make Pane 1 Active"
-  balloon register $bf.pane2 "Make Pane 2 Active"
-  pack $bf.top $bf.up -side left -padx 5
-  pack $bf.display $bf.clear -side right -padx 5
-  pack $bf.pane2 $bf.pane1 -side bottom -padx 5 -fill both
-
-  # The list of objects
-  table $lf.s -titlerows 1 \
-    -colstretch last -rowstretch last -selectmode single \
-    -selecttype row -variable $this \
-    -yscrollcommand "$lf.sb set" -resizeborders none \
-    -state disabled
-  scrollbar $lf.sb -orient vertical -command "$lf.s yview"
-  bind $lf.s <Double-1> [code $this display]
-  $lf.s tag configure coltag -anchor nw
-
-  grid $lf.s -row 0 -column 0 -sticky nsew
-  grid $lf.sb -row 0 -column 1 -sticky nsw
-  grid columnconfigure $lf 0 -weight 1
-  grid rowconfigure $lf 0 -weight 1
-
-  # Areas to display object details
-  set t1 [table $d1.t1 -titlerows 1 -colstretch last -rowstretch last \
-	    -selectmode single -selecttype row -variable $this-pane1 \
-	    -yscrollcommand "$d1.s1 set" -resizeborders none \
-	    -rows 1 -cols 1 -state disabled]
-  scrollbar $d1.s1 -orient vertical -command "$d1.t1 yview"
-  set t2 [table $d2.t2 -titlerows 1 -colstretch last -rowstretch last \
-	    -selectmode single -selecttype row -variable $this-pane2 \
-	    -yscrollcommand "$d2.s2 set" -resizeborders none \
-	    -rows 1 -cols 1 -state disabled]
-  scrollbar $d2.s2 -orient vertical -command "$d2.t2 yview"
-
-  grid $d1.t1 -row 0 -column 0 -sticky nsew
-  grid $d1.s1 -row 0 -column 1 -sticky nsw
-  grid columnconfigure $d1 0 -weight 1
-  grid rowconfigure $d1 0 -weight 1
-  grid $d2.t2 -row 0 -column 0 -sticky nsew
-  grid $d2.s2 -row 0 -column 1 -sticky nsw
-  grid columnconfigure $d2 0 -weight 1
-  grid rowconfigure $d2 0 -weight 1
-
-  debug "Will pack KOD window"
-  pack $tp.tf -side top -expand yes -fill both -padx 5 -pady 5
-  pack $tp.bf -side top -expand no -fill x -padx 5 -pady 5
-  pack $itk_interior.pw -side bottom -expand yes -fill both
-  wm minsize $_top 450 500
-
-  # Initialize button state variables for idle (called before update)
-  set BState(BDisplay) disabled
-  set BState(BClear) disabled
-  set BState(BTop) disabled
-  set BState(BUp) disabled
-
-  #    window_name "Kernel Objects"
-
-  update dummy
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  update - update widget when something changes
-# ------------------------------------------------------------------
-itcl::body KodWin::update {event} {
-
-  debug "updating kod window"
-
-  _disable_buttons
-
-  display_list
-  display_object
-
-  _restore_buttons
-
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  display - update the display based on the selection
-#           it can be a list or an actual object
-#           We get here from a press on the Display button or
-#           from a <Double-1> on a line of the list of objects
-# ------------------------------------------------------------------
-itcl::body KodWin::display {} {
-  upvar \#0 $this table_vals
-  if {!$Running && [$lf.s cget -rows] > 1} {
-    gdbtk_busy
-    set linenum [$lf.s index active row]
-    set object $table_vals($linenum,0)
-    debug "display selection on line $linenum $object"
-    incr level
-    set LevelCmd($level) $LevelCmd([expr $level-1])
-    append LevelCmd($level) $object
-    debug "kod command for level $level is now: $LevelCmd($level)"
-    update dummy
-    # Run idle hooks and cause all other widgets to update
-    gdbtk_idle
-  }
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  display_list - display list of objects
-# ------------------------------------------------------------------
-itcl::body KodWin::display_list {} {
-  upvar \#0 $this table_vals
-
-  debug "displaying list of objects"
-
-  $lf.s configure -state normal
-  set cmd $LevelCmd($level)
-  debug "new kod command is $cmd"
-  if {[catch "gdb_cmd \"$cmd\"" objects]} {
-    # failed.  leave window blank
-    $titl configure -text "Kernel Object Display Failed"
-    $lf.s delete rows 0 [$lf.s index end row]
-    $lf.s configure -state disabled
-    set BState(BDisplay) disabled
-    return
-  }
-
-  debug "KodWin update: \n$objects"
-  if {[llength $objects] == 0} {
-    $titl configure -text "No Kernel Objects Known"
-    # no objects listed.
-    $lf.s delete rows 0 [$lf.s index end row]
-    $lf.s configure -state disabled
-    set BState(BDisplay) disabled
-    return
-  }
-
-  # insert each line one at a time
-  set num_lines -1
-  foreach line [split $objects \n] {
-    if {$num_lines == -1} {
-      if {![string match List* $line]} {
-	if {($level > 0)} {
-	  display_object $cmd objects
-	  incr level -1
-	  $lf.s configure -state disabled
-	  return
-	} else {
-	  # if level 0 first line does not start with List ignore it
-	  $titl configure -text "List of Kernel Objects"
-	}
-      } else {
-	$titl configure -text $line
-      }
-      # Clear listbox and headers to get new stuff.
-      $lf.s delete rows 0 [$lf.s index end row]
-    } elseif {$line == ""} {
-      break
-    } else {
-      set col 0
-      set list [split [string trim $line] \t]
-      if {$num_lines == 0} {
-	$lf.s configure -cols [llength $list] -titlerows 1
-      }
-      foreach item $list {
-	debug "inserting $item at $num_lines,$col"
-	set table_vals($num_lines,$col) $item
-	incr col
-      }
-    }
-    incr num_lines
-  }
-  $lf.s configure -rows [expr {$num_lines + 1}]
-
-  if {$num_lines > 0} {
-    set BState(BDisplay) active
-  }
-
-  if {$level == 0} {
-    set BState(BTop) disabled
-    set BState(BUp) disabled
-  } else {
-    set BState(BTop) active
-    set BState(BUp) active
-  }
-
-  $lf.s configure -state disabled
-  $lf.s see 0,0
-  $lf.s activate 1,0
-
-  _restore_buttons
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  display_object - display information about an object
-#           When called from update we have to reissue the gdb
-#           command to get fresh data
-# ------------------------------------------------------------------
-itcl::body KodWin::display_object {{cmd ""} {obj ""}} {
-  debug  "Displaying object details..."
-  upvar $obj objects
-  global kodActivePane
-  debug "Active Pane is $kodActivePane"
-
-  # Determine which frame to use
-  if {$kodActivePane == "pane2"} {
-    set curpan $t2
-    upvar \#0 $this-pane2 pane_values
-    if {$cmd != ""} {
-      # save command for update
-      set pane2command $cmd
-    } else {
-      # reuse saved command
-      set cmd $pane2command
-    }
-  } else {
-    set curpan $t1
-    upvar \#0 $this-pane1 pane_values
-    if {$cmd != ""} {
-      # save command for update
-      set pane1command $cmd
-    } else {
-      # reuse saved command
-      set cmd $pane1command
-    }
-  }
-  debug "curpan $curpan"
-
-  # here we must take care of the case where the user has activated a window
-  # but it does not have been filled yet.  We just return.
-  if {$cmd == ""} {
-    return
-  }
-
-  $curpan configure -state normal
-  $curpan delete rows 0 [$curpan index end row]
-  if {$obj == ""} {
-    debug "pane kod command is $cmd"
-    if {[catch "gdb_cmd \"$cmd\"" objects]
-	|| $objects == ""} {
-      # Failed.  Tell user object no longer there.
-      $curpan configure -state disabled
-      return
-    }
-  }
-
-  set num_lin 0
-  foreach line [split $objects \n] {
-    set col 0
-    set list [split [string trim $line] \t]
-    if {$num_lin == 0} {
-      $curpan configure -cols [llength $list]
-    }
-    foreach item $list {
-      set pane_values($num_lin,$col) $item
-      incr col
-    }
-    incr num_lin
-  }
-  $curpan configure -rows $num_lin -state disabled
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  clear - clear detail panes and reset pane selection
-# ------------------------------------------------------------------
-itcl::body KodWin::clear {} {
-  debug "going to clear detail panes and pane selection"
-  $t1 configure -state normal
-  $t2 configure -state normal
-  $t1 delete rows 0 [$t1 index end row]
-  $t2 delete rows 0 [$t2 index end row]
-  $t1 configure -state disabled
-  $t2 configure -state disabled
-  # Default to pane 1 again.
-  global kodActivePane
-  set kodActivePane pane1
-  set pane1command ""
-  set pane2command ""
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  top - go to the list of types of objects (top level)
-# ------------------------------------------------------------------
-itcl::body KodWin::top {} {
-  debug "going to top from level $level"
-  if {$level > 0} {
-    set level 0
-    update dummy
-  }
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  up - go to the list of objects which led to the current one
-# ------------------------------------------------------------------
-itcl::body KodWin::up {} {
-  debug "going up from level $level..."
-  if {$level > 0} {
-    incr level -1
-    debug "...to level $level"
-    update dummy
-  }
-}
-
-# ------------------------------------------------------------------
-#  DESTRUCTOR - destroy window containing widget
-# ------------------------------------------------------------------
-itcl::body KodWin::destructor {} {
-  upvar \#0 $this table_vals $this-pane1 pane1_vals $this-pane2 pane2_vals
-  global kodActivePane
-
-  catch {unset table_vals}
-  catch {unset pane1_vals}
-  catch {unset pane2_vals}
-  catch {unset kodActivePane}
-}
-
-# ------------------------------------------------------------------
-#  PUBLIC METHOD:  set_variable - called when user runs `set os'
-#                   command
-# ------------------------------------------------------------------
-itcl::body KodWin::set_variable {event} {
-
-  set value [$event get value]
-  if {[$event get variable] == "os" && $value != ""} {
-    set LevelCmd(0) "info $value "
-    set level 0
-    update dummy
-  }
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  reconfig - used when preferences change
-# ------------------------------------------------------------------
-itcl::body KodWin::reconfig {} {
-  destroy $itk_interior.bf
-  destroy $titl
-  build_win
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  busy - BusyEvent handler
-#
-#        This method should accomplish blocking
-#        - clicks in the window
-#        - change mouse pointer
-# ------------------------------------------------------------------
-itcl::body KodWin::busy {event} {
-  set Running 1
-  _disable_buttons
-  cursor watch
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  idle - idle event handler.  Run when the target is not
-#           running
-# ------------------------------------------------------------------
-itcl::body KodWin::idle {event} {
-  set Running 0
-  _restore_buttons
-  cursor {}
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  cursor - set the window cursor
-#        This is a convenience method which simply sets the mouse
-#        pointer to the given glyph.
-# ------------------------------------------------------------------
-itcl::body KodWin::cursor {glyph} {
-  $_top configure -cursor $glyph
-}
-
-# ------------------------------------------------------------------
-#  PRIVATE METHOD:  _disable_buttons - disable all buttons
-#       Used when we are busy and can't take another event
-# ------------------------------------------------------------------
-itcl::body KodWin::_disable_buttons {} {
-  $BTop configure -state disabled
-  $BUp configure -state disabled
-  $BDisplay configure -state disabled
-  $BClear configure -state disabled
-}
-
-# ------------------------------------------------------------------
-#  PRIVATE METHOD:  _restore_buttons - restore all buttons to their
-#       previous states.
-#       Used when we are busy and can't take another event
-# ------------------------------------------------------------------
-itcl::body KodWin::_restore_buttons {} {
-  $BTop configure -state $BState(BTop)
-  $BUp configure -state $BState(BUp)
-  $BDisplay configure -state $BState(BDisplay)
-  # CLEAR is always active, except when busy
-  $BClear configure -state active
-}
diff --git a/gdb/gdbtk/library/kod.ith b/gdb/gdbtk/library/kod.ith
deleted file mode 100644
index f2dfefb3cdf..00000000000
--- a/gdb/gdbtk/library/kod.ith
+++ /dev/null
@@ -1,63 +0,0 @@
-# Kernel Object Display Window definition for Insight.
-# Copyright (C) 1999, 2001 Red Hat, Inc.
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License (GPL) 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.
-
-itcl::class KodWin {
-  inherit EmbeddedWin GDBWin
-
-  private {
-    variable bf
-    variable lf
-    variable titl
-    variable BTop
-    variable BUp
-    variable BClear
-    variable BDisplay
-    variable lb
-    variable t1
-    variable t2
-    variable pl1
-    variable pl2
-    variable pane1command ""
-    variable pane2command ""
-    variable BPane1
-    variable BPane2
-    variable level 0
-    common LevelCmd
-    variable BState
-    variable Running 0
-    method build_win {}
-    method display {}
-    method display_list {}
-    method display_object {{cmd ""} {obj ""}}
-    method clear {}
-    method top {}
-    method up {}
-    method cursor {glyph}
-    method _disable_buttons {}
-    method _restore_buttons {}
-  }
-
-  public {
-    method constructor {args}
-    method destructor {}
-    method reconfig {}
-
-    #
-    # Gdb Events
-    #
-    method set_variable {event}
-    method busy {event}
-    method idle {event}
-    method update {event}
-  }
-}
diff --git a/gdb/gdbtk/library/locals.tcl b/gdb/gdbtk/library/locals.tcl
deleted file mode 100644
index 9f3f098f9f5..00000000000
--- a/gdb/gdbtk/library/locals.tcl
+++ /dev/null
@@ -1,179 +0,0 @@
-# Local Variable Window for Insight.
-# Copyright 2002, 2003 Red Hat
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License (GPL) 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.
-
-
-# ----------------------------------------------------------------------
-# Implements local variables windows for gdb.
-# ----------------------------------------------------------------------
-
-itcl::class LocalsWin {
-  inherit EmbeddedWin GDBWin
-  # ------------------------------------------------------------------
-  #  CONSTRUCTOR - create new locals window
-  # ------------------------------------------------------------------
-  constructor {args} {
-    debug
-
-    gdbtk_busy
-    build_win $itk_interior
-    gdbtk_idle
-    
-    add_hook gdb_no_inferior_hook "$this no_inferior"
-    add_hook gdb_clear_file_hook [code $this clear_file]
-    add_hook file_changed_hook [code $this clear_file]
-
-    update dummy
-  }
-  
-
-  # ------------------------------------------------------------------
-  #   PUBLIC METHOD:  busy - BusyEvent handler
-  #           Disable all ui elements that could affect gdb's state
-  # ------------------------------------------------------------------
-  method busy {event} {
-    debug
-    set Running 1
-    cursor watch
-  }
-
-  # Re-enable the UI
-  method idle {event} {
-    debug
-    set Running 0
-    cursor {}
-  }
-
-  # ------------------------------------------------------------------
-  # METHOD:   no_inferior
-  #           Reset this object.
-  # ------------------------------------------------------------------
-  method no_inferior {} {
-    debug
-    cursor {}
-    set Running 0
-    set _frame {}
-  }
-  
-  # ------------------------------------------------------------------
-  #  METHOD:  cursor - change the toplevel's cursor
-  # ------------------------------------------------------------------
-  method cursor {what} {
-    [winfo toplevel [namespace tail $this]] configure -cursor $what
-    ::update idletasks
-  }
-  
-  
-  # ------------------------------------------------------------------
-  # METHOD: build_win - build window for variables. 
-  # ------------------------------------------------------------------
-  method build_win {f} {
-    #debug "$f"
-    
-    set tree [VarTree $f.tree -type "local"]
-    pack $f.tree -expand yes -fill both
-    pack $f -expand yes -fill both
-    
-    window_name "Local Variables"
-    ::update idletasks
-  }
-
-
-  # ------------------------------------------------------------------
-  #  METHOD: clear_file - Clear out state so that a new executable
-  #             can be loaded. For LocalWins, this means deleting
-  #             the Variables list.
-  # ------------------------------------------------------------------
-  method clear_file {} {
-    debug
-    set Variables {}
-  }
-
-  # ------------------------------------------------------------------
-  # DESTRUCTOR - delete locals window
-  # ------------------------------------------------------------------
-  destructor {
-    debug
-    set tree {}
-
-    # Remove this window and all hooks
-    remove_hook gdb_no_inferior_hook "$this no_inferior"
-    remove_hook gdb_clear_file_hook [code $this clear_file]
-    remove_hook file_changed_hook [code $this clear_file]
-
-    foreach var $Variables {
-      $var delete
-    }
-  }
-
-  method context_switch {} {
-    debug
-
-    set err [catch {gdb_selected_frame} current_frame]
-    #debug "1: err=$err; _frame=\"$_frame\"; current_frame=\"$current_frame\""
-
-    if {$err && $_frame != ""} {
-      # No current frame
-      debug "no current frame"
-      catch {destroy $_frame}
-      set _frame {}
-      return 1
-    } elseif {$current_frame == "" && $_frame == ""} {
-      #debug "2"
-      return 0
-    } elseif {$_frame == "" || $current_frame != [$_frame address]} {
-      # We've changed frames. If we knew something about
-      # the stack layout, we could be more intelligent about
-      # destroying variables, but we don't know that here (yet).
-      debug "switching to frame at $current_frame"
-      
-      # Destroy the old frame and create the new one
-      catch {destroy $_frame}
-      set _frame [Frame ::\#auto $current_frame]
-      debug "created new frame: $_frame at [$_frame address]"
-      return 1
-    }
-    
-    # Nothing changed
-    #debug "3"
-    return 0
-  }
-
-
-  method update {event} {
-    debug
-
-    # Check that a context switch has not occured
-    if {[context_switch]} {
-      debug "CONTEXT SWITCH"
-      
-      # delete variables in tree
-      $tree remove all
-      set Variables {}
-
-      if {$_frame != ""} {
-	$tree add [$_frame variables]
-      }
-    } else {
-      if {$_frame == ""} {return}
-      # check for any new variables in the same frame
-      $tree add [$_frame new]
-    }    
-    after idle [code $tree update]
-  }
-  
-  protected variable Entry
-  protected variable Variables {}
-  protected variable tree
-  protected variable Running
-  protected variable _frame {}
-}
diff --git a/gdb/gdbtk/library/main.tcl b/gdb/gdbtk/library/main.tcl
deleted file mode 100644
index 75c66ad18db..00000000000
--- a/gdb/gdbtk/library/main.tcl
+++ /dev/null
@@ -1,184 +0,0 @@
-# GDBtk (Insight) entry point
-# Copyright 1997, 1998, 1999, 2002, 2003 Red Hat, Inc.
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License (GPL) 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.
-
-
-# State is controlled by 5 global boolean variables.
-#
-# gdb_target_changed
-# gdb_exe_changed
-# gdb_running
-# gdb_downloading
-# gdb_loaded
-
-################### Initialization code #########################
-
-# If GDBtk fails to start at all, you might want to uncomment one or 
-# both of these.
-#set tcl_traceExec 2
-#set tcl_traceCompile 1
-
-# Add gdb's Tcl library directory to the end of the auto-load search path, if 
-# it isn't already on the path.
-# Also, add the plugins directory if it exists.
-# Note: GDBTK_LIBRARY will be set in tcl_findLibrary before main.tcl is called.
-
-set gdb_plugins ""
-if {[info exists auto_path]} {
-  if {[lsearch -exact $auto_path $GDBTK_LIBRARY] < 0} {
-    lappend auto_path $GDBTK_LIBRARY
-  }
-
-  # Add default plugins directory, which will be [name of exe]/../../lib/insight1.0
-  set exename [info nameofexecutable]
-  set dir [file join [file dirname [file dirname $exename]] lib insight1.0]
-  if {[file exists $dir]} {
-    lappend gdb_plugins $dir
-    lappend auto_path $dir
-  }
-  # Add any user-specified plugins directories
-  if {[info exists env(INSIGHT_PLUGINS)]} {
-    set dirs [split $env(INSIGHT_PLUGINS) :]
-    lappend gdb_plugins $dirs
-    lappend auto_path $dirs
-  }
-}
-
-
-# Require the packages we need.  Most are loaded already, but this will catch 
-# any odd errors... :
-
-foreach p {{Tcl 8.0} {Tk 8.0} {Itcl 3.0} {Itk 3.0} {Gdbtk 1.0} {combobox 2.2} {debug 1.0}} {
-  if {[catch {package require [lindex $p 0] [lindex $p 1]} msg]} {
-    if {![info exists ::env(GDBTK_TEST_RUNNING)] || $::env(GDBTK_TEST_RUNNING) == 0} {
-      if {$::tcl_platform(platform) != "windows"} {
-	puts stderr "Error: $msg"
-      }
-      catch {tk_messageBox -title Error -message $msg -icon error -type ok}
-    }
-    exit -1
-  } else {
-    #puts "Loaded [lindex $p 0] $msg"
-  }
-}
-
-namespace import itcl::*
-namespace import debug::*
-
-# Finally, load Iwidgets
-if {[info exists IWIDGETS_LIBRARY]} {
-  lappend auto_path $IWIDGETS_LIBRARY
-}
-if {[catch {package require Iwidgets} msg]} {
-  if {![info exists ::env(GDBTK_TEST_RUNNING)] || $::env(GDBTK_TEST_RUNNING) == 0} {
-    if {$::tcl_platform(platform) != "windows"} {
-      puts stderr "Error: $msg"
-    }
-    catch {tk_messageBox -title Error -message $msg -icon error -type ok}
-  }
-  exit -1
-}
-
-
-# Environment variables controlling debugging:
-# GDBTK_TRACE
-#	unset or 0	no tracing
-#	1		tracing initialized but not started
-#	2		tracing initialized and started
-#
-# GDBTK_DEBUGFILE - filename to write debugging messages and
-#	trace information (if tracing is enabled).
-#
-if {[info exists env(GDBTK_TRACE)] && $env(GDBTK_TRACE) != 0} {
-  # WARNING: the tracing code must not trace into itself or
-  # infinite recursion will result. As currently configured
-  # the tracing code will not trace basic tcl functions or anything defined
-  # before debug::init.  For this reason we must source the DebugWin
-  # code before debug::init is called.
-  source [file join $GDBTK_LIBRARY debugwin.ith]
-  source [file join $GDBTK_LIBRARY debugwin.itb]
-
-  # Calling this installs our hooks for tracing and profiling.
-  # This WILL slow things down.
-  ::debug::init
-
-  if {$env(GDBTK_TRACE) == 2} {
-    ::debug::trace_start
-  }
-}
-
-if {[info exists env(GDBTK_DEBUG)] && $env(GDBTK_DEBUG) != 0} {
-  if {[info exists env(GDBTK_DEBUGFILE)]} {
-    ::debug::logfile $env(GDBTK_DEBUGFILE)
-  } else {
-    ::debug::logfile "insight.log"
-  }
-}
-
-# For testing
-set _test(interactive) 0
-
-# set traces on state variables
-trace variable gdb_running w do_state_hook
-trace variable gdb_downloading w do_state_hook
-trace variable gdb_loaded w do_state_hook
-define_hook state_hook
-
-# set up preferences
-pref init
-
-# let libgui tell us how to feel
-standard_look_and_feel
-
-# now let GDB set its default preferences
-pref_set_defaults
-
-# read in preferences
-pref_read
-
-init_disassembly_flavor
-
-# initialize state variables
-initialize_gdbtk
-
-# Arrange for session code to notice when file changes.
-add_hook file_changed_hook Session::notice_file_change
-
-ManagedWin::init
-
-# This stuff will help us play nice with WindowMaker's AppIcons.
-# Can't do the first bit yet, since we don't get this from gdb...
-# wm command . [concat $argv0 $argv] 
-wm group . . 
-
-# some initial commands to get gdb in the right mode
-gdb_cmd {set height 0}
-gdb_cmd {set width 0}
-
-if {[info exists env(GDBTK_TEST_RUNNING)] && $env(GDBTK_TEST_RUNNING)} {
-  set gdb_target_name "exec"
-} else {
-  # gdb_target_name is the name of the GDB target; that is, the argument
-  # to the GDB target command.
-  set gdb_target_name ""
-  # By setting gdb_target_changed, we force a target dialog
-  # to be displayed on the first "run"
-  set gdb_target_changed 1
-}
-
-update
-
-# Uncomment the next line if you want a splash screen at startup...
-# ManagedWin::open About -transient -expire 5000
-
-gdbtk_idle
-
diff --git a/gdb/gdbtk/library/managedwin.itb b/gdb/gdbtk/library/managedwin.itb
deleted file mode 100644
index dcf4989bfb5..00000000000
--- a/gdb/gdbtk/library/managedwin.itb
+++ /dev/null
@@ -1,386 +0,0 @@
-# Managed window for Insight.
-# Copyright 1998, 1999, 2000, 2001, 2002 Red Hat, Inc.
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License (GPL) 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.
-
-
-# ------------------------------------------------------------
-#  PUBLIC METHOD:  constructor
-# ------------------------------------------------------------
-itcl::body ManagedWin::constructor {args} {
-  #debug "$this args=$args"
-  set _top [winfo toplevel $itk_interior]
-}
-
-# ------------------------------------------------------------
-#  PUBLIC METHOD: destructor
-# ------------------------------------------------------------
-itcl::body ManagedWin::destructor {} {
-  # If no toplevels remain, quit.  However, check the quit_if_last
-  # flag since we might be doing something like displaying a 
-  # splash screen at startup...
-
-  if {!$numTopWins && [quit_if_last]} {
-    gdb_force_quit
-  } else {
-    destroy_toplevel
-  }
-}
-
-# ------------------------------------------------------------
-#  PUBLIC METHOD:  window_name - Set the name of the window
-#   (and optionally its icon's name).
-# ------------------------------------------------------------
-itcl::body ManagedWin::window_name {wname {iname ""}} {
-  wm title $_top $wname
-  if {$iname != ""} {
-    wm iconname $_top $iname
-  } else {
-    wm iconname $_top $wname
-  }
-}
-
-# ------------------------------------------------------------
-#  PUBLIC METHOD: pickle - This is the base class pickle
-#   method.  It returns a command that can be used to recreate
-#   this particular window.  
-# ------------------------------------------------------------
-itcl::body ManagedWin::pickle {} {
-  return [list ManagedWin::open [namespace tail [info class]]]
-}
-
-# ------------------------------------------------------------
-#  PUBLIC METHOD:  reveal
-# ------------------------------------------------------------
-itcl::body ManagedWin::reveal {} {
-  # Do this update to flush all changes before deiconifying the window.
-  update idletasks
-  
-  raise $_top
-  wm deiconify $_top
-
-  # Some window managers (on unix) fail to honor the geometry unless
-  # the window is visible.
-  if {[info exists ::$_top._init_geometry]} {
-    upvar ::$_top._init_geometry gm
-    if {$::tcl_platform(platform) == "unix"} {
-      wm geometry $_top $gm
-    }
-    unset ::$_top._init_geometry
-  }
-  
-  # There used to be a `focus -force' here, but using -force is
-  # unfriendly, so it was removed.  It was then replaced with a simple
-  # `focus $top'.  However, this has no useful effect -- it just
-  # resets the subwindow of $top which has the `potential' focus.
-  # This can actually be confusing to the user.
-
-  # NOT for Windows, though. Without the focus, we get, eg. a
-  # register window on top of the source window, but the source window
-  # will have the focus. This is not the proper model for Windows.
-  if {$::tcl_platform(platform) == "windows"} {
-    focus -force [focus -lastfor $_top]
-  }
-}
-
-# ------------------------------------------------------------
-#  PUBLIC PROC:  restart
-# ------------------------------------------------------------
-itcl::body ManagedWin::restart {} {
-  # This is needed in case we've called "gdbtk_busy" before the restart.
-  # This will configure the stop/run button as necessary
-  after idle gdbtk_idle
-  
-  # call the reconfig method for each object
-  foreach obj [itcl_info objects -isa ManagedWin] {
-    if {[catch {$obj reconfig} msg]} {
-      dbug W "reconfig failed for $obj - $msg"
-    } 
-  }
-}
-
-# ------------------------------------------------------------------
-#  PUBLIC PROC:  shutdown - This writes all the active windows to
-#   the preferences file, so they can be restored at startup.
-#   FIXME: Currently assumes only ONE window per type...
-# ------------------------------------------------------------------
-itcl::body ManagedWin::shutdown {} {
-  set activeWins {}
-  foreach win [itcl_info objects -isa ManagedWin] {
-    if {![$win isa ModalDialog] && ![$win _ignore_on_save]} {
-      set g [wm geometry [winfo toplevel [namespace tail $win]]]
-      pref setd gdb/geometry/[namespace tail $win] $g
-      lappend activeWins [$win pickle]
-    }
-  }
-  pref set gdb/window/active $activeWins
-}
-
-# ------------------------------------------------------------------
-#  PUBLIC PROC:  startup - This restores all the windows that were
-#   opened at shutdown.
-#   FIXME: Currently assumes only ONE window per type...
-# ------------------------------------------------------------------
-itcl::body ManagedWin::startup {} {
-  debug "Got active list [pref get gdb/window/active]"
-
-  foreach cmd [pref get gdb/window/active] {
-    eval $cmd
-  }
-  # If we open the source window, and a source window already exists,
-  # then we end up raising it twice during startup.  This yields an
-  # annoying effect for the user: if the user tries the bury the
-  # source window during startup, it will raise itself again.  This
-  # explains why we first check to see if a source window exists
-  # before trying to create it -- raising the window is an inevitable
-  # side effect of the creation process.
-  if {[llength [find SrcWin]] == 0} {
-    ManagedWin::open SrcWin
-  }
-}
-
-# ------------------------------------------------------------
-#  PUBLIC PROC:  open_dlg
-# ------------------------------------------------------------
-itcl::body ManagedWin::open_dlg {class args} {
-  
-  set newwin [eval _open $class $args]
-  if {$newwin != ""} {
-    $newwin reveal
-    $newwin post
-  }
-}
-
-# ------------------------------------------------------------
-#  PUBLIC PROC:  open
-# ------------------------------------------------------------
-itcl::body ManagedWin::open {class args} {
-  
-  set newwin [eval _open $class $args]
-  if {$newwin != ""} {
-    if {[$newwin isa ModalDialog]} {
-      parse_args [list {expire 0}]
-      after idle "$newwin reveal; $newwin post 0 $expire"
-    } else {
-      after idle "$newwin reveal"
-    }
-  }
-  
-  return $newwin
-}
-
-# ------------------------------------------------------------
-#  PRIVATE PROC:  _open
-# ------------------------------------------------------------
-itcl::body ManagedWin::_open { class args } {
-  debug "$class $args"
-  
-  parse_args force
-
-  if {!$force} {
-    # check all windows for one of this type
-    foreach obj [itcl_info objects -isa ManagedWin] {
-      if {[$obj isa $class]} {
-	$obj reveal
-	return $obj
-      }
-    }
-    
-  }
-  # need to create a new window
-  return [eval _create $class $args]
-}
-
-# ------------------------------------------------------------
-#  PRIVATE PROC:  _create
-# ------------------------------------------------------------
-itcl::body ManagedWin::_create { class args } {
-  
-  set win [string tolower $class]
-  debug "win=$win args=$args"
-  
-  parse_args {center transient {over ""}} 
-  
-  # increment window numbers until we get an unused one
-  set i 0
-  while {[winfo exists .$win$i]} { incr i }
-  
-  while { 1 } {
-    set top [toplevel .$win$i]
-    wm withdraw $top
-    wm protocol $top WM_DELETE_WINDOW "destroy $top"
-    wm group $top .
-    set newwin $top.$win
-    if {[catch {uplevel \#0 eval $class $newwin $args} msg]} {
-      dbug E "object creation of $class failed: $msg"
-      dbug E $::errorInfo
-      if {[string first "object already exists" $msg] != -1} {
-	# sometimes an object is still really around even though
-	# [winfo exists] said it didn't exist.  Check for this case
-	# and increment the window number again.
-	catch {destroy $top}
-	incr i
-      } else {
-	return ""
-      }
-    } else {
-      break
-    }
-  }
-  
-  if {[catch {pack $newwin -expand yes -fill both}]} {
-    dbug W "packing of $newwin failed: $::errorInfo"
-    return ""
-  }
-  
-  wm maxsize $top $_screenwidth $_screenheight
-  wm minsize $top 20 20
-  update idletasks
-
-  if {$over != ""} {
-    # center new window
-    center_window $top -over [winfo toplevel [namespace tail $over]]
-  } elseif {$center} {
-    center_window $top
-  }
-
-  if {$transient} {
-    wm resizable $top 0 0
-
-    # If a SrcWin is around, use its toplevel as the master for
-    # the transient. Otherwise use ".". (The splash screen will
-    # need ".", for example.)
-    set srcs [ManagedWin::find SrcWin]
-    if {[llength $srcs] > 0} {
-      set w [winfo toplevel [namespace tail [lindex $srcs 0]]]
-    } else {
-      set w .
-    }
-    wm transient $top $w
-  } elseif {$::tcl_platform(platform) == "unix"} {
-    # Modal dialogs DONT get Icons...
-    if {[pref get gdb/use_icons] && ![$newwin isa ModalDialog]} {
-      set icon [_make_icon_window ${top}_icon]
-      wm iconwindow $top $icon
-      bind $icon <Double-1> "$newwin reveal"
-    }
-  }
-  
-  if {[info exists ::env(GDBTK_TEST_RUNNING)] && $::env(GDBTK_TEST_RUNNING)} {
-    set g "+100+100"
-    wm geometry $top $g
-    wm positionfrom $top user
-  } else {
-    set g [pref getd gdb/geometry/$newwin]
-    if {$g == "1x1+0+0"} { 
-      dbug E "bad geometry"
-      set g ""
-    }
-    if {$g != ""} {
-      # OK. We have a requested geometry. We know that it fits on the screen
-      # because we set the maxsize.  Now we have to make sure it will not be
-      # displayed off the screen.
-      set w 0; set h 0; set x 0; set y 0
-      if {![catch {scan $g  "%dx%d%d%d" w h x y} res]} {
-	if {$x < 0} {
-	  set x [expr $_screenwidth + $x]
-	}
-	if {$y < 0} {
-	  set y [expr $_screenheight + $y]
-	}
-	
-	# If the window is transient, then don't reset its size, since
-	# the user didn't set this anyway, and in some cases where the
-	# size can change dynamically, like the Global Preferences
-	# dialog, this can hide parts of the dialog with no recourse...
-	
-	# if dont_remember_size is true, don't set size, just like
-	# transients
-	
-	if {$transient || [dont_remember_size]} {
-	  set g "+${x}+${y}"
-	} else {
-	  set g "${w}x${h}+${x}+${y}"
-	}
-	if {[expr $x+50] < $_screenwidth && [expr $y+20] < $_screenheight} {
-	  wm positionfrom $top user
-	  wm geometry $top $g
-	  set ::$top._init_geometry $g
-	}
-      }
-    }
-  }
-
-  bind $top <Alt-F4> [list delete object $newwin]
-
-  return $newwin
-}
-
-# ------------------------------------------------------------
-#  PUBLIC PROC:  find
-# ------------------------------------------------------------
-itcl::body ManagedWin::find { win } {
-  debug "$win"
-  set res ""
-  foreach obj [itcl_info objects -isa ManagedWin] {
-    if {[$obj isa $win]} {
-      lappend res $obj
-    }
-  }
-  return $res
-}
-
-# ------------------------------------------------------------
-#  PUBLIC PROC:  init
-# ------------------------------------------------------------
-itcl::body ManagedWin::init {} {
-  wm withdraw .
-  set _screenheight [winfo screenheight .]
-  set _screenwidth [winfo screenwidth .]
-}
-
-# ------------------------------------------------------------
-#  PUBLIC METHOD:  destroy_toplevel
-# ------------------------------------------------------------
-itcl::body ManagedWin::destroy_toplevel {} {
-  after idle "update idletasks;destroy $_top"
-}
-
-# ------------------------------------------------------------
-#  PROTECTED METHOD:  _freeze_me
-# ------------------------------------------------------------
-itcl::body ManagedWin::_freeze_me {} {
-  $_top configure -cursor watch
-  ::update idletasks
-}
-
-# ------------------------------------------------------------
-#  PROTECTED METHOD: _thaw_me
-# ------------------------------------------------------------
-itcl::body ManagedWin::_thaw_me {} {
-
-  $_top configure -cursor {}
-  ::update idletasks
-}
-
-# ------------------------------------------------------------------
-#  PRIVATE PROC: _make_icon_window - create a small window with an
-#   icon in it for use by certain Unix window managers.
-# ------------------------------------------------------------------
-itcl::body ManagedWin::_make_icon_window {name {file "gdbtk_icon"}} {
-  if {![winfo exists $name]} {
-    toplevel $name
-    label $name.im -image \
-      [image create photo icon_photo -file [file join $::gdb_ImageDir $file.gif]]
-  }
-  pack $name.im
-  return $name
-}
diff --git a/gdb/gdbtk/library/managedwin.ith b/gdb/gdbtk/library/managedwin.ith
deleted file mode 100644
index f4a16c97c30..00000000000
--- a/gdb/gdbtk/library/managedwin.ith
+++ /dev/null
@@ -1,67 +0,0 @@
-# Managed window class definition for GDBtk.
-# Copyright 1998, 1999, 2000, 2001 Red Hat, Inc.
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License (GPL) 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.
-
-
-itcl::class ManagedWin {
-  inherit itk::Widget
-  
-  public {
-    method constructor {args}
-    method destructor {}
-
-    method reconfig {} {}
-    method destroy_toplevel {}
-    method quit_if_last {} {return 1}
-    method pickle {}
-    method reveal {}
-    method window_name {wname {iname ""}}
-
-    proc find {win}
-    proc open {class args}
-    proc open_dlg {class args}
-    proc init {}
-    proc restart {}
-    proc startup {}
-    proc shutdown {}
-  }
-
-  protected {
-    # The Tk's toplevel window for this ManagedWin
-    variable _top
-
-    # Variable which holds the geometry of this window
-    variable _geometry {}
-
-    # this is the counter of TopLevelWins open
-    # when it hits 0, exit.
-    common numTopWins 0
-
-    common _screenwidth
-    common _screenheight
-
-    method _freeze_me {}
-    method _thaw_me {}
-
-    # Should this window be reopened when we startup?
-    method _ignore_on_save {} { return 0 }
-
-    # Should this window's size be remembered?
-    proc dont_remember_size {} { return 0 }
-  }
-
-  private {
-    proc _create {class args}
-    proc _open {class args}
-    proc _make_icon_window {name {file "gdbtk_icon"}}
-  }
-}
diff --git a/gdb/gdbtk/library/mempref.itb b/gdb/gdbtk/library/mempref.itb
deleted file mode 100644
index c2617cf20f7..00000000000
--- a/gdb/gdbtk/library/mempref.itb
+++ /dev/null
@@ -1,386 +0,0 @@
-# Memory display preferences window for Insight.
-# Copyright 1998, 1999, 2002, 2003 Red Hat
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License (GPL) 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.
-
-
-# ------------------------------------------------------------------
-#  METHOD:  constructor - build the dialog
-# ------------------------------------------------------------------
-itcl::body MemPref::constructor {args} {
-
-  window_name "Memory Preferences"
-
-  eval itk_initialize $args
-  
-  if {$float_size == ""} {
-    set float_size [gdb_eval sizeof(float)]
-    set double_size [gdb_eval sizeof(double)]
-  }
-  
-  if {[string compare $format f] == 0} {
-    set gformat x
-    set format_disabled 1
-    if {$size == $float_size} {
-      set gsize 3
-    } elseif {$size == $double_size} {
-      set gsize 5
-    }
-  } else {
-    set gsize $size
-    set gformat $format
-  }
-  
-  set gnumbytes $numbytes
-  set gbpr $bpr
-  set gascii $ascii
-  set gascii_char $ascii_char
-  
-  build_win
-  
-  if {$format_disabled} {
-    set format_disabled 0
-    disable_format
-  }
-  
-  wm resizable [winfo toplevel $itk_interior] 0 0
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  destructor - destroy the dialog
-# ------------------------------------------------------------------
-itcl::body MemPref::destructor {} {
-  trace vdelete [scope gnumbytes] w [code $this check_numbytes]
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  build_win - build the dialog
-# ------------------------------------------------------------------
-itcl::body MemPref::build_win {} {
-
-  frame $itk_interior.f
-  set f [frame $itk_interior.f.a]
-  frame $itk_interior.f.b
-
-  # SIZE
-  Labelledframe $f.f1 -anchor nw -text Size
-  set fr [$f.f1 get_frame]
-
-  set Widgets(rb-Byte) [radiobutton $fr.1 -variable [scope gsize] -text Byte \
-			  -value 1 -command [code $this enable_format]]
-  set Widgets(rb-half_word) [radiobutton $fr.2 -variable [scope gsize] -text "Half Word" \
-			       -value 2 -command [code $this enable_format]]
-  set Widgets(rb-word) [radiobutton $fr.4 -variable [scope gsize] -text Word \
-			  -value 4 -command [code $this enable_format]]
-  set Widgets(rb-d_word) [radiobutton $fr.8 -variable [scope gsize] -text "Double Word" \
-			    -value 8 -command [code $this enable_format]]
-  set Widgets(rb-float) [radiobutton $fr.f -variable [scope gsize] -text Float \
-			   -value 3 -command [code $this disable_format]]
-  set Widgets(rb-d_float) [radiobutton $fr.d -variable [scope gsize] -text "Double Float" \
-			     -value 5 -command [code $this disable_format]]
-  grid $fr.1 $fr.4 $fr.f -sticky w -padx 4
-  grid $fr.2 $fr.8 $fr.d -sticky w -padx 4
-
-  # FORMAT
-  Labelledframe $f.f2 -anchor nw -text Format
-  set fr [$f.f2 get_frame]
-  set Widgets(rb-binary) [radiobutton $fr.1 -variable [scope gformat] \
-			    -text Binary -value t]
-  set Widgets(rb-octal) [radiobutton $fr.2 -variable [scope gformat] \
-			   -text Octal -value o]
-  set Widgets(rb-hex) [radiobutton $fr.3 -variable [scope gformat] \
-			 -text Hex -value x]
-  set Widgets(rb-signed_dec) [radiobutton $fr.4 -variable [scope gformat] \
-				-text "Signed Decimal" -value d]
-  set Widgets(rb-unsign_dec) [radiobutton $fr.5 -variable [scope gformat] \
-				-text "Unsigned Decimal" -value u]
-
-  grid $fr.1 $fr.2 $fr.3 -sticky w -padx 4
-  grid $fr.4 $fr.5 x -sticky w -padx 4
-
-  # TOTAL BYTES
-  Labelledframe $f.fx -anchor nw -text "Number of Bytes"
-
-  if {$gnumbytes == 0} {
-    set gnumbytes $default_numbytes
-    set gvar 0
-  } else {
-    set gvar 1
-  }
-
-  set fr [$f.fx get_frame] 
-  set Widgets(rb-win_size) [radiobutton $fr.1 -variable [scope gvar] -text "Depends on window size" \
-			      -value 0 -command [code $this toggle_size_control]]
-  frame $fr.2
-  set Widgets(rb-fixed) [radiobutton $fr.2.b -variable [scope gvar] -text Fixed \
-			   -value 1 -command [code $this toggle_size_control]]
-
-  set old_numbytes $default_numbytes
-  set Widgets(e-numbytes) [entry $fr.2.e -textvariable [scope gnumbytes] -width 3]
-  set normal_background [$Widgets(e-numbytes) cget -background]
-
-  #
-  # Trace gnumbytes so it will always be a +'ve integer...  Have to set this
-  # trace AFTER the widget's textvariable is set so this trace will fire
-  # BEFORE the widget's trace.
-  #
-
-  trace variable [scope gnumbytes] w [code $this check_numbytes]
-
-  label $fr.2.l -text bytes
-  grid $fr.2.b $fr.2.e $fr.2.l -sticky we
-  grid $fr.1 x -sticky w -padx 4
-  grid $fr.2 x -sticky w -padx 4
-  grid columnconfigure $fr 1 -weight 1
-
-  # MISC
-  Labelledframe $f.1 -anchor nw -text "Miscellaneous"
-  set fr [$f.1 get_frame] 
-  frame $fr.1
-  label $fr.1.plabel -height 1 -width 1 -bg $color -relief raised  
-  set Widgets(b-color) [button $fr.1.pc -text "Change color..."  \
-			  -command [code $this pick $fr.1.plabel]]
-  grid $fr.1.plabel $fr.1.pc
-  frame $fr.2
-  label $fr.2.l -text "Bytes Per Row "
-  set Widgets(b-bytes_per_row) [::combobox::combobox $fr.2.c \
-				  -command [code $this set_bytes_per_row]  \
-				  -width 4 -editable 0 -font global/fixed \
-				  -bg $::Colors(textbg)]
-  $fr.2.c list insert end 4
-  $fr.2.c list insert end 8
-  $fr.2.c list insert end 16
-  $fr.2.c list insert end 32
-  $fr.2.c list insert end 64
-  $fr.2.c list insert end 128
-  $fr.2.c configure -value $gbpr
-
-  pack $fr.2.l -side left -anchor e
-  pack $fr.2.c -side right
-
-  set Widgets(cb-display_ascii) [checkbutton $fr.3 -variable [scope gascii] -text "Display ASCII"]
-  frame $fr.4
-  set Widgets(e-ascii_char) [entry $fr.4.e -textvariable [scope gascii_char] -width 1]
-  label $fr.4.l -text "Control Char"
-  grid $fr.4.e $fr.4.l -sticky we
-  grid $fr.2 x $fr.3 -sticky w -padx 4
-  grid $fr.4 -sticky w -padx 4
-  grid columnconfigure $fr 1 -weight 1
-
-  grid $f.f1 -padx 5 -pady 6 -sticky news
-  grid $f.f2 -padx 5 -pady 6 -sticky news
-  grid $f.fx -padx 5 -pady 6 -sticky news
-  grid $f.1 -padx 5 -pady 6 -sticky we
-
-
-  set Widgets(b-ok) [button $itk_interior.f.b.ok -text OK -command [code $this ok] -width 7 -default active]
-  focus $Widgets(b-ok)
-  
-  # If there is an OK button, set Return in the entry field to invoke it...
-  
-  bind $Widgets(e-numbytes) <KeyPress-Return> "$Widgets(b-ok) flash ; $Widgets(b-ok) invoke"
-  
-  set Widgets(b-cancel) [button $itk_interior.f.b.quit -text Cancel -command [code $this cancel] -width 7]
-  set Widgets(b-apply) [button $itk_interior.f.b.apply -text Apply -command [code $this apply] -width 7]
-  standard_button_box $itk_interior.f.b
-  
-  grid $itk_interior.f.a 
-  grid $itk_interior.f.b -sticky news
-  grid $itk_interior.f
-  
-  #
-  # Set the state of the window size entry here...
-  #
-  toggle_size_control
-
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  busy - make the widget unusable
-# ------------------------------------------------------------------
-itcl::body MemPref::busy {} {
-  set top [winfo toplevel $itk_interior]
-  $top configure -cursor watch
-  
-  # Disable all the radiobuttons and what not
-  foreach w [array names Widgets] {
-    set WidgetState($w) [$Widgets($w) cget -state]
-  }
-  foreach w [array names Widgets] {
-    $Widgets($w) configure -state disabled
-  }
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  idle - make the widget useable
-# ------------------------------------------------------------------
-itcl::body MemPref::idle {} {
-  set top [winfo toplevel $itk_interior]
-  $top configure -cursor {}
-
-  # Re-enable all widgets
-  foreach w [array names Widgets] {
-    $Widgets($w) configure -state $WidgetState($w)
-  }
-}
-# ------------------------------------------------------------------
-#  METHOD:  ok - apply and quit
-# ------------------------------------------------------------------
-itcl::body MemPref::ok {} {
-  apply
-  unpost
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  cancel - just close the dialog w/o saving changes
-# ------------------------------------------------------------------
-itcl::body MemPref::cancel {} {
-  unpost
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  check_numbytes - a trace to make sure gnumbytes is an int > 0
-# ------------------------------------------------------------------
-itcl::body MemPref::check_numbytes {var index mode} {
-  upvar \#0 $var true
-  if {($true != "") && ([catch {expr {(int($true) != double($true)) || $true <= 0}} val] 
-			|| $val)} {
-    bell
-    set true $old_numbytes
-  } else {
-    set old_numbytes $true
-  }
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  set_bytes_per_row - combobox callback to set the bytes per row
-# ------------------------------------------------------------------
-itcl::body MemPref::set_bytes_per_row {w value} {
-  set gbpr $value
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  toggle_size_control - toggle the state of the entry box as the
-#           control method changes
-# ------------------------------------------------------------------
-itcl::body MemPref::toggle_size_control {} {
-
-  if {$gvar} {
-    $Widgets(e-numbytes) configure -state normal \
-      -background $normal_background
-  } else {
-    $Widgets(e-numbytes) configure -state disabled -background lightgray
-    if {[info exists Widgets(b-ok)]} {
-      focus $Widgets(b-ok)
-    }
-  }
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  apply - apply changes to the parent window
-# ------------------------------------------------------------------
-itcl::body MemPref::apply {} {
-
-  busy
-  gdbtk_busy
-
-  if {$gvar == 0} {
-    set numbytes 0
-  } elseif {$gnumbytes == "" || $gnumbytes == 0} {
-    # Protect against the case where someone sets the
-    # entry field to an empty string, or pastes in a 0...
-    bell
-    set gnumbytes $default_numbytes
-    set numbytes $gnumbytes
-  } else {
-    set numbytes $gnumbytes
-  }
-  switch $gsize {
-    3 {
-      set size $float_size
-      set format f
-    }
-    5 {
-      set size $double_size
-      set format f
-    }
-    default {
-      set size $gsize
-      set format $gformat
-    }
-  }
-
-  # pass all the changed values back to parent
-  debug "$win configChange -size $size -numbytes $numbytes \
-	     -format $format -ascii $gascii \
-	     -ascii_char $gascii_char -bytes_per_row $gbpr \
-	     -color $color"
-  eval $win configure -size $size -numbytes $numbytes \
-    -format $format -ascii $gascii \
-    -ascii_char $gascii_char -bytes_per_row $gbpr \
-    -color $color
-  
-  $win reconfig
-
-  gdbtk_idle
-  idle
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  enable_format - turn on the format radio buttons 
-# ------------------------------------------------------------------
-itcl::body MemPref::enable_format {} {
-  if {!$format_disabled} {
-    return
-  }
-
-  foreach widget {rb-binary rb-octal rb-hex rb-signed_dec rb-unsign_dec} {
-    $Widgets($widget) configure -state normal
-  }
-  set format_disabled 0
-}
-
-
-# ------------------------------------------------------------------
-#  METHOD:  disable_format - turn off the format radio buttons 
-# ------------------------------------------------------------------
-itcl::body MemPref::disable_format {} {
-  if {$format_disabled} {
-    return
-  }
-
-  foreach widget {rb-binary rb-octal rb-hex rb-signed_dec rb-unsign_dec} {
-    $Widgets($widget) configure -state disabled
-  }
-  set format_disabled 1
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  pick - pick colors
-# ------------------------------------------------------------------
-itcl::body MemPref::pick {lab} {
-  set new_color [tk_chooseColor -initialcolor $color -title "Choose color"]
-  if {$new_color != $color && $new_color != ""} {
-    set color $new_color
-    $lab configure -bg $color
-  }
-}
-
-
-# ------------------------------------------------------------------
-#  METHOD:  reconfig - used when preferences change
-# ------------------------------------------------------------------
-itcl::body MemPref::reconfig {} {
-  # for now, just delete and recreate
-  destroy $itk_interior.f 
-  build_win
-}
-
diff --git a/gdb/gdbtk/library/mempref.ith b/gdb/gdbtk/library/mempref.ith
deleted file mode 100644
index 0b43ef1a69f..00000000000
--- a/gdb/gdbtk/library/mempref.ith
+++ /dev/null
@@ -1,69 +0,0 @@
-# Memory display preferences window class definition for GDBtk.
-# Copyright 1998, 1999 Cygnus Solutions
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License (GPL) 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.
-
-
-itcl::class MemPref {
-  inherit ModalDialog ManagedWin
-
-  public {
-    variable win
-    variable size
-    variable format
-    variable numbytes
-    variable bpr
-    variable ascii
-    variable ascii_char
-    variable color
-
-    method constructor {args}
-    method destructor {}
-    method busy {}
-    method idle {}
-    method cancel {}
-    method set_bytes_per_row {w value}
-    method check_numbytes {var index mode}
-    method toggle_size_control {}
-    method apply {}
-    method enable_format {}
-    method disable_format {}
-    method pick {lab}
-    method reconfig {}
-  }
-  
-  private {
-    # The next seven variables are all used in the radio-buttons
-    # and checkbuttons of the display.
-    variable gsize   
-    variable gformat 
-    variable gnumbytes 
-    variable gbpr 
-    variable gascii  
-    variable gascii_char 
-    variable gvar
-
-    variable Widgets
-    variable WidgetState
-    variable format_disabled 0
-    variable old_numbytes
-    variable normal_background
-    method build_win {}
-    method ok {}
-  }
-
-  protected {
-    common float_size ""
-    common double_size ""
-    common default_numbytes 128
-  }
-
-}
diff --git a/gdb/gdbtk/library/memwin.itb b/gdb/gdbtk/library/memwin.itb
deleted file mode 100644
index 4c71ed00ef6..00000000000
--- a/gdb/gdbtk/library/memwin.itb
+++ /dev/null
@@ -1,774 +0,0 @@
-# Memory display window class definition for Insight.
-# Copyright 1998, 1999, 2001, 2002 Red Hat, Inc.
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License (GPL) 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.
-
-# ------------------------------------------------------------------
-#  METHOD:  constructor - build the dialog
-# ------------------------------------------------------------------
-itcl::body MemWin::constructor {args} {
-  global _mem
-  debug $args
-  eval itk_initialize $args
-
-  set top [winfo toplevel $itk_interior]
-  gdbtk_busy
-
-  set _mem($this,enabled) 1
-
-  if {![info exists type(1)]} {
-    set type(1) char
-    set type(2) short
-    set type(4) int
-    set type(8) "long long"
-  }
-
-  if {[pref getd gdb/mem/menu] != ""} {
-    set mbar 0
-  }
-
-  # Load defaults from preferences.
-  set size [pref getd gdb/mem/size]
-  set numbytes [pref getd gdb/mem/numbytes]
-  set format [pref getd gdb/mem/format]
-  set ascii [pref getd gdb/mem/ascii]
-  set ascii_char [pref getd gdb/mem/ascii_char]
-  set bytes_per_row [pref getd gdb/mem/bytes_per_row]
-  set color [pref getd gdb/mem/color]
-
-  init_addr_exp
-  build_win
-  gdbtk_idle
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  destructor - destroy the dialog
-# ------------------------------------------------------------------
-itcl::body MemWin::destructor {} {
-  if {[winfo exists $prefs_win]} {
-    $prefs_win cancel
-  }
-}
-
-
-# ------------------------------------------------------------------
-#  METHOD:  build_win - build the main memory window
-# ------------------------------------------------------------------
-itcl::body MemWin::build_win {} {
-  global tcl_platform gdb_ImageDir _mem ${this}_memval
-
-  set maxlen 0
-  set maxalen 0
-  set saved_value ""
-
-  if { $mbar } {
-    menu $itk_interior.m -tearoff 0
-    $top configure -menu $itk_interior.m
-    $itk_interior.m add cascade -menu $itk_interior.m.addr \
-      -label "Addresses" -underline 0
-    set m [menu $itk_interior.m.addr]
-    $m add check -label " Auto Update" -variable _mem($this,enabled) \
-      -underline 1 -command "after idle $this toggle_enabled"
-    $m add command -label " Update Now" -underline 1 \
-      -command [code $this _update_address 1] -accelerator {Ctrl+U}
-    $m add separator
-    $m add command -label " Preferences..." -underline 1 \
-      -command "$this create_prefs"
-  }
-
-  # Numcols = number of columns of data
-  # numcols = number of columns in table (data plus headings plus ASCII)
-  # if numbytes are 0, then use window size to determine how many to read
-  if {$numbytes == 0} {
-    set Numrows 8
-  } else {
-    set Numrows [expr {$numbytes / $bytes_per_row}]
-  }
-  set numrows [expr {$Numrows + 1}]
-
-  set Numcols [expr {$bytes_per_row / $size}]
-  if {$ascii} {
-    set numcols [expr {$Numcols + 2}]
-  } else {
-    set numcols [expr {$Numcols + 1}]
-  }
-
-  itk_component add table {
-    ::table $itk_interior.t -titlerows 1 -titlecols 1 -variable ${this}_memval \
-      -roworigin -1 -colorigin -1 -bg $::Colors(textbg) -fg $::Colors(textfg) \
-      -browsecmd "$this changed_cell %s %S" -font global/fixed\
-      -colstretch unset -rowstretch unset -selectmode single \
-      -xscrollcommand "$itk_interior.sx set" -resizeborders none \
-      -cols $numcols -rows $numrows -autoclear 1
-  } {
-    keep -foreground
-    keep -insertbackground
-    keep -highlightcolor
-    keep -highlightbackground
-  }
-  
-  if {$numbytes} {
-    $itk_component(table) configure -yscrollcommand "$itk_interior.sy set"
-    scrollbar $itk_interior.sy -command [list $itk_component(table) yview]
-  } else {
-    $itk_component(table) configure -rowstretchmode none
-  }
-  scrollbar $itk_interior.sx -command [list $itk_component(table) xview] -orient horizontal
-  $itk_component(table) tag config sel -bg [$itk_component(table) cget -bg] -relief sunken
-  $itk_component(table) tag config active -relief sunken -wrap 0 \
-    -bg $::Colors(sbg) -fg $::Colors(sfg)
-  $itk_component(table) tag config title -bg $::Colors(bg) -fg $::Colors(fg)
-
-  # rebind all events that use tkTableMoveCell to our local version
-  # because we don't want to move into the ASCII column if it exists
-  bind $itk_component(table) <Up>		"$this memMoveCell %W -1  0; break"
-  bind $itk_component(table) <Down>		"$this memMoveCell %W  1  0; break"
-  bind $itk_component(table) <Left>		"$this memMoveCell %W  0 -1; break"
-  bind $itk_component(table) <Right>	"$this memMoveCell %W  0  1; break"
-  bind $itk_component(table) <Return>	"$this memMoveCell %W 0 1; break"
-  bind $itk_component(table) <KP_Enter>	"$this memMoveCell %W 0 1; break"
-
-  # bind button 3 to popup
-  bind $itk_component(table) <3> "$this do_popup %X %Y"
-
-  # bind Paste and button2 to the paste function
-  # this is necessary because we want to not just paste the
-  # data into the cell, but we also have to write it
-  # out to real memory
-  bind $itk_component(table) <ButtonRelease-2> [format {after idle %s paste %s %s} $this %x %y]
-  bind $itk_component(table) <<Paste>> [format {after idle %s paste %s %s} $this %x %y]
-
-  menu $itk_component(table).menu -tearoff 0
-  bind_plain_key $top Control-u [code $this _update_address 1]
-
-  # bind resize events
-  bind $itk_interior <Configure> "$this newsize %h"
-
-  frame $itk_interior.f
-  iwidgets::spinint $itk_interior.f.cntl -labeltext " Address " -width 20 \
-    -command "after idle $this update_address_cb" \
-    -increment "after idle $this incr_addr -1" \
-    -decrement "after idle $this incr_addr 1" -foreground  $::Colors(textfg) \
-    -validate {}  -textbackground $::Colors(textbg) 
-  $itk_interior.f.cntl delete 0 end
-  $itk_interior.f.cntl insert end $addr_exp
-
-  label $itk_interior.f.endian -text "Target is [gdbtk_endian] endian"
-
-  balloon register [$itk_interior.f.cntl childsite].uparrow \
-    "Scroll Up (Decrement Address)"
-  balloon register [$itk_interior.f.cntl childsite].downarrow \
-    "Scroll Down (Increment Address)"
-  if {!$mbar} {
-    button $itk_interior.f.upd -command [code $this _update_address 1] \
-      -image [image create photo -file [::file join $gdb_ImageDir check.gif]]
-    balloon register $itk_interior.f.upd "Update Now"
-    checkbutton $itk_interior.cb -variable _mem($this,enabled) -command "$this toggle_enabled"
-    balloon register $itk_interior.cb "Toggles Automatic Display Updates"
-    grid $itk_interior.f.upd $itk_interior.f.cntl $itk_interior.f.endian -sticky ew -padx 5
-  } else {
-    grid $itk_interior.f.cntl x $itk_interior.f.endian -sticky e
-    grid columnconfigure $itk_interior.f 1 -weight 1
-  }
-
-  # draw top border
-  set col 0
-  for {set i 0} {$i < $bytes_per_row} { incr i $size} {
-    set ${this}_memval(-1,$col) [format " %X" $i]
-    incr col
-  }
-
-  if {$ascii} {
-    set ${this}_memval(-1,$col) ASCII
-  }
-
-  # fill initial display
-  if {$nb} {
-    _update_address 0
-  }
-
-  if {!$mbar} {
-    grid $itk_interior.f x -row 0 -column 0 -sticky nws
-    grid $itk_interior.cb -row 0 -column 1 -sticky news
-  } else {
-    grid $itk_interior.f -row 0 -column 0 -sticky news
-  }
-  grid $itk_component(table) -row 1 -column 0 -sticky news
-  if {$numbytes} { grid $itk_interior.sy -row 1 -column 1 -sticky ns }
-  grid $itk_interior.sx -sticky ew
-  grid columnconfig  $itk_interior 0 -weight 1
-  grid rowconfig  $itk_interior 1 -weight 1
-  focus $itk_interior.f.cntl
-
-  window_name "Memory"
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  paste - paste callback. Update cell contents after paste
-# ------------------------------------------------------------------
-itcl::body MemWin::paste {x y} {
-  edit [$itk_component(table) index @$x,$y]
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  validate - because the control widget wants this
-# ------------------------------------------------------------------
-itcl::body MemWin::validate {val} {
-  return $val
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  create_prefs - create memory preferences dialog
-# ------------------------------------------------------------------
-itcl::body MemWin::create_prefs {} {
-  if {$Running} { return }
-
-  # make sure row height is set
-  if {$rheight == ""} {
-    set rheight [lindex [$itk_component(table) bbox 0,0] 3]
-  }
-
-  set prefs_win [ManagedWin::open MemPref -force -over $this\
-		   -transient -win $this \
-		   -size $size -format $format -numbytes $numbytes \
-		   -bpr $bytes_per_row -ascii $ascii \
-		   -ascii_char $ascii_char -color $color]
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  changed_cell - called when moving from one cell to another
-# ------------------------------------------------------------------
-itcl::body MemWin::changed_cell {from to} {
-  #debug "moved from $from to $to"
-  #debug "value = [$itk_component(table) get $from]"
-  if {$saved_value != ""} {
-    if {$saved_value != [$itk_component(table) get $from]} {
-      edit $from
-    }
-  }
-  set saved_value [$itk_component(table) get $to]
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  edit - edit a cell
-# ------------------------------------------------------------------
-itcl::body MemWin::edit { cell } {
-  global _mem ${this}_memval
-
-  #debug "edit $cell"
-
-  if {$Running || $cell == ""} { return }
-  set rc [split $cell ,]
-  set row [lindex $rc 0]
-  set col [lindex $rc 1]
-  set val [$itk_component(table) get $cell]
-
-  if {$col == $Numcols} { 
-    # editing the ASCII field
-    set addr [gdb_incr_addr $current_addr [expr {$bytes_per_row * $row}]]
-    set start_addr $addr
-
-    # calculate number of rows to modify
-    set len [string length $val]
-    set rows 0
-    while {$len > 0} { 
-      incr rows
-      set len [expr {$len - $bytes_per_row}]
-    }
-    set nb [expr {$rows * $bytes_per_row}]
-
-    # now process each char, one at a time
-    foreach c [split $val ""] {
-      if {$c != $ascii_char} {
-	scan $c %c char
-	if {[catch {gdb_set_mem $addr [format %02x $char] 1} res]} {
-	  error_dialog $res
-
-	  # reset value
-	  set ${this}_memval($row,$col) $saved_value
-	  return
-	}
-      }
-      set addr [gdb_incr_addr $addr]
-    }
-    set addr $start_addr
-    set nextval 0
-    # now read back the data and update the widget
-    catch {gdb_update_mem ${this}_memval $addr $format $size $nb $bytes_per_row $ascii_char} vals
-    return
-  }
-
-  # calculate address based on row and column
-  set addr [gdb_incr_addr $current_addr [expr {$bytes_per_row * $row + $size * $col}]]
-  #debug "  edit $row,$col         $addr = $val"
-
-  # Pad the value with zeros, if necessary
-  set s [expr {$size * 2}]
-  set val [format "0x%0${s}x" $val]
-
-  # set memory
-  #debug "set_mem $addr $val $size"
-  if {[catch {gdb_set_mem $addr $val $size} res]} {
-    error_dialog $res
-
-    # reset value
-    set ${this}_memval($row,$col) $saved_value
-    return
-  }
-
-  # read it back
-  # FIXME - HACK ALERT - This call causes trouble with remotes on Windows. 
-  # This routine is in fact called from within an idle handler triggered by
-  # memMoveCell.  Something evil happens in that handler that causes gdb to
-  # start writing this changed value into all the visible cells...
-  # I have not figured out the cause of this, so for now I commented this
-  # line out.  It will only matter if the write did not succeed, and this was
-  # not a very good way to tell the user about that anyway...
-  #
-  # catch {gdb_update_mem $addr $format $size $size $size ""} val
-  # delete whitespace in response
-  set val [string trimright $val]
-  set val [string trimleft $val]
-  set ${this}_memval($row,$col) $val
-}
-
-
-# ------------------------------------------------------------------
-#  METHOD:  toggle_enabled - called when enable is toggled
-# ------------------------------------------------------------------
-itcl::body MemWin::toggle_enabled {} {
-  global _mem
-
-  if {$Running} { return }
-  if {$_mem($this,enabled)} {
-    _update_address 1
-    set state normal
-    set bg $::Colors(textbg)
-  } else {
-    set bg $::Colors(bg)
-    set state disabled
-  }
-  $itk_component(table) config -background $bg -state $state
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  update - update widget after every PC change
-# ------------------------------------------------------------------
-itcl::body MemWin::update {event} {
-  global _mem
-  if {$_mem($this,enabled)} {
-    _update_address 0
-  }
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  idle - memory window is idle, so enable menus
-# ------------------------------------------------------------------
-itcl::body MemWin::idle {event} {
-  # Fencepost
-  set Running 0
-
-  # Cursor
-  cursor {}
-
-  if {[winfo exists $itk_interior.m.addr]} {
-    # Enable menus
-    if {$mbar} {
-      for {set i 0} {$i <= [$itk_interior.m.addr index last]} {incr i} {
-	if {[$itk_interior.m.addr type $i] != "separator"} {
-	  $itk_interior.m.addr entryconfigure $i -state normal
-	}
-    }
-    }
-    
-    # Enable control
-    $itk_interior.f.cntl configure -state normal
-  }
-}
-
-
-# ------------------------------------------------------------------
-#  METHOD: busy - BusyEvent handler
-#                 Disable menus 'cause we're busy updating things.
-# ------------------------------------------------------------------
-itcl::body MemWin::busy {event} {
-  # Fencepost
-  set Running 1
-
-  # cursor
-  cursor watch
-
-  # go away if window is not finished drawing
-  if {![winfo exists $itk_interior.f.cntl]} { return }
-  
-  # Disable menus
-  if {$mbar} {
-    for {set i 0} {$i <= [$itk_interior.m.addr index last]} {incr i} {
-      if {[$itk_interior.m.addr type $i] != "separator"} {
-	$itk_interior.m.addr entryconfigure $i -state disabled
-      }
-    }
-  }
-
-  # Disable control
-  $itk_interior.f.cntl configure -state disabled
-}
-
-# ------------------------------------------------------------------
-#  METHOD: newsize - calculate how many rows to display when the
-#  window is resized.
-# ------------------------------------------------------------------
-itcl::body MemWin::newsize {height} {
-
-  if {$dont_size || $Running} {
-    return 
-  }
-  
-  # only add rows if numbytes is zero
-  if {$numbytes == 0} {
-    ::update idletasks
-
-    # make sure row height is set
-    if {$rheight == ""} {
-      set rheight [lindex [$itk_component(table) bbox 0,0] 3]
-    }
-
-    set theight [winfo height $itk_component(table)]
-    set Numrows [expr {$theight / $rheight}]
-    $itk_component(table) configure -rows $Numrows
-    _update_address 1
-  }
-}
-
-itcl::body MemWin::_update_address {make_busy} {
-  if {$make_busy} {
-    gdbtk_busy
-  }
-  update_address [string trimleft [$itk_interior.f.cntl get]]
-  if {$make_busy} {
-    gdbtk_idle
-  }
-}
-
-# ------------------------------------------------------------------
-#  METHOD: update_address_cb - address entry widget callback
-# ------------------------------------------------------------------
-itcl::body MemWin::update_address_cb {} {
-  set new_entry 1
-  _update_address 1
-}
-
-# ------------------------------------------------------------------
-#  METHOD: update_address - update address and data displayed
-# ------------------------------------------------------------------
-itcl::body MemWin::update_address {addr_exp} {
-
-  set bad_expr 0
-  set saved_addr $current_addr
-  if {[string match {[a-zA-Z_&0-9\*]*} $addr_exp]} {
-    # Looks like an expression
-    set retVal [catch {gdb_eval "$addr_exp" x} current_addr]
-    #debug "retVal=$retVal current_addr=$current_addr"
-    if {$retVal || [string match "No symbol*" $current_addr] || \
-	  [string match "Invalid *" $current_addr]} {
-      BadExpr $current_addr
-      return
-    }
-    if {[string match {\{*} $current_addr]} {
-      set current_addr [lindex $current_addr 1]
-      if {$current_addr == ""} {
-	return
-      }
-    }
-  } elseif {[regexp {\$[a-zA-Z_]} $addr_exp]} {
-    # Looks like a local variable
-    set retVal [catch {gdb_eval "$addr_exp" x} current_addr]
-    #debug "retVal=$retVal current_addr=$current_addr"
-    if {$retVal} {
-      BadExpr $current_addr
-      return
-    }
-    if {$current_addr == "void"} {
-      BadExpr "No Local Variable Named \"$addr_exp\""
-      return
-    }
-  } else {
-    # something really strange, like "0.1" or ""
-    BadExpr "Can't Evaluate \"$addr_exp\""
-    return
-  }
-
-  # Check for spaces - this can happen with gdb_eval and $pc, for example.
-  set index [string first \  $current_addr]
-  if {$index != -1} {
-    incr index -1
-    set current_addr [string range $current_addr 0 $index]
-  }
-  
-  # set table background
-  $itk_component(table) config -bg $::Colors(textbg) -state normal
-  catch {update_addr}
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  BadExpr - handle a bad expression
-# ------------------------------------------------------------------
-itcl::body MemWin::BadExpr {errTxt} {
-  if {$new_entry} {
-    tk_messageBox -type ok -icon error -message $errTxt
-    set new_entry 0
-  }
-  # set table background to gray
-  $itk_component(table) config -bg $::Colors(bg) -state disabled
-  set current_addr $saved_addr
-  set saved_addr ""
-  set bad_expr 1
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  incr_addr - callback from control widget to increment
-#  the current address.
-# ------------------------------------------------------------------
-itcl::body MemWin::incr_addr {num} {
-  if {$current_addr == ""} {
-    return
-  }
-  set old_addr $current_addr
-  set current_addr [gdb_incr_addr $current_addr [expr {$bytes_per_row * $num}]]
-
-  # A memory address less than zero is probably not a good thing...
-  #
-
-  if {($num < 0 && [gdb_eval "$current_addr > $old_addr"]) \
-      ||($num > 0 && [gdb_eval "$current_addr < $old_addr"]) } {
-    bell
-    set current_addr $old_addr
-    return
-  }
-  $itk_component(table) config -bg $::Colors(textbg) -state normal
-  $itk_interior.f.cntl clear
-  $itk_interior.f.cntl insert 0 $current_addr
-  _update_address 1
-}
-
-
-# ------------------------------------------------------------------
-#  METHOD:  update_addr - read in data starting at $current_addr
-#  This is just a helper function for update_address. 
-# ------------------------------------------------------------------
-itcl::body MemWin::update_addr {} {
-  global _mem ${this}_memval
-
-    set row 0
-
-  if {$numbytes == 0} {
-    set nb [expr {$Numrows * $bytes_per_row}]
-  } else {
-    set nb $numbytes
-  }
-  if {$ascii} {
-    set retVal [catch {gdb_update_mem ${this}_memval $current_addr $format $size $nb $bytes_per_row $ascii_char} vals]
-
-  } else {
-    set retVal [catch {gdb_update_mem ${this}_memval $current_addr $format $size $nb $bytes_per_row} vals]
-  }
-
-
-  if {$retVal || [llength $vals] != 3}  {
-    BadExpr "Couldn't get memory at address: \"$addr\""
-      debug "gdb_update_mem returned return code: $retVal and value: \"$vals\""
-    return    
-  }
-  # set default column width to the max in the data columns
-  $itk_component(table) configure -colwidth [lindex $vals 1]
-
-  # set border column width
-  $itk_component(table) width -1 [lindex $vals 0]
-
-  # set ascii column width
-  if {$ascii} {
-    $itk_component(table) width $Numcols [lindex $vals 2]
-  }
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  hidemb - hide the menubar.  NOT CURRENTLY USED
-# ------------------------------------------------------------------
-itcl::body MemWin::hidemb {} {
-  set mbar 0
-  reconfig
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  reconfig - used when preferences change
-# ------------------------------------------------------------------
-itcl::body MemWin::reconfig {} {
-  debug
-  set addr_exp [string trimright [string trimleft $addr_exp]]
-  set wh [winfo height $top]
-
-  if [winfo exists $itk_interior.m] { destroy $itk_interior.m }
-  if [winfo exists $itk_interior.cb] { destroy $itk_interior.cb }
-  if [winfo exists $itk_interior.f.upd] { destroy $itk_interior.f.upd }
-  if [winfo exists $itk_interior.sy] { destroy $itk_interior.sy }  
-  destroy $itk_interior.f.cntl $itk_interior.f $itk_component(table) \
-    $itk_interior.sx 
-
-  set dont_size 1
-
-  # If the fonts change, then you will need to recompute the 
-  # row height.  Ditto for switch from fixed number of rows to
-  # depends on size.
-
-  set rheight ""
-
-  # Update preferences to reflect new reality
-  pref setd gdb/mem/size $size
-  pref setd gdb/mem/numbytes $numbytes
-  pref setd gdb/mem/format $format
-  pref setd gdb/mem/ascii $ascii
-  pref setd gdb/mem/ascii_char $ascii_char
-  pref setd gdb/mem/bytes_per_row $bytes_per_row
-  pref setd gdb/mem/color $color
-
-  build_win
-  set dont_size 0
-  ::update
-  
-  if {$numbytes == 0} {
-    newsize $wh
-  }
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  do_popup - Display popup menu
-# ------------------------------------------------------------------
-itcl::body MemWin::do_popup {X Y} {
-  if {$Running} { return }
-  $itk_component(table).menu delete 0 end
-  $itk_component(table).menu add check -label "Auto Update" -variable _mem($this,enabled) \
-    -underline 0 -command "$this toggle_enabled"
-  $itk_component(table).menu add command -label "Update Now" -underline 0 \
-    -command [code $this _update_address 1]
-  $itk_component(table).menu add command -label "Go To [$itk_component(table) curvalue]" -underline 0 \
-    -command "$this goto [$itk_component(table) curvalue]"
-  $itk_component(table).menu add command -label "Open New Window at [$itk_component(table) curvalue]" -underline 0 \
-    -command [list ManagedWin::open MemWin -force -addr_exp [$itk_component(table) curvalue]]
-  $itk_component(table).menu add separator
-  $itk_component(table).menu add command -label "Preferences..." -underline 0 \
-    -command "$this create_prefs"
-  tk_popup $itk_component(table).menu $X $Y 
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  goto - change the address of the current memory window
-# ------------------------------------------------------------------
-itcl::body MemWin::goto { addr } {
-  set current_addr $addr
-  $itk_interior.f.cntl delete 0 end
-  $itk_interior.f.cntl insert end $addr
-  _update_address 1
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  init_addr_exp - initialize address expression
-#  On startup, if the public variable "addr_exp" was not set,
-#  then set it to the start of ".data" if found, otherwise "$pc"
-# ------------------------------------------------------------------
-itcl::body MemWin::init_addr_exp {} {
-  if {$addr_exp == ""} {
-    set err [catch {gdb_cmd "info file"} result]
-    if {!$err} {
-      foreach line [split [string trim $result] \n] { 
-	if {[scan $line {%x - %x is %s} start stop section] == 3} {
-	  if {$section == ".data"} {
-	    set addr_exp [format "%#08x" $start]
-	    break
-	  }
-	}
-      }
-    }
-    if {$addr_exp == ""} {
-      set addr_exp \$pc
-    }
-  }
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  cursor - set the cursor
-# ------------------------------------------------------------------
-itcl::body MemWin::cursor {glyph} {
-  # Set cursor for all labels
-  # for {set i 0} {$i < $bytes_per_row} {incr i $size} {
-  #   $itk_component(table).h.$i configure -cursor $glyph
-  # }
-  $top configure -cursor $glyph
-}
-
-# memMoveCell --
-#
-# Moves the location cursor (active element) by the specified number
-# of cells and changes the selection if we're in browse or extended
-# selection mode.
-#
-# Don't allow movement into the ASCII column.
-#
-# Arguments:
-# w - The table widget.
-# x - +1 to move down one cell, -1 to move up one cell.
-# y - +1 to move right one cell, -1 to move left one cell.
-
-itcl::body MemWin::memMoveCell {w x y} {
-  if {[catch {$w index active row} r]} return
-  set c [$w index active col]
-  if {$ascii && ($c == $Numcols)} {
-    # we're in the ASCII column so behave differently
-    if {$y == 1} {set x 1}
-    if {$y == -1} {set x -1}
-    incr r $x
-  } else {
-    incr r $x
-    incr c $y
-    if { $c < 0 } {
-      if {$r == 0} {
-	set c 0
-      } else {
-	set c [expr {$Numcols - 1}]
-	incr r -1
-      }
-    } elseif { $c >= $Numcols } {
-      if {$r >= [expr {$Numrows - 1}]} {
-	set c [expr {$Numcols - 1}]
-      } else {
-	set c 0
-	incr r
-      }
-    }
-  }
-  if { $r < 0 } { set r 0 }
-  $w activate $r,$c
-  $w see active
-}
-
-# ------------------------------------------------------------
-#  PUBLIC METHOD:  error_dialog - Open and error dialog.
-#    Arguments:
-#        msg      - The message to display in the dialog
-#        modality - The dialog modailty. Default: task
-#        type     - The dialog type (tk_messageBox).
-#                    Default: ok
-# ------------------------------------------------------------
-itcl::body MemWin::error_dialog {msg {modality task} {type ok}} {
-  set parent [winfo toplevel [namespace tail $this]]
-  tk_messageBox -icon error -title Error -type $type \
-    -message $msg -parent $parent
-}
-
diff --git a/gdb/gdbtk/library/memwin.ith b/gdb/gdbtk/library/memwin.ith
deleted file mode 100644
index f71c4325153..00000000000
--- a/gdb/gdbtk/library/memwin.ith
+++ /dev/null
@@ -1,85 +0,0 @@
-# Memory display window class definition for Insight.
-# Copyright 1998, 1999, 2001, 2002 Red Hat, Inc.
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License (GPL) 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.
-
-
-itcl::class MemWin {
-  inherit EmbeddedWin GDBWin
-
-  private {
-    variable saved_addr ""
-    variable bad_expr 0
-    variable current_addr ""
-    variable dont_size 0
-    variable mbar 1
-    variable bg
-    variable top
-    variable nb 128
-    variable prefs_win ""
-    variable Running 0
-    variable Numrows 0
-    variable Numcols 0
-    variable saved_value
-    variable maxlen
-    variable maxalen
-    variable rheight ""
-    variable new_entry 0
-
-    method build_win {}
-    method init_addr_exp {}
-    method cursor {glyph}
-    method _update_address {make_busy}
-  }
-
-  public {
-    variable addr_exp ""
-    variable size 4
-    variable format x
-    variable bytes_per_row 16
-    variable numbytes 0
-    variable ascii 1
-    variable ascii_char "."
-    variable color green
-  }
-
-  protected common type
-
-  public {
-    method constructor {args}
-    method destructor {}
-    method paste {x y}
-    method validate {val}
-    method create_prefs {}
-    method changed_cell {from to}
-    method edit {cell}
-    method toggle_enabled {}
-    method newsize {height}
-    method update_address_cb {}
-    method update_address {addr_exp}
-    method BadExpr {errTxt}
-    method incr_addr {num}
-    method update_addr 
-    method hidemb {}
-    method reconfig {}
-    method do_popup {x y}
-    method goto {addr}
-    method memMoveCell {w x y}
-    method error_dialog {msg {modality task} {type ok}}
-
-    #
-    # GDB Events
-    #
-    method busy {event}
-    method idle {event}
-    method update {event}
-  }
-}
diff --git a/gdb/gdbtk/library/modal.tcl b/gdb/gdbtk/library/modal.tcl
deleted file mode 100644
index 47768448175..00000000000
--- a/gdb/gdbtk/library/modal.tcl
+++ /dev/null
@@ -1,105 +0,0 @@
-# Modal dialog class for GDBtk.
-# Copyright 1998, 1999 Cygnus Solutions
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License (GPL) 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.
-
-
-# ----------------------------------------------------------------------
-# Implements the post and unpost behavior of a Modal Dialog.
-#
-# For now the point behind this is to control calling 
-# ide_grab_support.  If you call disable all the windows of an
-# application but one, destroy that window, THEN re-enable the
-# windows, Windows brings the last enabled window in the last
-# active application to the foreground (Doh!).
-#
-# ----------------------------------------------------------------------
-
-itcl::class ModalDialog {
-  # This is the variable we vwait on when the dialog is posted.  
-  # It is set to 1 in the unpost method, and to -1 in the destructor.
-  
-  private variable unpost_notification 0
-
-  destructor {
-    debug "  UNPOST $this"
-    set unpost_notification -1
-  }
-
-  # ------------------------------------------------------------------
-  #  METHOD:  unpost - unposts the dialog box...
-  # ------------------------------------------------------------------
-  public method unpost {} {
-    after idle [list set [scope unpost_notification] 1]
-  }
-
-  # ------------------------------------------------------------------
-  #  METHOD:  cancel - This just unposts the dialog box...
-  #           If you want to programatically cancel a dialog
-  #           selection, for instance if the app is going away
-  #           use this rather than unpost.  That way a sub-class
-  #           that actually has to do some work can override it.
-  # ------------------------------------------------------------------
-  public method cancel {} {
-    ModalDialog::unpost
-  }
-
-
-  # ------------------------------------------------------------------
-  #  METHOD:  post - posts the dialog box...
-  # ------------------------------------------------------------------
-  public method post {{on_top 0} {expire 0}} {
-
-    debug "POST $this"
-    set top [winfo toplevel [namespace tail $this]]
-    wm protocol $top WM_DELETE_WINDOW [code $this cancel]
-
-    if {$on_top} {
-      after 500 keep_raised $top
-    }
-    
-    ide_grab_support disable_except $top
-    focus $top
-    grab set $top
- 
-    if {$expire > 0} {
-      set afterID [after $expire [code $this cancel]]
-    }
-
-    vwait [scope unpost_notification]
-
-    if {$afterID != ""} {
-      after cancel $afterID
-      set afterID ""
-    }
-
-    grab release $top
- 
-    # Enable all the windows in the application BEFORE
-    # you destroy this one, or Windows will bring another
-    # app to the foreground.
-  
-    ide_grab_support enable_all
-
-    # We can get here either by someone calling unpost (if an OK button
-    # is clicked or whatever), or by someone destroying the dialog (for
-    # instance by using the Window Manager.)  Only delete the object if
-    # we are not already in the process of doing this.
-
-    if {$unpost_notification == 1} {
-      ::delete object $this
-    } 
-  }
-
-  public variable expire -1 ;# If this is set to a number > 0, the
-                             # dialog will time out after this interval.
-  private variable afterID ""; # The id for the expiration after event.
-}
diff --git a/gdb/gdbtk/library/pluginwin.itcl b/gdb/gdbtk/library/pluginwin.itcl
deleted file mode 100644
index 2db7bb46f94..00000000000
--- a/gdb/gdbtk/library/pluginwin.itcl
+++ /dev/null
@@ -1,185 +0,0 @@
-# PluginWindow
-# Copyright 2001 Red Hat, Inc.
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License (GPL) 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.
-
-# ----------------------------------------------------------------------
-# Implements a menu and a toolbar that are attached to a source window.
-#
-#   PUBLIC ATTRIBUTES:
-#
-#
-#   METHODS:
-#
-#     configure ....... used to change public attributes
-#
-#   PRIVATE METHODS
-#
-#   X11 OPTION DATABASE ATTRIBUTES
-#
-#
-# ----------------------------------------------------------------------
-
-itcl::class PluginWindow {
-  inherit ManagedWin GDBEventHandler
-
-  # ------------------------------------------------------------------
-  #  CONSTRUCTOR - create widget
-  # ------------------------------------------------------------------
-  constructor {args} {
-
-    # Create a menu widget for the plug-in window
-    set menubar [GDBMenuBar $itk_interior.menubar]
-
-    # Create a toolbar widget for the plug-in window
-    set toolbar [GDBToolBar $itk_interior.toolbar]
-
-    # Pack the toolbar
-    pack $toolbar -expand 1 -fill both
-
-    # Create a frame for the subclass to use
-    set child [frame $itk_interior.child]
-
-    # Pack the childsite
-    pack $child -expand 1 -fill both
-
-    eval itk_initialize $args
-    add_hook gdb_no_inferior_hook [code $this no_inferior]
-  }
-
-  # ------------------------------------------------------------------
-  #  DESTRUCTOR - destroy window containing widget
-  # ------------------------------------------------------------------
-  destructor {
-    remove_hook gdb_no_inferior_hook [code $this no_inferior]
-
-    #destroy $this
-  }
-
-  # ------------------------------------------------------------------
-  #  ACCESSOR METHOD - Retrieve childsite
-  # ------------------------------------------------------------------
-  public method childsite {} {
-    return $child
-  }
-
-  # Don't automatically reload plugins.
-  protected method _ignore_on_save {} { return 1 }
-
-  ####################################################################
-  #
-  # State control methods used by both the menu and the toolbar
-  # 
-  ####################################################################
-
-  # ------------------------------------------------------------------
-  #  METHOD:  idle - handle IdleEvent
-  # ------------------------------------------------------------------
-  protected method idle {event} {
-    debug "PluginWindow::idle"
-    enable_ui 1
-  }
-
-  # ------------------------------------------------------------------
-  #  METHOD:  busy - BusyEvent handler
-  #             Invoked when gdb is going to run the inferior
-  # ------------------------------------------------------------------
-  public method busy {event} {
-    debug "PluginWindow::busy"
-    enable_ui 0
-  }
-
-  # ------------------------------------------------------------------
-  #  METHOD:  no_inferior
-  #             Invoked when gdb detects the inferior is gone 
-  # ------------------------------------------------------------------
-  protected method no_inferior {} {
-    debug 
-    enable_ui 2
-  }
-
-  ####################################################################
-  # The following method enables/disables both menus and buttons.
-  ####################################################################
-
-  # ------------------------------------------------------------------
-  # METHOD:  enable_ui - enable/disable the appropriate buttons and menus
-  # Called from the busy, idle, and no_inferior hooks.
-  #
-  # on must be:
-  # value      Control    Other     State
-  #   0          off       off      gdb is busy
-  #   1          on        on       gdb has inferior, and is idle
-  #   2          off       on       gdb has no inferior, and is idle
-  # ------------------------------------------------------------------
-  public method enable_ui {on} {
-    global tcl_platform
-    debug "$on"
-
-    # Do the enabling so that all the disabling happens first, this way if a
-    # button belongs to two groups, enabling takes precedence, which is
-    #  probably right.
-
-    switch $on {
-      0 {
-        # Busy
-	set enable_list {Control disabled \
-			   Other disabled}
-      }
-      1 {
-        # Idle, with inferior
-	set enable_list {Control normal \
-			   Other normal}
-      }
-      2 {
-        # Idle, no inferior
-	set enable_list {Control disabled \
-			   Other normal}
-      }
-      default {
-	debug "Unknown type: $on in enable_ui"
-	return
-      }
-    }
-
-    $menubar set_class_state $enable_list
-    $toolbar set_class_state $enable_list
-  }
-
-  ####################################################################
-  #
-  #  PRIVATE DATA
-  #
-  ####################################################################
-
-  # The childsite
-  private variable child
-
-  ####################################################################
-  #
-  #  PROTECTED DATA
-  #
-  ####################################################################
-
-  # The GdbMenuBar component
-  protected variable menubar
-
-  # The GdbToolBar component
-  protected variable toolbar
-
-  ####################################################################
-  #
-  #  PUBLIC DATA
-  #
-  ####################################################################
-
-  # None.
-}
diff --git a/gdb/gdbtk/library/prefs.tcl b/gdb/gdbtk/library/prefs.tcl
deleted file mode 100644
index 7e70f560acd..00000000000
--- a/gdb/gdbtk/library/prefs.tcl
+++ /dev/null
@@ -1,699 +0,0 @@
-# Local preferences functions for Insight.
-# Copyright 1997, 1998, 1999, 2002, 2003 Red Hat
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License (GPL) 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.
-
-
-# On STARTUP:
-# 1. Options database (.Xdefaults on Unix  or ? on Windows) is read
-# 2. GDB prefs file is read ("gdbtk.ini" on Windows; ".gdbtkinit" on Unix)
-# 3. GDB init script is read
-#
-# Normally all preferences will be set in the prefs file, which is
-# a generated file.  Hand-editing, if necessary, should be done to the
-# GDB init script.
-#
-# when "save options" is selected, the contents of the
-# preferences array is written out to the GDB prefs file.
-#
-# Usage:
-#   pref_save
-#   pref_read
-# ----------------------------------------------------------------------
-#
-
-proc pref_read {} {
-  global prefs_init_filename env gdb_ImageDir GDBTK_LIBRARY GDBStartup
-  global tcl_platform
-
-  if {[info exists env(HOME)]} {
-    if {$tcl_platform(platform) == "windows"} {
-      set home [ide_cygwin_path to_win32 $env(HOME)]
-    } else {
-      set home $env(HOME)
-    }
-  } else {
-    set home ""
-  }
-
-  if {$tcl_platform(platform) == "windows"} {
-    set prefs_init_filename "gdbtk.ini"
-  } else {
-    set prefs_init_filename ".gdbtkinit"
-  }
-
-  if {!$GDBStartup(inhibit_prefs)} {
-    set file_opened 0
-    if {[file exists $prefs_init_filename]} {
-      if {[catch {open $prefs_init_filename r} fd]} {
-	dbug E "$fd"
-	return
-      }
-      set file_opened 1
-    } elseif {$home != ""} {
-      set name [file join $home $prefs_init_filename]
-      if {[file exists $name]} {
-	if {[catch {open $name r} fd]} {
-	  dbug E "$fd"
-	  return
-	}
-	set prefs_init_filename $name
-	set file_opened 1
-      }
-    }
-
-    if {$file_opened == "1"} {
-      set section gdb
-      set version 0
-      while {[gets $fd line] >= 0} {
-	switch -regexp -- $line {
-	  {^[ \t\n]*#.*} {
-	    # Comment.  We recognize one magic comment that includes
-	    # the version number.
-	    if {[regexp -- "^# GDBtkInitVersion: (\[0-9\]+)\$" $line \
-		   dummy v]} {
-	      set version $v
-	    }
-	  }
-
-	  {^[ \t\n]*$} {
-	    ;# empty line; ignore it
-	  }
-
-	  {\[.*\]} {
-	    regexp {\[(.*)\]} $line match section
-	  }
-
-	  {[ \t\n]*option.*} {
-	    set line [string trimleft $line]
-	    eval $line
-	  }
-
-	  default {
-	    set a ""
-	    set name ""
-	    set val ""
-	    regexp "\[ \t\n\]*\(.+\)=\(.+\)" $line a name val
-	    if {$a == "" || $name == ""} {
-	      dbug W "Cannot parse line: $line"
-	    } else {
-	      # Must unescape equal signs in val
-	      set val [unescape_value $val $version]
-	      if {$section == "gdb"} {
-		pref setd gdb/$name $val
-	      } elseif {$section == "global" && [regexp "^font/" $name]} {
-		set name [split $name /]
-		set f global/
-		append f [join [lrange $name 1 end] /]
-		if {[lsearch [font names] $f] == -1} {
-		  # new font
-		  eval define_font $f $val
-		} else {
-		  # existing font
-		  pref set global/font/[join [lrange $name 1 end] /] $val
-		}
-	      } elseif {$section == "global"} {
-		pref setd $section/$name $val
-	      } else {
-		# backwards compatibility. recognize old src-font name
-		if {$val == "src-font"} {set val "global/fixed"}
-		pref setd gdb/$section/$name $val
-	      }
-	    }
-	  }
-	}
-      }
-      close $fd
-    } elseif {$home != ""} {
-      set prefs_init_filename [file join $home $prefs_init_filename]
-    }
-    
-    # now set global options
-    set gdb_ImageDir [file join $GDBTK_LIBRARY [pref get gdb/ImageDir]]
-
-  }
-
-  # finally set colors, from system if possible
-  pref_set_colors $home
-}
-
-# ------------------------------------------------------------------
-#  PROC:  pref_save - save preferences to a file and delete window
-# ------------------------------------------------------------------
-proc pref_save {{win {}}} {
-  global prefs_init_filename GDBStartup
-
-  if {!$GDBStartup(inhibit_prefs)} {
-    debug "pref_save $prefs_init_filename"
-
-    if {[catch {open $prefs_init_filename w} fd]} {
-      debug "ERROR: $fd"
-      return
-    }
-    
-    puts $fd "\# GDBtk Init file"
-    puts $fd {# GDBtkInitVersion: 1}
-
-    set plist [pref list]
-    # write out global options
-    puts $fd "\[global\]"
-    foreach var $plist {
-      set t [split $var /]
-      if {[lindex $t 0] == "global"} {
-	set x [join [lrange $t 1 end] /]
-	set v [escape_value [pref get $var]]
-
-	if {$x != "" && $v != ""} {
-	  puts $fd "\t$x=$v"
-	}
-      }
-    }
-
-    # write out gdb-global options
-    puts $fd "\[gdb\]"
-    foreach var $plist {
-      set t [split $var /]
-      # We use the funny join/lreplace code because the session code
-      # can generate a key where [lindex $t 2] is empty but there is
-      # still stuff after that.  This happens because the session code
-      # uses filenames, which can start with `/'.
-      if {[lindex $t 0] == "gdb"
-	  && [string compare [join [lreplace $t 0 1] /] ""] == 0} {
-	set x [lindex $t 1]
-	set v [escape_value [pref get $var]]
-	if {$x != "" && $v != ""} {
-	  puts $fd "\t$x=$v"
-	}
-      }
-    }
-
-    # now loop through all sections writing out values
-    # FIXME: this is broken.  We should discover the list
-    # dynamically.
-    lappend secs load console src reg stack locals watch bp search \
-      process geometry help browser kod window session mem
-
-    foreach section $secs {
-      puts $fd "\[$section\]"
-      foreach var $plist {
-	set t [split $var /]
-	if {[lindex $t 0] == "gdb" && [lindex $t 1] == $section} {
-	  set x [join [lrange $t 2 end] /]
-	  set v [escape_value [pref get $var]]
-	  if {$x != "" && $v != ""} {
-	    puts $fd "\t$x=$v"
-	  }
-	}
-      }
-    }
-    close $fd
-  }
-
-  if {$win != ""} {
-    $win delete
-  }
-}
-
-# -------------------------------------------------------
-#  PROC: escape_value - escape all equal signs for saving
-#         prefs to a file
-# -------------------------------------------------------
-proc escape_value {val} {
-  # We use a URL-style quoting.  We encode `=', `%', the `[]'
-  # characters and newlines.  We use a cute trick here: we regsub in
-  # command expressions which we then expand using subst.
-  if {[info tclversion] >= 8.1} {
-    set expr {([\[\]=%\n])}
-  } else {
-    set expr "(\[\]\[=%\n\])"
-  }
-  regsub -all -- $expr $val \
-    {[format "%%%02x" [scan {\1} %c x; set x]]} newval
-  return [subst -nobackslashes -novariables $newval]
-}
-
-# -------------------------------------------------------
-#  PROC: unescape_value - unescape all equal signs for
-#         reading prefs from a file.  VERSION is the version
-#         number of the encoding.
-#  version 0 only encoded `='.
-#  version 1 correctly encoded more values
-# -------------------------------------------------------
-proc unescape_value {val version} {
-  switch -exact -- $version {
-    0 {
-      # Old-style encoding.
-      if {[regsub -all -- {!%} $val = newval]} {
-	return $newval
-      }
-    }
-
-    1 {
-      # Version 1 uses URL encoding.
-      regsub -all -- "%(..)" $val \
-	{[format %c 0x\1]} newval
-      return [subst -nobackslashes -novariables $newval]
-    }
-
-    default {
-      error "Unknown encoding version $version"
-    }
-  }
-
-  return $val  
-}
-
-# ------------------------------------------------------------------
-#  PROC:  pref_set_defaults - set up default values
-# ------------------------------------------------------------------
-proc pref_set_defaults {} {
-  global GDBTK_LIBRARY tcl_platform gdb_ImageDir
-  debug
-
-  # Gdb global defaults
-  pref define gdb/ImageDir                images2
-  set gdb_ImageDir [file join $GDBTK_LIBRARY [pref get gdb/ImageDir]]
-  pref define gdb/font_cache              ""
-  pref define gdb/mode                    0;     # 0 no tracing, 1 tracing enabled
-  pref define gdb/control_target          1;     # 0 can't control target (EMC), 1 can
-  pref define gdb/B1_behavior             1;     # 0 means set/clear breakpoints,
-  # 1 means set/clear tracepoints.
-  pref define gdb/use_icons		  1;	 # For Unix, use gdbtk_icon.gif as an icon
-  # some window managers can't deal with it.
-
-  # OS compatibility. Valid values are "Windows", "GNOME", "KDE", and "default"
-  if {$tcl_platform(platform) == "windows"}  {
-    pref define gdb/compat	"Windows"
-  } elseif {$tcl_platform(platform) == "unix"}  {
-    pref define gdb/compat	"GNOME"
-  } else {
-    pref define gdb/compat	"default"
-  }
-  
-  # set download and execution options
-  pref define gdb/load/verbose 0
-  pref define gdb/load/main 1
-  pref define gdb/load/exit 1
-  pref define gdb/load/check 0
-  pref define gdb/load/bp_at_func 0
-  pref define gdb/load/bp_func ""
-  pref define gdb/load/baud 38400
-  if {$tcl_platform(platform) == "windows"}  {
-    pref define gdb/load/port com1
-  } else {
-    pref define gdb/load/port "/dev/ttyS0"
-  }
-
-  # The list of active windows:
-  pref define gdb/window/active           {}
-
-  # Console defaults
-  pref define gdb/console/prompt          "(gdb) "
-  pref define gdb/console/deleteLeft      1
-  pref define gdb/console/wrap            0
-  pref define gdb/console/prompt_fg       DarkGreen
-  pref define gdb/console/error_fg        red
-  pref define gdb/console/log_fg          green 
-  pref define gdb/console/target_fg       blue
-  pref define gdb/console/font            global/fixed
-
-  # Source window defaults
-  pref define gdb/src/PC_TAG              green
-  pref define gdb/src/STACK_TAG           gold
-  pref define gdb/src/BROWSE_TAG          \#9595e2
-  pref define gdb/src/handlebg            red
-  pref define gdb/src/bp_fg               red
-  pref define gdb/src/temp_bp_fg          orange
-  pref define gdb/src/disabled_fg         black
-  pref define gdb/src/font                global/fixed
-  pref define gdb/src/break_fg            black
-  pref define gdb/src/source2_fg          navy
-  pref define gdb/src/variableBalloons    1
-  pref define gdb/src/trace_fg            magenta
-  pref define gdb/src/tab_size            8
-  pref define gdb/src/linenums		  1
-  pref define gdb/src/thread_fg           pink
-  pref define gdb/src/top_control	  1;	# 1 srctextwin controls on top, 0 bottom
-
-  # Define the run button's functions. These are defined here in case
-  # we do a "run" with an exec target (which never causes target.tcl to 
-  # source)...
-  pref define gdb/src/run_attach          0
-  pref define gdb/src/run_load            0
-  pref define gdb/src/run_run             1
-  pref define gdb/src/run_cont            0
-
-  # This is the disassembly flavor.  For now this is only supported on x86
-  # machines.
-
-  pref define gdb/src/disassembly-flavor  ""
-
-  # Variable Window defaults
-  pref define gdb/variable/font           global/fixed
-  pref define gdb/variable/disabled_fg    gray
-
-  # Stack Window
-  pref define gdb/stack/font              global/fixed
-  
-  # Register Window
-  pref define gdb/reg/rows                16
-
-  # Global Prefs Dialogs
-  pref define gdb/global_prefs/save_fg    red
-  pref define gdb/global_prefs/message_fg white
-  pref define gdb/global_prefs/message_bg red
-
-  # Browser Window Search
-  pref define gdb/search/last_symbol      ""
-  pref define gdb/search/filter_mode     "starts with"
-
-  pref define gdb/browser/hide_h          0
-  pref define gdb/browser/layout	2
-
-  # BP (breakpoint)
-  pref define gdb/bp/show_threads         0
-
-  # Help
-  pref define gdb/help/browsername	""
-
-  # Kernel Objects (kod)
-  pref define gdb/kod/show_icon           0
-
-  # Various possible "main" functions. What's for Java?
-  pref define gdb/main_names              [list main MAIN___ MAIN__ cyg_user_start cyg_start ]
-
-  # These are the classes of warning dialogs, and whether the user plans
-  # to ignore them.
-  pref define gdb/warnings/signal         0
-
-  # Memory window.
-  pref define gdb/mem/size 4
-  pref define gdb/mem/numbytes 0
-  pref define gdb/mem/format x
-  pref define gdb/mem/ascii 1
-  pref define gdb/mem/ascii_char .
-  pref define gdb/mem/bytes_per_row 16
-  pref define gdb/mem/color green
-  
-  # External editor.
-  pref define gdb/editor ""
-}
-
-proc pref_set_colors {home} {
-  # set color palette
-  
-  # In the past, tk widgets got their color information from Windows or
-  # the X resource database.  Unfortunately Insight is a mixture of widgets 
-  # from all over and was coded first in tcl and later in itcl.  So lots of 
-  # color inheritance is broken or wrong. And Insight has some special color
-  # requirements. We also have to deal with new Unix desktops that don't use the Xrdb.
-  # To enable us to fix that without hardcoding colors, we create a color
-  # array here and use it as needed to force widgets to the correct colors.
-  
-  global Colors tcl_platform
-  debug
-
-  # UNIX colors
-  
-  # For KDE3 (and probably earlier versions) when the user sets
-  # a color scheme from the KDE control center, the appropriate color 
-  # information is set in the X resource database.  Well, most of it 
-  # is there but it is missing some settings, so we will carefully 
-  # adjust things.
-  #
-  # For GNOME, we read .gtkrc or .gtkrc-1.2-gnome2 and parse it
-  # for the color information.  We cannot really get this right,
-  # but with luck we can read enough to get the colors to mostly match.
-
-  # If there is no information, we provide reasonable defaults.
-  
-  # If some theme sets the text foreground and background to something unusual
-  # then Insight won't be able to display sources and highlight things properly.
-  # Therefore we will not change the textfg and textbg.
-
-  switch [pref get gdb/compat] {
-
-    "Windows" {
-      debug "loading OS colors for Windows"
-      set Colors(fg) SystemButtonText
-      set Colors(bg) SystemButtonFace
-      #set Colors(textfg) SystemWindowText
-      #set Colors(textbg) SystemWindow
-      set Colors(textfg) black
-      set Colors(textbg) white
-      set Colors(sfg) SystemHighlightText
-      set Colors(sbg) SystemHighlight
-      pref_set_option_db 0
-    }
-
-    "KDE" {
-      debug "loading OS colors for KDE"
-
-      pref_load_default
-      # try loading "~/.gtkrc-kde"
-      if {[pref_load_gnome $home [list .gtkrc-kde]]} {
-	debug "loaded gnome file"
-	pref_set_option_db 0
-	debug "loaded option file"
-      } else {
-	# no .gtkrc-kde so assume X defaults have been set
-
-	# create an empty entry widget so we can query its colors
-	entry .e
-	
-	# text background
-	# set Colors(textbg) [option get .e background {}]
-	set Colors(textbg) white
-	
-	# text foreground
-	#set Colors(textfg) [option get .e foreground {}]
-	set Colors(textfg) black
-	
-	# background
-	set Colors(bg) [option get . background {}]
-	if {$Colors(bg) == ""} {set Colors(bg) lightgray}
-	
-	# foreground
-	set Colors(fg) [option get . foreground {}]
-	if {$Colors(fg) == ""} {set Colors(fg) black}
-	
-	# selectBackground
-	set Colors(sbg) [option get .e selectBackground {}]
-	if {$Colors(sbg) == ""} {set Colors(sbg) blue}
-	
-	# selectForeground
-	set Colors(sfg) [option get .e selectForeground {}]
-	if {$Colors(sfg) == ""} {set Colors(sfg) white}
-	
-	destroy .e
-	pref_set_option_db 1
-      }
-    }
-    
-    "GNOME" {
-      pref_load_default
-      pref_load_gnome $home
-      pref_set_option_db 0
-    }
-
-    "default" {
-      pref_load_default
-      pref_set_option_db 1
-    }
-  }
-}
-
-proc pref_load_default {} {
-  global Colors
-  debug "loading default colors"
-  
-  set Colors(textbg) white
-  set Colors(textfg) black
-  set Colors(bg) lightgray
-  set Colors(fg) black
-  
-  # selectBackground
-  set Colors(sbg) blue
-  
-  # selectForeground
-  set Colors(sfg) white
-}
-
-
-# load GNOME colors and fonts, if possible.
-proc pref_load_gnome {home {possible_names {}}} {
-  debug "loading OS colors for GNOME"
-
-  if {$possible_names == ""} {
-    set possible_names {.gtkrc .gtkrc-1.2-gnome2}
-  }
-
-  set found 0
-  foreach name $possible_names {
-    debug "home=$home name=$name"
-    set fname [file join $home $name]
-    debug "fname=$fname"
-    if {[file exists $fname]} {
-      if {[catch {open $fname r} fd]} {
-	dbug W "cannot open $fname: $fd"
-	return 0
-      }
-      set found 1
-      break
-    }
-  }
-  if {$found} {
-    set found [load_gnome_file $fd]
-    close $fd
-  }
-  return $found
-}
-
-proc load_gnome_file {fd} {
-  global Colors
-  set found 0
-  
-  while {[gets $fd line] >= 0} {
-    if {[regexp {include \"([^\"]*)} $line foo incname]} {
-      debug "include $incname $found"
-      if {$found == 0 && [file exists $incname]} {
-	if {[catch {open $incname r} fd2]} {
-	  dbug W "cannot open $incname: $fd2"
-	} else {
-	  set found [load_gnome_file $fd2]
-	  close $fd2
-	  if {$found} {
-	    return $found
-	  }
-	}
-      }
-      continue
-    } elseif {[regexp "\[ \t\n\]*\(.+\) = \(.+\)" $line a name val] == 0} {
-      continue 
-    }
-    set res [scan $val "\{ %f, %f, %f \}" r g b]
-    if {$res != 3} {continue}
-    set r [expr int($r*255)]
-    set g [expr int($g*255)]
-    set b [expr int($b*255)]
-    set val [format "\#%02x%02x%02x" $r $g $b]
-    debug "name=\"$name\"  val=\"$val\""
-
-    # This is a bit of a hack and probably only
-    # works for trivial cases.  Scan for colors and
-    # use the first one found.
-    switch [string trimright $name] {
-      {bg[NORMAL]} {
-	set found 1
-	if {![info exists new(bg)]} {
-	  debug "setting bg to $val"
-	  set new(bg) $val
-	}
-      }
-      {base[NORMAL]} {
-	#if {![info exists new(textbg)]} {
-	#  set new(textbg) $val
-	#}
-      }
-      {text[NORMAL]} {
-	#if {![info exists new(textfg)]} {
-	#  set new(textfg) $val
-	#}
-      }
-      {fg[NORMAL]} {
-	if {![info exists new(fg)]} {
-	  set new(fg) $val
-	}
-      }
-      {fg[ACTIVE]} {
-	if {![info exists new(afg)]} {
-	  set new(afg) $val
-	}
-      }
-      {bg[SELECTED]} {
-	if {![info exists new(sbg)]} {
-	  set new(sbg) $val
-	}
-      }
-      {base[SELECTED]} {
-	if {![info exists new(sbg)]} {
-	  set new(sbg) $val
-	}
-      }
-      {fg[SELECTED]} {
-	if {![info exists new(sfg)]} {
-	  set new(sfg) $val
-	}
-      }
-      {fg[INSENSITIVE]} {
-	if {![info exists new(dfg)]} {
-	  set new(dfg) $val
-	}
-      }
-      {bg[PRELIGHT]} {
-	set Colors(prelight) $val
-      }
-      {base[PRELIGHT]} {
-	set Colors(prelight) $val
-      }
-    }
-  } 
-
-  foreach c {fg bg sfg sbg dfg} {
-    if {[info exists new($c)]} {
-      set Colors($c) $new($c)
-    }
-  }
-  return 1
-}
-
-
-# load the colors into the tcl option database
-proc pref_set_option_db {makebg} {
-  global Colors
-
-  # The color of text that indicates changed items
-  # We standardize on one color here so that changed
-  # items don't blend into any OS color scheme
-  set Colors(change) "green"
-
-  option add *background $Colors(bg)
-  option add *Text*background $Colors(textbg)
-  option add *Entry*background $Colors(textbg)
-  option add *foreground $Colors(fg)
-  option add *Text*foreground $Colors(textfg)
-  option add *Entry*foreground $Colors(textfg)
-
-  option add *highlightBackground $Colors(bg)
-  option add *selectBackground $Colors(sbg)
-  option add *activeBackground $Colors(sbg)
-  option add *selectForeground $Colors(sfg)
-  if {[info exists Colors(prelight)]} {
-    option add *Button*activeBackground $Colors(prelight)
-  }
-  if {[info exists Colors(dfg)]} {
-    option add *disabledForeground $Colors(dfg)
-  }
-  
-  if {$makebg} {
-    # compute a slightly darker background color
-    # and use for activeBackground and troughColor
-    set bg2 [winfo rgb . $Colors(bg)]
-    set dbg [format #%02x%02x%02x [expr {(9*[lindex $bg2 0])/2560}] \
-	       [expr {(9*[lindex $bg2 1])/2560}] [expr {(9*[lindex $bg2 2])/2560}]]
-    option add *activeBackground $dbg
-    option add *troughColor $dbg
-  }
-
-  # Change the default select color for checkbuttons, etc to match 
-  # selectBackground.
-  option add *selectColor $Colors(sbg)
-}
diff --git a/gdb/gdbtk/library/process.itb b/gdb/gdbtk/library/process.itb
deleted file mode 100644
index b3aad6f9d5c..00000000000
--- a/gdb/gdbtk/library/process.itb
+++ /dev/null
@@ -1,162 +0,0 @@
-# Process window for Insight.
-# Copyright 1998, 1999, 2001, 2002 Red Hat, Inc.
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License (GPL) 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.
-
-
-# ----------------------------------------------------------------------
-# Implements a process window with a list of threads, tasks, and/or
-# processes to debug.
-#
-# ----------------------------------------------------------------------
-
-itcl::body ProcessWin::constructor {args} {
-
-  window_name "Processes"
-  gdbtk_busy
-  build_win
-  gdbtk_idle
-
-  # Add hooks for this object
-  add_hook gdb_no_inferior_hook [code $this idle]
-}
-
-
-# ------------------------------------------------------------------
-#  METHOD:  build_win - build the main process window
-# ------------------------------------------------------------------
-itcl::body ProcessWin::build_win {} {
-  global tcl_platform
-
-  itk_component add slbox {
-    iwidgets::scrolledlistbox $itk_interior.slbox \
-      -background $::Colors(bg) \
-      -selectbackground $::Colors(sbg) -selectforeground $::Colors(sfg) \
-      -textfont global/fixed \
-      -exportselection false \
-      -selectioncommand [code $this change_context]
-  } {}
-  [$itk_component(slbox) component listbox] configure \
-    -bg $::Colors(textbg) -fg $::Colors(textfg)
-  update dummy
-
-  pack $itk_component(slbox) -side left -expand yes -fill both
-}
-
-
-# ------------------------------------------------------------------
-#  METHOD:  update - update widget when something changes
-# ------------------------------------------------------------------
-itcl::body ProcessWin::update {event} {
-  if {!$protect_me} {
-
-    $itk_component(slbox) delete 0 end
-    if {[catch {gdb_cmd "info thread"} threads]} {
-      # failed.  leave window blank
-      return
-    }
-
-    set threads [split $threads \n]
-    debug "processWin update: \n$threads"
-    if {[llength $threads] == 0} {
-      # no processes/threads listed.
-      return
-    }
-    
-    # insert each line one at a time
-    set active -1
-    set num_threads 0
-    foreach line $threads {
-      # Active line starts with "*"
-      if {[string index $line 0] == "*"} {
-	# strip off leading "*"
-	set line " [string trimleft $line "*"]"
-	set active $num_threads
-      }
-      # scan for GDB ID number at start of line
-      if {[scan $line "%d" id($num_threads)] == 1} {
-	$itk_component(slbox) insert end $line
-	incr num_threads
-      }
-    }
-    
-    # highlight the active thread
-    if {$active >= 0} {
-      set active_thread $id($active)
-      $itk_component(slbox) selection set $active
-      $itk_component(slbox) see $active
-    }
-  }
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  change_context - change the current context (active thread)
-#        This method is currently ONLY called from the mouse binding
-# ------------------------------------------------------------------
-itcl::body ProcessWin::change_context {} {
-  if {!$Running && [$itk_component(slbox) size] != 0} {
-    gdbtk_busy
-    set sel [$itk_component(slbox) curselection]
-    set idnum $id($sel)
-    #debug "change_context to line $sel  id=$idnum"
-    catch {gdb_cmd "thread $idnum"}
-    # Run idle hooks and cause all widgets to update
-    set protect_me 1
-    gdbtk_update
-    set protect_me 0
-    gdbtk_idle
-  }
-}
-
-# ------------------------------------------------------------------
-#  DESTRUCTOR - destroy window containing widget
-# ------------------------------------------------------------------
-itcl::body ProcessWin::destructor {} {
-  remove_hook gdb_no_inferior_hook [code $this no_inferior]
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  reconfig - used when preferences change
-# ------------------------------------------------------------------
-itcl::body ProcessWin::reconfig {} {
-  destroy $itk_interior.s
-  if {[winfo exists $itk_interior.slbox]} { destroy $itk_interior.slbox }
-  build_win
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  busy - BusyEvent handler
-#
-#        This method should accomplish blocking
-#        - clicks in the window
-#        - change mouse pointer
-# ------------------------------------------------------------------
-itcl::body ProcessWin::busy {event} {
-  set Running 1
-  cursor watch
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  idle - handle IdleEvent
-# ------------------------------------------------------------------
-itcl::body ProcessWin::idle {event} {
-  set Running 0
-  cursor {}
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  cursor - set the window cursor
-#        This is a convenience method which simply sets the mouse
-#        pointer to the given glyph.
-# ------------------------------------------------------------------
-itcl::body ProcessWin::cursor {glyph} {
-  $_top configure -cursor $glyph
-}
diff --git a/gdb/gdbtk/library/process.ith b/gdb/gdbtk/library/process.ith
deleted file mode 100644
index e13df457eed..00000000000
--- a/gdb/gdbtk/library/process.ith
+++ /dev/null
@@ -1,41 +0,0 @@
-# Process window class definition for Insight.
-# Copyright 1998, 1999, 2001 Red Hat, Inc.
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License (GPL) 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.
-
-
-itcl::class ProcessWin {
-  inherit EmbeddedWin GDBWin
-  
-  private {
-    variable id
-    variable Running 0
-    variable protect_me 0
-
-
-    method build_win {}
-    method change_context {}
-    method cursor {glyph}
-  }
-
-  public {
-    method reconfig {}
-    method constructor {args} 
-    method destructor {}
-
-    #
-    # GDB Events
-    #
-    method busy {event}    
-    method idle {event}
-    method update {event}
-  }
-}
diff --git a/gdb/gdbtk/library/regwin.itb b/gdb/gdbtk/library/regwin.itb
deleted file mode 100644
index dd1145543b3..00000000000
--- a/gdb/gdbtk/library/regwin.itb
+++ /dev/null
@@ -1,1054 +0,0 @@
-# Register display window for Insight.
-# Copyright 1998, 1999, 2001, 2002, 2003 Red Hat, Inc.
-#
-# Written by Keith Seitz (keiths@redhat.com)
-#        and Martin Hunt (hunt@redhat.com)
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License (GPL) 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.
-
-# TODO
-#
-# Must fix:
-# o Edit menus -- weirdo interaction with tkTable. Seems okay on windows.
-#                 Needs more testing on unix (popup edit menu item).
-#
-# Want really badly:
-# o Multiple selections
-# o Multiple displays
-# o Better resizing
-# o Register groups (gdb and user-defined)
-# o format register values before inserting into table?
-#   (Instead of displaying "0x0", we should use "0x00000000" on
-#    machines with 32-bit regs, "0x0000000000000000" on machines
-#    with 64-bit regs, etc. Maybe user-defined formats, i.e.,
-#    "0x0000 0000 0000 0000 0000 0000"?)
-
-# ------------------------------------------------------------------
-#  NAME:         RegWin::constructor
-#  DESCRIPTION:  Create a new register window
-#
-#  ARGUMENTS:    None
-#  RETURNS:      Nothing
-# ------------------------------------------------------------------
-itcl::body RegWin::constructor {args} {
-
-  eval itk_initialize $args    
-
-  gdbtk_busy
-
-  window_name "Registers" "Regs"
-  _build_win
-  _layout_table
-
-  # Clear gdb's changed list
-  catch {gdb_reginfo changed}
-
-  gdbtk_idle
-}
-
-# ------------------------------------------------------------------
-#  NAME:         RegWin::destructor
-#  DESCRIPTION:  Destroys the register window
-#
-#  ARGUMENTS:    None
-#  RETURNS:      Nothing
-# ------------------------------------------------------------------
-itcl::body RegWin::destructor {} {
-  debug
-}
-
-# ------------------------------------------------------------------
-#  NAME:         RegWin::_load_prefs
-#  DESCRIPTION:  Load register preferences
-#
-#  ARGUMENTS:    None
-#  RETURNS:      Nothing
-# ------------------------------------------------------------------
-itcl::body RegWin::_load_prefs {} {
-  debug
-
-  # Find out largest register name length.
-  set _max_label_width 0;	# for reg labels
-  set _reg_display_list {}
-  set _register(hidden) {}
-
-  set regs [gdb_reginfo group $_group]
-  foreach r [gdb_reginfo name -numbers $regs] {
-    set nm [lindex $r 0]
-    set rn [lindex $r 1]
-    set size [string length $nm]
-    if {$size > $_max_label_width} {
-      set _max_label_width $size
-    }
-
-    # Set type from prefs or default to first in list of types
-    set _types($rn) [gdb_reginfo type $rn]
-    set tp [pref getd gdb/reg/${nm}-type]
-    set _type($rn,name) ""
-    if {$tp != ""} {
-      foreach t $_types($rn) {
-	if {[lindex $t 0] == $tp} {
-	  set _type($rn,name) $tp
-	  set _type($rn,addr) [lindex $t 1]
-	  set _type($rn,code) [lindex $t 2]
-	  break
-	}
-      }
-    }
-    if {$_type($rn,name) == ""} {
-      # either not set or couldn't find it in list of types
-      set _type($rn,name) [lindex [lindex $_types($rn) 0] 0]
-      set _type($rn,addr) [lindex [lindex $_types($rn) 0] 1]
-      set _type($rn,code) [lindex [lindex $_types($rn) 0] 2]
-    }
-
-    # Check preferences for format
-    set _format($rn) [pref getd gdb/reg/${nm}-format]
-    if {$_format($rn) == ""} {
-      # no preference set.  Set it to hex or float
-      if {$_type($rn,code) == "int"} {
-	set _format($rn) "x"
-      } else {
-	set _format($rn) "f"
-      }
-      pref setd gdb/reg/${nm}-format $_format($rn)
-    }
-    
-    gdb_reginfo format $rn $_type($rn,addr) $_format($rn)
-
-    # Check if the user prefers not to show this register
-    if {[pref getd gdb/reg/$nm] == "no"} {
-      set _cell($rn) hidden
-      lappend _register(hidden) $rn
-    } else {
-      lappend _reg_display_list $rn
-    }
-
-    # assume editable, for now
-    set _editable($rn) 1
-  }
-
-  incr _max_label_width 2;	# padding
-}
-
-
-#
-# Table layout/display methods
-#
-
-# ------------------------------------------------------------------
-#  NAME:         private method RegWin::_build_win
-#  DESCRIPTION:  Builds the register window from widgets
-#
-#  ARGUMENTS:    None
-#  RETURNS:      Nothing
-#
-#  NOTES:        This method should only be called once for
-#                each RegWin. To change the layout of the table
-#                in the window, use RegWin::_layout_table.
-# ------------------------------------------------------------------
-itcl::body RegWin::_build_win {} {
- 
-  # Create scrollbars and table
-  itk_component add vscroll {
-    scrollbar $itk_interior.vs -orient vertical
-  }
-  itk_component add hscroll {
-    scrollbar $itk_interior.hs -orient horizontal
-  }
-
-  itk_component add table {
-    ::table $itk_interior.tbl -variable [scope _data] \
-      -browsecmd [code $this _select_cell %S] -font global/fixed \
-      -colstretch unset -rowstretch unset -selectmode single \
-      -resizeborders none -multiline false -colwidth 18 \
-      -autoclear 0 -bg $::Colors(bg) \
-      -padx 5 -xscrollcommand [code $itk_component(hscroll) set] \
-      -yscrollcommand [code $itk_component(vscroll) set]
-  } {
-    keep -foreground
-    keep -insertbackground
-    keep -highlightcolor
-    keep -highlightbackground
-  }
-  bind $itk_component(table) <Up>       \
-    [format "%s; break" [code $this _move up]]
-  bind $itk_component(table) <Down>     \
-    [format "%s; break" [code $this _move down]]
-  bind $itk_component(table) <Left>     \
-    [format "%s; break" [code $this _move left]]
-  bind $itk_component(table) <Right>    \
-    [format "%s; break" [code $this _move right]]
-  bind $itk_component(table) <3>        \
-    [code $this _but3 %x %y %X %Y]
-  bind $itk_component(table) <Double-1> break 
-  bind $itk_component(table) <1> \
-    [code $this _edit %x %y]
-  bind $itk_component(table) <Return>   \
-    [format "%s; break" [code $this _accept_edit]]
-  bind $itk_component(table) <KP_Enter>   \
-    [format "%s; break" [code $this _accept_edit]]
-  bind $itk_component(table) <Escape>   \
-    [code $this _unedit]
-
-  $itk_component(hscroll) configure -command [code $itk_component(table) xview]
-  $itk_component(vscroll) configure -command [code $itk_component(table) yview]
-
-
-  # Create/configure tags for various display styles
-  # normal    - the "normal" display style
-  # highlight - changed registers are highlighted
-  # sel       - the selection fg/bg should conform to standard
-  # header    - used on the register name cells and empty cells
-  # edit      - used on a cell being edited
-  $itk_component(table) tag configure normal  \
-    -state disabled -bg $::Colors(textbg) -fg $::Colors(textfg)
-  $itk_component(table) tag configure sel -bg $::Colors(sbg) -fg $::Colors(sfg)
-  $itk_component(table) tag configure highlight -bg $::Colors(change) -fg black
-  $itk_component(table) tag raise highlight
-  $itk_component(table) tag configure header \
-    -anchor w -state disabled -relief raised
-  $itk_component(table) tag configure disabled \
-    -state disabled
-  $itk_component(table) tag raise active
-  $itk_component(table) tag configure edit \
-    -state normal 
-  $itk_component(table) tag raise edit
-  $itk_component(table) tag raise sel
-
-  itk_component add frame {
-    frame $itk_interior.m
-  }
-  iwidgets::optionmenu $itk_component(frame).opt -labeltext "Group:" \
-    -labelpos w -command [code $this _select_group]
-  eval $itk_component(frame).opt insert end [gdb_reginfo grouplist]
-  $itk_component(frame).opt select "all"
-  
-  pack $itk_component(frame).opt -anchor nw
-  grid $itk_component(frame) -row 0 -columnspan 2 -sticky news
-  grid $itk_component(table) -row 1 -column 0 -sticky news
-  grid $itk_component(vscroll) -row 1 -column 1 -sticky ns
-  grid $itk_component(hscroll) -row 2 -column 0 -sticky ew
-  grid columnconfigure $itk_interior 0 -weight 1
-  grid rowconfigure $itk_interior 0 -weight 0
-  grid rowconfigure $itk_interior 1 -weight 1
-
-  # Add popup menu - we populate it in the event handler
-  itk_component add popup {
-    menu $itk_interior.pop -tearoff 0
-  } {}
-}
-
-# ------------------------------------------------------------------
-#  NAME:         private method RegWin::_layout_table
-#  DESCRIPTION:  Configures and lays out the table
-#
-#  ARGUMENTS:    None
-#  RETURNS:      Nothing
-#
-#  NOTES:        Uses preferences to determine if/how a register
-#                is displayed
-# ------------------------------------------------------------------
-itcl::body RegWin::_layout_table {} {
-  debug
-
-  if {[info exists _cell]} {
-    unset _cell
-    unset _register
-  }
-  # Clear any column spans
-  foreach span [$itk_component(table) spans] {
-    $itk_component(table) spans $span 0,0
-  }
-
-  _load_prefs
-
-  # Fill data array with register names.
-  # 
-  # The table is indexed by (row,col). All odd columns will contain
-  # register values and all even columns will contain the labels.
-  #
-  set x 0
-  set y 0
-
-  # get register list
-  set regs [gdb_reginfo name -numbers $_reg_display_list]
-
-  # Set table dimensions
-  set num [llength $regs]
-  set _rows [pref get gdb/reg/rows]
-  set _cols [expr $num / $_rows]
-  if {[expr $num % $_rows] != 0} { incr _cols }
-  set _cols [expr 2 * $_cols]
-  $itk_component(table) configure -cols $_cols -rows $_rows
-
-  # get values
-  if {[catch {gdb_reginfo value $_reg_display_list} values]} {
-    dbug W "values=$values"
-    set values ""
-  }
-  set i 0
-
-  # now build table
-  foreach r $regs {
-    set name [lindex $r 0]
-    set rn [lindex $r 1]
-
-    set _cell($rn) "$y,[expr {$x+1}]"
-    set _register($_cell($rn)) $rn
-    set _data($y,$x) $name
-    set _data($_cell($rn)) [lindex $values $i]
-    incr i
-
-    # Go to next row/column
-    incr y
-    if {$y == $_rows} {
-      set _col_size([expr {$x+1}]) 0
-      
-      # Size the column
-      if {$::gdb_running} {
-	_size_column [expr {$x+1}] 1
-      }
-
-      $itk_component(table) width $x $_max_label_width
-      $itk_component(table) tag col header $x
-      $itk_component(table) tag col normal [expr {$x+1}]
-      
-      set y 0
-      incr x 2
-    }
-  }
-
-  # Mark empty cells
-  while {$y != $_rows && $x != $_cols} {
-    set _data($y,$x) ""
-    set _data($y,[expr {$x+1}]) ""
-    $itk_component(table) spans $y,$x 0,1
-    $itk_component(table) tag cell header $y,$x
-    set _col_size([expr {$x+1}]) 0
-
-    incr y
-    if {$y == $_rows} {
-      # Size the column
-      if {$::gdb_running} {
-	_size_column [expr {$x+1}] 1
-      }
-      $itk_component(table) width $x $_max_label_width
-      $itk_component(table) tag col header $x
-      $itk_component(table) tag col normal [expr {$x+1}]
-
-      set y 0
-      incr x 2
-    }
-  }
-}
-
-# ------------------------------------------------------------------
-#  NAME:         private method RegWin::_size_cell_column
-#  DESCRIPTION:  Resize the column for a given cell.
-#
-#  ARGUMENTS:
-#                cell  - the cell whose column is to be resized
-#                down  - whether the resizing should size the column
-#                        down or just up.
-#  RETURNS:      Nothing
-#
-#  NOTES:        See _size_column for the reasoning for the "down"
-#                option.
-# ------------------------------------------------------------------
-itcl::body RegWin::_size_cell_column {cell down} {
-
-  set col [string trim [lindex [split $cell ,] 1] ()]
-  _size_column $col $down
-}
-
-# ------------------------------------------------------------------
-#  NAME:         private method RegWin::_size_column
-#  DESCRIPTION:  Resize the given column
-#
-#  ARGUMENTS:
-#                col  - the column to be resized
-#                down - whether the resizing should size the column
-#  RETURNS:             down or just up.
-#
-#  NOTES:        The down option allows column sizes to change down
-#                as well as up. For most cases, this is what is
-#                wanted. However, when the user is stepping, it is
-#                really annoying to see the column sizes changing.
-#                It's bad enough we must size up, but going down
-#                is just too much. Consequently, when updating the
-#                contents of the table, we specify that the columns
-#                should not downsize. This helps mitigate the
-#                annoyance.
-# ------------------------------------------------------------------
-itcl::body RegWin::_size_column {col down} {
-
-  set max 0
-  foreach cell [array names _data *,$col] {
-    set len [string length $_data($cell)]
-    if {$len > $max} { set max $len }
-  }
-
-  if {($down && $max != $_col_size($col))
-      || (!$down && $max > $_col_size($col))} {
-    set _col_size($col) $max
-    $itk_component(table) width $col [expr {$max + 2}]
-
-    # Force the table to update itself
-    after idle event generate $itk_component(table) <Configure> \
-      -width [winfo width $itk_component(table)]
-  }
-}
-
-# ------------------------------------------------------------------
-#  NAME:         private method RegWin::_prefs_changed
-#  DESCRIPTION:  Reconfigures register window when a preference
-#                changes.
-#
-#  ARGUMENTS:
-#                pref   - the preference which changed
-#                value  - preference's new value
-#  RETURNS:      Nothing
-#
-#  NOTES:        Callback from pref system
-# ------------------------------------------------------------------
-itcl::body RegWin::_prefs_changed {pref value} {
-  debug "$pref $value"
-  # do nothing for now.  With proper iwidgets this would not
-  # be required anyway.
-}
-
-
-#
-# Table event handlers and related methods
-#
-
-# ------------------------------------------------------------------
-#  NAME:         private method RegWin::_accept_edit
-#  DESCRIPTION:  Change a register's value
-#
-#  ARGUMENTS:    None
-#  RETURNS:      Nothing
-#
-#  NOTES:        Event handler for <Enter> and <KP_Enter>
-#                in table
-# ------------------------------------------------------------------
-itcl::body RegWin::_accept_edit {} {
-  debug
-  set cell [$itk_component(table) tag cell edit]
-  if {[llength $cell] == 1 && [info exists _register($cell)]} {
-    # Select the same cell again. This forces the table
-    # to keep this value. Otherwise, we'll never see it...
-    _select_cell $cell
-    set rn $_register($cell)
-    set n [gdb_reginfo name $rn]
-    if {[llength $_types($rn)] > 1} {
-      append n ".$_type($rn,name)"
-    }
-    set v [string trim [$itk_component(table) curvalue] \ \r\n]
-    debug "n=$n v=$v"
-    if {$v != ""} {
-      if {[catch {gdb_cmd "set \$${n}=$v"} result]} {
-	tk_messageBox -icon error -type ok -message $result \
-	  -title "Error in Expression" -parent $_top
-      }
-    }
-
-    # Always update the register, even for error conditions. This
-    # will ensure that the cell's old value is restored to the table.
-    _update_register $_register($cell)
-    _size_cell_column $cell 1
-  }
-
-  _unedit
-}
-
-# ------------------------------------------------------------------
-#  NAME:         private method RegWin::_add_to_watch
-#  DESCRIPTION:  Add a register to the watch window
-#
-#  ARGUMENTS:    rn  - the register number to add to the WatchWin
-#  RETURNS:      Nothing
-#
-#  NOTES:        Only works with one WatchWin...
-# ------------------------------------------------------------------
-itcl::body RegWin::_add_to_watch {rn} {
-  [ManagedWin::open WatchWin] add "\$[gdb_reginfo name $rn]"
-}
-
-# ------------------------------------------------------------------
-#  NAME:         private method RegWin::_add_to_watch
-#  DESCRIPTION:  Add a register to the watch window
-#
-#  ARGUMENTS:    rn  - the register number to add to the WatchWin
-#  RETURNS:      Nothing
-#
-#  NOTES:        Only works with one WatchWin...
-# ------------------------------------------------------------------
-itcl::body RegWin::_open_memory {rn} {
-  ManagedWin::open MemWin -force -addr_exp $_data($_cell($rn))
-}
-
-# ------------------------------------------------------------------
-#  NAME:         private method RegWin::_but3
-#  DESCRIPTION:  Configure the popup menu before posting it
-#
-#  ARGUMENTS:    x  - x-coordinate of buttonpress
-#                y  - y-coordinate
-#                X  - x-root coordinate
-#                Y  - y-root coordinate
-#  RETURNS:      Nothing
-# ------------------------------------------------------------------
-itcl::body RegWin::_but3 {x y X Y} {
-
-  # Only post the menu when we're not executing the inferior,
-  # the inferior is in a runnable state, and we're not in a disabled
-  # cell.
-  if {!$_running && $::gdb_running} {
-
-    # Select the register
-    set cell [_select_cell [$itk_component(table) index @$x,$y]]
-    if {[info exists _register($cell)]} {
-      set rn $_register($cell)
-      set name [gdb_reginfo name $rn]
-      $itk_component(popup) delete 0 end
-      $itk_component(popup) add command -label $name -state disabled
-      $itk_component(popup) add separator
-      if {[llength $_types($rn)] > 1} {
-	foreach t $_types($rn) {
-	  $itk_component(popup) add radio -label [lindex $t 0] \
-	    -variable [scope _type($rn,addr)] \
-	    -value [lindex $t 1] \
-	    -command [code $this _change_format $rn [lindex $t 0]]
-	}
-	$itk_component(popup) add separator
-      }
-
-      $itk_component(popup) add radio -label "Hex"            \
-	-variable [scope _format($rn)] -value x               \
-	-command [code $this _change_format $rn]
-
-      if {$_type($rn,code) == "int"} {
-	$itk_component(popup) add radio -label "Decimal"        \
-	  -variable [scope _format($rn)] -value d               \
-	  -command [code $this _change_format $rn]
-	$itk_component(popup) add radio -label "Unsigned"       \
-	  -variable [scope _format($rn)] -value u               \
-	  -command [code $this _change_format $rn]
-      } elseif {$_type($rn,code) == "float"} {
-	$itk_component(popup) add radio -label "Floating Point" \
-	  -variable [scope _format($rn)] -value f               \
-	  -command [code $this _change_format $rn]
-      }
-      $itk_component(popup) add separator
-
-      if {$_editable($rn)} {
-	set state normal
-      } else {
-	set state disabled
-      }
-      
-      if {$_type($rn,code) == "int"} {
-	$itk_component(popup) add command    \
-	  -label "Open Memory Window" -command [code $this _open_memory $rn]
-      }
-      $itk_component(popup) add command    \
-	-label "Add to Watch" -command [code $this _add_to_watch $rn]
-      $itk_component(popup) add separator
-      $itk_component(popup) add command    \
-	-label "Remove from Display" \
-	-command [code $this _delete_from_display $rn]
-      if {[llength $_register(hidden)] != 0} {
-	$itk_component(popup) add command -label "Display all Registers" \
-	  -command [code $this _display_all]
-      }
-
-      # Help
-      $itk_component(popup) add separator
-      $itk_component(popup) add command    \
-	-label "Help" -command {open_help register.html}
-
-      # Close
-      $itk_component(popup) add separator
-      $itk_component(popup) add command -label "Close" \
-	-underline 0 -command [code delete object $this]
-
-      tk_popup $itk_component(popup) $X $Y
-    }
-  }
-}
-
-# ------------------------------------------------------------------
-#  NAME:         private method RegWin::_delete_from_display
-#  DESCRIPTION:  Remove a register from the display
-#
-#  ARGUMENTS:    rn  - the register number to remove
-#  RETURNS:      Nothing
-# ------------------------------------------------------------------
-itcl::body RegWin::_delete_from_display {rn} {
-
-  # Mark the cell as hidden
-  set index [lsearch $_reg_display_list $rn]
-  if {$index != -1} {
-    pref setd gdb/reg/[gdb_reginfo name $rn] no
-    set _reg_display_list [lreplace $_reg_display_list $index $index]
-
-    # Relayout table
-    _layout_table
-  }
-}
-
-# ------------------------------------------------------------------
-#  NAME:         private method RegWin::_display_all
-#  DESCRIPTION:  Display all registers in the window
-#
-#  ARGUMENTS:    None
-#  RETURNS:      Nothing
-# ------------------------------------------------------------------
-itcl::body RegWin::_display_all {} {
-
-  # Unhide all hidden registers
-  foreach r $_register(hidden) {
-    pref setd gdb/reg/[gdb_reginfo name $r] {}
-  }
-
-  # Note which register is active and restore it
-  if {[catch {$itk_component(table) index active} cell]} {
-    set active {}
-  } else {
-    set active $_register($cell)
-  }
-  _layout_table
-  if {$active != ""} {
-    $itk_component(table) activate $_cell($active)
-  }
-}
-
-# ------------------------------------------------------------------
-#  NAME:         private method RegWin::_edit
-#  DESCRIPTION:  Enables a cell for editing
-#
-#  ARGUMENTS:
-#                x  - the x coordinate of the button press
-#                y  - the y coordinate of the button press
-#  RETURNS:      Nothing
-#
-#  NOTES:        Event handler for <1> in table.
-#                
-# ------------------------------------------------------------------
-itcl::body RegWin::_edit {x y} {
-  _select_cell [$itk_component(table) index @$x,$y]
-}
-
-
-# ------------------------------------------------------------------
-#  NAME:         private method _move
-#  DESCRIPTION:  Handle arrow key events in table
-#
-#  ARGUMENTS:    direction  - "up", "down", "left", "right"
-#  RETURNS:      Nothing
-#
-#  NOTES:        Event handler for <Up>, <Down>, <Left>, <Right>
-#                in table. This is needed because the table
-#                has some rather strange bindings for moving
-#                the insertion cursor when editing a cell.
-#                This method will move to the next cell when
-#                we're not editing, or it will move the icursor
-#                if we are editing.
-# ------------------------------------------------------------------
-itcl::body RegWin::_move {direction} {
-
-  debug $direction
-
-  # If there is no active cell, the table will call error
-  if {[catch {$itk_component(table) index active row} row]} {
-    return
-  }
-
-  if {[$itk_component(table) tag cell edit] != ""} {
-    # Editing
-
-    switch $direction {
-      up {
-	# Go to beginning
-	$itk_component(table) icursor 0
-      }
-
-      down {
-	# Go to end
-	$itk_component(table) icursor end
-      }
-
-      left {
-	# Go left one character
-	set ic [$itk_component(table) icursor]
-	if {$ic > 0} {
-	  $itk_component(table) icursor [expr {$ic - 1}]
-	}
-      }
-
-      right {
-	# Go right one character
-	set ic [$itk_component(table) icursor]
-	if {$ic < [$itk_component(table) icursor end] } {
-	  $itk_component(table) icursor [expr {$ic + 1}]
-	}
-      }
-    }
-
-  } else {
-    # Not editing
-
-    set col [$itk_component(table) index active col]
-
-    switch $direction {
-      up {
-	incr row -1
-	if {$row < 0} {
-	  # go to bottom
-	  set row $_rows
-	}
-      }
-
-      down {
-	incr row 1
-	if {$row == $_rows} {
-	  # go to top
-	  set row 0
-	}
-      }
-
-      left {
-	incr col -2
-	if {$col < 0} {
-	  # go to right
-	  set col [expr {$_cols -1}]
-	}
-      }
-
-      right {
-	incr col 2
-	if {$col > $_cols} {
-	  # go to left
-	  set col 0
-	}
-      }
-    }
-
-    # clear the selection
-    # FIXME: multiple selections?
-    $itk_component(table) selection clear all
-
-    _select_cell $row,$col
-  }
-}
-
-
-# ------------------------------------------------------------------
-#  NAME:         private method RegWin::_select_cell
-#  DESCRIPTION:  Selects a given cell in the table
-#
-#  ARGUMENTS:
-#                cell  - the table index to select
-#  RETURNS:      The actual cell selected
-#
-#  NOTES:        Adjusts the cell index so that it always
-#                selects the value cell for a register
-# ------------------------------------------------------------------
-itcl::body RegWin::_select_cell {cell} {
-
-  # Abort an edit
-  _unedit
-
-  # check if going to label. If so, highlight next
-  set row [lindex [split $cell ,] 0]
-  set col [lindex [split $cell ,] 1]
-  if {[expr {$col % 2}] == 0} {
-    # going onto a label
-    incr col 1
-  }
-  set cell "$row,$col"
-
-  # Make the selected cell the active one
-  $itk_component(table) activate $row,$col
-  $itk_component(table) see active
-
-  # Select this cell and its label
-  # FIXME: multiple selections?
-  $itk_component(table) selection clear all
-  $itk_component(table) selection set $cell $row,[expr {$col-1}]
-
-  # Now mark the cell as being edited.
-  if {$::gdb_running && [info exists _register($cell)]} {
-    $itk_component(table) tag cell edit $cell
-  }
-
-  focus $itk_component(table)
-
-  return $cell
-}
-
-# ------------------------------------------------------------------
-#  NAME:         private method RegWin::_unedit
-#  DESCRIPTION:  Cancels an edit
-#
-#  ARGUMENTS:    None
-#  RETURNS:      Nothing
-# ------------------------------------------------------------------
-itcl::body RegWin::_unedit {} {
-
-  # clear the tag
-  set cell [$itk_component(table) tag cell edit]
-
-  if {$cell != ""} {
-    $itk_component(table) selection clear all
-    $itk_component(table) tag cell normal $cell 
-    focus $itk_component(table)
-  }
-}
-
-#
-# Register operations
-#
-
-# ------------------------------------------------------------------
-#  NAME:         private method RegWin::_get_value
-#  DESCRIPTION:  Get the value of a register
-#
-#  ARGUMENTS:    rn  - the register number whose value should be
-#                      fetched
-#  RETURNS:      The register's value or ""
-#
-#  NOTES:        
-# ------------------------------------------------------------------
-itcl::body RegWin::_get_value {rn} {
-  if {[catch {gdb_reginfo value $rn} value]} {
-    dbug W "\"gdb_reginfo value $rn\" returned $value"
-    set value ""
-  } else {
-    set value [string trim $value \ ]
-  }
-  return $value
-}
-
-# ------------------------------------------------------------------
-#  NAME:         private method RegWin::_change_format
-#  DESCRIPTION:  Change the display format of the register
-#
-#  ARGUMENTS:    rn  - the register number to change
-#		 newtype - type name (optional if just format changed)
-#
-#  RETURNS:      Nothing
-#
-#  NOTES:        
-# ------------------------------------------------------------------
-itcl::body RegWin::_change_format {rn {newtype {}}} {
-
-  set name [gdb_reginfo name $rn]
-
-  if {$newtype != ""} {
-    set _type($rn,name) $newtype
-    pref setd gdb/reg/${name}-type $newtype
-  }
-  
-  gdb_reginfo format $rn $_type($rn,addr) $_format($rn)
-
-  # Set the new format in prefs. 
-  pref setd gdb/reg/${name}-format $_format($rn)
-
-  _update_register $rn
-  _size_cell_column $_cell($rn) 1
-
-  # Show the active cell in case it's moved as a result
-  # of resizing the columns.
-  $itk_component(table) see active
-}
-
-# ------------------------------------------------------------------
-#  NAME:         private_method RegWin::_update_register
-#  DESCRIPTION:  Updates the value of a register and refreshes
-#                the table
-#
-#  ARGUMENTS:
-#                rn  - the register number to update
-#  RETURNS:      Nothing
-# ------------------------------------------------------------------
-itcl::body RegWin::_update_register {rn} {
-  set _data($_cell($rn)) [_get_value $rn]
-}
-
-# ------------------------------------------------------------------
-#  NAME:         private_method RegWin::_select_group
-#  DESCRIPTION:  Changes the register group. Callback
-#
-#  ARGUMENTS:
-#                
-#  RETURNS:      Nothing
-# ------------------------------------------------------------------
-itcl::body RegWin::_select_group {} {
-  set gr [$itk_component(frame).opt get]
-  debug $gr
-  if {$gr == ""} {
-    return
-  }
-
-  # Change anything on the old change list back to normal
-  foreach r $_change_list {
-    if {[info exists _cell($r)] && $_cell($r) != "hidden"} {
-      $itk_component(table) tag cell normal $_cell($r)
-    }
-  }
-
-  set _group $gr
-  _layout_table
-
-  # highlight changed registers if they still exist in the new group
-  foreach r $_change_list {
-    if {[info exists _cell($r)] && $_cell($r) != "hidden" && $_data($_cell($r)) != ""} {
-      $itk_component(table) tag cell highlight $_cell($r)
-    }
-  }
-
-  # Clear gdb's change list
-  catch {gdb_reginfo changed}
-}
-
-
-#
-# Gdb Events
-#
-
-# ------------------------------------------------------------------
-#  NAME:         public method RegWin::arch_changed
-#  DESCRIPTION:  ArchChangedEvent handler
-#
-#  ARGUMENTS:    event  - the ArchChangedEvent (not used)
-#  RETURNS:      Nothing
-# ------------------------------------------------------------------
-itcl::body RegWin::arch_changed {event} {
-
-  # When the arch changes, gdb will callback into gdbtk-register.c
-  # to swap out the old register set, so we need only redraw the
-  # window, updating the register names and numbers.
-  _layout_table
-
-  # Clear gdb's change list
-  catch {gdb_reginfo changed}
-}
-
-# ------------------------------------------------------------------
-#  NAME:         public method RegWin::busy
-#  DESCRIPTION:  BusyEvent handler
-#
-#  ARGUMENTS:    event  - the BusyEvent (not used)
-#  RETURNS:      Nothing
-# ------------------------------------------------------------------
-itcl::body RegWin::busy {event} {
-
-  # Abort any edit. Need to check if the table is constructed,
-  # since we call gdbtk_busy when we're created...
-  if {[info exists itk_component(table)]} {
-    _unedit
-  }
-
-  # Set fencepost
-  set _running 1
-
-  # Set cursor
-  $_top configure -cursor watch
-}
-
-# ------------------------------------------------------------------
-#  NAME:         public method RegWin::idle
-#  DESCRIPTION:  IdleEvent handler
-#
-#  ARGUMENTS:    event  - the IdleEvent (not used)
-#  RETURNS:      Nothing
-# ------------------------------------------------------------------
-itcl::body RegWin::idle {event} {
-
-  # Clear fencepost
-  set _running 0
-
-  # Reset cursor
-  $_top configure -cursor {}
-}
-
-# ------------------------------------------------------------------
-#  NAME:         public method RegWin::set_variable
-#  DESCRIPTION:  SetVariableEvent handler
-#
-#  ARGUMENTS:    None
-#  RETURNS:      Nothing
-# ------------------------------------------------------------------
-itcl::body RegWin::set_variable {event} {
-  switch [$event get variable] {
-    disassembly-flavor {
-      _layout_table
-    } 
-  }
-}
-
-# ------------------------------------------------------------------
-#  NAME:         public method RegWin::update
-#  DESCRIPTION:  UpdateEvent handler
-#
-#  ARGUMENTS:    event  - the UpdateEvent (not used)
-#  RETURNS:      Nothing
-# ------------------------------------------------------------------
-itcl::body RegWin::update {event} {
-  debug
-
-  # Change anything on the old change list back to normal
-  foreach r $_change_list {
-    if {[info exists _cell($r)] && $_cell($r) != "hidden"} {
-      $itk_component(table) tag cell normal $_cell($r)
-    }
-  }
-
-  # Now update and highlight the newly changed values
-  set _change_list {}
-  if {![catch {gdb_reginfo changed $_reg_display_list} changed]} {
-    set _change_list $changed
-  }
-
-  # Problem: if the register was invalid (i.e, we were not running),
-  # its old value will probably be "0x0". Now if we run and its real
-  # value is "0x0", then it will appear as a blank in the register
-  # window. Safegaurd against that here by adding any such register
-  # which is not already in the change list.
-  foreach r $_reg_display_list {
-    if {$_data($_cell($r)) == "" && [lsearch $_change_list $r] == -1} {
-      lappend _change_list $r
-    }
-  }
-
-  # Tag the changed cells and resize the columns
-  set cols {}
-  foreach r $_change_list {
-    _update_register $r
-
-    if {$_data($_cell($r)) != ""} {
-      $itk_component(table) tag cell highlight $_cell($r)
-    }
-    set col [lindex [split $_cell($r) ,] 1]
-    if {[lsearch $cols $col] == -1} {
-      lappend cols $col
-    }
-  }
-  
-  foreach col $cols {
-    set col [string trim $col ()]
-    _size_column $col 0
-  }
-
-  debug "END REGISTER UPDATE CALLBACK" 
-}
diff --git a/gdb/gdbtk/library/regwin.ith b/gdb/gdbtk/library/regwin.ith
deleted file mode 100644
index 47be705f2f9..00000000000
--- a/gdb/gdbtk/library/regwin.ith
+++ /dev/null
@@ -1,103 +0,0 @@
-# Register display window class definition for Insight.
-# Copyright 1998, 1999, 2001 Red Hat, Inc.
-#
-# Written by Keith Seitz (keiths@redhat.com)
-# based on work by Martin Hunt (hunt@redhat.com)
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License (GPL) 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.
-
-
-itcl::class RegWin {
-  inherit EmbeddedWin GDBWin
-  
-  private {
-    variable _change_list {}
-    variable _menuitems
-
-    # Display data for the table
-    variable _data
-
-    # Mapping of table cell index to register number
-    variable _register
-
-    # the register group that is displayed
-    variable _group "all"
-
-    # Mapping of register number to table cell index. "hidden" if
-    # the register was "removed" from the display.
-    variable _cell
-
-    # Is REGNUM editable?
-    variable _editable
-
-    # List of possible display types for the registers (indexed by regnum)
-    variable _types
-    # The display type to use for each register (indexed by regnum)
-    variable _type
-    # The display format to use for each register (indexed by regnum)
-    variable _format
-
-    # The list of registers we're displaying
-    variable _reg_display_list {}
-
-    # Size of columns
-    variable _col_size
-    variable _max_label_width
-
-    # Dimensions
-    variable _rows
-    variable _cols
-
-    # Fencepost
-    variable _running 0
-
-
-    # Table layout/display methods
-    method _build_win {}
-    method _layout_table {}
-    method _load_prefs {}
-    method _prefs_changed {pref value}
-    method _size_cell_column {cell down}
-    method _size_column {col down}
-
-    # Table event handlers and related methods
-    method _accept_edit {}
-    method _add_to_watch {rn}
-    method _but3 {x y X Y}
-    method _delete_from_display {rn} 
-    method _display_all {} 
-    method _edit {x y}
-    method _move {direction}
-    method _open_memory {rn}
-    method _select_group {}
-    method _select_cell {cell}
-    method _unedit {}
-
-    # Register operations
-    method _get_value {rn}
-    method _change_format {rn {t {}}}
-    method _update_register {rn}
-  }
-
-  public {
-    method constructor {args}
-    method destructor {}
-
-    #
-    # Gdb Events
-    #
-    method busy {event}
-    method idle {event}
-    method set_variable {event}
-    method update {event}
-    method arch_changed {event}
-  }
-}
diff --git a/gdb/gdbtk/library/session.tcl b/gdb/gdbtk/library/session.tcl
deleted file mode 100644
index 158ffd245be..00000000000
--- a/gdb/gdbtk/library/session.tcl
+++ /dev/null
@@ -1,318 +0,0 @@
-# Local preferences functions for GDBtk.
-# Copyright 2000, 2001, 2002 Red Hat, Inc.
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License (GPL) 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.
-
-namespace eval Session {
-  namespace export save load notice_file_change delete list_names
-
-  # An internal function for canonicalizing path names.  This probably
-  # should use `realpath', but that is more work.  So for now we neglect
-  # the possibility of symlinks.
-  proc _exe_name {path} {
-    global tcl_platform
-
-    # Get real directory.
-    if {[string compare $tcl_platform(platform) "windows"] == 0} {
-      set path [ide_cygwin_path to_win32 $path]
-    }
-    set save [pwd]
-    cd [file dirname $path]
-    set dir [pwd]
-    cd $save
-    return [file join $dir [file tail $path]]
-  }
-
-  # An internal function used when saving sessions.  Returns a string
-  # that can be used to recreate all pertinent breakpoint state.
-  proc _serialize_bps {} {
-    set result {}
-
-    # HACK.  When debugging gdb with itself in the build
-    # directory, there is a ".gdbinit" file that will set
-    # breakpoints on internal_error() and info_command().
-    # If we then save and set them, they will accumulate.
-    # Possible fixes are to modify GDB so we can tell which 
-    # breakpoints were set from .gdbinit, or modify 
-    # _recreate_bps to record which breakpoints were
-    # set before it was called.  For now, we simply detect the
-    # most common case and fix it.
-    set basename [string tolower [file tail $::gdb_exe_name]]
-    if {[string match "gdb*" $basename] 
-	|| [string match "insight*" $basename]} {
-      set debugging_gdb 1
-    } else {
-      set debugging_gdb 0
-    }
-    
-    foreach bp_num [gdb_get_breakpoint_list] {
-      lassign [gdb_get_breakpoint_info $bp_num] file function line_number \
-	address type enabled disposition ignore_count command_list \
-	condition thread hit_count user_specification
-
-      # These breakpoints are set when debugging GDB with itself.
-      # Ignore them so they don't accumulate. They get set again
-      # by .gdbinit anyway. 
-      if {$debugging_gdb} {
-	if {$function == "internal_error" || $function == "info_command"} {
-	  continue
-	}
-      }
-      
-      switch -glob -- $type {
-	"breakpoint" -
-	"hw breakpoint" {
-	  if {$disposition == "delete"} {
-	    set cmd tbreak
-	  } else {
-	    set cmd break
-	  }
-
-	  append cmd " "
-	  if {$user_specification != ""} {
-	    append cmd "$user_specification"
-	  } elseif {$file != ""} {
-	    # BpWin::bp_store uses file tail here, but I think that is
-	    # wrong.
-	    append cmd "$file:$line_number"
-	  } else {
-	    append cmd "*$address"
-	  }
-	}
-	"watchpoint" -
-	"hw watchpoint" {
-	  set cmd watch
-	  if {$user_specification != ""} {
-	    append cmd " $user_specification"
-	  } else {
-	    # There's nothing sensible to do.
-	    continue
-	  }
-	}
-
-	"catch*" {
-	  # FIXME: Don't know what to do.
-	  continue
-	}
-
-	default {
-	  # Can't serialize anything other than those listed above.
-	  continue
-	}
-      }
-
-      lappend result [list $cmd $enabled $condition $command_list]
-    }
-    
-    return $result
-  }
-
-  # An internal function used when loading sessions.  It takes a
-  # breakpoint string and recreates all the breakpoints.
-  proc _recreate_bps {specs} {  
-    foreach spec $specs {
-      lassign $spec create enabled condition commands
-
-      # Create the breakpoint
-      if {[catch {gdb_cmd $create} txt]} {
-	dbug W $txt
-      }
-
-      # Below we use `\$bpnum'.  This means we don't have to figure out
-      # the number of the breakpoint when doing further manipulations.
-
-      if {! $enabled} {
-	gdb_cmd "disable \$bpnum"
-      }
-
-      if {$condition != ""} {
-	gdb_cmd "cond \$bpnum $condition"
-      }
-
-      if {[llength $commands]} {
-	lappend commands end
-	eval gdb_run_readline_command_no_output [list "commands \$bpnum"] \
-	  $commands
-      }
-    }
-  }
-
-  #
-  # This procedure decides what makes up a gdb `session'.  Roughly a
-  # session is whatever the user found useful when debugging a certain
-  # executable.
-  #
-  # Eventually we should expand this procedure to know how to save
-  # window placement and contents.  That requires more work.
-  #
-  proc save {} {
-    global gdb_exe_name gdb_target_name
-    global gdb_current_directory gdb_source_path
-
-    # gdb sessions are named after the executable.
-    set name [_exe_name $gdb_exe_name]
-    set key gdb/session/$name
-
-    # We fill a hash and then use that to set the actual preferences.
-
-    # Always set the exe. name in case we later decide to change the
-    # interpretation of the session key.  Use the full path to the
-    # executable.
-    set values(executable) $name
-
-    # Some simple state the user wants.
-    set values(args) [gdb_get_inferior_args]
-    set values(dirs) $gdb_source_path
-    set values(pwd) $gdb_current_directory
-    set values(target) $gdb_target_name
-    set values(target_cmd) $::gdb_target_cmd
-
-    # these prefs need to be made session-dependent
-    set values(run_attach) [pref get gdb/src/run_attach]
-    set values(run_load) [pref get gdb/src/run_load]
-    set values(run_run) [pref get gdb/src/run_run]
-    set values(run_cont) [pref get gdb/src/run_cont]
-    
-    # Breakpoints.
-    set values(breakpoints) [_serialize_bps]
-
-    # Recompute list of recent sessions.  Trim to no more than 5 sessions.
-    set recent [concat [list $name] \
-		  [lremove [pref getd gdb/recent-projects] $name]]
-    if {[llength $recent] > 5} then {
-      set recent [lreplace $recent 5 end]
-    }
-    pref setd gdb/recent-projects $recent
-
-    foreach k [array names values] {
-      pref setd $key/$k $values($k)
-    }
-    pref setd $key/all-keys [array names values]
-  }
-
-  #
-  # Load a session saved with Session::save.  NAME is the pretty name of
-  # the session, as returned by Session::list_names.
-  #
-  proc load {name} {
-    # gdb sessions are named after the executable.
-    set key gdb/session/$name
-
-    # Fetch all keys for this session into an array.
-    foreach k [pref getd $key/all-keys] {
-      set values($k) [pref getd $key/$k]
-    }
-
-    if {[info exists values(executable)]} {
-      gdb_clear_file
-      set_exe_name $values(executable)
-      set_exe
-    }
-  }
-
-  #
-  # This is called from file_changed_hook.  It does all the work of
-  # loading a session, if one exists with the same name as the current
-  # executable.
-  #
-  proc notice_file_change {} {
-    global gdb_exe_name gdb_target_name
-
-    debug "noticed file change event for $gdb_exe_name"
-
-    # gdb sessions are named after the executable.
-    set name [_exe_name $gdb_exe_name]
-    set key gdb/session/$name
-
-    # Fetch all keys for this session into an array.
-    foreach k [pref getd $key/all-keys] {
-      set values($k) [pref getd $key/$k]
-    }
-
-    # reset these back to their defaults
-    pref set gdb/src/run_attach          0
-    pref set gdb/src/run_load            0
-    pref set gdb/src/run_run             1
-    pref set gdb/src/run_cont            0
-
-    if {! [info exists values(executable)] || $values(executable) != $name} {
-      # No such session.
-      return
-    }
-
-    debug "reloading session for $gdb_exe_name"
-
-    if {[info exists values(dirs)]} {
-      # FIXME: short-circuit confirmation.
-      gdb_cmd "directory"
-      gdb_cmd "directory $values(dirs)"
-    }
-
-    if {[info exists values(pwd)]} {
-      catch {gdb_cmd "cd $values(pwd)"}
-    }
-
-    if {[info exists values(args)]} {
-      gdb_set_inferior_args $values(args)
-    }
-
-    if {[info exists values(breakpoints)]} {
-      _recreate_bps $values(breakpoints)
-    }
-
-    if {[info exists values(target)]} {
-      debug "Restoring Target: $values(target)"
-      set gdb_target_name $values(target)
-      debug "Restoring Target_Cmd: $values(target_cmd)"
-      set ::gdb_target_cmd $values(target_cmd)
-      set_baud
-    }
-    
-    if {[info exists values(run_attach)]} {
-      pref set gdb/src/run_attach $values(run_attach)
-      pref set gdb/src/run_load $values(run_load)
-      pref set gdb/src/run_run $values(run_run)
-      pref set gdb/src/run_cont $values(run_cont)
-    } 
-  }
-
-  #
-  # Delete a session.  NAME is the internal name of the session.
-  #
-  proc delete {name} {
-    # FIXME: we can't yet fully define this because the libgui
-    # preference code doesn't supply a delete method.
-    set recent [lremove [pref getd gdb/recent-projects] $name]
-    pref setd gdb/recent-projects $recent
-  }
-
-  #
-  # Return a list of all known sessions.  This returns the `pretty name'
-  # of the session -- something suitable for a menu.
-  #
-  proc list_names {} {
-    set newlist {}
-    set result {}
-    foreach name [pref getd gdb/recent-projects] {
-      set exe [pref getd gdb/session/$name/executable]
-      # Take this opportunity to prune the list.
-      if {[file exists $exe]} then {
-	lappend newlist $name
-	lappend result $exe
-      } else {
-	# FIXME: if we could delete keys we would delete all keys
-	# associated with NAME now.
-      }
-    }
-    pref setd gdb/recent-projects $newlist
-    return $result
-  }
-}
diff --git a/gdb/gdbtk/library/srcbar.itcl b/gdb/gdbtk/library/srcbar.itcl
deleted file mode 100644
index 71ae814764f..00000000000
--- a/gdb/gdbtk/library/srcbar.itcl
+++ /dev/null
@@ -1,1206 +0,0 @@
-# SrcBar
-# Copyright 2001, 2002 Red Hat, Inc.
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License (GPL) 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.
-
-# ----------------------------------------------------------------------
-# Implements a menu and a toolbar that are attached to a source window.
-#
-#   PUBLIC ATTRIBUTES:
-#
-#
-#   METHODS:
-#
-#     configure ....... used to change public attributes
-#
-#   PRIVATE METHODS
-#
-#   X11 OPTION DATABASE ATTRIBUTES
-#
-#
-# ----------------------------------------------------------------------
-
-itcl::class SrcBar {
-  inherit itk::Widget GDBEventHandler
-
-  # ------------------------------------------------------------------
-  #  CONSTRUCTOR - create widget
-  # ------------------------------------------------------------------
-  constructor {src args} {
-    set source $src
-
-    # Load the images to be used in toolbar buttons
-    _load_images
-    _load_src_images
-
-    # Create a menu widget for the Source Window
-    set Menu [GDBMenuBar $itk_interior.menubar]
-
-    # Fill it with the initial set of entries
-    if {! [create_menu_items]} {
-      destroy $this
-    } else {
-      # We do not pack the menu, but make it the menu of the toplevel window
-      $Menu show
-    }
-
-    # Create a toolbar widget for the Source Window
-    set Tool [GDBToolBar $itk_interior.toolbar]
-
-    # Now create the Source Window initial set of toolbar buttons
-    # First give the necessary info about each button and their position
-    create_buttons
-    # Then effectively create the tollbar widget
-    $Tool show
-
-    # Pack the toolbar
-    pack $Tool -expand 1 -fill both
-
-    # Set the srcbar's initial state
-    enable_ui 2
-
-    eval itk_initialize $args
-    add_hook gdb_no_inferior_hook "$this enable_ui 2"
-    add_hook gdb_trace_find_hook "$this handle_trace_find_hook"
-  }
-
-  # ------------------------------------------------------------------
-  #  DESTRUCTOR - destroy window containing widget
-  # ------------------------------------------------------------------
-  destructor {
-    global GDBSrcBar_state
-
-    unset GDBSrcBar_state($this)
-    remove_hook gdb_no_inferior_hook "$this enable_ui 2"
-    remove_hook gdb_trace_find_hook "$this handle_trace_find_hook"
-
-    #destroy $this
-  }
-
-  # ------------------------------------------------------------------
-  #  NAME:         private method SrcBar::_post
-  #  DESCRIPTION:  Post the given menu
-  #
-  #  ARGUMENTS:
-  #                what  - which menu to post
-  #  RETURNS:      Nothing
-  # ------------------------------------------------------------------
-  private method _post {what} {
-
-    switch $what {
-      file {
-	_update_file_menu
-      }
-    }
-  }
-
-
-  ####################################################################
-  # The next set of functions create the common menu groupings that
-  # are used in gdb menus.
-  # Private.  Used at contruction time.
-  # These were previously at the GDBToolBar...
-  ####################################################################
-
-  # ------------------------------------------------------------------
-  #  METHOD:  create_menu_items - Add some menu items to the menubar.
-  #                               Returns 1 if any items added.
-  # ------------------------------------------------------------------
-  private method create_menu_items {} {
-
-    create_file_menu
-
-    create_run_menu
-
-    create_view_menu
-
-    if {[pref get gdb/control_target]} {
-      create_control_menu
-    }
-
-    if {[pref get gdb/mode]} {
-      create_trace_menu
-    }
-
-    create_plugin_menu
-
-    create_pref_menu
-    
-    create_help_menu
-
-    return 1
-  }
-
-  # ------------------------------------------------------------------
-  #  PRIVATE METHOD:  _update_file_menu - update the file menu
-  #                    Used really only to update the session list.
-  # ------------------------------------------------------------------
-  private method _update_file_menu {} {
-    global enable_external_editor tcl_platform gdb_exe_name
-
-    # Clear the File menu
-    $Menu clear file
-
-    if {[info exists enable_external_editor] && $enable_external_editor} {
-      $Menu add command None "Edit Source" \
-	[code $source edit]
-    }
-
-    $Menu add command Other "Open..."  \
-      "_open_file" -underline 0 -accelerator "Ctrl+O"
-
-    if {$gdb_exe_name == ""} {
-      set state disabled
-    } else {
-      set state normal
-    }
-    $Menu add command Other "Close" \
-      "_close_file" -underline 0 -accelerator "Ctrl+W" -state $state
-
-    $Menu add command Other "Source..." \
-      "source_file" -underline 0
-
-    set sessions [Session::list_names]
-    if {[llength $sessions]} {
-      $Menu add separator
-      set i 1
-      foreach item $sessions {
-	$Menu add command Other "$i $item" \
-	  [list Session::load $item] \
-	  -underline 0
-	incr i
-      }
-    }
-
-    $Menu add separator
-
-    if {$tcl_platform(platform) == "windows"} {
-      $Menu add command None "Page Setup..." \
-	[format {
-	  set top %s
-	  ide_winprint page_setup -parent $top
-	} [winfo toplevel [namespace tail $this]]] \
-	-underline 8
-    }
-
-    $Menu add command None "Print Source..." \
-      [code $source print] \
-      -underline 0 -accelerator "Ctrl+P"
-
-    $Menu add separator
-
-    $Menu add command Other "Target Settings..." \
-      "set_target_name" -underline 0
-
-    $Menu add separator
-
-    $Menu add command None "Exit" gdbtk_quit -underline 1
-  }
-
-  # ------------------------------------------------------------------
-  #  METHOD:  create_file_menu - Creates the standard file menu. 
-  # ------------------------------------------------------------------
-  
-  private method create_file_menu {} {
-
-    $Menu add menubutton file "File" 0 -postcommand [code $this _post file]
-    _update_file_menu
-  }
-
-  # ------------------------------------------------------------------
-  #  METHOD:  create_run_menu - Creates the standard run menu, 
-  #  or reconfigures it if it already exists.
-  # ------------------------------------------------------------------
-  
-  private method create_run_menu {} {
-
-    if {![$Menu exists Run]} {
-      set run_menu [$Menu add menubutton run "Run" 0]
-    } else {
-      set run_menu [$Menu clear Run]
-    }
-    
-    set is_native [TargetSelection::native_debugging]
-
-    # If we are on a Unix target, put in the attach options.  "ps" doesn't
-    # give me the Windows PID yet, and the attach also seems flakey, so 
-    # I will hold off on the Windows implementation for now.
-
-    if {$is_native} {
-      if {[string compare $::tcl_platform(platform) windows] != 0} {
-	$Menu add command Attach "Attach to process" \
-	  [code $this do_attach $run_menu] \
-	  -underline 0 -accelerator "Ctrl+A"
-      }
-    } else {
-      $Menu add command Other "Connect to target" \
-	"$this do_connect $run_menu" -underline 0
-    }
-
-    if {[pref get gdb/control_target]} {
-      if {!$is_native} {
-	$Menu add command Other "Download" Download::download_it \
-	  -underline 0 -accelerator "Ctrl+D"
-      }
-      $Menu add command Other "Run" [code $source inferior run] \
-        -underline 0 -accelerator R
-    }
-
-    if {$is_native} {
-      if {[string compare $::tcl_platform(platform) windows] != 0} {
-	$Menu add command Detach "Detach" \
-          [code $this do_detach $run_menu] \
-	  -underline 0 -state disabled
-      }
-    } else {
-      $Menu add command Other "Disconnect"  \
-	[code $this do_disconnect $run_menu] -underline 0 -state disabled
-    }
-
-    if {$is_native} {
-      $Menu add separator
-      $Menu add command Control "Kill" \
-        [code $this do_kill $run_menu] \
-	-underline 0 -state disabled
-    }
-
-    if { [pref get gdb/mode] } {
-      $Menu add separator 
-
-      $Menu add command Other "Start collection" "$this do_tstop" \
-	-underline 0 -accelerator "Ctrl+B"
-         
-      $Menu add command Other "Stop collection" "$this do_tstop" \
-	-underline 0  -accelerator "Ctrl+E" -state disabled
-    }
-  }
-
-  # ------------------------------------------------------------------
-  #  METHOD:  create_view_menu - Creates the standard view menu
-  # ------------------------------------------------------------------
-  
-  private method create_view_menu {} {
-
-    $Menu add menubutton view "View" 0
-
-    $Menu add command Other "Stack" {ManagedWin::open StackWin} \
-      -underline 0 -accelerator "Ctrl+S" 
-      
-    $Menu add command Other "Registers" {ManagedWin::open RegWin} \
-      -underline 0 -accelerator "Ctrl+R" 
-      
-    $Menu add command Other "Memory" {ManagedWin::open MemWin} \
-      -underline 0 -accelerator "Ctrl+M" 
-      
-    $Menu add command Other "Watch Expressions" \
-      {ManagedWin::open WatchWin} \
-      -underline 0 -accelerator "Ctrl+T" 
-    $Menu add command Other "Local Variables" \
-      {ManagedWin::open LocalsWin} \
-      -underline 0 -accelerator "Ctrl+L" 
-
-    if {[pref get gdb/control_target]} {
-      $Menu add command Other "Breakpoints" \
-	{ManagedWin::open BpWin -tracepoints 0} \
-	-underline 0 -accelerator "Ctrl+B" 
-    }
-
-    if {[pref get gdb/mode]} {
-      $Menu add command Other "Tracepoints" \
-        {ManagedWin::open BpWin -tracepoints 1} \
-	-underline 0 -accelerator "Ctrl+T"
-      $Menu add command Other "Tdump" {ManagedWin::open TdumpWin} \
-	-underline 2 -accelerator "Ctrl+U"
-    }
-
-    $Menu add command Other "Console" {ManagedWin::open Console} \
-      -underline 2 -accelerator "Ctrl+N" 
-      
-    $Menu add command Other "Function Browser" \
-      {ManagedWin::open BrowserWin} \
-      -underline 1 -accelerator "Ctrl+F" 
-    $Menu add command Other "Thread List" \
-      {ManagedWin::open ProcessWin} \
-      -underline 0 -accelerator "Ctrl+H"
-    if {[info exists ::env(GDBTK_DEBUG)] && $::env(GDBTK_DEBUG)} {
-      $Menu add separator
-      $Menu add command Other "Debug Window" \
-        {ManagedWin::open DebugWin} \
-	-underline 3 -accelerator "Ctrl+U"
-    }
-  }
-
-  # ------------------------------------------------------------------
-  #  METHOD:  create_control_menu - Creates the standard control menu
-  # ------------------------------------------------------------------
-  
-  private method create_control_menu {} {
-
-    $Menu add menubutton cntrl "Control" 0
-    
-    $Menu add command Control "Step" [code $source inferior step] \
-      -underline 0 -accelerator S
-    
-    $Menu add command Control "Next" [code $source inferior next] \
-      -underline 0 -accelerator N
-    
-    $Menu add command Control "Finish" \
-      [code $source inferior finish] \
-      -underline 0 -accelerator F
-    
-    $Menu add command Control "Continue" \
-      [code $source inferior continue] \
-      -underline 0 -accelerator C
-    
-    $Menu add separator
-    $Menu add command Control "Step Asm Inst" \
-      [code $source inferior stepi] \
-      -underline 1 -accelerator S
-    
-    $Menu add command Control "Next Asm Inst" \
-      [code $source inferior nexti] \
-      -underline 1 -accelerator N
-    
-    # $Menu add separator
-    # $Menu add command Other "Automatic Step" auto_step
-  }
-
-  # ------------------------------------------------------------------
-  #  METHOD:  create_trace_menu - Creates the standard trace menu
-  # ------------------------------------------------------------------
-  
-  private method create_trace_menu {} {
-
-    $Menu add menubutton trace "Trace" 0
-    
-    $Menu add command Other "Save Trace Commands..." \
-      "save_trace_commands" \
-      -underline 0
-
-    $Menu add separator
-
-    $Menu add command Trace "Next Hit" {tfind_cmd tfind} \
-      -underline 0 -accelerator N
-    
-    $Menu add command Trace "Previous Hit" {tfind_cmd "tfind -"} \
-      -underline 0 -accelerator P
-    
-    $Menu add command Trace "First Hit" {tfind_cmd "tfind start"} \
-      -underline 0 -accelerator F
-    
-    $Menu add command Trace "Next Line Hit" \
-      {tfind_cmd "tfind line"} \
-      -underline 5 -accelerator L
-    
-    $Menu add command Trace "Next Hit Here" \
-      {tfind_cmd "tfind tracepoint"} \
-      -underline 9 -accelerator H
-    
-    $Menu add separator
-    $Menu add command Trace "Tfind Line..." \
-      "ManagedWin::open TfindArgs -Type LN" \
-      -underline 9 -accelerator E
-    
-    $Menu add command Trace "Tfind PC..." \
-      "ManagedWin::open TfindArgs -Type PC" \
-      -underline 7 -accelerator C
-    
-    $Menu add command Trace "Tfind Tracepoint..." \
-      "ManagedWin::open TfindArgs -Type TP" \
-      -underline 6 -accelerator T
-
-    $Menu add command Trace "Tfind Frame..." \
-      "ManagedWin::open TfindArgs -Type FR" \
-      -underline 6 -accelerator F
-  }
-
-  # ------------------------------------------------------------------
-  #  METHOD:  create_plugin_menu - Creates the optional plugin menu
-  # ------------------------------------------------------------------  
-  private method create_plugin_menu {} {
-    global gdb_plugins
-
-    $Menu add menubutton plugin "PlugIn" 4
-    set plugins_available 0
-    foreach plugin_dir $gdb_plugins {
-      if {[catch {source [file join $plugin_dir plugins.tcl]} txt]} {
-	dbug E $txt
-      }
-    }
-
-    if {! $plugins_available} {
-      # No plugins are available for this configuration,
-      # so remove the menu
-      debug "No plugins configured, go remove the PlugIn menu..."
-      $Menu delete plugin
-    }
-  }
-
-  # ------------------------------------------------------------------
-  #  METHOD:  create_pref_menu - Creates the standard preferences menu
-  # ------------------------------------------------------------------  
-  private method create_pref_menu {} {
-
-    $Menu add menubutton pref "Preferences" 0
-    
-    $Menu add command Other "Global..." \
-      "ManagedWin::open GlobalPref -transient" -underline 0
-    
-    $Menu add command Other "Source..." \
-      "ManagedWin::open SrcPref -transient" -underline 0
-  }
-
-  # ------------------------------------------------------------------
-  #  METHOD:  create_help_menu - Creates the standard help menu
-  # ------------------------------------------------------------------  
-  private method create_help_menu {} {
-    # KDE and GNOME like the help menu to be the last item in the menubar.
-    # The default Unix behavior is to be at the far right of the menubar.
-    set os [pref get gdb/compat]
-    if {$os == "KDE" || $os == "GNOME"} {
-      set helpmenu "_help"
-    } else {
-      set helpmenu "help"
-    }
-    $Menu add menubutton $helpmenu "Help" 0
-    $Menu add command Other "Help Topics" {open_help index.html} \
-      -underline 0
-    $Menu add separator
-    $Menu add command Other "About GDB..." \
-      {ManagedWin::open About -transient} \
-      -underline 0
-  }
-
-  ####################################################################
-  # The next set of functions are the generic button groups that gdb uses.
-  # Private.  Used at contruction time.
-  # These were previously at the GDBToolBar...
-  ####################################################################
-  
-  # ------------------------------------------------------------------
-  #  METHOD:  create_buttons - Add some buttons to the toolbar.
-  #                         Returns list of buttons in form acceptable
-  #                         to standard_toolbar.
-  # ------------------------------------------------------------------
-  private  method create_buttons {} {
-    global enable_external_editor
-
-    $Tool add button stop None {} {}
-    _set_runstop
-
-    if {[pref get gdb/mode]} {
-      $Tool add button tstop Control \
-                         [list $this do_tstop] "Start Collection" \
-	                 -image Movie_on_img
-
-      $Tool add button view Other [list $this set_control_mode 1] \
-	                 "Switch to Browse Mode" -image watch_movie_img
-
-      $Tool add separator
-
-    }
-
-    if {[pref get gdb/control_target]} {
-      create_control_buttons
-      if {[pref get gdb/mode]} {
-	create_trace_buttons 0
-      }
-    } elseif {[get pref gdb/mode]} {
-
-      #
-      # If we don't control the target, then we might as well
-      # put a copy of the trace controls on the source window.
-      #
-      create_trace_buttons 1
-   }
-
-    $Tool add separator
-
-    create_window_buttons
-
-    # Random bits of obscurity...
-    $Tool itembind reg   <Button-3> "ManagedWin::open RegWin -force"
-    $Tool itembind mem   <Button-3> "ManagedWin::open MemWin -force"
-    $Tool itembind watch <Button-3> \
-      "ManagedWin::open WatchWin -force"
-    $Tool itembind vars  <Button-3> \
-      "ManagedWin::open LocalsWin -force"
-
-    $Tool add separator
-
-    if {[info exists enable_external_editor] && $enable_external_editor} {
-      $Tool add button edit Other [code $source edit] "Edit Source" \
-	                      -image edit_img
-
-      $Tool add separator
-    }
-
-    # Add find in file entry box.
-    $Tool add label findlabel "Find:" "" -anchor e -font global/fixed
-    $Tool add custom searchbox entry "Search in editor" \
-       -bd 3 -font global/fixed -width 10
-
-    set callback [code $source search]
-    $Tool itembind searchbox <Return> \
-	    "$callback forwards \[eval %W get\]"
-    $Tool itembind searchbox <Shift-Return> \
-            "$callback backwards \[eval %W get\]"
-
-    $Tool add separator
-
-    $Tool toolbar_button_right_justify
-
-    create_stack_buttons
-
-    # This feature has been disabled for now.
-    # checkbutton $ButtonFrame.upd -command "$this _toggle_updates" \
-    #   -variable GDBSrcBar_state($this)
-    # lappend button_list $ButtonFrame.upd
-    # global GDBSrcBar_state
-    # ::set GDBSrcBar_state($this) $updatevalue
-    # balloon register $ButtonFrame.upd "Toggle Window Updates"
-  }
-
-  # ------------------------------------------------------------------
-  #  METHOD:  create_control_buttons - Creates the step, continue, etc buttons.
-  # ------------------------------------------------------------------
-  
-  private method create_control_buttons {} {
-    $Tool add button step Control [code $source inferior step] \
-      "Step (S)" -image step_img
-    
-    $Tool add button next Control [code $source inferior next] \
-      "Next (N)" -image next_img
-    
-    $Tool add button finish Control [code $source inferior finish] \
-      "Finish (F)" -image finish_img
-    
-    $Tool add button continue Control [code $source inferior continue] \
-      "Continue (C)" -image continue_img
-    
-    # A spacer before the assembly-level items looks good.  It helps
-    # to indicate that these are somehow different.
-    $Tool add separator
-    
-    $Tool add button stepi Control [code $source inferior stepi] \
-      "Step Asm Inst (S)" -image stepi_img
-    
-    $Tool add button nexti Control [code $source inferior nexti] \
-      "Next Asm Inst (N)" -image nexti_img
-    
-    _set_stepi
-
-    set Run_control_buttons {step next finish continue -stepi nexti}
-    
-  }
-
-  # ------------------------------------------------------------------
-  #  METHOD:  create_trace_buttons - Creates the next hit, etc.
-  # ------------------------------------------------------------------
-  
-  private method create_trace_buttons {{show 0}} {
-
-    if {$show} {
-      set command "add button"
-    } else {
-      set command "create"
-    }
-
-    $Tool $command tfindstart Trace {tfind_cmd "tfind start"} "First Hit <F>" \
-      -image rewind_img
-    
-    $Tool $command tfind Trace {tfind_cmd tfind} "Next Hit <N>" -image next_hit_img
-    
-    $Tool $command tfindprev Trace {tfind_cmd "tfind -"} "Previous Hit <P>" \
-      -image prev_hit_img
-    
-    $Tool $command tfindline Trace {tfind_cmd "tfind line"} "Next Line Hit <L>" \
-      -image next_line_img
-    
-    $Tool $command tfindtp Trace { tfind_cmd "tfind tracepoint"} \
-      "Next Hit Here <H>" -image next_check_img
-
-    set Trace_control_buttons {tfindstart tfind tfindprev tfindline tfindtp}
-  }
-
-  # ------------------------------------------------------------------
-  #  METHOD:  create_window_buttons - Creates the registers, etc, buttons
-  # ------------------------------------------------------------------
-  
-  private method create_window_buttons {} {
-    $Tool add button reg Other {ManagedWin::open RegWin} \
-                           "Registers (Ctrl+R)" -image reg_img
-
-    $Tool add button mem Other {ManagedWin::open MemWin} \
-                           "Memory (Ctrl+M)" -image memory_img
-
-    $Tool add button stack Other {ManagedWin::open StackWin} \
-                             "Stack (Ctrl+S)" -image stack_img
-
-    $Tool add button watch Other {ManagedWin::open WatchWin} \
-                             "Watch Expressions (Ctrl+W)" -image watch_img
-
-    $Tool add button vars Other {ManagedWin::open LocalsWin} \
-                            "Local Variables (Ctrl+L)" -image vars_img
-
-    if {[pref get gdb/control_target]} {
-      $Tool add button bp Other {ManagedWin::open BpWin} \
-                            "Breakpoints (Ctrl+B)" -image bp_img
-    }
-
-    if {[pref get gdb/mode]} {
-      $Tool add button tp Other \
-        {ManagedWin::open BpWin -tracepoints 1} \
-	"Tracepoints (Ctrl+T)" -image tp_img
-      
-      $Tool add button tdump Trace {ManagedWin::open TdumpWin} \
-                               "Tdump (Ctrl+D)" -image tdump_img
-    }
-
-    $Tool add button con Other {ManagedWin::open Console} \
-                           "Console (Ctrl+N)" -image console_img
-  }
-
-  # ------------------------------------------------------------------
-  #  METHOD:  create_stack_buttons - Creates the up down bottom stack buttons
-  # ------------------------------------------------------------------
-  
-  private method create_stack_buttons {} {
-
-    $Tool add button down {Trace Control} \
-      [code $source stack down] \
-      "Down Stack Frame" -image down_img
-
-    $Tool add button up {Trace Control} \
-      [code $source stack up] \
-      "Up Stack Frame" -image up_img
-
-    $Tool add button bottom {Trace Control} \
-      [code $source stack bottom] \
-      "Go to Bottom of Stack" -image bottom_img
-
-  }
-
-  ####################################################################
-  #
-  # Auxiliary methods used by the toolbar
-  # 
-  ####################################################################
-
-  # ------------------------------------------------------------------
-  #  METHOD:  _load_images - Load standard images.  Private method.
-  # ------------------------------------------------------------------
-  public method _load_images { {reconfig 0} } {
-    global gdb_ImageDir
-    if {!$reconfig && $_loaded_images} {
-      return
-    }
-    set _loaded_images 1
-
-    lappend imgs console reg stack vars watch memory bp
-    foreach name $imgs {
-      image create photo ${name}_img -file [file join $gdb_ImageDir ${name}.gif]
-    }
-  }
-
-  # ------------------------------------------------------------------
-  #  METHOD:  _load_src_images - Load standard images.  Private method.
-  # ------------------------------------------------------------------
-  method _load_src_images { {reconf 0} } {
-    global gdb_ImageDir
-
-    if {!$reconf && $_loaded_src_images} {
-      return
-    }
-    set _loaded_src_images 1
-
-    foreach name {run stop step next finish continue edit \
-		    stepi nexti up down bottom Movie_on Movie_off \
-		    next_line next_check next_hit rewind prev_hit \
-		  watch_movie run_expt tdump tp} {
-      image create photo ${name}_img -file [file join $gdb_ImageDir ${name}.gif]
-    }
-  }
-
-  # ------------------------------------------------------------------
-  #  METHOD:  _set_runstop - Set state of run/stop button.
-  #
-  #  busy        - Run button becomes disabled
-  #  running     - Stop button appears, allowing user to stop executing target
-  #  downloading - Stop button appears, allowing user to interrupt downloading
-  #  normal      - Run button appears, allowing user to run/re-run exe
-  # ------------------------------------------------------------------
-  public method _set_runstop {} {
-    dbug I $runstop
-
-    switch $runstop {
-      busy {
-	$Tool itemconfigure stop -state disabled
-      }
-      downloading {
-	$Tool itemconfigure stop -state normal -image stop_img \
-	  -command [code $this cancel_download]
-	$Tool itemballoon stop "Stop"
-      }
-      running {
-	$Tool itemconfigure stop -state normal -image stop_img \
-	  -command [code $source inferior stop]
-	$Tool itemballoon stop "Stop"
-      }
-      normal {
-	$Tool itemconfigure stop -state normal -image run_img \
-	  -command [code $source inferior run]
-	$Tool itemballoon stop "Run (R)"
-      }
-      default {
-	dbug W "unknown state $runstop"
-      }
-    }
-  }
-
-
-  # ------------------------------------------------------------------
-  #  METHOD:  _set_stepi - Set state of stepi/nexti buttons.
-  # ------------------------------------------------------------------
-  public method _set_stepi {} {
-    
-    # Only do this in synchronous mode
-    if {!$Tracing} {
-      # In source-only mode, disable these buttons.  Otherwise, enable
-      # them.
-      if {$displaymode == "SOURCE"} {
-	set state disabled
-      } else {
-	set state normal
-      }
-      $Tool itemconfigure stepi -state $state
-      $Tool itemconfigure nexti -state $state
-    }
-  }
-
-
-  ####################################################################
-  #
-  # State control methods used by both the menu and the toolbar
-  # 
-  ####################################################################
-
-  # ------------------------------------------------------------------
-  #  METHOD:  handle_trace_find_hook - response to the tfind command.
-  #             If the command puts us in a new mode, then switch modes...
-  # ------------------------------------------------------------------
-  method handle_trace_find_hook {mode from_tty} {
-    debug "mode: $mode, from_tty: $from_tty, Browsing: $Browsing"
-    if {[string compare $mode -1] == 0} {
-      if {$Browsing} {
-	set_control_mode 0
-      }
-    } else {
-      if {!$Browsing} {
-	set_control_mode 1
-      }
-    }
-  }
-
-  # ------------------------------------------------------------------
-  #  METHOD:  set_control_mode - sets up the srcbar for browsing 
-  #  a trace experiment.
-  #   mode: 1 => browse mode
-  #         0 => control mode
-  # ------------------------------------------------------------------
-  method set_control_mode  {mode} {
-    debug "set_control_mode called with mode $mode"
-    if {$mode} {
-      set Browsing 1
-      $Tool itemconfigure view -image run_expt_img \
-                            -command "$this set_control_mode 0"
-      $Tool itemballoon view "Switch to Control mode"
-      # Now swap out the buttons...
-      $Tool toolbar_swap_button_lists $Trace_control_buttons \
-                                      $Run_control_buttons
-      enable_ui 1
-    } else {
-      if {$Browsing} {
-	tfind_cmd {tfind none}
-      }
-      set Browsing 0
-      $Tool itemconfigure view -image watch_movie_img \
-                            -command "$this set_control_mode 1"
-      $Tool itemballoon view "Switch to Browse mode"
-      # Now swap out the buttons...
-      $Tool toolbar_swap_button_lists $Run_control_buttons \
-                                      $Trace_control_buttons
-      enable_ui 1
-    }
-  }
-
-  # ------------------------------------------------------------------
-  #  METHOD:  reconfig - reconfigure the srcbar
-  #                      used when preferences change
-  # ------------------------------------------------------------------
-  public method reconfig {} {
-    debug
-    _load_src_images 1
-    _load_images 1
-    # FIXME: Must Check if we are Tracing and set the buttons accordingly.
-  }
-
-  # ------------------------------------------------------------------
-  #  METHOD:  set_variable - run when user enters a `set' command.
-  #
-  #  FIXME: Should not be accessing the base class internal data
-  #         As the spec says, one must clear the menu and recreate it.
-  # ------------------------------------------------------------------  
-  public method set_variable {event} {
-    set varname [$event get variable]
-    set value   [$event get value]
-    debug "Got $varname = $value"
-
-    if {$varname == "os"} {
-      # Make current_menu pointer point to the View Menu.
-      # FIXME: Should not be accessing the base class internal data directly
-      set view_menu [menu_find View]
-      # Restore the current_menu pointer.
-      set save_menu [$Menu menubar_set_current_menu $view_menu]
-      set title "Kernel Objects"
-
-      # Look for the KOD menu entry...
-      if {[catch {$view_menu index $title} index]} {
-	set index none
-      }
-
-      # FIXME: This assumes that the KOD menu is the last one as it does not
-      # adjust the index information kept by the GDBMenuBar class.
-      if {$value == ""} {
-	# No OS, so remove KOD from View menu.
-	if {$index != "none"} {
-          # FIXME: Should not be accessing the base class internal data
-	  $view_menu delete $index
-	}
-      } else {
-	# Add KOD to View menu, but only if it isn't already there.
-	if {$index == "none"} {
-	  $Menu add command Other $title \
-            {ManagedWin::open KodWin} \
-	    -underline 0 -accelerator "Ctrl+K"
-	}
-      }
-
-      # Restore the current_menu pointer.
-      $Menu menubar_set_current_menu $save_menu
-
-      global gdb_kod_cmd
-      set gdb_kod_cmd $value
-    }
-  }
-
-  ####################################################################
-  # The following method enables/disables both menus and buttons.
-  ####################################################################
-
-  # ------------------------------------------------------------------
-  # METHOD:  enable_ui - enable/disable the appropriate buttons and menus
-  # Called from the busy, idle, and no_inferior hooks.
-  #
-  # on must be:
-  # value      Control    Other    Trace    State
-  #   0          off       off      off     gdb is busy
-  #   1          on        on       off     gdb has inferior, and is idle
-  #   2          off       on       off     gdb has no inferior, and is idle
-  # ------------------------------------------------------------------
-  public method enable_ui {on} {
-    global tcl_platform
-    debug "$on - Browsing=$Browsing"
-
-    # Do the enabling so that all the disabling happens first, this way if a
-    # button belongs to two groups, enabling takes precedence, which is
-    #  probably right.
-
-    switch $on {
-      0 {
-        # Busy
-	set enable_list {Control disabled \
-			   Other disabled \
-			   Trace disabled \
-			   Attach disabled \
-			   Detach disabled}
-      }
-      1 {
-        # Idle, with inferior
-	if {!$Browsing} {
-	  set enable_list {Trace disabled \
-			     Control normal \
-			     Other normal \
-			     Attach disabled \
-			     Detach normal }
-	  # set the states of stepi and nexti correctly
-	  _set_stepi
-	} else {
-	  set enable_list {Control disabled Other normal Trace normal}
-	}
-
-      }
-      2 {
-        # Idle, no inferior
-	set enable_list {Control disabled \
-			   Trace disabled \
-			   Other normal \
-			   Attach normal \
-			   Detach disabled }
-      }
-      default {
-	debug "Unknown type: $on in enable_ui"
-	return
-      }
-    }
-
-    $Menu set_class_state $enable_list
-    $Tool set_class_state $enable_list
-  }
-
-  ####################################################################
-  #
-  # Execute actions corresponding to menu events
-  # 
-  ####################################################################
-
-  # ------------------------------------------------------------------
-  # METHOD:  do_attach: attach to a running target
-  # ------------------------------------------------------------------
-  method do_attach {menu} {
-      gdbtk_attach_native
-  }
-
-  # ------------------------------------------------------------------
-  # METHOD:  do_detach: detach from a running target
-  # ------------------------------------------------------------------
-  method do_detach {menu} {
-    gdbtk_disconnect
-    gdbtk_idle
-  }
-
-  # ------------------------------------------------------------------
-  # METHOD:  do_kill: kill the current target
-  # ------------------------------------------------------------------
-  method do_kill {menu} {
-    gdb_cmd "kill"
-    run_hooks gdb_no_inferior_hook
-  }
-  
-  # ------------------------------------------------------------------
-  # METHOD:  do_connect: connect to a remote target 
-  #                      in asynch mode if async is 1
-  # ------------------------------------------------------------------
-  method do_connect {menu {async 0}} {
-
-    set successful [gdbtk_connect $async]
-
-    if {$successful} {
-      $menu entryconfigure "Connect to target" -state disabled
-      $menu entryconfigure "Disconnect" -state normal
-    } else {
-      $menu entryconfigure "Connect to target" -state normal
-      $menu entryconfigure "Disconnect" -state disabled
-    }
-
-    # Make the menu reflect this change
-    ::update idletasks
-  }
-
-  # ------------------------------------------------------------------
-  # METHOD:  do_disconnect: disconnect from a remote target 
-  #                               in asynch mode if async is 1.   
-  #   
-  # ------------------------------------------------------------------
-  method do_disconnect {menu {async 0}} {
-    debug "$menu $async"
-    #
-    # For now, these are the same, but they might be different...
-    # 
-
-    gdbtk_disconnect $async
-
-    $menu entryconfigure "Connect to target" -state normal
-    $menu entryconfigure "Disconnect" -state disabled
-  }
-
-  ####################################################################
-  #
-  # Execute actions corresponding to toolbar events
-  # 
-  ####################################################################
-
-  # ------------------------------------------------------------------
-  #  METHOD:  _toggle_updates - Run when the update checkbutton is
-  #                             toggled.  Private method.
-  # ------------------------------------------------------------------
-  public method _toggle_updates {} {
-    global GDBSrcBar_state
-    if {$updatecommand != ""} {
-      uplevel \#0 $updatecommand $GDBSrcBar_state($this)
-    }
-  }
-
-  # ------------------------------------------------------------------
-  #  METHOD:  cancel_download
-  # ------------------------------------------------------------------
-  public method cancel_download {} {
-    global download_dialog download_cancel_ok
-
-    if {"$download_dialog" != ""} {
-      $download_dialog cancel
-    } else {
-      set download_cancel_ok 1
-    }
-  }
-
-  ####################################################################
-  #
-  # Execute actions that can be activated by both menu entries and
-  # toolbar buttons
-  # 
-  ####################################################################
-
-  # ------------------------------------------------------------------
-  # METHOD:  do_tstop: Change the GUI state, then do the tstop or
-  #                    tstart command, whichever is appropriate.   
-  #   
-  # ------------------------------------------------------------------
-  method do_tstop {} {
-    debug "do_tstop called... Collecting is $Collecting"
-
-    if {!$Collecting} {
-      #
-      # Start the trace experiment
-      #
-
-      if {$Browsing} {
-	set ret [tk_messageBox -title "Warning" -message \
-"You are currently browsing a trace experiment. 
-This command will clear the results of that experiment.
-Do you want to continue?" \
-		   -icon warning -type okcancel -default ok]
-	if {[string compare $ret cancel] == 0} {
-	  return
-	}
-	set_control_mode 1
-      }
-      if {[tstart]} {
-        # FIXME: Must enable the Stop Collection menu item and
-        # disable the Start Collection item
-        $Tool itemconfigure tstop -image Movie_off_img
-        $Tool itemballoon tstop "End Collection"
-	set Collecting 1
-      } else {
-	tk_messageBox -title Error \
-          -message "Error downloading tracepoint info" \
-	  -icon error -type ok
-      }
-    } else {
-      #
-      # Stop the trace experiment
-      #
-
-      if {[tstop]} {	
-        # FIXME: Must enable the Stop Collection menu item and
-        # disable the Start Collection item
-        $Tool itemconfigure tstop -image Movie_on_img
-        $Tool itemballoon tstop "Start Collection"
-	set Collecting 0
-     }
-    }
-  }
-
-  # ------------------------------------------------------------------
-  #  METHOD:  busy - BusyEvent handler
-  # ------------------------------------------------------------------
-  method busy {event} {
-    enable_ui 0
-  }
-
-  # ------------------------------------------------------------------
-  #  METHOD:  idle - IdleEvent handler
-  # ------------------------------------------------------------------
-  method idle {event} {
-    enable_ui 1
-  }
-
-  ####################################################################
-  #
-  #  PRIVATE DATA
-  #
-  ####################################################################
-
-  # This is a handle on our parent source window.
-  private variable source {}
-
-  # The GdbMenuBar component
-  private variable Menu
-
-  # The GdbToolBar component
-  private variable Tool
-
-  # FIXME - Need to break the images into the sets needed for
-  # each button group, and load them when the button group is
-  # created.
-
-  # This is set if we've already loaded the standard images.
-  private common _loaded_images 0
-
-  # This is set if we've already loaded the standard images.  Private
-  # variable.
-  private common _loaded_src_images 0
-
-  # These buttons go in the control area when we are browsing
-  protected variable Trace_control_buttons 
-
-  # And these go in the control area when we are running
-  protected variable Run_control_buttons
-
-  ####################################################################
-  #
-  #  PUBLIC DATA
-  #
-  ####################################################################
-
-  # This is the command that should be run when the `update'
-  # checkbutton is toggled.  The current value of the checkbutton is
-  # appended to the command.
-  public variable updatecommand {}
-
-  # This controls whether the `update' checkbutton is turned on or
-  # off.
-  public variable updatevalue 0 {
-    global GDBSrcBar_state
-    ::set GDBSrcBar_state($this) $updatevalue
-  }
-
-  # This holds the source window's display mode.  Valid values are
-  # SOURCE, ASSEMBLY, SRC+ASM, and MIXED.
-  public variable displaymode SOURCE {
-    _set_stepi
-  }
-
-  # This indicates what is the inferior state.
-  # Possible values are: {busy running downloading normal}
-  public variable runstop normal {
-    dbug I "configuring runstop $runstop"
-
-    # Set the Run/Stop button accordingly
-    _set_runstop
-  }
-
-  # The next three determine the state of the application when Tracing is enabled.
-
-  public variable Tracing 0     ;# Is tracing enabled for this gdb?
-  public variable Browsing   0  ;# Are we currently browsing a trace experiment?
-  public variable Collecting 0  ;# Are we currently collecting a trace experiment?
-}
diff --git a/gdb/gdbtk/library/srcpref.itb b/gdb/gdbtk/library/srcpref.itb
deleted file mode 100644
index 86d42436d96..00000000000
--- a/gdb/gdbtk/library/srcpref.itb
+++ /dev/null
@@ -1,278 +0,0 @@
-# Source preferences dialog for Insight.
-# Copyright 1998, 1999, 2002, 2003 Red Hat
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License (GPL) 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.
-
-
-# ------------------------------------------------------------------
-#  CONSTRUCTOR - create new source preferences window
-# ------------------------------------------------------------------
-itcl::body SrcPref::constructor {args} {
-  window_name "Source Preferences"
-  _init_var
-  _build_win
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  init_var - initialize preference variables
-# ------------------------------------------------------------------
-itcl::body SrcPref::_init_var {} {
-  set vlist {gdb/src/PC_TAG gdb/src/STACK_TAG gdb/src/BROWSE_TAG
-    gdb/src/run_attach gdb/src/run_load gdb/src/run_run
-    gdb/src/run_cont gdb/src/bp_fg gdb/src/temp_bp_fg 
-    gdb/src/trace_fg gdb/src/thread_fg gdb/src/variableBalloons
-    gdb/src/source2_fg gdb/src/tab_size gdb/mode gdb/editor
-    gdb/B1_behavior}
-
-  foreach var $vlist {
-    set _saved($var) [pref get $var]
-    set _new($var) $_saved($var)
-  }
-}
-
-
-# ------------------------------------------------------------------
-#  METHOD:  build_win - build the dialog
-# ------------------------------------------------------------------
-itcl::body SrcPref::_build_win {} {
-  frame $itk_interior.f
-  frame $itk_interior.f.a
-  frame $itk_interior.f.b
-  set f $itk_interior.f.a
-
-  # Colors frame
-  Labelledframe $f.colors -anchor nw -text {Colors}
-  set w [$f.colors get_frame]
-
-  set color [pref get gdb/src/PC_TAG]
-  label $w.pcl -text {PC}
-  button $w.pcb -text {     } -activebackground $color -bg $color \
-    -command [code $this _pick $color $w.pcb PC_TAG]
-  
-  set color [pref get gdb/src/STACK_TAG]
-  label $w.stl -text {Stack}
-  button $w.stb -text {     } -activebackground $color -bg $color \
-    -command [code $this _pick $color $w.stb STACK_TAG]
-
-  set color [pref get gdb/src/BROWSE_TAG]
-  label $w.brl -text {Browse}
-  button $w.brb -text {     } -activebackground $color -bg $color\
-    -command [code $this _pick $color $w.brb BROWSE_TAG]
-
-  set color [pref get gdb/src/source2_fg]
-  label $w.s2l -text {Mixed Source}
-  button $w.s2b -text {     } -activebackground $color -bg $color \
-    -command [code $this _pick $color $w.s2b source2_fg]
-
-  set color [pref get gdb/src/bp_fg]
-  label $w.nbpl -text {Normal Breakpoint}
-  button $w.nbpb -text {     } -activebackground $color -bg $color\
-    -command [code $this _pick $color $w.nbpb bp_fg]
-  
-  set color [pref get gdb/src/temp_bp_fg]
-  label $w.tbpl -text {Temporary Breakpoint}
-  button $w.tbpb -text {     } -activebackground $color -bg $color \
-    -command [code $this _pick $color $w.tbpb temp_bp_fg]
-  
-  set color [pref get gdb/src/thread_fg]
-  label $w.dbpl -text {Thread Breakpoint}
-  button $w.dbpb -text {     } -activebackground $color -bg $color \
-    -command [code $this _pick $color $w.dbpb thread_fg]
-
-  set color [pref get gdb/src/trace_fg]
-  label $w.tpl -text {Tracepoint}
-  button $w.tpb -text {     } -activebackground $color -bg $color \
-    -command [code $this _pick $color $w.tpb trace_fg]
-
-  grid $w.pcl $w.pcb $w.nbpl $w.nbpb -padx 10 -pady 2 -sticky w
-  grid $w.stl $w.stb $w.tbpl $w.tbpb -padx 10 -pady 2 -sticky w
-  grid $w.brl $w.brb $w.dbpl $w.dbpb -padx 10 -pady 2 -sticky w
-  grid $w.s2l $w.s2b $w.tpl  $w.tpb  -padx 10 -pady 2 -sticky w
-
-  frame $f.rmv
-
-  # Debug Mode frame
-  Labelledframe $f.rmv.mode -anchor nw -text "Mouse Button-1 Behavior"
-  set w [$f.rmv.mode get_frame]
-
-  if {[pref get gdb/mode]} {
-    set state normal
-  } else {
-    pref set gdb/B1_behavior 1
-    set state disabled
-  }
-
-  radiobutton $w.async -text "Set/Clear Tracepoints"  \
-    -variable [scope _new(gdb/B1_behavior)] -value 0 -state $state
-  radiobutton $w.sync  -text "Set/Clear Breakpoints" \
-    -variable [scope _new(gdb/B1_behavior)] -value 1 -state $state
-  
-  pack $w.async $w.sync -side top
-
-  # Variable Balloons
-  Labelledframe $f.rmv.var -anchor nw -text "Variable Balloons"
-  set w [$f.rmv.var get_frame]
-  set var _new(gdb/src/variableBalloons)
-  radiobutton $w.var_on -text "On " -variable [scope $var] -value 1
-  radiobutton $w.var_off -text "Off" -variable [scope $var] -value 0
-  pack $w.var_on $w.var_off -side top
-  grid $f.rmv.mode -sticky nsew -pady 5 -row 0 -column 0
-  grid $f.rmv.var -sticky nsew -pady 5 -row 0 -column 2
-  grid columnconfigure $f.rmv 0 -weight 1
-  grid columnconfigure $f.rmv 1 -minsize 4
-  grid columnconfigure $f.rmv 2 -weight 1
-  grid rowconfigure $f.rmv 0 -weight 1
-
-
-  frame $f.x
-  # Tab size
-  itk_component add size {
-    iwidgets::spinint $f.x.size -labeltext "Tab Size" -range {1 16} \
-      -step 1 -fixed 2 -width 2 -textvariable [scope _new(gdb/src/tab_size)] \
-      -wrap 0 -textbackground $::Colors(textbg)
-  }
-  $f.x.size delete 0 end
-  $f.x.size insert end $_saved(gdb/src/tab_size)
-
-  # Linenumbers
-  # commented out because this option isn't really useful
-#  checkbutton $f.x.linenum -text "Line Numbers" \
-#    -variable [pref varname gdb/src/linenums]
-#  pack $f.x.size $f.x.linenum -side left -padx 5 -pady 5
-  pack $f.x.size -side left -padx 5 -pady 5
-
-  # Disassembly flavor - We tell whether this architecture supports
-  # the flag by checking whether the flag exists.  
-  
-  set have_disassembly_flavor 0
-  set vals [list_disassembly_flavors]
-  if {[llength $vals] != 0} {
-    set have_disassembly_flavor 1
-    frame $f.dis
-    label $f.dis.l -text "Disassembly Flavor: "
-    combobox::combobox $f.dis.combo -maxheight 15 -width 15 \
-      -font global/fixed -editable 0 -command [code $this _set_flavor] \
-      -bg $::Colors(textbg)
-    
-    foreach elem $vals {
-      $f.dis.combo list insert end $elem
-    }
-    
-    set _saved_disassembly_flavor [get_disassembly_flavor]
-    $f.dis.combo entryset $_saved_disassembly_flavor
-    
-    pack $f.dis.l -side left
-    pack $f.dis.combo -side left -padx 4
-    
-  } else {
-    set _saved_disassembly_flavor ""
-  }
-
-  # External editor.
-  frame $f.exted
-  label $f.exted.l -text "External Editor: "
-  entry $f.exted.e -width 40 -textvariable [scope _new(gdb/editor)]
-  pack $f.exted.l -side left
-  pack $f.exted.e -side left -padx 4
-
-  pack $f.colors -fill both -expand 1
-  pack $f.rmv  -fill both -expand yes
-  pack $f.x -fill x -expand yes
-  
-  if {$have_disassembly_flavor} {
-    pack $f.dis -side top -fill x -padx 4
-  }
-
-  pack $f.exted -side top -fill x -padx 4 -pady 4
-
-  button $itk_interior.f.b.ok -text OK -width 7 -underline 0 -command [code $this _save]
-  button $itk_interior.f.b.apply -text Apply -width 7 -underline 0 -command [code $this _apply]
-  button $itk_interior.f.b.quit -text Cancel -width 7 -underline 0 -command [code $this _cancel]
-  standard_button_box $itk_interior.f.b
-  pack $itk_interior.f.a $itk_interior.f.b $itk_interior.f -expand yes -fill both -padx 5 -pady 5
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  apply - apply changes
-# ------------------------------------------------------------------
-itcl::body SrcPref::_apply {} {
-  foreach var [array names _new] {
-    if {$_new($var) != [pref get $var]} {
-      #debug "$var = $_new($var)"
-      pref set $var $_new($var)
-    }
-  }
-  if {$_new_disassembly_flavor != ""} {
-    gdb_cmd "set disassembly-flavor $_new_disassembly_flavor"
-    pref set gdb/src/disassembly-flavor $_new_disassembly_flavor
-  }
-  ManagedWin::restart
-}
-
-itcl::body SrcPref::cancel {} {
-  _save
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  _cancel
-# ------------------------------------------------------------------
-itcl::body SrcPref::_cancel {} {
-  set any_changed 0
-  
-  foreach elem [array names _saved] {
-    set cur_val [pref get $elem]
-    if {[string compare $cur_val $_saved($elem)] != 0} {
-      set any_changed 1
-      pref set $elem $_saved($elem)
-    }
-  }
-
-  if {$_new_disassembly_flavor != ""} {
-    set any_changed 1
-    gdb_cmd "set disassembly-flavor $_saved_disassembly_flavor"
-    pref set gdb/src/disassembly-flavor $_saved_disassembly_flavor
-  }
-  
-  if {$any_changed} {
-    ManagedWin::restart
-  }
-  unpost
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  save - apply changes and quit
-# ------------------------------------------------------------------
-itcl::body SrcPref::_save {} {
-  _apply
-  unpost
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  _set_flavor - sets the disassembly flavor.  The set disassembly-flavor
-#           gdb command is already known to exist, so I don't have to check...
-# ------------------------------------------------------------------
-itcl::body SrcPref::_set_flavor {w new_mode} {
-  $w entryset $new_mode
-  set _new_disassembly_flavor $new_mode
-}
-
-
-# ------------------------------------------------------------------
-#  METHOD:  pick - pick colors
-# ------------------------------------------------------------------
-itcl::body SrcPref::_pick {color win tag} {
-  set new_color [tk_chooseColor -initialcolor $color -title "Choose color"]
-  if {$new_color != $color && $new_color != {}} {
-    set _new(gdb/src/$tag) $new_color
-    $win configure -activebackground $new_color -bg $new_color
-  }
-}
-
diff --git a/gdb/gdbtk/library/srcpref.ith b/gdb/gdbtk/library/srcpref.ith
deleted file mode 100644
index 60a9ede2888..00000000000
--- a/gdb/gdbtk/library/srcpref.ith
+++ /dev/null
@@ -1,38 +0,0 @@
-# Source preferences dialog class definition for GDBtk.
-# Copyright 1998, 1999 Cygnus Solutions
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License (GPL) 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.
-
-
-itcl::class SrcPref {
-  inherit ManagedWin ModalDialog
-
-  private {
-    variable _saved	;# These are the saved values...
-    variable _new	;# These are the changed values
-    variable _saved_disassembly_flavor
-    variable _new_disassembly_flavor ""
-
-    method _apply {}
-    method _build_win {}
-    method _cancel {}
-    method _init_var {}
-    method _pick {color win tag}
-    method _save {}
-    method _set_flavor {w new_mode}
-    method cancel {}
-  }
-
-  public {
-    method constructor {args}
-  }
-}
-
diff --git a/gdb/gdbtk/library/srctextwin.itb b/gdb/gdbtk/library/srctextwin.itb
deleted file mode 100644
index 68e1575b7db..00000000000
--- a/gdb/gdbtk/library/srctextwin.itb
+++ /dev/null
@@ -1,2971 +0,0 @@
-# Paned text widget for source code, for Insight
-# Copyright 1997, 1998, 1999, 2001, 2002 Red Hat, Inc.
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License (GPL) 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.
-
-
-# ----------------------------------------------------------------------
-# Implements the paned text widget with the source code in it.
-# This widget is typically embedded in a SrcWin widget.
-#
-# ----------------------------------------------------------------------
-
-# ------------------------------------------------------------------
-#  CONSTRUCTOR - create new source text window
-# ------------------------------------------------------------------
-itcl::body SrcTextWin::constructor {args} {
-  eval itk_initialize $args
-  set top [winfo toplevel $itk_interior]
-  if {$parent == {}} {
-    set parent [winfo parent $itk_interior]
-  }
-
-  if {![info exists break_images(bp)]} {
-    set size [font measure [pref get gdb/src/font] "W"]
-    set break_images(bp)          [makeBreakDot $size \
-				     [pref get gdb/src/bp_fg]]
-    set break_images(temp_bp)     [makeBreakDot $size \
-				     [pref get gdb/src/temp_bp_fg]]
-    set break_images(disabled_bp) [makeBreakDot $size \
-				     [pref get gdb/src/disabled_fg]]
-    set break_images(tp)          [makeBreakDot $size \
-				     [pref get gdb/src/trace_fg]]
-    set break_images(thread_bp)   [makeBreakDot $size \
-				     [pref get gdb/src/thread_fg]]
-    set break_images(bp_and_tp)   [makeBreakDot $size \
-				     [list [pref get gdb/src/trace_fg] \
-					[pref get gdb/src/bp_fg]]] 
-  }
-
-  if {$ignore_var_balloons} {
-    set UseVariableBalloons 0
-  } else {
-    set UseVariableBalloons [pref get gdb/src/variableBalloons]
-  }
-  
-  set Linenums [pref get gdb/src/linenums]
-  
-  #Initialize state variables
-  _initialize_srctextwin
-
-  build_popups  
-  build_win
-  
-  # add hooks
-  if {$Tracing} {
-    add_hook control_mode_hook "$this set_control_mode"
-    add_hook gdb_trace_find_hook "$this trace_find_hook"
-  }
-  
-  if {$UseVariableBalloons} {
-    add_hook gdb_idle_hook "$this updateBalloon"
-  }
-  global ${this}_balloon
-  trace variable ${this}_balloon w "$this trace_help"
-
-}
-
-# ------------------------------------------------------------------
-#  DESTRUCTOR - destroy window containing widget
-# ------------------------------------------------------------------
-itcl::body SrcTextWin::destructor {} {
-  if {$Tracing} {
-    remove_hook control_mode_hook "$this set_control_mode"
-  }
-  if {$UseVariableBalloons} {
-    remove_hook gdb_idle_hook "$this updateBalloon"
-  }
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  trace_find_hook - response to the tfind command.  All we
-#  need to do here is to remove the trace tags, if we are exiting
-#  trace mode
-# ------------------------------------------------------------------
-itcl::body SrcTextWin::trace_find_hook {mode from_tty} {
-  if {[string compare $mode -1] == 0} {
-    if {$Browsing} {
-      $twin tag remove STACK_TAG 1.0 end
-    }
-  } 
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  set_control_mode- switches the src window between 
-#           browsing -> mode = 1
-#           controlling -> mode = 0
-# ------------------------------------------------------------------
-itcl::body SrcTextWin::set_control_mode {mode} {
-#  debug "Setting control mode of $twin to $mode"
-  if {$mode} {
-    set Browsing 1
-  } else {
-    set Browsing 0
-  }
-  
-  switch $current(mode) {
-    SOURCE {
-      config_win $twin
-    }
-    ASSEMBLY {
-      config_win $twin A
-    }
-    MIXED {
-      config_win $twin M
-    }
-    SRC+ASM {
-      config_win $twin
-      config_win $bwin A
-    }
-  }      
-  
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  build_popups - build the popups for the source window(s)
-# ------------------------------------------------------------------
-#
-# The popups array holds the data for the breakpoint & tracepoint popup menus.
-# The elements are:
-# Menus:
-#   break_rgn - the popup for clicking in a bare break region
-#   bp        - the popup for clicking on a set breakpoint
-#   tp        - the popup for clicking on a set tracepoint
-#   bp_and_tp - the popup for clicking on the break_region when the
-#               line contains both a bp & a tp
-#   source    - the popup for clicking on the source region of the window
-#
-# State:
-#    saved_y  - the y value of the mouse click that posted the popup
-#    saved_win- the Tk window which recieved the posting click
-# 
-# Disable info:
-#    run_disabled - a list of {menu entry} pairs for all the menus that
-#                   should be disabled when you are not running
-#    browse_disabled - a similar list for menus that should be disabled
-#                      when you are browsing a trace expt.
-#
-itcl::body SrcTextWin::build_popups {} {
-  
-  set popups(bp) $itk_interior.bp_menu
-  set popups(tp) $itk_interior.tp_menu
-  set popups(bp_and_tp) $itk_interior.tp_bp_menu
-  set popups(tp_browse) $itk_interior.tp_browse_menu
-  set popups(break_rgn) $itk_interior.break_menu
-  set popups(source) $itk_interior.src_menu
-  set popups(disabled_bp) $itk_interior.disabled_bp_menu
-
-  # This is a scratch popup menu we use when we are not over a bp...
-  if {![winfo exists $popups(source)]} {
-    menu $popups(source) -tearoff 0
-  }
-  
-  if {![winfo exists $popups(break_rgn)]} {
-    # breakpoint popup menu
-    # don't enable hardware or conditional breakpoints until they are tested
-    menu $popups(break_rgn) -tearoff 0
-    
-    set bp_fg [pref get gdb/src/bp_fg]
-    set tp_fg [pref get gdb/src/trace_fg]
-    
-    if {[pref get gdb/control_target]} {
-      
-      addPopup break_rgn "Continue to Here" "$this continue_to_here" \
-	[pref get gdb/src/PC_TAG] 0 0
-      addPopup break_rgn "Jump to Here" "$this jump_to_here" \
-	[pref get gdb/src/PC_TAG] 0 0
-      $popups(break_rgn) add separator
-      
-      addPopup break_rgn "Set Breakpoint" "$this set_bp_at_line" $bp_fg 
-      
-      lappend popups(break_rgn-browse) 1
-      lappend popups(break_rgn-control) 1
-      
-      addPopup break_rgn "Set Temporary Breakpoint" "$this set_bp_at_line T" \
-	[pref get gdb/src/temp_bp_fg]
-      
-      addPopup break_rgn "Set Breakpoint on Thread(s)..." \
-	"$this ask_thread_bp" [pref get gdb/src/thread_fg] 0 0
-    }
-    
-    if {$Tracing} {
-      $popups(break_rgn) add separator
-      addPopup break_rgn "Set Tracepoint" "$this set_tp_at_line" $tp_fg
-    }
-    
-  }
-  
-  if {![winfo exists $popups(bp)]} {
-    # this popup is used when the line contains a set breakpoint
-    menu $popups(bp) -tearoff 0
-    
-    if {!$Browsing && [pref get gdb/control_target]} {
-      addPopup bp "Continue to Here" "$this continue_to_here" {} 0 0
-      addPopup bp "Jump to Here" "$this jump_to_here" {} 0 0
-      $popups(bp) add separator    
-
-      addPopup bp "Disable Breakpoint" "$this enable_disable_at_line disable" \
-	$bp_fg
-      $popups(bp) add separator
-    }
-    
-    addPopup bp "Delete Breakpoint" "$this remove_bp_at_line"
-
-    # Currently you cannot set a tracepoint and a breakpoint at the same line...
-    #
-    #       if {$Tracing} {
-    # 	addPopup bp "Set Tracepoint" "$this set_tp_at_line" $tp_fg
-    #       }
-  }
-
-  if {![winfo exists $popups(tp)]} {
-    # This is the popup to use when the line contains a set tracepoint
-    
-    menu $popups(tp) -tearoff 0
-    
-    if {[pref get gdb/control_target]} {
-      
-      addPopup tp "Continue to Here" "$this continue_to_here" green 0 0
-      addPopup tp "Jump to Here" "$this jump_to_here" {} 0 0
-      #	$popups(tp) add separator    
-
-      # Currently you cannot set a tracepoint and a breakpoint at the same line...
-      #      
-      # 	addPopup tp "Set Breakpoint" "$this set_bp_at_line" $bp_fg
-
-      # 	addPopup tp "Set Temporary Breakpoint" "$this set_bp_at_line T" \
-	# 	  [pref get gdb/src/temp_bp_fg]
-      
-      # 	addPopup tp "Set Breakpoint on Thread(s)..." \
-	# 	  "$this ask_thread_bp" \
-	# 	  [pref get gdb/src/thread_fg] 0 0
-    }
-    
-    if {$Tracing} {
-      $popups(tp) add separator
-      addPopup tp "Modify Tracepoint" "$this set_tp_at_line" $tp_fg
-      addPopup tp "Delete Tracepoint" "$this remove_tp_at_line" $tp_fg
-    }
-  }
-  
-  # This is not currently used, since you can't set a bp & a tp on the same line.
-  # N.B. however, we don't exclude this on the command line, but...
-
-  if {![winfo exists $popups(bp_and_tp)]} {
-    
-    # this popup is used when the line contains a set breakpoint & tracepoint
-    menu $popups(bp_and_tp) -tearoff 0
-    
-    if {!$Browsing && [pref get gdb/control_target]} {
-      addPopup bp_and_tp "Continue to Here" "$this continue_to_here" \
-	green 0 0
-      addPopup bp_and_tp "Jump to Here" "$this jump_to_here" \
-	green 0 0
-      $popups(bp_and_tp) add separator    
-    }
-
-    addPopup bp_and_tp "Delete Breakpoint" "$this remove_bp_at_line" $bp_fg
-    if {$Tracing} {
-      addPopup bp_and_tp "Modify Tracepoint" "$this set_tp_at_line" $tp_fg
-      addPopup bp_and_tp "Delete Tracepoint" \
-	"$this remove_tp_at_line" $tp_fg
-    }
-  }
-
-  if {![winfo exists $popups(disabled_bp)]} {
-    menu $popups(disabled_bp) -tearoff 0
-
-    addPopup disabled_bp "Enable Breakpoint" \
-      "$this enable_disable_at_line enable" $bp_fg
-    
-    $popups(disabled_bp) add separator
-    addPopup disabled_bp "Delete Breakpoint" "$this remove_bp_at_line"
-  }
-
-  if {![winfo exists $popups(tp_browse)]} {
-    
-    # this popup is on a tracepoint when browsing.
-    
-    menu $popups(tp_browse) -tearoff 0
-    addPopup tp_browse "Next hit Here" "$this next_hit_at_line" \
-      green
-  }
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  build_win - build the main source paned window
-# ------------------------------------------------------------------
-itcl::body SrcTextWin::build_win {} {
-  cyg::panedwindow $itk_interior.p
-
-  set _tpane pane$filenum
-  incr filenum
-  
-  $itk_interior.p add $_tpane
-  set pane1 [$itk_interior.p childsite $_tpane]
-  set Stwc(gdbtk_scratch_widget:pane) $_tpane
-  set Stwc(gdbtk_scratch_widget:dirty) 0
-
-  set twinp [iwidgets::scrolledtext $pane1.st \
-	       -hscrollmode dynamic -vscrollmode dynamic]
-  set twin [$twinp component text]
-  pack $twinp -fill both -expand yes
-  pack $itk_interior.p -fill both -expand yes
-  config_win $twin
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  SetRunningState - set state based on if GDB is running or not.
-#  This disables the popup menus when GDB is not running yet.
-# ------------------------------------------------------------------
-itcl::body SrcTextWin::SetRunningState {state} {
-#  debug "$state"
-  foreach elem $popups(run_disabled) {
-    $popups([lindex $elem 0]) entryconfigure [lindex $elem 1] -state $state
-  }
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  enable - enable or disable bindings and change cursor
-# ------------------------------------------------------------------
-itcl::body SrcTextWin::enable {on} {
-  if {$on} {
-    set Running 0
-    set glyph ""
-    set bnd ""
-    set status normal
-  } else {
-    set Running 1
-    set glyph watch
-    set bnd "break"
-    set status disabled
-  }
-
-  if {[winfo exists $twin]} {
-    bind $twin <B1-Motion> $bnd
-    bind $twin <Double-1> $bnd
-    bind $twin <Triple-1> $bnd
-    enable_disable_src_tags $twin $status
-    $twin configure -cursor $glyph
-  }
-
-  if {$bwin != ""} {
-    bind $bwin <B1-Motion> $bnd
-    bind $bwin <Double-1> $bnd
-    bind $bwin <Triple-1> $bnd
-    enable_disable_src_tags $bwin $status
-    $bwin configure -cursor $glyph
-  }
-}
-
-# ------------------------------------------------------------------
-# PROC:  makeBreakDot - make the break dot for the screen
-# ------------------------------------------------------------------
-itcl::body SrcTextWin::makeBreakDot {size colorList {image {}}} {
-  if {$size > 32} {
-    set size 32
-  } elseif {$size < 1} {
-    set size 1
-  }
-
-  if {$image == ""} {
-    set image [image create photo -width $size -height $size]
-  } else {
-    $image blank
-    $image configure -width $size -height $size
-  }
-
-  if {[llength $colorList] == 1} { 
-    set x1 1
-    set x2 [expr {1 + $size}]
-    set y1 1
-    set y2 $x2
-    $image put $colorList -to 1 1 $x2 $y2
-  } else {
-    set x1 1
-    set x3 [expr {1 + $size}]
-    set x2 [expr int((1 + $size)/2)]
-    set y1 1
-    set y2 $x3
-    $image put [lindex $colorList 0] -to 1 1 $x2 $y2
-    $image put [lindex $colorList 1] -to [expr $x2 + 1] 1 $x3 $y2
-  }
-  
-  return $image
-}
-
-# ------------------------------------------------------------------
-# METHOD: setTabs - set the tabs for the assembly/src windows
-# ------------------------------------------------------------------
-itcl::body SrcTextWin::setTabs {win {asm S}} {
-  set fsize [font measure [pref get gdb/src/font] "W"]
-  set tsize [pref get gdb/src/tab_size]
-  set rest ""
-  
-  if {[string compare $asm "S"] != 0} {
-    set first  [expr {$fsize * 12}]
-    set second [expr {$fsize * 13}]
-    set third  [expr {$fsize * 34}]
-    for {set i 1} {$i < 8} {incr i} {
-      lappend rest [expr {(34 + ($i * $tsize)) * $fsize}] left
-    }
-    set tablist [concat [list $first right $second left $third left] $rest]
-  } else {
-    # SOURCE window
-    # The first tab right-justifies the line numbers and the second
-    # tab is the left margin for the start on the source code.  The remaining
-    # tabs should be regularly spaced depending on prefs.
-    if {$Linenums} {
-      set first  [expr {$fsize * 6}]	;# "- " plus 4 digit line number
-      set second [expr {$fsize * 7}]	;# plus a space after the number 
-      for {set i 1} {$i < 8} {incr i} {
-	lappend rest [expr {(7 + ($i * $tsize)) * $fsize}] left
-      }
-      set tablist [concat [list $first right $second left] $rest]
-    } else {
-      set first  [expr {$fsize * 2}]
-      for {set i 1} {$i < 8} {incr i} {
-	lappend rest [expr {(2 + ($i * $tsize)) * $fsize}] left
-      }
-      set tablist [concat [list $first left] $rest]
-    }
-  }
-  $win configure -tabs $tablist
-}
-
-itcl::body SrcTextWin::enable_disable_src_tags {win how} {
-
-  switch $how {
-    normal {
-      set cur1 dot
-      set cur2 xterm
-    }
-    disabled {
-      set cur1 watch
-      set cur2 $cur1
-    }
-    browse {
-      set cur1 dot
-      set cur2 xterm
-    }
-  }
-
-  if {[string compare $how browse] == 0} {
-    
-    $win tag bind break_rgn_tag <Enter> { }
-    $win tag bind break_rgn_tag <Leave> { }
-    
-    foreach type $bp_types {
-      $win tag bind ${type}_tag <Enter> { }
-      $win tag bind ${type}_tag <Motion> { }
-      $win tag bind ${type}_tag <Leave> { }
-    }
-
-  } else {
-    
-    $win tag bind break_rgn_tag <Enter> "$win config -cursor $cur1"
-    $win tag bind break_rgn_tag <Leave> "$win config -cursor $cur2"
-    
-    foreach type $bp_types {
-      $win tag bind ${type}_tag <Enter> "$win config -cursor $cur1"
-      $win tag bind ${type}_tag <Motion> "$this motion bp %W %x %y"
-      $win tag bind ${type}_tag <Leave> \
-	"$this cancelMotion;$win config -cursor $cur2"
-    }
-  }
-
-  $win tag bind tp_tag <Enter> "$win config -cursor $cur1"
-  $win tag bind tp_tag <Motion> "$this motion bp %W %x %y"
-  $win tag bind tp_tag <Leave> "$this cancelMotion;$win config -cursor $cur2"
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  config_win - configure the source or assembly text window
-# ------------------------------------------------------------------
-itcl::body SrcTextWin::config_win {win {asm S}} {
-#  debug "$win $asm Tracing=$Tracing Browsing=$Browsing"
-  
-  $win config -borderwidth 2 -insertwidth 0 -wrap none
-  
-  # font
-  set font [pref get gdb/src/font]
-  $win configure -font $font -bg $::Colors(textbg) -fg $::Colors(textfg)
-  
-  setTabs $win $asm
-
-  # set up some tags.  should probably be done differently
-  # !! change bg?
-  
-  $win tag configure break_rgn_tag
-  foreach type $bp_types {
-    $win tag configure ${type}_tag 
-  }
-  $win tag configure tp_tag 
-  $win tag configure source_tag2 -foreground [pref get gdb/src/source2_fg]
-  $win tag configure PC_TAG -background [pref get gdb/src/PC_TAG]
-  $win tag configure STACK_TAG -background [pref get gdb/src/STACK_TAG]
-  $win tag configure BROWSE_TAG -background [pref get gdb/src/BROWSE_TAG]
-  
-  # search tag used to highlight searches
-  foreach option [$win tag configure sel] {
-    set op [lindex $option 0]
-    set val [lindex $option 4]
-    eval $win tag configure search $op $val
-  }
-  
-  # bind mouse button 3 to the popup men
-  $win tag bind source_tag <Button-3> "$this do_source_popup %X %Y %x %y"
-  $win tag bind source_tag2 <Button-3> "$this do_source_popup %X %Y %x %y"
-  
-  # bind mouse button 3 to the popup menus
-  if {!$Browsing} {
-    
-    $win tag bind break_rgn_tag <Button-3> \
-      "$this do_tag_popup break_rgn %X %Y %y; break"
-    foreach type $bp_types {
-      if {$type == "disabled_bp"} then {
-	set tag disabled_bp
-      } else {
-	set tag bp
-      }
-      $win tag bind ${type}_tag <Button-3> \
-	"$this do_tag_popup $tag %X %Y %y; break"
-    }
-    $win tag bind tp_tag <Button-3> "$this do_tag_popup tp %X %Y %y; break"
-    $win tag bind bp_and_tp_tag <Button-3> "$this do_tag_popup bp_and_tp %X %Y %y; break"
-  } else {
-    $win tag bind tp_tag <Button-3> "$this do_tag_popup tp_browse %X %Y %y; break"
-    $win tag bind break_rgn_tag <Button-3> { }
-    foreach type $bp_types {
-      $win tag bind ${type}_tag <Button-3> { }
-    }
-    $win tag bind bp_and_tp_tag <Button-3> "$this do_tag_popup tp_browse %X %Y %y; break"
-    
-  }
-  
-  # Disable printing and cut and paste keys; makes the window readonly
-  # We do this so we don't have to enable and disable the
-  # text widget everytime we want to modify it.
-  
-  bind $win <Key> {if {"%A" != "{}"} {break}}
-  bind $win <Delete> break
-  bind $win <ButtonRelease-2> {break}
-  
-  # GDB key bindings
-  # We need to explicitly ignore keys with the Alt modifier, since
-  # otherwise they will interfere with selecting menus on Windows.
-  
-  if {!$Browsing && [pref get gdb/control_target]} {
-    bind_plain_key $win c "$this do_key continue; break" 
-    bind_plain_key $win r "$this do_key run; break"
-    bind_plain_key $win f "$this do_key finish; break"
-  } else {
-    bind_plain_key $win n "$this do_key tfind_next; break"
-    bind_plain_key $win p "$this do_key tfind_prev; break"
-    bind_plain_key $win f "$this do_key tfind_start; break"
-    bind_plain_key $win l "$this do_key tfind_line; break"
-    bind_plain_key $win h "$this do_key tfind_tp; break"
-  }
-  bind_plain_key $win u "$this do_key up; break"
-  bind_plain_key $win d "$this do_key down; break"
-  bind_plain_key $win x "$this do_key quit; break"
-  
-  if {!$Browsing && [pref get gdb/control_target]} {
-    if {[string compare $asm "S"] != 0} {
-      bind_plain_key $win s "$this do_key stepi; break"
-      bind_plain_key $win n "$this do_key nexti; break"
-    } else {
-      bind_plain_key $win s "$this do_key step; break"
-      bind_plain_key $win n "$this do_key next; break"
-    }
-  }
-  
-  bind_plain_key $win Control-h "$this do_key thread_list; break"
-  bind_plain_key $win Control-f "$this do_key browser; break"
-  bind_plain_key $win Control-d "$this do_key download; break"
-  bind_plain_key $win Control-p "$this do_key print"
-  bind_plain_key $win Control-u "$this do_key debug; break"
-  bind_plain_key $win Control-o [list $this do_key open]
-  bind_plain_key $win Control-a [list $this do_key attach]
-  bind_plain_key $win Control-w [code $this do_key close]
-
-  if {!$Browsing && [pref get gdb/control_target]} {
-    # Ctrl+F5 is another accelerator for Run
-    bind_plain_key $win Control-F5 "$this do_key run"
-  }
-  
-  bind_plain_key $win Control-F11 "$this do_key debug"
-  bind_plain_key $win Alt-v "$win yview scroll -1 pages"
-  bind_plain_key $win Control-v [format {
-    %s yview scroll 1 pages
-    break
-  } $win]
-  
-  # bind mouse button 1 to the breakpoint method or tracepoint, 
-  # depending on the settings of the B1_behavior setting.  We don't
-  # have to bind to bp_and_tp because that will fall through to either
-  # the tp or the bp tag.  We have to put in the break so that we don't
-  # both remove & reinsert a BP when we have both a tp & a bp on the same line.
-  # If we are browsing, then disable Button-1
-  
-  if {!$Browsing} {
-    if {[pref get gdb/B1_behavior]} {
-      $win tag bind break_rgn_tag <Button-1> "$this set_bp_at_line N $win %y; break"
-      foreach type $bp_types {
-	$win tag bind ${type}_tag <Button-1> "$this remove_bp_at_line $win %y; break"
-      }
-      $win tag bind tp_tag    <Button-1> "$this set_bp_at_line N $win %y; break"
-    } else {
-      $win tag bind break_rgn_tag <Button-1> "$this set_tp_at_line $win %y; break"
-      foreach type $bp_types {
-	$win tag bind ${type}_tag <Button-1> "$this set_tp_at_line $win %y; break"
-      }
-      $win tag bind tp_tag    <Button-1> "$this set_tp_at_line $win %y; break"
-    }
-  } else {
-    $win tag bind break_rgn_tag <Button-1> { }
-    foreach type $bp_types {
-      $win tag bind ${type}_tag <Button-1> { }
-    }
-    $win tag bind tp_tag    <Button-1> { }      
-  }
-  
-  
-  # avoid special handling of double and triple clicks in break area
-  bind $win <Double-1> [format {
-    if {[lsearch [%s tag names @%%x,%%y] break_rgn_tag] >= 0} {
-      break
-    }
-  } $win $win]
-  bind $win <Triple-1> [format {
-    if {[lsearch [%s tag names @%%x,%%y] break_rgn_tag] >= 0} {
-      break
-    }
-  } $win $win]
-  
-  # bind window shortcuts
-  bind_plain_key $win Control-s "$this do_key stack"
-  bind_plain_key $win Control-r "$this do_key registers"
-  bind_plain_key $win Control-m "$this do_key memory"
-  bind_plain_key $win Control-t "$this do_key watch"
-  bind_plain_key $win Control-l "$this do_key locals"
-  bind_plain_key $win Control-k "$this do_key kod"
-  if { !$Tracing } {
-    bind_plain_key $win Control-b "$this do_key breakpoints"
-  } else {
-    bind_plain_key $win Control-t "$this do_key tracepoints"
-    bind_plain_key $win Control-u "$this do_key tdump"
-  }
-  bind_plain_key $win Control-n "$this do_key console"
-  
-  if {$Browsing} {
-    enable_disable_src_tags $win browse
-  } else {
-    enable_disable_src_tags $win normal
-  }      
-  
-  if {$UseVariableBalloons} {
-    $win tag bind source_tag <Motion> "$this motion var %W %x %y"
-    $win tag bind source_tag <Leave> "$this cancelMotion"
-  }
-  
-  # Up/Down arrow key bindings
-  bind_plain_key $win Up [list %W yview scroll -1 units]
-  bind_plain_key $win Down [list %W yview scroll +1 units]
-
-  # After loading a new file, focus sometimes gets lost
-  # so point it back to this window if it doesn't already
-  # point elsewhere.
-  if {[focus -displayof $win] == ""} {focus $win}
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  addPopup - adds a popup to one of the source popup menus
-# ------------------------------------------------------------------
-itcl::body SrcTextWin::addPopup {menu label command {abg {}} {browse 1} {run 1}} {
-  
-  if {$abg == ""} {
-    $popups($menu) add command -label $label -command $command 
-  } else {
-    $popups($menu) add command -label $label -command $command \
-      -activebackground $abg
-  }
-  
-  set index [$popups($menu) index last]
-  if {!$run} {
-    lappend popups(run_disabled) [list $menu $index]
-  }
-  if {!$browse} {
-    lappend popups(browse_disabled) [list $menu $index]
-  }
-  
-}
-
-# ------------------------------------------------------------------
-#  PUBLIC METHOD:  set_variable - Handle changes in the gdb variables
-#           changed through the "set" gdb command.
-# ------------------------------------------------------------------
-itcl::body SrcTextWin::set_variable {event} {
-  set var [$event get variable]
-  set val [$event get value]
-  debug "Set hook got called with $var $val"
-  switch $var {
-    disassembly-flavor {
-        disassembly_changed
-    } 
-  }   
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  disassembly_changed - The disassembly flavor has changed,
-#           mark all the cached assembly windows dirty, and force the
-#           visible window to be redisplayed.
-# ------------------------------------------------------------------
-itcl::body SrcTextWin::disassembly_changed {} {
-  foreach name [array names Stwc *:pane] {
-    debug "Looking at $name"
-      set vals [split $name ,]
-      if {([string compare [lindex $vals 1] "A"] == 0)
-	  || ([string compare [lindex $vals 1] "M"] == 0)} {
-	debug "Setting $name to dirty"
-	set Stwc([lindex $vals 0]:dirty) 1
-      }
-  }
-
-  if {[string compare $current(mode) "SOURCE"] != 0} {
-    location $current(tag) $current(filename) $current(funcname) $current(line) \
-      $current(addr) $pc(addr) $current(lib)
-  }
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  reconfig - used when preferences change
-# ------------------------------------------------------------------
-itcl::body SrcTextWin::reconfig {} {
-#  debug
-  
-  # Make sure we redo the break images when we reconfigure
-  set size [font measure [pref get gdb/src/font] "W"]
-  makeBreakDot $size [pref get gdb/src/bp_fg] $break_images(bp)
-  makeBreakDot $size [pref get gdb/src/temp_bp_fg] $break_images(temp_bp)
-  makeBreakDot $size [pref get gdb/src/disabled_fg] $break_images(disabled_bp)
-  makeBreakDot $size [pref get gdb/src/trace_fg] $break_images(tp)
-  makeBreakDot $size \
-    [list [pref get gdb/src/trace_fg] [pref get gdb/src/bp_fg]] \
-    $break_images(bp_and_tp)
-  makeBreakDot $size [pref get gdb/src/thread_fg] $break_images(thread_bp)
-
-  # Tags
-  $twin tag configure PC_TAG -background [pref get gdb/src/PC_TAG]
-  $twin tag configure STACK_TAG -background [pref get gdb/src/STACK_TAG]
-  $twin tag configure BROWSE_TAG -background [pref get gdb/src/BROWSE_TAG]
-  switch $current(mode) {
-    SOURCE {
-      setTabs $twin
-    }
-    SRC+ASM {
-      setTabs $twin 
-      setTabs $bwin A
-    }
-    default {
-      setTabs $twin A
-    }
-  }
-  
-  # Variable Balloons
-  if {$ignore_var_balloons} {
-    set balloons 0
-  } else {
-    set balloons [pref get gdb/src/variableBalloons]
-  }
-  if {$UseVariableBalloons != $balloons} {
-    set UseVariableBalloons $balloons
-    if {$UseVariableBalloons} {
-      $twin tag bind source_tag <Motion> "$this motion var %W %x %y"
-      $twin tag bind source_tag <Leave> "$this cancelMotion"
-      add_hook gdb_idle_hook [list $this updateBalloon]
-    } else {
-      cancelMotion
-      $twin tag bind source_tag <Motion> {}
-      $twin tag bind source_tag <Leave> {}
-      $twin tag remove _show_variable 1.0 end 
-      remove_hook gdb_idle_hook [list $this updateBalloon]
-    }
-  }
-
-  # Tracing Hooks
-  catch {remove_hook control_mode_hook "$this set_control_mode"}
-  catch {remove_hook gdb_trace_find_hook "$this trace_find_hook"}
-  if {$Tracing} {
-    add_hook control_mode_hook "$this set_control_mode"
-    add_hook gdb_trace_find_hook "$this trace_find_hook"
-  }
-
-  # Popup colors
-
-  # need to rewrite because of the new addPopup function
-  #    if {$Tracing} {
-  #      $twin.bmenu entryconfigure 0 -activebackground [pref get gdb/src/trace_fg]
-  #    } else {
-  #      $twin.bmenu entryconfigure 0 -activebackground [pref get gdb/src/PC_TAG]
-  #      $twin.bmenu entryconfigure 1 -activebackground [pref get gdb/src/bp_fg]
-  #      $twin.bmenu entryconfigure 2 -activebackground \
-    #	[pref get gdb/src/temp_bp_fg]
-  #     $twin.bmenu entryconfigure 3 -activebackground \
-    #	[pref get gdb/src/thread_fg]
-  #    }
-}
-
-# ------------------------------------------------------------------
-# METHOD: updateBalloon - we have gone idle, update the balloon
-# ------------------------------------------------------------------
-itcl::body SrcTextWin::updateBalloon {} {
-
-    set err [catch {$_balloon_var update} changed]
-    catch {$_balloon_var name} var
-
-    if {!$err} {
-      if {$changed != ""} {
-	# The variable's value has changed, so update the
-	# balloon with its new value
-	balloon register $twin "$var=[balloon_value $_balloon_var]" _show_variable
-      }
-    }
-  }
-
-itcl::body SrcTextWin::balloon_value {variable} {
-
-  catch {$variable value} value
-  set value [string trim $value \ \r\t\n]
-
-  # Insert the variable's type for things like ptrs, etc.
-  catch {$variable type} type 
-  if {$value == "{...}"} {
-    set val "$type $value"
-  } elseif {[regexp -- {0x([0-9a-fA-F]+) <[a-zA-Z_].*} $value str]} {
-    set val $str
-  } elseif {[string first * $type] != -1} {
-    set val "($type) $value"
-  } elseif {[string first \[ $type] != -1} {
-    set val "$type"
-  } else {
-    set val "$value"
-  }
-
-  return $val
-}
-
-# ------------------------------------------------------------------
-# METHOD: ClearTags - clear all tags
-# ------------------------------------------------------------------
-itcl::body SrcTextWin::ClearTags {} {
-  foreach tag {PC_TAG BROWSE_TAG STACK_TAG} {
-    catch {
-      $twin tag remove $tag $current(line).2 $current(line).end
-      $twin tag remove $tag $pc(line).2 $pc(line).end
-      $twin tag remove $tag $current(asm_line).2 $current(asm_line).end
-      if {$bwin != ""} {
-	$bwin tag remove $tag $current(asm_line).2 $current(asm_line).end
-      }
-    }
-  }
-}
-
-# ------------------------------------------------------------------
-# METHOD: _mtime_changed - check if the modtime for a file
-#                          has changed.
-# ------------------------------------------------------------------
-itcl::body SrcTextWin::_mtime_changed {filename} {
-  global tcl_platform
-
-  if [catch {gdb_find_file $filename} f] {
-    set r 1
-  } elseif {$f == ""} {
-    set r 1
-  } else {
-    if {[string compare $tcl_platform(platform) "windows"] == 0} {
-      set f [ide_cygwin_path to_win32 $f]
-    }
-    if {[catch {file mtime $f} mtime]} {
-      debug "Could not stat file \"$f\" - \"$mtime\""
-      # The return code is not of much significance in this case
-      return 1
-    }
-    if {![info exists Stwc($filename:mtime)]} {
-      debug "no mtime. resetting to zero"
-      set Stwc($filename:mtime) 0
-    }
-    # debug "Stwc($filename:mtime)=$Stwc($filename:mtime); mtime=$mtime"
-
-    if {$mtime == $Stwc($filename:mtime)} {
-      set r 0
-    } else {
-      set r 1
-      set Stwc($filename:mtime) $mtime
-      set Stwc($filename:dirty) 1
-    }
-  }
-
-  return $r
-}
-
-# ------------------------------------------------------------------
-# METHOD: FillSource - fill a window with source
-# ------------------------------------------------------------------
-itcl::body SrcTextWin::FillSource {w tagname filename funcname line addr pc_addr lib} {
-  global gdb_running
-  upvar ${w}win win
-
-#  debug "$gdb_running $tagname line=$line pc(line)=$pc(line)"
-#  debug "current(filename)=$current(filename) filename=$filename"
-
-  if {$filename != ""} {
-    # load new file if necessary
-    set mtime [_mtime_changed $filename]
-    if {[string compare $filename $current(filename)] != 0 \
-	  || $mode_changed || $mtime} {
-      if {![LoadFile $w $filename $lib $mtime]} {
-	# failed to find source file
-	dbug W "Changing to ASSEMBLY"
-	
-	# We have to update this data here (it is also done by the caller)
-	# because we want to call mode, which calls mode_set, which calls
-	# location using these values.
-	set current(line) $line
-	set current(tag) $tagname
-	set current(addr) $addr
-	set current(funcname) $funcname
-	set current(filename) $filename
-	set current(lib) $lib
-	
-	set oldmode SOURCE
-	$parent mode "" ASSEMBLY
-	return
-      }
-      if {$current(mode) != "SRC+ASM"} {
-	# reset this flag in FillAssembly for SRC+ASM mode
-	set mode_changed 0
-      }
-    }
-
-#    debug "cf=$current(filename) pc=$pc(filename) filename=$filename"
-    if {$current(filename) != ""} {
-      if {$gdb_running && $pc(filename) == $filename} {
-	# set the PC tag in this file
-	$win tag add PC_TAG $pc(line).2 $pc(line).end
-      }
-      if {$tagname != "PC_TAG"} {
-	if {$gdb_running && ($pc(filename) == $filename) \
-	      && ($pc(line) == $line)} {
-	  # if the tag is on the same line as the PC, set a PC tag
-	  $win tag add PC_TAG $line.2 $line.end
-	} else {
-	  $win tag add $tagname $line.2 $line.end
-	}
-      }
-      if {$pc(filename) == $filename && $line == 0} {
-	# no line specified, so show line with PC
-	display_line $win $pc(line)
-      } else {
-	display_line $win $line
-      }
-    }
-    return
-  }
-  # no source; switch to assembly
-  dbug W "no source file; switch to assembly"
-  
-  # We have to update this data here (it is also done by the caller)
-  # because we want to call mode, which calls mode_set, which calls
-  # location using these values.
-  set current(line) $line
-  set current(tag) $tagname
-  set current(addr) $addr
-  set current(funcname) $funcname
-  set current(filename) $filename
-  set current(lib) $lib
-
-  set oldmode $current(mode)
-  $parent mode "" ASSEMBLY
-}
-
-# ------------------------------------------------------------------
-# METHOD: FillAssembly - fill a window with disassembled code
-# ------------------------------------------------------------------
-itcl::body SrcTextWin::FillAssembly {w tagname filename funcname line addr pc_addr lib} {
-  global gdb_running
-  upvar ${w}win win
-  upvar _${w}pane pane
-#  debug "$win $tagname $filename $funcname $line $addr $pc_addr"
-#  debug "mode_changed=$mode_changed"
-#  debug "funcname=$funcname"
-#  debug "current(funcname)=$current(funcname)"
-  if {$funcname == ""} {
-    set oldpane $pane
-    set pane $Stwc(gdbtk_scratch_widget:pane)
-    set win [[$itk_interior.p childsite $pane].st component text]
-    $win delete 0.0 end
-    $win insert 0.0 "Select function name to disassemble"
-    if {$oldpane != "" && $oldpane != $pane} {
-      $itk_interior.p replace $oldpane $pane
-    } else {
-      $itk_interior.p show $pane
-    }
-    return
-  } elseif {$funcname != $current(funcname) || $mode_changed
-	    || ([info exists Stwc($addr:dirty)] && $Stwc($addr:dirty))} {
-    set mode_changed 0
-    set oldpane $pane
-    set result [LoadFromCache $w $addr A $lib]
-    if {$result == 1} {
-      #debug "Disassembling at $addr"
-      #debug "cf=$current(filename) name=$filename"
-      if {[catch {gdb_load_disassembly $win nosource \
-			     [scope _map] $Cname $addr} mess]} {
-	# print some intelligent error message?
-	dbug E "Disassemble failed: $mess"
-	UnLoadFromCache $w $oldpane $addr A $lib
-	set pane $Stwc(gdbtk_scratch_widget:pane)
-	set win [[$itk_interior.p childsite $pane].st component text]
-	$win delete 0.0 end
-	$win insert 0.0 "$mess"
-	if {$oldpane != "" && $oldpane != $pane} {
-	  $itk_interior.p replace $oldpane $pane
-	} else {
-	  $itk_interior.p show $pane
-	}
-      } else {
-        debug "address range is $mess"
-      }
-    } elseif {$result == 0} {
-      debug "LoadFromCache returned 0"
-    } else {
-      # This branch should not ever happen.  In assembly mode, there
-      # are no checks in LoadFromCache that can fail.
-      debug "LoadFromCache returned -1"
-    }
-    set current(filename) $filename
-    set do_display_breaks 1
-  }
-  
-  # highlight proper line number
-  _highlightAsmLine $win $addr $pc_addr $tagname $filename $funcname
-
-  display_line $win $current(asm_line)
-}
-
-
-# ------------------------------------------------------------------
-# METHOD: FillMixed - fill a window with mixed source and assembly
-# ------------------------------------------------------------------
-itcl::body SrcTextWin::FillMixed {w tagname filename funcname line addr pc_addr lib} {
-  global gdb_running
-  upvar ${w}win win
-  upvar _${w}pane pane
-#  debug "$win $tagname $filename $funcname $line $addr $pc_addr"  
-
-  if {$funcname == ""} {
-    set oldpane $pane
-    set pane $Stwc(gdbtk_scratch_widget:pane)
-    set win [[$itk_interior.p childsite $pane].st component text]
-    $win delete 0.0 end
-    $win insert 0.0 "Select function name to disassemble"
-    if {$oldpane != ""} {
-      $itk_interior.p replace $oldpane $pane
-    } else {
-      $itk_interior.p show $pane
-    }
-  } elseif {$funcname != $current(funcname) || $mode_changed
-	    || ([info exists Stwc($funcname:dirty)] && $Stwc($funcname:dirty))} {
-    set mode_changed 0
-    set oldpane $pane
-    if {[LoadFromCache $w $funcname M $lib]} {
-      # debug "Disassembling at $addr"
-      if {[catch {gdb_load_disassembly $win source \
-			     [scope _map] $Cname $addr} mess] } {
-	# print some intelligent error message
-	dbug W "Disassemble Failed: $mess"
-	UnLoadFromCache $w $oldpane $funcname M $lib
-	set current(line) $line
-	set current(tag) $tagname
-	set current(addr) $addr
-	set current(funcname) $funcname
-	set current(filename) $filename
-	set current(lib) $lib
-	set oldmode MIXED
-	$parent mode "" ASSEMBLY
-	return
-      } else {
-        debug "address range is $mess"
-      }
-    }
-    set current(filename) $filename
-    # now set the breakpoints
-    set do_display_breaks 1
-  }
-
-  # highlight proper line number
-  _highlightAsmLine $win $addr $pc_addr $tagname $filename $funcname
-  display_line $win $current(asm_line)
-}
-
-# ------------------------------------------------------------------
-# METHOD: _highlightAsmLine - highlight the current execution line
-#         in one of the assembly modes
-# ------------------------------------------------------------------
-itcl::body SrcTextWin::_highlightAsmLine {win addr pc_addr \
-                                    tagname filename funcname} {
-  global gdb_running
-
-  # Some architectures allow multiple instructions in each asm source
-  # line...
-  if {[info exists _map($Cname,pc=$addr)]} {
-    set current(asm_line) $_map($Cname,pc=$addr)
-  } else {
-    set x [gdb_incr_addr $current(addr) -2]
-    if {[info exists _map($Cname,pc=$x)]} {
-      set current(asm_line) $_map($Cname,pc=$x)
-    }
-  }
-
-  # if current file has PC, highlight that too
-  if {$gdb_running && $tagname != "PC_TAG" && $pc(filename) == $filename
-      && $pc(func) == $funcname} {
-    set pc(asm_line) $_map($Cname,pc=$pc_addr)
-    $win tag add PC_TAG $pc(asm_line).2 $pc(asm_line).end
-  }
-
-  # don't set browse tag if it is at PC
-  if {$pc_addr != $addr || $tagname == "PC_TAG"} {
-    # HACK.  In STACK mode we usually want the previous instruction
-    # but not when we are browsing a trace experiment.
-    if {[string compare $tagname "STACK_TAG"] == 0 && !$Browsing} {
-      incr current(asm_line) -1
-    }
-    $win tag add $tagname $current(asm_line).2 $current(asm_line).end
-  }
-}
-
-# ------------------------------------------------------------------
-# METHOD: set_tag - update tag to STACK without making other changes
-# ------------------------------------------------------------------
-itcl::body SrcTextWin::set_tag_to_stack {} {
-  foreach window [list $twin $bwin] {
-    if {$window == ""} then {
-      continue
-    }
-    foreach {start end} [$window tag ranges PC_TAG] {
-      $window tag remove PC_TAG $start $end
-      $window tag add STACK_TAG $start $end
-    }
-  }
-  set current(tag) STACK_TAG
-}
-
-# ------------------------------------------------------------------
-# METHOD: location - display a location in a file
-# ------------------------------------------------------------------
-itcl::body SrcTextWin::location {tagname filename funcname line addr pc_addr lib} {
-#  debug "$tagname $filename $line $addr $pc_addr,  mode=$current(mode) oldmode=$oldmode  cf=$current(filename) lib=$lib"
-  
-  ClearTags
-  
-   # It seems odd to do this as a string compare, but on the Alpha,
-   # where ints are 32 bit but addresses are 64, a numerical compare
-   # will overflow Tcl's ints.
-
-  if {$tagname == "PC_TAG" && [string compare $addr $pc_addr] == 0} {
-    set pc(filename) $filename
-    set pc(line) $line
-    set pc(addr) $addr
-    set pc(func) $funcname
-    set pc(lib)  $lib
-  }
-  
-  if {$oldmode != "" \
-	&& [string compare $filename $current(filename)] != 0} {
-
-    if [catch {gdb_find_file $filename} fullname] {
-      dbug W "$filename: $fullname"
-      set fullname ""
-    }
-
-    if {$fullname != ""} {
-      set tmp $oldmode
-      set oldmode ""
-      $parent mode "" $tmp 0
-    }
-  }
-  
-  set oldpane $_tpane
-
-  switch $current(mode) {
-    SOURCE {
-      FillSource t $tagname $filename $funcname $line $addr $pc_addr $lib
-    }
-    ASSEMBLY {
-      FillAssembly t $tagname $filename $funcname $line $addr $pc_addr $lib
-    }
-    MIXED {
-      FillMixed t $tagname $filename $funcname $line $addr $pc_addr $lib
-    }
-    SRC+ASM {
-      FillSource t $tagname $filename $funcname $line $addr $pc_addr $lib
-      # This may seem redundant, but it is NOT.  FillSource can change
-      # the mode from SOURCE to ASSEMBLY if sources were not found. If
-      # this happens, then MIXED mode is pointless, so forget the bottom
-      # pane.
-      if {$current(mode) == "SRC+ASM"} {
-	FillAssembly b $tagname $filename $funcname $line $addr $pc_addr $lib
-      }
-    }
-  }
-
-  # After switching panes, clear the previous pane's cursor so that it isn't
-  # used as the default when no other cursors are set.
-  if { "$oldpane" != "$_tpane" } {
-    $twin configure -cursor ""
-  }
-
-  set current(line) $line
-  set current(tag) $tagname
-  set current(addr) $addr
-  set current(funcname) $funcname
-  set current(filename) $filename
-  set current(lib) $lib
-  if {$do_display_breaks} {
-    display_breaks
-    set do_display_breaks 0
-  }
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  LoadFile - loads in a new source file
-# ------------------------------------------------------------------
-itcl::body SrcTextWin::LoadFile {w name lib mtime_changed} {
-  debug "$name $current(filename) $current(mode)"
-  upvar ${w}win win
-  upvar _${w}pane pane
-
-  set oldpane $pane
-  set result [LoadFromCache $w $name "S" $lib]
-  if {$result == -1} {
-    # This is a source file we could not find the source for...
-    return 0
-  } elseif {$result == 1 || $mtime_changed} {
-    $win delete 0.0 end
-    debug "READING $name"
-    if {[catch {gdb_loadfile $win $name $Linenums} msg]} {
-      dbug W "Error opening $name:  $msg"
-      #if {$msg != ""} {
-      #  tk_messageBox -icon error -title "GDB" -type ok \
-	#    -modal task -message $msg
-      #}
-      UnLoadFromCache $w $oldpane $name "" $lib
-      return 0
-    }
-  }
-  set current(filename) $name
-  # Display all breaks/traces
-  set do_display_breaks 1
-  return 1
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  display_line - make sure a line is displayed and near the center
-# ------------------------------------------------------------------
-
-itcl::body SrcTextWin::display_line { win line } {
-  ::update idletasks
-  # keep line near center of display
-  set pixHeight [winfo height $win]
-  set topLine [lindex [split [$win index @0,0] .] 0]
-  set botLine [lindex [split [$win index @0,${pixHeight}] .] 0]    
-  set margin [expr {int(0.2*($botLine - $topLine))}]
-  if {$line < [expr {$topLine + $margin}]} {
-    set num [expr {($topLine - $botLine) / 2}]
-  } elseif {$line > [expr {$botLine - $margin}]} {
-    set num [expr {($botLine - $topLine) / 2}]
-  } else {
-    set num 0
-  }
-  $win yview scroll $num units
-  $win see $line.0
-}
-
-# ------------------------------------------------------------------
-# METHOD: display_breaks - insert all breakpoints and tracepoints
-# uses current(filename) in SOURCE mode
-# ------------------------------------------------------------------
-
-itcl::body SrcTextWin::display_breaks {} {
-#  debug
-  
-  # clear any previous breakpoints
-  foreach type "$bp_types tp" {
-    foreach {start stop} [$twin tag ranges ${type}_tag] {
-      scan $start "%d." linenum
-      removeBreakTag $twin $linenum ${type}_tag
-    }
-  }
-  
-  # now do second pane if it exists
-  if {[info exists bwin]} {
-    foreach type "$bp_types tp" {
-      foreach {start stop} [$twin tag ranges ${type}_tag] {
-	scan $start "%d." linenum
-	removeBreakTag $twin $linenum ${type}_tag
-      }
-    }
-  }
-  
-  # Display any existing breakpoints.
-  foreach bpnum [gdb_get_breakpoint_list] {
-    set info [gdb_get_breakpoint_info $bpnum]
-    set addr [lindex $info 3]
-    set line [lindex $info 2]
-    set file [lindex $info 0]
-    set type [lindex $info 6]
-    set enabled [lindex $info 5]
-    bp create $bpnum $addr $line $file $type $enabled
-  }
-  # Display any existing tracepoints.
-  foreach bpnum [gdb_get_tracepoint_list] {
-    set info [gdb_get_tracepoint_info $bpnum]
-    set addr [lindex $info 3]
-    set line [lindex $info 2]
-    set file [lindex $info 0]
-    bp create $bpnum $addr $line $file tracepoint
-  }
-}
-
-# ------------------------------------------------------------------
-# METHOD: insertBreakTag - insert the right amount of tag chars
-#         into the text window WIN, at line linenum.
-# ------------------------------------------------------------------
-itcl::body SrcTextWin::insertBreakTag {win linenum tag} {
-#  debug "$win $linenum $tag"
-  
-  # Get the tags at the current line.  
-  
-  # If there is a "break_rgn_tag", then there are currently no other
-  # break/trace points at this line.  So replace the break_rgn_tag
-  # with this tag.  Otherwise, add the new tag, and then the joint
-  # tag.  We will query the length of the previous tag, so we don't have
-  # to hard code it here.
-  
-  set tag_list [$win tag names $linenum.0]
-  set img_name [string range $tag 0 [expr [string length $tag] - 5]]
-  
-  if {[lsearch $tag_list break_rgn_tag] != -1} {
-    set stop [lindex [$win tag nextrange break_rgn_tag \
-			$linenum.0 "$linenum.0 lineend"] 1]
-    $win tag remove break_rgn_tag $linenum.0 "$linenum.0 lineend"
-    $win delete $linenum.0
-
-    # Strip the "_tag" off the end of the tag to get the image name.
-    $win image create $linenum.0 -image $break_images($img_name)
-    $win tag add $tag $linenum.0 $stop
-  } else {
-    set other_tag [lindex $tag_list \
-		     [lsearch -glob $tag_list {*[bt]p_tag}]]
-    if {$other_tag == ""} {
-      set stop 4
-    } else {
-      set stop [lindex [$win tag nextrange $other_tag \
-			  $linenum.0 "$linenum.0 lineend"] 1]
-    }
-
-    $win tag add $tag $linenum.0 $stop
-    $win image configure $linenum.0 -image $break_images($img_name)
-
-  }
-}
-
-# ------------------------------------------------------------------
-# METHOD: removeBreakTag - remove a break tag (breakpoint or tracepoint)
-#         from the given line.  If this is the last break tag on the 
-#         line reinstall the break_rgn_tag
-# ------------------------------------------------------------------
-itcl::body SrcTextWin::removeBreakTag {win linenum tag } {
-#  debug "$win $linenum $tag"
-
-  set tag_list [$win tag names $linenum.0]
-
-  if {[set pos [lsearch -exact $tag_list $tag]] == -1} {
-    debug "Tried to remove non-existant tag $tag"
-    return
-  } else {
-    set tag_list [lreplace $tag_list $pos $pos]
-  }
-
-  # Use the range of the removed tag for any insertions, so we don't
-  # have to hard code it here.
-
-  set stop [lindex [$win tag nextrange $tag \
-		      $linenum.0 "$linenum.0 lineend"] 1]
-
-  $win tag remove $tag $linenum.0 "$linenum.0 lineend"
-
-  # Now check what other tags are on this line.  If there are both bp & tp
-  # tags, also remove the joint tag, otherwise install the break_rgn_tag.
-
-  switch -glob $tag {
-    *bp_tag {
-      set only_one_tag [expr [set next_tag_index \
-				[lsearch -glob $tag_list tp_tag]] == -1]
-    }
-    tp_tag {
-      # Got to find out what kind of tag is here...
-      set only_one_tag [expr [set next_tag_index \
-				[lsearch -glob $tag_list *bp_tag]] == -1]
-    }
-  }
-
-  if {$only_one_tag} {
-    catch {$win image configure $linenum.0 -image {}}
-    $win delete $linenum.0
-    $win insert $linenum.0 "-"
-    $win tag add break_rgn_tag $linenum.0 $stop
-  } else {
-    set other_tag [lindex $tag_list $next_tag_index]
-    set img_name [string range $other_tag 0 \
-		    [expr [string length $other_tag] - 5]]
-    $win image configure $linenum.0 -image $break_images($img_name)
-    $win tag remove bp_and_tp_tag $linenum.0 "$linenum.0 lineend"
-  }
-}
-
-# ------------------------------------------------------------------
-#  PUBLIC METHOD:  breakpoint - Handle a breakpoint create, delete,
-#                   or modify event from the backend.
-# ------------------------------------------------------------------
-itcl::body SrcTextWin::breakpoint {bp_event} {
-
-  bp [$bp_event get action] [$bp_event get number] [$bp_event get address] \
-    [$bp_event get line] [$bp_event get file] [$bp_event get disposition]  \
-    [$bp_event get enabled] [$bp_event get thread]
-}
-
-# ------------------------------------------------------------------
-#  PUBLIC METHOD:  tracepoint - Handle a tracepoint create, delete,
-#                   modify event from the backend.
-# ------------------------------------------------------------------
-itcl::body SrcTextWin::tracepoint {tp_event} {
-
-  bp [$tp_event get action] [$tp_event get number] [$tp_event get address] \
-    [$tp_event get line] [$tp_event get file] tracepoint                   \
-    [$tp_event get pass_count]
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  bp - set and remove breakpoints
-#
-#  if $addr is valid, the breakpoint will be set in the assembly or 
-#  mixed window at that address.  If $line and $file are valid, 
-#  a breakpoint will be set in the source window if appropriate.
-# ------------------------------------------------------------------
-itcl::body SrcTextWin::bp {action bpnum addr {linenum {}} {file {}} {type 0} {enabled 0}  {thread -1}} {
-#  debug "$action addr=$addr line=$linenum file=$file type=$type current(filename)=$current(filename)"
-
-  switch $current(mode) {
-    SOURCE {
-      if {[string compare $file $current(filename)] == 0 && $linenum != {}} {
-	do_bp $twin $action $linenum $type $bpnum $enabled $thread 0
-      }
-    }
-
-    SRC+ASM {
-      if {$addr != {} && [info exists _map($Cname,pc=$addr)]} {
-	do_bp $bwin $action $_map($Cname,pc=$addr) $type $bpnum \
-	  $enabled $thread 1
-      }
-      if {[string compare $file $current(filename)] == 0 && $linenum != {}} {
-	do_bp $twin $action $linenum $type $bpnum $enabled $thread 0
-      }
-    }
-
-    ASSEMBLY {
-      if {$addr != {} &&[info exists _map($Cname,pc=$addr)]} {
-	do_bp $twin $action $_map($Cname,pc=$addr) $type $bpnum \
-	  $enabled $thread 1
-      }
-    }
-
-    MIXED {
-      if {$addr != {} && [info exists _map($Cname,pc=$addr)]} {
-	do_bp $twin $action $_map($Cname,pc=$addr) $type $bpnum \
-	  $enabled $thread 1
-      }
-    }
-  }
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  do_bp - bp helper function
-# ------------------------------------------------------------------
-itcl::body SrcTextWin::do_bp { win action linenum type bpnum enabled thread asm} {
-#  debug "$action line=$linenum type=$type bpnum=$bpnum enabled=$enabled thread=$thread"
-
-  if {$dont_change_appearance} {
-    return
-  }
-
-  if {$action == "delete" && [string compare $type tracepoint] != 0} {
-    # make sure there are no more breakpoints on
-    # this line.
-    if {!$asm} {
-      set bps [gdb_find_bp_at_line $current(filename) $linenum]
-    } else {
-      if {[info exists _map($Cname,line=$linenum)]} {
-	set bps [gdb_find_bp_at_addr $_map($Cname,line=$linenum)]
-      } else {
-	set bps {}
-      }
-    }
-    if {[llength $bps] > 0} {
-      foreach b $bps {
-	if {$b != $bpnum} {
-	  # OK we found another BP on this line.
-	  # So we really just want to modify whats
-	  # displayed on the line instead of deleting it.
-	  # Also, for lack of a better solution, we will
-	  # just display an image corresponding to the
-	  # first found BP.  If you have a temporary and
-	  # a perm BP on the same line, the image for the one 
-	  # with the lower bpnum will be displayed.
-	  set inf [gdb_get_breakpoint_info $b]
-	  set action "modify"
-	  set type [lindex $inf 6]
-	  set bpnum $b
-	  break
-	}
-      }
-    }
-  }
-
-  if {[string compare $type "tracepoint"] == 0} {
-    if {[string compare $action "delete"] != 0
-	&& [lindex [gdb_get_tracepoint_info $bpnum] 4] == 0} {
-      set type disabled_tracepoint
-    }
-  } else {
-    if {$enabled == "0" } {
-      set type disabled_bp
-    } elseif {$thread != "-1"} {
-      set type thread
-    }
-  }
-
-  switch $type {
-    donttouch {
-      set tag_type bp_tag
-      set remove_type disabled_bp_tag
-    }
-    delete {
-      set tag_type temp_bp_tag
-    }
-    disabled_bp {
-      set tag_type disabled_bp_tag
-      set remove_type bp_tag
-    }
-    tracepoint {
-      set tag_type tp_tag
-      set remove_type disabled_tp_tag
-    }
-    disabled_tracepoint {
-      set tag_type disabled_tp_tag
-      set remove_type tp_tag
-    }
-    thread {
-      set tag_type thread_bp_tag
-    }
-    default {
-      dbug E "UNKNOWN BP TYPE action=\"$action\" type=\"$type\""
-      $win insert $linenum.0 "X" bp_tag
-      set tag_type bp_tag
-    }
-  }
-
-  if {[string compare $action "delete"] == 0} {
-    removeBreakTag $win $linenum $tag_type
-  } else {
-    if {[string compare $action "modify"] == 0 && $remove_type != ""} {
-      removeBreakTag $win $linenum $remove_type
-    }
-    insertBreakTag $win $linenum $tag_type
-  }
-}
-
-
-# ------------------------------------------------------------------
-#  METHOD:  hasBP - see if a line number has a breakpoint set
-# ------------------------------------------------------------------
-itcl::body SrcTextWin::hasBP {win line} {
-  if {$win == ""} {
-    set win $popups(saved_win)
-  }
-
-  if {[lsearch -glob [$win tag names $line.0] *bp_tag] >= 0} {
-    return 1
-  }
-  return 0
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  hasTP - see if a line number has a tracepoint set
-# ------------------------------------------------------------------
-itcl::body SrcTextWin::hasTP {win line} {
-  if {$win == ""} {
-    set win $popups(saved_win)
-  }
-
-  if {[lsearch -exact [$win tag names $line.0] tp_tag] == 1} {
-    return 1
-  }
-  return 0
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  report_source_location
-#    
-#    This function reports the "current" location in the source
-#    window, where current means what gdb_loc would return, if 
-#    that point is actually visible in the window, or the middle
-#    of the current window, if that point is not visible.
-#
-#  Return:
-#    The gdb_loc result for the location found
-# ------------------------------------------------------------------
-itcl::body SrcTextWin::report_source_location {} {
-  
-  if {$current(filename) == ""} {
-    error "No source file in window"
-  }
-
-  # Figure out if the return from gdb_loc is visible.
-
-  set not_visible 1
-  if {![catch {gdb_loc} loc_info]} {
-    set loc_long_name [lindex $loc_info 2]
-    set loc_line [lindex $loc_info 3]
-#    debug "Got loc_info: \"$loc_info\" and filename $current(filename) long_name: $loc_long_name"
-    if {[string compare $current(filename) $loc_long_name] != 0} {
-      set not_visible 1
-    } else {
-      foreach {name line} [lookup_line $twin 1] {
-	break
-      }
-      if {$line < $loc_line} {
-	foreach {name line} [lookup_line $twin [winfo height $twin]] {
-	  break
-	}
-	if {$line > $loc_line} {
-	  set not_visible 0
-	}
-      }
-    }
-  } else {
-    debug "gdb_loc returned $loc_info"
-  }
-
-  if {$not_visible} {
-    set y [expr int([winfo height $twin] / 2)]
-    foreach {name line addr type} [lookup_line $twin $y] {
-      break
-    }
-    switch $type {
-      src {
-	return [gdb_loc $name:$addr]
-      }
-      asm {
-	return [gdb_loc *$addr]
-      }
-    }
-  } else {
-    return $loc_info
-  }
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  lookup_line - translated win & y position line info
-#
-#    If win is {}, or y is -1, then the saved values from the popup
-#    array are used.
-#
-#  Return:
-#    name - the fileName
-#    line - the line number in the text widget
-#    addr - the source line number, if in source mode, the
-#           address if in assembly mode, and if in mixed mode,
-#           the line if it is a source line, or the address if it
-#           is an assembly line
-#    type - src if it is a source line, asm if an assembly line.
-#   set_cmd - for convenience, this is the command needed to set a 
-#             breakpoint at this address.
-# ------------------------------------------------------------------
-itcl::body SrcTextWin::lookup_line {win y} {
-  #debug "$win $y"
-  if {$y == -1} {
-    set y $popups(saved_y)
-  }
-
-  if {$win == {}} {
-    set win $popups(saved_win)
-  }
-
-  scan [$win index @0,$y] "%d." line
-  set name [lindex [::file split $current(filename)] end]
-
-  # If we are in the SOURCE window (either because the mode is SOURCE,
-  # or SRC+ASM, and we are in the upper pane, then return the 
-  if {([string compare $current(mode) SOURCE] == 0)
-      || ([string compare $current(mode) SRC+ASM] == 0 
-	  && [string compare $win $twin] == 0)} {
-    set addr $line
-    set type "src"
-  } else {
-    if {[info exists _map($Cname,line=$line)]} {
-      set addr $_map($Cname,line=$line)
-      set type "asm"
-    } else { 
-      # This is a source line in MIXED mode
-      set line_contents [$win get $line.0 "$line.0 lineend"]
-      #debug "Looking at line: $line contents: \"$line_contents\""
-      regexp "^\t(\[0-9\]*)" $line_contents match srcline
-      set addr $srcline
-      set type "src"
-    }
-  }
-
-  switch $type {
-    asm {
-      set set_cmd [list gdb_set_bp_addr $addr]
-    }
-    src {
-      set set_cmd [list gdb_set_bp $current(filename) $addr]
-    }
-  }
-
-  #debug "Lookup line returning [list $name $line $addr $type $set_cmd]"
-  return [list $name $line $addr $type $set_cmd]
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  continue_to_here - Advance to the line pointed to by the
-#  y coordinate in the window win.  If win is {} or y is -1, the values
-#  saved in the popups array are used.  
-#
-#  The threads parameter is not currently used.
-# ------------------------------------------------------------------
-itcl::body SrcTextWin::continue_to_here {{win {}} {y -1} {threads -1}} {
-  
-  # Look up the line...  This foreach is an lassign...
-  foreach {name line addr type set_cmd} [lookup_line $win $y] {
-    break
-  }
-
-  set dont_change_appearance 1
-  foreach i [gdb_get_breakpoint_list] {
-    set enabled($i) [lindex [gdb_get_breakpoint_info $i] 5]
-  }	    
-  gdb_cmd "disable"
-  eval $set_cmd temp $threads
-  gdb_immediate "continue"
-  gdb_cmd "enable"
-  foreach i [gdb_get_breakpoint_list] {
-    if {![info exists enabled($i)]} {
-      gdb_cmd "delete $i"
-    } elseif {!$enabled($i)} {
-      gdb_cmd "disable $i"
-    }
-  }
-  set dont_change_appearance 0
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  jump_to_here - Advance to the line pointed to by the
-#  y coordinate in the window win.  If win is {} or y is -1, the values
-#  saved in the popups array are used.  
-#
-#  The threads parameter is not currently used.
-# ------------------------------------------------------------------
-itcl::body SrcTextWin::jump_to_here {{win {}} {y -1} {threads -1}} {
-  
-  # Look up the line...  This foreach is an lassign...
-  foreach {name line addr type set_cmd} [lookup_line $win $y] {
-    break
-  }
-
-  # Unfortunately we cant set the pc to a linespec and we have to do a
-  # trick with a temporary breakpoint and the jump command.
-  # FIXME: Get the address from the linespec.
-  # FIXME: Even in the case we do have an address, I was not able to just
-  # change the PC and get things updated wright.  While I work on that,
-  # I will use the temp breakpoint and jump trick for that case as well.
-  
-  set dont_change_appearance 1
-  
-  foreach i [gdb_get_breakpoint_list] {
-    set enabled($i) [lindex [gdb_get_breakpoint_info $i] 5]
-  }	    
-  gdb_cmd "disable"
-  
-  if {$type == "asm"} {
-    gdb_immediate "tbreak *$addr"
-    gdb_immediate "jump *$addr"
-  } else {
-    eval $set_cmd temp $threads
-    gdb_immediate "jump $name:$line"
-  }
-  gdb_cmd "enable"
-  foreach i [gdb_get_breakpoint_list] {
-    if {![info exists enabled($i)]} {
-      gdb_cmd "delete $i"
-    } elseif {!$enabled($i)} {
-      gdb_cmd "disable $i"
-    }
-  }
-  set dont_change_appearance 0
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  set_bp_at_line - called when an empty break tag is clicked on
-#
-# When "threads" is set it means to set a bp on each thread in the list.
-# ------------------------------------------------------------------
-itcl::body SrcTextWin::set_bp_at_line {{type N} {win {}} {y -1} {threads "-1"}} {
-#  debug "$win $y $type $current(filename) Tracing=$Tracing"
-  if {$Running} {return}
-  
-  # Look up the line...  This foreach is an lassign...
-
-  foreach {name line addr addr_type set_cmd} [lookup_line $win $y] {
-    break
-  }
-
-  foreach th $threads {    
-    switch $type {
-      N {
-	if {[catch {eval $set_cmd normal $th} msg]} {
-	  dbug W $msg
-	}
-      }
-      T {
-	if {[catch {eval $set_cmd temp $th} msg]} {
-	  dbug W $msg
-	}
-      }
-    }    
-  }
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  enable_disable_at_line - Enable or disable breakpoint
-# ------------------------------------------------------------------
-itcl::body SrcTextWin::enable_disable_at_line {action} {
-  if {$Running} {
-    return
-  }
-
-  # FIXME: should this work on $bwin as well?  In that case we'd need
-  # a `win' argument...
-
-  set y $popups(saved_y)
-
-  $twin tag remove _show_variable 1.0 end 
-  set line [lindex [split [$twin index @0,$y] .] 0]
-  set bps ""
-
-  switch $current(mode) {
-    SRC+ASM {
-    }
-    ASSEMBLY {
-      if {[info exists _map($Cname,line=$line)]} {
-	set addr $_map($Cname,line=$line)
-	set bps [gdb_find_bp_at_addr $addr]
-      } else {
-	return
-      }
-    }
-    MIXED {
-      if {[info exists _map($Cname,line=$line)]} {
-	set addr $_map($Cname,line=$line)
-	set bps [gdb_find_bp_at_addr $addr]
-      } else {
-	return
-      }
-    }
-  }
-
-  if {$bps == ""} {
-    set bps [gdb_find_bp_at_line $current(filename) $line]
-  }
-
-  # ACTION is `enable' or `disable'
-  gdb_cmd "$action $bps"
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  remove_bp_at_line - called when a bp tag is clicked on
-#
-# when "threads" is set it means to set a bp on each thread in the list.
-# ------------------------------------------------------------------
-itcl::body SrcTextWin::remove_bp_at_line {{win {}} {y -1}} {
-  
-  if {$Running} {return}
-  
-  # Look up the line...  This foreach is an lassign...
-
-  foreach {name line addr type} [lookup_line $win $y] {
-    break
-  }
-
-  # FIXME: if there are multiple bp/tp at a single line,
-  # we will (right now) always take the first one we find...
-  switch $type {
-    src { set bps [gdb_find_bp_at_line $name $addr] }
-    asm { set bps [gdb_find_bp_at_addr $addr] }
-  }
-
-  set number [lindex $bps 0]
-  gdb_cmd "delete $number"
-}
-
-
-# ------------------------------------------------------------------
-#  METHOD:  set_tp_at_line - called when an empty break region tag is clicked on
-#
-# when "threads" is set it means to set a bp on each thread in the list.
-# ------------------------------------------------------------------
-itcl::body SrcTextWin::set_tp_at_line {{win {}} {y -1}} {
-#  debug "$win $y $current(filename) Tracing=$Tracing"
-
-  if {$Running} {return}
-  
-  # Look up the line...  This foreach is an lassign...
-  
-  foreach {name line addr type} [lookup_line $win $y] {
-    break
-  }
-  
-  switch $type {
-    src {
-      after idle [list ManagedWin::open TraceDlg -File $name -Lines $addr]
-    }
-    asm {
-      after idle [list ManagedWin::open TraceDlg -File $name -Addresses [list $addr]]
-    }
-  }
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  next_hit_at_line - Finds the next trace hit at the line
-#           given by win & y...
-#
-# ------------------------------------------------------------------
-itcl::body SrcTextWin::next_hit_at_line {{win {}} {y -1}} {
-#  debug "$win $y $current(filename) Tracing=$Tracing"
-
-  if {!$Browsing} {return}
-  
-  # Look up the line...  This foreach is an lassign...
-  
-  foreach {name line addr type} [lookup_line $win $y] {
-    break
-  }
-  
-  # If the line and the addr are the same, then the specification was
-  # given by line.  Otherwise is was a memory address.
-
-  switch $type {
-    src {
-      tfind_cmd "tfind line $name:$addr"
-    }
-    asm {
-      tfind_cmd "tfind line *$addr"
-    }
-  }
-  
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  remove_tp_at_line - called when a tp tag is clicked on
-#
-# when "threads" is set it means to set a bp on each thread in the list.
-# ------------------------------------------------------------------
-itcl::body SrcTextWin::remove_tp_at_line {{win {}} {y -1}} {
-  
-  if {$Running} {return}
-  
-  # Look up the line...  This foreach is an lassign...
-  
-  foreach {name line addr type} [lookup_line $win $y] {
-    break
-  }
-  switch $type {
-    src {
-      set tp_num [gdb_tracepoint_exists $name:$addr]
-    }
-    asm {
-      set tp_num [gdb_tracepoint_exists *$addr]
-    }
-  }
-  
-  if {$tp_num != -1} {
-    if {[catch {gdb_cmd "delete tracepoints $tp_num"} errTxt]} {
-      tk_messageBox -type error -message "Could not delete tracepoint number $tp_num
-Error was: $errTxt"
-    }
-  } 
-
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  do_tag_popup - The tag bind function for breakpoint popups
-# ------------------------------------------------------------------
-
-itcl::body SrcTextWin::do_tag_popup {name X Y y} {
-
-#  debug "$name $X $Y $y"
-
-  if {$Running || [winfo ismapped $popups($name)]} { 
-    return 
-  }  
-
-  set popups(saved_y) $y
-  set popups(saved_win) [winfo containing -displayof $itk_interior $X $Y] 
-
-  # Hide variable balloons before showing the popup
-  $twin tag remove _show_variable 1.0 end
-  balloon withdraw $twin
-
-  tk_popup $popups($name) $X $Y
-
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  do_source_popup - tag bind function for source popups
-# ------------------------------------------------------------------
-
-itcl::body SrcTextWin::do_source_popup { X Y x y } {
-  if {$Running || [winfo ismapped $popups(source)]} { 
-    return 
-  }
-
-  # Figure out what window we are over...
-  set win [winfo containing -displayof $itk_interior $X $Y]
-
-  # Hide variable balloons before showing the popup
-  $win tag remove _show_variable 1.0 end
-  balloon withdraw $win
-  catch {$_balloon_var delete}
-
-
-  # Try to get the selection.  If you fail, get the word around the
-  # click point.  
-  # Note that we don't have to worry about the user clicking over the
-  # break area, since the break_rgn_tag will override this...
-  
-  set hit_point [$win index @$x,$y]
-  if {([$win tag ranges sel] != "")
-      && ([$win compare sel.first < $hit_point]
-	    && [$win compare $hit_point < sel.last])} {
-    set sel_first [$win index sel.first]
-    set sel_last  [$win index sel.last]
-
-    # If there was a selection, see if it spans multiple lines.
-    scan $sel_first "%d.%d" range_low sel_start_char
-    scan $sel_last "%d.%d" range_high sel_end_char
-
-    if {$range_low == $range_high} {
-      set range -1
-      set target_range [$win get sel.first sel.last]
-    } else {
-      # If the selection encompasses multiple lines, we only care about
-      # the start and ending line numbers
-      set range 1
-    }
-  } else {
-    set target_range [$win get "$hit_point wordstart" "$hit_point wordend"]
-    set range 0
-  }
-  
-  $popups(source) delete 0 end
-  
-  if {$range && $Tracing} {
-    # If the selection spans more than one line, it can't be a variable name...
-    # So just insert the tracepoint range item
-    $popups(source) add command -label "Set Tracepoint Range" \
-      -command "$this tracepoint_range $win $range_low $range_high"
-    $popups(source) add separator
-  } elseif {$range != 1} {
-    # RANGE = -1 means that we have already found the word we want (it was
-    #          a selection)...
-    # RANGE = 1 means we got the word around the point, and we are just saving
-    #          getVariable the trouble of parsing it again.
-    if {$range == -1} {
-      set variable $target_range
-    } else {
-      set variable [lindex [getVariable -1 -1 $target_range] 0]
-    }
-    
-    if {$variable != ""} {
-      # LAME: check to see if VARIABLE is really a number (constants??)
-      set is_var [catch {expr {$variable+1}}]
-
-      if {$is_var} {
-	$popups(source) add command -label "Add $variable to Watch" \
-	  -command [list $this addToWatch $variable]
-	$popups(source) add command -label "Dump Memory at $variable" \
-	  -command [list ManagedWin::open MemWin -force -addr_exp $variable]
-	$popups(source) add command -label "Set Breakpoint at $variable" \
-	  -command [list gdb_cmd "break $variable"]
-	$popups(source) add separator
-      }
-    }
-  }
-
-  $popups(source) add command -label "Open Another Source Window" \
-    -command {ManagedWin::open SrcWin -force}
-  $popups(source) add command -label "Open Source in external editor" \
-    -command [code $parent edit]
-
-  tk_popup $popups(source) $X $Y 
-}
-
-# ------------------------------------------------------------------
-# METHOD:  addToWatch - add a variable to the watch window
-# ------------------------------------------------------------------
-itcl::body SrcTextWin::addToWatch {var} {
-  [ManagedWin::open WatchWin] add $var
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  do_key  -- wrapper for all key bindings
-# ------------------------------------------------------------------
-itcl::body SrcTextWin::do_key {key} {    
-  if {!$Running} {
-    switch $key {
-      print        { print $top }
-      download     { Download::download_it }
-      run          { $parent inferior run }
-      stack        { ManagedWin::open StackWin }
-      registers    { ManagedWin::open RegWin }
-      memory       { ManagedWin::open MemWin }
-      watch        { ManagedWin::open WatchWin }
-      locals       { ManagedWin::open LocalsWin }
-      breakpoints  { ManagedWin::open BpWin }
-      console      { ManagedWin::open Console }
-      step         { $parent inferior step }
-      next         { $parent inferior next }
-      finish       { $parent inferior finish }
-      continue     { $parent inferior continue }
-      stepi        { $parent inferior stepi }
-      nexti        { $parent inferior nexti }
-      up           { catch {gdb_cmd up} }
-      down         { catch {gdb_cmd down} }
-      quit         { gdbtk_quit }
-      tdump        { ManagedWin::open TdumpWin }
-      tracepoints  { ManagedWin::open BpWin -tracepoints 1}
-      tfind_next   { catch {gdb_immediate tfind} }
-      tfind_prev   { catch {gdb_immediate "tfind -"} }
-      tfind_start  { catch {gdb_immediate "tfind start"} }
-      tfind_line   { catch {gdb_immediate "tfind line"} }
-      tfind_tp     { catch {gdb_immediate "tfind tracepoint"} }
-      open         { catch {_open_file} }
-      close        { catch {_close_file} }
-      browser      { catch {ManagedWin::open BrowserWin} }
-      thread_list  { catch {ManagedWin::open ProcessWin} }
-      debug	     { catch {ManagedWin::open DebugWin} }
-      kod          { catch {ManagedWin::open KodWin} }
-      attach       { catch {gdbtk_attach_native} }
-      default      {
-	dbug E "Unknown key binding: \"$key\""
-      }
-    }
-  } else {
-#    debug "ignoring keypress -- running"
-  }
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  mode_get - get the source mode
-# ------------------------------------------------------------------
-itcl::body SrcTextWin::mode_get {} {
-  return $current(mode)
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  mode_set - change the source mode
-# ------------------------------------------------------------------
-itcl::body SrcTextWin::mode_set {new_mode {go 1}} {
-  debug "$new_mode"
-
-  if {$new_mode != $current(mode)} {
-
-    if {$current(mode) == "SRC+ASM"} {
-      if {$_bpane != ""} {$itk_interior.p hide $_bpane}
-      set _bpane ""
-      set _bwin ""
-    }
-    
-    set current(mode) $new_mode
-    set mode_changed 1
-
-    if {$go} {
-      location $current(tag) $current(filename) $current(funcname) \
-	$current(line) $current(addr) $pc(addr) $current(lib)
-    }
-  }
-}
-
-# ------------------------------------------------------------------
-# METHOD:  cancelMotion - cancel any pending motion callbacks for
-#          the source window's variable balloons
-# ------------------------------------------------------------------
-itcl::body SrcTextWin::cancelMotion {} {
-  catch {after cancel $timeoutID}
-}
-
-# ------------------------------------------------------------------
-# METHOD:  motion - callback for mouse motion within the source
-#          window's text widget
-# ------------------------------------------------------------------
-itcl::body SrcTextWin::motion {type win x y} {
-  global gdb_running
-  cancelMotion
-
-  # The showBalloon method can sometimes raise errors (for instance in
-  # assembly code with no sources, and when gdb coughs over a path
-  # that contains a space.  These functions should error quietly.
-  # but write to the debug window so we can trace problems.
-
-  if {$type == "var"} {
-    set cmd_bit ""
-  } else {
-    set cmd_bit BP
-  }
-  set cmd_line [format {
-    if {[catch {%s show%sBalloon %s %d %d} err]} {
-      debug "show%sBalloon got error: $err"
-    }
-  } $this $cmd_bit $win $x $y $cmd_bit]
-  set timeoutID [after $TimeOut $cmd_line]
-}
-
-
-# ------------------------------------------------------------------
-# METHOD:  showBPBalloon - show BP information in a balloon
-# ------------------------------------------------------------------
-itcl::body SrcTextWin::showBPBalloon {win x y} {
-  if {$Running} { return }
-  $win tag remove _show_variable 1.0 end 
-  set line [lindex [split [$win index @0,$y] .] 0]
-  set bps ""
-
-  switch $current(mode) {
-    SRC+ASM {
-      if {$win == $bwin} {
-	if {[info exists _map($Cname,line=$line)]} {
-	  set addr $_map($Cname,line=$line)
-	  set bps [gdb_find_bp_at_addr $addr]
-	} else {
-	  return
-	}
-      }
-    }
-    ASSEMBLY {
-      if {[info exists _map($Cname,line=$line)]} {
-	set addr $_map($Cname,line=$line)
-	set bps [gdb_find_bp_at_addr $addr]
-      } else {
-	return
-      }
-    }
-    MIXED {
-      if {[info exists _map($Cname,line=$line)]} {
-	set addr $_map($Cname,line=$line)
-	set bps [gdb_find_bp_at_addr $addr]
-      } else {
-	return
-      }
-    }
-  }
-
-  if {$bps == ""} {
-    set bps [gdb_find_bp_at_line $current(filename) $line]
-  }
-
-  set str ""
-  set need_lf 0
-  foreach b $bps {
-    set bpinfo [gdb_get_breakpoint_info $b]
-    lassign $bpinfo file func linenum addr type enabled disposition \
-      ignore_count commands cond thread hit_count user_specification
-    set file [lindex [file split $file] end]
-    if {$enabled} {
-      set enabled "ENA"
-    } else {
-      set enabled "DIS"
-    }
-
-    if {$need_lf} {append str \n}
-
-    append str [format "breakpoint %d at %s:%d (%s)\n   %s %s %s" \
-		  $b $file $linenum $addr $enabled $type $disposition]
-
-    if {$thread != "-1"} {
-      append str "\n   threads: $thread"
-    }
-
-    if {$ignore_count != 0} {
-      append str "\n   ignore: $ignore_count"
-    }
-
-    if {$cond != ""} {
-      append str "\n   condition: $cond"
-    }
-
-    if {$commands != ""} {
-      if {[string length $commands] > 50} {
-	append str "\n   commands: [string range $commands 0 50] ..."
-      } else {
-	append str "\n   commands: $commands"
-      }
-    }
-    set need_lf 1
-  }
-
-  # Scope out which break type is set here, and use the tag to get
-  # the break region range...
-
-  set tag_list [$win tag names $line.0]
-  set break_tag [lindex $tag_list [lsearch -glob $tag_list *bp_tag]]
-  set end [lindex [$win tag nextrange $break_tag $line.0 $line.end] 1]
-
-  if {$end != ""} {
-    $win tag add _show_variable $line.0 $end
-    balloon register $win $str _show_variable
-    balloon show $win _show_variable 1
-  }
-}
-
-# ------------------------------------------------------------------
-# METHOD:  showBalloon - (possibly) show a variable's value in
-#          a balloon-help widget
-# ------------------------------------------------------------------
-itcl::body SrcTextWin::showBalloon {win x y} {
-  if {$Running} { return }
-
-  $twin tag remove _show_variable 1.0 end
-  catch {tmp delete}
-
-
-  if {[catch  {getVariable $x $y} variable]} {
-    return
-  }
-
-  if {[llength $variable] != 3} {
-    return
-  }    
-  
-  # We get the variable name, and its start and stop indices in the text 
-  # widget, so all we need to do is set the tag and register the balloon help
-  set varName [lindex $variable 0]
-  set start   [lindex $variable 1]
-  set stop    [lindex $variable 2]
-
-  # Get the address associated with this line
-  foreach {file text_line source_line type} [lookup_line $twin $y] {
-    break
-  }
-
-  # Reduce the areas over which we will show balloons.
-  # 1) Only pop up a balloon if we are over the function in
-  #    the currently selected frame, or in the static data for
-  #    the file.
-  # 2) We would also like to exclude cases where the line that 
-  #    under the mouse cursor does not contain executable code, 
-  #    but we can't since gdb considers continuation lines to not
-  #    have executible code so we would lose on these...
-  
-  set cur_fn [lindex [gdb_loc $file:$source_line] 1]
-  set selected_frame_fn [lindex [gdb_loc] 1]
-
-  if {[string compare $cur_fn $selected_frame_fn] == 0} {
-    # Create the variable object
-    catch {$_balloon_var delete}
-    set err [catch {gdb_variable create -expr $varName} _balloon_var]
-    if {!$err} {
-      set value [balloon_value $_balloon_var]
-      if {$value != ""} {
-	$win tag add _show_variable $start $stop
-
-	# display variable's value
-	balloon register $twin "$varName=$value" _show_variable
-	balloon show $win _show_variable
-      } else {
-	# No value/error. Don't show it.
-	catch {$_balloon_var delete}
-	set _balloon_var {}
-      }
-    } else {
-      set _balloon_var {}
-    }
-  } else {
-    set _balloon_var {}
-  }
-}
-
-# ------------------------------------------------------------------
-# METHOD:  getVariable - get the name of the 'variable' under the
-#          mouse pointer in the text widget
-# ------------------------------------------------------------------
-itcl::body SrcTextWin::getVariable {x y {line {}}} {
-  #debug "$x $y $line"
-  set hit_point [$twin index @$x,$y]
-
-  if {$x != -1 && $y != -1} {
-    # If we are over a selection, just report that:
-    if {([$twin tag ranges sel] != "")
-	&& ([$twin compare sel.first < $hit_point] 
-	    && [$twin compare $hit_point < sel.last])} {
-      return [list [$twin get sel.first sel.last] [$twin index sel.first] [$twin index sel.last]]
-    } 
-    # Since we will only be concerned with this line, get it
-    set line [$twin get "$hit_point linestart" "$hit_point lineend"]
-    # debug "new line=$line"
-    set simple 0
-  } else {
-    # This is not quite right -- still want constants to appear...
-    set simple 1
-  }
-
-  # The index into LINE that contains the char at which the pointer hangs
-  set a [split [$twin index @$x,$y] .]
-  set lineNo [lindex $a 0]
-  set index  [lindex $a 1]
-  set s [string range $line $index end]
-  set last {}
-  foreach char [split $s {}] {
-    if {[regexp -- {([^a-zA-Z0-9_>.-])} $char dummy]} {
-      break
-    }
-    lappend last $char
-  }
-  set last [string trimright [join $last {}] ->]
-
-  # Decrement index for string -- will need to increment it later
-  incr index -1
-  set tmp [string range $line 0 $index]
-  set s {}
-  foreach char [split $tmp {}] {
-    set s [linsert $s 0 $char]
-  }
-
-  set first {}
-  foreach char $s {
-    if {[regexp -- {([^a-zA-Z0-9_>.-])} $char dummy]} {
-      break
-    }
-    set first [linsert $first 0 $char]
-  }
-  #set first [string trimleft [join $first {}] ->]
-  set first [join $first {}]
-  #debug "FIRST=$first\nLAST=$last"
-
-  # Validate the variable
-  set variable [string trim $first$last \ ]
-  if {!$simple && ![regexp {^[a-zA-Z_]} $variable dummy]} {
-    #debug "Rejecting: $variable"
-    return {}
-  }
-
-  incr index
-  # Find the boundaries of this word in the text box
-  set a [string length $first]
-  set b [string length $last]
-
-  # Gag! If there is a breakpoint at a line, this is off by one!
-  if {[hasBP $twin $lineNo] || [hasTP $twin $lineNo]} {
-    incr a -1
-    incr b 1
-  }
-  set start "$lineNo.[expr {$index - $a}]"
-  set end   "$lineNo.[expr {$index + $b}]"
-  return [list $variable $start $end]
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  trace_help - update statusbar with ballon help message
-# ------------------------------------------------------------------
-itcl::body SrcTextWin::trace_help {args} {
-  upvar #0 ${this}_balloon a
-  if {$a == ""} {
-    $parent set_status
-  } else {
-    $parent set_status $a 1
-  }
-}
-
-itcl::body SrcTextWin::line_is_executable {win line} {
-  # there should be an image or a "-" on the line
-  set res [catch {$win image cget $line.0 -image}]
-  if {!$res || [$win get $line.0] == "-"} {
-    return 1
-  }
-  return 0
-}
-
-# ------------------------------------------------------------------
-# METHOD:   tracepoint_range - create tracepoints at every line in
-#           a range of lines on the screen
-# ------------------------------------------------------------------
-itcl::body SrcTextWin::tracepoint_range {win low high} {
-#  debug "$win $low $high"
-
-  switch $current(mode) {
-    SOURCE {
-      set lines {}
-      for {set i $low} {$i <= $high} {incr i} {
-	if {[line_is_executable $win $i]} {
-	  lappend lines $i
-	}
-      }
-    }
-
-    ASSEMBLY {
-      set addrs {}
-      for {set i $low} {$i <= $high} {incr i} {
-	lappend addrs $_map($Cname,line=$i)
-      }
-    }
-
-    MIXED {
-      set addrs {}
-      for {set i $low} {$i <= $high} {incr i} {
-	if {[line_is_executable $win $i]} {
-	  lappend addrs $_map($Cname,line=$i)
-	}
-      }
-    }
-
-    SRC+ASM {
-      if {$win == $awin} {
-	# Assembly
-	set addrs {}
-	for {set i $low} {$i <= $high} {incr i} {
-	  lappend addrs $_map($Cname,line=$i)
-	}
-      } else {
-	# Source
-	set lines {}
-	for {set i $low} {$i <= $high} {incr i} {
-	  if {[line_is_executable $win $i]} {
-	    lappend lines $i
-	  }
-	}
-      }
-    }
-  }
-  
-  if {[info exists lines]} {
-#    debug "Got executible lines: $lines"
-    if {[llength $lines]} {
-      set name [::file tail $current(filename)]
-      ManagedWin::open TraceDlg -File $name -Lines $lines
-    }
-  } elseif {[info exists addrs]} {
-#    debug "Got executible addresses: $addrs"
-    if {[llength $addrs]} {
-      set name [::file tail $current(filename)]
-      ManagedWin::open TraceDlg -File $name -Addresses $addrs
-    }
-  } else {
-#    debug "Got no executible lines in the selected range..."
-  }
-
-  # Clear the selection -- it looks a lot better.
-  $twin tag remove sel 1.0 end
-}
-
-
-# ------------------------------------------------------------------
-#  METHOD:  search - search for text or jump to a specific line
-#           in source window, going in the specified DIRECTION.
-# ------------------------------------------------------------------
-itcl::body SrcTextWin::search {exp direction} {
-  if {$exp != ""} {
-    set result {}
-    if {[regexp {^@([0-9]+)} $exp dummy index]} {
-      append index .0
-      set end [$twin index "$index lineend"]
-    } else {
-      set index [$twin search -exact -count len -$direction -- $exp $SearchIndex]
-      
-      if {$index != ""} {
-	set end [split $index .]
-	set line [lindex $end 0]
-	set char [lindex $end 1]
-	set char [expr {$char + $len}]
-	set end $line.$char
-	set result "Match of \"$exp\" found on line $line"
-	if {$direction == "forwards"} {
-	  set SearchIndex $end
-	} else {
-	  set SearchIndex $index
-	}
-      }
-    }
-    if {$index != ""} {
-      # Highlight word and save index
-      $twin tag remove search 1.0 end
-      $twin tag add search $index $end
-      $twin see $index
-    } else {
-      set result "No match for \"$exp\" found"
-    }
-    return $result
-  } else {
-    $twin tag remove search 1.0 end
-  }
-}
-
-# -----------------------------------------------------------------------------
-# NAME:		SrcTextWin::LoadFromCache
-#
-# SYNOPSIS:	LoadFromCache {w name asm lib}
-#
-# DESC:		Looks up $name in the cache.  If $name is cached, replace the
-#		pane $w with the cached pane. Otherwise create a new
-#		pane and scrolledtext widget and set _${w}pane and _${w}win.
-#
-# ARGS:		w	"t" or "b" (for Top and Bottom pane)
-#		name	name to look for in cache. This will be a filename if
-#			we are filling in a source window, or an address 
-#			otherwise.
-#		asm	'S' for source, 
-#                       'A' for assembly mode 
-#                       'M' for mixed mode.
-#		lib	library name
-#
-# RETURNS:	0 - read from cache
-#		1 - created new (blank) widget
-#              -1 - could not find the contents you are trying to load,
-#                   so far this only happens for "Source" files.
-#
-# NOTES:	If you call this and a new widget is created which cannot be
-#		filled in later due to errors, call UnLoadFromCache.
-# -----------------------------------------------------------------------------
-
-itcl::body SrcTextWin::LoadFromCache {w name asm lib} {
-  debug "LoadFromCache $w $name $asm"
-  global tcl_platform
-  upvar ${w}win win
-  upvar _${w}pane pane
-
-  if {[string compare gdbtk_scratch_widget $name]} {
-    append full_name $name "," $asm "," $lib
-  } else {
-    set full_name $name
-  }
-
-  set loadingSource [expr ![string compare $asm "S"]]
-
-  set oldpane $pane
-  if {[info exists Stwc($full_name:pane)]} {
-    debug "READING CACHE $full_name->$Stwc($full_name:pane)"
-    set pane $Stwc($full_name:pane)
-    if {$oldpane != ""} {
-      $itk_interior.p replace $oldpane $pane
-    } else {
-      $itk_interior.p show $pane
-    }
-    set win [[$itk_interior.p childsite $pane].st component text]
-    if {!$loadingSource} {
-      set Cname $full_name
-    }
-
-    # If the text in this cache file is dirty, clean the window, and
-    # return 1, which will tell the caller to refill it.  Otherwise
-    # return 0, and the caller will just display the window.
-    
-    if {$Stwc($name:dirty)} {
-      $win delete 0.0 end
-      set res 1
-      set Stwc($name:dirty) 0
-    } else {
-      set res 0
-    }
-
-  } else {
-    debug "name=$name"
-    # If we are trying to load a source file, check the time
-    # to see if we need to update it.  If we can't stat the
-    # file then we probably can't open it either, so error 
-    # out.
-
-    if {$loadingSource} {
-      if {[string compare $tcl_platform(platform) "windows"] == 0} {
-        set f [ide_cygwin_path to_win32 $name]
-      } else {
-        set f $name
-      }
-      if {[catch {file mtime $f} file_time]} {
-	debug "Could not stat file \"$f\" - \"$file_time\""
-	return -1
-      } else {
-        set Stwc($full_name:pane) pane$filenum
-	set Stwc($name:mtime) $file_time
-      }    
-    } else {
-      # FIXME: This is wrong.  For Assembly files we need to
-      # check whether the executable is newer than the cached
-      # disassembly.  For mixed files, we need to check BOTH
-      # the source file mtime, and the executable time.
-      
-      set Stwc($full_name:pane) pane$filenum
-      set Stwc($name:mtime) 0
-    }
-
-    set Stwc($full_name:pane) pane$filenum
-
-    set Stwc($name:dirty) 0
-    incr filenum
-
-    set pane $Stwc($full_name:pane)
-    debug "pane=$pane"
-    if {$oldpane != ""} {$itk_interior.p hide $oldpane}
-    $itk_interior.p add $pane
-    set p [$itk_interior.p childsite $pane]
-    set st [iwidgets::scrolledtext $p.st \
-	      -hscrollmode dynamic -vscrollmode dynamic]
-    set win [$st component text]
-
-    if {!$loadingSource} {
-      set Cname $full_name
-    }
-    pack $st -expand yes -fill both
-    set res 1
-  }
-
-  # reconfigure in case some preferences have changed
-  config_win $win $asm
-  return $res
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  UnLoadFromCache - revert back to previously cached widget
-#  This is used when a new widget is created with LoadFromCache but
-#  there is a problem with filling the widget.  
-# ------------------------------------------------------------------
-
-itcl::body SrcTextWin::UnLoadFromCache {w oldpane name asm lib} {
-#  debug "$w $oldpane $name"
-  upvar ${w}win win
-  upvar _${w}pane pane
-#  debug "pane=$pane win=$win"
-
-
-  set full_name ${name},${asm},${lib}
-  $itk_interior.p delete $pane
-  foreach elem [array names Stwc $full_name:*] {
-    unset Stwc($elem)
-  }
-  foreach elem [array names Stwc $name:*] {
-    unset Stwc($elem)
-  }
-
-  if {$oldpane != ""} {
-    $itk_interior.p show $oldpane
-    set pane $oldpane
-    set win [[$itk_interior.p childsite $pane].st component text]
-  }
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  print - print the contents of the text widget
-# ------------------------------------------------------------------
-itcl::body SrcTextWin::print {top} {
-  # FIXME
-  send_printer -ascii [$twin get 1.0 end] -parent $top
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  ask_thread_bp - prompt for thread(s) for BP
-# ------------------------------------------------------------------
-itcl::body SrcTextWin::ask_thread_bp {} {
-#  debug
-  if {[catch {gdb_cmd "info thread"} threads]} {
-    # failed. Just leave
-    return
-  }
-  set threads [split $threads \n]
-  set num_threads [expr {[llength $threads] -  1}]
-  if {$num_threads <= 0} {
-    show_warning "No threads were found.\nYou may only set breakpoints on threads\nthat have already been created."
-    return
-  }
-  
-  set a [toplevel .[gensym]]
-  wm title $a "Thread Selection"
-
-  iwidgets::scrolledlistbox $a.slb \
-    -vscrollmode dynamic -hscrollmode dynamic \
-    -selectmode multiple -textfont global/fixed
-
-  set i [expr $num_threads - 1]
-  set width 0
-  foreach line $threads {
-    # Active line starts with "*"
-    if {[string index $line 0] == "*"} {
-      # strip off leading "*"
-      set line " [string trimleft $line "*"]"
-    }
-    # scan for GDB ID number at start of line
-    if {[scan $line "%d" id($i)] == 1} {
-      if {[string length $line] > $width} {
-	set width [string length $line]
-      }
-      $a.slb insert 0 $line 
-      incr i -1
-    }
-  }
-  $a.slb configure -visibleitems ${width}x$num_threads 
-  [$a.slb component listbox] configure -bg $::Colors(textbg) -fg $::Colors(textfg)
-
-  frame $a.b
-  button $a.b.ok -text OK -underline 0 -width 7 \
-    -command "$this do_thread_bp $a.slb"
-  button $a.b.cancel -text Cancel -width 7 -underline 0 -command "destroy $a"
-  pack $a.b.ok $a.b.cancel -side left
-  standard_button_box $a.b
-  pack $a.b -fill x -expand yes -side bottom -padx 5 -pady 5
-  center_window $a -over [winfo toplevel [namespace tail $this]]
-  pack $a.slb -side top -fill both -expand yes
-  bind $a.b.ok <Return> "$a.b.ok flash; $a.b.ok invoke"
-  focus $a.b.ok
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  do_thread_bp - callback from thread selection
-# ------------------------------------------------------------------
-itcl::body SrcTextWin::do_thread_bp {listbox} {
-#  debug "$listbox [$listbox curselection]"
-  set x ""
-  foreach i [$listbox curselection] {
-    lappend x $id($i)
-  }
-  $this set_bp_at_line N {} -1 $x
-  destroy [winfo toplevel $listbox]
-}
-
-
-# public method for testing use only!
-itcl::body SrcTextWin::test_get {var} {
-  if {[array exists $var]} {
-    return [array get $var]
-  } else {
-    return [set $var]
-  }
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  get_file - Return name of current file.
-# ------------------------------------------------------------------
-itcl::body SrcTextWin::get_file {} {
-  return $current(filename)
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  clear_file - Clear out state so that user may load
-#              new executable. For the SrcTextWin class, this means:
-#
-#              Delete all srctextwin caches
-#              Delete the variable balloon if it exists.
-#              Clear the screen.
-# ------------------------------------------------------------------
-itcl::body SrcTextWin::clear_file {} {
-
-  debug "In clear_file"
-  # delete all caches
-  _clear_cache
-
-  set oldpane {}
-
-  # clear window
-  # FIXME - We don't do this here, because is causes a wierd error
-  # where the "Source file more recent than executible" error gets
-  # for no apparent reason.  This only effects the case where the
-  # user types just "file" in the command line, then the window will
-  # not get cleared.
-
-  # delete variable balloon
-  catch {$_balloon_var delete}
-  set _balloon_var {}
-
-  # reinit state
-  _initialize_srctextwin
-
-  # update the screen
-  update idletasks
-
-}
-
-itcl::body SrcTextWin::_initialize_srctextwin {} {
-  set pc(filename) ""
-  set pc(func) ""
-  set pc(line) 0
-  set pc(addr) ""
-  set pc(asm_line) 0
-  set pc(lib) ""
-  set current(filename) ""
-  set current(funcname) ""
-  set current(line) 0
-  set current(addr) ""
-  set current(asm_line) 0
-  set current(tag) "BROWSE_TAG"
-  set current(mode) "SOURCE"
-  set current(lib) ""  
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  _clear_cache - Clear the cache
-# ------------------------------------------------------------------
-itcl::body SrcTextWin::_clear_cache {} {
-
-  # display empty scratch frame
-  set pane $Stwc(gdbtk_scratch_widget:pane)
-  set win [[$itk_interior.p childsite $pane].st component text]
-  $win delete 0.0 end
-  $itk_interior.p show $pane
-
-  # delete all cached frames
-  foreach p [array names Stwc *:pane] {
-    set p [lindex [split $p :] 0]
-    if {$p != "gdbtk_scratch_widget"} {
-      catch {
-	#debug "clearing cache: \"$p\""
-	$itk_interior.p delete $Stwc($p:pane)
-	unset Stwc($p:pane)
-	unset Stwc($p:mtime)
-      }
-    }
-  }
-
-  _initialize_srctextwin
-  set filenum 0
-  set Cname ""
-  set _tpane pane$filenum
-  incr filenum
-  set _bpane ""
-}
diff --git a/gdb/gdbtk/library/srctextwin.ith b/gdb/gdbtk/library/srctextwin.ith
deleted file mode 100644
index d13a9799044..00000000000
--- a/gdb/gdbtk/library/srctextwin.ith
+++ /dev/null
@@ -1,163 +0,0 @@
-# SrcTextWin class definition, for Insight
-# Copyright 1997, 1998, 1999, 2001 Red Hat, Inc.
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License (GPL) 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.
-
-
-itcl::class SrcTextWin {
-  inherit itk::Widget GDBWin
-
-  public {
-    variable Tracing	;# 1 if we are running in trace mode
-    variable Browsing     0 ;# 1 if we are browsing a trace experiment
-    variable parent {}	;# the parent SrcWin
-    variable ignore_var_balloons 0;  # ignore all variable balloons
-
-    # Set the height of the src window
-    variable textheight 5i {
-      catch {$itk_interior.p configure -height $itk_option(-textheight)}
-    }
-    
-    method constructor {args}
-    method destructor {}
-    method disassembly_changed {}
-    method reconfig {}
-    method trace_find_hook {mode from_tty}
-    method set_control_mode {mode}
-    method build_popups {}
-    method build_win {}
-    method SetRunningState {state}
-    method enable {on}
-    method setTabs {win {asm S}}
-    method enable_disable_src_tags {win how}
-    method config_win {win {asm S}}
-    method addPopup {menu label command {abg {}} {browse 1} {run 1}}
-    method updateBalloon {}
-    method ClearTags {}
-    method FillSource {winname tagname filename funcname line addr pc_addr lib}
-    method FillAssembly {winname tagname filename funcname line addr pc_addr lib}
-    method FillMixed {winname tagname filename funcname line addr pc_addr lib}
-    method location {tagname filename funcname line addr pc_addr lib}
-    method LoadFile {winname name lib mtime_changed}
-    method display_line { win line }
-    method display_breaks {}
-    method insertBreakTag {win linenum tag}
-    method removeBreakTag {win linenum tag }
-    method bp {action bpnum addr {linenum {}} {file {}} {type 0} {enabled 0} {thread -1}}
-    method do_bp { win action linenum type bpnum enabled thread asm}
-    method hasBP {win line}
-    method hasTP {win line}
-    method report_source_location {}
-    method lookup_line {win y}
-    method continue_to_here {{win {}} {y -1} {threads -1}}
-    method jump_to_here {{win {}} {y -1} {threads -1}}
-    method set_bp_at_line {{type N} {win {}} {y -1} {threads "-1"}}
-    method remove_bp_at_line {{win {}} {y -1}}
-    method enable_disable_at_line {action}
-    method set_tp_at_line {{win {}} {y -1}}
-    method next_hit_at_line {{win {}} {y -1}}
-    method remove_tp_at_line {{win {}} {y -1}}
-    method do_tag_popup {name X Y y}
-    method do_source_popup { X Y x y }
-    method addToWatch {var}
-    method do_key {key}
-    method mode_get {}
-    method mode_set {new_mode {go 1}}
-    method cancelMotion {}
-    method motion {type win x y}
-    method showBPBalloon {win x y}
-    method showBalloon {win x y}
-    method getVariable {x y {line {}}}
-    method trace_help {args}
-    method line_is_executable {win line}
-    method tracepoint_range {win low high}
-    method search {exp direction}
-    method LoadFromCache {pname name asm lib}
-    method UnLoadFromCache {pname oldpane name asm lib}
-    method print {top}
-    method ask_thread_bp {}
-    method do_thread_bp {listbox}
-    method test_get {var}
-    method clear_file {}
-    method get_file {}
-    method set_tag_to_stack {}
-
-    # GDB Events
-    method breakpoint {event}
-    method tracepoint {event}
-    method set_variable {event}
-  }
-
-  private {
-    variable top	;# toplevel window
-    variable twin	;# top text window of pane
-    variable _tpane	;# top pane name
-    variable bwin ""	;# bottom text window of pane
-    variable _bpane ""	;# bottom pane name
-
-    variable do_display_breaks 0	;# flag    
-    variable popups
-    
-    variable timeoutID {} ;# The timeout ID for the variable balloon help
-    variable UseVariableBalloons
-    
-    variable mode_changed 0
-    variable current	;# our current state
-    variable pc		;# where the PC is now
-    variable oldmode ""	;# remember the mode we want, even if we can't have it
-    
-    variable Running 0	;# another way to disable things while target is active
-    variable Linenums	;# use linenumbers?
-    variable SearchIndex 1.0	;# static
-    variable id	;#thread id to line mapping
-    # needed for assembly support
-    variable _map
-    variable Cname  ""	;# cache index name for _map
-    # cache is not shared among windows yet.  That could be a later
-    # optimization
-    variable Stwc	;# Source Text Window Cache
-    variable filenum 0
-
-    # The variable object which the variable balloon describes 
-    variable _balloon_var {}
-
-    method balloon_value {variable}
-    method _mtime_changed {filename}
-    method _initialize_srctextwin {}
-    method _clear_cache {}
-    method _highlightAsmLine {win addr pc_addr tagname filename funcname} {}
-
-    proc makeBreakDot {size colorList {image {}}}
-  }
-
-
-  
-  # common variables are shared among all objects of this type
-  # break_images stores the images associated with the break dot.
-  # bp
-  # temp_bp
-  # disabled_bp
-  # tp
-  # thread_bp
-  protected common break_images
-
-  # This is the list of bp types.  Be nice, and don't put spaces in
-  # any of the elements of this list...
-  protected common bp_types {bp temp_bp disabled_bp thread_bp}
-
-  # This variable is used in the "Continue to here" case, where we are
-  # disabling then reenabling breakpoints behind the user's back to
-  # implement this feature, but we don't want the user to see this...
-  protected common dont_change_appearance 0
-
-  protected common TimeOut 100 ;# The timeout value for variable balloon help
-
-}
diff --git a/gdb/gdbtk/library/srcwin.itb b/gdb/gdbtk/library/srcwin.itb
deleted file mode 100644
index ad10b5aa0fe..00000000000
--- a/gdb/gdbtk/library/srcwin.itb
+++ /dev/null
@@ -1,1032 +0,0 @@
-# Source window for Insight.
-# Copyright 1997, 1998, 1999, 2000, 2001, 2002, 2003 Red Hat, Inc.
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License (GPL) 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.
-
-
-# ------------------------------------------------------------------
-#  CONSTRUCTOR - create new source window
-# ------------------------------------------------------------------
-itcl::body SrcWin::constructor {args} {
-  debug "$args"
-  eval itk_initialize $args
-  set top [winfo toplevel $itk_interior]
-
-  _update_title ""
-
-  set Tracing [pref get gdb/mode]
-  set current(filename) ""
-
-  if {[catch {_build_win} mssg]} {
-    dbug E "_build_win returned: $::errorInfo"
-  }
-
-  # add special delete handler
-  wm protocol $top WM_DELETE_WINDOW "[code $this _exit]"
-
-  # add hooks
-  add_hook gdb_no_inferior_hook "$this no_inferior"
-  add_hook download_progress_hook "$this download_progress"
-  add_hook state_hook [code $this _set_state]
-  add_hook gdb_clear_file_hook [code $this clear_file]
-  after idle "
-      update idletasks
-      $this sizeWinByChild toolbar"
-
-  lappend window_list $this
-}
-
-# ------------------------------------------------------------------
-#  DESTRUCTOR - destroy window containing widget
-# ------------------------------------------------------------------
-itcl::body SrcWin::destructor {} {
-  debug
-  remove_hook gdb_no_inferior_hook "$this no_inferior"
-  remove_hook download_progress_hook "$this download_progress"
-  remove_hook state_hook [code $this _set_state]
-  remove_hook gdb_clear_file_hook [code $this clear_file]
-  set window_list [lremove $window_list $this]
-  if {$pc_window == $this} then {
-    set pc_window ""
-  }
-}
-
-# ------------------------------------------------------------------
-#  PRIVATE METHOD:  _build_win - build the main source window
-# ------------------------------------------------------------------
-itcl::body SrcWin::_build_win {} {
-  global gdb_downloading gdb_running gdb_loaded
-
-  # build source toolbar
-  set _toolbar [conAdd toolbar -resizable 0]
-  SrcBar $_toolbar $this \
-    -updatecommand [list $this toggle_updates] \
-    -updatevalue $do_updates
-  pack $_toolbar -expand 1 -fill both
-
-  # if user likes control on bottom...
-  if {! [pref get gdb/src/top_control]} {
-
-    # add a SrcTextWin container
-    set srcwin [conAdd src]
-    set twin [SrcTextWin $srcwin -Tracing $Tracing -parent $this]
-    pack $srcwin -expand 1 -fill both
-
-    # add status line
-    set _status [conAdd status -resizable 0]
-    label $_status -relief sunken -bd 3 -font global/status -height 1
-    pack $_status -expand 1 -fill both
-  }
-  
-  # add a status bar container
-  set _statbar [conAdd stat -resizable 0]
-  frame $_statbar
-  pack $_statbar -expand 1 -fill both
-
-  combobox::combobox $_statbar.name -maxheight 15 -font global/fixed\
-    -command [code $this _name] -bg $::Colors(textbg)
-  
-  set need_files 1
-  
-  combobox::combobox $_statbar.func -maxheight 15 -font global/fixed\
-    -command [code $this goto_func] -bg $::Colors(textbg)
-  combobox::combobox $_statbar.mode -width 9 -editable false \
-    -font global/fixed -command [code $this mode] -bg $::Colors(textbg)
-  
-  $_statbar.mode list insert end SOURCE
-  $_statbar.mode list insert end ASSEMBLY
-  $_statbar.mode list insert end MIXED
-  $_statbar.mode list insert end SRC+ASM
-
-  pack $_statbar.mode -side right -padx 10 -pady 4
-  pack $_statbar.name $_statbar.func -side left -pady 4 -padx 10
-
-  # if user likes control on top...
-  if {[pref get gdb/src/top_control]} {
-  
-    # add a SrcTextWin container
-    set srcwin [conAdd src]
-    set twin [SrcTextWin $srcwin -Tracing $Tracing -parent $this]
-    pack $srcwin -expand 1 -fill both
-
-    # add status line
-    set _status [conAdd status -resizable 0]
-    set _statusframe [frame $_status]
-    set _status $_statusframe.con
-    label $_status -relief sunken -bd 3 -font global/status -height 1 \
-      -anchor w
-
-    # add download progress meter
-    canvas $_statusframe.progress -relief sunken -borderwidth 2 \
-      -highlightthickness 0 -takefocus 0 -width 100 -height 0 -confine 1
-    $_statusframe.progress create rectangle 0 0 0 \
-      [winfo height $_statusframe.progress] -outline blue -fill blue -tags rect
-
-    # add address and line number indicators
-    label $_statusframe.addr -text "" -width 10 -relief sunken \
-      -bd 1 -anchor e -font global/fixed
-    label $_statusframe.line -text "" -width 6 -relief sunken \
-      -bd 1 -anchor e -font global/fixed
-
-    balloon register $_statusframe.addr "Address"
-    balloon register $_statusframe.line "Line number"
-
-    pack $_statusframe -expand 1 -fill both
-    grid $_status -row 0 -column 1 -sticky news -pady 2 -padx 2
-    grid $_statusframe.addr -row 0 -column 3 -sticky nes -pady 4
-    grid $_statusframe.line -row 0 -column 4 -sticky nws -pady 4
-    grid columnconfigure $_statusframe 1 -weight 10
-    grid columnconfigure $_statusframe 2 -minsize 5
-    grid columnconfigure $_statusframe 5 -minsize 5
-  }
-
-  set_execution_status
-
-  # balloon help
-  foreach i {entry button} {
-    balloon register $_statbar.name.$i "Current file name"
-    balloon register $_statbar.func.$i "Current function name"
-    balloon register $_statbar.mode.$i "Source mode"
-  }
-  balloon variable $_status ${twin}_balloon
-
-  $_statbar.mode entryset [$twin mode_get]
-
-  # time to load the widget with a file.
-  # If this is a new widget and the program is
-  # not yet being debugged, load the file with "main" in it.
-  if {$gdb_running} {
-    if {[catch {gdb_loc} loc]} {
-      # Nothing we can do but leave the window empty.
-    } else {
-      _update $loc
-    }
-  } else {
-    if {[set linespec [gdbtk_locate_main]] != ""} {
-      location BROWSE_TAG $linespec
-    }
-  }
-}
-
-
-# ------------------------------------------------------------------
-#  PUBLIC METHOD:  _set_state - do things when program state changes
-# ------------------------------------------------------------------
-itcl::body SrcWin::_set_state {varname} {
-  global gdb_running gdb_downloading gdb_loaded gdb_program_has_run
-  debug "$varname l=$gdb_loaded d=$gdb_downloading r=$gdb_running"
-
-  if {$varname == "gdb_loaded" && $gdb_loaded == 1} {
-    set gdb_program_has_run 0
-    #set current(filename) ""
-    return
-  }
-
-  if {$gdb_running} {
-    set state normal
-    set gdb_program_has_run 1
-  } else {
-    set state disabled
-  }
-  if {!$Tracing} {
-    $twin SetRunningState $state
-  }
-}
-
-# ------------------------------------------------------------------
-#  PUBLIC METHOD:  download_progress - update the progress meter when downloading
-# ------------------------------------------------------------------
-itcl::body SrcWin::download_progress { section num tot {msg ""} } {
-  global download_start_time download_cancel_ok gdb_loaded
-
-  #debug "$section $num $tot $msg"
-  if {$last_section_start == 0} {
-    grid forget $_statusframe.addr $_statusframe.line
-    grid $_statusframe.progress -row 0 -column 4 -padx 4 -sticky news
-    ::update idletasks
-  }
-
-  if {$section == "DONE"} {
-    set last_done $tot
-    if {$gdb_loaded} {
-      # loaded something
-      set secs [expr {[clock seconds] - $download_start_time}]
-      if {$secs} {
-	set bps [expr {8 * $tot / $secs}]
-	set_status "DOWNLOAD FINISHED: $tot bytes in $secs seconds ($bps bits per second)"
-      } else {
-	set_status "DOWNLOAD FINISHED"
-      }
-    }
-  } elseif {$section != "CANCEL"} {
-    if {$section != $last_section} {
-      set last_section $section
-      set last_section_start $last_done
-    }
-    set last_done [expr {$last_section_start + $num}]
-    set_status "Downloading section $section - $num bytes"
-  }
-
-  set canvas $_statusframe.progress
-  set height [winfo height $canvas]
-  if {$last_done} {
-    set width [winfo width $canvas]
-    set rw [expr {double ($last_done) * $width / $tot}]
-    $canvas coords rect 0 0 $rw $height
-    ::update
-  }
-
-  if {$last_done == $tot || $section == "CANCEL"} {
-    $_toolbar configure -runstop normal
-    if {!$gdb_loaded} {
-      ::update
-      # errored or canceled
-      if {$msg != ""} {
-	set_status "DOWNLOAD FAILED: $msg"
-      } else {
-	set_status "DOWNLOAD CANCELLED"
-      }
-      $canvas coords rect 0 0 0 $height
-      ::update idletasks
-    }
-
-    set last_section ""
-    set last_done 0
-    set last_section_start 0
-
-    grid forget $_statusframe.progress
-    grid $_statusframe.addr -row 0 -column 3 -sticky new -pady 4
-    grid $_statusframe.line -row 0 -column 4 -sticky nws -pady 4
-    ::update idletasks
-  }
-}
-
-# ------------------------------------------------------------------
-#  PUBLIC METHOD:  reconfig - used when preferences change
-# ------------------------------------------------------------------
-itcl::body SrcWin::reconfig {} {
-  debug
-  $_toolbar reconfig
-  $twin reconfig
-}
-
-
-# ------------------------------------------------------------------
-#  PRIVATE METHOD:  _name - filename combobox callback
-#  This is only called when the user edits the name combobox.
-#  It is the only way that files can be inserted into the file list
-#  once the debugger is started. 
-# ------------------------------------------------------------------
-itcl::body SrcWin::_name {w {val ""}} {
-  global _files
-  debug "$w $val"
-  if {$val != ""} {
-    if {![info exists _files(short,$val)]} {
-      if {![info exists _files(full,$val)]} {
-	if [catch {gdb_find_file $val} full] {
-	  set_status "Cannot find source file \"$val\": $full"
-	  $_statbar.name entryset [lindex [file split $current(filename)] end]
-	  return
-	}
-	if {$full == ""} {
-	  set_status "Cannot find source file \"$val\""
-	  $_statbar.name entryset [lindex [file split $current(filename)] end]
-	  return
-	}
-	set _files(short,$full) $val
-	set _files(full,$val) $full
-      }
-      set full $_files(full,$val)
-    } else {
-      set full $val
-      set val $_files(short,$full)
-    }
-    $_statbar.name entryset $val
-    location BROWSE_TAG [list $val "" $full 0 0 0 {}]
-  }
-}
-
-# ------------------------------------------------------------------
-#  PRIVATE PUBLIC METHOD:  toggle_updates - update toggle callback
-# ------------------------------------------------------------------
-itcl::body SrcWin::toggle_updates {value} {
-  # save state in do_updates so it will be preserved
-  # in window reconfigs
-  set do_updates $value
-}
-
-# ------------------------------------------------------------------
-#  PRIVATE PUBLIC METHOD:  goto_func - function combobox callback
-# ------------------------------------------------------------------
-itcl::body SrcWin::goto_func {w {val ""}} {
-  if {$val != ""} {
-    set mang 0
-    if {[info exists _mangled_func($val)]} {
-      set mang $_mangled_func($val)
-    }
-    if {$mang} {
-      set loc $val
-    } else {
-      set fn [lindex [::file split $current(filename)] end]
-      if {$fn == ""} {
-	set loc $val
-      } else {
-	set loc $fn:$val
-      }
-    }
-    debug "GOTO $loc"
-    if {![catch {gdb_loc $loc} result]} {
-      location BROWSE_TAG $result
-    } else {
-      dbug W "gdb_loc returned \"$result\""
-    }
-  }
-}
-
-# ------------------------------------------------------------------
-#  PUBLIC METHOD:  fillNameCB - fill the name combobox
-#
-#         This method needs to be public, since other parts of
-#         the gui can cause new symbols to be read.
-# ------------------------------------------------------------------
-itcl::body SrcWin::fillNameCB {} {
-  global _files
-  set allfiles [gdb_listfiles]
-  foreach f $allfiles {
-    # FIXME: If you reactivate this code add a catch as gdb_find_file can err
-    # (P.S.: I don't know why this is commented out)
-    #set fullname [gdb_find_file $f]
-    #set _files(full,$f) $fullname
-    #set _files(short,$fullname) $f
-    $_statbar.name list insert end $f
-  }
-  set need_files 0
-}
-
-
-# ------------------------------------------------------------------
-#  PUBLIC METHOD:  fillFuncCB - fill the function combobox
-#
-#         This method needs to be public, since other parts of
-#         the gui can cause new symbols to be read.
-# ------------------------------------------------------------------
-itcl::body SrcWin::fillFuncCB {name} {
-  $_statbar.func list delete 0 end
-  if {$name != ""} {
-    set maxlen 10
-    if {[catch {gdb_listfuncs $name} listfuncs]} {
-      tk_messageBox -icon error -default ok \
-	-title "GDB" -type ok \
-	-message "This file can not be found or does not contain\ndebugging information."
-      _set_name ""
-      return
-    }
-    foreach f [lsort -increasing $listfuncs] {
-      lassign $f func mang
-      set _mangled_func($func) $mang
-      $_statbar.func list insert end $func
-      if {[string length $func] > $maxlen} {
-	set maxlen [string length $func]
-      }
-    }
-    $_statbar.func configure -width [expr $maxlen + 1]
-  }
-}
-
-# ------------------------------------------------------------------
-#  PUBLIC METHOD:  location - update the location displayed
-#
-#  a linespec looks like this:
-#  0: basename of the file
-#  1: function name
-#  2: full filename
-#  3: source line number
-#  4: address
-#  5: current PC - which will often be the same as address, but not when
-#     we are browsing, or walking the stack.
-#  6: shared library name if the pc is in a shared lib
-#
-# linespec will be "{} {} {} 0 0x0 0x0" when GDB has not started debugging.
-# ------------------------------------------------------------------
-itcl::body SrcWin::location {tag linespec} {
-  global gdb_running gdb_exe_name _files tcl_platform
-
-  # We need to keep track of changes to the line, filename, function name
-  # and address so we can keep the widgets up-to-date.  Otherwise we
-  # basically pass things through to the SrcTextWin location public method.
-
-  debug "running=$gdb_running tag=$tag linespec=$linespec"    
-  lassign $linespec foo funcname name line addr pc_addr lib
-
-  # need to call this to update running state
-  set_execution_status $line $addr
-
-  # "update" doesn't set the tag so we do it here
-  if {$tag == ""} {
-    if {$addr == $pc_addr} {
-      set tag PC_TAG
-    } else {
-      set tag STACK_TAG
-    }
-  }
-  
-  if {!$gdb_running} {
-    # When we are not yet debugging, we need to force something
-    # to be displayed, so we choose to find function "main" and
-    # display the file with it.
-    set tag BROWSE_TAG
-    debug "not running: name=$name funcname=$funcname line=$line"
-    if {$name == ""} {
-      if {[set linespec [gdbtk_locate_main]] == ""} {
-	# no "main" function found
-	return 
-      }
-      lassign $linespec foo funcname name line addr pc_addr lib
-      debug "new linespec=$linespec"    
-    }
-  }
-
-  # update file and function combobox
-  if {$name != $current(filename)} {
-    _set_name $name
-    fillFuncCB $name
-  }
-
-  # get a proper address string to display
-  set textaddr [gdb_CA_to_TAS $addr]
-
-  # set address and line widgets
-  if {[string length $textaddr] > 8} {
-    # 64-bit address
-    set width 16
-  } else {
-    # 32-bit address
-    set width 8
-  }
-  $_statusframe.addr configure -text $textaddr -font global/fixed -width $width
-  $_statusframe.line configure -text $line
-
-  # set function combobox
-  $_statbar.func entryset $funcname
-
-  # call SrcTextWin::location
-  $twin location $tag $name $funcname $line $addr $pc_addr $lib
-
-  set current(filename) $name
-}
-
-# ------------------------------------------------------------------
-#  PUBLIC METHOD:  stack - handle stack commands
-# ------------------------------------------------------------------
-itcl::body SrcWin::stack {cmd} {
-  if {$cmd == "bottom"} {
-    set cmd "frame 0"
-  }
-  gdbtk_busy
-  if {[catch {gdb_cmd "$cmd"} message]} {
-    dbug E "STACK ERROR: $message"
-  }
-  gdbtk_update
-  gdbtk_idle
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  _update - update widget when PC changes
-# ------------------------------------------------------------------
-itcl::body SrcWin::_update {loc} {
-  debug "loc=$loc"
-  # See if name combobox needs filled.
-  if {$need_files} {
-    fillNameCB
-  }
-  location "" $loc
-}
-
-# ------------------------------------------------------------------
-#  PUBLIC METHOD:  idle - callback for gdbtk_idle
-#  Called when the target is idle, so enable all buttons.
-# ------------------------------------------------------------------
-itcl::body SrcWin::idle {event} {
-  $_toolbar configure -runstop normal
-  enable_ui 1
-}
-
-# ------------------------------------------------------------------
-#  PUBLIC METHOD:  mode - set mode to SOURCE, ASSEMBLY, MIXED, SRC+ASM
-# ------------------------------------------------------------------
-itcl::body SrcWin::mode {w new_mode {go 1}} {
-  gdbtk_busy
-  $_statbar.mode entryset $new_mode
-  catch {$twin mode_set $new_mode $go} errorVal
-  $_toolbar configure -displaymode $new_mode
-  gdbtk_idle
-}
-
-# ------------------------------------------------------------------
-#  PRIVATE METHOD:  _update_title - update title bar
-# ------------------------------------------------------------------
-itcl::body SrcWin::_update_title {name} {
-  set fn [lindex [::file split $name] end]
-  if {$fn == ""} {
-    set prefix ""
-  } else {
-    set prefix "$fn - "
-  }
-  window_name "${prefix}Source Window" $fn
-}
-
-# ------------------------------------------------------------------
-#  PUBLIC METHOD:  busy - disable things when gdb is busy
-# ------------------------------------------------------------------
-itcl::body SrcWin::busy {event} {
-  global gdb_loaded gdb_target_name
-#  debug "gdb_loaded=$gdb_loaded, gdb_target_name=$gdb_target_name"
-
-  if {$do_updates} {
-    enable_ui 0
-    if {$Running} {
-      $_toolbar configure -runstop running
-      if {$gdb_loaded || \
-	    ([TargetSelection::native_debugging] && $gdb_target_name != "remote")} {
-	set_status "Program is running."
-      } 
-    } else {
-      $_toolbar configure -runstop busy
-    }
-  }
-}
-
-# ------------------------------------------------------------------
-#   PUBLIC METHOD:  update - The inferior's state has changed.
-# ------------------------------------------------------------------
-itcl::body SrcWin::update {event} {
-
-  # FIXME: This is kinda lame. We need to run this only once
-  # as it is now written, so only the first window in the list
-  # will actually call choose_and_update.
-  # This is still better than before, since it will not
-  # matter if this window is destroyed: as long as _a_
-  # SrcWin exists, this will get called.
-  if {[lindex $window_list 0] == $this} {
-    choose_and_update
-  }
-}
-
-# ------------------------------------------------------------------
-#  PRIVATE METHOD:  _set_name - set the name in the name combobox and in the title
-# ------------------------------------------------------------------
-itcl::body SrcWin::_set_name { val {found 1} } {
-  global _files
-  _update_title $val
-  if {![info exists _files(short,$val)]} {
-    if {![info exists _files(full,$val)]} {
-      # not in our list; just display basename
-      $_statbar.name entryset [lindex [::file split $val] end]
-      return
-    }
-  } else {
-    set val $_files(short,$val)
-  }
-  if {$found} {
-    $_statbar.name entryset $val
-  } else {
-    $_statbar.name entryset "$val (not found)"
-  }
-}
-
-# ------------------------------------------------------------------
-#  PUBLIC METHOD:  set_status - write a message to the status line.
-#  If "tmp" is set, the status change will not be saved.
-# ------------------------------------------------------------------
-
-itcl::body SrcWin::set_status { {msg ""} {tmp 0} } {
-  set msg [lindex [split $msg \n] 0]
-  if {$tmp} {
-    $_status configure -text $msg
-    return
-  }
-  if {$msg != ""} {
-    set saved_msg $msg
-  }
-  $_status configure -text $saved_msg
-}
-
-# ------------------------------------------------------------------
-#  PUBLIC METHOD:  set_execution_status - write the current execution state 
-#  to the status line
-# ------------------------------------------------------------------
-itcl::body SrcWin::set_execution_status { {line ""} {pc ""}} {
-  global gdb_running gdb_loaded gdb_program_has_run gdb_target_changed
-  #debug "line=$line pc=$pc [gdb_target_has_execution] running=$gdb_running loaded=$gdb_loaded"
-  set message ""
-
-  if {![gdb_target_has_execution]} {
-    if {$gdb_running} {
-      set gdb_running 0
-      # tell text window program is no longer running
-      $twin ClearTags
-    }
-    if {$gdb_loaded} {
-      if {$gdb_program_has_run} {
-	set message "Program terminated. 'Run' will restart."
-	# Need to set gdb_target_changed because most
-	# remote targets detach when they are finished, 
-	# and this will force it to reattach.
-	set gdb_target_changed 1
-	set gdb_running 0
-      } else {
-	set message "Program is ready to run."
-      }
-    } else {
-      set message "Program not running. Click on run icon to start."
-    }
-  } else {
-
-    # gdb_target_has_execution has returned true, so we must be running.
-    #
-    # This can cause problems on targets which do not set inferior_pid.
-    # Although this is bogus, much of gdb (and gdbtk) relies on
-    # gdb_target_has_execution (and thus inferior_pid), so we should
-    # not try to second guess it and fix those targets which do not set
-    # inferior_pid when opened.
-    set gdb_running 1
-
-    # only do a gdb_loc if we have to
-    if {$line == "" && $pc == ""} {
-      if {[catch {gdb_loc} loc] == 0} {
-	set line [lindex $loc 3] 
-	set pc [lindex $loc 4]
-      }
-    }
-
-    set pc [gdb_CA_to_TAS $pc]
-
-    if {$line == "" || $line == 0} {
-      if {$pc == "" || $pc == 0} {
-	if {$Tracing} {
-	  set message "Ready."
-	} else {
-	  set message "Program stopped."
-	}
-      } else {
-	set message "Program stopped at 0x$pc"
-      }
-    } else {
-      if {$Tracing} {
-	set msg "Inspecting trace"
-      } else {
-	set msg "Program stopped"
-      }
-      switch [$twin mode_get] {
-	ASSEMBLY {set message "$msg at 0x$pc" }
-	MIXED {set message "$msg at line $line, 0x$pc" }
-	SRC+ASM {set message "$msg at line $line, 0x$pc" }
-	default {set message "$msg at line $line" }
-      }
-    }
-  }
-  set_status $message
-}
-
-# ------------------------------------------------------------------
-#  PUBLIC METHOD:  edit - invoke external editor
-# ------------------------------------------------------------------
-itcl::body SrcWin::edit {} {
-  global external_editor_command
-  # If external editor is enabled, pass the file to the specified command
-
-  if {$current(filename) == ""} {
-    tk_dialog .warn {Edit} {No file is loaded in the source window.} error 0 Ok
-    return
-  }
-
-  if {[catch {$twin report_source_location} loc_info]} {
-    tk_dialog .warn "Edit" "No source file selected" error 0 Ok
-    return
-  }
-
-  Editor::edit $loc_info
-}
-
-# ------------------------------------------------------------------
-#  PUBLIC METHOD:  print - print the contents of the text widget
-# ------------------------------------------------------------------
-itcl::body SrcWin::print {} {
-  # Call the SrcTextWin's print public method
-  $twin print $top
-}
-
-# ------------------------------------------------------------------
-# PUBLIC METHOD:   enable_ui
-#              Enable all UI elements for user interaction.
-# ------------------------------------------------------------------
-itcl::body SrcWin::enable_ui { on } {
-  #debug "$on"
-  if {$on} {
-    set Running 0
-    set state normal
-    set glyph ""
-  } else {
-    if {!$NoRun} {set Running 1}
-    set state disabled
-    set glyph watch
-  }
-  # combo boxes
-  $_statbar.mode configure -state $state
-  $_statbar.name configure -state $state
-  $_statbar.func configure -state $state
-
-  $twin enable $on
-  $top configure -cursor $glyph
-}
-
-# ------------------------------------------------------------------
-# PUBLIC METHOD:   no_inferior
-#              Put the UI elements of this object into a state
-#              appropriate for an inferior which is not executing.
-#              For this object, this means:
-# Disable:
-# - key binding for all inferior control (not needed -- gdb does this
-#    for us)
-#
-# Enable:
-# - file/func/mode selectors
-# - right-click popups, since gdb DOES allow looking at exe fil
-# - selections
-# 
-# Change mouse pointer to normal
-# ------------------------------------------------------------------
-itcl::body SrcWin::no_inferior {} {
-  #debug
-  set_execution_status
-  enable_ui 1
-}
-
-# ------------------------------------------------------------------
-#   PUBLIC METHOD: reset - reset the source window
-# ------------------------------------------------------------------  
-itcl::body SrcWin::reset {} {
-  set current(filename) ""
-  set need_files 1
-  set do_updates 1
-  set last_section ""
-  set last_section_start 0
-  set last_done 0
-  set saved_msg ""
-
-  # do we need to flush the cache or clear the source windows?
-
-  # Empty combo boxes
-  $_statbar.name list delete 0 end
-  $_statbar.name configure -value {}
-  $_statbar.func list delete 0 end
-  $_statbar.func configure -value {}
-}
-
-# ------------------------------------------------------------------
-#  PUBLIC METHOD:  search - search for a STRING or jump to a specific line
-#           in source window, going in the specified DIRECTION.
-# ------------------------------------------------------------------
-itcl::body SrcWin::search {direction string} {
-  set_status
-  set_status [$twin search $string $direction] 1
-}
-
-# ------------------------------------------------------------------
-#  PROCEDURE: point_to_main
-#         Proc that may be called to point some source window to
-#         main (or an entry point?). (see gdbtk_tcl_exec_file_changed)
-# ------------------------------------------------------------------
-itcl::body SrcWin::point_to_main {} {
-  # We need to force this to some default location. Assume main and
-  # if that fails, let the source window guess (via gdb_loc using stop_pc).
-  set src [lindex [ManagedWin::find SrcWin] 0]
-  if {[set linespec [gdbtk_locate_main]] == ""} {
-    gdbtk_update
-    debug "could not find main"
-  } else {
-    $src location BROWSE_TAG [list $linespec]
-  }
-}
-
-itcl::body SrcWin::_exit {} {
-  debug
-  if {[llength [ManagedWin::find SrcWin]] == 1} {
-    if {![gdbtk_quit_check]} {
-      return
-    }
-  }
-  after idle [delete object $this]
-}
-
-# public method for testing use only!
-itcl::body SrcWin::test_get {var {private_func 0}} {
-  debug $var
-  if {$private_func} {
-    return [code $this $var]
-  }
-  return [set $var]
-}
-
-# ------------------------------------------------------------------
-#  PUBLIC METHOD: toolbar - configure the toolbar's "state"
-# ------------------------------------------------------------------
-#
-#  This method is used to configure the toolbar's running state.
-#  Valid states include anything that the "runtest" variable of
-#  the GDBSrcBar may accept. Specifically,
-#
-#  busy        - Run button becomes disabled
-#  running     - Stop button appears, allowing user to stop executing target
-#  downloading - Stop button appears, allowing user to interrupt downloading
-#  normal      - Run button appears, allowing user to run/re-run exe
-itcl::body SrcWin::toolbar {state} {
-  $_toolbar configure -runstop $state
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  inferior - change execution state of inferior
-# ------------------------------------------------------------------
-#
-# ACTION may be:
-#   step       -  step the inferior one source line (stepping into functions)
-#   next       -  step the inferior one source line (stepping over functions)
-#   finish     -  finish the current frame of execution
-#   continue   -  continue executing the inferior
-#   stepi      -  step one machine instruction (stepping into calls)
-#   nexti      -  step one machine instruction (stepping over calls)
-#   run        -  run/re-run the inferior
-#   stop       -  stop or detach from target
-#
-# FIXME: This should really be in an object which describes gdb's state.
-# Unfortunately, this doesn't exist, so it's here for now.
-itcl::body SrcWin::inferior {action} {
-
-  switch $action {
-    step { gdbtk_step }
-
-    next { gdbtk_next }
-
-    finish { gdbtk_finish }
-
-    continue { gdbtk_continue }
-
-    stepi { gdbtk_stepi }
-
-    nexti { gdbtk_nexti }
-
-    run { gdbtk_run }
-
-    stop { gdbtk_stop }
-  }
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  clear_file
-#  Tasks for SrcWin to clear file:
-#
-# - clear window
-# - reset to src mode
-# - clear func/file comboboxes
-# - clear status (done by no_inferior)
-# - allow SrcTextWin to clear_file
-# ------------------------------------------------------------------
-itcl::body SrcWin::clear_file {} {
-
-  # Reset to Source mode
-  if {[$twin mode_get] != "SOURCE"} {
-    mode {} SOURCE 0
-  }
-
-  no_inferior
-  reset
-
-  # run srctextwin clear_file
-  $twin clear_file
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  get_file
-#  Return name of displayed file, or empty string if no file.
-# ------------------------------------------------------------------
-itcl::body SrcWin::get_file {} {
-  if {$twin == ""} {
-    return ""
-  } else {
-    return [$twin get_file]
-  }
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  is_fixed
-#  Return boolean indicating whether this window is fixed.
-# ------------------------------------------------------------------
-itcl::body SrcWin::is_fixed {} {
-  return 0
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  get_top
-#  Return toplevel
-# ------------------------------------------------------------------
-itcl::body SrcWin::get_top {} {
-  return $top
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  _set_tag_to_stack
-#  Set tag to `stack' and update the underlying window.
-# ------------------------------------------------------------------
-itcl::body SrcWin::_set_tag_to_stack {} {
-  set tag STACK_TAG
-  if {$twin != ""} then {
-    $twin set_tag_to_stack
-  }
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  _choose_window
-#  Choose the right source window.
-# ------------------------------------------------------------------
-itcl::body SrcWin::_choose_window {file} {
-  # Find the next available source window.  The rules are:
-  # 1. LRU overall
-  # 2. Skip iconified windows
-  # 3. If a window already shows the file, use it.  Prefer the
-  #    window currently showing the PC
-  # 4. If the window is fixed, skip it
-  if {$pc_window != ""} then {
-    if {[$pc_window get_file] == $file} then {
-      return $pc_window
-    }
-  }
-
-  set choice ""
-  foreach win $window_list {
-    if {[wm state [$win get_top]] != "normal"} then {
-      continue
-    }
-
-    if {[$win get_file] == ""
-	|| [$win get_file] == $file
-	|| ! [$win is_fixed]} then {
-      set choice $win
-      break
-    }
-  }
-
-  # If we didn't find an available window, then pick the current PC
-  # window.
-  if {$choice == ""} then {
-    set choice $pc_window
-  }
-
-  set window_list [lremove $window_list $choice]
-  lappend window_list $choice
-
-  return $choice
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  choose_and_update
-#  Choose the right source window and then cause it to be updated
-# ------------------------------------------------------------------
-itcl::body SrcWin::choose_and_update {} {
-  if {$pc_window == ""} then {
-    set pc_window [lindex $window_list 0]
-  }
-
-  if {$pc_window == ""} then {
-    # Nothing.
-  } elseif {[catch {gdb_loc} loc]} {
-    $pc_window set_execution_status
-  } else {
-    set prev $pc_window
-    set file [lindex $loc 2]
-    set pc_window [_choose_window $file]
-    debug "chose window $pc_window"
-    $pc_window _update $loc
-    if {$pc_window != $prev} then {
-      $pc_window reveal
-      $prev _set_tag_to_stack
-    }
-  }
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  choose_and_display
-#  Choose the right source window for a given file
-# ------------------------------------------------------------------
-itcl::body SrcWin::choose_and_display {tag linespec} {
-  set file [lindex $linespec 2]
-  set window [_choose_window $file]
-  $window location $tag $linespec
-}
diff --git a/gdb/gdbtk/library/srcwin.ith b/gdb/gdbtk/library/srcwin.ith
deleted file mode 100644
index 65d2033fb2b..00000000000
--- a/gdb/gdbtk/library/srcwin.ith
+++ /dev/null
@@ -1,106 +0,0 @@
-# Source window class definition for GDBtk.
-# Copyright 1997, 1998, 1999, 2000, 2001, 2002 Red Hat, Inc.
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License (GPL) 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.
-
-
-# ----------------------------------------------------------------------
-# Implements a source display widget using primitive widgets as the
-# building blocks.
-#
-# The main display for SrcWin is a SrcTextWin widget.  This file
-# should contain all the code for controlling the SrcTextWin.
-# SrcTextWin should just display the requested file and lines, without
-# having to be very intelligent.  If there are problems, error codes
-# should be returned and SrcWin should figure out what to do.
-# ----------------------------------------------------------------------
-
-itcl::class SrcWin {
-  inherit TopLevelWin GDBWin
-
-  public {
-    method constructor {args}
-    method destructor {}
-    method download_progress { section num tot {msg ""} }
-    method edit {}
-    method enable_ui { on }
-    method fillNameCB {}
-    method fillFuncCB {name}
-    method goto_func {w {val ""}}
-    method location {tag linespec}
-    method mode {w new_mode {go 1}}
-    method no_inferior {}
-    method print {}
-    method reconfig {}
-    method reset {}
-    method set_status { {msg ""} {tmp 0} }
-    method set_execution_status { {line ""} {pc ""}}
-    method stack {cmd}
-    method test_get {var {private_func 0}}
-    method toggle_updates {value}
-    method toolbar {state}
-    method inferior {action}
-    method clear_file {}
-    method get_file {}
-    method is_fixed {}
-    method search {direction string}
-
-    proc choose_and_update {}
-    proc choose_and_display {tag linespec}
-    proc point_to_main {}
-
-    #
-    # GDB Events
-    #
-    method busy {event}
-    method idle {event}
-    method update {event}
-  }
-
-  private {
-    method _build_win {}
-    method _exit {}
-    method _name {w {val ""}}
-    method _set_name { val {found 1} }
-    method _set_state {varname}
-    method _update_title {name}
-    method _update {loc}
-    method get_top {}
-    method _set_tag_to_stack {}
-    proc _choose_window {file}
-    variable _statbar
-    variable _status
-    variable _toolbar
-    variable _statusframe
-    variable top
-    variable twin
-    variable current
-    variable need_files 0
-    variable do_updates 1	;# if the window does updates
-    variable _mangled_func
-    variable Tracing  
-    variable saved_msg ""	;# static
-
-    # statics used for downloads
-    variable last_section ""
-    variable last_section_start 0
-    variable last_done 0
-
-    # These keep track of the current PC window and the list of all
-    # source windows.
-    common window_list ""
-    common pc_window ""
-
-    # fenceposts
-    variable Running 0
-    variable NoRun 0
-  }  
-}
diff --git a/gdb/gdbtk/library/stackwin.itb b/gdb/gdbtk/library/stackwin.itb
deleted file mode 100644
index 3561c0302fb..00000000000
--- a/gdb/gdbtk/library/stackwin.itb
+++ /dev/null
@@ -1,159 +0,0 @@
-# Stack window for Insight.
-# Copyright 1997, 1998, 1999, 2002, 2003 Red Hat
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License (GPL) 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.
-
-
-# ------------------------------------------------------------------
-#  CONSTRUCTOR - create new stack window
-# ------------------------------------------------------------------
-itcl::body StackWin::constructor {args} {    
-  gdbtk_busy
-  build_win
-  gdbtk_idle
-  
-  add_hook gdb_no_inferior_hook [code $this no_inferior]
-}
-
-# ------------------------------------------------------------------
-#  DESTRUCTOR - destroy window containing widget
-# ------------------------------------------------------------------
-itcl::body StackWin::destructor {} {
-  remove_hook gdb_no_inferior_hook [code $this no_inferior]
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  build_win - build the main register window
-# ------------------------------------------------------------------
-itcl::body StackWin::build_win {} {
-  global tcl_platform
-
-  itk_component add slb {
-    iwidgets::scrolledlistbox $itk_interior.s \
-      -vscrollmode dynamic -hscrollmode dynamic \
-      -selectmode single -exportselection false -visibleitems 30x15 \
-      -textfont global/fixed -selectioncommand [code $this change_frame]
-  }
-
-  [$itk_component(slb) component listbox] configure \
-    -bg $::Colors(textbg) -fg $::Colors(textfg)
-
-  update dummy
-
-  pack $itk_interior.s -side left -expand yes -fill both
-
-  window_name "Stack"
-}
-
-
-# ------------------------------------------------------------------
-#  METHOD:  update - update widget when PC changes
-# ------------------------------------------------------------------
-itcl::body StackWin::update {event} {
-  global gdb_selected_frame_level
-
-  if {!$protect_me} {
-    # The gdb_stack command might fail, for instance if you are browsing
-    # a trace experiment, and the stack has not been collected.
-
-    if {[catch {gdb_stack 0 -1} frames]} {
-      dbug W "Error in stack collection $frames"
-      set frames {}
-    }
-
-    if {[llength $frames] == 0} {
-      $itk_component(slb) delete 0 end
-      $itk_component(slb) insert end {NO STACK}
-      return
-    }
-    
-    $itk_component(slb) delete 0 end
-    set levels 0
-    foreach frame $frames {
-      set len [string length $frame]
-
-      if {$len > $maxwidth} {
-	set maxwidth $len
-      }
-      $itk_component(slb) insert end $frame
-      incr levels
-    }
-
-    # this next section checks to see if the source
-    # window is looking at some location other than the 
-    # bottom of the stack.  If so, highlight the stack frame
-    set level [expr {$levels - $gdb_selected_frame_level - 1}]
-    $itk_component(slb) selection set $level
-    $itk_component(slb) see $level
-  }
-}
-
-itcl::body StackWin::idle {event} {
-  set Running 0
-  cursor {}
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  change_frame - change the current frame
-#        This method is currently ONLY called from the mouse binding
-# ------------------------------------------------------------------
-itcl::body StackWin::change_frame {} {
-
-  if {!$Running && [$itk_component(slb) size] != 0} {
-    gdbtk_busy
-    set sel [$itk_component(slb) curselection]
-    set size [$itk_component(slb) size]
-    set frame_num [expr {$size - $sel - 1}]
-    catch {gdb_cmd "frame $frame_num"}
-    
-    # Run idle hooks and cause all widgets to update
-    set protect_me 1
-    gdbtk_update
-    set protect_me 0
-    gdbtk_idle
-  }
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  reconfig - used when preferences change
-# ------------------------------------------------------------------
-itcl::body StackWin::reconfig {} {
-  destroy $itk_interior.s
-  build_win
-}
-
-# ------------------------------------------------------------------
-#  PUBLIC METHOD:  busy - BusyEvent handler
-#                  This method should cause blocking of clicks in
-#                  the window and change mouse pointer.
-# ------------------------------------------------------------------
-itcl::body StackWin::busy {event} {
-  set Running 1
-  cursor watch
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  no_inferior - gdb_no_inferior_hook
-# ------------------------------------------------------------------
-itcl::body StackWin::no_inferior {} {
-  set Running 0
-  cursor {}
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  cursor - set the window cursor
-#        This is a convenience method which simply sets the mouse
-#        pointer to the given glyph.
-# ------------------------------------------------------------------
-itcl::body StackWin::cursor {glyph} {
-  set top [winfo toplevel $itk_interior]
-  $top configure -cursor $glyph
-}
diff --git a/gdb/gdbtk/library/stackwin.ith b/gdb/gdbtk/library/stackwin.ith
deleted file mode 100644
index 4bb140ef061..00000000000
--- a/gdb/gdbtk/library/stackwin.ith
+++ /dev/null
@@ -1,46 +0,0 @@
-# Stack window class definition for GDBtk.
-# Copyright 1997, 1998, 1999 Cygnus Solutions
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License (GPL) 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.
-
-
-# ----------------------------------------------------------------------
-# Implements stack window for gdb
-# ----------------------------------------------------------------------
-
-itcl::class StackWin {
-  inherit EmbeddedWin GDBWin
-
-  private {
-    variable maxwidth 40
-    variable Running 0
-    variable protect_me 0
-    method build_win {}
-    method cursor {glyph}
-    method change_frame {}
-    method no_inferior {}
-  }
-
-  public {
-    method reconfig {}
-    method constructor {args} 
-    method destructor {}
-
-    #
-    # GDB Events
-    #
-    method busy {event}
-    method idle {event}
-    method update {event}
-  }
-
-}
-
diff --git a/gdb/gdbtk/library/targetselection.itb b/gdb/gdbtk/library/targetselection.itb
deleted file mode 100644
index 959b51a7a68..00000000000
--- a/gdb/gdbtk/library/targetselection.itb
+++ /dev/null
@@ -1,1081 +0,0 @@
-# Target selection dialog for Insight.
-# Copyright 1997, 1998, 1999, 2000, 2001, 2002, 2003 Red Hat, Inc.
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License (GPL) 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.
-
-
-# ----------------------------------------------------------------------
-# Implements GDB TargetSelection dialog
-# ----------------------------------------------------------------------
-
-# ------------------------------------------------------------------
-#  CONSTRUCTOR - create new target selection window
-# ------------------------------------------------------------------
-itcl::body TargetSelection::constructor {args} {
-  eval itk_initialize $args
-  set top [winfo toplevel $itk_interior]
-  _init
-  build_win
-}
-
-itcl::body TargetSelection::getname {target name} {
-
-  # Init target database if we haven't already done so
-  init_target_db
-
-  if {[info exists gdb_target($target,$name)]} {
-    return $gdb_target($target,$name)
-  } else {
-    return ""
-  }
-}
-
-itcl::body TargetSelection::init_target_db {} {
-  # check to see if we already initialized this database
-  if {$db_inited} { 
-    return 
-  }
-  set db_inited 1
-
-  # Target Database
-  # Set the following members:
-  # TARGET,pretty-name: Name to display to user
-  # TARGET,debaud: Default baudrate
-  # TARGET,baud-rates: Permissible baudrates
-  # TARGET,cmd: Abstracted command to run for this target (tcpX and com1 are
-  #          replaced with the real port and host/port in set_target)
-  # TARGET,runlist: List of preferences for the target: {attach download run cont}
-  # TARGET,after_attaching: a command to run after attaching to the target
-
-  # Default target
-  set gdb_target(default,pretty-name) "Default"
-  set gdb_target(default,defbaud) ""
-  set gdb_target(default,baud-rates) {}
-  set gdb_target(default,cmd) ""
-  set gdb_target(default,runlist) {0 0 1 0}
-  set gdb_target(default,options) ""
-  set gdb_target(default,after_attaching) {}
-
-  # Exec target
-  set gdb_target(exec,pretty-name) "Exec"
-  set gdb_target(exec,defbaud) ""
-  set gdb_target(exec,baud-rates) {}
-  set gdb_target(exec,cmd) ""
-  set gdb_target(exec,runlist) {0 0 1 0}
-  set gdb_target(exec,options) ""
-  set gdb_target(exec,after_attaching) {}
-
-  # ADS board w/SDS protocol
-  set gdb_target(sds,pretty-name) "SDS"
-  set gdb_target(sds,defbaud) "38400"
-  set gdb_target(sds,baud-rates) {9600 38400}
-  set gdb_target(sds,cmd) "sds com1"
-  set gdb_target(sds,runlist) {1 1 0 1}
-  set gdb_target(sds,after_attaching) {}
-
-  # Simulator
-  set gdb_target(sim,pretty-name) "Simulator"
-  set gdb_target(sim,defbaud) ""
-  set gdb_target(sim,baud-rates) {}
-  set gdb_target(sim,cmd) "sim"
-  set gdb_target(sim,runlist) {1 1 1 0}
-  set gdb_target(sim,options) ""
-  set gdb_target(sim,after_attaching) {}
-
-  # Remote
-  set gdb_target(remote,pretty-name) "Remote/Serial"
-  set gdb_target(remote,defbaud) "9600"
-  set gdb_target(remote,baud-rates) {9600 19200 38400 57600 115200}
-  set gdb_target(remote,cmd) "remote com1"
-  set gdb_target(remote,runlist) {1 1 0 1}
-  set gdb_target(remote,after_attaching) {}
-  set gdb_target(remotetcp,pretty-name) "Remote/TCP"
-  set gdb_target(remotetcp,defbaud) "TCP"
-  set gdb_target(remotetcp,baud-rates) {}
-  set gdb_target(remotetcp,cmd) "remote tcpX"
-  set gdb_target(remotetcp,runlist) {1 1 0 1}
-  set gdb_target(remotetcp,after_attaching) {}
-
-  # ARM Angel
-  set gdb_target(rdi,pretty-name) "ARM Angel/Serial"
-  set gdb_target(rdi,defbaud) "9600"
-  set gdb_target(rdi,baud-rates) {9600 19200 38400 57600 115200}
-  set gdb_target(rdi,cmd) "rdi com1"
-  set gdb_target(rdi,runlist) {1 1 0 1}
-  set gdb_target(rdi,after_attaching) {}
-
-  # ARM Angel/Ethernet
-  set gdb_target(rditcp,pretty-name) "ARM Angel/Ethernet"
-  set gdb_target(rditcp,defbaud) "ETH"
-  set gdb_target(rditcp,baud-rates) {}
-  set gdb_target(rditcp,cmd) "rdi ethX"
-  set gdb_target(rditcp,runlist) {1 1 0 1}
-  set gdb_target(rditcp,after_attaching) {}
-
-  # ARM Remote
-  set gdb_target(rdp,pretty-name) "ARM Remote/Serial"
-  set gdb_target(rdp,defbaud) "9600"
-  set gdb_target(rdp,baud-rates) {9600}
-  set gdb_target(rdp,cmd) "rdp com1"
-  set gdb_target(rdp,runlist) {1 1 0 1}
-  set gdb_target(rdp,after_attaching) {}
-  set gdb_target(rdptcp,pretty-name) "ARM Remote/TCP"
-  set gdb_target(rdptcp,defbaud) "TCP"
-  set gdb_target(rdptcp,baud-rates) {}
-  set gdb_target(rdptcp,cmd) "rdp tcpX"
-  set gdb_target(rdptcp,runlist) {1 1 0 1}
-  set gdb_target(rdptcp,after_attaching) {}
-
-  # m32r rev C
-  set gdb_target(m32r,pretty-name) "M32R/Serial"
-  set gdb_target(m32r,defbaud) "9600"
-  set gdb_target(m32r,baud-rates) {9600}
-  set gdb_target(m32r,cmd) "m32r com1"
-  set gdb_target(m32r,runlist) {1 1 0 1}
-  set gdb_target(m32r,after_attaching) {}
-  set gdb_target(m32rtcp,pretty-name) "M32R/TCP"
-  set gdb_target(m32rtcp,defbaud) "TCP"
-  set gdb_target(m32rtcp,baud-rates) {}
-  set gdb_target(m32rtcp,cmd) "m32r tcpX"
-  set gdb_target(m32rtcp,runlist) {1 1 0 1}
-  set gdb_target(m32rtcp,after_attaching) {}
-
-  # m32r msa2000
-  set gdb_target(mon2000,pretty-name) "MON2000/Serial"
-  set gdb_target(mon2000,defbaud) "9600"
-  set gdb_target(mon2000,baud-rates) {9600}
-  set gdb_target(mon2000,cmd) "mon2000 com1"
-  set gdb_target(mon2000,runlist) {1 1 0 1}
-  set gdb_target(mon2000,after_attaching) {}
-  set gdb_target(mon2000tcp,pretty-name) "MON2000/TCP"
-  set gdb_target(mon2000tcp,defbaud) "TCP"
-  set gdb_target(mon2000tcp,baud-rates) {}
-  set gdb_target(mon2000tcp,cmd) "mon2000 tcpX"
-  set gdb_target(mon2000tcp,runlist) {1 1 0 1}
-  set gdb_target(mon2000tcp,after_attaching) {}
-
-  # sparclite
-  set gdb_target(sparclite,pretty-name) "SPARClite/Serial"
-  set gdb_target(sparclite,defbaud) "9600"
-  set gdb_target(sparclite,baud-rates) {9600}
-  set gdb_target(sparclite,cmd) "sparclite com1"
-  set gdb_target(sparclite,runlist) {1 1 0 1}
-  set gdb_target(sparclite,after_attaching) {}
-  set gdb_target(sparclitetcp,pretty-name) "SPARClite/TCP"
-  set gdb_target(sparclitetcp,defbaud) "TCP"
-  set gdb_target(sparclitetcp,baud-rates) {}
-  set gdb_target(sparclitetcp,cmd) "sparclite tcpX"
-  set gdb_target(sparclitetcp,runlist) {1 1 0 1}
-  set gdb_target(sparclitetcp,after_attaching) {}
-
-  # V850 ICE
-  set gdb_target(ice,pretty-name) "V850 ICE"
-  set gdb_target(ice,defbaud) ""
-  set gdb_target(ice,baud-rates) {}
-  set gdb_target(ice,cmd) "ice"
-  set gdb_target(ice,runlist) {1 1 0 1}
-  set gdb_target(ice,after_attaching) {}
-
-  # MIPS
-  set gdb_target(mips,pretty-name) "MIPS/Serial"
-  set gdb_target(mips,defbaud) "9600"
-  set gdb_target(mips,baud-rates) {9600}
-  set gdb_target(mips,cmd) "mips com1"
-  set gdb_target(mips,runlist) {1 1 0 1}
-  set gdb_target(mips,after_attaching) {}
-  set gdb_target(mipstcp,pretty-name) "MIPS/TCP"
-  set gdb_target(mipstcp,defbaud) "TCP"
-  set gdb_target(mipstcp,baud-rates) {}
-  set gdb_target(mipstcp,cmd) "mips tcpX"
-  set gdb_target(mipstcp,runlist) {1 1 0 1}
-  set gdb_target(mipstcp,after_attaching) {}
-
-  # PMON
-  set gdb_target(pmon,pretty-name) "PMON/Serial"
-  set gdb_target(pmon,defbaud) "9600"
-  set gdb_target(pmon,baud-rates) {9600 19200 38400}
-  set gdb_target(pmon,cmd) "pmon com1"
-  set gdb_target(pmon,runlist) {1 1 0 1}
-  set gdb_target(pmon,after_attaching) {}
-  set gdb_target(pmontcp,pretty-name) "PMON/TCP"
-  set gdb_target(pmontcp,defbaud) "TCP"
-  set gdb_target(pmontcp,baud-rates) {}
-  set gdb_target(pmontcp,cmd) "pmon tcpX"
-  set gdb_target(pmontcp,runlist) {1 1 0 1}
-  set gdb_target(pmontcp,after_attaching) {}
-
-  # DDB
-  set gdb_target(ddb,pretty-name) "DDB/Serial"
-  set gdb_target(ddb,defbaud) "19200"
-  set gdb_target(ddb,baud-rates) {9600 19200 38400}
-  set gdb_target(ddb,cmd) "ddb com1"
-  set gdb_target(ddb,runlist) {1 1 0 1}
-  set gdb_target(ddb,after_attaching) {}
-  set gdb_target(ddbtcp,pretty-name) "DDB/TCP"
-  set gdb_target(ddbtcp,defbaud) "TCP"
-  set gdb_target(ddbtcp,baud-rates) {}
-  set gdb_target(ddbtcp,cmd) "ddb tcpX"
-  set gdb_target(ddbtcp,runlist) {1 1 0 1}
-  set gdb_target(ddbtcp,after_attaching) {}
-
-  # Picobug
-  set gdb_target(picobug,pretty-name) "Picobug/Serial"
-  set gdb_target(picobug,defbaud) "19200"
-  set gdb_target(picobug,baud-rates) {19200}
-  set gdb_target(picobug,cmd) "picobug com1"
-  set gdb_target(picobug,runlist) {1 1 0 1}
-  set gdb_target(picobug,after_attaching) {}
-  set gdb_target(picobugtcp,pretty-name) "Picobug/TCP"
-  set gdb_target(picobugtcp,defbaud) "TCP"
-  set gdb_target(picobugtcp,baud-rates) {}
-  set gdb_target(picobugtcp,cmd) "picobug tcpX"
-  set gdb_target(picobugtcp,runlist) {1 1 0 1}
-  set gdb_target(picobugtcp,after_attaching) {}
-
-  # Cisco.
-  set gdb_target(cisco,pretty-name) "Cisco/Serial"
-  set gdb_target(cisco,defbaud) "38400"
-  set gdb_target(cisco,baud-rates) {9600 19200 38400 56000}
-  set gdb_target(cisco,cmd) "cisco com1"
-  set gdb_target(cisco,runlist) {1 0 0 0}
-  set gdb_target(cisco,after_attaching) "set os cisco"
-  set gdb_target(ciscotcp,pretty-name) "Cisco/TCP"
-  set gdb_target(ciscotcp,defbaud) "TCP"
-  set gdb_target(ciscotcp,baud-rates) {}
-  set gdb_target(ciscotcp,cmd) "cisco tcpX"
-  set gdb_target(ciscotcp,runlist) {1 0 0 0}
-  set gdb_target(ciscotcp,after_attaching) "set os cisco"
-
-  # VxWorks
-  set gdb_target(vxworks,pretty-name) "VxWorks RDB"
-  set gdb_target(vxworks,defbaud) "ETH"
-  set gdb_target(vxworks,baud-rates) {}
-  set gdb_target(vxworks,cmd) "vxworks ethX"
-  set gdb_target(vxworks,runlist) { 1 0 1 1}
-  set gdb_target(vxworks,after_attaching) { sym vxWorks.st }
-
-  # GDBServer, libremote, rda, etc
-  set gdb_target(gdbserver,pretty-name) "GDBserver"
-  set gdb_target(gdbserver,pretty-name) "GDBserver/Serial"
-  set gdb_target(gdbserver,defbaud) "9600"
-  set gdb_target(gdbserver,baud-rates) {9600 19200 38400 57600 115200}
-  set gdb_target(gdbserver,cmd) "remote com1"
-  set gdb_target(gdbserver,runlist) {1 0 0 1}
-  set gdb_target(gdbserver,after_attaching) {}
-  set gdb_target(gdbservertcp,pretty-name) "GDBserver/TCP"
-  set gdb_target(gdbservertcp,defbaud) "TCP"
-  set gdb_target(gdbservertcp,baud-rates) {}
-  set gdb_target(gdbservertcp,cmd) "remote tcpX"
-  set gdb_target(gdbservertcp,runlist) {1 0 0 1}
-  set gdb_target(gdbservertcp,after_attaching) {}
-}
-
-itcl::body TargetSelection::default_port {} {
-  global tcl_platform
-  switch -regexp $tcl_platform(os) {
-    Windows { set port com1 }
-    Linux   { set port /dev/ttyS0 }
-    SunOS   { set port /dev/ttya }
-    AIX     { set port /dev/foo1 }
-    ULTRIX  { set port /dev/foo1 }
-    IRIX    { set port /dev/foo1 }
-    OSF1    { set port /dev/foo1 }
-    NetBSD  { set port /dev/foo1 }
-    HP-UX   { 
-      # Special case...
-      switch -regexp $tcl_platform(osVersion) {
-	A.09 { set port /dev/tty00 }
-	B.10 -
-	B.11 { set port /dev/tty0p0 }
-      }
-    }
-    default { set port /dev/ttya }
-  }
-  
-  return $port
-}
-
-
-itcl::body TargetSelection::_init_prefs {} {
-
-  if {$prefs_inited} {
-    return
-  }
-  set prefs_inited 1
-
-  # these are not target-specific
-
-  pref define gdb/load/main 1
-  pref define gdb/load/exit 1
-  pref define gdb/load/check 0
-
-  # these are target-specific
-  # set up the defaults
-  pref define gdb/load/default-verbose 0
-  pref define gdb/load/default-port [default_port]
-  pref define gdb/load/default-hostname ""
-  pref define gdb/load/default-after_attaching {}
-}
-
-itcl::body TargetSelection::_init_target {} {
-  global gdb_target_name
-  set target_list [get_target_list]
-  set target $gdb_target_name
-
-  # target = CANCEL should never come into here.  If the target was
-  # returned as CANCEL, it should be fixed by the caller...  But it
-  # should not be harmful if it gets in here.
-
-  if {$target == "" || [string compare $target CANCEL] == 0} {
-    set target default
-  }
-    
-  set defbaud $gdb_target($target,defbaud)
-  pref define gdb/load/$target-baud $defbaud
-  pref define gdb/load/$target-port [pref get gdb/load/default-port]
-  pref define gdb/load/$target-verbose [pref get gdb/load/default-verbose]
-  pref define gdb/load/$target-portname 1000
-  pref define gdb/load/$target-hostname [pref get gdb/load/default-hostname]
-  
-  set err [catch {pref get gdb/load/$target-runlist} run_list]
-  if {$err} {
-    set run_list $gdb_target($target,runlist)
-    pref setd gdb/load/$target-runlist $run_list
-  }
-  pref set gdb/src/run_attach [lindex $run_list 0]
-  pref set gdb/src/run_load   [lindex $run_list 1]
-  pref set gdb/src/run_run    [lindex $run_list 2]
-  pref set gdb/src/run_cont   [lindex $run_list 3]
-  
-  set err [catch {pref get gdb/load/$target-after_attaching} aa]
-  if {$err} {
-    set aa $gdb_target($target,after_attaching)
-    pref setd gdb/load/$target-after_attaching $aa
-  }
-}
-
-itcl::body TargetSelection::_init {} {
-
-  if {!$trace_inited} {
-    # Trace all gdb_loaded changes based on target
-    trace variable gdb_loaded w [code TargetSelection::target_trace]
-  }
-  set trace_inited 1
-
-  init_target_db	;# initialize database
-  _init_prefs	;# initialize load prefs 
-  _init_target	;# initialize target prefs
-  set_saved
-
-  # This tells us that the target system is inited.  Some of these
-  # init functions need to be called every time the target dialog is
-  # posted, some only once.  The latter functions can check inited to
-  # see what they should do.
-
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  build_win - build the dialog
-# ------------------------------------------------------------------
-itcl::body TargetSelection::build_win {} {
-  global tcl_platform PREFS_state gdb_ImageDir gdb_target_name
-
-  set f [frame $itk_interior.f]
-  set opts [frame $itk_interior.moreoptions]
-  frame $itk_interior.moreoptionsframe
-  set btns [frame $itk_interior.buttons]
-
-  #labelled frame "Connection"
-  iwidgets::Labeledframe $f.lab -labelpos nw -labeltext [gettext "Connection"]
-  set fr [$f.lab childsite]
-
-  # target name
-  label $fr.tarl -text [gettext "Target:"]
-  combobox::combobox $fr.tar -editable 0 -command [code $this change_target] \
-    -width $Width -maxheight 10 -bg $::Colors(textbg)
-
-  # baud rate combobox
-  label $fr.cbl -text [gettext "Baud Rate:"]
-  combobox::combobox $fr.cb -editable 0 -command [code $this change_baud] \
-    -textvariable [pref varname gdb/load/$target-baud] -width $Width \
-    -maxheight 10 -bg $::Colors(textbg)
-
-  if {[catch {gdb_cmd "show remotebaud"} res]} {
-    set baud [pref get gdb/load/$target-baud]
-  } else {
-    set baud [lindex $res end]
-    set baud [string trimright $baud "."]
-    # When uninitialized, GDB returns a baud rate of 2^32
-    # Detect this and ignore it.
-    if {$baud > 4000000000} {
-      set baud [pref get gdb/load/$target-baud]
-    } else {
-      pref setd gdb/load/$target-baud $baud
-    }
-  }
-
-  # host entry widget
-  entry $fr.host -textvariable [pref varname gdb/load/$target-hostname] \
-    -width $Width
-
-  # port combobox
-  if {$tcl_platform(platform) == "windows"} {
-    set editable 0
-  } else {
-    set editable 1
-  }
-
-  label $fr.portl -text [gettext "Port:"]
-  combobox::combobox $fr.port -editable $editable \
-    -textvariable [pref varname gdb/load/$target-port] \
-    -width $Width -maxheight 10 -bg $::Colors(textbg)
-
-  # load baud rates into combobox
-  fill_rates
-
-  # load port combobox
-  if {$tcl_platform(platform) == "windows"} {
-    foreach val [port_list] {
-      $fr.port list insert end $val
-    }
-  } else {
-    # fixme:  how do I find valid values for these????
-    switch $tcl_platform(os) {
-      Linux { set ports [list /dev/cua0 /dev/ttyS0 /dev/ttyS1 /dev/ttyS2 /dev/ttyS3]}
-      SunOS { set ports [list /dev/ttya /dev/ttyb] }
-      AIX   { set ports [list /dev/foo1 /dev/foo2] }
-      ULTRIX { set ports [list /dev/foo1 /dev/foo2] }
-      IRIX   { set ports [list /dev/foo1 /dev/foo2] }
-      OSF1   { set ports [list /dev/foo1 /dev/foo2] }
-      NetBSD { set ports [list /dev/foo1 /dev/foo2] }
-      HP-UX  { 
-	# Special case...
-	switch -regexp $tcl_platform(osVersion) {
-	  A.09 { set ports [list /dev/tty00 /dev/tty01] }
-	  B.10 -
-	  B.11 { set ports [list /dev/tty0p0 /dev/tty1p0] }
-	}
-      }
-      default { set ports [list UNKNOWN UNKNOWN] }
-    }
-    foreach val $ports {
-      $fr.port list insert end $val
-    }
-  }
-
-  # Port entry widget
-  entry $fr.porte -textvariable [pref varname gdb/load/$target-port] -width $Width
-
-  frame $f.fr
-  checkbutton $f.fr.main -text [gettext "Set breakpoint at 'main'"] \
-    -variable [pref varname gdb/load/main]
-  checkbutton $f.fr.exit -text [gettext "Set breakpoint at 'exit'"] \
-    -variable [pref varname gdb/load/exit]
-  frame $f.fr.bp
-  checkbutton $f.fr.bp.at_func -text [gettext "Set breakpoint at"] \
-    -variable [pref varname gdb/load/bp_at_func]
-  entry $f.fr.bp.func -textvariable [pref varname gdb/load/bp_func] -width 20
-  checkbutton $f.fr.verb -text [gettext "Display Download Dialog"] \
-    -variable [pref varname gdb/load/$target-verbose]
-  checkbutton $f.fr.xterm -text [gettext "Use xterm as inferior's tty"] \
-    -variable [pref varname gdb/process/xtermtty] \
-    -onvalue yes -offvalue no
-
-  if {![pref get gdb/control_target]} {
-    $f.fr.main configure -state disabled
-    $f.fr.exit configure -state disabled
-    $f.fr.verb configure -state disabled
-    $f.fr.bp.at_func configure -state disabled
-    $f.fr.bp.func configure -state disabled
-    checkbutton $f.fr.check -text [gettext "Compare to remote executable"] \
-      -variable [pref varname gdb/load/check]
-    if { $gdb_target_name == "exec" } {
-      $f.fr.check configure -state disabled
-    }
-  }
-
-  grid $fr.tarl $fr.tar -sticky w -padx 5 -pady 5
-  grid $fr.cbl $fr.cb -sticky w -padx 5 -pady 5
-  grid $fr.portl $fr.port -sticky w -padx 5 -pady 5
-  set mapped1 $fr.cb
-  set mapped2 $fr.port
-
-  grid $f.fr.main -sticky w -padx 5 -pady 5
-  grid $f.fr.exit -sticky w -padx 5 -pady 5
-  pack $f.fr.bp.at_func $f.fr.bp.func -side left
-  grid $f.fr.bp -sticky w -padx 5 -pady 5
-  grid $f.fr.verb -sticky w -padx 5 -pady 5
-  grid $f.fr.xterm -sticky w -padx 5 -pady 5
-  if {![pref get gdb/control_target]} {
-    grid $f.fr.check -sticky w -padx 5 -pady 5
-  }
-
-  grid $f.lab $f.fr -sticky w -padx 5 -pady 5
-
-  # Create the "More Options" thingy
-  if {[lsearch [image names] _MORE_] == -1} {
-    image create photo _MORE_ -file [file join $gdb_ImageDir more.gif]
-    image create photo _LESS_ -file [file join $gdb_ImageDir less.gif]
-  }
-
-  set MoreButton [button $opts.button -image _MORE_ \
-		    -relief flat -command [code $this toggle_more_options]]
-  set MoreLabel [label $opts.lbl -text {More Options}]
-  frame $opts.frame -relief raised -bd 1
-  pack $opts.button $opts.lbl -side left
-  place $opts.frame -relx 1 -x -10 -rely 0.5 -relwidth 0.73 -height 2 -anchor e
-
-  # Create the (hidden) more options frame
-  set MoreFrame [iwidgets::Labeledframe $itk_interior.moreoptionsframe.frame \
-		   -labelpos nw -labeltext {Run Options}]
-  set frame [$MoreFrame childsite]
-
-  set var [pref varname gdb/src/run_attach]
-  checkbutton $frame.attach -text {Attach to Target} -variable $var
-
-  set var [pref varname gdb/src/run_load]
-  checkbutton $frame.load -text {Download Program} -variable $var
-
-  set rm_frame [iwidgets::labeledframe $frame.run_method -labelpos nw -labeltext "Run Method" ]
-  set RunMethod [ $rm_frame childsite ]
-
-  set var [pref varname gdb/src/run_cont]
-  radiobutton $RunMethod.cont -text {Continue from Last Stop} -value 1 -variable $var \
-    -command [code $this set_run run]
-  
-  set var [pref varname gdb/src/run_run]
-  radiobutton $RunMethod.run -text {Run Program} -value 1 -variable $var \
-    -command [code $this set_run cont]
-
-  # The after attaching command entry
-  set _after_entry [entry $frame.aftere]
-  label $frame.afterl -text {Command to issue after attaching:}
-
-  grid $frame.attach -column 0 -row 1 -padx 10 -sticky w
-  grid $frame.load -column 0 -row 2 -padx 10 -sticky w
-
-  grid $RunMethod.run -column 0 -row 1 -sticky w -ipady 2
-  grid $RunMethod.cont -column 0 -row 2 -sticky w -ipady 2
-  
-  grid $rm_frame -column 1 -row 1 -rowspan 2 -sticky nsew -ipady 2
-
-  grid $frame.afterl -row 4 -sticky we -columnspan 2 -ipady 2
-  grid $frame.aftere -sticky we -columnspan 2 -ipady 2
-  grid columnconfigure $frame 0 -weight 1
-  grid columnconfigure $frame 1 -weight 1
-
-  # Map everything onto the screen
-  # This looks like a possible packing bug -- our topmost frame
-  # will not resize itself. So, instead, use the topmost frame.
-  #pack $f $opts $itk_interior.moreoptionsframe -side top -fill x
-  pack $MoreFrame -fill x -expand yes
-  pack $f $opts -side top -fill x
-
-  change_target $gdb_target($target,pretty-name)
-
-  button $btns.ok -text [gettext OK] -width 7 -command [code $this save] \
-    -default active
-  button $btns.cancel -text [gettext Cancel] -width 7 \
-    -command [code $this cancel]
-  button $btns.help -text [gettext Help] -width 7 -command [code $this help] \
-    -state disabled
-  standard_button_box $btns
-  bind $btns.ok <Return> "$btns.ok flash; $btns.ok invoke"
-  bind $btns.cancel <Return> "$btns.cancel flash; $btns.cancel invoke"
-  bind $btns.help <Return> "$btns.help flash; $btns.help invoke"
-
-  pack $btns -side bottom -anchor e
-  focus $btns.ok
-  
-  # set up balloon help
-  balloon register $f.fr.bp.at_func "Set User-Speficied Breakpoints at Run Time"
-  balloon register $f.fr.bp.func "Enter a List of Functions for Breakpoints"
-
-  window_name "Target Selection"
-
-  if {[valid_target $target]} {
-    $fr.tar configure -value $gdb_target($target,pretty-name)
-  }
-  fill_targets
-
-
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  set_saved - set saved values
-# ------------------------------------------------------------------
-itcl::body TargetSelection::set_saved {} {
-  set saved_baud [pref get gdb/load/$target-baud]
-  set saved_port [pref get gdb/load/$target-port]
-  set saved_main [pref get gdb/load/main]
-  set saved_exit [pref get gdb/load/exit]
-  set saved_check [pref get gdb/load/check]
-  set saved_verb [pref get gdb/load/$target-verbose]
-  set saved_portname [pref get gdb/load/$target-portname]
-  set saved_hostname [pref get gdb/load/$target-hostname]
-  set saved_attach [pref get gdb/src/run_attach]
-  set saved_load   [pref get gdb/src/run_load]
-  set saved_run    [pref get gdb/src/run_run]
-  set saved_cont   [pref get gdb/src/run_cont]
-  if {[info exists gdb_target($target,options)]} {
-    if {[catch {pref get gdb/load/$target-opts} saved_options]} {
-      set saved_options ""
-    }
-  }
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  write_saved - write saved values to preferences
-# ------------------------------------------------------------------
-itcl::body TargetSelection::write_saved {} {
-  pref setd gdb/load/$target-baud $saved_baud
-  pref setd gdb/load/$target-port $saved_port
-  pref setd gdb/load/main $saved_main
-  pref setd gdb/load/exit $saved_exit
-  pref setd gdb/load/check $saved_check
-  pref setd gdb/load/$target-verbose $saved_verb
-  pref setd gdb/load/$target-portname $saved_portname
-  pref setd gdb/load/$target-hostname $saved_hostname
-  pref setd gdb/load/$target-runlist [list $saved_attach $saved_load $saved_run $saved_cont]
-  if {[info exists gdb_target($target,options)]} {
-    pref setd gdb/load/$target-opts $saved_options
-  }
-  if {[catch {$_after_entry get} saved_after_attaching]} {
-    set saved_after_attaching ""
-  }
-  pref setd gdb/load/$target-after_attaching $saved_after_attaching
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  fill_rates - fill baud rate combobox
-# ------------------------------------------------------------------
-itcl::body TargetSelection::fill_rates {} {
-  $fr.cb list delete 0 end
-
-  if {$gdb_target($target,baud-rates) != ""} {
-    foreach val $gdb_target($target,baud-rates) {
-      $fr.cb list insert end $val
-    }
-  }
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  fill_targets - fill target combobox
-# ------------------------------------------------------------------
-itcl::body TargetSelection::fill_targets {} {
-  #[$fr.tar subwidget listbox] delete 0 end
-  $fr.tar list delete 0 end
-
-  foreach val $target_list {
-    if {[info exists gdb_target($val,pretty-name)]} {
-      $fr.tar list insert end $gdb_target($val,pretty-name)
-
-      # Insert TCP target, if it exists
-      if {[info exists gdb_target(${val}tcp,pretty-name)]} {
-	$fr.tar list insert end $gdb_target(${val}tcp,pretty-name)
-      }
-    }
-  }
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  config_dialog - Convenience method to map/unmap/rename
-#            components onto the screen based on target T.
-# ------------------------------------------------------------------
-itcl::body TargetSelection::config_dialog {t} {
-  pref define gdb/load/$t-verbose [pref get gdb/load/verbose]
-  $f.fr.verb config -variable [pref varname gdb/load/$t-verbose]
-  # Map the correct entries and comboboxes onto the screen
-  if {$gdb_target($t,defbaud) == "TCP"} {
-    # we have a tcp target
-    # map host and porte
-    if {$mapped1 != "$fr.host"} {
-      grid forget $mapped1
-      set mapped1 $fr.host
-      grid $mapped1 -row 1 -column 1 -sticky w -padx 5 -pady 5
-    }
-    $fr.cbl configure -text "Hostname:"
-    $fr.host config -textvariable [pref varname gdb/load/$t-hostname]
-
-    if {$mapped2 != "$fr.porte"} {
-      grid forget $mapped2
-      set mapped2 $fr.porte
-      grid $mapped2 -row 2 -column 1 -sticky w -padx 5 -pady 5
-    }
-    $fr.portl configure -text {Port:}
-    $fr.porte config -textvariable [pref varname gdb/load/$t-portname] -fg black
-
-    $mapped1 configure -state normal
-    $mapped2 configure -state normal
-  } elseif {$gdb_target($t,defbaud) == "ETH"} {
-    # we have a udp target
-    # map host and porte
-    if {$mapped1 != "$fr.host"} {
-      grid forget $mapped1
-      set mapped1 $fr.host
-      grid $mapped1 -row 1 -column 1 -sticky w -padx 5 -pady 5
-    }
-    $fr.cbl configure -text "Hostname:"
-    $fr.host config -textvariable [pref varname gdb/load/$t-hostname]
-
-    if {$mapped2 != "$fr.porte"} {
-      grid forget $mapped2
-    }
-    $fr.portl configure -text {Port: N/A (fixed)}
-
-    $mapped1 configure -state normal
-    $mapped2 configure -state disabled
-  } elseif {$gdb_target($t,defbaud) != ""} {
-    # we have a serial target
-    # map port and cb
-    if {$mapped1 != "$fr.cb"} {
-      grid forget $mapped1
-      set mapped1 $fr.cb
-      grid $mapped1 -row 1 -column 1 -sticky w -padx 5 -pady 5
-    }
-    $fr.cbl configure -text "Baud Rate:"
-    $fr.cb configure -textvariable [pref varname gdb/load/$t-baud]
-    
-    if {$mapped2 != "$fr.port"} {
-      grid forget $mapped2
-      set mapped2 $fr.port
-      grid $mapped2 -row 2 -column 1 -sticky w -padx 5 -pady 5
-    }
-    $fr.portl configure -text {Port:}
-    $fr.port configure -textvariable [pref varname gdb/load/$t-port]
-
-    $mapped1 configure -state normal
-    $mapped2 configure -state normal
-  } else {
-    # we have a non-remote(-like) target
-    # disable all (except tar) and check for
-    # options
-    $mapped1 configure -state disabled
-    $mapped2 configure -state disabled
-    $fr.porte configure -fg gray
-
-    if {[info exists gdb_target($t,options)]} {
-      if {$mapped1 != "$fr.host"} {
-	grid forget $mapped1
-	set mapped1 $fr.host
-	grid $mapped1 -row 1 -column 1 -sticky w -padx 5 -pady 5
-      }
-      $mapped1 configure -state normal
-      $fr.host config -textvariable [pref varname gdb/load/$t-opts]
-
-      # We call options "arguments" for the exec target
-      # FIXME: this is really overloaded!!
-      if {$t == "exec"} {
-	set text "Arguments:"
-      } else {
-	set text "Options:"
-      }
-      $fr.cbl configure -text $text
-    }
-  }
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  change_target - callback for target combobox
-# ------------------------------------------------------------------
-itcl::body TargetSelection::change_target {w {name ""}} {
-  if {$name == ""} {return}
-  set target [get_target $name]
-
-  if { "$target" == "exec" } {
-    $RunMethod.run configure -state disabled -value 1
-    $RunMethod.cont configure -state disabled
-  } else {
-    $RunMethod.run configure -state normal
-    $RunMethod.cont configure -state normal
-  }
-
-  debug "$target"
-  set defbaud $gdb_target($target,defbaud)
-  pref define gdb/load/$target-baud $defbaud
-  pref define gdb/load/$target-portname 1000
-  pref define gdb/load/$target-hostname [pref get gdb/load/default-hostname]
-  if {$defbaud == ""} {
-    pref define gdb/load/$target-port ""
-  } else {
-    pref define gdb/load/$target-port [pref get gdb/load/default-port]
-  }
-
-  config_dialog $target
-  fill_rates
-
-  # Configure the default run options for this target
-  set err [catch {pref get gdb/load/$target-runlist} run_list]
-  if {$err} {
-    set run_list $gdb_target($target,runlist)
-    pref setd gdb/load/$target-runlist $run_list
-  }
-
-  pref set gdb/src/run_attach [lindex $run_list 0]
-  pref set gdb/src/run_load   [lindex $run_list 1]
-  pref set gdb/src/run_run    [lindex $run_list 2]
-  pref set gdb/src/run_cont   [lindex $run_list 3]
-  set_check_button $name
-
-  set err [catch {pref get gdb/load/$target-after_attaching} aa]
-  if {$err} {
-    set aa $gdb_target($target,after_attaching)
-    pref setd gdb/load/$target-after_attaching $aa
-  }
-
-  $_after_entry delete 0 end
-  $_after_entry insert 0 $aa
-
-  set_saved
-
-  set changes 0
-}
-
-# ------------------------------------------------------------------
-#  PRIVATE METHOD:  change_baud - called when the baud rate is changed.
-#  If GDB is running, set baud rate in GDB and read it back.
-# ------------------------------------------------------------------
-itcl::body TargetSelection::change_baud {w {baud ""}} {
-  if {$baud != ""} {
-    if {([string compare $baud "TCP"] != 0)
-        && ([string compare $baud "ETH"] != 0)} {
-      gdb_cmd "set remotebaud $baud"
-      if {[catch {gdb_cmd "show remotebaud"} res]} {
-	set newbaud 0
-      } else {
-	set newbaud [lindex $res end]
-	set newbaud [string trimright $newbaud "."]
-	if {$newbaud > 4000000} {
-	  set newbaud 0
-	}
-      }
-      if {$newbaud != $baud} {
-	pref set gdb/load/$target-baud $newbaud
-      }
-    }
-  }
-}
-
-
-# ------------------------------------------------------------------
-#  METHOD:  port_list - return a list of valid ports for Windows
-# ------------------------------------------------------------------
-itcl::body TargetSelection::port_list {} {
-  set plist ""
-  # Scan com1 - com8 trying to open each one.
-  # If permission is denied that means it is in use,
-  # which is OK because we may be using it or the user
-  # may be setting up the remote target manually with
-  # a terminal program.
-  set quit 0
-  for {set i 1} {!$quit} {incr i} {
-    if {[catch { set fd [::open COM$i: RDWR] } msg]} {
-      # Failed.  Find out why.
-      if {[string first "permission denied" $msg] != -1} {
-	# Port is there, but busy right now. That's OK.
-	lappend plist com$i
-      } elseif {$i > 4} {
-	# if we've scanned the first 4 ports, then quit when we find no more 
-	set quit 1
-      }
-    } else {
-      # We got it.  Now close it and add to list.
-      close $fd
-      lappend plist com$i
-    }
-  }
-  return $plist
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  get_target_list - return a list of targets supported
-#  by this GDB.  Parses the output of "help target"
-# ------------------------------------------------------------------
-itcl::body TargetSelection::get_target_list {} {
-  set native [native_debugging]
-  set names ""
-  set res [gdb_cmd "help target"]
-  foreach line [split $res \n] {
-    if {![string compare [lindex $line 0] "target"]} {
-      set name [lindex $line 1]
-
-      # For cross debuggers, do not allow the target "exec"
-      if {$name == "exec" && !$native} {
-	continue
-      }
-      lappend names $name
-    }
-  }
-  lappend names gdbserver
-  return $names
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  save - save values
-# ------------------------------------------------------------------
-itcl::body TargetSelection::save {} {
-  global gdb_target_name
-  set err [catch {
-    set_saved
-    write_saved
-    set gdb_target_name $target
-    pref setd gdb/load/target $target
-  } errtxt]
-  if {$err} {debug "target: $errtxt"}
-  if {[valid_target $gdb_target_name]} {
-    # Dismiss the dialog box
-    unpost
-  } else {
-    tk_messageBox -message "The current target is not valid."
-  }
-  
-}
-
-
-# ------------------------------------------------------------------
-#  METHOD:  cancel - restore previous values
-# ------------------------------------------------------------------
-itcl::body TargetSelection::cancel {} {
-  global gdb_target_name
-  catch {gdb_cmd "set remotebaud $saved_baud"}
-
-  $fr.cb configure -value $saved_baud
-  write_saved
-  if {$exportcancel} {
-    set gdb_target_name CANCEL
-  }
-
-  # Now dismiss the dialog
-  unpost
-}
-
-# ------------------------------------------------------------------
-#  METHOD: set_check_button - enable/disable compare-section command 
-# ------------------------------------------------------------------
-itcl::body TargetSelection::set_check_button {name} {
-  if {[winfo exists  $itk_interior.f.fr.check]} {
-    if { $name == "exec" } {
-      $itk_interior.f.fr.check configure -state disabled
-    } else {
-      $itk_interior.f.fr.check configure -state normal
-    }
-  }
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  help - launches context sensitive help.
-# ------------------------------------------------------------------
-itcl::body TargetSelection::help {} {
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  reconfig - used when preferences change
-# ------------------------------------------------------------------
-itcl::body TargetSelection::reconfig {} {
-  # for now, just delete and recreate
-  destroy $itk_interior.f
-  build_win
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  get_target - get the internal name of a target from the
-#              pretty-name
-# ------------------------------------------------------------------
-itcl::body TargetSelection::get_target {name} {
-  set t {}
-  set list [array get gdb_target *,pretty-name]
-  set i [lsearch -exact $list $name]
-  if {$i != -1} {
-    incr i -1
-    set t [lindex [split [lindex $list $i] ,] 0]
-  } else {
-    debug "unknown pretty-name \"$name\""
-  }
-  return $t
-}
-
-# ------------------------------------------------------------------
-#  METHOD: toggle_more_options -- toggle displaying the  More/Fewer
-#                Options pane
-# ------------------------------------------------------------------
-itcl::body TargetSelection::toggle_more_options {} {
-  if {[$MoreLabel cget -text] == "More Options"} {
-    $MoreLabel configure -text "Fewer Options"
-    $MoreButton configure -image _LESS_
-    # Bug in Tk? The top-most frame does not shrink...
-    #pack $MoreFrame
-    pack $itk_interior.moreoptionsframe -after $itk_interior.moreoptions -fill both -padx 5 -pady 5
-  } else {
-    $MoreLabel configure -text "More Options"
-    $MoreButton configure -image _MORE_
-    #pack forget $MoreFrame
-    pack forget $itk_interior.moreoptionsframe
-  }
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  set_run - set the run button. Make sure not both run and
-#                     continue are selected.
-# ------------------------------------------------------------------
-itcl::body TargetSelection::set_run {check_which} {
-  global PREFS_state
-  set var [pref varname gdb/src/run_$check_which]
-  global $var
-  if {[set $var]} {
-    set $var 0
-  }
-}
-
-# ------------------------------------------------------------------
-#   PROCEDURE: target_trace
-#          This procedure is used to configure gdb_loaded
-#          and possible more) whenever the value of gdb_loaded
-#          is changed based on the current target.
-# ------------------------------------------------------------------
-itcl::body TargetSelection::target_trace {variable index op} {
-  global gdb_target_name gdb_loaded
-
-  switch $gdb_target_name {
-
-    exec {
-      # The exec target is always loaded.
-      set gdb_loaded 1
-    }
-  }
-}
-
-# Returns 1 if TARGET is a _runnable_ target for this gdb.
-itcl::body TargetSelection::valid_target {target} {
-
-  # always allow gdbserver
-  if {$target == "gdbserver"} {return 1}
-
-  set err [catch {gdb_cmd "help target $target"}]
-  if {$target == "exec" && ![native_debugging]} {
-    set err 1
-  }
-
-  if {[regexp "tcp$" $target]} {
-    # Special case (of course)
-    regsub tcp$ $target {} foo
-    return [valid_target $foo]
-  }
-
-  return [expr {$err == 0}]
-}
-
-# Returns 1 if this is not a cross debugger.
-itcl::body TargetSelection::native_debugging {} {
-  global GDBStartup
-
-  set r [string compare $GDBStartup(host_name) $GDBStartup(target_name)]
-  return [expr {!$r}]
-}
diff --git a/gdb/gdbtk/library/targetselection.ith b/gdb/gdbtk/library/targetselection.ith
deleted file mode 100644
index aed0b8d7bb5..00000000000
--- a/gdb/gdbtk/library/targetselection.ith
+++ /dev/null
@@ -1,100 +0,0 @@
-# Target selection dialog class definition for GDBtk.
-# Copyright 1997, 1998, 1999 Cygnus Solutions
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License (GPL) 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.
-
-
-itcl::class TargetSelection {
-  inherit ModalDialog ManagedWin
-
-  private {
-    variable f
-    variable fr
-    variable target
-    variable saved_baud
-    variable saved_port
-    variable saved_main
-    variable saved_exit
-    variable saved_check
-    variable saved_verb
-    variable saved_portname
-    variable saved_hostname
-    variable saved_attach
-    variable saved_load
-    variable saved_run
-    variable saved_cont
-    variable saved_options
-    variable saved_after_attaching
-    variable _after_entry
-    variable changes 0
-    variable target_list ""
-
-    common db_inited    0
-    common prefs_inited 0
-    common trace_inited 0
-
-    # The Connection frame has three "sections"; the first contains
-    # a combobox with all the targets. The second can either be
-    # a combobox listing available baud rates or an entry for specifying
-    # the hostname of a TCP connection. The actual widget mapped onto the
-    # screen is saved in MAPPED1. The third section contains either a
-    # combobox for the serial port or an entry for the portnumber. The
-    # widget actually mapped onto the screen is saved in MAPPED2.
-    variable mapped1
-    variable mapped2
-    
-    variable Width 20
-    variable MoreButton
-    variable MoreFrame
-    variable MoreLabel
-
-    variable RunMethod
-    
-    proc _init_prefs {}
-    proc default_port {}
-
-    method build_win {}
-    method cancel {}
-    method change_baud {w {baud ""}}    
-    method change_target {w {name ""}}
-    method config_dialog {t}
-    method fill_rates {}
-    method fill_targets {}
-    method get_target {name}
-    method help {}
-    method _init {}
-    method _init_target {}
-    method port_list {}
-    method save {}
-    method set_check_button {name}
-    method set_run {check_which}
-    method set_saved {}
-    method target_trace {variable index op}
-    method toggle_more_options {}
-    method valid_target {target}
-    method write_saved {}
-  }
-
-  public {
-    variable exportcancel 0
-
-    method constructor {args} 
-    method reconfig {}
-
-    proc get_target_list {}
-    proc native_debugging {}
-    proc getname {target name}
-    proc init_target_db {}
-  }
-
-  protected common gdb_target
-
-}
diff --git a/gdb/gdbtk/library/tclIndex b/gdb/gdbtk/library/tclIndex
deleted file mode 100644
index 657c54d226e..00000000000
--- a/gdb/gdbtk/library/tclIndex
+++ /dev/null
@@ -1,618 +0,0 @@
-# Tcl autoload index file, version 2.0
-# This file is generated by the "auto_mkindex" command
-# and sourced to set up indexing information for one or
-# more commands.  Typically each line is a command that
-# sets an element in the auto_index array, where the
-# element name is the name of a command and the value is
-# a script that loads the command.
-
-set auto_index(About) [list source [file join $dir about.tcl]]
-set auto_index(ActionDlg) [list source [file join $dir actiondlg.tcl]]
-set auto_index(::Editor::edit) [list source [file join $dir editor.tcl]]
-set auto_index(open_help) [list source [file join $dir helpviewer.tcl]]
-set auto_index(prompt_helpname) [list source [file join $dir helpviewer.tcl]]
-set auto_index(gdbtk_tcl_set_variable) [list source [file join $dir interface.tcl]]
-set auto_index(gdbtk_tcl_preloop) [list source [file join $dir interface.tcl]]
-set auto_index(gdbtk_busy) [list source [file join $dir interface.tcl]]
-set auto_index(gdbtk_update) [list source [file join $dir interface.tcl]]
-set auto_index(gdbtk_update_safe) [list source [file join $dir interface.tcl]]
-set auto_index(gdbtk_idle) [list source [file join $dir interface.tcl]]
-set auto_index(gdbtk_quit_check) [list source [file join $dir interface.tcl]]
-set auto_index(gdbtk_quit) [list source [file join $dir interface.tcl]]
-set auto_index(gdbtk_force_quit) [list source [file join $dir interface.tcl]]
-set auto_index(gdbtk_cleanup) [list source [file join $dir interface.tcl]]
-set auto_index(gdbtk_tcl_query) [list source [file join $dir interface.tcl]]
-set auto_index(gdbtk_tcl_warning) [list source [file join $dir interface.tcl]]
-set auto_index(show_warning) [list source [file join $dir interface.tcl]]
-set auto_index(gdbtk_tcl_ignorable_warning) [list source [file join $dir interface.tcl]]
-set auto_index(gdbtk_tcl_fputs) [list source [file join $dir interface.tcl]]
-set auto_index(echo) [list source [file join $dir interface.tcl]]
-set auto_index(gdbtk_tcl_fputs_error) [list source [file join $dir interface.tcl]]
-set auto_index(gdbtk_tcl_fputs_log) [list source [file join $dir interface.tcl]]
-set auto_index(gdbtk_tcl_fputs_target) [list source [file join $dir interface.tcl]]
-set auto_index(gdbtk_tcl_fputs_target_err) [list source [file join $dir interface.tcl]]
-set auto_index(gdbtk_tcl_flush) [list source [file join $dir interface.tcl]]
-set auto_index(gdbtk_tcl_start_variable_annotation) [list source [file join $dir interface.tcl]]
-set auto_index(gdbtk_tcl_end_variable_annotation) [list source [file join $dir interface.tcl]]
-set auto_index(gdbtk_tcl_breakpoint) [list source [file join $dir interface.tcl]]
-set auto_index(gdbtk_tcl_tracepoint) [list source [file join $dir interface.tcl]]
-set auto_index(gdbtk_tcl_trace_find_hook) [list source [file join $dir interface.tcl]]
-set auto_index(gdb_run_readline_command) [list source [file join $dir interface.tcl]]
-set auto_index(gdb_run_readline_command_no_output) [list source [file join $dir interface.tcl]]
-set auto_index(gdbtk_tcl_readline_begin) [list source [file join $dir interface.tcl]]
-set auto_index(gdbtk_tcl_readline) [list source [file join $dir interface.tcl]]
-set auto_index(gdbtk_tcl_readline_end) [list source [file join $dir interface.tcl]]
-set auto_index(gdbtk_tcl_busy) [list source [file join $dir interface.tcl]]
-set auto_index(gdbtk_tcl_idle) [list source [file join $dir interface.tcl]]
-set auto_index(gdbtk_tcl_tstart) [list source [file join $dir interface.tcl]]
-set auto_index(gdbtk_tcl_tstop) [list source [file join $dir interface.tcl]]
-set auto_index(gdbtk_tcl_display) [list source [file join $dir interface.tcl]]
-set auto_index(gdbtk_register_changed) [list source [file join $dir interface.tcl]]
-set auto_index(gdbtk_memory_changed) [list source [file join $dir interface.tcl]]
-set auto_index(gdbtk_tcl_pre_add_symbol) [list source [file join $dir interface.tcl]]
-set auto_index(gdbtk_tcl_post_add_symbol) [list source [file join $dir interface.tcl]]
-set auto_index(gdbtk_tcl_file_changed) [list source [file join $dir interface.tcl]]
-set auto_index(gdbtk_tcl_exec_file_display) [list source [file join $dir interface.tcl]]
-set auto_index(gdbtk_locate_main) [list source [file join $dir interface.tcl]]
-set auto_index(set_exe_name) [list source [file join $dir interface.tcl]]
-set auto_index(set_exe) [list source [file join $dir interface.tcl]]
-set auto_index(_open_file) [list source [file join $dir interface.tcl]]
-set auto_index(_close_file) [list source [file join $dir interface.tcl]]
-set auto_index(set_target_name) [list source [file join $dir interface.tcl]]
-set auto_index(set_target) [list source [file join $dir interface.tcl]]
-set auto_index(run_executable) [list source [file join $dir interface.tcl]]
-set auto_index(gdbtk_attach_remote) [list source [file join $dir interface.tcl]]
-set auto_index(gdbtk_connect) [list source [file join $dir interface.tcl]]
-set auto_index(gdbtk_step) [list source [file join $dir interface.tcl]]
-set auto_index(gdbtk_next) [list source [file join $dir interface.tcl]]
-set auto_index(gdbtk_finish) [list source [file join $dir interface.tcl]]
-set auto_index(gdbtk_continue) [list source [file join $dir interface.tcl]]
-set auto_index(gdbtk_stepi) [list source [file join $dir interface.tcl]]
-set auto_index(gdbtk_nexti) [list source [file join $dir interface.tcl]]
-set auto_index(gdbtk_attached) [list source [file join $dir interface.tcl]]
-set auto_index(gdbtk_detached) [list source [file join $dir interface.tcl]]
-set auto_index(gdbtk_stop) [list source [file join $dir interface.tcl]]
-set auto_index(gdbtk_stop_idle_callback) [list source [file join $dir interface.tcl]]
-set auto_index(gdbtk_detach) [list source [file join $dir interface.tcl]]
-set auto_index(gdbtk_run) [list source [file join $dir interface.tcl]]
-set auto_index(gdbtk_attach_native) [list source [file join $dir interface.tcl]]
-set auto_index(set_baud) [list source [file join $dir interface.tcl]]
-set auto_index(do_state_hook) [list source [file join $dir interface.tcl]]
-set auto_index(gdbtk_disconnect) [list source [file join $dir interface.tcl]]
-set auto_index(tstart) [list source [file join $dir interface.tcl]]
-set auto_index(tstop) [list source [file join $dir interface.tcl]]
-set auto_index(source_file) [list source [file join $dir interface.tcl]]
-set auto_index(gdbtk_signal) [list source [file join $dir interface.tcl]]
-set auto_index(gdbtk_clear_file) [list source [file join $dir interface.tcl]]
-set auto_index(initialize_gdbtk) [list source [file join $dir interface.tcl]]
-set auto_index(gdbtk_tcl_architecture_changed) [list source [file join $dir interface.tcl]]
-set auto_index(gdbtk_console_read) [list source [file join $dir interface.tcl]]
-set auto_index(LocalsWin) [list source [file join $dir locals.tcl]]
-set auto_index(ModalDialog) [list source [file join $dir modal.tcl]]
-set auto_index(pref_read) [list source [file join $dir prefs.tcl]]
-set auto_index(pref_save) [list source [file join $dir prefs.tcl]]
-set auto_index(escape_value) [list source [file join $dir prefs.tcl]]
-set auto_index(unescape_value) [list source [file join $dir prefs.tcl]]
-set auto_index(pref_set_defaults) [list source [file join $dir prefs.tcl]]
-set auto_index(pref_set_colors) [list source [file join $dir prefs.tcl]]
-set auto_index(pref_load_default) [list source [file join $dir prefs.tcl]]
-set auto_index(pref_load_gnome) [list source [file join $dir prefs.tcl]]
-set auto_index(load_gnome_file) [list source [file join $dir prefs.tcl]]
-set auto_index(pref_set_option_db) [list source [file join $dir prefs.tcl]]
-set auto_index(::Session::_exe_name) [list source [file join $dir session.tcl]]
-set auto_index(::Session::_serialize_bps) [list source [file join $dir session.tcl]]
-set auto_index(::Session::_recreate_bps) [list source [file join $dir session.tcl]]
-set auto_index(::Session::save) [list source [file join $dir session.tcl]]
-set auto_index(::Session::load) [list source [file join $dir session.tcl]]
-set auto_index(::Session::notice_file_change) [list source [file join $dir session.tcl]]
-set auto_index(::Session::delete) [list source [file join $dir session.tcl]]
-set auto_index(::Session::list_names) [list source [file join $dir session.tcl]]
-set auto_index(TdumpWin) [list source [file join $dir tdump.tcl]]
-set auto_index(TfindArgs) [list source [file join $dir tfind_args.tcl]]
-set auto_index(TraceDlg) [list source [file join $dir tracedlg.tcl]]
-set auto_index(gdb_add_tracepoint) [list source [file join $dir tracedlg.tcl]]
-set auto_index(gdb_edit_tracepoint) [list source [file join $dir tracedlg.tcl]]
-set auto_index(::tty::create) [list source [file join $dir tty.tcl]]
-set auto_index(::tty::destroy) [list source [file join $dir tty.tcl]]
-set auto_index(keep_raised) [list source [file join $dir util.tcl]]
-set auto_index(sleep) [list source [file join $dir util.tcl]]
-set auto_index(auto_step) [list source [file join $dir util.tcl]]
-set auto_index(auto_step_cancel) [list source [file join $dir util.tcl]]
-set auto_index(tfind_cmd) [list source [file join $dir util.tcl]]
-set auto_index(save_trace_commands) [list source [file join $dir util.tcl]]
-set auto_index(do_test) [list source [file join $dir util.tcl]]
-set auto_index(gdbtk_read_defs) [list source [file join $dir util.tcl]]
-set auto_index(bp_exists) [list source [file join $dir util.tcl]]
-set auto_index(gridCGet) [list source [file join $dir util.tcl]]
-set auto_index(get_disassembly_flavor) [list source [file join $dir util.tcl]]
-set auto_index(list_disassembly_flavors) [list source [file join $dir util.tcl]]
-set auto_index(init_disassembly_flavor) [list source [file join $dir util.tcl]]
-set auto_index(list_element_strcmp) [list source [file join $dir util.tcl]]
-set auto_index(gdbtk_endian) [list source [file join $dir util.tcl]]
-set auto_index(WarningDlg) [list source [file join $dir warning.tcl]]
-set auto_index(::WarningDlg::constructor) [list source [file join $dir warning.tcl]]
-set auto_index(WatchWin) [list source [file join $dir watch.tcl]]
-set auto_index(GDBMenuBar) [list source [file join $dir gdbmenubar.itcl]]
-set auto_index(GDBToolBar) [list source [file join $dir gdbtoolbar.itcl]]
-set auto_index(PluginWindow) [list source [file join $dir pluginwin.itcl]]
-set auto_index(SrcBar) [list source [file join $dir srcbar.itcl]]
-set auto_index(AttachDlg) [list source [file join $dir attachdlg.ith]]
-set auto_index(Block) [list source [file join $dir blockframe.ith]]
-set auto_index(Frame) [list source [file join $dir blockframe.ith]]
-set auto_index(BpWin) [list source [file join $dir bpwin.ith]]
-set auto_index(BrowserWin) [list source [file join $dir browserwin.ith]]
-set auto_index(Console) [list source [file join $dir console.ith]]
-set auto_index(DebugWin) [list source [file join $dir debugwin.ith]]
-set auto_index(DebugWinDOpts) [list source [file join $dir debugwin.ith]]
-set auto_index(Download) [list source [file join $dir download.ith]]
-set auto_index(GDBEventHandler) [list source [file join $dir ehandler.ith]]
-set auto_index(::GDBEventHandler::dispatch) [list source [file join $dir ehandler.ith]]
-set auto_index(EmbeddedWin) [list source [file join $dir embeddedwin.ith]]
-set auto_index(GDBEvent) [list source [file join $dir gdbevent.ith]]
-set auto_index(BreakpointEvent) [list source [file join $dir gdbevent.ith]]
-set auto_index(TracepointEvent) [list source [file join $dir gdbevent.ith]]
-set auto_index(SetVariableEvent) [list source [file join $dir gdbevent.ith]]
-set auto_index(BusyEvent) [list source [file join $dir gdbevent.ith]]
-set auto_index(IdleEvent) [list source [file join $dir gdbevent.ith]]
-set auto_index(UpdateEvent) [list source [file join $dir gdbevent.ith]]
-set auto_index(ArchChangedEvent) [list source [file join $dir gdbevent.ith]]
-set auto_index(GDBWin) [list source [file join $dir gdbwin.ith]]
-set auto_index(GlobalPref) [list source [file join $dir globalpref.ith]]
-set auto_index(KodWin) [list source [file join $dir kod.ith]]
-set auto_index(ManagedWin) [list source [file join $dir managedwin.ith]]
-set auto_index(MemPref) [list source [file join $dir mempref.ith]]
-set auto_index(MemWin) [list source [file join $dir memwin.ith]]
-set auto_index(ProcessWin) [list source [file join $dir process.ith]]
-set auto_index(RegWin) [list source [file join $dir regwin.ith]]
-set auto_index(SrcPref) [list source [file join $dir srcpref.ith]]
-set auto_index(SrcTextWin) [list source [file join $dir srctextwin.ith]]
-set auto_index(SrcWin) [list source [file join $dir srcwin.ith]]
-set auto_index(StackWin) [list source [file join $dir stackwin.ith]]
-set auto_index(TargetSelection) [list source [file join $dir targetselection.ith]]
-set auto_index(TopLevelWin) [list source [file join $dir toplevelwin.ith]]
-set auto_index(VarTree) [list source [file join $dir vartree.ith]]
-set auto_index(::AttachDlg::constructor) [list source [file join $dir attachdlg.itb]]
-set auto_index(::AttachDlg::build_win) [list source [file join $dir attachdlg.itb]]
-set auto_index(::AttachDlg::doit) [list source [file join $dir attachdlg.itb]]
-set auto_index(::AttachDlg::cancel) [list source [file join $dir attachdlg.itb]]
-set auto_index(::AttachDlg::choose_symbol_file) [list source [file join $dir attachdlg.itb]]
-set auto_index(::AttachDlg::list_pids) [list source [file join $dir attachdlg.itb]]
-set auto_index(::AttachDlg::select_pid) [list source [file join $dir attachdlg.itb]]
-set auto_index(::AttachDlg::clear_pid_selection) [list source [file join $dir attachdlg.itb]]
-set auto_index(::AttachDlg::filter_pid_selection) [list source [file join $dir attachdlg.itb]]
-set auto_index(::Block::constructor) [list source [file join $dir blockframe.itb]]
-set auto_index(::Block::destructor) [list source [file join $dir blockframe.itb]]
-set auto_index(::Block::variables) [list source [file join $dir blockframe.itb]]
-set auto_index(::Block::_findVariables) [list source [file join $dir blockframe.itb]]
-set auto_index(::Block::update) [list source [file join $dir blockframe.itb]]
-set auto_index(::Block::info) [list source [file join $dir blockframe.itb]]
-set auto_index(::Frame::constructor) [list source [file join $dir blockframe.itb]]
-set auto_index(::Frame::destructor) [list source [file join $dir blockframe.itb]]
-set auto_index(::Frame::_removeBlock) [list source [file join $dir blockframe.itb]]
-set auto_index(::Frame::_addBlock) [list source [file join $dir blockframe.itb]]
-set auto_index(::Frame::_createBlocks) [list source [file join $dir blockframe.itb]]
-set auto_index(::Frame::update) [list source [file join $dir blockframe.itb]]
-set auto_index(::Frame::variables) [list source [file join $dir blockframe.itb]]
-set auto_index(::Frame::new) [list source [file join $dir blockframe.itb]]
-set auto_index(::Frame::deleteOld) [list source [file join $dir blockframe.itb]]
-set auto_index(::Frame::_oldBlocks) [list source [file join $dir blockframe.itb]]
-set auto_index(::Frame::old) [list source [file join $dir blockframe.itb]]
-set auto_index(::Frame::_findBlock) [list source [file join $dir blockframe.itb]]
-set auto_index(::Frame::_findBlockIndex) [list source [file join $dir blockframe.itb]]
-set auto_index(::BpWin::constructor) [list source [file join $dir bpwin.itb]]
-set auto_index(::BpWin::destructor) [list source [file join $dir bpwin.itb]]
-set auto_index(::BpWin::build_win) [list source [file join $dir bpwin.itb]]
-set auto_index(::BpWin::bp_add) [list source [file join $dir bpwin.itb]]
-set auto_index(::BpWin::bp_store) [list source [file join $dir bpwin.itb]]
-set auto_index(::BpWin::bp_restore) [list source [file join $dir bpwin.itb]]
-set auto_index(::BpWin::bp_select) [list source [file join $dir bpwin.itb]]
-set auto_index(::BpWin::_select_and_popup) [list source [file join $dir bpwin.itb]]
-set auto_index(::BpWin::bp_modify) [list source [file join $dir bpwin.itb]]
-set auto_index(::BpWin::bp_able) [list source [file join $dir bpwin.itb]]
-set auto_index(::BpWin::bp_remove) [list source [file join $dir bpwin.itb]]
-set auto_index(::BpWin::bp_type) [list source [file join $dir bpwin.itb]]
-set auto_index(::BpWin::bp_delete) [list source [file join $dir bpwin.itb]]
-set auto_index(::BpWin::breakpoint) [list source [file join $dir bpwin.itb]]
-set auto_index(::BpWin::tracepoint) [list source [file join $dir bpwin.itb]]
-set auto_index(::BpWin::bp_all) [list source [file join $dir bpwin.itb]]
-set auto_index(::BpWin::get_actions) [list source [file join $dir bpwin.itb]]
-set auto_index(::BpWin::toggle_threads) [list source [file join $dir bpwin.itb]]
-set auto_index(::BpWin::reconfig) [list source [file join $dir bpwin.itb]]
-set auto_index(::BpWin::goto_bp) [list source [file join $dir bpwin.itb]]
-set auto_index(::BrowserWin::constructor) [list source [file join $dir browserwin.itb]]
-set auto_index(::BrowserWin::destructor) [list source [file join $dir browserwin.itb]]
-set auto_index(::BrowserWin::_build_win) [list source [file join $dir browserwin.itb]]
-set auto_index(::BrowserWin::_filter_trace_proc) [list source [file join $dir browserwin.itb]]
-set auto_index(::BrowserWin::_filter_trace_after) [list source [file join $dir browserwin.itb]]
-set auto_index(::BrowserWin::_search_src) [list source [file join $dir browserwin.itb]]
-set auto_index(::BrowserWin::search) [list source [file join $dir browserwin.itb]]
-set auto_index(::BrowserWin::_process_file_selection) [list source [file join $dir browserwin.itb]]
-set auto_index(::BrowserWin::_process_func_selection) [list source [file join $dir browserwin.itb]]
-set auto_index(::BrowserWin::do_all_bp) [list source [file join $dir browserwin.itb]]
-set auto_index(::BrowserWin::_toggle_bp) [list source [file join $dir browserwin.itb]]
-set auto_index(::BrowserWin::_select) [list source [file join $dir browserwin.itb]]
-set auto_index(::BrowserWin::_set_filter_mode) [list source [file join $dir browserwin.itb]]
-set auto_index(::BrowserWin::_file_hide_h) [list source [file join $dir browserwin.itb]]
-set auto_index(::BrowserWin::_fill_source) [list source [file join $dir browserwin.itb]]
-set auto_index(::BrowserWin::mode) [list source [file join $dir browserwin.itb]]
-set auto_index(::BrowserWin::_goto_func) [list source [file join $dir browserwin.itb]]
-set auto_index(::BrowserWin::_fill_file_box) [list source [file join $dir browserwin.itb]]
-set auto_index(::BrowserWin::_fill_funcs_combo) [list source [file join $dir browserwin.itb]]
-set auto_index(::BrowserWin::_build_filter_frame) [list source [file join $dir browserwin.itb]]
-set auto_index(::BrowserWin::_build_file_frame) [list source [file join $dir browserwin.itb]]
-set auto_index(::BrowserWin::_build_function_frame) [list source [file join $dir browserwin.itb]]
-set auto_index(::BrowserWin::_build_view_frame) [list source [file join $dir browserwin.itb]]
-set auto_index(::BrowserWin::_switch_layout) [list source [file join $dir browserwin.itb]]
-set auto_index(::Console::constructor) [list source [file join $dir console.itb]]
-set auto_index(::Console::destructor) [list source [file join $dir console.itb]]
-set auto_index(::Console::_build_win) [list source [file join $dir console.itb]]
-set auto_index(::Console::idle) [list source [file join $dir console.itb]]
-set auto_index(::Console::busy) [list source [file join $dir console.itb]]
-set auto_index(::Console::insert) [list source [file join $dir console.itb]]
-set auto_index(::Console::_operate_and_get_next) [list source [file join $dir console.itb]]
-set auto_index(::Console::_previous) [list source [file join $dir console.itb]]
-set auto_index(::Console::_search_history) [list source [file join $dir console.itb]]
-set auto_index(::Console::_rsearch_history) [list source [file join $dir console.itb]]
-set auto_index(::Console::_next) [list source [file join $dir console.itb]]
-set auto_index(::Console::_last) [list source [file join $dir console.itb]]
-set auto_index(::Console::_first) [list source [file join $dir console.itb]]
-set auto_index(::Console::_setprompt) [list source [file join $dir console.itb]]
-set auto_index(::Console::gets) [list source [file join $dir console.itb]]
-set auto_index(::Console::_cancel) [list source [file join $dir console.itb]]
-set auto_index(::Console::activate) [list source [file join $dir console.itb]]
-set auto_index(::Console::invoke) [list source [file join $dir console.itb]]
-set auto_index(::Console::_delete) [list source [file join $dir console.itb]]
-set auto_index(::Console::_insertion) [list source [file join $dir console.itb]]
-set auto_index(::Console::_paste) [list source [file join $dir console.itb]]
-set auto_index(::Console::_find_lcp) [list source [file join $dir console.itb]]
-set auto_index(::Console::_find_completion) [list source [file join $dir console.itb]]
-set auto_index(::Console::_complete) [list source [file join $dir console.itb]]
-set auto_index(::Console::_reset_tab) [list source [file join $dir console.itb]]
-set auto_index(::Console::_set_wrap) [list source [file join $dir console.itb]]
-set auto_index(::Console::_update_option) [list source [file join $dir console.itb]]
-set auto_index(::Console::test) [list source [file join $dir console.itb]]
-set auto_index(::DebugWin::constructor) [list source [file join $dir debugwin.itb]]
-set auto_index(::DebugWin::destructor) [list source [file join $dir debugwin.itb]]
-set auto_index(::DebugWin::build_win) [list source [file join $dir debugwin.itb]]
-set auto_index(::DebugWin::puts) [list source [file join $dir debugwin.itb]]
-set auto_index(::DebugWin::put_trace) [list source [file join $dir debugwin.itb]]
-set auto_index(::DebugWin::loadlog) [list source [file join $dir debugwin.itb]]
-set auto_index(::DebugWin::_source_all) [list source [file join $dir debugwin.itb]]
-set auto_index(::DebugWin::_clear) [list source [file join $dir debugwin.itb]]
-set auto_index(::DebugWin::_mark_old) [list source [file join $dir debugwin.itb]]
-set auto_index(::DebugWin::_save_contents) [list source [file join $dir debugwin.itb]]
-set auto_index(::DebugWinDOpts::constructor) [list source [file join $dir debugwin.itb]]
-set auto_index(::DebugWinDOpts::destructor) [list source [file join $dir debugwin.itb]]
-set auto_index(::DebugWinDOpts::build_win) [list source [file join $dir debugwin.itb]]
-set auto_index(::DebugWinDOpts::_all) [list source [file join $dir debugwin.itb]]
-set auto_index(::DebugWinDOpts::_apply) [list source [file join $dir debugwin.itb]]
-set auto_index(::Download::constructor) [list source [file join $dir download.itb]]
-set auto_index(::Download::update_download) [list source [file join $dir download.itb]]
-set auto_index(::Download::done) [list source [file join $dir download.itb]]
-set auto_index(::Download::cancel) [list source [file join $dir download.itb]]
-set auto_index(::Download::destructor) [list source [file join $dir download.itb]]
-set auto_index(::Download::do_download_hooks) [list source [file join $dir download.itb]]
-set auto_index(::Download::download_hash) [list source [file join $dir download.itb]]
-set auto_index(::Download::download_it) [list source [file join $dir download.itb]]
-set auto_index(::GDBEventHandler::dispatch) [list source [file join $dir ehandler.itb]]
-set auto_index(::BreakpointEvent::get) [list source [file join $dir gdbevent.itb]]
-set auto_index(::BreakpointEvent::_init) [list source [file join $dir gdbevent.itb]]
-set auto_index(::BreakpointEvent::number) [list source [file join $dir gdbevent.itb]]
-set auto_index(::TracepointEvent::get) [list source [file join $dir gdbevent.itb]]
-set auto_index(::TracepointEvent::_init) [list source [file join $dir gdbevent.itb]]
-set auto_index(::TracepointEvent::number) [list source [file join $dir gdbevent.itb]]
-set auto_index(::TracepointEvent::get) [list source [file join $dir gdbevent.itb]]
-set auto_index(::SetVariableEvent::get) [list source [file join $dir gdbevent.itb]]
-set auto_index(::UpdateEvent::constructor) [list source [file join $dir gdbevent.itb]]
-set auto_index(::UpdateEvent::get) [list source [file join $dir gdbevent.itb]]
-set auto_index(::GlobalPref::_init) [list source [file join $dir globalpref.itb]]
-set auto_index(::GlobalPref::_init_var) [list source [file join $dir globalpref.itb]]
-set auto_index(::GlobalPref::constructor) [list source [file join $dir globalpref.itb]]
-set auto_index(::GlobalPref::destructor) [list source [file join $dir globalpref.itb]]
-set auto_index(::GlobalPref::_build_win) [list source [file join $dir globalpref.itb]]
-set auto_index(::GlobalPref::_make_font_item) [list source [file join $dir globalpref.itb]]
-set auto_index(::GlobalPref::_resize_font_item_height) [list source [file join $dir globalpref.itb]]
-set auto_index(::GlobalPref::_change_icons) [list source [file join $dir globalpref.itb]]
-set auto_index(::GlobalPref::_change_font) [list source [file join $dir globalpref.itb]]
-set auto_index(::GlobalPref::_change_size) [list source [file join $dir globalpref.itb]]
-set auto_index(::GlobalPref::_toggle_tracing) [list source [file join $dir globalpref.itb]]
-set auto_index(::GlobalPref::_ok) [list source [file join $dir globalpref.itb]]
-set auto_index(::GlobalPref::_apply) [list source [file join $dir globalpref.itb]]
-set auto_index(::GlobalPref::_cancel) [list source [file join $dir globalpref.itb]]
-set auto_index(::GlobalPref::cancel) [list source [file join $dir globalpref.itb]]
-set auto_index(::KodWin::constructor) [list source [file join $dir kod.itb]]
-set auto_index(::KodWin::build_win) [list source [file join $dir kod.itb]]
-set auto_index(::KodWin::update) [list source [file join $dir kod.itb]]
-set auto_index(::KodWin::display) [list source [file join $dir kod.itb]]
-set auto_index(::KodWin::display_list) [list source [file join $dir kod.itb]]
-set auto_index(::KodWin::display_object) [list source [file join $dir kod.itb]]
-set auto_index(::KodWin::clear) [list source [file join $dir kod.itb]]
-set auto_index(::KodWin::top) [list source [file join $dir kod.itb]]
-set auto_index(::KodWin::up) [list source [file join $dir kod.itb]]
-set auto_index(::KodWin::destructor) [list source [file join $dir kod.itb]]
-set auto_index(::KodWin::set_variable) [list source [file join $dir kod.itb]]
-set auto_index(::KodWin::reconfig) [list source [file join $dir kod.itb]]
-set auto_index(::KodWin::busy) [list source [file join $dir kod.itb]]
-set auto_index(::KodWin::idle) [list source [file join $dir kod.itb]]
-set auto_index(::KodWin::cursor) [list source [file join $dir kod.itb]]
-set auto_index(::KodWin::_disable_buttons) [list source [file join $dir kod.itb]]
-set auto_index(::KodWin::_restore_buttons) [list source [file join $dir kod.itb]]
-set auto_index(::ManagedWin::constructor) [list source [file join $dir managedwin.itb]]
-set auto_index(::ManagedWin::destructor) [list source [file join $dir managedwin.itb]]
-set auto_index(::ManagedWin::window_name) [list source [file join $dir managedwin.itb]]
-set auto_index(::ManagedWin::pickle) [list source [file join $dir managedwin.itb]]
-set auto_index(::ManagedWin::reveal) [list source [file join $dir managedwin.itb]]
-set auto_index(::ManagedWin::restart) [list source [file join $dir managedwin.itb]]
-set auto_index(::ManagedWin::shutdown) [list source [file join $dir managedwin.itb]]
-set auto_index(::ManagedWin::startup) [list source [file join $dir managedwin.itb]]
-set auto_index(::ManagedWin::open_dlg) [list source [file join $dir managedwin.itb]]
-set auto_index(::ManagedWin::open) [list source [file join $dir managedwin.itb]]
-set auto_index(::ManagedWin::_open) [list source [file join $dir managedwin.itb]]
-set auto_index(::ManagedWin::_create) [list source [file join $dir managedwin.itb]]
-set auto_index(::ManagedWin::find) [list source [file join $dir managedwin.itb]]
-set auto_index(::ManagedWin::init) [list source [file join $dir managedwin.itb]]
-set auto_index(::ManagedWin::destroy_toplevel) [list source [file join $dir managedwin.itb]]
-set auto_index(::ManagedWin::_freeze_me) [list source [file join $dir managedwin.itb]]
-set auto_index(::ManagedWin::_thaw_me) [list source [file join $dir managedwin.itb]]
-set auto_index(::ManagedWin::_make_icon_window) [list source [file join $dir managedwin.itb]]
-set auto_index(::MemPref::constructor) [list source [file join $dir mempref.itb]]
-set auto_index(::MemPref::destructor) [list source [file join $dir mempref.itb]]
-set auto_index(::MemPref::build_win) [list source [file join $dir mempref.itb]]
-set auto_index(::MemPref::busy) [list source [file join $dir mempref.itb]]
-set auto_index(::MemPref::idle) [list source [file join $dir mempref.itb]]
-set auto_index(::MemPref::ok) [list source [file join $dir mempref.itb]]
-set auto_index(::MemPref::cancel) [list source [file join $dir mempref.itb]]
-set auto_index(::MemPref::check_numbytes) [list source [file join $dir mempref.itb]]
-set auto_index(::MemPref::set_bytes_per_row) [list source [file join $dir mempref.itb]]
-set auto_index(::MemPref::toggle_size_control) [list source [file join $dir mempref.itb]]
-set auto_index(::MemPref::apply) [list source [file join $dir mempref.itb]]
-set auto_index(::MemPref::enable_format) [list source [file join $dir mempref.itb]]
-set auto_index(::MemPref::disable_format) [list source [file join $dir mempref.itb]]
-set auto_index(::MemPref::pick) [list source [file join $dir mempref.itb]]
-set auto_index(::MemPref::reconfig) [list source [file join $dir mempref.itb]]
-set auto_index(::MemWin::constructor) [list source [file join $dir memwin.itb]]
-set auto_index(::MemWin::destructor) [list source [file join $dir memwin.itb]]
-set auto_index(::MemWin::build_win) [list source [file join $dir memwin.itb]]
-set auto_index(::MemWin::paste) [list source [file join $dir memwin.itb]]
-set auto_index(::MemWin::validate) [list source [file join $dir memwin.itb]]
-set auto_index(::MemWin::create_prefs) [list source [file join $dir memwin.itb]]
-set auto_index(::MemWin::changed_cell) [list source [file join $dir memwin.itb]]
-set auto_index(::MemWin::edit) [list source [file join $dir memwin.itb]]
-set auto_index(::MemWin::toggle_enabled) [list source [file join $dir memwin.itb]]
-set auto_index(::MemWin::update) [list source [file join $dir memwin.itb]]
-set auto_index(::MemWin::idle) [list source [file join $dir memwin.itb]]
-set auto_index(::MemWin::busy) [list source [file join $dir memwin.itb]]
-set auto_index(::MemWin::newsize) [list source [file join $dir memwin.itb]]
-set auto_index(::MemWin::_update_address) [list source [file join $dir memwin.itb]]
-set auto_index(::MemWin::update_address_cb) [list source [file join $dir memwin.itb]]
-set auto_index(::MemWin::update_address) [list source [file join $dir memwin.itb]]
-set auto_index(::MemWin::BadExpr) [list source [file join $dir memwin.itb]]
-set auto_index(::MemWin::incr_addr) [list source [file join $dir memwin.itb]]
-set auto_index(::MemWin::update_addr) [list source [file join $dir memwin.itb]]
-set auto_index(::MemWin::hidemb) [list source [file join $dir memwin.itb]]
-set auto_index(::MemWin::reconfig) [list source [file join $dir memwin.itb]]
-set auto_index(::MemWin::do_popup) [list source [file join $dir memwin.itb]]
-set auto_index(::MemWin::goto) [list source [file join $dir memwin.itb]]
-set auto_index(::MemWin::init_addr_exp) [list source [file join $dir memwin.itb]]
-set auto_index(::MemWin::cursor) [list source [file join $dir memwin.itb]]
-set auto_index(::MemWin::memMoveCell) [list source [file join $dir memwin.itb]]
-set auto_index(::MemWin::error_dialog) [list source [file join $dir memwin.itb]]
-set auto_index(::ProcessWin::constructor) [list source [file join $dir process.itb]]
-set auto_index(::ProcessWin::build_win) [list source [file join $dir process.itb]]
-set auto_index(::ProcessWin::update) [list source [file join $dir process.itb]]
-set auto_index(::ProcessWin::change_context) [list source [file join $dir process.itb]]
-set auto_index(::ProcessWin::destructor) [list source [file join $dir process.itb]]
-set auto_index(::ProcessWin::reconfig) [list source [file join $dir process.itb]]
-set auto_index(::ProcessWin::busy) [list source [file join $dir process.itb]]
-set auto_index(::ProcessWin::idle) [list source [file join $dir process.itb]]
-set auto_index(::ProcessWin::cursor) [list source [file join $dir process.itb]]
-set auto_index(::RegWin::constructor) [list source [file join $dir regwin.itb]]
-set auto_index(::RegWin::destructor) [list source [file join $dir regwin.itb]]
-set auto_index(::RegWin::_load_prefs) [list source [file join $dir regwin.itb]]
-set auto_index(::RegWin::_build_win) [list source [file join $dir regwin.itb]]
-set auto_index(::RegWin::_layout_table) [list source [file join $dir regwin.itb]]
-set auto_index(::RegWin::_size_cell_column) [list source [file join $dir regwin.itb]]
-set auto_index(::RegWin::_size_column) [list source [file join $dir regwin.itb]]
-set auto_index(::RegWin::_prefs_changed) [list source [file join $dir regwin.itb]]
-set auto_index(::RegWin::_accept_edit) [list source [file join $dir regwin.itb]]
-set auto_index(::RegWin::_add_to_watch) [list source [file join $dir regwin.itb]]
-set auto_index(::RegWin::_open_memory) [list source [file join $dir regwin.itb]]
-set auto_index(::RegWin::_but3) [list source [file join $dir regwin.itb]]
-set auto_index(::RegWin::_delete_from_display) [list source [file join $dir regwin.itb]]
-set auto_index(::RegWin::_display_all) [list source [file join $dir regwin.itb]]
-set auto_index(::RegWin::_edit) [list source [file join $dir regwin.itb]]
-set auto_index(::RegWin::_move) [list source [file join $dir regwin.itb]]
-set auto_index(::RegWin::_select_cell) [list source [file join $dir regwin.itb]]
-set auto_index(::RegWin::_unedit) [list source [file join $dir regwin.itb]]
-set auto_index(::RegWin::_get_value) [list source [file join $dir regwin.itb]]
-set auto_index(::RegWin::_change_format) [list source [file join $dir regwin.itb]]
-set auto_index(::RegWin::_update_register) [list source [file join $dir regwin.itb]]
-set auto_index(::RegWin::_select_group) [list source [file join $dir regwin.itb]]
-set auto_index(::RegWin::arch_changed) [list source [file join $dir regwin.itb]]
-set auto_index(::RegWin::busy) [list source [file join $dir regwin.itb]]
-set auto_index(::RegWin::idle) [list source [file join $dir regwin.itb]]
-set auto_index(::RegWin::set_variable) [list source [file join $dir regwin.itb]]
-set auto_index(::RegWin::update) [list source [file join $dir regwin.itb]]
-set auto_index(::SrcPref::constructor) [list source [file join $dir srcpref.itb]]
-set auto_index(::SrcPref::_init_var) [list source [file join $dir srcpref.itb]]
-set auto_index(::SrcPref::_build_win) [list source [file join $dir srcpref.itb]]
-set auto_index(::SrcPref::_apply) [list source [file join $dir srcpref.itb]]
-set auto_index(::SrcPref::cancel) [list source [file join $dir srcpref.itb]]
-set auto_index(::SrcPref::_cancel) [list source [file join $dir srcpref.itb]]
-set auto_index(::SrcPref::_save) [list source [file join $dir srcpref.itb]]
-set auto_index(::SrcPref::_set_flavor) [list source [file join $dir srcpref.itb]]
-set auto_index(::SrcPref::_pick) [list source [file join $dir srcpref.itb]]
-set auto_index(::SrcTextWin::constructor) [list source [file join $dir srctextwin.itb]]
-set auto_index(::SrcTextWin::destructor) [list source [file join $dir srctextwin.itb]]
-set auto_index(::SrcTextWin::trace_find_hook) [list source [file join $dir srctextwin.itb]]
-set auto_index(::SrcTextWin::set_control_mode) [list source [file join $dir srctextwin.itb]]
-set auto_index(::SrcTextWin::build_popups) [list source [file join $dir srctextwin.itb]]
-set auto_index(::SrcTextWin::build_win) [list source [file join $dir srctextwin.itb]]
-set auto_index(::SrcTextWin::SetRunningState) [list source [file join $dir srctextwin.itb]]
-set auto_index(::SrcTextWin::enable) [list source [file join $dir srctextwin.itb]]
-set auto_index(::SrcTextWin::makeBreakDot) [list source [file join $dir srctextwin.itb]]
-set auto_index(::SrcTextWin::setTabs) [list source [file join $dir srctextwin.itb]]
-set auto_index(::SrcTextWin::enable_disable_src_tags) [list source [file join $dir srctextwin.itb]]
-set auto_index(::SrcTextWin::config_win) [list source [file join $dir srctextwin.itb]]
-set auto_index(::SrcTextWin::addPopup) [list source [file join $dir srctextwin.itb]]
-set auto_index(::SrcTextWin::set_variable) [list source [file join $dir srctextwin.itb]]
-set auto_index(::SrcTextWin::disassembly_changed) [list source [file join $dir srctextwin.itb]]
-set auto_index(::SrcTextWin::reconfig) [list source [file join $dir srctextwin.itb]]
-set auto_index(::SrcTextWin::updateBalloon) [list source [file join $dir srctextwin.itb]]
-set auto_index(::SrcTextWin::balloon_value) [list source [file join $dir srctextwin.itb]]
-set auto_index(::SrcTextWin::ClearTags) [list source [file join $dir srctextwin.itb]]
-set auto_index(::SrcTextWin::_mtime_changed) [list source [file join $dir srctextwin.itb]]
-set auto_index(::SrcTextWin::FillSource) [list source [file join $dir srctextwin.itb]]
-set auto_index(::SrcTextWin::FillAssembly) [list source [file join $dir srctextwin.itb]]
-set auto_index(::SrcTextWin::FillMixed) [list source [file join $dir srctextwin.itb]]
-set auto_index(::SrcTextWin::_highlightAsmLine) [list source [file join $dir srctextwin.itb]]
-set auto_index(::SrcTextWin::set_tag_to_stack) [list source [file join $dir srctextwin.itb]]
-set auto_index(::SrcTextWin::location) [list source [file join $dir srctextwin.itb]]
-set auto_index(::SrcTextWin::LoadFile) [list source [file join $dir srctextwin.itb]]
-set auto_index(::SrcTextWin::display_line) [list source [file join $dir srctextwin.itb]]
-set auto_index(::SrcTextWin::display_breaks) [list source [file join $dir srctextwin.itb]]
-set auto_index(::SrcTextWin::insertBreakTag) [list source [file join $dir srctextwin.itb]]
-set auto_index(::SrcTextWin::removeBreakTag) [list source [file join $dir srctextwin.itb]]
-set auto_index(::SrcTextWin::breakpoint) [list source [file join $dir srctextwin.itb]]
-set auto_index(::SrcTextWin::tracepoint) [list source [file join $dir srctextwin.itb]]
-set auto_index(::SrcTextWin::bp) [list source [file join $dir srctextwin.itb]]
-set auto_index(::SrcTextWin::do_bp) [list source [file join $dir srctextwin.itb]]
-set auto_index(::SrcTextWin::hasBP) [list source [file join $dir srctextwin.itb]]
-set auto_index(::SrcTextWin::hasTP) [list source [file join $dir srctextwin.itb]]
-set auto_index(::SrcTextWin::report_source_location) [list source [file join $dir srctextwin.itb]]
-set auto_index(::SrcTextWin::lookup_line) [list source [file join $dir srctextwin.itb]]
-set auto_index(::SrcTextWin::continue_to_here) [list source [file join $dir srctextwin.itb]]
-set auto_index(::SrcTextWin::jump_to_here) [list source [file join $dir srctextwin.itb]]
-set auto_index(::SrcTextWin::set_bp_at_line) [list source [file join $dir srctextwin.itb]]
-set auto_index(::SrcTextWin::enable_disable_at_line) [list source [file join $dir srctextwin.itb]]
-set auto_index(::SrcTextWin::remove_bp_at_line) [list source [file join $dir srctextwin.itb]]
-set auto_index(::SrcTextWin::set_tp_at_line) [list source [file join $dir srctextwin.itb]]
-set auto_index(::SrcTextWin::next_hit_at_line) [list source [file join $dir srctextwin.itb]]
-set auto_index(::SrcTextWin::remove_tp_at_line) [list source [file join $dir srctextwin.itb]]
-set auto_index(::SrcTextWin::do_tag_popup) [list source [file join $dir srctextwin.itb]]
-set auto_index(::SrcTextWin::do_source_popup) [list source [file join $dir srctextwin.itb]]
-set auto_index(::SrcTextWin::addToWatch) [list source [file join $dir srctextwin.itb]]
-set auto_index(::SrcTextWin::do_key) [list source [file join $dir srctextwin.itb]]
-set auto_index(::SrcTextWin::mode_get) [list source [file join $dir srctextwin.itb]]
-set auto_index(::SrcTextWin::mode_set) [list source [file join $dir srctextwin.itb]]
-set auto_index(::SrcTextWin::cancelMotion) [list source [file join $dir srctextwin.itb]]
-set auto_index(::SrcTextWin::motion) [list source [file join $dir srctextwin.itb]]
-set auto_index(::SrcTextWin::showBPBalloon) [list source [file join $dir srctextwin.itb]]
-set auto_index(::SrcTextWin::showBalloon) [list source [file join $dir srctextwin.itb]]
-set auto_index(::SrcTextWin::getVariable) [list source [file join $dir srctextwin.itb]]
-set auto_index(::SrcTextWin::trace_help) [list source [file join $dir srctextwin.itb]]
-set auto_index(::SrcTextWin::line_is_executable) [list source [file join $dir srctextwin.itb]]
-set auto_index(::SrcTextWin::tracepoint_range) [list source [file join $dir srctextwin.itb]]
-set auto_index(::SrcTextWin::search) [list source [file join $dir srctextwin.itb]]
-set auto_index(::SrcTextWin::LoadFromCache) [list source [file join $dir srctextwin.itb]]
-set auto_index(::SrcTextWin::UnLoadFromCache) [list source [file join $dir srctextwin.itb]]
-set auto_index(::SrcTextWin::print) [list source [file join $dir srctextwin.itb]]
-set auto_index(::SrcTextWin::ask_thread_bp) [list source [file join $dir srctextwin.itb]]
-set auto_index(::SrcTextWin::do_thread_bp) [list source [file join $dir srctextwin.itb]]
-set auto_index(::SrcTextWin::test_get) [list source [file join $dir srctextwin.itb]]
-set auto_index(::SrcTextWin::get_file) [list source [file join $dir srctextwin.itb]]
-set auto_index(::SrcTextWin::clear_file) [list source [file join $dir srctextwin.itb]]
-set auto_index(::SrcTextWin::_initialize_srctextwin) [list source [file join $dir srctextwin.itb]]
-set auto_index(::SrcTextWin::_clear_cache) [list source [file join $dir srctextwin.itb]]
-set auto_index(::SrcWin::constructor) [list source [file join $dir srcwin.itb]]
-set auto_index(::SrcWin::destructor) [list source [file join $dir srcwin.itb]]
-set auto_index(::SrcWin::_build_win) [list source [file join $dir srcwin.itb]]
-set auto_index(::SrcWin::_set_state) [list source [file join $dir srcwin.itb]]
-set auto_index(::SrcWin::download_progress) [list source [file join $dir srcwin.itb]]
-set auto_index(::SrcWin::reconfig) [list source [file join $dir srcwin.itb]]
-set auto_index(::SrcWin::_name) [list source [file join $dir srcwin.itb]]
-set auto_index(::SrcWin::toggle_updates) [list source [file join $dir srcwin.itb]]
-set auto_index(::SrcWin::goto_func) [list source [file join $dir srcwin.itb]]
-set auto_index(::SrcWin::fillNameCB) [list source [file join $dir srcwin.itb]]
-set auto_index(::SrcWin::fillFuncCB) [list source [file join $dir srcwin.itb]]
-set auto_index(::SrcWin::location) [list source [file join $dir srcwin.itb]]
-set auto_index(::SrcWin::stack) [list source [file join $dir srcwin.itb]]
-set auto_index(::SrcWin::_update) [list source [file join $dir srcwin.itb]]
-set auto_index(::SrcWin::idle) [list source [file join $dir srcwin.itb]]
-set auto_index(::SrcWin::mode) [list source [file join $dir srcwin.itb]]
-set auto_index(::SrcWin::_update_title) [list source [file join $dir srcwin.itb]]
-set auto_index(::SrcWin::busy) [list source [file join $dir srcwin.itb]]
-set auto_index(::SrcWin::update) [list source [file join $dir srcwin.itb]]
-set auto_index(::SrcWin::_set_name) [list source [file join $dir srcwin.itb]]
-set auto_index(::SrcWin::set_status) [list source [file join $dir srcwin.itb]]
-set auto_index(::SrcWin::set_execution_status) [list source [file join $dir srcwin.itb]]
-set auto_index(::SrcWin::edit) [list source [file join $dir srcwin.itb]]
-set auto_index(::SrcWin::print) [list source [file join $dir srcwin.itb]]
-set auto_index(::SrcWin::enable_ui) [list source [file join $dir srcwin.itb]]
-set auto_index(::SrcWin::no_inferior) [list source [file join $dir srcwin.itb]]
-set auto_index(::SrcWin::reset) [list source [file join $dir srcwin.itb]]
-set auto_index(::SrcWin::search) [list source [file join $dir srcwin.itb]]
-set auto_index(::SrcWin::point_to_main) [list source [file join $dir srcwin.itb]]
-set auto_index(::SrcWin::_exit) [list source [file join $dir srcwin.itb]]
-set auto_index(::SrcWin::test_get) [list source [file join $dir srcwin.itb]]
-set auto_index(::SrcWin::toolbar) [list source [file join $dir srcwin.itb]]
-set auto_index(::SrcWin::inferior) [list source [file join $dir srcwin.itb]]
-set auto_index(::SrcWin::clear_file) [list source [file join $dir srcwin.itb]]
-set auto_index(::SrcWin::get_file) [list source [file join $dir srcwin.itb]]
-set auto_index(::SrcWin::is_fixed) [list source [file join $dir srcwin.itb]]
-set auto_index(::SrcWin::get_top) [list source [file join $dir srcwin.itb]]
-set auto_index(::SrcWin::_set_tag_to_stack) [list source [file join $dir srcwin.itb]]
-set auto_index(::SrcWin::_choose_window) [list source [file join $dir srcwin.itb]]
-set auto_index(::SrcWin::choose_and_update) [list source [file join $dir srcwin.itb]]
-set auto_index(::SrcWin::choose_and_display) [list source [file join $dir srcwin.itb]]
-set auto_index(::StackWin::constructor) [list source [file join $dir stackwin.itb]]
-set auto_index(::StackWin::destructor) [list source [file join $dir stackwin.itb]]
-set auto_index(::StackWin::build_win) [list source [file join $dir stackwin.itb]]
-set auto_index(::StackWin::update) [list source [file join $dir stackwin.itb]]
-set auto_index(::StackWin::idle) [list source [file join $dir stackwin.itb]]
-set auto_index(::StackWin::change_frame) [list source [file join $dir stackwin.itb]]
-set auto_index(::StackWin::reconfig) [list source [file join $dir stackwin.itb]]
-set auto_index(::StackWin::busy) [list source [file join $dir stackwin.itb]]
-set auto_index(::StackWin::no_inferior) [list source [file join $dir stackwin.itb]]
-set auto_index(::StackWin::cursor) [list source [file join $dir stackwin.itb]]
-set auto_index(::TargetSelection::constructor) [list source [file join $dir targetselection.itb]]
-set auto_index(::TargetSelection::getname) [list source [file join $dir targetselection.itb]]
-set auto_index(::TargetSelection::init_target_db) [list source [file join $dir targetselection.itb]]
-set auto_index(::TargetSelection::default_port) [list source [file join $dir targetselection.itb]]
-set auto_index(::TargetSelection::_init_prefs) [list source [file join $dir targetselection.itb]]
-set auto_index(::TargetSelection::_init_target) [list source [file join $dir targetselection.itb]]
-set auto_index(::TargetSelection::_init) [list source [file join $dir targetselection.itb]]
-set auto_index(::TargetSelection::build_win) [list source [file join $dir targetselection.itb]]
-set auto_index(::TargetSelection::set_saved) [list source [file join $dir targetselection.itb]]
-set auto_index(::TargetSelection::write_saved) [list source [file join $dir targetselection.itb]]
-set auto_index(::TargetSelection::fill_rates) [list source [file join $dir targetselection.itb]]
-set auto_index(::TargetSelection::fill_targets) [list source [file join $dir targetselection.itb]]
-set auto_index(::TargetSelection::config_dialog) [list source [file join $dir targetselection.itb]]
-set auto_index(::TargetSelection::change_target) [list source [file join $dir targetselection.itb]]
-set auto_index(::TargetSelection::change_baud) [list source [file join $dir targetselection.itb]]
-set auto_index(::TargetSelection::port_list) [list source [file join $dir targetselection.itb]]
-set auto_index(::TargetSelection::get_target_list) [list source [file join $dir targetselection.itb]]
-set auto_index(::TargetSelection::save) [list source [file join $dir targetselection.itb]]
-set auto_index(::TargetSelection::cancel) [list source [file join $dir targetselection.itb]]
-set auto_index(::TargetSelection::set_check_button) [list source [file join $dir targetselection.itb]]
-set auto_index(::TargetSelection::help) [list source [file join $dir targetselection.itb]]
-set auto_index(::TargetSelection::reconfig) [list source [file join $dir targetselection.itb]]
-set auto_index(::TargetSelection::get_target) [list source [file join $dir targetselection.itb]]
-set auto_index(::TargetSelection::toggle_more_options) [list source [file join $dir targetselection.itb]]
-set auto_index(::TargetSelection::set_run) [list source [file join $dir targetselection.itb]]
-set auto_index(::TargetSelection::target_trace) [list source [file join $dir targetselection.itb]]
-set auto_index(::TargetSelection::valid_target) [list source [file join $dir targetselection.itb]]
-set auto_index(::TargetSelection::native_debugging) [list source [file join $dir targetselection.itb]]
-set auto_index(::VarTree::constructor) [list source [file join $dir vartree.itb]]
-set auto_index(::VarTree::destructor) [list source [file join $dir vartree.itb]]
-set auto_index(::VarTree::build) [list source [file join $dir vartree.itb]]
-set auto_index(::VarTree::buildlayer) [list source [file join $dir vartree.itb]]
-set auto_index(::VarTree::add) [list source [file join $dir vartree.itb]]
-set auto_index(::VarTree::remove) [list source [file join $dir vartree.itb]]
-set auto_index(::VarTree::update_var) [list source [file join $dir vartree.itb]]
-set auto_index(::VarTree::update) [list source [file join $dir vartree.itb]]
-set auto_index(::VarTree::drawselection) [list source [file join $dir vartree.itb]]
-set auto_index(::VarTree::clicked) [list source [file join $dir vartree.itb]]
-set auto_index(::VarTree::setselection) [list source [file join $dir vartree.itb]]
-set auto_index(::VarTree::closed) [list source [file join $dir vartree.itb]]
-set auto_index(::VarTree::open) [list source [file join $dir vartree.itb]]
-set auto_index(::VarTree::close) [list source [file join $dir vartree.itb]]
-set auto_index(::VarTree::edit) [list source [file join $dir vartree.itb]]
-set auto_index(::VarTree::unedit) [list source [file join $dir vartree.itb]]
-set auto_index(::VarTree::changeValue) [list source [file join $dir vartree.itb]]
-set auto_index(::VarTree::_change_format) [list source [file join $dir vartree.itb]]
-set auto_index(::VarTree::_but3) [list source [file join $dir vartree.itb]]
-set auto_index(::VarTree::_do_default_menu) [list source [file join $dir vartree.itb]]
-set auto_index(::VarTree::_sort) [list source [file join $dir vartree.itb]]
-set auto_index(::VarTree::_compare) [list source [file join $dir vartree.itb]]
-set auto_index(::VarTree::_init_data) [list source [file join $dir vartree.itb]]
diff --git a/gdb/gdbtk/library/tdump.tcl b/gdb/gdbtk/library/tdump.tcl
deleted file mode 100644
index 06f1cdeb04b..00000000000
--- a/gdb/gdbtk/library/tdump.tcl
+++ /dev/null
@@ -1,95 +0,0 @@
-# Trace dump window for Insight
-# Copyright 1998, 1999, 2001, 2002 Red Hat, Inc.
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License (GPL) 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.
-
-
-# ----------------------------------------------------------------------
-# Implements Tdump window for gdb
-#
-#   PUBLIC ATTRIBUTES:
-#
-#
-#   METHODS:
-#
-#     reconfig ....... called when preferences change
-#
-#
-#   X11 OPTION DATABASE ATTRIBUTES
-#
-#
-# ----------------------------------------------------------------------
-
-itcl::class TdumpWin {
-  inherit ManagedWin GDBWin
-
-  # ------------------------------------------------------------------
-  #  CONSTRUCTOR - create new tdump window
-  # ------------------------------------------------------------------
-  constructor {args} {
-    window_name "Trace Dump"
-    build_win
-    eval itk_initialize $args
-  }
-
-
-  # ------------------------------------------------------------------
-  #  METHOD:  build_win - build the main tdump window
-  # ------------------------------------------------------------------
-  method build_win {} {
-    global tcl_platform
-
-    itk_component add stext {
-      iwidgets::scrolledtext $itk_interior.stext -hscrollmode $mode \
-	-vscrollmode $mode -textfont global/fixed \
-	-background $::Colors(bg)
-    } {}
-    [$itk_component(stext) component text] configure \
-      -background $::Colors(bg)
-    pack $itk_component(stext) -side left -expand yes -fill both
-    update dummy
-  }
-
-
-  # ------------------------------------------------------------------
-  #  METHOD:  update - update widget when PC changes
-  # ------------------------------------------------------------------
-  method update {event} {
-    #debug "tdump: update"
-    gdbtk_busy
-    set tframe_num [gdb_get_trace_frame_num]
-
-    if { $tframe_num!=-1 } {
-      debug "doing tdump"
-      $itk_component(stext) delete 1.0 end
-
-      if {[catch {gdb_cmd "tdump $tframe_num" 0} tdump_output]} {
-	tk_messageBox -title "Error" -message $tdump_output -icon error \
-	  -type ok
-      } else {
-	#debug "tdum output is $tdump_output"
-	
-	$itk_component(stext) insert end $tdump_output
-	$itk_component(stext) see insert
-      }
-    }
-    gdbtk_idle
-  }
-
-  # ------------------------------------------------------------------
-  #  METHOD:  reconfig - used when preferences change
-  # ------------------------------------------------------------------
-  method reconfig {} {
-    if {[winfo exists $itk_interior.stext]} { destroy $itk_interior.stext }
-    build_win
-  }
-}
-
diff --git a/gdb/gdbtk/library/tfind_args.tcl b/gdb/gdbtk/library/tfind_args.tcl
deleted file mode 100644
index d90447a65a2..00000000000
--- a/gdb/gdbtk/library/tfind_args.tcl
+++ /dev/null
@@ -1,139 +0,0 @@
-# TfindArgs
-# Copyright 1998, 1999 Cygnus Solutions
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License (GPL) 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.
-
-
-# ----------------------------------------------------------------------
-# Implements tfind arguments dialogs
-#
-#   PUBLIC ATTRIBUTES:
-#     
-#     Type .........Type of dialog (tfind pc, tfind line, tfind tracepoint)
-#
-#     config ....... used to change public attributes
-#
-#     PRIVATE METHODS
-#
-#   X11 OPTION DATABASE ATTRIBUTES
-#
-#
-# ----------------------------------------------------------------------
- 
-itcl_class TfindArgs {
-  # ------------------------------------------------------------------
-  #  CONSTRUCTOR - create new tfind arguments dialog
-  # ------------------------------------------------------------------
-  constructor {config} {
-    #
-    #  Create a window with the same name as this object
-    #
-    set class [$this info class]
-    set hull [namespace tail $this]
-    set old_name $this
-    ::rename $this $this-tmp-
-    ::frame $hull -class $class
-    ::rename $hull $old_name-win-
-    ::rename $this $old_name
-    build_win
-  }
- 
-  # ------------------------------------------------------------------
-  #  METHOD:  build_win - build the dialog
-  # ------------------------------------------------------------------
-  method build_win {} {
-
-    frame $hull.f
-    frame $hull.f.a
-    frame $hull.f.b
-    set f $hull.f.a
-
-    switch $Type {
-      LN   { 
-	set text "Enter argument: " 
-      }
-      PC   { 
-	set text "Enter PC value: " 
-      }
-      TP   { 
-	set text "Enter Tracepoint No.: " 
-      }
-      FR  {
-	set text "Enter Frame No.:"
-    }
-    
-    if {[string compare $Type $last_type]} != 0} {
-      global argument
-      set argument ""
-    }
-
-    set last_type $Type
-
-    label $f.1 -text $text
-    entry $f.2 -textvariable argument -width 10
-    $f.2 selection range 0 end
-    grid $f.1 $f.2 -padx 4 -pady 4 -sticky nwe
-    
-    button $hull.f.b.ok -text OK -command "$this ok" -width 7 -default active
-    button $hull.f.b.quit -text Cancel -command "delete object $this" -width 7
-    grid $hull.f.b.ok $hull.f.b.quit  -padx 4 -pady 4  -sticky ews
-
-    pack $hull.f.a $hull.f.b  
-    grid $hull.f
-
-    focus $f.2
-    bind $f.2 <Return> "$this.f.b.ok flash; $this.f.b.ok invoke"
-
-  }
-
-  # ------------------------------------------------------------------
-  #  DESTRUCTOR - destroy window containing widget
-  # ------------------------------------------------------------------
-  destructor {
-    set top [winfo toplevel $hull]
-    manage delete $this 1
-    destroy $this
-      destroy $top
-  }
- 
-
-
-  # ------------------------------------------------------------------
-  #  METHOD:  ok - do it and quit
-  # ------------------------------------------------------------------
-  method ok {} {
-    do_it 
-    delete
-  }
-
-
-  # ------------------------------------------------------------------
-  #  METHOD:  do_it - call the gdb command
-  # ------------------------------------------------------------------
-  method do_it {} {
-    global argument
-    
-    
-    switch $Type {
-      LN  { tfind_cmd "tfind line $argument"} 
-      PC  { tfind_cmd "tfind pc $argument"}
-      TP  { tfind_cmd "tfind tracepoint $argument"} 
-      FR  { tfind_cmd "tfind $argument"}
-    }
-  }
-
-
-  public Type
-  common last_type {}
-  private hull
-
-
-}
diff --git a/gdb/gdbtk/library/toplevelwin.ith b/gdb/gdbtk/library/toplevelwin.ith
deleted file mode 100644
index 0a3f4ad18b7..00000000000
--- a/gdb/gdbtk/library/toplevelwin.ith
+++ /dev/null
@@ -1,64 +0,0 @@
-# TopLevelWin class definition for GDBtk.
-# Copyright 1998, 1999 Cygnus Solutions
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License (GPL) 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.
-
-
-itcl::class TopLevelWin {
-  inherit ManagedWin
-  
-  private variable frame ""
-
-  constructor {args} {
-    debug $itk_interior
-
-    # create a container frame
-    conFrame $itk_interior.container
-    pack $itk_interior.container -fill both -expand 1
-    
-    # set up bindings for group iconification/deiconification    
-    # NOT IMPLEMENTED YET
-    #set top [winfo toplevel [namespace tail $this]]
-    #bind_for_toplevel_only $top <Unmap> {
-    #     manage_iconify iconify
-    #}
-    #bind_for_toplevel_only $top <Map> {
-    #     manage_iconify deiconify
-    #}
-    incr numTopWins
-  }
-  
-  public method conFrame {win} {
-    set frame [cyg::panedwindow $win -height 5i]
-    return $frame.con
-  }
-
-  public method conAdd {child args} {
-    parse_args {{resizable 1}}
-    $frame add $child -margin 0 -resizable $resizable
-    return [$frame childsite $child].con
-  }
-
-  public method sizeWinByChild {child} {
-    if {[catch {$frame childsite $child} childWin]} {
-      debug "Could not find child $child"
-      return
-    }
-    set width [winfo reqwidth $childWin]
-    $frame configure -width $width
-    
-  }
-
-  destructor {
-    debug
-    incr numTopWins -1
-  }
-}
diff --git a/gdb/gdbtk/library/tracedlg.tcl b/gdb/gdbtk/library/tracedlg.tcl
deleted file mode 100644
index 25f47e043b2..00000000000
--- a/gdb/gdbtk/library/tracedlg.tcl
+++ /dev/null
@@ -1,800 +0,0 @@
-# Trace configuration dialog for Insight
-# Copyright 1997, 1998, 1999, 2001, 2002, 2003 Red Hat, Inc.
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License (GPL) 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.
-
-
-# -----------------------------------------------------------------
-# Implements the Tracepoint configuration dialog box. This (modal)
-# dialog will be called upon to interact with gdb's tracepoint routines
-# allowing the user to add/edit tracepoints. Specifically, user can
-# specify:
-#
-#    - What data to collect: locals, registers, "all registers", "all locals",
-#                            user-defined (globals)
-#    - Number of passes which we should collect the data
-#    - An ignore count after which data will start being collected
-# This method will destroy itself when the dialog is released. It returns
-# either one if a tracepoint was set/edited successfully or zero if 
-# the user bails out (cancel or destroy buttons).
-
-itcl::class TraceDlg {
-  inherit ManagedWin
-
-  # ------------------------------------------------------------------
-  # CONSTRUCTOR: create new trace dialog
-  # ------------------------------------------------------------------
-  constructor {args} {
-
-    eval itk_initialize $args
-    build_win
-    title
-  }
-
-  # ------------------------------------------------------------------
-  #  DESTRUCTOR - destroy window containing widget
-  # ------------------------------------------------------------------
-  destructor {
-
-    # Remove this window and all hooks
-    if {$ActionsDlg != ""} {
-      catch {delete object $ActionsDlg}
-    }
-  }
-
-  # ------------------------------------------------------------------
-  # METHOD: build_win - build the Trace dialog box (cache this?)
-  # ------------------------------------------------------------------
-  method build_win {} {
-
-    set f $itk_interior
-
-    # Need to set the title to either "Add Tracepoint" or "Edit Tracepoint",
-    # depending on the location of the given tracepoint.
-    # !! Why can I not do this?
-
-    # If we have multiple lines, we "add" if we have any new ones ONLY..
-    set nums      {}
-    set lown     -1
-    set highn    -1
-    set lowl     -1
-    set highl     0
-    set functions {}
-    set last_function {}
-    set display_lines {}
-    set display_number {}
-
-    # Look at all lines
-    foreach line $Lines {
-      set num [gdb_tracepoint_exists "$File:$line"]
-      if {$num == -1} {
-	set New 1
-      } else {
-	set Exists 1
-      }
-      
-      set function [gdb_get_function "$File:$line"]
-      if {"$last_function" != "$function"} {
-	lappend functions $function
-	set last_function $function
-      }
-
-      if {$lown == -1 && $num != -1} {
-	set lown $num
-      }
-      if {$lowl == -1} {
-	set lowl $line
-      }
-
-      lappend Number $num
-      if {$num > $highn} {
-	set highn $num
-      }
-      if {$num != -1 && $num < $lown} {
-	set lown $num
-      }
-      if {$line > $highl} {
-	set highl $line
-      }
-      if {$line < $lowl} {
-	set lowl $line
-      } 
-    }
-    
-    # Look at all addresses
-    foreach addr $Addresses {
-      set num [gdb_tracepoint_exists "*$addr"]
-      if {$num == -1} {
-	set New 1
-      } else {
-	set Exists 1
-      }
-      
-      set function [gdb_get_function "*$addr"]
-      if {"$last_function" != "$function"} {
-	lappend functions $function
-	set last_function $function
-      }
-
-      if {$lown == -1 && $num != -1} {
-	set lown $num
-      }
-      if {$lowl == -1} {
-	set lowl $addr
-      }
-
-      lappend Number $num
-      if {$num > $highn} {
-	set highn $num
-      }
-      if {$num != -1 && $num < $lown} {
-	set lown $num
-      }
-      if {$addr > $highl} {
-	set highl $addr
-      }
-      if {$addr < $lowl} {
-	set lowl $addr
-      } 
-    }
-
-    if {$Lines != {}} {
-      if {[llength $Lines] == 1} {
-	set Number $lown
-	set display_number [concat $Number]
-	set display_lines  [concat $Lines]
-	set multiline 0
-      } else {
-	# range of numbers
-	set display_number "$lown-$highn"
-	set display_lines  "$lowl-$highl"
-	set multiline 1
-      }
-    } elseif {$Addresses != {}} {
-      if {[llength $Addresses] == 1} {
-	set Number $lown
-	set display_number [concat $Number]
-	set display_lines  [concat $Addresses]
-	set multiline 0
-      } else {
-	# range of numbers
-	set display_number "$lown-$highn"
-	set display_lines  "$lowl-$highl"
-	set multiline 1
-      }
-    } elseif {$Number != {}} {
-      set New 0
-      set multiline 0
-      set display_number $Number
-    }
-
-    # The three frames of this dialog
-    set bbox [frame $f.bbox];		     # for holding OK,CANCEL DELETE buttons
-    Labelledframe $f.exp -text "Experiment"
-    set exp [$f.exp get_frame];	     # the "Experiment" frame
-    Labelledframe $f.act -text "Actions"
-    set act [$f.act get_frame];	     # the "Actions" frame
-
-    # Setup the button box
-    button $bbox.ok     -text OK -command "$this ok" -width 6
-    button $bbox.cancel -text CANCEL -command "$this cancel"
-    set Delete [button $bbox.delete -text DELETE -command "$this delete_tp"]
-    pack $bbox.ok $bbox.cancel -side left -padx 10 -expand yes
-    pack $bbox.delete -side right -padx 10 -expand yes
-
-    # Setup the "Experiment" frame
-    if {$New} {
-      set hit_count   "N/A"
-      set thread      "N/A"
-      set _TPassCount 0
-      if {!$Exists} {
-	$Delete configure -state disabled
-      }
-    } else {
-      if {!$multiline} {
-	set stuff [gdb_get_tracepoint_info $Number]
-	# 0=file 1=func 2=line 3=addr 4=disposition 5=passCount 6=stepCount
-	# 7=thread 8=hitCount 9=actions
-	set enabled [lindex $stuff 4]
-	set _TPassCount [lindex $stuff 5]
-	set thread      [lindex $stuff 7]
-	set hit_count   [lindex $stuff 8]
-	set actions     [lindex $stuff 9]
-	if {$File == {}} {
-	  set File [lindex $stuff 0]
-	}
-	if {$Lines == {} && $Addresses == {}} {
-	  set Addresses [lindex $stuff 3]
-	  set display_lines $Addresses
-	}
-	if {$functions == {}} {
-	  set functions [lindex $stuff 1]
-	}
-      } else {
-	# ummm...
-	set hit_count "N/A"
-	set thread    "N/A"
-
-	# !! Assumptions...
-	set stuff [gdb_get_tracepoint_info [lindex $Number 0]]
-	set _TPassCount [lindex $stuff 5]
-	set actions     [lindex $stuff 9]
-      }
-    }
-
-    # Number
-    label $exp.numlbl -text {Number:}
-    label $exp.number -text $display_number
-
-    # File
-    label $exp.fillbl -text {File:}
-    label $exp.file   -text $File
-    # Line
-    if {$Lines != {}} {
-      label $exp.linlbl -text {Line(s):}
-    } else {
-      label $exp.linlbl -text {Address(es):}
-    }
-    label $exp.line   -text $display_lines
-
-    # Function
-    if {[llength $functions] > 1} {
-      # Do not allow this until we clean up the action dialog...
-      tk_messageBox -type ok -icon error \
-	-message "Cannot set tracepoint ranges across functions!"
-      after idle [code delete object $this]
-    }
-    #set functions [join $functions ,]
-    label $exp.funlbl -text {Function:}
-    label $exp.funct  -text [concat $functions]
-
-    # Hit count
-    label $exp.hitlbl -text {Hit Count:}
-    label $exp.hit    -text $hit_count
-
-    # Thread
-    label $exp.thrlbl -text {Thread:}
-    label $exp.thread -text $thread
-
-    # Place these onto the screen
-    grid $exp.numlbl -row 0 -column 0 -sticky w -padx 10 -pady 1
-    grid $exp.number -row 0 -column 1 -sticky w -padx 10 -pady 1
-    grid $exp.funlbl -row 0 -column 2 -sticky w -padx 10 -pady 1
-    grid $exp.funct  -row 0 -column 3 -sticky w -padx 10 -pady 1
-    grid $exp.hitlbl -row 1 -column 0 -sticky w -padx 10 -pady 1
-    grid $exp.hit    -row 1 -column 1 -sticky w -padx 10 -pady 1
-    grid $exp.fillbl -row 1 -column 2 -sticky w -padx 10 -pady 1
-    grid $exp.file   -row 1 -column 3 -sticky w -padx 10 -pady 1
-    grid $exp.thrlbl -row 2 -column 0 -sticky w -padx 10 -pady 1
-    grid $exp.thread -row 2 -column 1 -sticky w -padx 10 -pady 1
-    grid $exp.linlbl -row 2 -column 2 -sticky w -padx 10 -pady 1
-    grid $exp.line   -row 2 -column 3 -sticky w -padx 10 -pady 1
-
-    # Configure columns
-    grid columnconfigure $exp 0 -weight 1
-    grid columnconfigure $exp 1 -weight 1
-    grid columnconfigure $exp 2 -weight 1
-    grid columnconfigure $exp 3 -weight 1    
-
-    # The "Actions" Frame
-    set pass_frame [frame $act.pass]
-    set act_frame  [frame $act.actions]
-    set new_frame  [frame $act.new]
-
-    # Pack these frames
-    pack $pass_frame -fill x 
-    pack $act_frame -fill both -expand 1
-    pack $new_frame -side top -fill x
-
-    # Passes
-    label $pass_frame.lbl -text {Number of Passes:}
-    entry $pass_frame.ent -textvariable _TPassCount -width 5
-    pack $pass_frame.lbl -side left -padx 10 -pady 5
-    pack $pass_frame.ent -side right -padx 10 -pady 5
-
-    # Actions
-    set ActionLB $act_frame.lb
-    iwidgets::scrolledlistbox $act_frame.lb -hscrollmode dynamic \
-      -vscrollmode dynamic -selectmode multiple -exportselection 0 \
-      -dblclickcommand [code $this edit] \
-      -selectioncommand [code $this set_delete_action_state $ActionLB $new_frame.del_but] \
-      -background $::Colors(bg)
-    [$ActionLB component listbox] configure -background $::Colors(bg)
-    label $act_frame.lbl -text {Actions}
-    pack $act_frame.lbl -side top
-    pack $act_frame.lb -side bottom -fill both -expand 1 -padx 5 -pady 5
-
-    # New actions
-    combobox::combobox $new_frame.combo -maxheight 15 -editable 0 \
-      -font global/fixed -command [code $this set_action_type] \
-      -bg $::Colors(textbg)
-    $new_frame.combo list insert end collect while-stepping
-    $new_frame.combo entryset collect
-
-    button $new_frame.add_but -text {Add} -command "$this add_action"
-    pack $new_frame.combo $new_frame.add_but -side left -fill x \
-      -padx 5 -pady 5    
-
-    button $new_frame.del_but -text {Delete} -state disabled \
-      -command "$this delete_action"
-    pack $new_frame.del_but -side right -fill x \
-      -padx 5 -pady 5    
-
-    # Pack the main frames
-    pack $bbox -side bottom -padx 5 -pady 8 -fill x
-    pack $f.exp -side top -padx 5 -pady 2 -fill x
-    pack $f.act -side top -padx 5 -pady 2 -expand yes -fill both
-
-    # If we are not new, add all actions
-    if {!$New} {
-      add_all_actions $actions
-    }
-    
-    # !! FOR SOME REASON, THE *_FRAMES DO NOT GET MAPPED WHENEVER THE USER
-    # WAITS A FEW SECONDS TO PLACE THIS DIALOG ON THE SCREEN. This is here
-    # as a workaround so that the action-related widgets don't disappear...
-    #update idletasks
-  }
-
-  method set_action_type {widget action} {
-    set ActionType $action
-  }
-
-  method add_action {} {
-
-    if {"$ActionType" == "while-stepping"} {
-      if {$WhileStepping} {
-	# We are only allowed on of these...
-	tk_messageBox -icon error -type ok \
-	  -message "A tracepoint may only have one while-stepping action."
-	return
-      }
-      set whilestepping 1
-      set step_args "-Steps 1"
-    } else {
-      set whilestepping 0
-      set step_args {}
-    }
-
-    #debug "ADDING ACTION FOR $File:[lindex $Lines 0]"
-    if {$Lines != {}} {
-      set ActionsDlg [eval ManagedWin::open ActionDlg -File $File \
-			-Line [lindex $Lines 0] \
-			-WhileStepping $whilestepping -Number [lindex $Number 0]\
-			-Callback "\\\{$this done\\\}" $step_args]
-    } else {
-      set ActionsDlg [eval ManagedWin::open ActionDlg -File $File \
-			-Address [lindex $Addresses 0] \
-			-WhileStepping $whilestepping -Number [lindex $Number 0]\
-			-Callback "\\\{$this done\\\}" $step_args]
-    }
-  }
-
-  method delete_action {} {
-    # If we just delete these from the action list, they will get deleted
-    # when the user presses OK.
-
-    set selected_elem [lsort -integer -decreasing [$ActionLB curselection]]
-    foreach elem $selected_elem {
-      $ActionLB delete $elem
-    }
-  }
-
-  method set_delete_action_state {list but} {
-    if {[$list curselection] == ""} {
-      $but configure -state disabled
-    } else {
-      $but configure -state normal
-    }
-  }
-
-  method done {status {steps 0} {data {}}} {
-    
-    # We have just returned from the ActionDlg: must reinstall our grab
-#    after idle grab $this
-
-    switch $status {
-      cancel {
-	# Don't do anything
-	set ActionsDlg {}
-	return
-      }
-      add {
-	add_action_to_list $steps $data
-	set ActionsDlg {}
-      }
-      delete {
-	# do something
-	set ActionsDlg {}
-      }
-      modify {
-	# Delete the current selection and insert the new one in its place
-	$ActionLB delete $Selection
-	add_action_to_list $steps $data $Selection
-	set ActionsDlg {}
-      }
-      default {
-	debug "Unknown status from ActionDlg : \"$status\""
-      }
-    }
-  }
-
-  method add_action_to_list {steps data {index {}}} {
-
-    set data [join $data ,]
-
-    if {$steps > 0} {
-      if {"$index" == ""} {
-	set index "end"
-      }
-      $ActionLB insert $index "while-stepping ($steps): $data"
-      set WhileStepping 1
-    } else {
-      if {"$index" == ""} {
-	set index 0
-      }
-      $ActionLB insert $index "collect: $data"
-    }
-  }
-  
-  # ------------------------------------------------------------------
-  # METHOD: cancel - cancel the dialog and do not set the trace
-  # ------------------------------------------------------------------
-  method cancel {} {
-    ::delete object $this
-  }
-
-  # ------------------------------------------------------------------
-  # METHOD: ok - validate the tracepoint and install it
-  # ------------------------------------------------------------------
-  method ok {} {
-    
-    # We "dismiss" the dialog here...
-    wm withdraw [winfo toplevel [namespace tail $this]]
-
-    set actions [get_actions]
-    # Check that we are collecting data
-
-    # This is silly, but, hey, it works.
-    # Lines is the line number where the tp is 
-    # in case of a tp-range it is the set of lines for that range
-    if {$Lines != {}} {
-      for {set i 0} {$i < [llength $Number]} {incr i} {
-	set number [lindex $Number $i]
-	set line   [lindex $Lines $i]
-
-	if {$number == -1} {
-	  #debug "Adding new tracepoint at $File:$line $_TPassCount $actions"
-	  set err [catch {gdb_add_tracepoint $File:$line $_TPassCount $actions} errTxt]
-	} else {
-	  if {$New && $Exists} {
-	    set result [tk_messageBox -icon error -type yesno \
-			  -message "Overwrite actions for tracepoint \#$number at $File:$line?" \
-			  -title "Query"]
-	    if {"$result" == "no"} {
-	      continue
-	    }
-	  }
-        if {$New == 0 && $Exists == 1} {
-          set tpnum [gdb_tracepoint_exists "$File:$line"]
-          if {$tpnum == -1} {
-             tk_messageBox -type ok -icon error -message "Tracepoint was deleted"
-             ::delete object $this
-             return
-           }
-        }
-
-	  #debug "Editing tracepoint \#$Number: $_TPassCount $actions"
-	  set err [catch {gdb_edit_tracepoint $number $_TPassCount $actions} errTxt]
-	}
-
-	if {$err} {
-	  if {$number == -1} {
-	    set str "adding new tracepoint at $File:$line"
-	  } else {
-	    set str "editing tracepoint $number at $File:$line"
-	  }
-	  tk_messageBox -type ok -icon error -message "Error $str: $errTxt"
-	}
-      }
-    } else {
-      # Async
-      for {set i 0} {$i < [llength $Number]} {incr i} {
-	set number [lindex $Number $i]
-	set addr   [lindex $Addresses $i]
-	if {$number == -1} {
-	  #debug "Adding new tracepoint at $addr in $File; $_TPassCount $actions"
-	  set err [catch {gdb_add_tracepoint {} $_TPassCount $actions $addr} errTxt]
-	} else {
-	  if {$New && $Exists} {
-	    set result [tk_messageBox -icon error -type yesno \
-			  -message "Overwrite actions for tracepoint \#$number at $File:$line?" \
-			  -title "Query"]
-	    if {"$result" == "no"} {
-	      continue
-	    }
-	  }
-	  if {$New == 0 && $Exists == 1} {
-	    set num [gdb_tracepoint_exists "$File:$Line"]
-	    if {$num == -1} {
-	      tk_messageBox -type ok -icon error -message "Tracepoint was deleted"
-	      ::delete object $this
-	      return
-	    }
-	  }
-
-	  #debug "Editing tracepoint \#$Number: $_TPassCount $actions"
-	  set err [catch {gdb_edit_tracepoint $number $_TPassCount $actions} errTxt]
-	}
-
-	if {$err} {
-	  if {$number == -1} {
-	    set str "adding new tracepoint at $addr in $File"
-	  } else {
-	    set str "editing tracepoint $number at $addr in $File"
-	  }
-	  tk_messageBox -type ok -icon error -message "Error $str: $errTxt"
-	}
-      }
-    }
-    
-    ::delete object $this
-  }
-
-  method cmd {line} {
-    $line
-  }
-
-  method delete_tp {} {
-    debug "deleting tracepoint $Number"
-    set err [catch {gdb_cmd "delete tracepoints $Number"} errTxt]
-    debug "done deleting tracepoint $Number"
-    ::delete object $this
-  }
-
-  method get_data {action} {
-
-    set data {}
-    foreach a $action {
-      set datum [string trim $a \ \r\n\t,]
-      if {"$datum" == "collect" || "$datum" == ""} {
-	continue
-      }
-
-      lappend data $datum
-    }
-      
-    return $data
-  }
-  
-  method add_all_actions {actions} {
-    
-    set length [llength $actions]
-    for {set i 0} {$i < $length} {incr i} {
-      set action [lindex $actions $i]
-
-      if {[regexp "collect" $action]} {
-	set steps 0
-	set data [get_data $action]
-      } elseif {[regexp "while-stepping" $action]} {
-	scan $action "while-stepping %d" steps
-	incr i
-	set action [lindex $actions $i]
-	set data [get_data $action]
-      } elseif {[regexp "end" $action]} {
-	continue
-      }
-
-      # Now have an action: data and steps
-      add_action_to_list $steps $data
-    }
-  }
-
-  method get_actions {} {
-    
-    set actions {}
-    set list [$ActionLB get 0 end]
-    foreach action $list {
-      if {[regexp "collect" $action]} {
-	scan $action "collect: %s" data
-	set steps 0
-	set whilestepping 0
-      } elseif {[regexp "while-stepping" $action]} {
-	scan $action "while-stepping (%d): %s" steps data
-	set whilestepping 1
-      } else {
-	debug "unknown action: $action"
-	continue
-      }
-
-      lappend actions [list $steps $data]
-    }
-
-    return $actions
-  }
-
-  method edit {} {
-    
-    set Selection [$ActionLB curselection]
-    if {$Selection != ""} {
-      set action [$ActionLB get $Selection]
-      if [regexp "collect" $action] {
-	scan $action "collect: %s" data
-	set steps 0
-	set whilestepping 0
-      } elseif [regexp "while-stepping" $action] {
-	scan $action "while-stepping (%d): %s" steps data
-	set whilestepping 1
-      } else {
-	debug "unknown action: $action"
-	return
-      }
-    
-      set data [split $data ,] 
-      set len [llength $data]
-      set real_data {}
-      set special 0
-      for {set i 0} {$i < $len} {incr i} {
-	set a [lindex $data $i]
-	if {[string range $a 0 1] == "\$("} {
-	  set special 1
-	  set b $a
-	} elseif {$special} {
-	  lappend b $a
-	  if {[string index $a [expr {[string length $a]-1}]] == ")"} {
-	    lappend real_data [join $b ,]
-	    set special 0
-	  }
-	} else {
-	  lappend real_data $a
-	}
-      }
-
-      # !! lindex $Lines 0 -- better way?
-      if {$Lines != {}} {
-	ManagedWin::open ActionDlg -File $File -Line [lindex $Lines 0] \
-	  -WhileStepping $whilestepping -Number [lindex $Number 0] \
-	  -Callback [list [code $this done]] -Data $real_data -Steps $steps
-      } else {
-	ManagedWin::open ActionDlg -File $File -Address [lindex $Addresses 0] \
-	  -WhileStepping $whilestepping -Number [lindex $Number 0] \
-	  -Callback [list [code $this done]] -Data $real_data -Steps $steps
-      }
-    }
-  }
-
-  method get_selection {} {
-    
-    set action [$ActionLB curselection]
-    return [$ActionLB get $action]
-  }
-
-  # ------------------------------------------------------------------
-  #   METHOD:  title - Title the trace dialog.
-  #
-  #        This is needed to title the window after the dialog has
-  #        been created. The window manager actually sets our title
-  #        after we've been created, so we need to do this in an
-  #        "after idle".
-  # ------------------------------------------------------------------
-  method title {} {
-    if {$New} {
-      set display_number "N/A"
-      wm title [winfo toplevel [namespace tail $this]] "Add Tracepoint"
-    } else {
-      wm title [winfo toplevel [namespace tail $this]] "Edit Tracepoint"
-    }
-  }
-
-  # PUBLIC DATA
-  public variable File {}
-  public variable Lines {}
-  public variable Addresses {}
-  public variable Number {}
-
-  # PROTECTED DATA
-  protected variable Delete
-  protected variable _TPassCount
-  protected variable ActionType {}
-  protected variable ActionLB
-  protected variable Actions
-  protected variable WhileStepping 0
-  protected variable Selection {}
-  protected variable New 0;		# set whenever there is a new tp to add
-  protected variable Exists 0;		# set whenever a tracepoint in the range exists
-  protected variable Dismissed 0;	# has this dialog been dismissed already?
-  protected variable ActionsDlg {}
-}
-
-proc gdb_add_tracepoint {where passes actions {addr {}}} {
-  #debug "gdb_add_tracepoint $where $passes $actions $addr"
-  
-  # Install the tracepoint
-  if {$where == "" && $addr != ""} {
-    set where "*$addr"
-  }
-
-  #debug "trace $where"
-  set err [catch {gdb_cmd "trace $where"} errTxt]
-
-  if {$err} {
-    tk_messageBox -type ok -icon error -message $errTxt
-    return
-  }
-
-  # Get the number for this tracepoint
-  set number [gdb_tracepoint_exists $where]
-
-  # If there is a pass count, add that, too
-  set err [catch {gdb_cmd "passcount $passes $number"} errTxt]
-
-  if {$err} {
-    tk_messageBox -type ok -icon error -message $errTxt
-    return
-  }
-
-  set real_actions {}
-  foreach action $actions {
-    set steps [lindex $action 0]
-    set data  [lindex $action 1]
-
-    if {$steps} {
-      lappend real_actions "while-stepping $steps"
-      lappend real_actions "collect $data"
-      lappend real_actions "end"
-    } else {
-      lappend real_actions "collect $data"
-    }
-  }
-
-  if {[llength $real_actions] > 0} {
-    lappend real_actions "end"
-  }
-
-  set err [catch {gdb_actions $number $real_actions} errTxt]
-   if $err {
-    set errTxt "$errTxt Tracepoint will be installed with no actions"
-    tk_messageBox -type ok -icon error -message $errTxt
-    return
-   }
-}
-
-proc gdb_edit_tracepoint {number passes actions} {
-  #debug "gdb_edit_tracepoint $number $passes $actions"
-
-  # If there is a pass count, add that, too
-  set err [catch {gdb_cmd "passcount $passes $number"} errTxt]
-    
-  if $err {
-    tk_messageBox -type ok -icon error -message $errTxt
-    return
-  }
-  
-  set real_actions {}
-  foreach action $actions {
-    set steps [lindex $action 0]
-    set data  [lindex $action 1]
-
-    if $steps {
-      lappend real_actions "while-stepping $steps"
-      lappend real_actions "collect $data"
-      lappend real_actions "end"
-    } else {
-      lappend real_actions "collect $data"
-    }
-  }
-  
-  if {[llength $real_actions] > 0} {
-    lappend real_actions "end"
-  }
-  
-  gdb_actions $number $real_actions
-}
diff --git a/gdb/gdbtk/library/tty.tcl b/gdb/gdbtk/library/tty.tcl
deleted file mode 100644
index d7eff97879d..00000000000
--- a/gdb/gdbtk/library/tty.tcl
+++ /dev/null
@@ -1,55 +0,0 @@
-# tty.tcl - xterm as tty for the inferior
-# Copyright (C) 1996, 2000 Red Hat, Inc
-# Written by Tom Tromey <tromey@cygnus.com>
-#
-# Interface to the inferior's terminal.  This is very rough, and is
-# guaranteed to only work on Unix machines (if even there).
-#
-
-namespace eval tty {
-  namespace export create
-
-  variable _xterm_fd {}
-
-  proc create {} {
-    variable _xterm_fd
-
-    destroy
-
-    # Tricky: we exec /bin/cat so that the xterm will exit whenever we
-    # close the write end of the pipe.  Note that the stdin
-    # redirection must come after tty is run; tty looks at its stdin.
-    set shcmd {/bin/sh -c 'exec 1>&7; tty; exec /bin/cat 0<&6'}
-
-    set fg [option get . foreground Foreground]
-    if {$fg == ""} then {
-      set fg black
-    }
-
-    set bg [. cget -background]
-    if {$bg == ""} then {
-      set bg [lindex [. configure -background] 3]
-    }
-
-    set xterm [list /bin/sh -c "exec xterm -T 'Gdb Child' -n Gdb -bg '$bg' -fg '$fg' -e $shcmd 6<&0 7>&1"]
-
-    # Need both read and write access to xterm process.
-    set _xterm_fd [open "| $xterm" w+]
-    set tty [gets $_xterm_fd]
-
-    # On failure we don't try the tty command.
-    if {$tty != ""} {
-      gdb_cmd "tty $tty"
-    }
-  }
-
-  proc destroy {} {
-    variable _xterm_fd
-
-    if {$_xterm_fd != ""} then {
-      # We don't care if this fails.
-      catch {close $_xterm_fd}
-    }
-    set _xterm_fd {}
-  }
-}
diff --git a/gdb/gdbtk/library/util.tcl b/gdb/gdbtk/library/util.tcl
deleted file mode 100644
index cd6a92714ac..00000000000
--- a/gdb/gdbtk/library/util.tcl
+++ /dev/null
@@ -1,275 +0,0 @@
-# Utilities for GDBtk.
-# Copyright 1997, 1998, 1999 Cygnus Solutions
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License (GPL) 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.
-
-
-# ----------------------------------------------------------------------
-# Misc routines
-#
-#   PROCS:
-#
-#     keep_raised - keep a window raised
-#     sleep - wait a certain number of seconds and return
-#     toggle_debug_mode - turn debugging on and off
-#     freeze - make a window modal
-#     bp_exists - does a breakpoint exist on linespec?
-#
-# ----------------------------------------------------------------------
-#
-
-
-# A helper procedure to keep a window on top.
-proc keep_raised {top} {
-  if {[winfo exists $top]} {
-    raise $top
-    wm deiconify $top
-    after 1000 [info level 0]
-  }
-}
-
-# sleep - wait a certain number of seconds then return
-proc sleep {sec} {
-  global __sleep_timer
-  set __sleep_timer 0
-  after [expr {1000 * $sec}] set __sleep_timer 1
-  vwait __sleep_timer
-}
-
-
-# ------------------------------------------------------------------
-#  PROC:  auto_step - automatically step through a program
-# ------------------------------------------------------------------
-
-# FIXME FIXME
-proc auto_step {} {
-  global auto_step_id
-
-  set auto_step_id [after 2000 auto_step]
-  gdb_cmd next
-}
-
-# ------------------------------------------------------------------
-#  PROC:  auto_step_cancel - cancel auto-stepping
-# ------------------------------------------------------------------
-
-proc auto_step_cancel {} {
-  global auto_step_id
-
-  if {[info exists auto_step_id]} {
-    after cancel $auto_step_id
-    unset auto_step_id
-  }
-}
-
-# ------------------------------------------------------------------
-#  PROC:  tfind_cmd -- to execute a tfind command on the target
-# ------------------------------------------------------------------
-proc tfind_cmd {command} {
-  gdbtk_busy
-  # need to call gdb_cmd because we want to ignore the output
-  set err [catch {gdb_cmd $command} msg]
-  if {$err || [regexp "Target failed to find requested trace frame" $msg]} {
-    tk_messageBox -icon error -title "GDB" -type ok \
-      -message $msg
-    gdbtk_idle
-    return
-  } else {
-    gdbtk_update
-    gdbtk_idle
-  }
-}
-
-# ------------------------------------------------------------------
-#  PROC:  save_trace_command -- Saves the current trace settings to a file
-# ------------------------------------------------------------------
-proc save_trace_commands {} {
-  
-  set out_file [tk_getSaveFile -title "Enter output file for trace commands"]
-  debug "Got outfile: $out_file"
-  if {$out_file != ""} {
-    gdb_cmd "save-tracepoints $out_file"
-  }
-}
-
-# ------------------------------------------------------------------
-#  PROC:  do_test - invoke the test passed in
-#           This proc is provided for convenience. For any test
-#           that uses the console window (like the console window
-#           tests), the file cannot be sourced directly using the
-#           'tk' command because it will block the console window
-#           until the file is done executing. This proc assures
-#           that the console window is free for input by wrapping
-#           the source call in an after callback.
-#           Users may also pass in the verbose and tests globals
-#           used by the testsuite.
-# ------------------------------------------------------------------
-proc do_test {{file {}} {verbose {}} {tests {}}} {
-  global _test
-
-  if {$file == {}} {
-    error "wrong \# args: should be: do_test file ?verbose? ?tests ...?"
-  }
-
-  if {$verbose != {}} {
-    set _test(verbose) $verbose
-  } elseif {![info exists _test(verbose)]} {
-    set _test(verbose) 0
-  }
-
-  if {$tests != {}} {
-    set _test(tests) $tests
-  }
-
-  set _test(interactive) 1
-  after 500 [list source $file]
-}
-
-# ------------------------------------------------------------------
-#  PROCEDURE:  gdbtk_read_defs
-#        Reads in the defs file for the testsuite. This is usually
-#        the first procedure called by a test file. It returns
-#        1 if it was successful and 0 if not (if run interactively
-#        from the console window) or exits (if running via dejagnu).
-# ------------------------------------------------------------------
-proc gdbtk_read_defs {} {
-  global _test env
-
-  if {[info exists env(DEFS)]} {
-    set err [catch {source $env(DEFS)} errTxt]
-  } else {
-    set err [catch {source defs} errTxt]
-  }
-
-  if {$err} {
-    if {$_test(interactive)} {
-      tk_messageBox -icon error -message "Cannot load defs file:\n$errTxt" -type ok
-      return 0
-    } else {
-      puts stderr "cannot load defs files: $errTxt\ntry setting DEFS"
-      exit 1
-    }
-  }
-
-  return 1
-}
-
-# ------------------------------------------------------------------
-#  PROCEDURE:  bp_exists
-#            Returns BPNUM if a breakpoint exists at LINESPEC or
-#            -1 if no breakpoint exists there
-# ------------------------------------------------------------------
-proc bp_exists {linespec} {
-
-  lassign $linespec foo function filename line_number addr pc_addr
-
-  set bps [gdb_get_breakpoint_list]
-  foreach bpnum $bps {
-    set bpinfo [gdb_get_breakpoint_info $bpnum]
-    lassign $bpinfo file func line pc type enabled disposition \
-      ignore_count commands cond thread hit_count user_specification
-    if {$filename == $file && $function == $func && $addr == $pc} {
-      return $bpnum
-    }
-  }
-
-  return -1
-}
-
-
-# gridCGet - This provides the missing grid cget
-# command.
-
-proc gridCGet {slave option} {
-  set config_list [grid info $slave]
-  return [lindex $config_list [expr [lsearch $config_list $option] + 1]] 
-}
-
-# ------------------------------------------------------------------
-#  PROC:  get_disassembly_flavor - gets the current disassembly flavor.
-#         The set disassembly-flavor command is assumed to exist.  This
-#         will error out if it does not.
-# ------------------------------------------------------------------
-proc get_disassembly_flavor {} {
-  if {[catch {gdb_cmd "show disassembly-flavor"} ret]} {
-    return ""
-  } else {
-    regexp {\"([^\"]*)\"\.} $ret dummy gdb_val
-    return $gdb_val
-  }
-}
- 
-# ------------------------------------------------------------------
-#  PROC:  list_disassembly_flavors - Lists the current disassembly flavors.
-#         Returns an empty list if the set disassembly-flavor is not supported.
-# ------------------------------------------------------------------
-proc list_disassembly_flavors {} {
-  catch {gdb_cmd "set disassembly-flavor"} ret_val
-  if {[regexp {Requires an argument\. Valid arguments are (.*)\.} \
-	 $ret_val dummy list]} {
-    foreach elem  [split $list ","] {
-      lappend vals [string trim $elem]
-    }
-    return [lsort $vals]
-  } else {
-    return {}
-  }    
-}
-
-# ------------------------------------------------------------------
-#  PROC:  init_disassembly_flavor - Synchs up gdb's internal disassembly
-#         flavor with the value in the preferences file.
-# ------------------------------------------------------------------
-proc init_disassembly_flavor {} { 
-  set gdb_val [get_disassembly_flavor]
-  if {$gdb_val != ""} {
-    set def_val [pref get gdb/src/disassembly-flavor]
-    if {[string compare $def_val ""] != 0} {
-      if {[catch "gdb_cmd \"set disassembly-flavor $def_val\""]} {
-	pref set gdb/src/disassembly-flavor $gdb_val
-      }
-    } else {
-      pref set gdb/src/disassembly-flavor $gdb_val
-    }
-  }
-}
-
-# ------------------------------------------------------------------
-#  PROC:  list_element_strcmp - to be used in lsort -command when the
-#         elements are themselves lists, and you always want to look at
-#         a particular item.
-# ------------------------------------------------------------------
-proc list_element_strcmp {index first second} {
-  set theFirst [lindex $first $index]
-  set theSecond [lindex $second $index]
-
-  return [string compare $theFirst $theSecond]
-}
-
-# ------------------------------------------------------------------
-#  PROC:  gdbtk_endian - returns BIG or LITTLE depending on target
-#                        endianess
-# ------------------------------------------------------------------
-
-proc gdbtk_endian {} {
-  if {[catch {gdb_cmd "show endian"} result]} {
-    return "UNKNOWN"
-  }
-  if {[regexp {.*big endian} $result]} {
-    set result "BIG"
-  } elseif {[regexp {.*little endian} $result]} {
-    set result "LITTLE"
-  } else {
-    set result "UNKNOWN"
-  }
-  return $result
-}
-
diff --git a/gdb/gdbtk/library/vartree.itb b/gdb/gdbtk/library/vartree.itb
deleted file mode 100644
index 57d0c3228d5..00000000000
--- a/gdb/gdbtk/library/vartree.itb
+++ /dev/null
@@ -1,431 +0,0 @@
-# Variable tree implementation for Insight.
-# Copyright 2002 Red Hat, Inc.
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License (GPL) 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.
-
-itcl::body  VarTree::constructor {args} {
-  debug $args
-  if {!$initialized} {
-    _init_data
-  }
-  eval itk_initialize $args
-  
-  itk_component add canvas {
-    iwidgets::scrolledcanvas $itk_interior.c -autoresize 1 -hscrollmode dynamic -vscrollmode dynamic \
-      -background $::Colors(textbg) -borderwidth 0 -highlightthickness 0
-  }
-  set c [$itk_component(canvas) childsite]
-  pack $itk_component(canvas) -side top -fill both -expand 1
-  bind $c <1> "[code $this clicked %W %x %y 0]"
-
-  # Add popup menu - we populate it in _but3
-  itk_component add popup {
-    menu $itk_interior.pop -tearoff 0
-  } {}
-  set pop $itk_component(popup)
-  $pop configure -disabledforeground $::Colors(fg)
-  bind $c <3> [code $this _but3 %x %y %X %Y]
-
-  set selection {}
-  set selidx {}
-  after idle [code $this build]
-}
-
-itcl::body  VarTree::destructor {} {
-  debug
-}
-
-itcl::body  VarTree::build {} {
-  debug
-  $c delete all
-  catch {unset var_to_items}
-  catch {unset item_to_var}
-  set _y 30
-  buildlayer $rootlist 10
-  $c config -scrollregion [$c bbox all] -background $::Colors(textbg) -borderwidth 0 -highlightthickness 0
-  update 1
-  drawselection
-}
-
-itcl::body  VarTree::buildlayer {tlist in} {
-  set start [expr $_y - 10]
-
-  foreach var $tlist {
-    set y $_y
-    incr _y 17
-
-    if {$in > 10} {
-      $c create line $in $y [expr $in+10] $y -fill $colors(line) 
-    }
-    set x [expr $in + 12]
-
-    set j1 [$c create text $x $y -text "[$var name] = " -fill $colors(name) -anchor w -font global/fixed]
-    set x [expr [lindex [$c bbox $j1] 2] + 5]
-    set j2 [$c create text $x $y -text "([$var type])" -fill $colors(type) -anchor w -font global/fixed]
-    set x [expr [lindex [$c bbox $j2] 2] + 5]
-    if {[catch {$var value} val]} {
-      # error accessing memory, etc.
-      set j3 [$c create text $x $y -text $val -fill $colors(error) -anchor w -font global/fixed]      
-    } else {
-      set j3 [$c create text $x $y -text $val -fill $colors(value) -anchor w -font global/fixed]
-    }
-
-    set var_to_items($var) [list $j1 $j2 $j3]
-    set item_to_var($j1) $var
-    set item_to_var($j2) $var
-    set item_to_var($j3) $var
-
-    $c bind $j1 <Double-1> "[code $this clicked %W %x %y 1]"
-    $c bind $j2 <Double-1> "[code $this clicked %W %x %y 1]"
-    $c bind $j3 <Double-1> "[code $this edit $j3];break"
-
-    if {[$var numChildren]} {
-      if {[closed $var]} {
-	set j [$c create image $in $y -image closedbm]
-	$c bind $j <1> "[code $this open $var]"
-      } else {
-	set j [$c create image $in $y -image openbm]
-	$c bind $j <1> "[code $this close $var]"
-	buildlayer [$var children] [expr $in+18]
-      }
-    }
-  }
-  if {$in > 10} {
-    $c lower [$c create line $in $start $in [expr $y+1] -fill $colors(line) ]
-  }
-}
-
-# add: add a list of varobj to the tree
-itcl::body  VarTree::add {var} {
-  debug $var
-  if {$var == ""} {return}
-  set rootlist [concat $rootlist $var]
-  after idle [code $this build]
-}
-
-# remove: remove a varobj from the tree
-# if the name is "all" then remove all
-itcl::body  VarTree::remove {name} {
-  debug $name
-  if {$name == ""} {return}
-  if {$name == "all"} {
-    set rootlist {}
-  } else {
-    set rootlist [lremove $rootlist $name]
-  }
-  after idle [code $this build]
-}
-
-# update a var
-itcl::body  VarTree::update_var {var enabled check} {
-  if {$enabled && $check} {return}
-  lassign $var_to_items($var) nam typ val
-  if {$enabled} {
-    $c itemconfigure $nam -fill $colors(name)
-    $c itemconfigure $typ -fill $colors(type)
-
-    if {[catch {$var value} value]} {
-      set color $colors(error)      
-    } elseif {[$c itemcget $val -text] != $value} {
-      set color $colors(change)
-    } else {
-      set color $colors(value)
-    }
-    $c itemconfigure $val -text $value -fill $color
-  } else {
-    $c itemconfigure $nam -fill $colors(disabled)
-    $c itemconfigure $typ -fill $colors(disabled)
-    $c itemconfigure $val -fill $colors(disabled)
-  }
-  
-  if {![closed $var] && [$var numChildren]} {
-    foreach child [$var children] {
-      update_var $child $enabled $check
-    }
-  }
-}
-
-# update: update the values of the vars in the tree.
-# The "check" argument is a hack we have to do because
-# [$varobj value] does not return an error; only [$varobj update]
-# does.  So after changing the tree layout in build, we must then
-# do an update.  The "check" argument just optimizes things a bit over
-# a normal update by not fetching values, just calling update.
-itcl::body  VarTree::update {{check 0}} {
-  debug
-
-  # delete selection box if it is visible
-  if {$selidx != ""} {
-    $c delete $selidx
-  }
-
-  # update all the root variables
-  foreach var $rootlist {
-    if {[$var update] == "-1"} {
-      set enabled 0
-    } else {
-      set enabled 1
-    }
-    update_var $var $enabled $check
-  }
-}
-
-# Draw the selection highlight
-itcl::body  VarTree::drawselection {} {
-  #debug "selidx=$selidx selection=$selection"
-  if {$selidx != ""} {
-    $c delete $selidx
-  }
-  if {$selection == ""} return
-  if {![info exists var_to_items($selection)]} return
-  set bbox [eval "$c bbox $var_to_items($selection)"]
-  if {[llength $bbox] == 4} {
-    set selidx [eval $c create rectangle $bbox -fill $::Colors(sbg) -outline {{}}]
-    $c lower $selidx
-  } else {
-    set selidx {}
-  }
-}
-
-# button 1 callback
-itcl::body  VarTree::clicked {w x y open} {
-  #debug "clicked $w $x $y $open"
-  set x [$w canvasx $x]
-  set y [$w canvasy $y]
-  foreach m [$w find overlapping $x $y $x $y] {
-    if {[info exists item_to_var($m)]} {
-      if {$open} {
-	set var $item_to_var($m)
-	if {[closed $var]} {
-	  set closed($var) 0
-	} else {
-	  set closed($var) 1
-	}
-	after idle [code $this build]
-      } else {
-	setselection $item_to_var($m)
-      }
-      return
-    }
-  }
-  if {!$open} {
-    setselection ""
-  }
-}
-
-
-#
-# Change the selection to the indicated item
-#
-itcl::body  VarTree::setselection {var} {
-  #debug "setselection $var"
-  set selection $var
-  drawselection
-}
-
-# Check if a node is closed.
-# If it is a new node, set it to closed
-itcl::body  VarTree::closed {name} {
-  if {![info exists closed($name)]} {
-    set closed($name) 1
-  }
-  return $closed($name)
-}
-
-# mark a node open
-itcl::body  VarTree::open {name} {
-  set closed($name) 0
-  after idle [code $this build]
-}
-
-# mark a node closed
-itcl::body  VarTree::close {name} {
-  set closed($name) 1
-  after idle [code $this build]
-}
-
-# edit a varobj.  
-# creates an entry widget in place of the current value
-itcl::body  VarTree::edit {j} {
-  #debug "$j"
-
-  # if another edit is in progress, cancel it
-  if {$entry != ""} { unedit $j }
-
-  set entryobj $item_to_var($j)
-  set entry [entry $c.entry  -bg $::Colors(bg) -fg $::Colors(fg) -font global/fixed]
-  set entrywin [$c create window [$c coords $j] -window $entry -anchor w]
-  focus $entry
-  bind $entry <Return> [code $this changeValue $j]
-  bind $entry <Escape> [code $this unedit $j]
-}
-
-# cancel or clean up after an edit
-itcl::body  VarTree::unedit {j} {
-  #debug
-  # cancel the edit
-  $c delete $entrywin
-  destroy $entry
-  set entry ""
-  $c raise $j
-}
-
-# change the value of a varobj.
-itcl::body  VarTree::changeValue {j} {
-  #debug "value = [$entry get]"
-  set new [string trim [$entry get] \ \r\n]
-  if {$new == ""} {
-    unedit $j
-    return
-  }
-  if {[catch {$entryobj value $new} errTxt]} {
-    # gdbtk-varobj doesn't actually return meaningful error messages
-    # so use a generic one.
-    set errTxt "GDB could not evaluate that expression"
-    tk_messageBox -icon error -type ok -message $errTxt \
-      -title "Error in Expression" -parent [winfo toplevel $itk_interior]
-    focus $entry
-    $entry selection to end
-  } else {
-    unedit $j
-    
-    # We may have changed a register or something else that is 
-    # being displayed in another window
-    gdbtk_update
-  }
-}
-
-# change the format for a var
-itcl::body  VarTree::_change_format {var} {
-  #debug "$var $popup_temp"
-  catch {$var format $popup_temp}
-  after idle [code $this update]
-}
-
-# button 3 callback.  Pops up a menu.
-itcl::body  VarTree::_but3 {x y X Y} {
-  set x [$c canvasx $x]
-  set y [$c canvasy $y]
-  catch {destroy $pop.format}
-
-  set var ""
-  foreach item [$c find overlapping $x $y $x $y] {
-    if {![catch {set var $item_to_var($item)}]} {
-      break
-    }
-  }
-  setselection $var
-  if {$var == ""} {
-    _do_default_menu $X $Y
-    return
-  }
-  set popup_temp [$var format]
-  set j3 [lindex $var_to_items($var) 2]
-  #debug "var=$var [$var name] format=$popup_temp  this=$this"
-  $pop delete 0 end
-  $pop add command -label [$var name] -state disabled
-  $pop add separator
-  $pop add cascade -menu $pop.format -label "Format" -underline 0
-  set f [menu $pop.format -tearoff 0]
-  $f add radio -label "Natural" -variable [scope popup_temp] -value "natural" -command [code $this _change_format $var]
-  $f add radio -label "Decimal" -variable [scope popup_temp] -value "decimal" -command [code $this _change_format $var]
-  $f add radio -label "Hex" -variable [scope popup_temp] -value "hexadecimal" -command [code $this _change_format $var]
-  $f add radio -label "Octal" -variable [scope popup_temp] -value "octal" -command [code $this _change_format $var]
-  $f add radio -label "Binary" -variable [scope popup_temp] -value "binary" -command [code $this _change_format $var]
-  $pop add command -label "Edit" -command [code $this edit $j3]
-  $pop add command -label "Delete" -command [code $this remove $var]
-  if {![catch {$var value} value]} {
-    $pop add separator   
-    $pop add command -label "Dump Memory at [$var name]" -command [list ManagedWin::open MemWin -force -addr_exp [$var name]]
-  }
-  $pop add separator
-  if {$type == "local"} {
-    $pop add command -label "Help" -command "open_help watch.html"
-  } else {
-    $pop add command -label "Help" -command "open_help locals.html"
-  }
-  $pop add separator
-  $pop add command -label "Close" -command "destroy [winfo toplevel $itk_interior]"
-  tk_popup $pop $X $Y
-}
-
-# popup menu over empty space
-itcl::body  VarTree::_do_default_menu {X Y} {
-  #debug
-  $pop delete 0 end
-  if {$type == "local"} {
-    $pop add command -label "Local Variables" -state disabled
-  } else {
-    $pop add command -label "Watch Window" -state disabled
-  }
-  $pop add separator
-  $pop add command -label "Sort" -command [code $this _sort]
-  if {$type == "local"} {
-    $pop add command -label "Help" -command "open_help watch.html"
-  } else {
-    $pop add command -label "Help" -command "open_help locals.html"
-  }
-  $pop add separator
-  $pop add command -label "Close" -command "destroy [winfo toplevel $itk_interior]"
-  tk_popup $pop $X $Y
-}
-
-# alphabetize the variable names in the list
-itcl::body  VarTree::_sort {} {
-  #debug $rootlist
-  set rootlist [lsort -command [code $this _compare] $rootlist]
-  after idle [code $this build]
-}
-
-# comparison function for lsort.
-itcl::body  VarTree::_compare {a b} {
-  return [string compare [$a name] [$b name]]
-}
-
-# ititialize common data
-itcl::body  VarTree::_init_data {} {
-  set colors(name) "\#0000C0"
-  set colors(type) "red"
-  set colors(error) "red"
-  set colors(value) "black"
-  set colors(change) $::Colors(change)
-  set colors(disabled) "gray50"
-  set colors(line) "gray50"
-
-  set maskdata "#define solid_width 9\n#define solid_height 9"
-  append maskdata {
-    static unsigned char solid_bits[] = {
-      0xff, 0x01, 0xff, 0x01, 0xff, 0x01, 0xff, 0x01, 0xff, 0x01, 0xff, 0x01,
-      0xff, 0x01, 0xff, 0x01, 0xff, 0x01
-    };
-  }
-  set data "#define open_width 9\n#define open_height 9"
-  append data {
-    static unsigned char open_bits[] = {
-      0xff, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x7d, 0x01, 0x01, 0x01,
-      0x01, 0x01, 0x01, 0x01, 0xff, 0x01
-    };
-  }
-  image create bitmap openbm -data $data -maskdata $maskdata \
-    -foreground black -background white
-  set data "#define closed_width 9\n#define closed_height 9"
-  append data {
-    static unsigned char closed_bits[] = {
-      0xff, 0x01, 0x01, 0x01, 0x11, 0x01, 0x11, 0x01, 0x7d, 0x01, 0x11, 0x01,
-      0x11, 0x01, 0x01, 0x01, 0xff, 0x01
-    };
-  }
-  image create bitmap closedbm -data $data -maskdata $maskdata \
-    -foreground black -background white
-
-  set initialized 1
-}
-
diff --git a/gdb/gdbtk/library/vartree.ith b/gdb/gdbtk/library/vartree.ith
deleted file mode 100644
index b250f2ea2cb..00000000000
--- a/gdb/gdbtk/library/vartree.ith
+++ /dev/null
@@ -1,77 +0,0 @@
-# Variable tree class definition for Insight.
-# Copyright 2002 Red Hat, Inc.
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License (GPL) 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.
-
-itcl::class VarTree {
-  inherit itk::Widget
-
-  public variable type "watch"
-
-  private {
-    # list of root variables in tree
-    variable rootlist {}
-
-    # mapping of varobj to canvas items
-    variable var_to_items
-    variable item_to_var
-
-    variable c		;#the canvas
-    variable pop	;#popup menu
-    variable _y 0
-    variable selection
-    variable selidx
-    variable closed
-
-    variable popup_temp
-
-    # when editing, these contain the entry widget and edited varobj
-    variable entry ""
-    variable entryobj
-    variable entrywin
-  }
-
-  common maskdata
-  common data
-  common openbm
-  common closedbm
-  common initialized 0
-  common colors 
-
-  private {
-    method _init_data {}
-    method build {}
-    method buildlayer {tlist n}
-    method drawselection {}
-    method clicked {w x y open}
-    method setselection {var}
-    method closed {name}
-    method open {name}
-    method close {name}
-    method edit {j}
-    method unedit {j}
-    method changeValue {j}
-    method update_var {var ena check}
-    method _but3 {x y X Y}
-    method _change_format {var}
-    method _do_default_menu {X Y}
-    method _sort {}
-    method _compare {a b}
-  }
-
-  public {
-    method constructor {args}
-    method destructor {}
-    method add {varobj}
-    method remove {varobj}
-    method update {{check 0}}
-  }
-}
\ No newline at end of file
diff --git a/gdb/gdbtk/library/warning.tcl b/gdb/gdbtk/library/warning.tcl
deleted file mode 100644
index 0e1a82342b0..00000000000
--- a/gdb/gdbtk/library/warning.tcl
+++ /dev/null
@@ -1,102 +0,0 @@
-# Warning dialog for GDBtk.
-# Copyright 1998, 1999 Cygnus Solutions
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License (GPL) 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.
-
-
-# -----------------------------------------------------------------------------
-# NAME:
-#       class WarningDlg
-#
-# DESC:
-#       This class implements a warning dialog.  It has an optional checkbox
-#       that the user can select to disable all warnings of the same type.
-#
-# ARGS:
-#	-ignorable "class"	- Causes an ignorable dialog to be created.
-#				"class" is the warning class that will be either
-#				displayed or ignored.  It may be any string, so
-#				long as the same string is used for all related
-#				warning messages.
-#
-#	-message "msg"		- Message to be displayed.
-# -----------------------------------------------------------------------------
-#
-
-itcl::class WarningDlg {
-  inherit ManagedWin ModalDialog
-
-  public {
-    variable ignorable ""
-    variable message ""
-    method constructor {args}
-  }
-
-  protected common ignore
-}
- 
-# -----------------------------------------------------------------------------
-# NAME: 
-#       WarningDlg::constructor
-#
-# DESC: 
-#       Creates the warning dialog.
-# -----------------------------------------------------------------------------
-itcl::body WarningDlg::constructor {args} {
-  debug $args
-  window_name "Warning"
-  eval itk_initialize $args
-
-  if {$ignorable == ""} {
-    tk_messageBox -message $message -type ok -icon warning -default ok \
-      -parent [winfo toplevel $itk_interior]
-    delete
-    return
-  } else {
-    if {[info exists ignore($ignorable)]} {
-      if {$ignore($ignorable)} { 
-	delete
-	return 
-      }
-    } else {
-      set ignore($ignorable) 0
-    }
-  }
-  
-  frame $itk_interior.f
-  frame $itk_interior.f.a -relief raised -bd 1
-  frame $itk_interior.f.b -relief raised -bd 1
-  set f $itk_interior.f.a
-  
- 
-  label $f.bitmap -bitmap warning
-  label $f.lab -text $message
-  pack $f.bitmap $f.lab -side left -padx 10 -pady 10
-
-  if {$ignorable != ""} {
-    checkbutton $itk_interior.f.b.ignore -text "Don't show this warning again" \
-      -variable [scope ignore($ignorable)] -anchor w 
-  }
-  
-  button $itk_interior.f.b.ok -text OK -underline 0 -command [code $this unpost]
-  bind $itk_interior.f.b.ok <Return> \
-    "$itk_interior.f.b.ok flash; $itk_interior.f.b.ok invoke"
-  focus $itk_interior.f.b.ok
-
-  if {$ignorable != ""} {
-    pack $itk_interior.f.b.ignore
-  }
-
-  pack $itk_interior.f.b.ok -expand yes -side left 
-  pack $itk_interior.f.a 
-  pack $itk_interior.f.b  -fill x
-  pack $itk_interior.f
-}
diff --git a/gdb/gdbtk/library/watch.tcl b/gdb/gdbtk/library/watch.tcl
deleted file mode 100644
index 6d2fd367410..00000000000
--- a/gdb/gdbtk/library/watch.tcl
+++ /dev/null
@@ -1,214 +0,0 @@
-# Watch window for Insight.
-# Copyright 2002, 2003 Red Hat
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License (GPL) 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.
-
-
-# ----------------------------------------------------------------------
-# Implements watch windows for gdb.
-# ----------------------------------------------------------------------
-
-itcl::class WatchWin {
-  inherit EmbeddedWin GDBWin
-  # ------------------------------------------------------------------
-  #  CONSTRUCTOR - create new watch window
-  # ------------------------------------------------------------------
-  constructor {args} {
-    debug
-
-    gdbtk_busy
-    build_win $itk_interior
-    gdbtk_idle
-    
-    add_hook gdb_no_inferior_hook "$this no_inferior"
-    add_hook gdb_clear_file_hook [code $this clear_file]
-    add_hook file_changed_hook [code $this clear_file]
-  }
-  
-
-  # ------------------------------------------------------------------
-  #   PUBLIC METHOD:  busy - BusyEvent handler
-  #           Disable all ui elements that could affect gdb's state
-  # ------------------------------------------------------------------
-  method busy {event} {
-    debug
-    set Running 1
-    cursor watch
-  }
-
-  # Re-enable the UI
-  method idle {event} {
-    debug
-    set Running 0
-    cursor {}
-  }
-
-  # ------------------------------------------------------------------
-  # METHOD:   no_inferior
-  #           Reset this object.
-  # ------------------------------------------------------------------
-  method no_inferior {} {
-    debug
-    cursor {}
-    set Running 0
-  }
-  
-  # ------------------------------------------------------------------
-  #  METHOD:  cursor - change the toplevel's cursor
-  # ------------------------------------------------------------------
-  method cursor {what} {
-    [winfo toplevel [namespace tail $this]] configure -cursor $what
-    ::update idletasks
-  }
-  
-  
-  # ------------------------------------------------------------------
-  # METHOD: build_win - build window for watch. 
-  # ------------------------------------------------------------------
-  method build_win {f} {
-    #debug "$f"
-    
-    set f [::frame $f.f]
-    set treeFrame  [frame $f.top]
-    set entryFrame [frame $f.expr]
-
-    set tree [VarTree $treeFrame.tree]
-    pack $tree -expand yes -fill both
-
-    set Entry [entry $entryFrame.ent -font global/fixed]
-    button $entryFrame.but -text "Add Watch" -command [code $this validateEntry]
-    pack $f -fill both -expand yes
-    grid $entryFrame.ent -row 0 -column 0 -sticky news -padx 2
-    grid $entryFrame.but -row 0 -column 1 -padx 2
-    grid columnconfigure $entryFrame 0 -weight 1
-    grid columnconfigure $entryFrame 1
-
-    grid $treeFrame -row 0 -column 0 -sticky news
-    grid $entryFrame -row 1 -column 0 -padx 5 -pady 5 -sticky news
-    grid columnconfigure $f 0 -weight 1
-    grid rowconfigure $f 0 -weight 1
-    window_name "Watch"
-    ::update idletasks
-    # Binding for the entry
-    bind $entryFrame.ent <Return> "$entryFrame.but flash; $entryFrame.but invoke"
-  }
-
-  method validateEntry {} {
-    if {!$Running} {
-      debug "Getting entry value...."
-      set variable [$Entry get]
-      debug "Got $variable, going to add"
-      set ok [add $variable]
-      debug "Added... with ok: $ok"      
-      $Entry delete 0 end
-    }
-  }
-
-  # ------------------------------------------------------------------
-  #  METHOD: clear_file - Clear out state so that a new executable
-  #             can be loaded. For WatchWins, this means deleting
-  #             the Watched list.
-  # ------------------------------------------------------------------
-  method clear_file {} {
-    debug
-    set Watched {}
-  }
-
-  # ------------------------------------------------------------------
-  # DESTRUCTOR - delete watch window
-  # ------------------------------------------------------------------
-  destructor {
-    debug
-    set tree {}
-
-    # Remove this window and all hooks
-    remove_hook gdb_no_inferior_hook "$this no_inferior"
-    remove_hook gdb_clear_file_hook [code $this clear_file]
-    remove_hook file_changed_hook [code $this clear_file]
-
-    foreach var $Watched {
-      $var delete
-    }
-  }
-
-  method remove {entry} {
-    debug $entry
-
-    # Remove this entry from the list of watched variables
-    set Watched [lremove $Watched $entry]
-
-    $entry remove
-    $entry delete
-  }
-
-
-  method update {event} {
-    $tree update
-  }
-
-
-  # ------------------------------------------------------------------
-  # METHOD: add - add a variable to the watch window
-  # ------------------------------------------------------------------
-  method add {name} {
-    debug "Trying to add \"$name\" to watch"
- 
-    # Strip all the junk after the first \n
-    set var [split $name \n]
-    set var [lindex $var 0]
-    set var [split $var =]
-    set var [lindex $var 0]
-
-    # Strip out leading/trailing +, -, ;, spaces, commas
-    set var [string trim $var +-\;\ \r\n,]
-
-    # Make sure that we have a valid variable
-    set err [catch {gdb_cmd "set variable $var"} errTxt]
-    if {$err} {
-      dbug W "ERROR adding variable: $errTxt"
-      ManagedWin::open WarningDlg -transient \
-	-over $this -message [list $errTxt] -ignorable "watchvar"
-    } else {
-      if {[string index $var 0] == "\$"} {
-	# We must make a special attempt at verifying convenience
-	# variables.. Specifically, these are printed as "void"
-	# when they are not defined. So if a user type "$_I_made_tbis_up",
-	# gdb responds with the value "void" instead of an error
-	catch {gdb_cmd "p $var"} msg
-	set msg [split $msg =]
-	set msg [string trim [lindex $msg 1] \ \r\n]
-	if {$msg == "void"} {
-	  return 0
-	}
-      }
-
-      debug "In add, going to add $name"
-      # make one last attempt to get errors
-      set err [catch {set foo($name) 1}]
-      debug "err1=$err"
-      set err [expr {$err + [catch {expr {$foo($name) + 1}}]}]
-      debug "err2=$err"
-      if {!$err} {
-	set var [gdb_variable create -expr $name]
-	debug "var=$var"
-	$tree add $var
-	lappend Watched $var
-	return 1
-      }
-    }    
-    return 0
-  }
-
-  protected variable Entry
-  protected variable Watched {}
-  protected variable tree
-  protected variable Running
-}
diff --git a/gdb/gdbtk/plugins/ChangeLog b/gdb/gdbtk/plugins/ChangeLog
deleted file mode 100644
index 9cae2603a17..00000000000
--- a/gdb/gdbtk/plugins/ChangeLog
+++ /dev/null
@@ -1,8 +0,0 @@
-2002-08-14  Keith Seitz  <keiths@redhat.com>
-
-	* acinclude.m4, aclocal.m4, configure, configure.in,
-	HOW-TO, Makefile.am, Makefile.in, Make-rules,
-	plugins.tcl: New files adding improved support for plugins.
-	* rhabout/: Add new sample plugin.
-	* intel-pentium/: Add new Intel Pentium plugin.
-
diff --git a/gdb/gdbtk/plugins/HOW-TO b/gdb/gdbtk/plugins/HOW-TO
deleted file mode 100644
index 6d7ebc158f9..00000000000
--- a/gdb/gdbtk/plugins/HOW-TO
+++ /dev/null
@@ -1,414 +0,0 @@
-INSIGHT PLUG-INS HOW-TO
-=======================
-
-This text describes the technical aspects of adding a plug-in window
-to Insight, the graphical front-end to the GNU Debugger, GDB.
-
-
-1) INTRODUCTION
-
-The plug-in facility allows for the addition of custom windows to
-Insight.  These windows are not to become part of the Insight
-distribution, but rather to be distributed separately.  They can be
-downloaded from the author's web site, may accompany some development
-board or embedded OS, or come with anything else that can benefit from
-a custom window being added to the standard Insight.  Plug-ins
-will be loaded into Insight/GDB for execution, so the terms of the GPL
-also apply to the plug-in code.  Also, Red Hat provides this facility
-as-is and accepts no responsibility from its use.  Please refer to the
-text of the GPL for more details.
-
-The facilities described here provide support for custom
-visualizations (custom windows for displaying information retrieved
-from the target).  By writing a plug-in, it is possible to visualize
-target-specific data that is not shown in the standard Insight
-windows.
-
-The plug-in facility cannot be used to control target execution.  The
-current implementation of Insight assumes that only the Source Window
-issues commands related to target execution control.  There is no
-mechanism to prevent one to call the commands that control execution,
-but its use may result in inconsistent GUI states.  This restriction
-may be lifted in future versions of Insight.
-
-The facility works as follows: A plugins subdirectory is added under
-the "EXEC-PREFIX/lib" directory where Insight is installed.  The custom
-plug-in code will be installed in a subdirectory of this plugins
-directory.  The plug-in window will be written as an [incr Tcl/Tk]
-class which inherits from the provided PluginWindow class and
-implements the methods necessary to display the desired custom
-data. GDB will read plug-in files on start-up and add a menu item to
-the PlugIn menu of the Insight Source Window.  When the menu item is
-chosen, GDB instantiates the custom plug-in class.
-
-The PluginWindow base class constructor creates a toplevel window (an
-Insight ManagedWin) which contains a "childsite".  In this case, the
-"childsite" is a frame in which the derived class (the custom plug-in)
-can draw.  The PluginWindow class also provides facilities to add a
-menu and a toolbar.  Among the methods provided by this class, the
-"running" method is called every time the debugger starts the target
-and the "stopped" method is called every time the target stops. In the
-"stopped" method, information can be gathered from the target and
-displayed.  The "running" method indicates that GDB is busy running
-the target.  No activities should be initiated by any GUI component
-while in this state (except for the STOP button in the Source Window).
-
-The remainder of this document describes how to install a custom
-plug-in and some details of the PluginWindow class.  Writing Tcl
-extensions (technically what plug-ins are) is beyond the scope of
-this document, but a simple example is given and some documentation
-references are provided.
-
-Please see the file CONTRIBUTE in this directory for some
-administrative details before you start developing your plug-in.
-
-
-2) HOW TO ADD A PLUG-IN WINDOW TO INSIGHT
-
-Once you have your plug-in class ready, here is how to make it show up
-in the Insight Source Window "PlugIn" menu.  You may perform these
-steps manually, but if you are distributing your plug-in, it may be
-convenient to provide an installation script with it that automates
-this steps.
-
-The examples in this section refer to the sample plug-in code provided
-with the Insight sources, located in the
-$(SOURCE)/gdb/gdbtk/plugins and $(SOURCE)/gdb/gdbtk/plugins/rhabout
-directories.
-
-Custom plug-ins are provided as "packages" (see [Welch 2000] and
-[Smith 2000]).  The following setup will cause your plug-in package to
-be loaded. 
-
-** FIXME: don't need to create the directory -- install will do it **
-i) First, locate the $(EXEC-PREFIX)/lib/insight1.0 directory.  This is the
-directory which contains the plug-in code used by Insight.  Create a
-this directory if it does not exist yet (i.e., if your plug-in
-is the first to be installed).
-
-ii) Create a subdirectory for your plug-in code (named in accordance to
-the conventions set forth in the CONTRIBUTE file).  Add all your code
-to that directory.  Make sure you have a tclIndex file or use
-auto_mkindex to create it.  For instance, in the sample case we would
-have:
-
-   $(EXEC-PREFIX)/lib/insight1.0/rhabout
-
-** FIXME: this shows unix. show cygwin, too. **
-and it would contain:
-
-   rhabout.itcl  rhabout.so  rhabout.tcl pkgIndex.tcl tclIndex
-
-iii) In your plug-in's directory, create a file that will actually load your
-plug-in package (named accordingly to the CONTRIBUTE conventions).  In
-the provided sample, this file is "rhabout.tcl" and would contain the
-following lines:
-
-   package provide RHABOUT 1.0
-   set dirname [file dirname [info script]]
-   lappend auto_path [file join $dirname]
-   catch {load [file join $dirname rhabout@TCL_SHLIB_SUFFIX@]}
-
-The first line states what package the sample plug-in code is
-providing.  Note that the subdirectory "rhabout" which contains the
-sample plug-in is added to the auto_path in the third line and there
-is a tclIndex file in that directory (that is how plug-in classes and
-methods are found).
-
-The last line is only necessary if your plug-in contains Tcl command
-procedures written in C.  Loading Tcl libraries is described in [Welch
-2000] and the [incr Tcl/Tk] bits can be found in [Smith 2000].  It is
-recommended that the reader also refer to the "load" Tcl man page if
-these dynamic libraries are to be loaded.
-
-iv) Add a pkgIndex.tcl file to your plug-in's directory. Do not use
-Tcl to generate this file, since it will not work properly. Instead,
-just add a line like:
-
-   package ifneeded RHABOUT 1.0 [list source [file join $dir rhabout.tcl]]
-
-This roughly corresponds to what would be created by a pkg_mkIndex
-command with the "-direct" option.
-
-** FIXME: install will do this, too. ALL plugins should be mentioned
-   in the global plugins.tcl file **
-v) Create/append the file "plugins.tcl" in the plugins directory
-($(EXEC-PREFIX/lib/insight1.0) if it does not yet exist.  This is a file
-shared by all plug-ins so make sure your install script does not overwrite,
-but append to it.
-
-This is a Tcl code fragment that will be sourced by the Insight Source
-Window constructor to add menu entries to the "PlugIn" menu that will
-instantiate the plug-in classes.  If there is any error in this few
-lines of code Insight will not start and a Tcl stack trace will be
-shown.  So test it in your build directory before installing in a
-system shared by others.
-
-For the sample plug-in, this lines would be:
-
-   # Add your window to the PlugIn menu here
-   # Don't forget to add your packet as well
-
-   if {1} {  #test here if your target is configured
-     # Uncomment this when the PlugIn class is ready
-     #package require LIBGDB 1.0
-     package require RHABOUT 1.0
-     $Menu add command Other "About Red Hat" \
-       {ManagedWin::open RHAbout} \
-       -underline 0
-     # To activate the PlugIn sample, uncomment the next line
-     set plugins_available 1
-   }
-
-You can ignore the LIBGDB "package require" command for now.  LIBGDB
-is under construction and not yet available.  But do not forget to
-add a "package require" command for your plug-in package.  Otherwise,
-when someone choses your plug-in menu entry a stack trace will be
-produced.
-
-The Tcl command starting with "$Menu" is similar to the ones provided
-by the "menubar" component of the PluginWindow class (described later
-in this document), but all one needs to do is to copy the above
-replacing the menu entry text "About Red Hat", the plug-in class name
-"RHAbout" and the underline index with the appropriate values.
-
-The "set plugins_available 1" command is important.  If the variable
-"plugins_available" is not set to 1 by any of the plug-in code
-fragments, the Source Window will not have a "PlugIn" menu.
-
-This brings us to the "if" statement in the first line.  The sample
-plug-in is generic, it works with any target.  However, a custom
-plug-in may be written for a specific target and be of no generic
-use. Furthermore, a target-specific plug-in may not even work with
-other host and target configurations different from the one for which
-it was designed.
-
-The plugins.tcl file used by Insight is shared by all configurations on a
-given host, and adding a plug-in incorrectly could render Insight unusable.
-To avoid this, test for the right configuration before adding your plug-in
-to the plug-in menu entry (the "package require" must also be protected).
-
-Insight has a global variable which contains configuration
-information. The array "GDBStartup" has the elements:
-
-   host_name     - host configuration triplet
-   target_name   - target configuration triplet 
-
-Use the values $GDBStartup(host_name) and $GDBStartup(target_name)
-to verify that your plug-in code is supported. Since these are global
-variables, you must either add "global GDBStartup" somewhere before using
-it, or simply specify GDBStartup in the global space, e.g.,
-"$::GDBStartup(host_name)".
-
-For instance, if the sample code could only be used with Linux hosts,
-the sample code above would look like this:
-
-   # Add your window to the PlugIn menu here
-   # Don't forget to add your packet as well
-
-   global GDBStartup
-   if {[string first "linux" $GDBStartup(host_name)] != -1} {
-     #package require LIBGDB 1.0
-     package require RHABOUT 1.0
-     $Menu add command Other "About Red Hat" \
-       {ManagedWin::open RHAbout} \
-       -underline 0
-     set plugins_available 1
-   }
-
-
-3) DEVELOPING AN INSIGHT PLUG-IN
-
-Only itcl-based windows will work.  They must also be derived (i.e.,
-inherit) from the PluginWindow class described in the next section.
-You must also follow the name conventions described in the CONTRIBUTE
-file to avoid class name clashes.
-
-The PluginWindow base class has facilities for adding a menu and a
-toolbar.  It already provides the code to deactivate buttons and menu
-entries when GDB is busy (running the target) and reactivate them when
-the target stops.  Your job usually consists of calling a method to
-redraw your window with updated information when the target stops.
-You can do this simply by adding a call to this method inside the
-"stopped" method provided.
-
-The Insight Tcl source file gdb/gdbtk/library/interface.tcl and the C
-file gdb/gdbtk/generic/gdbtk-cmds.c contain a (quite volatile) set of
-Tcl commands that can be used to retrieve information from and about
-the target.  Examples of the use of such commands exist all around the
-Insight source code and details are usually given near the procedure
-or function definitions.  Please refrain from using commands that
-control the target execution or change the GDB state in any way, they
-are reserved for use by the Source Window only.  Remember, plug-ins are
-a visualization facility only.
-
-A special remark is necessary about the gdb_cmd and gdb_immediate
-commands.  These are deprecated and will disappear (stop working) soon.
-The GDB maintainers have asked the Insight maintainers to stop using
-the hooks in GDB code that make them possible.  Conversion is already
-under way.  You can use them for prototyping (for now), but be
-prepared to write Tcl command procedures instead of parsing console text
-output.  
-
-If you need to issue target-dependent commands to retrieve information
-from your target (that cannot be retrieved with the standard register
-and memory access operations), you can write Tcl command procedures
-and add them to your target dependent file enclosed in 
-   #ifdef GDBTK
-   #endif
-The target-dependent Tcl code will move to a subdirectory of gdbtk in
-the future, but for now, just add it to your existent target-dependent
-file.
-
-If you must access gdb functions that are not yet available in
-gdbtk-cmds.c (or in any of the spun-offs that will soon exist in the
-gdb/gdbtk/generic directory), consider writing to the Insight
-maintainers.  They will be able to tell you what command should be
-implemented and, if they have the time, add it to Insight.  As they
-may be busy, consider offering to write the code yourself and
-submitting it for approval (see CONTRIBUTE).  You can see how these
-Tcl command procedures in C are written by looking at what it is done
-in the gdbtk-cmds.c file and others in the gdb/gdbtk/generic
-subdirectory.  Again, you can use the gdb_cmd and gdb_immediate
-commands to invoke a GDB command line interface command, but they will
-not be available for long.
-
-Please refer to the sample source code located in the files:
-  gdb/gdbtk/library/plugins/rhabout/rhabout.itcl
-  gdb/gdbtk/library/plugins/rhabout/rhabout.c 
-
-The comments in these files provide a basic framework for a Insight
-plug-in.
-
-
-4) THE "PluginWindow" BASE CLASS
-
-The PluginWindow base class provides the following methods:
-
-childsite  -  returns the path of the frame component that can be used
-by the plug-in code to pack its custom display components.
-
-stopped  -  called when the target stops.  It should be overloaded and
-call the plug-in procedure that updates the display.  The child
-version must call the base class method implementation if it wants
-menu items and/or buttons to be automatically controlled.
-
-running  -  called when GDB becomes busy by running the target.  No
-commands shall be issued by a plug-in while GDB is busy.  The child
-version must call the base class method implementation if it wants
-menu items and/or buttons to be automatically controlled.
-
-no_inferior  -  called when GDB disconnects from the target.  The
-plug-in may want to forget some context information in this case,
-depending on the specifics of its implementation.  The child
-version must call the base class method implementation if it wants
-menu items and/or buttons to be automatically controlled.
-
-
-The PluginWindow base class contains two components which can be
-optionally used:
-
-menubar  -  allows a menu to be added to the plug-in window.  This
-facility is implemented by the GDBMenuBar class (gdbmenubar.itcl).
-
-toolbar  -  allows a toolbar to be added to the plug-in window.  This
-facility is implemented by the GDBToolBar class (gdbtoolbar.itcl).
-
-
-Both buttons and menu entries have "class" attributes.  Button classes
-and Menu entry classes are specified when they are created and are
-used for the automatic control of button and menu entry states.
-If the class is specified as "None", the menu entry or button will
-remain always active.  The classes "Control" and "Other" follow the
-following convention:
-
-   Control    Other     State
-     off       off      gdb is busy
-     on        on       gdb has inferior, and is idle
-     off       on       gdb has no inferior, and is idle
-
-
-The "menubutton" component offers the following supported commands:
-
-add menubutton  - add a menu button to the window menu bar.
-add command     - add an entry to the last menu created.
-add separator   - add a separator to the last menu created.
-show            - attach the created menu to the window.
-
-If the show command is not issued, the plug-in window will have no
-menu bar.  There are other methods and commands defined in the
-GDBMenuBar class.  They are for Insight internal use only and should
-not be used by plug-in windows.
-
-A menu named "help" will automatically be aligned to the right.
-
-The sample plug-in code creates a simple menu with the following commands:
-
-    $menubar add menubutton file "File" 0
-    $menubar add command None "Close" \
-      [code $this destroy_toplevel] \
-      -underline 1
-    $menubar add menubutton help "Help" 0
-    $menubar add command Other "Help Topics" \
-      {HtmlViewer::open_help index.html} \
-      -underline 0
-    $menubar add separator
-    $menubar add command Other "About GDB..." \
-      {ManagedWin::open About -transient} \
-      -underline 0
-
-    # The menu only shows up if you do this:
-    $menubar show
-
-
-The "toolbar" component offers the following supported commands:
-
-add button      - add a button to the window tool bar.
-add label       - add an label widget to the tool bar.
-add separator   - add a separator to the tool bar.
-itemconfigure   - configure a tool bar element.
-show            - make the toolbar visible.
-
-If the show command is not issued, the plug-in window will have no
-tool bar.  There are other methods and commands defined in the
-GDBToolBar class.  They are for Insight internal use only and should
-not be used by plug-in windows.
-
-Use the "itemconfigure" command to fill the label elements with the
-current data as necessary.
-
-The sample plug-in code creates a single button with the following commands:
-
-    $toolbar add button con Other {ManagedWin::open Console} \
-                           "Console (Ctrl+N)" -image console_img
-
-    # The toolbar will only show up if you do this:
-    $toolbar show
-
-
-The complete Tcl code of the sample plug-in can be found in the file
-   gdb/gdbtk/library/plugins/rhabout/rhabout.itcl
-and the PluginWindow class definition and implementation is in the file
-   gdb/gdbtk/library/pluginwin.itcl
-
-Please refer to the files
-   gdb/gdbtk/library/gdbmenubar.itcl
-and
-   gdb/gdbtk/library/gdbtoolbar.itcl
-for the current arguments accepted by the menubar and toolbar commands
-respectively.
-
-REQUIRED FILES
-gdbtk/plugins/PLUGIN
-gdbtk/plugins/PLGUIN/PLUGIN.tcl.in
-gdbtk/plugins/PLUGIN/Makefile.in
-gdbtk/plugins/PLUGIN/pkgIndex.tcl
-gdbtk/plugins/PLUGIN/tclIndex
-
-REFERENCES
-
-[Smith 2000] Chad Smith, "[incr Tcl/Tk] from the Ground Up".
-Chapters 9 and 10.  Osborne/McGraw-Hill, 2000. 
-
-[Welch 2000] Brent B. Welch, "Practical Programming in Tcl and Tk",
-3/e.  Chapters 12, 14, 44, 45, 46 and 47.  Prentice Hall PTR, 2000.
diff --git a/gdb/gdbtk/plugins/Make-rules b/gdb/gdbtk/plugins/Make-rules
deleted file mode 100644
index 78a32e1a886..00000000000
--- a/gdb/gdbtk/plugins/Make-rules
+++ /dev/null
@@ -1,165 +0,0 @@
-# Variables to be defined by plugin's Makefile.in:
-#
-# PLUGIN (required)
-# PLUGIN_CFLAGS - CFLAGS to use for build
-# PLUGIN_SHLIB_LIBS - shared libs to link against
-# PLUGIN_INSTALL - anything to install from builddir
-# PLUGIN_INSTALL_SRCDIR - anything to install from srcdir
-# PLUGIN_INSTALL_TARGET - install target (overrides default)
-# PLUGIN_TARGETS - targets to build
-# PLUGIN_CLEAN - clean targets (overrides default)
-# PLUGIN_DISTCLEAN - distclean targets (overrides default)
-#
-# Cygwin-specific variables
-# PLUGIN_DLL_ENTRY - cygwin DLL entry point default _DllMain@12)
-# PLUGIN_IMAGE_BASE (required) - DLL image base
-# PLUGIN_CYGWIN_LIBS - any additional cygwin libs to link against
-# PLUGIN_OBJS - objects to put in DLL (hack)
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-srcdir = @srcdir@
-datadir = @datadir@
-libdir = @libdir@
-mandir = @mandir@
-plugin_srcdir = @top_srcdir@
-plugin_builddir = @plugin_builddir@
-
-SHELL = @SHELL@
-CC = @CC@
-CFLAGS = @CFLAGS@
-
-OBJEXT = @OBJEXT@
-TCL_SHLIB_CFLAGS = @TCL_SHLIB_CFLAGS@
-TCL_SHLIB_LD = @TCL_SHLIB_LD@
-TCL_DBGX = @TCL_DBGX@
-TCL_SHLIB_SUFFIX = @TCL_SHLIB_SUFFIX@
-TCL_INCLUDES = @TCLHDIR@
-TCL_BUILD_LIB_SPEC = @TCL_BUILD_LIB_SPEC@
-
-mkinstalldirs = $(srcdir)/../../../../mkinstalldirs
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-
-PLUGIN_MODULE = $(PLUGIN)$(TCL_SHLIB_SUFFIX)
-
-# Must include a path to tclWinInt.h on cygwin
-ifeq ($(TCL_SHLIB_SUFFIX),.dll)
-CYGWIN_CFLAGS=-I$(srcdir)/../../../../tcl/win
-else
-CYGWIN_CFLAGS=
-endif
-GENERIC_CFLAGS = $(CFLAGS) $(TCL_SHLIB_CFLAGS) $(TCL_INCLUDES) $(CYGWIN_CFLAGS)
-ALL_CFLAGS = $(GENERIC_CFLAGS) $(PLUGIN_CFLAGS)
-
-# It would be nice to copy all the plugin's files to the build dir so
-# that we can use the plugin without installing it...
-#GENERIC_TARGETS = tclIndex pkgIndex.tcl
-ifeq ($(PLUGIN_OBJS),)
-ALL_TARGETS = $(GENERIC_TARGETS) $(PLUGIN_TARGETS)
-else
-ALL_TARGETS = $(PLUGIN_MODULE) $(GENERIC_TARGETS) $(PLUGIN_TARGETS)
-endif
-
-GENERIC_SHLIB_LIBS = $(TCL_BUILD_LIB_SPEC)
-CYGWIN_DLL_LIBS = $(PLUGIN_CYGWIN_LIBS) @LIBCYGWIN_A@
-ALL_SHLIB_LIBS = $(GENERIC_SHLIB_LIBS) $(PLUGIN_SHLIB_LIBS)
-
-GENERIC_INSTALL = $(PLUGIN).tcl
-ifeq ($(PLUGIN_OBJS),)
-ALL_INSTALL = $(GENERIC_INSTALL) $(PLUGIN_INSTALL)
-else
-ALL_INSTALL = $(PLUGIN_MODULE) $(GENERIC_INSTALL) $(PLUGIN_INSTALL)
-endif
-
-ifeq ($(PLUGIN_INSTALL_TARGET),)
-INSTALL_TARGET = install-generic
-else
-INSTALL_TARGET = $(PLUGIN_INSTALL_TARGET)
-endif
-
-ifeq ($(PLUGIN_CLEAN),)
-CLEAN_TARGET = clean-generic
-else
-CLEAN_TARGET = $(PLUGIN_CLEAN)
-endif
-
-ifeq ($(PLUGIN_DISTCLEAN),)
-DISTCLEAN_TARGET = distclean-generic
-else
-DISTCLEAN_TARGET = $(PLUGIN_DISTCLEAN)
-endif
-
-# Makefile dependencies
-Makefile: $(plugin_srcdir)/Make-rules $(plugin_builddir)/config.status
-	cd $(plugin_builddir) \
-	  && CONFIG_FILES=$(PLUGIN)/Makefile:$(PLUGIN)/Makefile.in:Make-rules CONFIG_HEADERS= $(SHELL) ./config.status
-
-all: $(ALL_TARGETS)
-
-%.$(OBJEXT): $(srcdir)/%.c
-	$(CC) -c $(ALL_CFLAGS) $<
-
-install: $(INSTALL_TARGET)
-
-install-generic:
-	$(mkinstalldirs) $(libdir)/insight1.0/$(PLUGIN)
-	for i in $(ALL_INSTALL); do \
-            $(INSTALL_DATA) $$i $(libdir)/insight1.0/$(PLUGIN)/$$i ; \
-        done ;
-	for i in pkgIndex.tcl tclIndex $(PLUGIN_INSTALL_SRCDIR) ; do \
-	    $(INSTALL_DATA) $(srcdir)/$$i $(libdir)/insight1.0/$(PLUGIN)/$$i ; \
-	done ;
-
-info:
-install-info:
-clean: $(CLEAN_TARGET)
-
-clean-generic:
-	rm -f *.$(OBJEXT) *.base *.def *.exp $(PLUGIN_MODULE) $(PLUGIN_CLEAN)
-
-distclean-generic: $(CLEAN_TARGET)
-
-distclean: $(DISTCLEAN_TARGET)
-
-#
-# Build rules for the DLL/shlib
-#
-
-ifeq ($(TCL_SHLIB_SUFFIX),.dll)
-
-# cygwin stuff
-DLLTOOL = @DLLTOOL@
-LD = @LD@
-AS = @AS@
-NM = @NM@
-
-PLUGIN_DEFS = $(PLUGIN).def
-PLUGIN_BASE = $(PLUGIN).base
-PLUGIN_EXP = $(PLUGIN).exp
-ifeq ($(PLUGIN_DLL_ENTRY),)
-PLUGIN_DLL_ENTRY = _DllMain@12
-endif
-
-$(PLUGIN_DEFS): $(PLUGIN_OBJS)
-	echo 'EXPORTS' > tmp.def
-	-for o in $(PLUGIN_OBJS) ; do \
-	  $(NM) --extern-only --defined-only $$o | sed -e 's/[^ ]* [^ ]* //' -e 's/^_//' | fgrep -v DllMain | fgrep -v impure_ptr >> tmp.def ; \
-	done
-	mv tmp.def $(PLUGIN_DEFS)
-
-$(PLUGIN_MODULE): $(PLUGIN_OBJS) $(PLUGIN_DEFS)
-	$(LD) -s --base-file $(PLUGIN_BASE) -dll -o $(PLUGIN_MODULE) $(PLUGIN_OBJS) $(ALL_SHLIB_LIBS) $(CYGWIN_DLL_LIBS) -e $(PLUGIN_DLL_ENTRY) --image-base $(PLUGIN_IMAGE_BASE)
-	$(DLLTOOL) --as=$(AS) --dllname $(PLUGIN_MODULE) --def $(PLUGIN_DEFS) --base-file $(PLUGIN_DEFS) --output-exp $(PLUGIN_EXP)
-	$(LD) -s --base-file $(PLUGIN_BASE) $(PLUGIN_EXP) -dll -o $(PLUGIN_MODULE) $(PLUGIN_OBJS) $(ALL_SHLIB_LIBS) $(CYGWIN_DLL_LIBS) -e $(PLUGIN_DLL_ENTRY) --image-base $(PLUGIN_IMAGE_BASE)
-	$(DLLTOOL) --as=$(AS) --dllname $(PLUGIN_MODULE) --def $(PLUGIN_DEFS) --base-file $(PLUGIN_BASE) --output-exp $(PLUGIN_EXP)
-	$(LD) $(PLUGIN_EXP) -dll -o $(PLUGIN_MODULE) $(PLUGIN_OBJS) $(ALL_SHLIB_LIBS) $(CYGWIN_DLL_LIBS) -e $(PLUGIN_DLL_ENTRY) --image-base $(PLUGIN_IMAGE_BASE)
-
-else
-
-# For unixen only
-$(PLUGIN_MODULE): $(PLUGIN_OBJS)
-	$(TCL_SHLIB_LD) -o $(PLUGIN_MODULE) $(PLUGIN_OBJS) $(ALL_SHLIB_LIBS)
-
-endif
diff --git a/gdb/gdbtk/plugins/Makefile.am b/gdb/gdbtk/plugins/Makefile.am
deleted file mode 100644
index 03fabe7c4d9..00000000000
--- a/gdb/gdbtk/plugins/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-## Process this file with automake to produce Makefile.in
-
-AUTOMAKE_OPTIONS = cygnus
-SUBDIRS = @make_subdirs@
diff --git a/gdb/gdbtk/plugins/Makefile.in b/gdb/gdbtk/plugins/Makefile.in
deleted file mode 100644
index d7ae2ec6674..00000000000
--- a/gdb/gdbtk/plugins/Makefile.in
+++ /dev/null
@@ -1,395 +0,0 @@
-# Makefile.in generated automatically by automake 1.4 from Makefile.am
-
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = .
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-host_alias = @host_alias@
-host_triplet = @host@
-BFDHDIR = @BFDHDIR@
-BFDLIB = @BFDLIB@
-CC = @CC@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-DEJAGNUHDIR = @DEJAGNUHDIR@
-DEJAGNULIB = @DEJAGNULIB@
-DEVOHDIR = @DEVOHDIR@
-ENDIAN = @ENDIAN@
-EXEEXT = @EXEEXT@
-GUILIB = @GUILIB@
-HAVE_DEVO_SIM = @HAVE_DEVO_SIM@
-IDEHDIR = @IDEHDIR@
-IDELIB = @IDELIB@
-IDETCLLIB = @IDETCLLIB@
-ILUHDIR = @ILUHDIR@
-ILULIB = @ILULIB@
-ILUTOP = @ILUTOP@
-INTLHDIR = @INTLHDIR@
-INTLLIB = @INTLLIB@
-ITCLHDIR = @ITCLHDIR@
-ITCLLIB = @ITCLLIB@
-ITCLMKIDX = @ITCLMKIDX@
-ITCLSH = @ITCLSH@
-ITCL_BUILD_LIB_SPEC = @ITCL_BUILD_LIB_SPEC@
-ITCL_LIB_FILE = @ITCL_LIB_FILE@
-ITCL_LIB_FULL_PATH = @ITCL_LIB_FULL_PATH@
-ITCL_SH = @ITCL_SH@
-ITK_BUILD_LIB_SPEC = @ITK_BUILD_LIB_SPEC@
-ITK_LIB_FILE = @ITK_LIB_FILE@
-ITK_LIB_FULL_PATH = @ITK_LIB_FULL_PATH@
-LIBERTY = @LIBERTY@
-LIBGCC = @LIBGCC@
-LIBGUIHDIR = @LIBGUIHDIR@
-LIBGUILIB = @LIBGUILIB@
-LIBIBERTY = @LIBIBERTY@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-OBJEXT = @OBJEXT@
-OPCODESLIB = @OPCODESLIB@
-PACKAGE = @PACKAGE@
-RUNTESTDIR = @RUNTESTDIR@
-SIMHDIR = @SIMHDIR@
-SIMLIB = @SIMLIB@
-TCLCONFIG = @TCLCONFIG@
-TCLHDIR = @TCLHDIR@
-TCL_BIN_DIR = @TCL_BIN_DIR@
-TCL_BUILD_LIB_SPEC = @TCL_BUILD_LIB_SPEC@
-TCL_CFLAGS = @TCL_CFLAGS@
-TCL_DEFS = @TCL_DEFS@
-TCL_LD_FLAGS = @TCL_LD_FLAGS@
-TCL_LD_SEARCH_FLAGS = @TCL_LD_SEARCH_FLAGS@
-TCL_LIBS = @TCL_LIBS@
-TCL_LIB_FILE = @TCL_LIB_FILE@
-TCL_LIB_FULL_PATH = @TCL_LIB_FULL_PATH@
-TCL_LIB_SPEC = @TCL_LIB_SPEC@
-TCL_RANLIB = @TCL_RANLIB@
-TCL_SHLIB_CFLAGS = @TCL_SHLIB_CFLAGS@
-TCL_SHLIB_LD = @TCL_SHLIB_LD@
-TCL_SHLIB_SUFFIX = @TCL_SHLIB_SUFFIX@
-TIXHDIR = @TIXHDIR@
-TIX_BUILD_LIB_SPEC = @TIX_BUILD_LIB_SPEC@
-TIX_LIB_FULL_PATH = @TIX_LIB_FULL_PATH@
-TKCONFIG = @TKCONFIG@
-TKHDIR = @TKHDIR@
-TK_BUILD_INCLUDES = @TK_BUILD_INCLUDES@
-TK_BUILD_LIB_SPEC = @TK_BUILD_LIB_SPEC@
-TK_DEFS = @TK_DEFS@
-TK_LIBS = @TK_LIBS@
-TK_LIB_FILE = @TK_LIB_FILE@
-TK_LIB_FULL_PATH = @TK_LIB_FULL_PATH@
-TK_LIB_SPEC = @TK_LIB_SPEC@
-TK_VERSION = @TK_VERSION@
-TK_XINCLUDES = @TK_XINCLUDES@
-TK_XLIBSW = @TK_XLIBSW@
-VERSION = @VERSION@
-ac_cv_c_itclsh = @ac_cv_c_itclsh@
-make_subdirs = @make_subdirs@
-plugin_builddir = @plugin_builddir@
-
-AUTOMAKE_OPTIONS = cygnus
-SUBDIRS = @make_subdirs@
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/../../../mkinstalldirs
-CONFIG_CLEAN_FILES = 
-DIST_COMMON =  Makefile.am Makefile.in acinclude.m4 aclocal.m4 configure \
-configure.in
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = gtar
-GZIP_ENV = --best
-all: all-redirect
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --cygnus Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in  acinclude.m4
-	cd $(srcdir) && $(ACLOCAL)
-
-config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	$(SHELL) ./config.status --recheck
-$(srcdir)/configure: @MAINTAINER_MODE_TRUE@$(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
-	cd $(srcdir) && $(AUTOCONF)
-
-# This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-
-@SET_MAKE@
-
-all-recursive install-data-recursive install-exec-recursive \
-installdirs-recursive install-recursive uninstall-recursive install-info-recursive \
-check-recursive installcheck-recursive info-recursive dvi-recursive:
-	@set fnord $(MAKEFLAGS); amf=$$2; \
-	dot_seen=no; \
-	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    dot_seen=yes; \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-	done; \
-	if test "$$dot_seen" = "no"; then \
-	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-	fi; test -z "$$fail"
-
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
-	@set fnord $(MAKEFLAGS); amf=$$2; \
-	dot_seen=no; \
-	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
-	  rev="$$subdir $$rev"; \
-	  test "$$subdir" = "." && dot_seen=yes; \
-	done; \
-	test "$$dot_seen" = "no" && rev=". $$rev"; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-
-tags: TAGS
-
-ID: $(HEADERS) $(SOURCES) $(LISP)
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	here=`pwd` && cd $(srcdir) \
-	  && mkid -f$$here/ID $$unique $(LISP)
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-   if test "$$subdir" = .; then :; else \
-	    test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
-   fi; \
-	done; \
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
-
-mostlyclean-tags:
-
-clean-tags:
-
-distclean-tags:
-	-rm -f TAGS ID
-
-maintainer-clean-tags:
-
-distdir = $(PACKAGE)-$(VERSION)
-top_distdir = $(distdir)
-
-# This target untars the dist file and tries a VPATH configuration.  Then
-# it guarantees that the distribution is self-contained by making another
-# tarfile.
-distcheck: dist
-	-rm -rf $(distdir)
-	GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz
-	mkdir $(distdir)/=build
-	mkdir $(distdir)/=inst
-	dc_install_base=`cd $(distdir)/=inst && pwd`; \
-	cd $(distdir)/=build \
-	  && ../configure --srcdir=.. --prefix=$$dc_install_base \
-	  && $(MAKE) $(AM_MAKEFLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
-	  && $(MAKE) $(AM_MAKEFLAGS) check \
-	  && $(MAKE) $(AM_MAKEFLAGS) install \
-	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
-	  && $(MAKE) $(AM_MAKEFLAGS) dist
-	-rm -rf $(distdir)
-	@banner="$(distdir).tar.gz is ready for distribution"; \
-	dashes=`echo "$$banner" | sed s/./=/g`; \
-	echo "$$dashes"; \
-	echo "$$banner"; \
-	echo "$$dashes"
-dist: distdir
-	-chmod -R a+r $(distdir)
-	GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
-	-rm -rf $(distdir)
-dist-all: distdir
-	-chmod -R a+r $(distdir)
-	GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
-	-rm -rf $(distdir)
-distdir: $(DISTFILES)
-	-rm -rf $(distdir)
-	mkdir $(distdir)
-	-chmod 777 $(distdir)
-	@for file in $(DISTFILES); do \
-	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-	  fi; \
-	done
-	for subdir in $(SUBDIRS); do \
-	  if test "$$subdir" = .; then :; else \
-	    test -d $(distdir)/$$subdir \
-	    || mkdir $(distdir)/$$subdir \
-	    || exit 1; \
-	    chmod 777 $(distdir)/$$subdir; \
-	    (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(distdir) distdir=../$(distdir)/$$subdir distdir) \
-	      || exit 1; \
-	  fi; \
-	done
-info-am:
-info: info-recursive
-dvi-am:
-dvi: dvi-recursive
-check-am:
-check: check-recursive
-installcheck-am:
-installcheck: installcheck-recursive
-install-info-am: 
-install-info: install-info-recursive
-install-exec-am:
-install-exec: install-exec-recursive
-
-install-data-am:
-install-data: install-data-recursive
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-recursive
-uninstall-am:
-uninstall: uninstall-recursive
-all-am: Makefile
-all-redirect: all-recursive
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs: installdirs-recursive
-installdirs-am:
-
-
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-
-maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-tags mostlyclean-generic
-
-mostlyclean: mostlyclean-recursive
-
-clean-am:  clean-tags clean-generic mostlyclean-am
-
-clean: clean-recursive
-
-distclean-am:  distclean-tags distclean-generic clean-am
-
-distclean: distclean-recursive
-	-rm -f config.status
-
-maintainer-clean-am:  maintainer-clean-tags maintainer-clean-generic \
-		distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-maintainer-clean: maintainer-clean-recursive
-	-rm -f config.status
-
-.PHONY: install-data-recursive uninstall-data-recursive \
-install-exec-recursive uninstall-exec-recursive installdirs-recursive \
-uninstalldirs-recursive all-recursive check-recursive \
-installcheck-recursive info-recursive dvi-recursive \
-mostlyclean-recursive distclean-recursive clean-recursive \
-maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
-distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
-dvi-am dvi check check-am installcheck-am installcheck install-info-am \
-install-info install-exec-am install-exec install-data-am install-data \
-install-am install uninstall-am uninstall all-redirect all-am all \
-installdirs-am installdirs mostlyclean-generic distclean-generic \
-clean-generic maintainer-clean-generic clean mostlyclean distclean \
-maintainer-clean
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/gdb/gdbtk/plugins/acinclude.m4 b/gdb/gdbtk/plugins/acinclude.m4
deleted file mode 100644
index f5b22bea8aa..00000000000
--- a/gdb/gdbtk/plugins/acinclude.m4
+++ /dev/null
@@ -1 +0,0 @@
-"sinclude(../../../config/acinclude.m4)"
diff --git a/gdb/gdbtk/plugins/aclocal.m4 b/gdb/gdbtk/plugins/aclocal.m4
deleted file mode 100644
index 1b373603803..00000000000
--- a/gdb/gdbtk/plugins/aclocal.m4
+++ /dev/null
@@ -1,139 +0,0 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4
-
-dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-dnl PARTICULAR PURPOSE.
-
-"sinclude(../../../config/acinclude.m4)"
-
-# Do all the work for Automake.  This macro actually does too much --
-# some checks are only needed if your package does certain things.
-# But this isn't really a big deal.
-
-# serial 1
-
-dnl Usage:
-dnl AM_INIT_AUTOMAKE(package,version, [no-define])
-
-AC_DEFUN(AM_INIT_AUTOMAKE,
-[AC_REQUIRE([AC_PROG_INSTALL])
-PACKAGE=[$1]
-AC_SUBST(PACKAGE)
-VERSION=[$2]
-AC_SUBST(VERSION)
-dnl test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
-  AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-fi
-ifelse([$3],,
-AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
-AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package]))
-AC_REQUIRE([AM_SANITY_CHECK])
-AC_REQUIRE([AC_ARG_PROGRAM])
-dnl FIXME This is truly gross.
-missing_dir=`cd $ac_aux_dir && pwd`
-AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
-AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
-AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
-AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
-AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
-AC_REQUIRE([AC_PROG_MAKE_SET])])
-
-#
-# Check to make sure that the build environment is sane.
-#
-
-AC_DEFUN(AM_SANITY_CHECK,
-[AC_MSG_CHECKING([whether build environment is sane])
-# Just in case
-sleep 1
-echo timestamp > conftestfile
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
-   if test "[$]*" = "X"; then
-      # -L didn't work.
-      set X `ls -t $srcdir/configure conftestfile`
-   fi
-   if test "[$]*" != "X $srcdir/configure conftestfile" \
-      && test "[$]*" != "X conftestfile $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
-alias in your environment])
-   fi
-
-   test "[$]2" = conftestfile
-   )
-then
-   # Ok.
-   :
-else
-   AC_MSG_ERROR([newly created file is older than distributed files!
-Check your system clock])
-fi
-rm -f conftest*
-AC_MSG_RESULT(yes)])
-
-dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
-dnl The program must properly implement --version.
-AC_DEFUN(AM_MISSING_PROG,
-[AC_MSG_CHECKING(for working $2)
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if ($2 --version) < /dev/null > /dev/null 2>&1; then
-   $1=$2
-   AC_MSG_RESULT(found)
-else
-   $1="$3/missing $2"
-   AC_MSG_RESULT(missing)
-fi
-AC_SUBST($1)])
-
-# Add --enable-maintainer-mode option to configure.
-# From Jim Meyering
-
-# serial 1
-
-AC_DEFUN(AM_MAINTAINER_MODE,
-[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
-  dnl maintainer-mode is disabled by default
-  AC_ARG_ENABLE(maintainer-mode,
-[  --enable-maintainer-mode enable make rules and dependencies not useful
-                          (and sometimes confusing) to the casual installer],
-      USE_MAINTAINER_MODE=$enableval,
-      USE_MAINTAINER_MODE=no)
-  AC_MSG_RESULT($USE_MAINTAINER_MODE)
-  AM_CONDITIONAL(MAINTAINER_MODE, test $USE_MAINTAINER_MODE = yes)
-  MAINT=$MAINTAINER_MODE_TRUE
-  AC_SUBST(MAINT)dnl
-]
-)
-
-# Define a conditional.
-
-AC_DEFUN(AM_CONDITIONAL,
-[AC_SUBST($1_TRUE)
-AC_SUBST($1_FALSE)
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi])
-
diff --git a/gdb/gdbtk/plugins/configure b/gdb/gdbtk/plugins/configure
deleted file mode 100755
index d4d17a74c14..00000000000
--- a/gdb/gdbtk/plugins/configure
+++ /dev/null
@@ -1,2368 +0,0 @@
-#! /bin/sh
-
-# Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.13 
-# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
-#
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-
-# Defaults:
-ac_help=
-ac_default_prefix=/usr/local
-# Any additions from configure.in:
-ac_help="$ac_help
-  --enable-maintainer-mode enable make rules and dependencies not useful
-                          (and sometimes confusing) to the casual installer"
-ac_help="$ac_help
-  --with-tclconfig           directory containing tcl configuration (tclConfig.sh)"
-ac_help="$ac_help
-  --with-tkconfig           directory containing tk configuration (tkConfig.sh)"
-ac_help="$ac_help
-  --with-tclinclude       directory where tcl headers are"
-ac_help="$ac_help
-  --with-tkinclude       directory where tk headers are"
-
-# Initialize some variables set by options.
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-build=NONE
-cache_file=./config.cache
-exec_prefix=NONE
-host=NONE
-no_create=
-nonopt=NONE
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-sitefile=
-srcdir=
-target=NONE
-verbose=
-x_includes=NONE
-x_libraries=NONE
-bindir='${exec_prefix}/bin'
-sbindir='${exec_prefix}/sbin'
-libexecdir='${exec_prefix}/libexec'
-datadir='${prefix}/share'
-sysconfdir='${prefix}/etc'
-sharedstatedir='${prefix}/com'
-localstatedir='${prefix}/var'
-libdir='${exec_prefix}/lib'
-includedir='${prefix}/include'
-oldincludedir='/usr/include'
-infodir='${prefix}/info'
-mandir='${prefix}/man'
-
-# Initialize some other variables.
-subdirs=
-MFLAGS= MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
-# Maximum number of lines to put in a shell here document.
-ac_max_here_lines=12
-
-ac_prev=
-for ac_option
-do
-
-  # If the previous option needs an argument, assign it.
-  if test -n "$ac_prev"; then
-    eval "$ac_prev=\$ac_option"
-    ac_prev=
-    continue
-  fi
-
-  case "$ac_option" in
-  -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-  *) ac_optarg= ;;
-  esac
-
-  # Accept the important Cygnus configure options, so we can diagnose typos.
-
-  case "$ac_option" in
-
-  -bindir | --bindir | --bindi | --bind | --bin | --bi)
-    ac_prev=bindir ;;
-  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-    bindir="$ac_optarg" ;;
-
-  -build | --build | --buil | --bui | --bu)
-    ac_prev=build ;;
-  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build="$ac_optarg" ;;
-
-  -cache-file | --cache-file | --cache-fil | --cache-fi \
-  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-    ac_prev=cache_file ;;
-  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-    cache_file="$ac_optarg" ;;
-
-  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
-    ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
-  | --da=*)
-    datadir="$ac_optarg" ;;
-
-  -disable-* | --disable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*disable-//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    eval "enable_${ac_feature}=no" ;;
-
-  -enable-* | --enable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=*) ;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "enable_${ac_feature}='$ac_optarg'" ;;
-
-  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-  | --exec | --exe | --ex)
-    ac_prev=exec_prefix ;;
-  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
-  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
-  | --exec=* | --exe=* | --ex=*)
-    exec_prefix="$ac_optarg" ;;
-
-  -gas | --gas | --ga | --g)
-    # Obsolete; use --with-gas.
-    with_gas=yes ;;
-
-  -help | --help | --hel | --he)
-    # Omit some internal or obsolete options to make the list less imposing.
-    # This message is too long to be a string in the A/UX 3.1 sh.
-    cat << EOF
-Usage: configure [options] [host]
-Options: [defaults in brackets after descriptions]
-Configuration:
-  --cache-file=FILE       cache test results in FILE
-  --help                  print this message
-  --no-create             do not create output files
-  --quiet, --silent       do not print \`checking...' messages
-  --site-file=FILE        use FILE as the site file
-  --version               print the version of autoconf that created configure
-Directory and file names:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-                          [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-                          [same as prefix]
-  --bindir=DIR            user executables in DIR [EPREFIX/bin]
-  --sbindir=DIR           system admin executables in DIR [EPREFIX/sbin]
-  --libexecdir=DIR        program executables in DIR [EPREFIX/libexec]
-  --datadir=DIR           read-only architecture-independent data in DIR
-                          [PREFIX/share]
-  --sysconfdir=DIR        read-only single-machine data in DIR [PREFIX/etc]
-  --sharedstatedir=DIR    modifiable architecture-independent data in DIR
-                          [PREFIX/com]
-  --localstatedir=DIR     modifiable single-machine data in DIR [PREFIX/var]
-  --libdir=DIR            object code libraries in DIR [EPREFIX/lib]
-  --includedir=DIR        C header files in DIR [PREFIX/include]
-  --oldincludedir=DIR     C header files for non-gcc in DIR [/usr/include]
-  --infodir=DIR           info documentation in DIR [PREFIX/info]
-  --mandir=DIR            man documentation in DIR [PREFIX/man]
-  --srcdir=DIR            find the sources in DIR [configure dir or ..]
-  --program-prefix=PREFIX prepend PREFIX to installed program names
-  --program-suffix=SUFFIX append SUFFIX to installed program names
-  --program-transform-name=PROGRAM
-                          run sed PROGRAM on installed program names
-EOF
-    cat << EOF
-Host type:
-  --build=BUILD           configure for building on BUILD [BUILD=HOST]
-  --host=HOST             configure for HOST [guessed]
-  --target=TARGET         configure for TARGET [TARGET=HOST]
-Features and packages:
-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --x-includes=DIR        X include files are in DIR
-  --x-libraries=DIR       X library files are in DIR
-EOF
-    if test -n "$ac_help"; then
-      echo "--enable and --with options recognized:$ac_help"
-    fi
-    exit 0 ;;
-
-  -host | --host | --hos | --ho)
-    ac_prev=host ;;
-  -host=* | --host=* | --hos=* | --ho=*)
-    host="$ac_optarg" ;;
-
-  -includedir | --includedir | --includedi | --included | --include \
-  | --includ | --inclu | --incl | --inc)
-    ac_prev=includedir ;;
-  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
-  | --includ=* | --inclu=* | --incl=* | --inc=*)
-    includedir="$ac_optarg" ;;
-
-  -infodir | --infodir | --infodi | --infod | --info | --inf)
-    ac_prev=infodir ;;
-  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-    infodir="$ac_optarg" ;;
-
-  -libdir | --libdir | --libdi | --libd)
-    ac_prev=libdir ;;
-  -libdir=* | --libdir=* | --libdi=* | --libd=*)
-    libdir="$ac_optarg" ;;
-
-  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
-  | --libexe | --libex | --libe)
-    ac_prev=libexecdir ;;
-  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
-  | --libexe=* | --libex=* | --libe=*)
-    libexecdir="$ac_optarg" ;;
-
-  -localstatedir | --localstatedir | --localstatedi | --localstated \
-  | --localstate | --localstat | --localsta | --localst \
-  | --locals | --local | --loca | --loc | --lo)
-    ac_prev=localstatedir ;;
-  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-  | --localstate=* | --localstat=* | --localsta=* | --localst=* \
-  | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
-    localstatedir="$ac_optarg" ;;
-
-  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-    ac_prev=mandir ;;
-  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-    mandir="$ac_optarg" ;;
-
-  -nfp | --nfp | --nf)
-    # Obsolete; use --without-fp.
-    with_fp=no ;;
-
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c)
-    no_create=yes ;;
-
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
-    no_recursion=yes ;;
-
-  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
-  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
-  | --oldin | --oldi | --old | --ol | --o)
-    ac_prev=oldincludedir ;;
-  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
-  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
-  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-    oldincludedir="$ac_optarg" ;;
-
-  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-    ac_prev=prefix ;;
-  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-    prefix="$ac_optarg" ;;
-
-  -program-prefix | --program-prefix | --program-prefi | --program-pref \
-  | --program-pre | --program-pr | --program-p)
-    ac_prev=program_prefix ;;
-  -program-prefix=* | --program-prefix=* | --program-prefi=* \
-  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-    program_prefix="$ac_optarg" ;;
-
-  -program-suffix | --program-suffix | --program-suffi | --program-suff \
-  | --program-suf | --program-su | --program-s)
-    ac_prev=program_suffix ;;
-  -program-suffix=* | --program-suffix=* | --program-suffi=* \
-  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-    program_suffix="$ac_optarg" ;;
-
-  -program-transform-name | --program-transform-name \
-  | --program-transform-nam | --program-transform-na \
-  | --program-transform-n | --program-transform- \
-  | --program-transform | --program-transfor \
-  | --program-transfo | --program-transf \
-  | --program-trans | --program-tran \
-  | --progr-tra | --program-tr | --program-t)
-    ac_prev=program_transform_name ;;
-  -program-transform-name=* | --program-transform-name=* \
-  | --program-transform-nam=* | --program-transform-na=* \
-  | --program-transform-n=* | --program-transform-=* \
-  | --program-transform=* | --program-transfor=* \
-  | --program-transfo=* | --program-transf=* \
-  | --program-trans=* | --program-tran=* \
-  | --progr-tra=* | --program-tr=* | --program-t=*)
-    program_transform_name="$ac_optarg" ;;
-
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil)
-    silent=yes ;;
-
-  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
-    ac_prev=sbindir ;;
-  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-  | --sbi=* | --sb=*)
-    sbindir="$ac_optarg" ;;
-
-  -sharedstatedir | --sharedstatedir | --sharedstatedi \
-  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
-  | --sharedst | --shareds | --shared | --share | --shar \
-  | --sha | --sh)
-    ac_prev=sharedstatedir ;;
-  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
-  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
-  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
-  | --sha=* | --sh=*)
-    sharedstatedir="$ac_optarg" ;;
-
-  -site | --site | --sit)
-    ac_prev=site ;;
-  -site=* | --site=* | --sit=*)
-    site="$ac_optarg" ;;
-
-  -site-file | --site-file | --site-fil | --site-fi | --site-f)
-    ac_prev=sitefile ;;
-  -site-file=* | --site-file=* | --site-fil=* | --site-fi=* | --site-f=*)
-    sitefile="$ac_optarg" ;;
-
-  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-    ac_prev=srcdir ;;
-  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-    srcdir="$ac_optarg" ;;
-
-  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
-  | --syscon | --sysco | --sysc | --sys | --sy)
-    ac_prev=sysconfdir ;;
-  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
-  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-    sysconfdir="$ac_optarg" ;;
-
-  -target | --target | --targe | --targ | --tar | --ta | --t)
-    ac_prev=target ;;
-  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target="$ac_optarg" ;;
-
-  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-    verbose=yes ;;
-
-  -version | --version | --versio | --versi | --vers)
-    echo "configure generated by autoconf version 2.13"
-    exit 0 ;;
-
-  -with-* | --with-*)
-    ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=*) ;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "with_${ac_package}='$ac_optarg'" ;;
-
-  -without-* | --without-*)
-    ac_package=`echo $ac_option|sed -e 's/-*without-//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    eval "with_${ac_package}=no" ;;
-
-  --x)
-    # Obsolete; use --with-x.
-    with_x=yes ;;
-
-  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
-  | --x-incl | --x-inc | --x-in | --x-i)
-    ac_prev=x_includes ;;
-  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
-  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-    x_includes="$ac_optarg" ;;
-
-  -x-libraries | --x-libraries | --x-librarie | --x-librari \
-  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
-    ac_prev=x_libraries ;;
-  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
-  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-    x_libraries="$ac_optarg" ;;
-
-  -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
-    ;;
-
-  *)
-    if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
-      echo "configure: warning: $ac_option: invalid host type" 1>&2
-    fi
-    if test "x$nonopt" != xNONE; then
-      { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
-    fi
-    nonopt="$ac_option"
-    ;;
-
-  esac
-done
-
-if test -n "$ac_prev"; then
-  { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; }
-fi
-
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-# File descriptor usage:
-# 0 standard input
-# 1 file creation
-# 2 errors and warnings
-# 3 some systems may open it to /dev/tty
-# 4 used on the Kubota Titan
-# 6 checking for... messages and results
-# 5 compiler messages saved in config.log
-if test "$silent" = yes; then
-  exec 6>/dev/null
-else
-  exec 6>&1
-fi
-exec 5>./config.log
-
-echo "\
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-" 1>&5
-
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Also quote any args containing shell metacharacters.
-ac_configure_args=
-for ac_arg
-do
-  case "$ac_arg" in
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c) ;;
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;;
-  *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*)
-  ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-  *) ac_configure_args="$ac_configure_args $ac_arg" ;;
-  esac
-done
-
-# NLS nuisances.
-# Only set these to C if already set.  These must not be set unconditionally
-# because not all systems understand e.g. LANG=C (notably SCO).
-# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
-# Non-C LC_CTYPE values break the ctype check.
-if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
-if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
-if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
-if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
-
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -rf conftest* confdefs.h
-# AIX cpp loses on an empty file, so make sure it contains at least a newline.
-echo > confdefs.h
-
-# A filename unique to this package, relative to the directory that
-# configure is in, which we can look for to find out if srcdir is correct.
-ac_unique_file=Make-rules
-
-# Find the source files, if location was not specified.
-if test -z "$srcdir"; then
-  ac_srcdir_defaulted=yes
-  # Try the directory containing this script, then its parent.
-  ac_prog=$0
-  ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'`
-  test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
-  srcdir=$ac_confdir
-  if test ! -r $srcdir/$ac_unique_file; then
-    srcdir=..
-  fi
-else
-  ac_srcdir_defaulted=no
-fi
-if test ! -r $srcdir/$ac_unique_file; then
-  if test "$ac_srcdir_defaulted" = yes; then
-    { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; }
-  else
-    { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; }
-  fi
-fi
-srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
-
-# Prefer explicitly selected file to automatically selected ones.
-if test -z "$sitefile"; then
-  if test -z "$CONFIG_SITE"; then
-    if test "x$prefix" != xNONE; then
-      CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-    else
-      CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
-    fi
-  fi
-else
-  CONFIG_SITE="$sitefile"
-fi
-for ac_site_file in $CONFIG_SITE; do
-  if test -r "$ac_site_file"; then
-    echo "loading site script $ac_site_file"
-    . "$ac_site_file"
-  fi
-done
-
-if test -r "$cache_file"; then
-  echo "loading cache $cache_file"
-  . $cache_file
-else
-  echo "creating cache $cache_file"
-  > $cache_file
-fi
-
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-ac_exeext=
-ac_objext=o
-if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
-  # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
-  if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
-    ac_n= ac_c='
-' ac_t='	'
-  else
-    ac_n=-n ac_c= ac_t=
-  fi
-else
-  ac_n= ac_c='\c' ac_t=
-fi
-
-
-ac_aux_dir=
-for ac_dir in ../../.. $srcdir/../../..; do
-  if test -f $ac_dir/install-sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f $ac_dir/install.sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  { echo "configure: error: can not find install-sh or install.sh in ../../.. $srcdir/../../.." 1>&2; exit 1; }
-fi
-ac_config_guess=$ac_aux_dir/config.guess
-ac_config_sub=$ac_aux_dir/config.sub
-ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
-
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# ./install, which can be erroneously created by make from ./install.sh.
-echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:578: checking for a BSD compatible install" >&5
-if test -z "$INSTALL"; then
-if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
-  for ac_dir in $PATH; do
-    # Account for people who put trailing slashes in PATH elements.
-    case "$ac_dir/" in
-    /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
-    *)
-      # OSF1 and SCO ODT 3.0 have their own names for install.
-      # Don't use installbsd from OSF since it installs stuff as root
-      # by default.
-      for ac_prog in ginstall scoinst install; do
-        if test -f $ac_dir/$ac_prog; then
-	  if test $ac_prog = install &&
-            grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  else
-	    ac_cv_path_install="$ac_dir/$ac_prog -c"
-	    break 2
-	  fi
-	fi
-      done
-      ;;
-    esac
-  done
-  IFS="$ac_save_IFS"
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL="$ac_cv_path_install"
-  else
-    # As a last resort, use the slow shell script.  We don't cache a
-    # path for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the path is relative.
-    INSTALL="$ac_install_sh"
-  fi
-fi
-echo "$ac_t""$INSTALL" 1>&6
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
-echo "configure:631: checking whether build environment is sane" >&5
-# Just in case
-sleep 1
-echo timestamp > conftestfile
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
-   if test "$*" = "X"; then
-      # -L didn't work.
-      set X `ls -t $srcdir/configure conftestfile`
-   fi
-   if test "$*" != "X $srcdir/configure conftestfile" \
-      && test "$*" != "X conftestfile $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      { echo "configure: error: ls -t appears to fail.  Make sure there is not a broken
-alias in your environment" 1>&2; exit 1; }
-   fi
-
-   test "$2" = conftestfile
-   )
-then
-   # Ok.
-   :
-else
-   { echo "configure: error: newly created file is older than distributed files!
-Check your system clock" 1>&2; exit 1; }
-fi
-rm -f conftest*
-echo "$ac_t""yes" 1>&6
-if test "$program_transform_name" = s,x,x,; then
-  program_transform_name=
-else
-  # Double any \ or $.  echo might interpret backslashes.
-  cat <<\EOF_SED > conftestsed
-s,\\,\\\\,g; s,\$,$$,g
-EOF_SED
-  program_transform_name="`echo $program_transform_name|sed -f conftestsed`"
-  rm -f conftestsed
-fi
-test "$program_prefix" != NONE &&
-  program_transform_name="s,^,${program_prefix},; $program_transform_name"
-# Use a double $ so make ignores it.
-test "$program_suffix" != NONE &&
-  program_transform_name="s,\$\$,${program_suffix},; $program_transform_name"
-
-# sed with no file args requires a program.
-test "$program_transform_name" = "" && program_transform_name="s,x,x,"
-
-echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:688: checking whether ${MAKE-make} sets \${MAKE}" >&5
-set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftestmake <<\EOF
-all:
-	@echo 'ac_maketemp="${MAKE}"'
-EOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=`
-if test -n "$ac_maketemp"; then
-  eval ac_cv_prog_make_${ac_make}_set=yes
-else
-  eval ac_cv_prog_make_${ac_make}_set=no
-fi
-rm -f conftestmake
-fi
-if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  SET_MAKE=
-else
-  echo "$ac_t""no" 1>&6
-  SET_MAKE="MAKE=${MAKE-make}"
-fi
-
-
-PACKAGE=insight
-
-VERSION=1.0
-
-if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
-  { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
-fi
-cat >> confdefs.h <<EOF
-#define PACKAGE "$PACKAGE"
-EOF
-
-cat >> confdefs.h <<EOF
-#define VERSION "$VERSION"
-EOF
-
-
-
-missing_dir=`cd $ac_aux_dir && pwd`
-echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
-echo "configure:734: checking for working aclocal" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (aclocal --version) < /dev/null > /dev/null 2>&1; then
-   ACLOCAL=aclocal
-   echo "$ac_t""found" 1>&6
-else
-   ACLOCAL="$missing_dir/missing aclocal"
-   echo "$ac_t""missing" 1>&6
-fi
-
-echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-echo "configure:747: checking for working autoconf" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (autoconf --version) < /dev/null > /dev/null 2>&1; then
-   AUTOCONF=autoconf
-   echo "$ac_t""found" 1>&6
-else
-   AUTOCONF="$missing_dir/missing autoconf"
-   echo "$ac_t""missing" 1>&6
-fi
-
-echo $ac_n "checking for working automake""... $ac_c" 1>&6
-echo "configure:760: checking for working automake" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (automake --version) < /dev/null > /dev/null 2>&1; then
-   AUTOMAKE=automake
-   echo "$ac_t""found" 1>&6
-else
-   AUTOMAKE="$missing_dir/missing automake"
-   echo "$ac_t""missing" 1>&6
-fi
-
-echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-echo "configure:773: checking for working autoheader" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (autoheader --version) < /dev/null > /dev/null 2>&1; then
-   AUTOHEADER=autoheader
-   echo "$ac_t""found" 1>&6
-else
-   AUTOHEADER="$missing_dir/missing autoheader"
-   echo "$ac_t""missing" 1>&6
-fi
-
-echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
-echo "configure:786: checking for working makeinfo" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (makeinfo --version) < /dev/null > /dev/null 2>&1; then
-   MAKEINFO=makeinfo
-   echo "$ac_t""found" 1>&6
-else
-   MAKEINFO="$missing_dir/missing makeinfo"
-   echo "$ac_t""missing" 1>&6
-fi
-
-
-echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:800: checking whether to enable maintainer-specific portions of Makefiles" >&5
-    # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
-if test "${enable_maintainer_mode+set}" = set; then
-  enableval="$enable_maintainer_mode"
-  USE_MAINTAINER_MODE=$enableval
-else
-  USE_MAINTAINER_MODE=no
-fi
-
-  echo "$ac_t""$USE_MAINTAINER_MODE" 1>&6
-  
-
-if test $USE_MAINTAINER_MODE = yes; then
-  MAINTAINER_MODE_TRUE=
-  MAINTAINER_MODE_FALSE='#'
-else
-  MAINTAINER_MODE_TRUE='#'
-  MAINTAINER_MODE_FALSE=
-fi
-  MAINT=$MAINTAINER_MODE_TRUE
-  
-
-echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:823: checking whether ${MAKE-make} sets \${MAKE}" >&5
-set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftestmake <<\EOF
-all:
-	@echo 'ac_maketemp="${MAKE}"'
-EOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=`
-if test -n "$ac_maketemp"; then
-  eval ac_cv_prog_make_${ac_make}_set=yes
-else
-  eval ac_cv_prog_make_${ac_make}_set=no
-fi
-rm -f conftestmake
-fi
-if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  SET_MAKE=
-else
-  echo "$ac_t""no" 1>&6
-  SET_MAKE="MAKE=${MAKE-make}"
-fi
-
-
-# Make sure we can run config.sub.
-if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
-else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:856: checking host system type" >&5
-
-host_alias=$host
-case "$host_alias" in
-NONE)
-  case $nonopt in
-  NONE)
-    if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then :
-    else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
-    fi ;;
-  *) host_alias=$nonopt ;;
-  esac ;;
-esac
-
-host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias`
-host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$host" 1>&6
-
-# Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:879: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CC="gcc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:909: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_prog_rejected=no
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
-        ac_prog_rejected=yes
-	continue
-      fi
-      ac_cv_prog_CC="cc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# -gt 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    set dummy "$ac_dir/$ac_word" "$@"
-    shift
-    ac_cv_prog_CC="$@"
-  fi
-fi
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-  if test -z "$CC"; then
-    case "`uname -s`" in
-    *win32* | *WIN32*)
-      # Extract the first word of "cl", so it can be a program name with args.
-set dummy cl; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:960: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CC="cl"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
- ;;
-    esac
-  fi
-  test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:992: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
-
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-cat > conftest.$ac_ext << EOF
-
-#line 1003 "configure"
-#include "confdefs.h"
-
-main(){return(0);}
-EOF
-if { (eval echo configure:1008: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  ac_cv_prog_cc_works=yes
-  # If we can't run a trivial program, we are probably using a cross compiler.
-  if (./conftest; exit) 2>/dev/null; then
-    ac_cv_prog_cc_cross=no
-  else
-    ac_cv_prog_cc_cross=yes
-  fi
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  ac_cv_prog_cc_works=no
-fi
-rm -fr conftest*
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
-if test $ac_cv_prog_cc_works = no; then
-  { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
-fi
-echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1034: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
-echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
-cross_compiling=$ac_cv_prog_cc_cross
-
-echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1039: checking whether we are using GNU C" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.c <<EOF
-#ifdef __GNUC__
-  yes;
-#endif
-EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1048: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-  ac_cv_prog_gcc=yes
-else
-  ac_cv_prog_gcc=no
-fi
-fi
-
-echo "$ac_t""$ac_cv_prog_gcc" 1>&6
-
-if test $ac_cv_prog_gcc = yes; then
-  GCC=yes
-else
-  GCC=
-fi
-
-ac_test_CFLAGS="${CFLAGS+set}"
-ac_save_CFLAGS="$CFLAGS"
-CFLAGS=
-echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1067: checking whether ${CC-cc} accepts -g" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  echo 'void f(){}' > conftest.c
-if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
-  ac_cv_prog_cc_g=yes
-else
-  ac_cv_prog_cc_g=no
-fi
-rm -f conftest*
-
-fi
-
-echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
-if test "$ac_test_CFLAGS" = set; then
-  CFLAGS="$ac_save_CFLAGS"
-elif test $ac_cv_prog_cc_g = yes; then
-  if test "$GCC" = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-g"
-  fi
-else
-  if test "$GCC" = yes; then
-    CFLAGS="-O2"
-  else
-    CFLAGS=
-  fi
-fi
-
-echo $ac_n "checking for object suffix""... $ac_c" 1>&6
-echo "configure:1099: checking for object suffix" >&5
-if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  rm -f conftest*
-echo 'int i = 1;' > conftest.$ac_ext
-if { (eval echo configure:1105: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  for ac_file in conftest.*; do
-    case $ac_file in
-    *.c) ;;
-    *) ac_cv_objext=`echo $ac_file | sed -e s/conftest.//` ;;
-    esac
-  done
-else
-  { echo "configure: error: installation or configuration problem; compiler does not work" 1>&2; exit 1; }
-fi
-rm -f conftest*
-fi
-
-echo "$ac_t""$ac_cv_objext" 1>&6
-OBJEXT=$ac_cv_objext
-ac_objext=$ac_cv_objext
-
-echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
-echo "configure:1123: checking for Cygwin environment" >&5
-if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 1128 "configure"
-#include "confdefs.h"
-
-int main() {
-
-#ifndef __CYGWIN__
-#define __CYGWIN__ __CYGWIN32__
-#endif
-return __CYGWIN__;
-; return 0; }
-EOF
-if { (eval echo configure:1139: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  ac_cv_cygwin=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_cygwin=no
-fi
-rm -f conftest*
-rm -f conftest*
-fi
-
-echo "$ac_t""$ac_cv_cygwin" 1>&6
-CYGWIN=
-test "$ac_cv_cygwin" = yes && CYGWIN=yes
-echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
-echo "configure:1156: checking for mingw32 environment" >&5
-if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 1161 "configure"
-#include "confdefs.h"
-
-int main() {
-return __MINGW32__;
-; return 0; }
-EOF
-if { (eval echo configure:1168: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  ac_cv_mingw32=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_mingw32=no
-fi
-rm -f conftest*
-rm -f conftest*
-fi
-
-echo "$ac_t""$ac_cv_mingw32" 1>&6
-MINGW32=
-test "$ac_cv_mingw32" = yes && MINGW32=yes
-
-
-echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1187: checking for executable suffix" >&5
-if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test "$CYGWIN" = yes || test "$MINGW32" = yes; then
-  ac_cv_exeext=.exe
-else
-  rm -f conftest*
-  echo 'int main () { return 0; }' > conftest.$ac_ext
-  ac_cv_exeext=
-  if { (eval echo configure:1197: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
-    for file in conftest.*; do
-      case $file in
-      *.c | *.o | *.obj | *.ilk | *.pdb) ;;
-      *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
-      esac
-    done
-  else
-    { echo "configure: error: installation or configuration problem: compiler cannot create executables." 1>&2; exit 1; }
-  fi
-  rm -f conftest*
-  test x"${ac_cv_exeext}" = x && ac_cv_exeext=no
-fi
-fi
-
-EXEEXT=""
-test x"${ac_cv_exeext}" != xno && EXEEXT=${ac_cv_exeext}
-echo "$ac_t""${ac_cv_exeext}" 1>&6
-ac_exeext=$EXEEXT
-
-
-# Find Tcl, Tk, etc
-
-dirlist=".. ../../ ../../../ ../../../../ ../../../../../ ../../../../../../ ../../../../../../.. ../../../../../../../.. ../../../../../../../../.. ../../../../../../../../../.."
-if test x"${no_tcl}" = x ; then
-      no_tcl=true
-    # Check whether --with-tclconfig or --without-tclconfig was given.
-if test "${with_tclconfig+set}" = set; then
-  withval="$with_tclconfig"
-  with_tclconfig=${withval}
-fi
-
-    echo $ac_n "checking for Tcl configuration script""... $ac_c" 1>&6
-echo "configure:1230: checking for Tcl configuration script" >&5
-    if eval "test \"`echo '$''{'ac_cv_c_tclconfig'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-
-        if test x"${with_tclconfig}" != x ; then
-        if test -f "${with_tclconfig}/tclConfig.sh" ; then
-            ac_cv_c_tclconfig=`(cd ${with_tclconfig}; ${PWDCMD-pwd})`
-        else
-            { echo "configure: error: ${with_tclconfig} directory doesn't contain tclConfig.sh" 1>&2; exit 1; }
-        fi
-    fi
-
-        if test x"${ac_cv_c_tclconfig}" = x ; then
-        for i in $dirlist; do
-                                                if test -f $srcdir/$i/unix/tclConfig.sh ; then
-                ac_cv_c_tclconfig=`(cd $srcdir/$i/unix; ${PWDCMD-pwd})`
-	        break
-            fi
-            if test -f $srcdir/$i/win/tclConfig.sh ; then
-                ac_cv_c_tclconfig=`(cd $srcdir/$i/win; ${PWDCMD-pwd})`
-	        break
-            fi
-        done
-    fi
-        if test x"${ac_cv_c_tclconfig}" = x ; then
-                for i in $dirlist; do
-            if test -n "`ls -dr $i/tcl* 2>/dev/null`" ; then
-	        tclconfpath=$i
-	        break
-	    fi
-        done
-
-                        for i in `ls -dr $tclconfpath/tcl* 2>/dev/null ` ; do
-                                                if test -f $i/unix/tclConfig.sh ; then
-                ac_cv_c_tclconfig=`(cd $i/unix; ${PWDCMD-pwd})`
-                break
-            fi
-            if test -f $i/win/tclConfig.sh ; then
-                ac_cv_c_tclconfig=`(cd $i/win; ${PWDCMD-pwd})`
-                break
-            fi
-        done
-    fi
-
-            if test x"${ac_cv_c_tclconfig}" = x ; then
-        	ccpath=`which ${CC}  | sed -e 's:/bin/.*::'`/lib
-        if test -f $ccpath/tclConfig.sh; then
-	    ac_cv_c_tclconfig=$ccpath
-        fi
-    fi
-    
-fi
-	
-    if test x"${ac_cv_c_tclconfig}" = x ; then
-        TCLCONFIG=""
-        echo "configure: warning: Can't find Tcl configuration definitions" 1>&2
-    else
-        no_tcl=""
-        TCLCONFIG=${ac_cv_c_tclconfig}/tclConfig.sh
-        echo "$ac_t""${TCLCONFIG}" 1>&6
-     fi
-fi
-
-
-
-    . $TCLCONFIG
-
-    
-
-    
-    
-    
-
-    
-
-
-    
-    
-    
-    
-    
-    
-    
-    
-
-
-
-
-dirlist=".. ../../ ../../../ ../../../../ ../../../../../ ../../../../../../ ../../../../../../.. ../../../../../../../.. ../../../../../../../../.. ../../../../../../../../../.."
-if test x"${no_tk}" = x ; then
-      no_tk=true
-    # Check whether --with-tkconfig or --without-tkconfig was given.
-if test "${with_tkconfig+set}" = set; then
-  withval="$with_tkconfig"
-  with_tkconfig=${withval}
-fi
-
-    echo $ac_n "checking for Tk configuration script""... $ac_c" 1>&6
-echo "configure:1330: checking for Tk configuration script" >&5
-    if eval "test \"`echo '$''{'ac_cv_c_tkconfig'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-
-        if test x"${with_tkconfig}" != x ; then
-        if test -f "${with_tkconfig}/tkConfig.sh" ; then
-            ac_cv_c_tkconfig=`(cd ${with_tkconfig}; ${PWDCMD-pwd})`
-        else
-            { echo "configure: error: ${with_tkconfig} directory doesn't contain tkConfig.sh" 1>&2; exit 1; }
-        fi
-    fi
-
-        if test x"${ac_cv_c_tkconfig}" = x ; then
-        for i in $dirlist; do
-                                                if test -f $srcdir/$i/unix/tkConfig.sh ; then
-                ac_cv_c_tkconfig=`(cd $srcdir/$i/unix; ${PWDCMD-pwd})`
-	        break
-            fi
-            if test -f $srcdir/$i/win/tkConfig.sh ; then
-                ac_cv_c_tkconfig=`(cd $srcdir/$i/unix; ${PWDCMD-pwd})`
-	        break
-            fi
-        done
-    fi
-        if test x"${ac_cv_c_tkconfig}" = x ; then
-                for i in $dirlist; do
-            if test -n "`ls -dr $i/tk* 2>/dev/null`" ; then
-	        tkconfpath=$i
-	        break
-	    fi
-        done
-
-                        for i in `ls -dr $tkconfpath/tk* 2>/dev/null ` ; do
-                                                if test -f $i/unix/tkConfig.sh ; then
-                ac_cv_c_tkconfig=`(cd $i/unix; ${PWDCMD-pwd})`
-                break
-            fi
-            if test -f $i/win/tkConfig.sh ; then
-                ac_cv_c_tkconfig=`(cd $i/win; ${PWDCMD-pwd})`
-                break
-            fi
-        done
-    fi
-
-            if test x"${ac_cv_c_tkconfig}" = x ; then
-        	ccpath=`which ${CC}  | sed -e 's:/bin/.*::'`/lib
-        if test -f $ccpath/tkConfig.sh; then
-	    ac_cv_c_tkconfig=$ccpath
-        fi
-    fi
-    
-fi
-	
-    if test x"${ac_cv_c_tkconfig}" = x ; then
-        TKCONFIG=""
-        echo "configure: warning: Can't find Tk configuration definitions" 1>&2
-    else
-        no_tk=""
-        TKCONFIG=${ac_cv_c_tkconfig}/tkConfig.sh
-        echo "$ac_t""${TKCONFIG}" 1>&6
-     fi
-fi
-
-
-
-    if test -f "$TKCONFIG" ; then
-      . $TKCONFIG
-    fi
-
-    
-    
-
-    
-    
-    
-
-    
-    
-    
-    
-    
-
-echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:1415: checking how to run the C preprocessor" >&5
-# On Suns, sometimes $CPP names a directory.
-if test -n "$CPP" && test -d "$CPP"; then
-  CPP=
-fi
-if test -z "$CPP"; then
-if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-    # This must be in double quotes, not single quotes, because CPP may get
-  # substituted into the Makefile and "${CC-cc}" will confuse make.
-  CPP="${CC-cc} -E"
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp.
-  cat > conftest.$ac_ext <<EOF
-#line 1430 "configure"
-#include "confdefs.h"
-#include <assert.h>
-Syntax Error
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1436: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  :
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  CPP="${CC-cc} -E -traditional-cpp"
-  cat > conftest.$ac_ext <<EOF
-#line 1447 "configure"
-#include "confdefs.h"
-#include <assert.h>
-Syntax Error
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1453: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  :
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  CPP="${CC-cc} -nologo -E"
-  cat > conftest.$ac_ext <<EOF
-#line 1464 "configure"
-#include "confdefs.h"
-#include <assert.h>
-Syntax Error
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1470: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  :
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  CPP=/lib/cpp
-fi
-rm -f conftest*
-fi
-rm -f conftest*
-fi
-rm -f conftest*
-  ac_cv_prog_CPP="$CPP"
-fi
-  CPP="$ac_cv_prog_CPP"
-else
-  ac_cv_prog_CPP="$CPP"
-fi
-echo "$ac_t""$CPP" 1>&6
-
-
-dirlist=".. ../../ ../../../ ../../../../ ../../../../../ ../../../../../../ ../../../../../../.. ../../../../../../../.. ../../../../../../../../.. ../../../../../../../../../.."
-no_tcl=true
-echo $ac_n "checking for Tcl headers in the source tree""... $ac_c" 1>&6
-echo "configure:1498: checking for Tcl headers in the source tree" >&5
-# Check whether --with-tclinclude or --without-tclinclude was given.
-if test "${with_tclinclude+set}" = set; then
-  withval="$with_tclinclude"
-  with_tclinclude=${withval}
-fi
-
-if eval "test \"`echo '$''{'ac_cv_c_tclh'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-if test x"${with_tclinclude}" != x ; then
-  if test -f ${with_tclinclude}/tcl.h ; then
-    ac_cv_c_tclh=`(cd ${with_tclinclude}; ${PWDCMD-pwd})`
-  elif test -f ${with_tclinclude}/generic/tcl.h ; then
-    ac_cv_c_tclh=`(cd ${with_tclinclude}/generic; ${PWDCMD-pwd})`
-  else
-    { echo "configure: error: ${with_tclinclude} directory doesn't contain headers" 1>&2; exit 1; }
-  fi
-fi
-
-if test x"${ac_cv_c_tclconfig}" != x ; then
-  for i in $dirlist; do
-    if test -f $ac_cv_c_tclconfig/$i/generic/tcl.h ; then
-      ac_cv_c_tclh=`(cd $ac_cv_c_tclconfig/$i/generic; ${PWDCMD-pwd})`
-      break
-    fi
-  done
-fi
-
-if test x"${ac_cv_c_tclh}" = x ; then
-        for i in $dirlist; do
-        if test -n "`ls -dr $srcdir/$i/tcl* 2>/dev/null`" ; then
-	    tclpath=$srcdir/$i
-	    break
-	fi
-    done
-
-            for i in `ls -dr $tclpath/tcl* 2>/dev/null ` ; do
-        if test -f $i/generic/tcl.h ; then
-          ac_cv_c_tclh=`(cd $i/generic; ${PWDCMD-pwd})`
-          break
-        fi
-    done
-fi
-
-if test x"${ac_cv_c_tclh}" = x ; then
-        ccpath=`which ${CC}  | sed -e 's:/bin/.*::'`/include
-    if test -f $ccpath/tcl.h; then
-        ac_cv_c_tclh=$ccpath
-    fi
-fi
-
-if test x"${ac_cv_c_tclh}" = x ; then
-   echo "$ac_t""none" 1>&6
-   ac_safe=`echo "tcl.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for tcl.h""... $ac_c" 1>&6
-echo "configure:1555: checking for tcl.h" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 1560 "configure"
-#include "confdefs.h"
-#include <tcl.h>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1565: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  ac_cv_c_tclh=installed
-else
-  echo "$ac_t""no" 1>&6
-ac_cv_c_tclh=""
-fi
-
-else
-   echo "$ac_t""${ac_cv_c_tclh}" 1>&6
-fi
-
-fi
-
-  TCLHDIR=""
-if test x"${ac_cv_c_tclh}" = x ; then
-    { echo "configure: error: Can't find any Tcl headers" 1>&2; exit 1; }
-fi
-if test x"${ac_cv_c_tclh}" != x ; then
-    no_tcl=""
-    if test x"${ac_cv_c_tclh}" != x"installed" ; then
-	if test x"${CC}" = xcl ; then
-	    tmp="`cygpath --windows ${ac_cv_c_tclh}`"
-	    ac_cv_c_tclh="`echo $tmp | sed -e s#\\\\\\\\#/#g`"
-	fi
-        echo "$ac_t""${ac_cv_c_tclh}" 1>&6
-        TCLHDIR="-I${ac_cv_c_tclh}"
-    fi
-fi
-
-
-
-
-#
-# Ok, lets find the tk source trees so we can use the headers
-# If the directory (presumably symlink) named "tk" exists, use that one
-# in preference to any others.  Same logic is used when choosing library
-# and again with Tcl. The search order is the best place to look first, then in
-# decreasing significance. The loop breaks if the trigger file is found.
-# Note the gross little conversion here of srcdir by cd'ing to the found
-# directory. This converts the path from a relative to an absolute, so
-# recursive cache variables for the path will work right. We check all
-# the possible paths in one loop rather than many separate loops to speed
-# things up.
-# the alternative search directory is involked by --with-tkinclude
-#
-dirlist=".. ../../ ../../../ ../../../../ ../../../../../ ../../../../../../ ../../../../../../.. ../../../../../../../.. ../../../../../../../../.. ../../../../../../../../../.."
-no_tk=true
-echo $ac_n "checking for Tk headers in the source tree""... $ac_c" 1>&6
-echo "configure:1628: checking for Tk headers in the source tree" >&5
-# Check whether --with-tkinclude or --without-tkinclude was given.
-if test "${with_tkinclude+set}" = set; then
-  withval="$with_tkinclude"
-  with_tkinclude=${withval}
-fi
-
-if eval "test \"`echo '$''{'ac_cv_c_tkh'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-if test x"${with_tkinclude}" != x ; then
-  if test -f ${with_tkinclude}/tk.h ; then
-    ac_cv_c_tkh=`(cd ${with_tkinclude}; ${PWDCMD-pwd})`
-  elif test -f ${with_tkinclude}/generic/tk.h ; then
-    ac_cv_c_tkh=`(cd ${with_tkinclude}/generic; ${PWDCMD-pwd})`
-  else
-    { echo "configure: error: ${with_tkinclude} directory doesn't contain headers" 1>&2; exit 1; }
-  fi
-fi
-
-if test x"${ac_cv_c_tkconfig}" != x ; then
-  for i in $dirlist; do
-    if test -f $ac_cv_c_tkconfig/$i/generic/tk.h ; then
-      ac_cv_c_tkh=`(cd $ac_cv_c_tkconfig/$i/generic; ${PWDCMD-pwd})`
-      break
-    fi
-  done
-fi
-
-if test x"${ac_cv_c_tkh}" = x ; then
-        for i in $dirlist; do
-        if test -n "`ls -dr $srcdir/$i/tk* 2>/dev/null`" ; then
-	    tkpath=$srcdir/$i
-	    break
-	fi
-    done
-
-            for i in `ls -dr $tkpath/tk* 2>/dev/null ` ; do
-        if test -f $i/generic/tk.h ; then
-          ac_cv_c_tkh=`(cd $i/generic; ${PWDCMD-pwd})`
-          break
-        fi
-    done
-fi
-
-if test x"${ac_cv_c_tkh}" = x ; then
-    echo "$ac_t""none" 1>&6
-            ccpath=`which ${CC}  | sed -e 's:/bin/.*::'`/include
-    if test -f $ccpath/tk.h; then
-	ac_cv_c_tkh=$ccpath
-    fi
-else
-   echo "$ac_t""${ac_cv_c_tkh}" 1>&6
-fi
-
-fi
-
-  TKHDIR=""
-if test x"${ac_cv_c_tkh}" = x ; then
-    { echo "configure: error: Can't find any Tk headers" 1>&2; exit 1; }
-fi
-if test x"${ac_cv_c_tkh}" != x ; then
-    no_tk=""
-    if test x"${ac_cv_c_tkh}" != x"installed" ; then
-	if test x"${CC}" = xcl ; then
-	    tmp="`cygpath --windows ${ac_cv_c_tkh}`"
-	    ac_cv_c_tkh="`echo $tmp | sed -e s#\\\\\\\\#/#g`"
-	fi
-        echo "$ac_t""found in ${ac_cv_c_tkh}" 1>&6
-        TKHDIR="-I${ac_cv_c_tkh}"
-    fi
-fi
-
-
-
-
-
-# Make sure TCL_SHLIB_SUFFIX is set
-if test x$TCL_SHLIB_SUFFIX = x ; then
-  case "${host}" in
-    *cygwin*) TCL_SHLIB_SUFFIX=".dll" ;;
-    *) TCL_SHILB_SUFFIX=".so" ;;
-  esac
-fi
-
-
-# Since we're not using autoconf > 2.1x, we cannot use AC_CONFIG_FILES.
-make_subdirs=""
-
-# See if -mwin32 works for cygwin
-case "${host}" in
-  *cygwin*)
-    ocflags=${CFLAGS}
-    CFLAGS="${CFLAGS} -mwin32"
-    cat > conftest.$ac_ext <<EOF
-#line 1724 "configure"
-#include "confdefs.h"
-
-int main() {
-
-; return 0; }
-EOF
-if { (eval echo configure:1731: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  :
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  CFLAGS="${ocflags}"
-fi
-rm -f conftest*
-    ;;
-  *) ;;
-esac
-
-# note toplevel plugin build directory
-plugin_builddir=`pwd`
-
-#
-# Plugins
-#
-
-# Supported hosts
-
-# Only supported/tested on linux, solaris, cygwin
-supported=yes
-case "${host}" in
-  *cygwin*) ;;
-  *solaris*) ;;
-  *linux*) ;;
-  *) supported=no ;;
-esac
-
-# Host-specific configury
-case "${host}" in
-  *cygwin*)
-    echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:1766: checking build system type" >&5
-
-build_alias=$build
-case "$build_alias" in
-NONE)
-  case $nonopt in
-  NONE) build_alias=$host_alias ;;
-  *) build_alias=$nonopt ;;
-  esac ;;
-esac
-
-build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
-build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$build" 1>&6
-
-if test $host != $build; then
-  ac_tool_prefix=${host_alias}-
-else
-  ac_tool_prefix=
-fi
-
-# Extract the first word of "${ac_tool_prefix}nm", so it can be a program name with args.
-set dummy ${ac_tool_prefix}nm; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1792: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_NM'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$NM"; then
-  ac_cv_prog_NM="$NM" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_NM="${ac_tool_prefix}nm"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-NM="$ac_cv_prog_NM"
-if test -n "$NM"; then
-  echo "$ac_t""$NM" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-if test -z "$ac_cv_prog_NM"; then
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "nm", so it can be a program name with args.
-set dummy nm; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1824: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_NM'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$NM"; then
-  ac_cv_prog_NM="$NM" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_NM="nm"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_NM" && ac_cv_prog_NM="nm"
-fi
-fi
-NM="$ac_cv_prog_NM"
-if test -n "$NM"; then
-  echo "$ac_t""$NM" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-  NM="nm"
-fi
-fi
-
-    # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
-set dummy ${ac_tool_prefix}as; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1859: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$AS"; then
-  ac_cv_prog_AS="$AS" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_AS="${ac_tool_prefix}as"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-AS="$ac_cv_prog_AS"
-if test -n "$AS"; then
-  echo "$ac_t""$AS" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-if test -z "$ac_cv_prog_AS"; then
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "as", so it can be a program name with args.
-set dummy as; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1891: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$AS"; then
-  ac_cv_prog_AS="$AS" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_AS="as"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_AS" && ac_cv_prog_AS="as"
-fi
-fi
-AS="$ac_cv_prog_AS"
-if test -n "$AS"; then
-  echo "$ac_t""$AS" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-  AS="as"
-fi
-fi
-
-    # Extract the first word of "${ac_tool_prefix}ld", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ld; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1926: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_LD'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$LD"; then
-  ac_cv_prog_LD="$LD" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_LD="${ac_tool_prefix}ld"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-LD="$ac_cv_prog_LD"
-if test -n "$LD"; then
-  echo "$ac_t""$LD" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-if test -z "$ac_cv_prog_LD"; then
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "ld", so it can be a program name with args.
-set dummy ld; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1958: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_LD'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$LD"; then
-  ac_cv_prog_LD="$LD" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_LD="ld"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_LD" && ac_cv_prog_LD="ld"
-fi
-fi
-LD="$ac_cv_prog_LD"
-if test -n "$LD"; then
-  echo "$ac_t""$LD" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-  LD="ld"
-fi
-fi
-
-    echo $ac_n "checking "for libcygwin.a"""... $ac_c" 1>&6
-echo "configure:1991: checking "for libcygwin.a"" >&5
-    LIBCYGWIN_A=`$CC -print-file-name=libcygwin.a`
-    echo "$ac_t""$LIBCYGWIN_A" 1>&6
-    
-    # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
-set dummy ${ac_tool_prefix}dlltool; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1998: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$DLLTOOL"; then
-  ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_DLLTOOL" && ac_cv_prog_DLLTOOL="dlltool"
-fi
-fi
-DLLTOOL="$ac_cv_prog_DLLTOOL"
-if test -n "$DLLTOOL"; then
-  echo "$ac_t""$DLLTOOL" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-
-    ;;
-esac
-
-# Plugins supported by this configuration
-if test x${supported} = xyes; then
-  plugins="rhabout"
-  case "${target}" in
-    *cygwin*) ;;
-    *linux*) ;;
-    *i?86*)
-      plugins="${plugins} intel-pentium"
-      ;;
-  esac
-
-  for i in $plugins ; do
-    make_subdirs="${make_subdirs} $i"
-  done
-fi
-
-
-
-
-trap '' 1 2 15
-cat > confcache <<\EOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs.  It is not useful on other systems.
-# If it contains results you don't want to keep, you may remove or edit it.
-#
-# By default, configure uses ./config.cache as the cache file,
-# creating it if it does not exist already.  You can give configure
-# the --cache-file=FILE option to use a different cache file; that is
-# what configure does when it calls configure scripts in
-# subdirectories, so they share the cache.
-# Giving --cache-file=/dev/null disables caching, for debugging configure.
-# config.status only pays attention to the cache file if you give it the
-# --recheck option to rerun configure.
-#
-EOF
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(set) 2>&1 |
-  case `(ac_space=' '; set | grep ac_space) 2>&1` in
-  *ac_space=\ *)
-    # `set' does not quote correctly, so add quotes (double-quote substitution
-    # turns \\\\ into \\, and sed turns \\ into \).
-    sed -n \
-      -e "s/'/'\\\\''/g" \
-      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
-    ;;
-  *)
-    # `set' quotes correctly as required by POSIX, so do not add quotes.
-    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
-    ;;
-  esac >> confcache
-if cmp -s $cache_file confcache; then
-  :
-else
-  if test -w $cache_file; then
-    echo "updating cache $cache_file"
-    cat confcache > $cache_file
-  else
-    echo "not updating unwritable cache $cache_file"
-  fi
-fi
-rm -f confcache
-
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-# Any assignment to VPATH causes Sun make to only execute
-# the first set of double-colon rules, so remove it if not needed.
-# If there is a colon in the path, we need to keep it.
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[ 	]*VPATH[ 	]*=[^:]*$/d'
-fi
-
-trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
-
-# Transform confdefs.h into DEFS.
-# Protect against shell expansion while executing Makefile rules.
-# Protect against Makefile macro expansion.
-cat > conftest.defs <<\EOF
-s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g
-s%[ 	`~#$^&*(){}\\|;'"<>?]%\\&%g
-s%\[%\\&%g
-s%\]%\\&%g
-s%\$%$$%g
-EOF
-DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '`
-rm -f conftest.defs
-
-
-# Without the "./", some shells look in PATH for config.status.
-: ${CONFIG_STATUS=./config.status}
-
-echo creating $CONFIG_STATUS
-rm -f $CONFIG_STATUS
-cat > $CONFIG_STATUS <<EOF
-#! /bin/sh
-# Generated automatically by configure.
-# Run this file to recreate the current configuration.
-# This directory was configured as follows,
-# on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-#
-# $0 $ac_configure_args
-#
-# Compiler output produced by configure, useful for debugging
-# configure, is in ./config.log if it exists.
-
-ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]"
-for ac_option
-do
-  case "\$ac_option" in
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
-    exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
-  -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
-    echo "$CONFIG_STATUS generated by autoconf version 2.13"
-    exit 0 ;;
-  -help | --help | --hel | --he | --h)
-    echo "\$ac_cs_usage"; exit 0 ;;
-  *) echo "\$ac_cs_usage"; exit 1 ;;
-  esac
-done
-
-ac_given_srcdir=$srcdir
-ac_given_INSTALL="$INSTALL"
-
-trap 'rm -fr `echo "Makefile rhabout/Makefile:rhabout/Makefile.in:Make-rules rhabout/rhabout.tcl intel-pentium/Makefile:intel-pentium/Makefile.in:Make-rules intel-pentium/intel-pentium.tcl" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
-EOF
-cat >> $CONFIG_STATUS <<EOF
-
-# Protect against being on the right side of a sed subst in config.status.
-sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g;
- s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
-$ac_vpsub
-$extrasub
-s%@SHELL@%$SHELL%g
-s%@CFLAGS@%$CFLAGS%g
-s%@CPPFLAGS@%$CPPFLAGS%g
-s%@CXXFLAGS@%$CXXFLAGS%g
-s%@FFLAGS@%$FFLAGS%g
-s%@DEFS@%$DEFS%g
-s%@LDFLAGS@%$LDFLAGS%g
-s%@LIBS@%$LIBS%g
-s%@exec_prefix@%$exec_prefix%g
-s%@prefix@%$prefix%g
-s%@program_transform_name@%$program_transform_name%g
-s%@bindir@%$bindir%g
-s%@sbindir@%$sbindir%g
-s%@libexecdir@%$libexecdir%g
-s%@datadir@%$datadir%g
-s%@sysconfdir@%$sysconfdir%g
-s%@sharedstatedir@%$sharedstatedir%g
-s%@localstatedir@%$localstatedir%g
-s%@libdir@%$libdir%g
-s%@includedir@%$includedir%g
-s%@oldincludedir@%$oldincludedir%g
-s%@infodir@%$infodir%g
-s%@mandir@%$mandir%g
-s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
-s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
-s%@INSTALL_DATA@%$INSTALL_DATA%g
-s%@PACKAGE@%$PACKAGE%g
-s%@VERSION@%$VERSION%g
-s%@ACLOCAL@%$ACLOCAL%g
-s%@AUTOCONF@%$AUTOCONF%g
-s%@AUTOMAKE@%$AUTOMAKE%g
-s%@AUTOHEADER@%$AUTOHEADER%g
-s%@MAKEINFO@%$MAKEINFO%g
-s%@SET_MAKE@%$SET_MAKE%g
-s%@MAINTAINER_MODE_TRUE@%$MAINTAINER_MODE_TRUE%g
-s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g
-s%@MAINT@%$MAINT%g
-s%@host@%$host%g
-s%@host_alias@%$host_alias%g
-s%@host_cpu@%$host_cpu%g
-s%@host_vendor@%$host_vendor%g
-s%@host_os@%$host_os%g
-s%@CC@%$CC%g
-s%@OBJEXT@%$OBJEXT%g
-s%@EXEEXT@%$EXEEXT%g
-s%@TCLCONFIG@%$TCLCONFIG%g
-s%@TCL_DEFS@%$TCL_DEFS%g
-s%@TCL_LIB_FILE@%$TCL_LIB_FILE%g
-s%@TCL_LIB_FULL_PATH@%$TCL_LIB_FULL_PATH%g
-s%@TCL_LIBS@%$TCL_LIBS%g
-s%@TCL_CFLAGS@%$TCL_CFLAGS%g
-s%@TCL_SHLIB_CFLAGS@%$TCL_SHLIB_CFLAGS%g
-s%@TCL_SHLIB_LD@%$TCL_SHLIB_LD%g
-s%@TCL_LD_FLAGS@%$TCL_LD_FLAGS%g
-s%@TCL_LD_SEARCH_FLAGS@%$TCL_LD_SEARCH_FLAGS%g
-s%@TCL_RANLIB@%$TCL_RANLIB%g
-s%@TCL_BUILD_LIB_SPEC@%$TCL_BUILD_LIB_SPEC%g
-s%@TCL_LIB_SPEC@%$TCL_LIB_SPEC%g
-s%@TCL_BIN_DIR@%$TCL_BIN_DIR%g
-s%@TKCONFIG@%$TKCONFIG%g
-s%@TK_VERSION@%$TK_VERSION%g
-s%@TK_DEFS@%$TK_DEFS%g
-s%@TK_LIB_FILE@%$TK_LIB_FILE%g
-s%@TK_LIB_FULL_PATH@%$TK_LIB_FULL_PATH%g
-s%@TK_LIBS@%$TK_LIBS%g
-s%@TK_BUILD_INCLUDES@%$TK_BUILD_INCLUDES%g
-s%@TK_XINCLUDES@%$TK_XINCLUDES%g
-s%@TK_XLIBSW@%$TK_XLIBSW%g
-s%@TK_BUILD_LIB_SPEC@%$TK_BUILD_LIB_SPEC%g
-s%@TK_LIB_SPEC@%$TK_LIB_SPEC%g
-s%@CPP@%$CPP%g
-s%@TCLHDIR@%$TCLHDIR%g
-s%@TKHDIR@%$TKHDIR%g
-s%@TCL_DBGX@%$TCL_DBGX%g
-s%@TCL_SHLIB_SUFFIX@%$TCL_SHLIB_SUFFIX%g
-s%@build@%$build%g
-s%@build_alias@%$build_alias%g
-s%@build_cpu@%$build_cpu%g
-s%@build_vendor@%$build_vendor%g
-s%@build_os@%$build_os%g
-s%@NM@%$NM%g
-s%@AS@%$AS%g
-s%@LD@%$LD%g
-s%@LIBCYGWIN_A@%$LIBCYGWIN_A%g
-s%@DLLTOOL@%$DLLTOOL%g
-s%@make_subdirs@%$make_subdirs%g
-s%@plugin_builddir@%$plugin_builddir%g
-
-CEOF
-EOF
-
-cat >> $CONFIG_STATUS <<\EOF
-
-# Split the substitutions into bite-sized pieces for seds with
-# small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=60 # Maximum number of lines to put in a sed script.
-ac_file=1 # Number of current file.
-ac_beg=1 # First line for current file.
-ac_end=$ac_max_sed_cmds # Line after last line for current file.
-ac_more_lines=:
-ac_sed_cmds=""
-while $ac_more_lines; do
-  if test $ac_beg -gt 1; then
-    sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file
-  else
-    sed "${ac_end}q" conftest.subs > conftest.s$ac_file
-  fi
-  if test ! -s conftest.s$ac_file; then
-    ac_more_lines=false
-    rm -f conftest.s$ac_file
-  else
-    if test -z "$ac_sed_cmds"; then
-      ac_sed_cmds="sed -f conftest.s$ac_file"
-    else
-      ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file"
-    fi
-    ac_file=`expr $ac_file + 1`
-    ac_beg=$ac_end
-    ac_end=`expr $ac_end + $ac_max_sed_cmds`
-  fi
-done
-if test -z "$ac_sed_cmds"; then
-  ac_sed_cmds=cat
-fi
-EOF
-
-cat >> $CONFIG_STATUS <<EOF
-
-CONFIG_FILES=\${CONFIG_FILES-"Makefile rhabout/Makefile:rhabout/Makefile.in:Make-rules rhabout/rhabout.tcl intel-pentium/Makefile:intel-pentium/Makefile.in:Make-rules intel-pentium/intel-pentium.tcl"}
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case "$ac_file" in
-  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
-       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-  *) ac_file_in="${ac_file}.in" ;;
-  esac
-
-  # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
-
-  # Remove last slash and all that follows it.  Not all systems have dirname.
-  ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
-  if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
-    # The file is in a subdirectory.
-    test ! -d "$ac_dir" && mkdir "$ac_dir"
-    ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`"
-    # A "../" for each directory in $ac_dir_suffix.
-    ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'`
-  else
-    ac_dir_suffix= ac_dots=
-  fi
-
-  case "$ac_given_srcdir" in
-  .)  srcdir=.
-      if test -z "$ac_dots"; then top_srcdir=.
-      else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;;
-  /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;;
-  *) # Relative path.
-    srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
-    top_srcdir="$ac_dots$ac_given_srcdir" ;;
-  esac
-
-  case "$ac_given_INSTALL" in
-  [/$]*) INSTALL="$ac_given_INSTALL" ;;
-  *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
-  esac
-
-  echo creating "$ac_file"
-  rm -f "$ac_file"
-  configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
-  case "$ac_file" in
-  *Makefile*) ac_comsub="1i\\
-# $configure_input" ;;
-  *) ac_comsub= ;;
-  esac
-
-  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
-  sed -e "$ac_comsub
-s%@configure_input@%$configure_input%g
-s%@srcdir@%$srcdir%g
-s%@top_srcdir@%$top_srcdir%g
-s%@INSTALL@%$INSTALL%g
-" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file
-fi; done
-rm -f conftest.s*
-
-EOF
-cat >> $CONFIG_STATUS <<EOF
-
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-
-exit 0
-EOF
-chmod +x $CONFIG_STATUS
-rm -fr confdefs* $ac_clean_files
-test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
-
diff --git a/gdb/gdbtk/plugins/configure.in b/gdb/gdbtk/plugins/configure.in
deleted file mode 100644
index 58a54808124..00000000000
--- a/gdb/gdbtk/plugins/configure.in
+++ /dev/null
@@ -1,93 +0,0 @@
-AC_INIT(Make-rules)
-AC_CONFIG_AUX_DIR(../../..)
-AM_INIT_AUTOMAKE(insight, 1.0)
-AM_MAINTAINER_MODE
-AC_PROG_MAKE_SET
-AC_CANONICAL_HOST
-AC_PROG_CC
-AC_OBJEXT
-AC_EXEEXT
-
-# Find Tcl, Tk, etc
-CYG_AC_PATH_TCLCONFIG
-CYG_AC_LOAD_TCLCONFIG
-CYG_AC_PATH_TKCONFIG
-CYG_AC_LOAD_TKCONFIG
-CYG_AC_PATH_TCLH
-CYG_AC_PATH_TKH
-AC_SUBST(TCL_DBGX)
-
-# Make sure TCL_SHLIB_SUFFIX is set
-if test x$TCL_SHLIB_SUFFIX = x ; then
-  case "${host}" in
-    *cygwin*) TCL_SHLIB_SUFFIX=".dll" ;;
-    *) TCL_SHILB_SUFFIX=".so" ;;
-  esac
-fi
-AC_SUBST(TCL_SHLIB_SUFFIX)
-
-# Since we're not using autoconf > 2.1x, we cannot use AC_CONFIG_FILES.
-make_subdirs=""
-
-# See if -mwin32 works for cygwin
-case "${host}" in
-  *cygwin*)
-    ocflags=${CFLAGS}
-    CFLAGS="${CFLAGS} -mwin32"
-    AC_TRY_COMPILE(,,,CFLAGS="${ocflags}")
-    ;;
-  *) ;;
-esac
-
-# note toplevel plugin build directory
-plugin_builddir=`pwd`
-
-#
-# Plugins
-#
-
-# Supported hosts
-
-# Only supported/tested on linux, solaris, cygwin
-supported=yes
-case "${host}" in
-  *cygwin*) ;;
-  *solaris*) ;;
-  *linux*) ;;
-  *) supported=no ;;
-esac
-
-# Host-specific configury
-case "${host}" in
-  *cygwin*)
-    AC_CHECK_TOOL(NM, nm, nm)
-    AC_CHECK_TOOL(AS, as, as)
-    AC_CHECK_TOOL(LD, ld, ld)
-    AC_MSG_CHECKING("for libcygwin.a")
-    LIBCYGWIN_A=`$CC -print-file-name=libcygwin.a`
-    AC_MSG_RESULT($LIBCYGWIN_A)
-    AC_SUBST(LIBCYGWIN_A)
-    AC_CHECK_TOOL(DLLTOOL, dlltool)
-    ;;
-esac
-
-# Plugins supported by this configuration
-if test x${supported} = xyes; then
-  plugins="rhabout"
-  case "${target}" in
-    *cygwin*) ;;
-    *linux*) ;;
-    *i?86*)
-      plugins="${plugins} intel-pentium"
-      ;;
-  esac
-
-  for i in $plugins ; do
-    make_subdirs="${make_subdirs} $i"
-  done
-fi
-
-AC_SUBST(make_subdirs)
-AC_SUBST(plugin_builddir)
-
-AC_OUTPUT(Makefile rhabout/Makefile:rhabout/Makefile.in:Make-rules rhabout/rhabout.tcl intel-pentium/Makefile:intel-pentium/Makefile.in:Make-rules intel-pentium/intel-pentium.tcl)
diff --git a/gdb/gdbtk/plugins/intel-pentium/ChangeLog b/gdb/gdbtk/plugins/intel-pentium/ChangeLog
deleted file mode 100644
index 439d8856026..00000000000
--- a/gdb/gdbtk/plugins/intel-pentium/ChangeLog
+++ /dev/null
@@ -1,37 +0,0 @@
-2002-08-14  Keith Seitz  <keiths@redhat.com>
-
-	Merged from Red Hat internal branch:
-
-	2001-11-30  Keith Seitz  <keith@redhat.com>
-	* Makefile.in: New file.
-	* intel-pentium.tcl: Renamed to intel-pentium.tcl.in.
-	* plugins.tcl: This plugin is only available on non-native targets.
-	Append to ../plugins.tcl and remove.
-
-	2001-11-28  Ian Roxborough  <irox@redhat.com>
-	* cpuinfo.tcl (display_cpu_info): exec the gdb command
-	"info cpu" to get the extra cpuinformation (CPU ID).
-	* library/plugins/intel-pentium/msrselection.itb
-	(MsrSelDlg::build_win): Switch the OK and Cancel buttons
-	around to improve ease of use.
-	* plugins.tcl:	Use "$::GDBStartup" rather than "$GDBStartup".
-	Create a sub menu in the plugins menu called "Intel Pentium"
-	and place the menu items in it.
-
-	2001-11-21  Ian Roxborough  <irox@redhat.com>
-	* msrselection.itb (MsrSelDlg::list_msrs): Use
-	"set msr-pointer" instead of "set msr".
-	(MsrSelDlg::doit): Set the msr-pointer before calling
-	unpost.  Display an error message is we can't set the
-	msr-pointer.
-
-	2001-11-16  Ian Roxborough  <irox@redhat.com>
-	* cpuinfo.tcl: New file.
-	* intel-pentium.tcl: Ditto.
-	* cpuinfo.tcl: Ditto.
-	* msrselection.itb: Ditto.
-	* msrselection.ith: Ditto.
-	* pkgIndex.tcl: Ditto.
-	* plugins.tcl: Ditto.
-	* tclIndex: Ditto.
-
diff --git a/gdb/gdbtk/plugins/intel-pentium/Makefile.in b/gdb/gdbtk/plugins/intel-pentium/Makefile.in
deleted file mode 100644
index 79613d9f1da..00000000000
--- a/gdb/gdbtk/plugins/intel-pentium/Makefile.in
+++ /dev/null
@@ -1,6 +0,0 @@
-# Plugin definitions
-PLUGIN 			= intel-pentium
-PLUGIN_INSTALL_SRCDIR 	= cpuinfo.tcl \
-			  msrselection.ith \
-			  msrselection.itb
-
diff --git a/gdb/gdbtk/plugins/intel-pentium/cpuinfo.tcl b/gdb/gdbtk/plugins/intel-pentium/cpuinfo.tcl
deleted file mode 100644
index 8f78ae15ea8..00000000000
--- a/gdb/gdbtk/plugins/intel-pentium/cpuinfo.tcl
+++ /dev/null
@@ -1,33 +0,0 @@
-# Display CPU information.
-# Copyright 1999, 2000, 2001 Red Hat, Inc.
-#
-# Written by Fernando Nasser  <fnasser@redhat.com>
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License (GPL) 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.
-
-# ------------------------------------------------------------------
-#  NAME:         proc display_cpu_info
-#  DESCRIPTION:  display what we know about the target CPU
-#                if the information is available.
-#
-#  ARGUMENTS:    None
-#  RETURNS:      Nothing
-#
-#  NOTES:
-# ------------------------------------------------------------------
-proc display_cpu_info {} {
-  global gdb_cpuid_info
-  if {[catch {gdb_cmd "info cpu"} result]} {
-    tk_messageBox -message "CPU information not available"
-  } else {
-    tk_messageBox -message "$result"
-  }
-}
diff --git a/gdb/gdbtk/plugins/intel-pentium/intel-pentium.tcl.in b/gdb/gdbtk/plugins/intel-pentium/intel-pentium.tcl.in
deleted file mode 100644
index 77b737647af..00000000000
--- a/gdb/gdbtk/plugins/intel-pentium/intel-pentium.tcl.in
+++ /dev/null
@@ -1,4 +0,0 @@
-package provide INTELPENTIUM 1.0
-set dirname [file dirname [info script]]
-lappend auto_path $dirname
-#catch {load [file join $dirname intel-pentium@TCL_SHLIB_SUFFIX@]}
diff --git a/gdb/gdbtk/plugins/intel-pentium/msrselection.itb b/gdb/gdbtk/plugins/intel-pentium/msrselection.itb
deleted file mode 100644
index 365a3ef02e7..00000000000
--- a/gdb/gdbtk/plugins/intel-pentium/msrselection.itb
+++ /dev/null
@@ -1,192 +0,0 @@
-# Implements MSR selection dialog class for Insight.
-# Copyright 1999, 2000, 2001 Red Hat, Inc.
-#
-# Written by Fernando Nasser  <fnasser@redhat.com>
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License (GPL) 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.
-
-# ------------------------------------------------------------------
-#  NAME:         MsrSelDlg::constructor
-#  DESCRIPTION:  Create a new MSR Selection dialog window.
-#
-#  ARGUMENTS:    None
-#  RETURNS:      Nothing
-# ------------------------------------------------------------------
-body MsrSelDlg::constructor {args} {
-
-  window_name "MSR Selection"
-  build_win
-  eval itk_initialize $args
-
-}
-
-# ------------------------------------------------------------------
-#  NAME:         protected method MsrSelDlg::build_win
-#  DESCRIPTION:  Builds the MSR dialog window from widgets.
-#
-#  ARGUMENTS:    None
-#  RETURNS:      Nothing
-#
-#  NOTES:        This method should only be called once for
-#                each MsrSelDlg.
-# ------------------------------------------------------------------
-body MsrSelDlg::build_win {} {
-  
-  # CHOOSE_MSR: the list box with list of MSRs.  Also an entry
-  # for typing in the MSR by hand.
-
-  itk_component add choose_msr {
-    iwidgets::scrolledlistbox $itk_interior.cmsr -visibleitems 30x15 \
-      -labeltext "Choose MSR" -labelpos nw \
-      -labelrelief groove -labelborderwidth 2 \
-      -ipadx 8 -ipady 6 -childsitepos s -hscrollmode none \
-      -textbackground white -exportselection 0 \
-      -selectioncommand [code $this select_msr] \
-      -dblclickcommand [code $this doit]
-  }
-
-  # MSR_ENTRY: this is the MSR entry box.  You can enter the MSR register name
-  # by hand here, or click on the listbox to have it entered for you.
-
-  itk_component add msr_entry {
-    iwidgets::entryfield [$itk_component(choose_msr) childsite].lab \
-      -labeltext MSR: -textbackground white \
-      -focuscommand [code $this clear_msr_selection] \
-      -command [code $this doit]
-  }
-  pack $itk_component(msr_entry) -fill x -side bottom -pady 4
-  
-  itk_component add button_box {
-    frame $itk_interior.b
-  }
-  
-  itk_component add ok {
-    button $itk_component(button_box).ok -text OK -command [code $this doit]
-  }
-  $itk_component(ok) configure -state disabled
-
-  itk_component add cancel {
-    button $itk_component(button_box).cancel -text Cancel \
-      -command [code $this cancel]
-  }
-
-  ::standard_button_box $itk_component(button_box)
-
-  pack $itk_component(button_box) -side bottom -fill x \
-    -pady 4 -padx 4
-  pack $itk_component(choose_msr) -fill both -expand 1 -pady 4 -padx 4
-
-  after idle [list update idletasks;  $this list_msrs]
-
-}
-
-# ------------------------------------------------------------------
-#  NAME:         protected method MsrSelDlg::doit
-#  DESCRIPTION:  Selects the MSR to view and unposts window.
-#
-#  ARGUMENTS:    None
-#  RETURNS:      Nothing
-#
-#  NOTES:        
-# ------------------------------------------------------------------
-body MsrSelDlg::doit {} {
-  set MsrSelDlg::last_button 1
-  set msr [$itk_component(msr_entry) get]
-  set MsrSelDlg::last_msr $msr
-
-  if {[catch {gdb_cmd "set msr-pointer $msr"} result]} {
-    ManagedWin::open WarningDlg -transient \
-		    -message [list "Could not select this $msr:\n$result"]
-  }
-
-  debug "About to unpost"
-  unpost
-}
-
-# ------------------------------------------------------------------
-#  NAME:         protected method MsrSelDlg::cancel
-#  DESCRIPTION:  Unposts the window without selecting
-#                the MSR to view.
-#
-#  ARGUMENTS:    None
-#  RETURNS:      Nothing
-#
-#  NOTES:        
-# ------------------------------------------------------------------
-body MsrSelDlg::cancel {} {
-  set MsrSelDlg::last_button 0
-  set MsrSelDlg::last_msr {}
-  unpost
-}
-
-# ------------------------------------------------------------------
-#  NAME:         protected method MsrSelDlg::list_msrs
-#  DESCRIPTION:  List the known MSR names.
-#
-#  ARGUMENTS:    None
-#  RETURNS:      Nothing
-#
-#  NOTES:        
-# ------------------------------------------------------------------
-body MsrSelDlg::list_msrs {{expr {}}} {
-  set err [catch {gdb_cmd "set msr-pointer" 1} msg ]
-  set msg [string trimright $msg "."]
-  set msrnames [split $msg ,]
-  set msrnames [lrange $msrnames 1 end]
-
-  $itk_component(choose_msr) clear
-  set msr_list {}
-
-  foreach name $msrnames {
-    lappend msr_list [list $name {set msr $name}]
-    $itk_component(choose_msr) insert end $name
-  }
-
-  $itk_component(choose_msr) selection set 0
-  select_msr
-}
-
-# ------------------------------------------------------------------
-#  NAME:         protected method MsrSelDlg::select_msrs
-#  DESCRIPTION:  Grab the selected element from the MSR listbox
-#                and insert the associated MSR into the entry form.
-#
-#  ARGUMENTS:    None
-#  RETURNS:      Nothing
-#
-#  NOTES:        
-# ------------------------------------------------------------------
-body MsrSelDlg::select_msr {} {
-  set hit [$itk_component(choose_msr) curselection]
-  if {$hit != ""} {
-    $itk_component(msr_entry) clear
-    $itk_component(msr_entry) insert 0 [lindex [lindex $msr_list $hit] 0]
-    $itk_component(ok) configure -state normal
-  }
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  clear_msr_selection - Clear the current MSR selection.
-# ------------------------------------------------------------------
-# ------------------------------------------------------------------
-#  NAME:         protected method MsrSelDlg::clear_msrs_selection
-#  DESCRIPTION:  Clear the current MSR selection.
-#
-#  ARGUMENTS:    None
-#  RETURNS:      Nothing
-#
-#  NOTES:        
-# ------------------------------------------------------------------
-body MsrSelDlg::clear_msr_selection {} {
-  $itk_component(choose_msr) selection clear 0 end
-  $itk_component(msr_entry) selection range 0 end
-}
-
diff --git a/gdb/gdbtk/plugins/intel-pentium/msrselection.ith b/gdb/gdbtk/plugins/intel-pentium/msrselection.ith
deleted file mode 100644
index 777472be7e6..00000000000
--- a/gdb/gdbtk/plugins/intel-pentium/msrselection.ith
+++ /dev/null
@@ -1,38 +0,0 @@
-# Implements MSR selection dialog class for Insight.
-# Copyright 1999, 2000, 2001 Red Hat, Inc.
-#
-# Written by Fernando Nasser  <fnasser@redhat.com>
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License (GPL) 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.
-
-class MsrSelDlg {
-  inherit ModalDialog PluginWindow
-
-  public {
-    method constructor {args}
-    proc last_button {} {return $last_button}
-    proc msr {} {return $last_msr}
-  }
-
-  protected {
-    method build_win {args}
-    method cancel {}
-    method doit {}
-    method list_msrs {{expr {}}}
-    method select_msr {}
-    method clear_msr_selection {}
-
-    variable msr_list
-
-    common  last_button 0
-    common last_msr {}
-  }
-}
diff --git a/gdb/gdbtk/plugins/intel-pentium/pkgIndex.tcl b/gdb/gdbtk/plugins/intel-pentium/pkgIndex.tcl
deleted file mode 100644
index 58182a9676c..00000000000
--- a/gdb/gdbtk/plugins/intel-pentium/pkgIndex.tcl
+++ /dev/null
@@ -1 +0,0 @@
-package ifneeded INTELPENTIUM 1.0 [list source [file join $dir intel-pentium.tcl]]
diff --git a/gdb/gdbtk/plugins/intel-pentium/tclIndex b/gdb/gdbtk/plugins/intel-pentium/tclIndex
deleted file mode 100644
index 8b7e117e667..00000000000
--- a/gdb/gdbtk/plugins/intel-pentium/tclIndex
+++ /dev/null
@@ -1,17 +0,0 @@
-# Tcl autoload index file, version 2.0
-# This file is generated by the "auto_mkindex" command
-# and sourced to set up indexing information for one or
-# more commands.  Typically each line is a command that
-# sets an element in the auto_index array, where the
-# element name is the name of a command and the value is
-# a script that loads the command.
-
-set auto_index(MsrSelDlg) [list source [file join $dir msrselection.ith]]
-set auto_index(::MsrSelDlg::constructor) [list source [file join $dir msrselection.itb]]
-set auto_index(::MsrSelDlg::build_win) [list source [file join $dir msrselection.itb]]
-set auto_index(::MsrSelDlg::doit) [list source [file join $dir msrselection.itb]]
-set auto_index(::MsrSelDlg::cancel) [list source [file join $dir msrselection.itb]]
-set auto_index(::MsrSelDlg::list_msrs) [list source [file join $dir msrselection.itb]]
-set auto_index(::MsrSelDlg::select_msr) [list source [file join $dir msrselection.itb]]
-set auto_index(::MsrSelDlg::clear_msr_selection) [list source [file join $dir msrselection.itb]]
-set auto_index(display_cpu_info) [list source [file join $dir cpuinfo.tcl]]
diff --git a/gdb/gdbtk/plugins/plugins.tcl b/gdb/gdbtk/plugins/plugins.tcl
deleted file mode 100644
index b9b1f926713..00000000000
--- a/gdb/gdbtk/plugins/plugins.tcl
+++ /dev/null
@@ -1,30 +0,0 @@
-# Only load the rhabout plugin if it was installed.
-foreach dir $::gdb_plugins {
-  if {[file exists [file join $dir rhabout]]} {
-    package require RHABOUT 1.0
-    $Menu add command Other "About Red Hat" \
-      {ManagedWin::open RHAbout} -underline 0
-
-    # To activate the PlugIn sample, uncomment the next line
-    set plugins_available 1
-  }
-}
-
-# Only load the Intel Pentium plugin for x86 targets.
-if {[string match "i?86-*" $::GDBStartup(target_name)] && ![TargetSelection::native_debugging]} {
-  package require INTELPENTIUM 1.0
-
-  # Add a new cascading-style menu to plugin menu
-  $Menu add cascade intel "Intel Pentium" 0
-
-  # Add MSR selection dialog menu item.
-  $Menu add command None "MSR Selection..." \
-    {ManagedWin::open_dlg MsrSelDlg} -underline 0
-
-  # Add CPU info menu item.
-  $Menu add command None "CPU Information..." \
-    display_cpu_info -underline 0
-
-  # Activate the PlugIn.
-  set plugins_available 1
-}
diff --git a/gdb/gdbtk/plugins/rhabout/ChangeLog b/gdb/gdbtk/plugins/rhabout/ChangeLog
deleted file mode 100644
index 8f5ec3a0402..00000000000
--- a/gdb/gdbtk/plugins/rhabout/ChangeLog
+++ /dev/null
@@ -1,17 +0,0 @@
-2003-03-12  Martin M. Hunt  <hunt@redhat.com>
-
-	* rhabout.itcl (RHAbout): Fix call
-	to open_help. We no longer use HTMLViewer.
-
-2002-08-14  Keith Seitz  <keiths@redhat.com>
-
-	Merged from Red Hat internal branch:
-	2001-11-30  Keith Seitz  <keiths@redhat.com>
-	* rhabout.c: Update for building a DLL on cygwin.
-	(DllMain): New function.
-	* rhabout.tcl: Moved from ../ and renamed to
-	rhabout.tcl.in: configure needs to tweak the shared library name.
-	* rhabout.tcl.in: "New" file.
-	* Makefile.in: New (template) file.
-	* Makefile: Remove.
-	* pkgIndex.tcl: Moved from ../ here.
diff --git a/gdb/gdbtk/plugins/rhabout/Makefile.in b/gdb/gdbtk/plugins/rhabout/Makefile.in
deleted file mode 100644
index e63e568d6f4..00000000000
--- a/gdb/gdbtk/plugins/rhabout/Makefile.in
+++ /dev/null
@@ -1,9 +0,0 @@
-# Plugin definitions
-PLUGIN 			= rhabout
-PLUGIN_OBJS 		= rhabout.$(OBJEXT)
-PLUGIN_IMAGE_BASE 	= 0x65000000
-PLUGIN_INSTALL_SRCDIR	= rhabout.itcl
-# Comment out this to install the example plugin
-PLUGIN_INSTALL_TARGET   = nothing
-
-nothing:
diff --git a/gdb/gdbtk/plugins/rhabout/pkgIndex.tcl b/gdb/gdbtk/plugins/rhabout/pkgIndex.tcl
deleted file mode 100644
index b56e703e31f..00000000000
--- a/gdb/gdbtk/plugins/rhabout/pkgIndex.tcl
+++ /dev/null
@@ -1,2 +0,0 @@
-package ifneeded RHABOUT 1.0 [list source [file join $dir rhabout.tcl]]
-
diff --git a/gdb/gdbtk/plugins/rhabout/rhabout.c b/gdb/gdbtk/plugins/rhabout/rhabout.c
deleted file mode 100644
index fd6cc87eb4a..00000000000
--- a/gdb/gdbtk/plugins/rhabout/rhabout.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/* Sample command procedure library for a plug-in. */
-
-/* You have to include the Tcl headers, of course. */
-#include <tcl.h>
-
-/* Define the functions that implement your commands as required by Tcl */
-#ifdef __CYGWIN__
-#  define EXPORT __declspec(dllexport)
-#else
-#  define EXPORT /* nothing */
-#endif
-
-int extra_text (ClientData clientData,
-                Tcl_Interp *interp,
-                int argc, char *argv[]);
-
-/* Here you actually do whatever you want, like calling your target 
-   libraries etc.  Here we just return a string. */
-
-int
-extra_text (ClientData clientData,
-                Tcl_Interp *interp,
-                int argc, char *argv[])
-{
-  interp->result = "\nThis is a sample plug-in\n";
-  return TCL_OK;
-}
-
-/* Initialization function required in Tcl libraries. */
-
-int EXPORT
-Rhabout_Init (Tcl_Interp *interp)
-{
-  /* Register your command as a Tcl command with this interpreter. */
-  Tcl_CreateCommand (interp, "rhabout_extra_text", extra_text,
-                     (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
-
-  /* Register this package */
-  Tcl_PkgProvide (interp, "RHABOUT", "1.0");
-  return TCL_OK;
-}
-
-/* This is REQUIRED for cygwin */
-#ifdef __CYGWIN__
-#include <windows.h>
-#include <tclInt.h>
-
-struct _reent *_impure_ptr;
-extern struct _reent *_imp__reent_data;
-
-BOOL APIENTRY
-DllMain (HINSTANCE hInstance, DWORD reason, LPVOID reserved)
-{
-  _impure_ptr = _imp__reent_data;
-  return TRUE;
-}
-#endif
diff --git a/gdb/gdbtk/plugins/rhabout/rhabout.itcl b/gdb/gdbtk/plugins/rhabout/rhabout.itcl
deleted file mode 100644
index 02a83517dfd..00000000000
--- a/gdb/gdbtk/plugins/rhabout/rhabout.itcl
+++ /dev/null
@@ -1,87 +0,0 @@
-class RHAbout {
-  inherit PluginWindow
-  constructor {args} {
-    global gdb_ImageDir
-
-    # What about a menu?
-    $menubar add menubutton file "File" 0
-    $menubar add command None "Close" \
-      [code $this destroy_toplevel] \
-      -underline 1
-    $menubar add menubutton help "Help" 0
-    $menubar add command Other "Help Topics" \
-      {open_help index.html} \
-      -underline 0
-    $menubar add separator
-    $menubar add command Other "About GDB..." \
-      {ManagedWin::open About -transient} \
-      -underline 0
-
-    # The menu only shows up if you do this:
-    $menubar show
-
-    # Do you want a toolbar?
-    $toolbar add button con Other {ManagedWin::open Console} \
-                           "Console (Ctrl+N)" -image console_img
-
-    # The toolbar will only show up if you do this:
-    $toolbar show
-
-    # Now, fill the childsite with some graphics and text
-
-    # Remember to use the childsite, do not pack in the widget hull
-    set f [childsite]
-
-    # Put in some graphics
-    label $f.image1 -bg white -image \
-      [image create photo -file [file join $gdb_ImageDir insight.gif]]
-
-    # Here we call an interface function provided by GDBTCL
-    set text [gdb_cmd {show version}]
-
-    # Here we call a command procedure that we created, if it exists
-    catch {append text [rhabout_extra_text]}
-
-    # Now add the text
-    message $f.m -bg white -fg black -text $text -aspect 500 -relief flat
-
-    # Add a status bar so we can show some dynamic information
-    set _status [label $f.stat -relief sunken -bd 3 \
-                   -font global/status -height 1]
-
-    # pack everything
-    pack $f.image1 $f.m -fill both -expand yes
-    pack $f.stat -expand 1 -fill both
-    pack $itk_interior
-
-    # Give our sample window a name
-    window_name "About Red Hat Insight Plug-In"
-  }
-
-  # You can overload the base class busy method, but make sure
-  # to call it as well or the menu and button status will not be updated
-  # (unless this is what you want)
-  public method busy {event} {
-    debug
-    # Call the baseclass version
-    PluginWindow::busy $event
-
-    # Display something in the status area
-    $_status configure -text "Running..."
-  }
-
-  # You can overload the base class idle method, but make sure
-  # to call it as well or the menu and button status will not be updated
-  # (unless this is what you want)
-  private method idle {} {
-    debug
-    # First call the baseclass version
-    PluginWindow::idle
-
-    # Display something in the status area
-    $_status configure -text "Stopped."
-  }
-
-  # Path to the status area
-  private variable _status
-}
diff --git a/gdb/gdbtk/plugins/rhabout/rhabout.tcl.in b/gdb/gdbtk/plugins/rhabout/rhabout.tcl.in
deleted file mode 100644
index 61533da7501..00000000000
--- a/gdb/gdbtk/plugins/rhabout/rhabout.tcl.in
+++ /dev/null
@@ -1,5 +0,0 @@
-package provide RHABOUT 1.0
-set dirname [file dirname [info script]]
-lappend auto_path $dirname
-set TCL_DBGX "@TCL_DBGX@" ; # needed for cygwin
-catch {load [file join $dirname rhabout@TCL_SHLIB_SUFFIX@]}
diff --git a/gdb/gdbtk/plugins/rhabout/tclIndex b/gdb/gdbtk/plugins/rhabout/tclIndex
deleted file mode 100644
index 6a7b8a87329..00000000000
--- a/gdb/gdbtk/plugins/rhabout/tclIndex
+++ /dev/null
@@ -1,9 +0,0 @@
-# Tcl autoload index file, version 2.0
-# This file is generated by the "auto_mkindex" command
-# and sourced to set up indexing information for one or
-# more commands.  Typically each line is a command that
-# sets an element in the auto_index array, where the
-# element name is the name of a command and the value is
-# a script that loads the command.
-
-set auto_index(RHAbout) [list source [file join $dir rhabout.itcl]]
diff --git a/gdb/ppc-linux-nat.c b/gdb/ppc-linux-nat.c
index 20c8adda44a..aff1f7385bd 100644
--- a/gdb/ppc-linux-nat.c
+++ b/gdb/ppc-linux-nat.c
@@ -48,11 +48,108 @@
 #define PT_WRITE_U PTRACE_POKEUSR
 #endif
 
-/* Default the type of the ptrace transfer to int.  */
+/* Default the type of the ptrace transfer to long.  */
 #ifndef PTRACE_XFER_TYPE
-#define PTRACE_XFER_TYPE int
+#define PTRACE_XFER_TYPE long
 #endif
 
+/* Write DATA into location ADDR within the "user area" on a 64-bit
+   process from a 32-bit process. */
+#ifndef PPC_PTRACE_POKEUSR_3264
+#define PPC_PTRACE_POKEUSR_3264   0x90 
+#endif
+
+/* Read a register (specified by ADDR) out of the "user area" on a
+   64-bit process from a 32-bit process. */
+#ifndef PPC_PTRACE_PEEKUSR_3264
+#define PPC_PTRACE_PEEKUSR_3264   0x91
+#endif
+
+/* Write word at location ADDR on a 64-bit process from a 32-bit process. */
+#ifndef PPC_PTRACE_POKEDATA_3264
+#define PPC_PTRACE_POKEDATA_3264   0x92
+#endif
+
+/* Read word at location ADDR on a 64-bit process from a 32-bit
+   process. */
+#ifndef PPC_PTRACE_PEEKDATA_3264
+#define PPC_PTRACE_PEEKDATA_3264   0x94
+#endif
+
+#define ARCH64() (REGISTER_RAW_SIZE (0) == 8)
+
+/* REALLY SHAMELESS HACK:
+
+   32 bit programs can exec 64 bit programs and so forth. GDB launches
+   the inferior process by lauching ${SHELL} -c <program and args>.
+   Fortunately, we know that it only tries to get the PC so we only
+   have to hack that.. I THINK.
+
+   At this time we are not ready to unify ppc32 and ppc64 as
+   rs/6000-aix is. and there is know easy way to find out if a process
+   is running 32 or 64 bits so we have this little hack.
+
+   EVEN MORE SHAMELESS HACK: rs6000-nat.c solves this problem by
+   expecting the first few ptracex() calls to fail.
+
+*/
+#include <sys/stat.h>
+#include "bfd/elf-bfd.h"
+static int
+ppc_wordsize_pid(pid_t pid)
+{
+  static ino_t fino = 0;
+  static int last = 0;
+  struct stat sb;
+  const char fmt[] = "/proc/%u/exe";
+  FILE *file;
+  char *fname = alloca (sizeof(fmt) + 10); /* 10 digit pid.. why not */
+  Elf_Internal_Ehdr elfh;
+
+  if ((gdbarch_tdep (current_gdbarch))->wordsize == 4)
+    return 4;
+
+  sprintf (fname, fmt, pid);
+
+  if (stat(fname, &sb) == -1)
+    {
+      internal_error (__FILE__, __LINE__,
+		      "could not stat executable from /proc.");
+      return 0;
+    }
+
+  if (fino == sb.st_ino)
+      return last;
+
+  fino = sb.st_ino;
+
+  /* FIXME: could stat the file and check if inode changed. */
+  file = fopen (fname, "rb");
+  if (file == NULL)
+    {
+      internal_error (__FILE__, __LINE__,
+		      "could not open executable from /proc.");
+      return 0;
+    }
+
+  if (fread (elfh.e_ident, EI_NIDENT, 1, file) == 1)
+    {
+      if (elfh.e_ident [EI_CLASS] == ELFCLASS64)
+	last = 8;
+      else
+	last = 4;
+    }
+  else
+    {
+      last = 0;
+      internal_error (__FILE__, __LINE__,
+		      "could not read executable from /proc.");
+    }
+  fclose (file);
+  
+  return last;
+}
+
 /* Glibc's headers don't define PTRACE_GETVRREGS so we cannot use a
    configure time check.  Some older glibc's (for instance 2.2.1)
    don't have a specific powerpc version of ptrace.h, and fall back on
@@ -106,7 +203,15 @@ int have_ptrace_getvrregs = 1;
 int
 kernel_u_size (void)
 {
-  return (sizeof (struct user));
+  if ((gdbarch_tdep (current_gdbarch))->wordsize == sizeof (PTRACE_XFER_TYPE))
+    return (sizeof (struct user));
+  else
+    {
+      /* with a 64-bit kernel, all members of struct user go from 32
+         to 64 bit except for the u_comm character array so we can
+         double everything and subtract sizeof u_comm. */
+      return ((sizeof (struct user) * 2) - sizeof (((struct user*)0)->u_comm));
+    }
 }
 
 /* *INDENT-OFF* */
@@ -127,32 +232,33 @@ ppc_register_u_addr (int regno)
 {
   int u_addr = -1;
   struct gdbarch_tdep *tdep = gdbarch_tdep (current_gdbarch);
+  int wordsize = tdep->wordsize;
 
   /* General purpose registers occupy 1 slot each in the buffer */
   if (regno >= tdep->ppc_gp0_regnum && regno <= tdep->ppc_gplast_regnum )
-    u_addr =  ((PT_R0 + regno) * 4);
+    u_addr =  ((PT_R0 + regno) * wordsize);
 
   /* Floating point regs: 2 slots each */
   if (regno >= FP0_REGNUM && regno <= FPLAST_REGNUM)
-    u_addr = ((PT_FPR0 + (regno - FP0_REGNUM) * 2) * 4);
+    u_addr = ((PT_FPR0 + (regno - FP0_REGNUM) * 2) * wordsize);
 
   /* UISA special purpose registers: 1 slot each */
   if (regno == PC_REGNUM)
-    u_addr = PT_NIP * 4;
+    u_addr = PT_NIP * wordsize;
   if (regno == tdep->ppc_lr_regnum)
-    u_addr = PT_LNK * 4;
+    u_addr = PT_LNK * wordsize;
   if (regno == tdep->ppc_cr_regnum)
-    u_addr = PT_CCR * 4;
+    u_addr = PT_CCR * wordsize;
   if (regno == tdep->ppc_xer_regnum)
-    u_addr = PT_XER * 4;
+    u_addr = PT_XER * wordsize;
   if (regno == tdep->ppc_ctr_regnum)
-    u_addr = PT_CTR * 4;
+    u_addr = PT_CTR * wordsize;
   if (regno == tdep->ppc_mq_regnum)
-    u_addr = PT_MQ * 4;
+    u_addr = PT_MQ * wordsize;
   if (regno == tdep->ppc_ps_regnum)
-    u_addr = PT_MSR * 4;
+    u_addr = PT_MSR * wordsize;
   if (regno == tdep->ppc_fpscr_regnum)
-    u_addr = PT_FPSCR * 4;
+    u_addr = PT_FPSCR * wordsize;
 
   return u_addr;
 }
@@ -206,6 +312,16 @@ fetch_register (int tid, int regno)
   unsigned int offset;         /* Offset of registers within the u area. */
   char buf[MAX_REGISTER_SIZE];
   CORE_ADDR regaddr = ppc_register_u_addr (regno);
+  int wordsize = (gdbarch_tdep (current_gdbarch))->wordsize;
+
+  /* Do the easy thing for now which is to silently succeed if we are
+     attached to a 32-bit process when we are expecting 64-bits */
+  if (wordsize != ppc_wordsize_pid(tid))
+    {
+      /* supplying garbage.. but that's ok */
+      supply_register (regno, buf);
+      return;
+    }
 
   if (altivec_register_p (regno))
     {
@@ -233,8 +349,19 @@ fetch_register (int tid, int regno)
   for (i = 0; i < REGISTER_RAW_SIZE (regno); i += sizeof (PTRACE_XFER_TYPE))
     {
       errno = 0;
-      *(PTRACE_XFER_TYPE *) & buf[i] = ptrace (PT_READ_U, tid,
-					       (PTRACE_ARG3_TYPE) regaddr, 0);
+      if (wordsize != sizeof (PTRACE_XFER_TYPE))
+	{
+	  PTRACE_XFER_TYPE reg;
+	  ptrace (PPC_PTRACE_PEEKUSR_3264, tid,
+		  (PTRACE_ARG3_TYPE) regaddr, &reg);
+	  *(PTRACE_XFER_TYPE *) & buf[i] = reg;
+	}
+      else
+      {
+	  *(PTRACE_XFER_TYPE *) & buf[i] = ptrace (PT_READ_U, tid,
+						   (PTRACE_ARG3_TYPE) regaddr, 0);
+      }
+
       regaddr += sizeof (PTRACE_XFER_TYPE);
       if (errno != 0)
 	{
@@ -365,6 +492,7 @@ store_register (int tid, int regno)
   register int i;
   unsigned int offset;         /* Offset of registers within the u area.  */
   char buf[MAX_REGISTER_SIZE];
+  int wordsize = (gdbarch_tdep (current_gdbarch))->wordsize;
 
   if (altivec_register_p (regno))
     {
@@ -379,8 +507,18 @@ store_register (int tid, int regno)
   for (i = 0; i < REGISTER_RAW_SIZE (regno); i += sizeof (PTRACE_XFER_TYPE))
     {
       errno = 0;
-      ptrace (PT_WRITE_U, tid, (PTRACE_ARG3_TYPE) regaddr,
-	      *(PTRACE_XFER_TYPE *) & buf[i]);
+      if (wordsize != sizeof (PTRACE_XFER_TYPE))
+	{
+	  PTRACE_XFER_TYPE reg;
+	  ptrace (PPC_PTRACE_POKEUSR_3264, tid, (PTRACE_ARG3_TYPE) regaddr,
+		  *(PTRACE_XFER_TYPE *) & buf[i]);
+	}
+      else
+      {
+	  ptrace (PT_WRITE_U, tid, (PTRACE_ARG3_TYPE) regaddr,
+		  *(PTRACE_XFER_TYPE *) & buf[i]);
+      }
+
       regaddr += sizeof (PTRACE_XFER_TYPE);
 
       if (errno == EIO 
@@ -534,3 +672,243 @@ fill_fpregset (gdb_fpregset_t *fpregsetp, int regno)
   if ((regno == -1) || regno == tdep->ppc_fpscr_regnum)
     regcache_collect (tdep->ppc_fpscr_regnum, (char *) (*fpregsetp + regi));
 }
+
+
+#ifdef CHILD_XFER_MEMORY
+
+/* this is a complete rip off from infptrace.c */
+
+#ifndef GDB_MAX_ALLOCA
+#define GDB_MAX_ALLOCA 0x1000
+#endif /* GDB_MAX_ALLOCA */
+
+/* Copy LEN bytes to or from inferior's memory starting at MEMADDR to
+   debugger memory starting at MYADDR.  Copy to inferior if WRITE is
+   nonzero.  TARGET is ignored.
+
+   Returns the length copied, which is either the LEN argument or
+   zero.  This xfer function does not do partial moves, since
+   child_ops doesn't allow memory operations to cross below us in the
+   target stack anyway.  */
+
+int
+child_xfer_memory (CORE_ADDR memaddr, char *myaddr, int len, int write,
+		   struct mem_attrib *attrib, struct target_ops *target)
+{
+    int i;
+  /* Round starting address down to longword boundary.  */
+    CORE_ADDR addr = memaddr & -(CORE_ADDR) sizeof (PTRACE_XFER_TYPE);
+  /* Round ending address up; get number of longwords that makes.  */
+    int count = ((((memaddr + len) - addr) + sizeof (PTRACE_XFER_TYPE) - 1)
+		 / sizeof (PTRACE_XFER_TYPE));
+    int alloc = count * sizeof (PTRACE_XFER_TYPE);
+    PTRACE_XFER_TYPE *buffer;
+    struct cleanup *old_chain = NULL;
+    int wordsize = (gdbarch_tdep (current_gdbarch))->wordsize;
+    int arch64 = ARCH64();
+
+  /* Allocate buffer of that many longwords.  */
+    if (len < GDB_MAX_ALLOCA)
+    {
+	buffer = (PTRACE_XFER_TYPE *) alloca (alloc);
+    }
+    else
+    {
+	buffer = (PTRACE_XFER_TYPE *) xmalloc (alloc);
+	old_chain = make_cleanup (xfree, buffer);
+    }
+
+  /* WARNING: from kernel source: "when I and D space are separate,
+     these will need to be fixed." */
+    if (write)
+    {
+      /* Fill start and end extra bytes of buffer with existing memory
+	 data.  */
+	if (addr != memaddr || len < (int) sizeof (PTRACE_XFER_TYPE))
+	{
+	  /* Need part of initial word -- fetch it.  */
+	    if (wordsize == sizeof (PTRACE_XFER_TYPE) && (!arch64))
+	    {
+		buffer[0] = ptrace (PT_READ_I, PIDGET (inferior_ptid), 
+				    (PTRACE_ARG3_TYPE) addr, 0);
+	    }
+	    else
+	    {
+		if (arch64) {
+		    buffer[0] = ptrace (PTRACE_PEEKDATA, PIDGET (inferior_ptid), 
+					(unsigned long) addr, 0);
+		}
+		else 
+		{
+		    ptrace (PPC_PTRACE_PEEKDATA_3264, PIDGET (inferior_ptid), 
+			    (PTRACE_ARG3_TYPE) &addr, buffer);
+		}
+	    }
+	}
+	if (count > 1)		/* FIXME, avoid if even boundary.  */
+	{
+	    CORE_ADDR a64 = (addr + (count - 1) * sizeof (PTRACE_XFER_TYPE));
+	    if (wordsize == sizeof (PTRACE_XFER_TYPE) && (!arch64))
+	    {
+		buffer[count - 1] = ptrace (PT_READ_I, PIDGET (inferior_ptid),
+					    (PTRACE_ARG3_TYPE) a64, 0);
+	    }
+	    else
+		if (arch64) {
+		    buffer[count-1] = ptrace (PTRACE_PEEKDATA, PIDGET (inferior_ptid),
+					      (PTRACE_ARG3_TYPE) &a64, 0);
+		}
+		else
+		{
+		    ptrace (PPC_PTRACE_PEEKDATA_3264, PIDGET (inferior_ptid),
+			    (PTRACE_ARG3_TYPE) &a64, &buffer[count - 1]);
+		}
+	}
+
+      /* Copy data to be written over corresponding part of buffer.  */
+	memcpy ((char *) buffer + (memaddr & (sizeof (PTRACE_XFER_TYPE) - 1)),
+		myaddr, len);
+
+      /* Write the entire buffer.  */
+	for (i = 0; i < count; i++, addr += sizeof (PTRACE_XFER_TYPE))
+	{
+	    errno = 0;
+	    if (wordsize == sizeof (PTRACE_XFER_TYPE) && (!arch64))
+	    {
+		ptrace (PT_WRITE_D, PIDGET (inferior_ptid), 
+			(PTRACE_ARG3_TYPE) addr, buffer[i]);
+	    }
+	    else
+		if (arch64) {
+		    ptrace (PT_WRITE_D, PIDGET (inferior_ptid), 
+			    (unsigned long) addr, buffer[i]);  
+		}
+		else 
+		{
+		    ptrace (PPC_PTRACE_POKEDATA_3264, PIDGET (inferior_ptid), 
+			    (PTRACE_ARG3_TYPE) &addr, buffer[i]);
+		}
+	    if (errno)
+	    {
+		errno = 0;
+		if (wordsize == sizeof (PTRACE_XFER_TYPE) && (!arch64))
+		{
+		    ptrace (PT_WRITE_I, PIDGET (inferior_ptid), 
+			    (PTRACE_ARG3_TYPE) addr, buffer[i]);
+		}
+		else
+		    if (arch64) {
+			ptrace (PTRACE_POKEDATA, PIDGET (inferior_ptid),  
+				(PTRACE_ARG3_TYPE) addr, buffer[i]); 
+		    }
+		    else 
+		    {
+			ptrace (PPC_PTRACE_POKEDATA_3264, PIDGET (inferior_ptid), 
+				(PTRACE_ARG3_TYPE) &addr, buffer[i]);
+		    }
+	    }
+	    if (errno)
+		return 0;
+	}
+#ifdef CLEAR_INSN_CACHE
+	    CLEAR_INSN_CACHE ();
+#endif
+    }
+  else
+  {
+      /* Read all the longwords.  */
+      for (i = 0; i < count; i++, addr += sizeof (PTRACE_XFER_TYPE))
+      {
+	  errno = 0;
+	  if (wordsize == sizeof (PTRACE_XFER_TYPE) && (!arch64))
+	  {
+	      buffer[i] = ptrace (PT_READ_I, PIDGET (inferior_ptid),
+				  (PTRACE_ARG3_TYPE) addr, 0);
+	  }
+	  else
+	  {
+	      if (arch64) {
+		  buffer[i] = ptrace (PTRACE_PEEKDATA, PIDGET (inferior_ptid),
+				      (unsigned long) addr, 0);
+	      }
+	      else
+	      {
+		  ptrace (PPC_PTRACE_PEEKDATA_3264, PIDGET (inferior_ptid),
+			  (PTRACE_ARG3_TYPE) &addr, &buffer[i]);
+	      }
+	      if (errno)
+		  return 0;
+	      QUIT;
+	  }
+
+      /* Copy appropriate bytes out of the buffer.  */
+	  memcpy (myaddr,
+		  (char *) buffer + (memaddr & (sizeof (PTRACE_XFER_TYPE) - 1)),
+		  len);
+      }
+  }
+  if (old_chain != NULL)
+    do_cleanups (old_chain);
+  return len;
+    }
+
+
+/* Did not want to add this originally since the kernel will give us a
+   lot of gargabe (and would probably fail if it wasn't for the
+   FPU's). But at least you can get the other registers in struct
+   pt_regs.  Perhaps we can get the kernels to co-operate. */
+static void
+udot_info (char *dummy1, int dummy2)
+{
+  int udot_off;			/* Offset into user struct */
+  int udot_val;			/* Value from user struct at udot_off */
+  char mess[128];		/* For messages */
+  int wordsize = (gdbarch_tdep (current_gdbarch))->wordsize;
+
+  if (!target_has_execution)
+    {
+      error ("The program is not being run.");
+    }
+
+  for (udot_off = 0; udot_off < KERNEL_U_SIZE; udot_off += sizeof (udot_val))
+    {
+      if ((udot_off % 24) == 0)
+	{
+	  if (udot_off > 0)
+	    {
+	      printf_filtered ("\n");
+	    }
+	  printf_filtered ("%04x:", udot_off);
+	}
+      if (wordsize != sizeof (PTRACE_XFER_TYPE))
+	{
+	  PTRACE_XFER_TYPE reg;
+	  /* ptrace will place contents in "data" pointer */
+	  ptrace (PPC_PTRACE_PEEKUSR_3264, PIDGET (inferior_ptid),
+		  (PTRACE_ARG3_TYPE) udot_off, &reg);
+	  udot_val = reg;
+	}
+      else
+	udot_val = ptrace (PT_READ_U, PIDGET (inferior_ptid),
+			   (PTRACE_ARG3_TYPE) udot_off, 0);
+      if (errno != 0)
+	{
+	  sprintf (mess, "\nreading user struct at offset 0x%x", udot_off);
+	  perror_with_name (mess);
+	}
+      /* Avoid using nonportable (?) "*" in print specs */
+      printf_filtered (sizeof (int) == 4 ? " 0x%08x" : " 0x%16x", udot_val);
+    }
+  printf_filtered ("\n");
+}
+#endif /* CHILD_XFER_MEMORY */
+
+#include "command.h"
+void
+_initialize_ppc_linux_nat (void)
+{
+#ifdef CHILD_XFER_MEMORY
+  add_info ("udot", udot_info,
+	    "Print contents of kernel ``struct user'' for current child.");
+#endif
+}
diff --git a/gdb/ppc-linux-tdep.c b/gdb/ppc-linux-tdep.c
index 9284751fd0c..59930396c0b 100644
--- a/gdb/ppc-linux-tdep.c
+++ b/gdb/ppc-linux-tdep.c
@@ -63,6 +63,8 @@
    offsetof(struct sigcontext_struct, handler) == 0x14 */
 #define PPC_LINUX_HANDLER_PTR_OFFSET (PPC_LINUX_SIGNAL_FRAMESIZE + 0x14)
 
+#define TDEP	gdbarch_tdep (current_gdbarch)
+	
 /* From <asm/ptrace.h>, values for PT_NIP, PT_R1, and PT_LNK */
 #define PPC_LINUX_PT_R0		0
 #define PPC_LINUX_PT_R1		1
@@ -755,3 +757,64 @@ _initialize_ppc_linux_tdep (void)
 			  ppc_linux_init_abi);
   add_core_fns (&ppc_linux_regset_core_fns);
 }
+
+struct link_map_offsets *
+	ppc64_linux_svr4_fetch_link_map_offsets (void)
+{
+    static struct link_map_offsets lmo;
+    static struct link_map_offsets *lmp = NULL;
+
+    if (lmp == NULL)
+    {
+	lmp = &lmo;
+
+	lmo.r_debug_size = 16;/* The actual size is xx bytes, but
+					   this is all we need.  */
+	lmo.r_map_offset = 8;
+	lmo.r_map_size   = 8; 
+	lmo.link_map_size = 40;  /* The actual size is xxx bytes, but
+					   this is all we need.  */
+	lmo.l_addr_offset = 0;
+	lmo.l_addr_size   = 8;
+	lmo.l_name_offset = 8; 
+	lmo.l_name_size   = 8;
+	lmo.l_next_offset = 24;
+	lmo.l_next_size   = 8;
+	lmo.l_prev_offset = 32;
+	lmo.l_prev_size   = 8;
+    }
+
+    return lmp;
+}
+
+
+/* Support for CONVERT_FROM_FUNC_PTR_ADDR(ADDR).
+	   Duplicate of RS6000 function, except ppc64_linux requires relocated address. */
+static CORE_ADDR
+read_memory_addr (CORE_ADDR memaddr, int len)
+{
+    return read_memory_unsigned_integer (memaddr, len);
+}
+	
+	
+CORE_ADDR
+ppc64_linux_convert_from_func_ptr_addr (CORE_ADDR addr)
+{
+    long long my_adder;
+    struct obj_section *s;
+    CORE_ADDR retval;
+    extern struct obj_section *find_pc_section(CORE_ADDR);
+
+	/* this should be the base address that the object (containing the func_ptr_addr) is loaded at. */
+    my_adder = 0x7fe0000000; 
+
+    s = find_pc_section (my_adder + addr);
+    if (s && s->the_bfd_section->flags & SEC_CODE)
+	return addr;
+
+	  /* ADDR is in the data space, so it's a special function pointer. */
+    retval = read_memory_addr (my_adder + addr, TDEP->wordsize);
+	/*  printf("reading 0x%lx ",my_adder+addr); */
+	/*  printf("ppc64...convert_func_ptr addr:0x%lx  new:0x%lx\n",addr,retval); */
+    return retval;
+}
diff --git a/gdb/ppc64-linux-tdep.c b/gdb/ppc64-linux-tdep.c
new file mode 100644
index 00000000000..f7e0a2aa4bb
--- /dev/null
+++ b/gdb/ppc64-linux-tdep.c
@@ -0,0 +1,80 @@
+/* Target-dependent code for GDB, the GNU debugger.
+
+   Copyright 1986, 1987, 1989, 1991, 1992, 1993, 1994, 1995, 1996, 1997,
+   2000, 2001 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.  */
+
+#include "defs.h"
+
+
+/* These elfcore fuctions are defined in libbfd.a but only when host
+   == target, once we can convince the bfd to supply it these can go */
+#define _SYSCALL32
+#include "bfd.h"
+#include "sysdep.h"
+#include "bfdlink.h"
+#include "libbfd.h"
+#define ARCH_SIZE 0
+#include "elf-bfd.h"
+#include "libiberty.h"
+#include <sys/procfs.h>
+
+
+/*
+ * Initialization
+ */
+void
+_initialize_ppc64_linux_tdep (void)
+{
+  /* hardware/kernel supports single stepping */
+  set_gdbarch_software_single_step (current_gdbarch, NULL);
+}
+
+/* the start_address stored in the bfd is a function descriptor */
+#include "gdb/target.h"
+CORE_ADDR
+ppc64_bfd_get_start_address (bfd *abfd)
+{
+  extern struct target_ops exec_ops;
+  CORE_ADDR myaddr;
+  xfer_memory(abfd->start_address, (char *)&myaddr, 8, 0, 0, &exec_ops);
+  return myaddr;
+}
+
+/* Fetch (and possibly build) an appropriate link_map_offsets
+   structure for GNU/Linux PPC targets using the struct offsets
+   defined in link.h (but without actual reference to that file).
+
+   This makes it possible to access GNU/Linux PPC shared libraries
+   from a GDB that was not built on an GNU/Linux PPC host (for cross
+   debugging).
+
+*/
+#include "gdbcore.h"
+#include "symfile.h"
+#include "objfiles.h"
+
+#include "ppc-tdep.h"
+#define TDEP	gdbarch_tdep (current_gdbarch)
+
+static CORE_ADDR
+read_memory_addr (CORE_ADDR memaddr, int len)
+{
+  return read_memory_unsigned_integer (memaddr, len);
+}
diff --git a/gdb/rs6000-tdep.c b/gdb/rs6000-tdep.c
index 0b239bd4180..cd59cd43bd4 100644
--- a/gdb/rs6000-tdep.c
+++ b/gdb/rs6000-tdep.c
@@ -529,13 +529,13 @@ skip_prologue (CORE_ADDR pc, CORE_ADDR lim_pc, struct rs6000_framedata *fdata)
 
       if ((op & 0xfc1fffff) == 0x7c0802a6)
 	{			/* mflr Rx */
-	  lr_reg = (op & 0x03e00000) | 0x90010000;
+	  lr_reg = (op & 0x03e00000);
 	  continue;
 
 	}
       else if ((op & 0xfc1fffff) == 0x7c000026)
 	{			/* mfcr Rx */
-	  cr_reg = (op & 0x03e00000) | 0x90010000;
+	  cr_reg = (op & 0x03e00000);
 	  continue;
 
 	}
@@ -561,7 +561,7 @@ skip_prologue (CORE_ADDR pc, CORE_ADDR lim_pc, struct rs6000_framedata *fdata)
 	    {
 	      fdata->saved_gpr = reg;
 	      if ((op & 0xfc1f0003) == 0xf8010000)
-		op = (op >> 1) << 1;
+		op &= ~3UL;
 	      fdata->gpr_offset = SIGNED_SHORT (op) + offset;
 	    }
 	  continue;
@@ -593,19 +593,49 @@ skip_prologue (CORE_ADDR pc, CORE_ADDR lim_pc, struct rs6000_framedata *fdata)
 	  continue;
 
 	}
-      else if (lr_reg != -1 && (op & 0xffff0000) == lr_reg)
-	{			/* st Rx,NUM(r1) 
-				   where Rx == lr */
-	  fdata->lr_offset = SIGNED_SHORT (op) + offset;
+      else if (lr_reg != -1 &&
+	       /* std Rx || stdu Rx */
+	       (((op & 0xffff0000) == (lr_reg | 0xf8010000)) ||
+		/* stw Rx */
+		((op & 0xffff0000) == (lr_reg | 0x90010000)) ||
+		/* stwu Rx */
+		((op & 0xffff0000) == (lr_reg | 0x94010000))))
+	{	/* where Rx == lr */
+	  fdata->lr_offset = offset;
 	  fdata->nosavedpc = 0;
 	  lr_reg = 0;
+	  if ((op & 0xfc000003) == 0xf8000000 ||	/* std Rx */
+	      (op & 0xfc000000) == 0x90000000)		/* stw Rx */
+	    {
+	      /* does not update r1 add d to lr_offset */
+	      fdata->lr_offset = SIGNED_SHORT (op);
+	    }
+	  continue;
+
+	}
+      else if (cr_reg != -1 &&
+	       /* std Rx || stdu Rx */
+	       (((op & 0xffff0000) == (cr_reg | 0xf8010000)) ||
+		/* stw Rx */
+		((op & 0xffff0000) == (cr_reg | 0x90010000)) ||
+		/* stwu Rx */
+		((op & 0xffff0000) == (cr_reg | 0x94010000))))
+	{	/* where Rx == cr */
+	  fdata->cr_offset = offset;
+	  cr_reg = 0;
+	  if ((op & 0xfc000003) == 0xf8000000 ||
+	      (op & 0xfc000000) == 0x90000000)
+	    {
+	      /* does not update r1 add d to cr_offset */
+	      fdata->cr_offset += SIGNED_SHORT (op);
+	    }
 	  continue;
 
 	}
-      else if (cr_reg != -1 && (op & 0xffff0000) == cr_reg)
-	{			/* st Rx,NUM(r1) 
+      else if (cr_reg != -1 && (op & 0xffff0003) == cr_reg)
+	{			/* std Rx,NUM(r1) || stdu Rx,NUM(r1) 
 				   where Rx == cr */
-	  fdata->cr_offset = SIGNED_SHORT (op) + offset;
+	  fdata->cr_offset = SIGNED_SHORT (op & ~3UL) + offset;
 	  cr_reg = 0;
 	  continue;
 
@@ -650,30 +680,41 @@ skip_prologue (CORE_ADDR pc, CORE_ADDR lim_pc, struct rs6000_framedata *fdata)
 				   this branch */
 	  continue;
 
-	  /* update stack pointer */
 	}
-      else if ((op & 0xffff0000) == 0x94210000 ||	/* stu r1,NUM(r1) */
-	       (op & 0xffff0003) == 0xf8210001)		/* stdu r1,NUM(r1) */
-	{
+      /* update stack pointer */
+      else if ((op & 0xfc1f0000) == 0x94010000)
+	{		/* stu rX,NUM(r1) ||  stwu rX,NUM(r1) */
 	  fdata->frameless = 0;
-	  if ((op & 0xffff0003) == 0xf8210001)
-	    op = (op >> 1) << 1;
 	  fdata->offset = SIGNED_SHORT (op);
 	  offset = fdata->offset;
 	  continue;
-
 	}
-      else if (op == 0x7c21016e)
-	{			/* stwux 1,1,0 */
+      else if ((op & 0xfc1f016a) == 0x7c01016e)
+	{			/* stwux rX,r1,rY */
+	  /* no way to figure out what r1 is going to be */
+	  fdata->frameless = 0;
+	  offset = fdata->offset;
+	  continue;
+	}
+      else if ((op & 0xfc1f0003) == 0xf8010001)
+	{			/* stdu rX,NUM(r1) */
+	  fdata->frameless = 0;
+	  fdata->offset = SIGNED_SHORT (op & ~3UL);
+	  offset = fdata->offset;
+	  continue;
+	}
+      else if ((op & 0xfc1f016a) == 0x7c01016a)
+	{			/* stdux rX,r1,rY */
+	  /* no way to figure out what r1 is going to be */
 	  fdata->frameless = 0;
 	  offset = fdata->offset;
 	  continue;
-
-	  /* Load up minimal toc pointer */
 	}
-      else if ((op >> 22) == 0x20f
+      /* Load up minimal toc pointer */
+      else if (((op >> 22) == 0x20f	||	/* l r31,... or l r30,... */
+	       (op >> 22) == 0x3af)		/* ld r31,... or ld r30,... */
 	       && !minimal_toc_loaded)
-	{			/* l r31,... or l r30,... */
+	{
 	  minimal_toc_loaded = 1;
 	  continue;
 
@@ -2456,6 +2497,44 @@ static const struct reg registers_7400[] =
   /* FIXME? Add more registers? */
 };
 
+
+/* PowerPC UISA - a PPC64 processor as viewed by user-level code. */
+/* Should be able to use the common registers_powerpc[] here, however
+   it does not define an fpscr, though both linux and aix get one from
+   ptrace(). Can only assume that there is a 32-bit core our there
+   that does not have an fpscr.  I think we can assert that all 64-bit
+   cores do. */
+static const struct reg registers_powerpc64[] =
+{
+  COMMON_UISA_REGS,
+  /* SPRs */
+  /*  66 */ R4(cr), R(lr), R(ctr), R4(xer),
+  /*  70 */ R4(fpscr), R0 /* mq? */
+};
+
+static const struct reg registers_a35[] =
+{
+  COMMON_UISA_REGS,
+  /* SPRs */
+  /*  66 */ R4(cr), R(lr), R(ctr), R4(xer),
+  /*  70 */ R4(fpscr), R0 /* mq? */,
+  /*  72 */ R(dabr), R(iabr), R4(dsisr),
+  /*  75 */ R(dar), R4(dec), R(sdr1), R(srr0), R(srr1),
+  /*  80 */ R(sprg0), R(sprg1), R(sprg2), R(sprg3),
+  /*  84 */ R64(asr), R4(ear), R4(tbl), R4(tbu),
+  /*  88 */ R(ibat0u), R(ibat0l), R(ibat1u), R(ibat1l),
+  /*  92 */ R(ibat2u), R(ibat2l), R(ibat3u), R(ibat3l),
+  /*  96 */ R(dbat0u), R(dbat0l), R(dbat1u), R(dbat1l),
+  /* 100 */ R(dbat2u), R(dbat2l), R(dbat3u), R(dbat3l),
+  /* 104 */ R(pir), R4(mmcr0),
+  /* 106..121 segment regs 0..15 */ 
+  /* 106 */ R(sr0), R(sr1), R(sr2), R(sr3),
+  /* 110 */ R(sr4), R(sr5), R(sr6), R(sr7),
+  /* 114 */ R(sr8), R(sr9), R(sr10), R(sr11),
+  /* 118 */ R(sr12), R(sr13), R(sr14), R(sr15),
+  /* 122 */ R4(pvr) /* processor version register */
+};
+
 /* Motorola e500.  */
 static const struct reg registers_e500[] =
 {
@@ -2956,6 +3035,15 @@ rs6000_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
          descriptors).  */
       set_gdbarch_convert_from_func_ptr_addr (gdbarch,
 	rs6000_convert_from_func_ptr_addr);
+
+      /* wordsize 8, ppc64 linux  functions */
+      if (osabi == ELFOSABI_LINUX)
+      {
+	  set_solib_svr4_fetch_link_map_offsets
+	    (gdbarch, ppc64_linux_svr4_fetch_link_map_offsets);
+	  set_gdbarch_convert_from_func_ptr_addr
+            (gdbarch, ppc64_linux_convert_from_func_ptr_addr);
+      }
     }
   set_gdbarch_frame_args_address (gdbarch, rs6000_frame_args_address);
   set_gdbarch_frame_locals_address (gdbarch, rs6000_frame_args_address);
diff --git a/gdb/solib-svr4.c b/gdb/solib-svr4.c
index 6c4c10ae013..2b453c9ba6b 100644
--- a/gdb/solib-svr4.c
+++ b/gdb/solib-svr4.c
@@ -76,6 +76,9 @@ struct lm_info
 
 static char *solib_break_names[] =
 {
+#if defined (SOLIB_BREAK_NAME)
+  SOLIB_BREAK_NAME,
+#endif
   "r_debug_state",
   "_r_debug_state",
   "_dl_debug_state",
@@ -1015,7 +1018,7 @@ enable_break (void)
 	 the current pc (which should point at the entry point for the
 	 dynamic linker) and subtracting the offset of the entry point.  */
       if (!load_addr_found)
-	load_addr = read_pc () - tmp_bfd->start_address;
+	load_addr = read_pc () - CONVERT_FROM_FUNC_PTR_ADDR(tmp_bfd->start_address);
 
       /* Record the relocated start and end address of the dynamic linker
          text and plt section for svr4_in_dynsym_resolve_code.  */
diff --git a/gdb/testsuite/gdb.gdbtk/ChangeLog b/gdb/testsuite/gdb.gdbtk/ChangeLog
deleted file mode 100644
index 1099ce4c317..00000000000
--- a/gdb/testsuite/gdb.gdbtk/ChangeLog
+++ /dev/null
@@ -1,314 +0,0 @@
-2003-02-28  Martin M. Hunt  <hunt@redhat.com>
-
-	* c_variable.test: Fix result for 6.22.
-
-2003-02-27  Martin M. Hunt  <hunt@redhat.com>
-
-	* cpp_variable.test: Major changes required because varobj_update
-	now returns "-1" if a variable is out of scope.
-
-	* c_variable.test: Major changes required because varobj_update
-	now returns "-1" if a variable is out of scope. This fixes a bunch 
-	of XFAILS. Change bug reporting address.
-	
-	* windows.test: Remove HtmlViewer from list of windows.
-
-	* srcwin.test: Use "list get" instead of "listget" to
-	get contents of comboboxes. 
-	(2.1): Be less sensitive. 
-
-	* srcwin2.test: Use "list get" instead of "listget" to
-	get contents of comboboxes
-	(2-1.3): Accept assembly == mixed
-	for no source tests.
-
-	* srcwin3.test:  Use "list get" instead of "listget" to
-	get contents of comboboxes
-
-2002-09-09  Fred Fish  <fnf@intrinsity.com>
-
-	* simple.c:  Pass addresses to strncpy, not chars.
-
-2002-04-26  Martin M. Hunt  <hunt@redhat.com>
-
-	* defs (gdbtk_test_done): Call gdbtk_force_quit. 
-
-2002-04-26  Martin M. Hunt  <hunt@redhat.com>
-
-	* srcwin.test (click): Take a button number as an arg.
-	Generate a ButtonPress event then a ButtonRelease event
-	for that button number.
-	(4.4): Fix args for click().
-	(5.1): Fix results again.
-
-2002-03-07  Martin M. Hunt  <hunt@redhat.com>
-
-	* srcwin.test (5.1): Adjust line numbers to
-	test now runs correctly.
-
-2002-01-18  Keith Seitz  <keiths@redhat.com>
-
-	* console.test: Don't rely on "event generate" to do
-	keystrokes. It just doesn't work. Use the console window's
-	"test" method instead.
-	Use Console::test instead of Console::get_text.
-
-2002-01-15  Keith Seitz  <keiths@redhat.com>
-
-	* c_variable.test (1.4,2.14): Remove test for local frame
-	variables. Varobj now forces evaluation in the current frame
-	by default.
-	(2.15): Ignore any changes and only check for out of scope
-	locals (which is still unsupported).
-	* cpp_variable.test (1.1): Support alternative names for
-	local scope.
-	(1.6a): Catch call to gdb_cmd to prevent an error from
-	throwing testsuite into la-la land. Add to test.
-	(1.7): Ignore results from children during step, since
-	they may or may not change value when the parent changes.
-	(2.2a): New test incorperating gdb_cmd (also wrapped in
-	catch).
-	(2.22a): Likewise.
-	(2.71a): Likewise.
-
-2001-12-20  Keith Seitz  <keiths@redhat.com>
-
-	* cpp_variable.test: Catch non-test calls in case we
-	could not run.
-
-2001-10-25  Keith Seitz  <keiths@redhat.com>
-
-	* defs (_report_error): Fix typo.
-	(show_warning): Redefine the standard warning handler
-	so that we don't end up stalling tests with a warning dialog.
-
-	* windows.exp: New file.
-	* windows.test: New file.
-
-2001-10-08  Keith Seitz  <keiths@redhat.com>
-
-	* c_variable.test (check_update): Forget about returning
-	the "unchanged" list. It unneccessarily complicates things.
-	Update all callers.
-	* cpp_variable.test: Likewise.
-
-2001-08-30  Keith Seitz  <keiths@redhat.com>
-
-	* README: Update documentation to reflect recent changes.
-	* browser.exp: Load the insight testsuite support library.
-	* c_variable.exp: Likewise.
-	* console.exp: Likewise.
-	* cpp_variable.exp: Likewise.
-	* srcwin.exp: Likewise.
-
-2001-08-16  Keith Seitz  <keiths@redhat.com>
-
-	* cpp_variable.test (2.29, 2.30, 2.43, 2.63, 2.72): Char
-	pointers can now be dereferenced. Update test to reflect
-	this change in varobj.
-	* c_variable.test (4.9, 4.10, 4.47, 4.48, 5.1, 5.2, 5.3,
-	5.4, 5.5, 5.6, 5.7, 5.8, 5.9, 5.17, 5.18, 5.43, 5.44, 5.47,
-	5.48, 5.49, 5.50, 5.51, 5.53, 6.30): Likewise.
-
-2001-08-13  Jeff Holcomb  <jeffh@redhat.com>
-
-	* cpp_variable.test: Use gdbtk_test_run to start the test
-	program.
-
-2001-05-07  Keith Seitz  <keiths@cygnus.com>
-
-	* README: New file.
-
-        * configure.in: Check for executable filename extension.
-	* Makefile.in: Add filename extensions.
-        * configure: Regenerated.
-
-        * defs: Fix typo setting _test(verbose).
-        (gdbtk_test_file): New proc to load executables into gdbtk.
-        (gdbtk_test_run): New proc to run executables on gdbtk.
-        * browser.exp: Don't check if DISPLAY is set: let
-        gdbtk_initialize_display do it all for us.
-        Call gdbtk_done when finished with tests.
-        * c_variable.exp: Ditto.
-        * console.exp: Ditto.
-        * cpp_variable.exp: Ditto.
-        Only run tests if c++ is supported in the configuration.
-        * srcwin.exp: Ditto the DISPLAY stuff.
-        Accumulate all test results for the end and report them then.
-
-        * browser.test: Use gdbtk_test_file and gdbtk_test_run
-        to load and run an executable.
-        * c_variable.test: Use gdbtk_test_file and gdbtk_test_run
-        to load and run an executable.
-        * srcwin.test: Ditto.
-        * srcwin1.test: Ditto.
-        * srcwin2.test: Ditto.
-
-        * browser.test: (set_search_mode): Use "configure
-        -value" not "entryset" to set the combobox's value. We need
-        to have the command fired.
-        (browser-3.5): Remove trailing whitespace which causes test to
-        fail.
-        (browser-4.4): Expect something rational. Regexp "\_1$" cannot
-        match "func_10"!
-        (browser-4.5): Ditto.
-        (browser-5.12): Select all files for search to make test
-        match description.
-        (browser-6.2): Renamed from another test also calledd 6.1.
-        (browser-7.1): Delete all breakpoints at once without from_tty.
-        Select all entries in the comobox before invoking BP set/delete
-        button.
-        (browser-7.2): Ditto.
-
-        * list0.c, list1.c, list0.h: New files. Grabbed from gdb.base.
-        * srcwin.exp: Use these local files instead of those in gdb.base.
-
-1999-09-17  Fernando Nasser  <fnasser@totem.to.cygnus.com>
-
-	* cpp_variable.test: Add test (2.75) to verify
-	that a baseclass member value was effectively changed.
-
-1999-09-17  Fernando Nasser  <fnasser@totem.to.cygnus.com>
-
-	* cpp_variable.test: Update for new variable
-	code.
-
-1999-09-17  Fernando Nasser  <fnasser@totem.to.cygnus.com>
-
-	* c_variable.test: Update for new variable code.
-
-1999-09-17  Fernando Nasser  <fnasser@totem.to.cygnus.com>
-
-	* cpp_variable.h (class V): Add type to virtual function
-	declaration.
-
-1999-06-08  Fernando Nasser  <fnasser@totem.to.cygnus.com>
-
-	* browser.exp: Use untested and not warning when DISPLAY is
-	not found.
-	* c_variable.exp: Same.
-	* console.exp: Same.
-	* cpp_variable.exp: Same.
-	* srcwin.exp: Same.
-
-1999-04-12  Keith Seitz  <keiths@cygnus.com>
-
-	* cpp_variable.exp: Pass the "c++" flag to gdb_compile so
-	that it can grab the right compiler.
-
-1999-03-16  Martin Hunt  <hunt@cygnus.com>
-
-	* srcwin.test (srcwin-4.5): Change variable name
-	to $b so test will run again.
-
-1999-03-03  James Ingham  <jingham@cygnus.com>
-
-	* browser.test: Fixed up to match the new function browser.
-	This is not done yet...
-
-	* srcwin.test: Check for errors when the bbox is called for a text 
-	item that is not on screen (so bbox is "").  Return something more 
-	useful.
-
-1999-03-01  James Ingham  <jingham@cygnus.com>
-
-	Changelog entries merged over from gdb development branch.
-
-	1999-01-12  Martin Hunt  <hunt@cygnus.com>
-	* srcwin.test: Add a bunch of tests for the source
-	window filename and function comboboxes.  Add in stack tests.
-
-	1999-01-11  Martin Hunt  <hunt@cygnus.com>
-	* srcwin.test: New file. Source Window tests.
-	* srcwin.exp: New file. Source Window tests.
-
-	Wed Jan  6 09:22:52 1999  Keith Seitz  <keiths@cygnus.com>
-	* c_variable.test (c_variable-1.9): Add new
-	test to check for creation of a variable that is really a type.
-	(c_variable-7.81): Use "output" instead of "print" to get PC.
-	Include missing bits of test.
-
-	* cpp_variable.test (cpp_variable-1.6): Default format
-	is now "natural", not "hexadecimal"
-	(cpp_variable-2.22): Ditto.
-	(cpp_variable-2.24): Force format to hex before getting value.
-
-	* cpp_variable.exp: Supply missing arg to gdbtk_analyze_results.
-
-	Tue Jan  5 12:40:52 1999  Keith Seitz  <keiths@cygnus.com>
-	* gdb.gdbtk/c_variable.c, c_variable.test, c_variable.exp: New C
-	language tests for variable object interface.
-	
-	* gdb.gdbtk/cpp_variable.h, cpp_variable.cc, cpp_variable.test,
-	cpp_variable.exp: New C++ language tests for variable object
-	interface.
-	
-	* gdb.gdbtk/Makefile.in (EXECUTABLES): Add c_variable and cpp_variable.
-
-	Tue Jan  5 12:33:47 1999  Keith Seitz  <keiths@cygnus.com>
-	lib/gdb.exp (gdbtk_analyze_results): Generic function
-	for outputting results of test run.
-	
-	* gdb.gdbtk/defs (gdbtk_test): Handle xpass and xfail.
-	(gdbtk_test_error): New proc which handles error aborts.
-	
-	* gdb.gdbtk/console.exp: Use gdbtk_analyze_results.
-	Check if we have a valid DISPLAY before running.
-	* gdb.gdbtk/browser.exp: Ditto.
-
-	1998-12-07  Martin M. Hunt  <hunt@cygnus.com>
-	* lib/gdb.exp (gdbtk_start): Fix path for itcl library.
-	* gdb.gdbtk/browser.test: Change "manage open" to ManagedWin::open.
-	* gdb.gdbtk/console.test: Same.
-	* gdb.gdbtk/*: Update from devo.
-
-	Fri Jul 24 14:57:19 1998  Keith Seitz  <keiths@cygnus.com>
-	* gdb.gdbtk/Makefile.in: Add new example program "stack".
-	* gdb.gdbtk/browser.test,browser.exp: Add browser window
-	  tests.
-	* gdb.gdbtk/stack1.c,stack2.c: Test case for browser window.
-
-1999-02-22  Martin Hunt  <hunt@cygnus.com>
-
-	* srcwin.test (move_mouse_to): Fix typo.
-
-1999-02-03  Martin Hunt  <hunt@cygnus.com>
-
-	* console.test (clear_command_line): Add tests 1.5 - 1.8,
-	which test the new Shift-Up and Shift-Down bindings.
-
-1999-02-01  Martin Hunt  <hunt@cygnus.com>
-
-	* srcwin.test (srcwin-4.3): Fix bp test.
-
-1999-01-29  Martin Hunt  <hunt@cygnus.com>
-
-	* srcwin.test (click): New function that generates an event
-	at a location.
-	(srcwin-4.4): New test. Simulate a click on a line and
-	check for breakpoint set.
-	(srcwin-4.5): New test. Right-click on a line and select "Continue
-	to Here" from popup.
-
-	* srcwin.exp: Source srcwin3.test, which will test source window
-	assembly debugging on executables built without "-g".
-	
-1999-01-29  Martin Hunt  <hunt@cygnus.com>	
-
-	* srcwin.exp: Add srcwin2.test, which are basically the same
-	tests as srcwin.test, but run with a missing source file.
-
-	* srcwin2.test: New file.
-
-	* srcwin.test: Add tests for setting breakpoints in the source window,
-	testing BP balloons, variable balloons, and mixed-mode disassembly
-	of include files.
-
-Sun Jun 28 22:34:34 1998  Martin M. Hunt  <hunt@cygnus.com>
-
-	* gdb.gdbtk/simple.c (main): Make main return an
-	int so compiler will stop complaining.
-
-Fri Jun 26 14:27:13 1998  Keith Seitz  <keiths@cygnus.com>
-
-	* gdb.gdbtk/console.{exp, test}: New console window tests.
diff --git a/gdb/testsuite/gdb.gdbtk/Makefile.in b/gdb/testsuite/gdb.gdbtk/Makefile.in
deleted file mode 100644
index 51151a57814..00000000000
--- a/gdb/testsuite/gdb.gdbtk/Makefile.in
+++ /dev/null
@@ -1,36 +0,0 @@
-VPATH = @srcdir@
-srcdir = @srcdir@
-
-EXEEXT = @EXEEXT@
-
-EXECUTABLES = simple$(EXEEXT) stack$(EXEEXT) c_variable$(EXEEXT) \
-		cpp_variable$(EXEEXT)
-
-# uuencoded format to avoid SCCS/RCS problems with binary files.
-CROSS_EXECUTABLES =
-
-all:
-	@echo "Nothing to be done for all..."
-
-info:
-install-info:
-dvi:
-install:
-uninstall: force
-installcheck:
-check:
-
-clean mostlyclean:
-	-rm -f *~ *.o a.out xgdb *.x $(CROSS_EXECUTABLES) *.ci *.tmp
-	-rm -f core core.coremaker coremaker.core corefile $(EXECUTABLES)
-	-rm -f twice-tmp.c
-
-distclean maintainer-clean realclean: clean
-	-rm -f *~ core
-	-rm -f Makefile config.status config.log
-	-rm -f arch.inc
-	-rm -f *-init.exp
-	-rm -fr *.log summary detail *.plog *.sum *.psum site.*
-
-Makefile : $(srcdir)/Makefile.in $(srcdir)/configure.in
-	$(SHELL) ./config.status --recheck
diff --git a/gdb/testsuite/gdb.gdbtk/README b/gdb/testsuite/gdb.gdbtk/README
deleted file mode 100644
index b70488647b4..00000000000
--- a/gdb/testsuite/gdb.gdbtk/README
+++ /dev/null
@@ -1,421 +0,0 @@
-			The Insight Testsuite
-			---------------------
-		   Keith Seitz (keiths@cygnus.com)
-			     May 1, 2001
-
-RUNNING THE TESTSUITE
-
-The Insight testsuite is run in much the same way that gdb's testsuites
-are run. The one big difference is the environment variable GDB_DISPLAY,
-which governs what display should be used for the tests.
-
-When GDB_DISPLAY is not set in the user's environment, the Insight testsuite
-will attempt to run Xvfb, an X server with a virtual frame buffer. Using
-Xvfb, the testsuite can run without interuppting the user.
-
-When Xvfb is not available, the testsuite will mark the Insight tests
-"untested" and print out some appropriate warning to the testsuite log
-file.
-
-If GDB_DISPLAY is set in the user's environment, the testsuite will attempt
-to use this display for the tests. If this display is a desktop display,
-it is very likely that any interaction between the user and his desktop
-will interfere with the tests. Some tests warp the cursor, i.e., they
-force the mouse to move on the screen. If you don't want this to happen to
-you, put Xvfb in your path.
-
-On Cygwin systems, Xvfb is not supported. Only two choices are available in
-this environment: run the testsuites using the desktop or do not run the
-testsuite. To run the testsuite on Cygwin, just define the environment
-variable GDB_DISPLAY to anything.
-
-The examples below summarize the usage of the environment variable GDB_DISPLAY
-on unix/X-Windows hosts and Cygwin hosts. In all examples, assume that DISPLAY
-set to the local workstation's main display (:0).
-
-To run the testsuite using Xvfb -- unix only (Xvfb must be in PATH):
-$ make check
-
-To run the testsuite using a given display (either the desktop or a peviously
-started Xvfb):
-$ GDB_DISPLAY=$DISPLAY make check
-
-To run the testsuite on Cygwin:
-$ GDB_DISPLAY=foo make check
-
-
-TESTSUITE INFRASTRUCTURE
-
-The rest of this document deals with writing tests for Insight. This reading
-is only noteworthy for developers and contributors.
-
-The Insight testsuite consists of two large portions of code: code which is
-run in dejagnu and code which runs in Insight's built-in Tcl interpreter. Files
-containing dejagnu code (those files ending in ".exp" in the testsuite directory)
-are "glue code" between gdb's dejagnu testsuite and Insight's Tcl testsuite.
-
-Dejagnu testsuite files are considered "drivers" for any particular set of
-tests, since they allow dejagnu to control Insight's Tcl testsuite.
-
-
-Dejagnu Testsuite Infrastructure
-
-The dejagnu code is responsible for doing several things. Some of the more
-important responsibilities include:
-
-o Initializing the display
-o Determining if tests should be run
-o Results accounting
-o Compiling testcases in various languages
-o Repoting results to gdb's testsuite
-
-There are various functions defined to facilitate the writing of tests. These
-functions currently reside in gdb's gdb.exp (src/gdb/testsuite/lib/gdb.exp) and
-include:
-
-Pulic functions:
-proc gdbtk_initialize_display {}
-
-  gdbtk_initialize_display should be the first function called from the
-  (dejagnu) test file. It initializes the DISPLAY variable on unix systems
-  and determines (for all host systems) whether or not the testsuite should
-  run. It returns 1 if the test should run. If tests should not run, it
-  marks the test as "untested" and leaves a suitable message about why
-  the test should not run. If gdbtk_initialize_display returns zero, a test
-  should simply exit.
-
-proc gdbtk_start {test}
-
-  This function marks the start of a test and will execute Insight for
-  testing. The TEST parameter should be the file name of the Tcl test
-  file to load into Insight's Tcl interpreter. It returns a list of
-  test results suitable for passing to gdbtk_done or gdbtk_analyze_results.
-  See gdbtk_analyze_results for more information on the format of results.
-
-  gdbtk_start is responsible for communicating target startup information
-  to Insight, so that Insight's testsuite may be run on any target supported
-  by gdb. It does this by setting several environment variables just before
-  it starts Insight. These environment variables are:
-
-  OBJDIR
-    The object directory of the dejagnu testsuite (i.e.,
-    objdir/gdb/testsuite).
-  SRCDIR
-    The dejagnu source directory in which the tests are located (i.e,
-    src/gdb/testsuite)
-  SUBDIR
-    The dejagnu testsuite subdirectory for the test (i.e., gdb.gdbtk)
-  DEFS
-    The location of the testsuite definitions file (i.e.,
-    src/gdb/testsuite/gdb.gdbtk/defs)
-
-  Note that DEFS is converted to abs$lute tcl-style paths. On unix,
-  this means that DEFS would point to, for example,
-  /home/keiths/insight/src/gdb/testsuite/gdb.gdbtk/defs. On Cygwin it
-  would point to C:/cygwin/home/keiths/insight/src/gdb/testsuite/gdb.gdbtk/defs.
-  This is because of a descrepency between Cygwin's posix paths and Tcl's
-  not-quite-posix paths.
-
-proc gdbtk_analyze_results {results}
-  This function translates the list of results in RESULTS into dejagnu
-  results, reporting the number of failures, errors, passes, and expected
-  failures and passes. It currently does not deal with "untested" and other
-  test statuses from dejagnu since Insight's tcl testsuite does not
-  issue such results.
-
-  The format of the results expected by gdbtk_analyze_results is simple:
-  it is a list of {status name description msg}. "status" is the execution
-  status of one of the tcl tests run. This can be "PASS", "FAIL", "ERROR",
-  "XFAIL", or "XPASS".
-
-  "name" is the name of the test, and it is reported in all testsuite
-  results in dejagnu. This speeds location of the failing test. This
-  "name" may also be given to Insight's testsuite, telling it to
-  only run this test. See "do_tests" in Tcl Testsuite Infrastructure
-  for more information.
-
-  "description" is a textual description of the test given by "name".
-
-  "msg" is currently not used.
-
-proc gdbtk_done {{results {}}}
-  gdbtk_done takes any RESULTS and passes it gdbtk_analyze_results for
-  outputting to the dejagnu part of the testsuite. It may be called
-  without an argument, in which case it will only terminate Xvfb if it
-  was started. Tests must call gdbtk_done _once_ at the end of their
-  test drivers.
-
-Private functions:
-proc _gdbtk_export_target_info
-  This functin exports information about the target into the environment
-  so that Insight's testsuite may run programs on any supported gdb
-  target. This target information is passed into the Tcl testsuite
-  via an environment variable, TARGET_INFO, which is really a Tcl array,
-  i.e., the array is constructed in tcl and exported into the environment
-  with Tcl's "array get" command).
-
-  There are four elements to the array:
-  TARGET_INFO(init)   - (optional) A list of commands to execute in gdb
-                        to initialize the session. This usually includes
-                        setting baud rates and remote protocol options.
-  TARGET_INFO(target) - (required) The complete "target" command to connect
-                        to the given target.
-  TARGET_INFO(load)   - (optional) The complete "load" command to load an
-                        executable into a target.
-  TARGET_INFO(run)    - (required) The complete "run" command, sans arguments,
-			to start a process on the target. For remote targets,
-                        this is usually just "continue".
-  
-proc _gdbtk_xvfb_init
-  This procedure actually determines whether the an Insight test should
-  run and what DISPLAY it should use for that test. It is called by
-  gdbtk_initialize_display to do most of the dirty work.
-
-  It has a simple heuristic: If GDB_DISPLAY is not set and Xvfb is available
-  (on unix), it starts Xvfb, using the current process id as the screen number.
-  If Xvfb is not available and GDB_DISPLAY was not set, it skips the tests.
-
-proc _gdbtk_xvfb_exit
-  _gdbtk_xvfb_exit will kill any previously started Xvfb.
-
-Private globals:
-global _xvfb_spawn_id
-  This variable holds the spawn_id of any Xvfb process started
-  by the testsuite (or it is left undefined).
-
-global _using_windows
-  A global variable which indicates whether the testsuite is running
-  on cygwin. Unfortunately, as of writing, the global variable
-  tcl_platform(platform) is "unix" on Cygwin, so it is not possible
-  to rely on this for platform-dependent operations.
-
-  Instead, this variable is set by gdbtk_initialize_display. The test
-  it uses to determine if Cygwin is being used: it looks for the program
-  cygpath in the PATH. Therefore, cygpath is REQUIRED to run the testsuite
-  on Cygwin. (gdbtk_start also uses cygpath to determine Windows
-  pathnames for Cygwin.)
-
-
-Testsuite Driver Basics
-
-Given the above interfaces for connecting Insight's Tcl testsuite and
-gdb's dejagnu testsuite, the basic testsuite driver file should look
-(minimally) like this:
-
-File: mytest.exp
-1   load_lib "insight-support.exp"
-2   if {[gdbtk_initialize_display]} {
-3     # We found a display to use
-4     gdb_exit;   # Make sure any previous gdb is gone
-5     set results [gdbtk_start mytest.test]
-6
-7     # Done!
-8     gdbtk_done [split $results \n]
-9   }
-
-Line 1 loads the insight testsuite support library which contains definitions
-for all the procedures used in dejagnu to initialize and run the Insight testsuite.
-Line 2 calls gdbtk_initialize_display to ascertain whether there is a display
-to use for the test. This could use an existing display (if GDB_DISPLAY is
-set in the environment) or gdbk_initialize_display could startup an Xvfb
-for use by the testsuite.
-
-Line 4 forces any previously executing gdb to terminate.
-
-Line 5 signals the start of the test run. "mytest.test" is the name of the
-Tcl test file to execute in Insight's built-in Tcl interpreter. The output
-of gdbtk_start_test is all of the results of the Tcl test from Insight, which
-is subsequently passed to gdbk_analyze_results via gdbtk_done on Line 8.
-
-Note how nothing happens if gdbtk_initialize_display returns false.
-
-
-Tcl Testsuite Infrastructure
-
-The heart of Insight's testsuite is its Tcl testsuite. It is these tests
-which run directly in Insight's Tcl interpreter and allow test writers
-access to Insight's internals. Tcl testsuite files have the filename suffix
-".test" to distinguish them from their driver files, which end in ".exp".
-
-The design of the Insight Tcl testsuite parallels Tcl's testsuite. It has
-many powerful features, including the ability to run ANY test in a given
-Tcl test file. See the description of utility routines below for more
-information about running any set of tests from a file.
-
-The bulk of the code implementing the Tcl testsuite infrastructure in
-Insight is contained in the testsuite definitions file, "defs", located
-in src/gdb/testsuite/gdb.gdbtk. This file contains routines necessary
-to write tests for Insight.
-
-Public functions:
-proc gdbtk_read_defs {}
-  This function, located in Insight's core Tcl library, attempts to load
-  the testsuite definitions file. If it fails, it will either pop up
-  a dialog box with the error (if running interactively) or it will
-  print the error to stderr and exit (if running non-interactively).
-
-  If successful, it will return true.
-
-proc gdbtk_test_file {filename}
-  This function is used to load the file given by FILENAME into
-  Insight. It will automatically append ".exe" to any FILENAME
-  on Cygwin-hosted systems.
-
-  If successful, it will load the given file into Insight and
-  return the output of gdb's file command. It will call "error"
-  if it was succesful, therefore all calls to "gdbtk_test_file"
-  should be called using "catch".
-
-  Test authors should not use "gdb_cmd {file FILENAME}" to load
-  files into gdb unless they are testing interface code between
-  gdb and Insight.
-
-proc gdbtk_test_run {{prog_args {}}}
-  gdbtk_test_run runs the previoiusly loaded executable, passing
-  the given arguments to the inferior. Like Insight's Run button,
-  it will do whatever is necessary to get the executable running,
-  including any target initialization (setting baud rate and remote
-  protocol options), downloading the executable to the target, and
-  finally starting execution.
-
-  Test authors should NEVER use "gdb_cmd {run ARGUMENTS}" to run an
-  executable. Doing so will insure that your tests will only run on
-  a native debugger.
-
-  It returns true if successful or false otherwise. It will report
-  the error in a dialog box (if running interactively) or it will
-  print the error to stderr.
-
-proc gdbtk_test {name description script answer}
-  This is Tcl testsuite equivalent of "expect". "name" is a canonical
-  name of the test, usually of the form "shortname-major.minor". This is
-  the name that is used when running selected tests from a given file.
-  If "name" starts with an asterisk (*), it designates that the test
-  is expected to fail.
-
-  "description" is a short textual description of the test to help
-  humans understand what it does.
-
-  "script" is the actual test script to run. The result of this script
-  will be compared against "answer" to determine if the test passed
-  or failed.
-
-  It calls gdbtk_print_verbose to print out the results to the terminal
-  (if running interactively) or to the log file.
-
-proc gdbtk_test_done {}
-  gdbtk_test_done is called at the very end of all tcl tests. It is used
-  to exit Insight and return control back to the dejagnu driver which
-  started the tests.
-  
-proc gdbtk_dotests {file args}
-  Obsolete.
-
-proc do_test {{file {}} {verbose {}} {tests {}}}
-  This procedure is used to invoke the Insight test(s) given in FILE
-  which match the regular expression(s) in TESTS. This is invoked
-  from Insight's console window to run tests interactively.
-
-  VERBOSE sets the verbosity of the test run. When set to one,
-  the testsuite will report all results in human readable form.
-  When set  greater than one, it will print out results as a list,
-  i.e., for passing to gdbtk_analyze_results. If zero, it will only
-  print errors and failures in human readable form.
-
-Public global variables:
-objdir   - The objdir from dejagnu. See gdbtk_start for more information.
-srcdir   - The srcdir from dejagnu. See gdbtk_start for more information.
-test_ran - Indicates whether the last test ran or not. See example below.
-
-Private functions:
-proc gdbtk_test_error {desc}
-  An internal function used to report a framework error in the testsuite.
-  "desc" is a description of the error. It calls gdbtk_test_done.
-
-proc gdbtk_print_verbose {status name description script code answer}
-  A helper procedure to gdbtk_test which prints out results to the terminal
-  or the logfile (or both or none).
-
-Private global variables:
-_test - An array used by the testsuite internals.
-
-
-Tcl Test Basics
-
-Armed with the basic interface described above, it is possible to test Insight's
-GUI. Please do not write tests which attempt to imitate a user (moving the
-mouse and clicking buttons), unless there is no other way to test the functionality.
-
-The basic test file (with one test) looks like this (nonsensical one):
-File: mytest.test
-1  if {![gdbtk_read_defs]} {
-2    break
-3  }
-4  
-5  global objdir test_ran
-6  set program [file join $objdir mytest]
-7  if {[catch {gdbtk_test_file $program} t]} {
-8    gdbtk_test_error "loading \"$program\": $t"
-9  }
-10 if {![gdbtk_test_run]} { exit 1 }
-11
-12 global foo
-13 set foo 1
-14
-15 # Test:  mytest-1.1
-16 # Desc:  check if a source window was created
-17 gdbtk_test mytest-1.1 {source window created} {
-18   set window [ManagedWin::find SrcWin]
-19   llength $window
-20   set foo 13
-21 } {1}
-22
-23 if {$test_ran} {
-24   set foo 1
-25 }
-26
-27 # Done
-28 gdbtk_test_done
-
-Line 1 calls the Inisght function gdbtk_read_defs to read in the testsuite
-definitions file.
-
-Line 6 then specifies the name of a file (mytest) in the object directory
-which is loaded into gdb on Line 7. If loading the file into Insight
-failed, gdbtk_test_error is called to publish the error (and terminate the
-test run for this file).
-
-Line 10 runs the executable on the target, and exits if it was unable
-to do so.
-
-Line 13 simply sets a global variable foo to illustrate the purpose
-of the global "test_ran". Before the test "mytest-1.1" runs, foo is set to
-one. In order to support running specific tests, the state of the debugger
-cannot be altered INSIDE gdbtk_test scripts, since the contents of the
-script may not be run if the user requested only a specific test to run.
-
-Line 20 in the middle of the test modifies the global foo. If subsequent
-test relied on foo being one, we would have a state violation, since
-mytest-1.1 may have (or may have not) run.
-
-Therefore, we can check if a test ran and reset foo by checking the
-global "test_ran". If set, we know that the previous test (mytest-1.1)
-was run, and that foo is now thirteen. We reset the result back to one.
-
-(Aside: Some tests do not follow this rule explicitly: they can assume
-that all tests run sequentially. In these cases, running a specific
-test in the file will probably fail, since the debugger is not brought
-to a known state along the way.)
-
-Lines 17-21 contain the actual test. The test's name is "mytest-1.1". It
-is this name that may be referred to when asking the testsuite to run
-a specific test. The description of this test is "source window created",
-indicating that mytest-1.1's purpose is to check whether a source window
-was created.
-
-If gdbtk_test determines that this test is to run, it will execute the
-next part, lines 18-20, and compare the output of that script (llength
-$window) with "1". If the result is not "1", a failure is recorded. If
-it is "1", a pass is recorded.
-
-Finally, the test file is done and exits on line 28.
diff --git a/gdb/testsuite/gdb.gdbtk/browser.exp b/gdb/testsuite/gdb.gdbtk/browser.exp
deleted file mode 100644
index 9869bc4ee48..00000000000
--- a/gdb/testsuite/gdb.gdbtk/browser.exp
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1998, 1999, 2001 Red Hat, Inc.
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License (GPL) 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.
-
-load_lib insight-support.exp
-
-if {[gdbtk_initialize_display]} {
-  if {$tracelevel} {
-    strace $tracelevel
-  }
-
-  #
-  # test browser window
-  #
-  set prms_id 0
-  set bug_id 0
-
-  set testfile "stack"
-  set binfile ${objdir}/${subdir}/${testfile}
-  set r [gdb_compile "${srcdir}/${subdir}/stack1.c ${srcdir}/${subdir}/stack2.c" "${binfile}" executable {debug}]
-  if  { $r != "" } {
-    gdb_suppress_entire_file \
-      "Testcase compile failed, so some tests in this file will automatically fail."
-  }
-
-  # Start with a fresh gdbtk
-  gdb_exit
-  set results [gdbtk_start [file join $srcdir $subdir browser.test]]
-  set results [split $results \n]
-
-  # Analyze results
-  gdbtk_done $results
-}
diff --git a/gdb/testsuite/gdb.gdbtk/browser.test b/gdb/testsuite/gdb.gdbtk/browser.test
deleted file mode 100644
index 9e358dab1a5..00000000000
--- a/gdb/testsuite/gdb.gdbtk/browser.test
+++ /dev/null
@@ -1,686 +0,0 @@
-# Browser Window Tests
-# Copyright 1998, 2001 Red Hat, Inc.
-#
-# 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.
-
-# Please email any bugs, comments, and/or additions to this file to:
-# bug-gdb@prep.ai.mit.edu
-
-# This file was written by Keith Seitz (keiths@cygnus.com)
-
-# Read in the standard defs file
-
-if {![gdbtk_read_defs]} {
-  break
-}
-
-global objdir test_ran
-set _files(stupid_initializer) -100
-
-#####                            #####
-#                                    #
-#  Helper functions for this module  #
-#                                    #
-#####                            #####
-
-# Set the search expression
-proc set_regexp {exp} {
-  global browser
-
-  $browser component filt_entry delete 0 end
-  $browser component filt_entry insert 0 $exp
-}
-
-# Do the search
-proc do_search {} {
-  global browser
-  $browser search
-  set m [$browser component func_box get 0 end]
-
-  return $m
-}
-
-# Set search to use regular expressions.
-proc set_search_mode {val} {
-  global browser
-  pref set gdb/search/filter_mode $val
-
-  # Use configure instead of entryset: need to have
-  # combobox's command fire
-  $browser component filt_type configure -value $val
-}
-
-# Highlight a file
-proc select {filename} {
-  global browser _files
-
-  if {[info exists _files($filename)]} {
-    $browser component file_box selection set $_files($filename)
-  } else {
-    set files [$browser component file_box get 0 end]
-    set i [lsearch $files $filename]
-    set _files($filename) $i
-    $browser component file_box selection set $i
-  }
-  $browser search
-}
-
-proc select_all {} {
-  global browser
-  
-  $browser component file_all invoke
-
-}
-
-# clear all files
-proc clear {} {
-  global browser
-
-  $browser component file_box selection clear 0 end
-  $browser search
-}
-
-#####         #####
-#                 #
-#  BROWSER TESTS  #
-#                 #
-#####         #####
-
-# Load the test executable
-set program [file join $objdir stack]
-if {[catch {gdbtk_test_file $program} t]} {
-  # This isn't a test case, since if this fails, we're hosed.
-  gdbtk_test_error "loading \"$program\": $t"
-}
-
-# Open a browser
-set browser [ManagedWin::open BrowserWin]
-
-# Test:  browser-1.1
-# Desc:  Check file listbox contents
-gdbtk_test browser-1.1 {file listbox contents} {
-  set m [$browser component file_box get 0 end]
-  set f {}
-  if {[lsearch $m stack1.c] == -1} {
-    lappend f 0
-  } else {
-    lappend f 1
-  }
-  if {[lsearch $m stack2.c] == -1} {
-    lappend f 0
-  } else {
-    lappend f 1
-  }
-
-  join $f \ 
-} {1 1}
-
-# Tests 2.* test starts with search mode.
-# Test:  browser-2.1
-# Desc:  Check all files/all funcs
-gdbtk_test browser-2.1 {all files/all funcs} {
-  set_search_mode "starts with"
-  set_regexp ""
-  select_all
-  set m [do_search]
-  set r 0
-  foreach f {extern_func1_1 extern_func1_10 extern_func1_11 extern_func1_12 \
-	       extern_func1_13 extern_func1_14 extern_func1_15 extern_func1_2 \
-	       extern_func1_3 extern_func1_4 extern_func1_5 extern_func1_6 \
-	       extern_func1_7 extern_func1_8 extern_func1_9 func_1 \
-	       func_10 func_11 func_12 func_13 \
-	       func_14 func_15 func_2 func_3 \
-	       func_4 func_5 func_6 func_7 \
-	       func_8 func_9 main static_func_1 \
-	       static_func_10 static_func_11 static_func_12 static_func_13 \
-	       static_func_14 static_func_15 static_func_2 static_func_3 \
-	       static_func_4 static_func_5 static_func_6 static_func_7 \
-	       static_func_8 static_func_9} {
-    if {[lsearch $m $f] != -1} {
-      incr r
-    }
-  }
-
-  set r
-} {46}
-
-# Test:  browser-2.2
-# Desc:  Check all functions in stack1.c
-gdbtk_test browser-2.2 {all functions in stack1.c} {
-  set_regexp ""
-  clear
-  select stack1.c
-  set m [do_search]
-
-  set r 0
-  foreach f {func_1 func_10 func_11 func_12 \
-	       func_13 func_14 func_15 func_2 \
-	       func_3 func_4 func_5 func_6 \
-	       func_7 func_8 func_9 main \
-	       static_func_1 static_func_10 static_func_11 static_func_12 \
-	       static_func_13 static_func_14 static_func_15 static_func_2 \
-	       static_func_3 static_func_4 static_func_5 static_func_6 \
-	       static_func_7 static_func_8 static_func_9} {
-    if {[lsearch $m $f] != -1} {
-      incr r
-    }
-  }
-
-  set r
-} {31}
-if {$test_ran} {
-  clear
-}
-
-# Test:  browser-2.3
-# Desc:  Check all functions in stack2.c
-gdbtk_test browser-2.3 {all functions in stack2.c} {
-  set_regexp ""
-  clear
-  select stack2.c
-  set m [do_search]
-
-  set r 0
-  foreach f {extern_func1_1 extern_func1_10 extern_func1_11 \
-	       extern_func1_12 extern_func1_13 extern_func1_14 extern_func1_15 \
-	       extern_func1_2 extern_func1_3 extern_func1_4 extern_func1_5 \
-	       extern_func1_6 extern_func1_7 extern_func1_8 extern_func1_9} {
-    if {[lsearch $m $f] != -1} {
-      incr r
-    }
-  }
-
-  set r
-} {15}
-if {$test_ran} {
-  clear
-}
-
-# Test:  browser-2.4
-# Desc:  Check for all functions matching "func" - mode starts with
-gdbtk_test browser-2.4 {all functions matching "func" - "mode starts with"} {
-  set_search_mode "starts with"
-  select_all
-  set_regexp func
-  do_search
-} {func_1 func_10 func_11 func_12 func_13 func_14 func_15 func_2 func_3 func_4 func_5 func_6 func_7 func_8 func_9}
-
-# Test:  browser-2.5
-# Desc:  Check all functions matching "func" in stack1.c - mode starts with
-gdbtk_test browser-2.5 {all functions matching "func" in stack1.c - "mode starts with"} {
-  set_search_mode "starts with"
-  set_regexp func
-  clear
-  select stack1.c
-  do_search
-} {func_1 func_10 func_11 func_12 func_13 func_14 func_15 func_2 func_3 func_4 func_5 func_6 func_7 func_8 func_9}
-
-# Test:  browser-2.6
-# Desc:  Check all functions matching "funcs" in stack2.c - mode starts with
-gdbtk_test browser-2.6 {all functions matching "func" in stack2.c - mode "starts with"} {
-  set_search_mode "starts with"
-  set_regexp func
-  clear
-  select stack2.c
-  do_search
-} {}
-if {$test_ran} {
-  clear
-}
-
-# Test:  browser-2.7
-# Desc:  Check all functions matching "foobar"
-gdbtk_test browser-2.7 {all functions matching "foobar"} {
-  set_search_mode "starts with"
-  select_all
-  set_regexp foobar
-  do_search
-} {}
-
-# Test:  browser-2.8
-# Desc:  Check all functions matching "foobar" in stack1.c
-gdbtk_test browser-2.8 {functions matching "foobar" in stack1.c} {
-  set_search_mode "starts with"
-  set_regexp foobar
-  clear
-  select stack1.c
-  do_search
-} {}
-
-# Tests 3.* test "contains" search mode.
-# Test:  browser-3.1
-# Desc:  Check all files/all funcs
-gdbtk_test browser-3.1 {all files/all funcs} {
-  set_search_mode "contains"
-  set_regexp ""
-  select_all
-  set m [do_search]
-  set r 0
-  foreach f {extern_func1_1 extern_func1_10 extern_func1_11 extern_func1_12 \
-	       extern_func1_13 extern_func1_14 extern_func1_15 extern_func1_2 \
-	       extern_func1_3 extern_func1_4 extern_func1_5 extern_func1_6 \
-	       extern_func1_7 extern_func1_8 extern_func1_9 func_1 \
-	       func_10 func_11 func_12 func_13 \
-	       func_14 func_15 func_2 func_3 \
-	       func_4 func_5 func_6 func_7 \
-	       func_8 func_9 main static_func_1 \
-	       static_func_10 static_func_11 static_func_12 static_func_13 \
-	       static_func_14 static_func_15 static_func_2 static_func_3 \
-	       static_func_4 static_func_5 static_func_6 static_func_7 \
-	       static_func_8 static_func_9} {
-    if {[lsearch $m $f] != -1} {
-      incr r
-    }
-  }
-
-  set r
-} {46}
-
-# Test:  browser-3.2
-# Desc:  Check all functions in stack1.c
-gdbtk_test browser-3.2 {all functions in stack1.c} {
-  set_regexp ""
-  set_search_mode "contains"
-  clear
-  select stack1.c
-  set m [do_search]
-
-  set r 0
-  foreach f {func_1 func_10 func_11 func_12 \
-	       func_13 func_14 func_15 func_2 \
-	       func_3 func_4 func_5 func_6 \
-	       func_7 func_8 func_9 main \
-	       static_func_1 static_func_10 static_func_11 static_func_12 \
-	       static_func_13 static_func_14 static_func_15 static_func_2 \
-	       static_func_3 static_func_4 static_func_5 static_func_6 \
-	       static_func_7 static_func_8 static_func_9} {
-    if {[lsearch $m $f] != -1} {
-      incr r
-    }
-  }
-
-  set r
-} {31}
-
-if {$test_ran} {
-  clear
-}
-
-# Test:  browser-3.3
-# Desc:  Check all functions in stack2.c
-gdbtk_test browser-3.3 {all functions in stack2.c} {
-  set_regexp ""
-  set_search_mode "contains"
-  clear
-  select stack2.c
-  set m [do_search]
-
-  set r 0
-  foreach f {extern_func1_1 extern_func1_10 extern_func1_11 \
-	       extern_func1_12 extern_func1_13 extern_func1_14 extern_func1_15 \
-	       extern_func1_2 extern_func1_3 extern_func1_4 extern_func1_5 \
-	       extern_func1_6 extern_func1_7 extern_func1_8 extern_func1_9} {
-    if {[lsearch $m $f] != -1} {
-      incr r
-    }
-  }
-
-  set r
-} {15}
-if {$test_ran} {
-  clear
-}
-
-# Test:  browser-3.4
-# Desc:  Check for all functions matching "func" - mode contains
-gdbtk_test browser-3.4 {all functions matching "func_1" - "mode contains"} {
-  set_search_mode "contains"
-  set_regexp "func_1"
-  select_all
-  do_search
-} {func_1 func_10 func_11 func_12 func_13 func_14 func_15 static_func_1 static_func_10 static_func_11 static_func_12 static_func_13 static_func_14 static_func_15}
-
-# Test:  browser-3.5
-# Desc:  Check all functions matching "func_1" in stack1.c - mode contains
-gdbtk_test browser-3.5 {all functions matching "func_1" in stack1.c - "mode contains"} {
-  set_search_mode "contains"
-  set_regexp "func_1"
-  clear
-  select stack1.c
-  do_search
-} {func_1 func_10 func_11 func_12 func_13 func_14 func_15 static_func_1 static_func_10 static_func_11 static_func_12 static_func_13 static_func_14 static_func_15}
-
-# Test:  browser-3.6
-# Desc:  Check all functions matching "func_1" in stack2.c - mode contains
-gdbtk_test browser-3.6 {all functions matching "func" in stack2.c - mode "contains"} {
-  set_search_mode "contains"
-  set_regexp func_1
-  clear
-  select stack2.c
-  do_search
-} {}
-
-# Test:  browser-3.7
-# Desc:  Check all functions matching "foobar"
-gdbtk_test browser-3.7 {all functions matching "foobar"} {
-  set_search_mode "contains"
-  select_all
-  set_regexp foobar
-  do_search
-} {}
-
-# Test:  browser-3.8
-# Desc:  Check all functions matching "foobar" in stack1.c
-gdbtk_test browser-3.8 {functions matching "foobar" in stack1.c} {
-  set_search_mode "contains"
-  set_regexp foobar
-  clear
-  select stack1.c
-  do_search
-} {}
-
-# Tests 4.* test "ends with" search mode.
-# Test:  browser-4.1
-# Desc:  Check all files/all funcs
-gdbtk_test browser-4.1 {all files/all funcs} {
-  set_search_mode "ends with"
-  set_regexp ""
-  select_all
-  set m [do_search]
-  set r 0
-  foreach f {extern_func1_1 extern_func1_10 extern_func1_11 extern_func1_12 \
-	       extern_func1_13 extern_func1_14 extern_func1_15 extern_func1_2 \
-	       extern_func1_3 extern_func1_4 extern_func1_5 extern_func1_6 \
-	       extern_func1_7 extern_func1_8 extern_func1_9 func_1 \
-	       func_10 func_11 func_12 func_13 \
-	       func_14 func_15 func_2 func_3 \
-	       func_4 func_5 func_6 func_7 \
-	       func_8 func_9 main static_func_1 \
-	       static_func_10 static_func_11 static_func_12 static_func_13 \
-	       static_func_14 static_func_15 static_func_2 static_func_3 \
-	       static_func_4 static_func_5 static_func_6 static_func_7 \
-	       static_func_8 static_func_9} {
-    if {[lsearch $m $f] > -1} {
-      incr r
-    }
-  }
-
-  set r
-} {46}
-
-# Test:  browser-4.2
-# Desc:  Check all functions in stack1.c
-gdbtk_test browser-4.2 {all functions in stack1.c} {
-  set_regexp ""
-  set_search_mode "ends with"
-  clear
-  select stack1.c
-  set m [do_search]
-
-  set r 0
-  foreach f {func_1 func_10 func_11 func_12 \
-	       func_13 func_14 func_15 func_2 \
-	       func_3 func_4 func_5 func_6 \
-	       func_7 func_8 func_9 main \
-	       static_func_1 static_func_10 static_func_11 static_func_12 \
-	       static_func_13 static_func_14 static_func_15 static_func_2 \
-	       static_func_3 static_func_4 static_func_5 static_func_6 \
-	       static_func_7 static_func_8 static_func_9} {
-    if {[lsearch $m $f] != -1} {
-      incr r
-    }
-  }
-
-  set r
-} {31}
-
-if {$test_ran} {
-  clear
-}
-
-# Test:  browser-4.3
-# Desc:  Check all functions in stack2.c
-gdbtk_test browser-4.3 {all functions in stack2.c} {
-  set_regexp ""
-  set_search_mode "ends with"
-  clear
-  select stack2.c
-  set m [do_search]
-
-  set r 0
-  foreach f {extern_func1_1 extern_func1_10 extern_func1_11 \
-	       extern_func1_12 extern_func1_13 extern_func1_14 extern_func1_15 \
-	       extern_func1_2 extern_func1_3 extern_func1_4 extern_func1_5 \
-	       extern_func1_6 extern_func1_7 extern_func1_8 extern_func1_9} {
-    if {[lsearch $m $f] != -1} {
-      incr r
-    }
-  }
-
-  set r
-} {15}
-if {$test_ran} {
-  clear
-}
-
-# Test:  browser-4.4
-# Desc:  Check for all functions matching "func_1" - mode ends with
-gdbtk_test browser-4.4 {all functions matching "func_1" - "mode ends with"} {
-  set_search_mode "ends with"
-  set_regexp "func_1"
-  select_all
-  do_search
-} {func_1 static_func_1}
-
-# Test:  browser-4.5
-# Desc:  Check all functions matching "func_1" in stack1.c - mode ends with
-gdbtk_test browser-4.5 {all functions matching "func_1" in stack1.c - "mode ends with"} {
-  set_search_mode "ends with"
-  set_regexp "func_1"
-  clear
-  select stack1.c
-  do_search
-} {func_1 static_func_1}
-if {$test_ran} {
-  clear
-}
-
-# Test:  browser-4.6
-# Desc:  Check all functions matching "func_1" in stack2.c - mode ends with
-gdbtk_test browser-4.6 {all functions matching "func" in stack2.c - mode "ends with"} {
-  set_search_mode "ends with"
-  set_regexp func_1
-  clear
-  select stack2.c
-  do_search
-} {}
-
-# Test:  browser-4.7
-# Desc:  Check all functions matching "foobar"
-gdbtk_test browser-4.7 {all functions matching "foobar"} {
-  set_search_mode "ends with"
-  select_all
-  set_regexp foobar
-  do_search
-} {}
-
-# Test:  browser-4.8
-# Desc:  Check all functions matching "foobar" in stack1.c
-gdbtk_test browser-4.8 {functions matching "foobar" in stack1.c} {
-  set_search_mode "ends with"
-  set_regexp foobar
-  clear
-  select stack1.c
-  do_search
-} {}
-if {$test_ran} {
-  clear
-}
-
-# Test:  browser-5.10
-# Desc:  Check all functions matching regexp "func"
-gdbtk_test browser-5.10 {all functions matching regexp "func"} {
-  set_search_mode "matches regexp"
-  set_regexp func
-  select_all
-  do_search
-} {extern_func1_1 extern_func1_10 extern_func1_11 extern_func1_12 extern_func1_13 extern_func1_14 extern_func1_15 extern_func1_2 extern_func1_3 extern_func1_4 extern_func1_5 extern_func1_6 extern_func1_7 extern_func1_8 extern_func1_9 func_1 func_10 func_11 func_12 func_13 func_14 func_15 func_2 func_3 func_4 func_5 func_6 func_7 func_8 func_9 static_func_1 static_func_10 static_func_11 static_func_12 static_func_13 static_func_14 static_func_15 static_func_2 static_func_3 static_func_4 static_func_5 static_func_6 static_func_7 static_func_8 static_func_9}
-
-# Test:  browser-5.11
-# Desc:  Check all functions matching regexp "func" in stack1.c
-gdbtk_test browser-5.11 {all functions matching regexp "func" in stack1.c} {
-  set_search_mode "matches regexp"
-  set_regexp func
-  clear
-  select stack1.c
-  do_search
-} {func_1 func_10 func_11 func_12 func_13 func_14 func_15 func_2 func_3 func_4 func_5 func_6 func_7 func_8 func_9 static_func_1 static_func_10 static_func_11 static_func_12 static_func_13 static_func_14 static_func_15 static_func_2 static_func_3 static_func_4 static_func_5 static_func_6 static_func_7 static_func_8 static_func_9}
-
-# Test:  browser-5.12
-# Desc:  Check all functions matching regexp "func" in stack2.c
-gdbtk_test browser-5.12 {all functions matching regexp "func" in stack2.c} {
-  set_regexp func
-  clear
-  select stack2.c
-  do_search
-} {extern_func1_1 extern_func1_10 extern_func1_11 extern_func1_12 extern_func1_13 extern_func1_14 extern_func1_15 extern_func1_2 extern_func1_3 extern_func1_4 extern_func1_5 extern_func1_6 extern_func1_7 extern_func1_8 extern_func1_9}
-
-# Test:  browser-5.13
-# Desc:  Check all functions matching regexp "\_1$"
-gdbtk_test browser-5.13 {all functions matching regexp "\_1$"} {
-  set_search_mode "matches regexp"
-  set_regexp {\_1$}
-  select_all
-  do_search
-} {extern_func1_1 func_1 static_func_1}
-
-# Test:  browser-5.14
-# Desc:  Check all functions matching regexp "\_1$" in stack1.c
-gdbtk_test browser-5.14 {all functions matching regexp "\_1$" in stack1.c} {
-  set_search_mode "matches regexp"
-  set_regexp {\_1$}
-  clear
-  select stack1.c
-  do_search
-} {func_1 static_func_1}
-
-# Test:  browser-5.15
-# Desc:  Check all functions matching regexp "\_1$" in stack2.c
-gdbtk_test browser-5.15 {all functions matching regexp "\_1$" in stack2.c} {
-  set_search_mode "matches regexp"
-  set_regexp {\_1$}
-  clear
-  select stack2.c
-  do_search
-} {extern_func1_1}
-
-# Test:  browser-5.16
-# Desc:  Check all functions matching regexp "foobar"
-gdbtk_test browser-5.16 {all functions matching regexp "foobar"} {
-  set_search_mode "matches regexp"
-  set_regexp foobar
-  select_all
-  do_search
-} {}
-
-# Test:  browser-5.17
-# Desc:  Check all functions matching regexp "foobar" in stack1.c
-gdbtk_test browser-5.17 {all functions matching regexp "foobar" in stack1.c} {
-  set_search_mode "matches regexp"
-  set_regexp foobar
-  clear
-  select stack1.c
-  do_search
-} {}
-
-
-# Test:  browser-6.1
-# Desc:  Check select button function
-gdbtk_test browser-6.1 {select button - select all} {
-  clear
-  select_all
-  set m [$browser component file_box curselection]
-
-  expr {[llength $m] >= 2}
-} {1}
-
-# Test:  browser-6.2
-# Desc:  Check that search expressions are saved
-gdbtk_test browser-6.2 {save last search expression} {
-  set_regexp hello
-  select_all
-  do_search
-  pref get gdb/search/last_symbol
-} {hello}
-
-# Test:  browser-7.1
-# Desc:  Toggle all bps on
-gdbtk_test browser-7.1 {toggle_all_bp on} {
-  set_regexp {\_1$}
-  set_search_mode "matches regexp"
-  select_all
-  set funcs [do_search]
-
-  # select all to set bp on
-  $browser component func_box selection set 0 end
-  $browser component func_add_bp invoke
-
-  set bps {}
-  foreach f $funcs {
-    if {![catch {gdb_loc $f} ls]} {
-      if {[bp_exists $ls] != -1} {
-	lappend bps $f
-      }
-    }
-  }
-
-  catch {gdb_cmd "delete" 0}
-  join [lsort $bps]
-} {extern_func1_1 func_1 static_func_1}
-
-# Test:  browser-7.2
-# Desc:  Toggle some bps off
-gdbtk_test browser-7.2 {toggle_some_bp off} {
-  set_regexp {\_1$}
-  set_search_mode "matches regexp"
-  select_all
-  set funcs [do_search]
-
-  $browser component func_box selection set 0 end
-  $browser component func_add_bp invoke
-
-  # Turn off all the "static_func_*" bps
-  set_regexp {^static.*_1$}
-  do_search
-  $browser component func_box selection set 0 end
-  $browser component func_remove_bp invoke
-  set bps {}
-  foreach f $funcs {
-    if {![catch {gdb_loc $f} ls]} {
-      if {[bp_exists $ls] != -1} {
-	lappend bps $f
-      }
-    }
-  }
-
-  catch {gdb_cmd "delete" 0}
-
-  join [lsort $bps]
-} {extern_func1_1 func_1}
-
-#
-#  Exit
-#
-gdbtk_test_done
diff --git a/gdb/testsuite/gdb.gdbtk/c_variable.c b/gdb/testsuite/gdb.gdbtk/c_variable.c
deleted file mode 100644
index 461d5cee2fa..00000000000
--- a/gdb/testsuite/gdb.gdbtk/c_variable.c
+++ /dev/null
@@ -1,296 +0,0 @@
-struct _simple_struct {
-  int integer;
-  unsigned int unsigned_integer;
-  char character;
-  signed char signed_character;
-  char *char_ptr;
-  int array_of_10[10];
-};
-
-typedef struct _simple_struct simpleton;
-
-simpleton global_simple;
-
-enum foo {
-  bar = 1,
-  baz
-};
-
-typedef enum foo efoo;
-
-union named_union
-{
-  int integer;
-  char *char_ptr;
-};
-
-typedef struct _struct_decl {
-  int   integer;
-  char  character;
-  char *char_ptr;
-  long  long_int;
-  int  **int_ptr_ptr;
-  long  long_array[10];
-
-  void (*func_ptr) (void);
-  struct _struct_decl (*func_ptr_struct) (int, char *, long);
-  struct _struct_decl *(*func_ptr_ptr) (int, char *, long);
-  union {
-    int   a;
-    char *b;
-    long  c;
-    enum foo d;
-  } u1;
-
-  struct {
-    union {
-      struct {
-        int d;
-        char e[10];
-        int *(*func) (void);
-        efoo foo;
-      } u1s1;
-
-      long f;
-      struct {
-        char array_ptr[2];
-        int (*func) (int, char *);
-      } u1s2;
-    } u2;
-
-    int g;
-    char h;
-    long i[10];
-  } s2;
-} weird_struct;
-
-struct _struct_n_pointer {
-  char ****char_ptr;
-  long ****long_ptr;
-  struct _struct_n_pointer *ptrs[3];
-  struct _struct_n_pointer *next;
-};
-
-void do_locals_tests (void);
-void do_block_tests (void);
-void subroutine1 (int, long *);
-void nothing (void);
-void do_children_tests (void);
-void do_special_tests (void);
-void incr_a (int);
-
-void incr_a (int a)
-{
-  int b;
-  b = a;
-}
-
-void
-do_locals_tests ()
-{
-  int linteger;
-  int *lpinteger;
-  char lcharacter;
-  char *lpcharacter;
-  long llong;
-  long *lplong;
-  float lfloat;
-  float *lpfloat;
-  double ldouble;
-  double *lpdouble;
-  struct _simple_struct lsimple;
-  struct _simple_struct *lpsimple;
-  void (*func) (void);
-
-  /* Simple assignments */
-  linteger = 1234;
-  lpinteger = &linteger;
-  lcharacter = 'a';
-  lpcharacter = &lcharacter;
-  llong = 2121L;
-  lplong = &llong;
-  lfloat = 2.1;
-  lpfloat = &lfloat;
-  ldouble = 2.718281828459045;
-  lpdouble = &ldouble;
-  lsimple.integer = 1234;
-  lsimple.unsigned_integer = 255;
-  lsimple.character = 'a';
-  lsimple.signed_character = 21;
-  lsimple.char_ptr = &lcharacter;
-  lpsimple = &lsimple;
-  func = nothing;
-
-  /* Check pointers */
-  linteger = 4321;
-  lcharacter = 'b';
-  llong = 1212L;
-  lfloat = 1.2;
-  ldouble = 5.498548281828172;
-  lsimple.integer = 255;
-  lsimple.unsigned_integer = 4321;
-  lsimple.character = 'b';
-  lsimple.signed_character = 0;
-
-  subroutine1 (linteger, &llong);
-}
-
-void
-nothing ()
-{
-}
-
-void
-subroutine1 (int i, long *l)
-{
-  global_simple.integer = i + 3;
-  i = 212;
-  *l = 12;
-}
-
-void
-do_block_tests ()
-{
-  int cb = 12;
-
-  {
-    int foo;
-    foo = 123;
-    {
-      int foo2;
-      foo2 = 123;
-      {
-        int foo;
-        foo = 321;
-      }
-      foo2 = 0;
-    }
-    foo = 0;
-  }
-
-  cb = 21;
-}
-
-void
-do_children_tests (void)
-{
-  weird_struct *weird;
-  struct _struct_n_pointer *psnp;
-  struct _struct_n_pointer snp0, snp1, snp2;
-  char a0, *a1, **a2, ***a3;
-  char b0, *b1, **b2, ***b3;
-  char c0, *c1, **c2, ***c3;
-  long z0, *z1, **z2, ***z3;
-  long y0, *y1, **y2, ***y3;
-  long x0, *x1, **x2, ***x3;
-  int *foo;
-  int bar;
-
-  struct _struct_decl struct_declarations;
-  weird = &struct_declarations;
-
-  struct_declarations.integer = 123;
-  weird->char_ptr = "hello";
-  bar = 2121;
-  foo = &bar;
-  struct_declarations.int_ptr_ptr = &foo;
-  weird->long_array[0] = 1234;
-  struct_declarations.long_array[1] = 2345;
-  weird->long_array[2] = 3456;
-  struct_declarations.long_array[3] = 4567;
-  weird->long_array[4] = 5678;
-  struct_declarations.long_array[5] = 6789;
-  weird->long_array[6] = 7890;
-  struct_declarations.long_array[7] = 8901;
-  weird->long_array[8] = 9012;
-  struct_declarations.long_array[9] = 1234;
-
-  weird->func_ptr = nothing;
-
-  /* Struct/pointer/array tests */
-  a0 = '0';
-  a1 = &a0;
-  a2 = &a1;
-  a3 = &a2;
-  b0 = '1';
-  b1 = &b0;
-  b2 = &b1;
-  b3 = &b2;
-  c0 = '2';
-  c1 = &c0;
-  c2 = &c1;
-  c3 = &c2;
-  z0 = 0xdead + 0;
-  z1 = &z0;
-  z2 = &z1;
-  z3 = &z2;
-  y0 = 0xdead + 1;
-  y1 = &y0;
-  y2 = &y1;
-  y3 = &y2;
-  x0 = 0xdead + 2;
-  x1 = &x0;
-  x2 = &x1;
-  x3 = &x2;
-  snp0.char_ptr = &a3;
-  snp0.long_ptr = &z3;
-  snp0.ptrs[0] = &snp0;
-  snp0.ptrs[1] = &snp1;
-  snp0.ptrs[2] = &snp2;
-  snp0.next = &snp1;
-  snp1.char_ptr = &b3;
-  snp1.long_ptr = &y3;
-  snp1.ptrs[0] = &snp0;
-  snp1.ptrs[1] = &snp1;
-  snp1.ptrs[2] = &snp2;
-  snp1.next = &snp2;
-  snp2.char_ptr = &c3;
-  snp2.long_ptr = &x3;
-  snp2.ptrs[0] = &snp0;
-  snp2.ptrs[1] = &snp1;
-  snp2.ptrs[2] = &snp2;
-  snp2.next = 0x0;
-  psnp = &snp0;
-  snp0.char_ptr = &b3;
-  snp1.char_ptr = &c3;
-  snp2.char_ptr = &a3;
-  snp0.long_ptr = &y3;
-  snp1.long_ptr = &x3;
-  snp2.long_ptr = &z3;
-}
-
-void
-do_special_tests (void)
-{
-  union named_union u;
-  union {
-    int a;
-    char b;
-    long c;
-  } anonu;
-  struct _simple_struct s;
-  struct {
-    int a;
-    char b;
-    long c;
-  } anons;
-  enum foo e;
-  enum { A, B, C } anone;
-  int array[21];
-  int a;
-
-  a = 1;   
-  incr_a(2);
-}
-
-int
-main (int argc, char *argv [])
-{
-  do_locals_tests ();
-  do_block_tests ();
-  do_children_tests ();
-  do_special_tests ();
-  exit (0);
-}
-
-  
diff --git a/gdb/testsuite/gdb.gdbtk/c_variable.exp b/gdb/testsuite/gdb.gdbtk/c_variable.exp
deleted file mode 100644
index 4ef8b6f361b..00000000000
--- a/gdb/testsuite/gdb.gdbtk/c_variable.exp
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999, 2001 Red Hat, Inc.
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License (GPL) 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.
-
-load_lib insight-support.exp
-
-if {[gdbtk_initialize_display]} {
-  if {$tracelevel} {
-    strace $tracelevel
-  }
-
-  #
-  # test variable API
-  #
-  set prms_id 0
-  set bug_id 0
-
-  set testfile "c_variable"
-  set srcfile ${testfile}.c
-  set binfile ${objdir}/${subdir}/${testfile}
-  set r [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}]
-  if  { $r != "" } {
-    gdb_suppress_entire_file \
-      "Testcase compile failed, so some tests in this file will automatically fail."
-  }
-
-  # Start with a fresh gdbtk
-  gdb_exit
-  set results [gdbtk_start [file join $srcdir $subdir ${testfile}.test]]
-  set results [split $results \n]
-
-  # Analyze results
-  gdbtk_done $results
-}
diff --git a/gdb/testsuite/gdb.gdbtk/c_variable.test b/gdb/testsuite/gdb.gdbtk/c_variable.test
deleted file mode 100644
index 625ac7c017d..00000000000
--- a/gdb/testsuite/gdb.gdbtk/c_variable.test
+++ /dev/null
@@ -1,2071 +0,0 @@
-# Varobj Tests (C language)
-# Copyright 1998, 2001, 2003 Red Hat, Inc.
-#
-# 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.
-
-# Please email any bugs, comments, and/or additions to this file to:
-# insight@sources.redhat.com
-
-# This file was written by Keith Seitz (keiths@cygnus.com)
-
-# Read in the standard defs file
-if {![gdbtk_read_defs]} {
-  break
-}
-
-global objdir test_ran
-
-# Load in a file
-set program [file join $objdir c_variable]
-if {[catch {gdbtk_test_file $program} t]} {
-  # This isn't a test case, since if this fails, we're hosed.
-  gdbtk_test_error "loading \"$program\": $t"
-}
-
-# The variables that are created are stored in an array called "var".
-
-# proc to tell us which of the variables are changed/out of scope
-proc check_update {} {
-  global var
-
-  set out {}
-  set changed {}
-  foreach ind [array names var] {
-    set ret [$var($ind) update]
-    if {$ret == -1} {
-	lappend out $ind
-    } elseif {$ret != ""} {
-        lappend changed $ret
-    }
-  }
-  return [list $changed $out]
-}
-
-# proc to create a variable
-proc create_variable {expr} {
-  global var
-
-  set err [catch {gdb_variable create "$expr" -expr $expr} v]
-  if {!$err} {
-    set var($expr) $v
-  }
-
-  return $err
-}
-
-# proc to get the children
-# Children are stored in the global "var" as
-# PARENT.child. So for struct _foo {int a; int b} bar;,
-# the children returned are {a b} and var(bar.a) and var(bar.b)
-# map the actual objects to their names.
-proc get_children {parent} {
-  global var
-
-  set kiddies [$var($parent) children]
-  set children {}
-  foreach child $kiddies {
-    set name [lindex [split $child .] end]
-    lappend children $name
-    set var($parent.$name) $child
-  }
-
-  return $children
-}
-
-proc delete_variable {varname} {
-  global var
-
-  if {[info exists var($varname)]} {
-    # This has to be caught, since deleting a parent
-    # will erase all children.
-    $var($varname) delete
-    set vars [array names var $varname*]
-    foreach v $vars {
-      if {[info exists var($v)]} {
-	unset var($v)
-      }
-    }
-  }
-}
-
-# Compare the values of variable V in format FMT
-# with gdb's value.
-proc value {v fmt} {
-  global var
-  global _test
-
-  set value [$var($v) value]
-  set gdb [gdb_cmd "output/$fmt $v"]
-  if {$value == $gdb} {
-    set result ok
-  } else {
-    set result $v
-    puts $_test(logfile) "output/$fmt $v"
-    puts $_test(logfile) "gdbtk: $value <> gdb: $gdb"
-  }
-
-  return $result
-}
-
-proc delete_all_variables {} {
-  global var
-
-  foreach variable [array names var] {
-    delete_variable $variable
-  }
-}
-
-proc editable_variables {} {
-  global var
-
-  set yes {}
-  set no {}
-  foreach name [array names var] {
-    if {[$var($name) editable]} {
-      lappend yes $name
-    } else {
-      lappend no $name
-    }
-  }
-
-  return [list $yes $no]
-}
-
-
-#####                   #####
-#                           #
-#  Variable Creation tests  #
-#                           #
-#####                   #####
-
-# Test:  c_variable-1.1
-# Desc:  Create global variable
-gdbtk_test c_variable-1.1 {create global variable} {
-  create_variable global_simple
-} {0}
-
-# Test: c_variable-1.2
-# Desc: Create non-existent variable
-gdbtk_test c_variable-1.2 {create non-existent variable} {
-  create_variable bogus_unknown_variable
-} {1}
-
-# Test: c_variable-1.3
-# Desc: Create out of scope variable
-gdbtk_test c_variable-1.3 {create out of scope variable} {
-  create_variable argc
-} {1}
-
-# Break in main and run
-gdb_cmd "break do_locals_tests"
-gdbtk_test_run
-
-# Test: c_variable-1.4
-# Desc: create local variables
-gdbtk_test c_variable-1.4 {create local variables} {
-  set results {}
-  foreach v {linteger lpinteger lcharacter lpcharacter llong lplong lfloat lpfloat ldouble lpdouble lsimple lpsimple func} {
-    lappend results [create_variable $v]
-  }
-  set results
-} {0 0 0 0 0 0 0 0 0 0 0 0 0}
-
-# Test: c_variable-1.5
-# Desc: create lsimple.character
-gdbtk_test c_variable-1.5 {create lsimple.character} {
-  create_variable lsimple.character
-} {0}
-
-# Test: c_variable-1.6
-# Desc: create lpsimple->integer
-gdbtk_test c_variable-1.6 {create lpsimple->integer} {
-  create_variable lpsimple->integer
-} {0}
-
-# Test: c_variable-1.7
-# Desc: create lsimple.integer
-gdbtk_test c_variable-1.7 {create lsimple.integer} {
-  create_variable lsimple.integer
-} {0}
-
-# Test: c_variable-1.8
-# Desc: names of editable variables
-gdbtk_test c_variable-1.8 {names of editable variables} {
-  editable_variables
-} {{lsimple.character lsimple.integer lpsimple lcharacter lpcharacter linteger lpinteger lfloat lpfloat func llong lplong lpsimple->integer ldouble lpdouble} {lsimple global_simple}}
-
-# Test: c_variable-1.9
-# Desc: create type name
-#    Type names (like int, long, etc..) are all proper expressions to gdb.
-#    make sure variable code does not allow users to create variables, though.
-gdbtk_test c_variable-1.9 {create type name} {
-  create_variable int
-} {1}
-
-#####             #####
-#                     #
-# Value changed tests #
-#                     #
-#####             #####
-
-# Test: c_variable-2.1
-# Desc: check whether values changed at do_block_tests
-gdbtk_test c_variable-2.1 {check whether values changed at do_block_tests} {
-  check_update
-} {{} {}}
-
-# Step over "linteger = 1234;"
-gdb_cmd "step"
-
-# Test: c_variable-2.2
-# Desc: check whether only linteger changed values
-gdbtk_test c_variable-2.2 {check whether only linteger changed values} {
-  check_update
-} {linteger {}}
-
-# Step over "lpinteger = &linteger;"
-gdb_cmd "step"
-
-# Test: c_variable-2.3
-# Desc: check whether only lpinteger changed
-gdbtk_test c_variable-2.3 {check whether only lpinteger changed} {
-  check_update
-} {lpinteger {}}
-
-# Step over "lcharacter = 'a';"
-gdb_cmd "step"
-
-# Test: c_variable-2.4
-# Desc: check whether only lcharacter changed
-gdbtk_test c_variable-2.4 {check whether only lcharacter changed} {
-  check_update
-} {lcharacter {}}
-
-# Step over "lpcharacter = &lcharacter;"
-gdb_cmd "step"
-
-# Test: c_variable-2.5
-# Desc: check whether only lpcharacter changed
-gdbtk_test c_variable-2.5 {check whether only lpcharacter changed} {
-  check_update
-} {lpcharacter {}}
-
-# Step over:
-#  llong = 2121L;
-#  lplong = &llong;
-#  lfloat = 2.1;
-#  lpfloat = &lfloat;
-#  ldouble = 2.718281828459045;
-#  lpdouble = &ldouble;
-#  lsimple.integer = 1234;
-#  lsimple.unsigned_integer = 255;
-#  lsimple.character = 'a';
-for {set i 0} {$i < 9} {incr i} {
-  gdb_cmd "step"
-}
-
-# Test: c_variable-2.6
-# Desc: check whether llong, lplong, lfloat, lpfloat, ldouble, lpdouble, lsimple.integer,
-#       lsimple.unsigned_character lsimple.integer lsimple.character changed
-gdbtk_test c_variable-2.6 {check whether llong -- lsimple.character changed} {
-  check_update
-} {{lsimple.character lsimple.integer lfloat lpfloat llong lplong ldouble lpdouble} {}}
-
-# Step over:
-#  lsimple.signed_character = 21;
-#  lsimple.char_ptr = &lcharacter;
-#  lpsimple = &lsimple;
-#  func = nothing;
-for {set i 0} {$i < 4} {incr i} {
-  gdb_cmd "step"
-}
-
-# Test: c_variable-2.7
-# Desc: check whether lsimple.signed_character, lsimple.char_ptr, lpsimple, func changed
-gdbtk_test c_variable-2.7 {check whether lsimple.signed_character, lsimple.char_ptr, lpsimple, func changed} {
-  check_update
-} {{lpsimple func lpsimple->integer} {}}
-
-# Step over
-#  linteger = 4321;
-#  lcharacter = 'b';
-#  llong = 1212L;
-#  lfloat = 1.2;
-#  ldouble = 5.498548281828172;
-#  lsimple.integer = 255;
-#  lsimple.unsigned_integer = 4321;
-#  lsimple.character = 'b';
-for {set i 0} {$i < 8} {incr i} {
-  gdb_cmd "step"
-}
-
-# Test: c_variable-2.8
-# Desc: check whether linteger, lcharacter, llong, lfoat, ldouble, lsimple.integer,
-#       lpsimple.integer lsimple.character changed
-# Note: this test also checks that lpsimple->integer and lsimple.integer have
-#       changed (they are the same)
-gdbtk_test c_variable-2.8 {check whether linteger -- lsimple.integer changed} {
-  check_update
-} {{lsimple.character lsimple.integer lcharacter linteger lfloat llong lpsimple->integer ldouble} {}}
-
-gdb_cmd "break subroutine1"
-gdb_cmd "continue"
-
-# Test: c_variable-2.9
-# Desc: stop in subroutine1
-gdbtk_test c_variable-2.9 {stop in subroutine1} {
-  lindex [gdb_loc] 1
-} {subroutine1}
-
-# Test: c_variable-2.10
-# Desc: create variable for locals i,l in subroutine1
-gdbtk_test c_variable-2.10 {create variable for locals i,l in subroutine1} {
-  set r [create_variable i]
-  lappend r [create_variable l]  
-} {0 0}
-
-# Test: c_variable-2.11
-# Desc: create do_locals_tests local in subroutine1
-gdbtk_test c_variable-2.11 {create do_locals_tests local in subroutine1} {
-  create_variable linteger
-} {1}
-
-# Step over
-#  global_simple.integer = i + 3;
-gdb_cmd "step"
-
-# Test: c_variable-2.12
-# Desc: change global_simple.integer
-# Note: This also tests whether we are reporting changes in structs properly.
-#       gdb normally would say that global_simple has changed, but we
-#       special case that, since it is not what a human expects to see.
-gdbtk_test c_variable-2.12 {change global_simple.integer} {
-  check_update
-} {{} {lsimple.character lsimple.integer lpsimple lsimple lcharacter lpcharacter linteger lpinteger lfloat lpfloat func llong lplong lpsimple->integer ldouble lpdouble}}
-
-# Step over
-#  i = 212;
-gdb_cmd "step"
-
-# Test: c_variable-2.13
-# Desc: change subroutine1 local i
-gdbtk_test c_variable-2.13 {change subroutine1 local i} {
-  check_update
-} {i {lsimple.character lsimple.integer lpsimple lsimple lcharacter lpcharacter linteger lpinteger lfloat lpfloat func llong lplong lpsimple->integer ldouble lpdouble}}
-
-# Step over
-#  *l = 12
-gdb_cmd "step"
-
-# This test is no longer valid, since varobj now forces
-# re-evaluation in the current frame by default.
-# Test: c_variable-2.14
-# Desc: change do_locals_tests local llong
-#gdbtk_test c_variable-2.14 {change do_locals_tests local llong} {
-#  check_update
-#} {llong {}}
-
-# Leave subroutine1
-gdb_cmd "next"
-
-# Test: c_variable-2.15
-# Desc: check for out of scope subroutine1 locals
-gdbtk_test c_variable-2.15 {check for out of scope subroutine1 locals} {
-  lindex [check_update] 1
-} {i l}
-
-# Test: c_variable-2.16
-# Desc: names of all editable variables
-gdbtk_test c_variable-2.16 {names of all editable variables} {
-  editable_variables
-} {{lsimple.character lsimple.integer lpsimple i lcharacter lpcharacter linteger lpinteger lfloat lpfloat l func llong lplong lpsimple->integer ldouble lpdouble} {lsimple global_simple}}
-
-# Done with locals/globals tests. Erase all variables
-delete_all_variables
-
-#####     #####
-#             #
-# Block tests #
-#             #
-#####     #####
-gdb_cmd "break do_block_tests"
-gdb_cmd "continue"
-
-# Test: c_variable-3.1
-# Desc: stop in do_block_tests
-gdbtk_test c_variable-3.1 {stop in do_block_tests} {
-  lindex [gdb_loc] 1
-} {do_block_tests}
-
-# Test: c_variable-3.2
-# Desc: create cb and foo
-gdbtk_test c_variable-3.2 {create cb and foo} {
-  set r [create_variable cb]
-  lappend r [create_variable foo]
-} {0 1}
-
-# step to "foo = 123;"
-gdb_cmd "step"
-
-# Be paranoid and assume 3.2 created foo
-delete_variable foo
-
-# Test: c_variable-3.3
-# Desc: create foo
-gdbtk_test c_variable-3.3 {create foo} {
-  create_variable foo
-} {0}
-
-# step to "foo2 = 123;"
-gdb_cmd "step"
-
-# Test: c_variable-3.4
-# Desc: check foo, cb changed
-gdbtk_test c_variable-3.4 {check foo,cb changed} {
-  check_update
-} {{foo cb} {}}
-
-# step to "foo = 321;"
-gdb_cmd "step"
-
-# Test: c_variable-3.5
-# Desc: create inner block foo
-gdbtk_test c_variable-3.5 {create inner block foo} {
-  global var
-  set err [catch {gdb_variable create inner_foo -expr foo} v]
-  if {!$err} {
-    set var(inner_foo) $v
-  }
-  
-  set err
-} {0}
-
-# step to "foo2 = 0;"
-gdb_cmd "step"
-
-# Test: c_variable-3.6
-# Desc: create foo2
-gdbtk_test c_variable-3.6 {create foo2} { 
-  create_variable foo2
-} {0}
-
-# Test: c_variable-3.7
-# Desc: check that outer foo in scope and inner foo out of scope
-
-# Disabled for now because varobjs don't work this way.  If you create a varobj named "foo"
-# it will display the correct value for any variable named "foo" in scope. So inner_foo 
-# is not out of scope because there is another variable named "foo" in scope. It is
-# instead marked as changed.
-
-#gdbtk_test *c_variable-3.7 {check that outer foo in scope and inner foo out of scope} {
-#  check_update
-#} {{} inner_foo}
-
-delete_variable inner_foo
-
-# step to "foo = 0;"
-gdb_cmd "step"
-
-# Test: c_variable-3.8
-# Desc: check that foo2 out of scope
-gdbtk_test c_variable-3.8 {check that foo2 out of scope} {
-  check_update
-} {{} foo2}
-
-# step to "cb = 21;"
-gdb_cmd "step"
-
-# Test: c_variable-3.9
-# Desc: check that only cb is in scope
-gdbtk_test c_variable-3.9 {check that only cb is in scope} {
-  check_update
-} {{} {foo foo2}}
-
-# Test: c_variable-3.10
-# Desc: names of editable variables
-gdbtk_test c_variable-3.10 {names of editable variables} {
-  editable_variables
-} {{foo cb foo2} {}}
-
-# Done with block tests
-delete_all_variables
-
-#####        #####
-#                #
-# children tests #
-#                #
-#####        #####
-
-gdb_cmd "break do_children_tests"
-gdb_cmd "continue"
-
-# Test: c_variable-4.1
-# Desc: stopped in do_children_tests
-gdbtk_test c_variable-4.1 {stopped in do_children_tests} {
-  lindex [gdb_loc] 1
-} {do_children_tests}
-
-# Test: c_variable-4.2
-# Desc: create variable "struct_declarations"
-gdbtk_test c_variable-4.2 {create variable "struct_declarations"} {
-  create_variable struct_declarations
-} {0}
-
-# Test: c_variable-4.3
-# Desc: children of struct_declarations
-gdbtk_test c_variable-4.3 {children of struct_declarations} {
-  get_children  struct_declarations
-} {integer character char_ptr long_int int_ptr_ptr long_array func_ptr func_ptr_struct func_ptr_ptr u1 s2}
-
-# Test: c_variable-4.4
-# Desc: number of children of struct_declarations
-gdbtk_test c_variable-4.4 {number of children of struct_declarations} {
-  $var(struct_declarations) numChildren
-} {11}
-
-# Test: c_variable-4.5
-# Desc: children of struct_declarations.integer
-gdbtk_test c_variable-4.5 {children of struct_declarations.integer} {
-  get_children struct_declarations.integer
-} {}
-
-# Test: c_variable-4.6
-# Desc: number of children of struct_declarations.integer
-gdbtk_test c_variable-4.6 {number of children of struct_declarations.integer} {
-  $var(struct_declarations.integer) numChildren
-} {0}
-
-# Test: c_variable-4.7
-# Desc: children of struct_declarations.character
-gdbtk_test c_variable-4.7 {children of struct_declarations.character} {
-  get_children struct_declarations.character
-} {}
-
-# Test: c_variable-4.8
-# Desc: number of children of struct_declarations.character
-gdbtk_test c_variable-4.8 {number of children of struct_declarations.character} {
-  $var(struct_declarations.character) numChildren
-} {0}
-
-# Test: c_variable-4.9
-# Desc: children of struct_declarations.char_ptr
-gdbtk_test c_variable-4.9 {children of struct_declarations.char_ptr} {
-  get_children struct_declarations.char_ptr
-} {*char_ptr}
-
-# Test: c_variable-4.10
-# Desc: number of children of struct_declarations.char_ptr
-gdbtk_test c_variable-4.10 {number of children of struct_declarations.char_ptr} {
-  $var(struct_declarations.char_ptr) numChildren
-} {1}
-
-# Test: c_variable-4.11
-# Desc: children of struct_declarations.long_int
-gdbtk_test c_variable-4.11 {children of struct_declarations.long_int} {
-
-  get_children struct_declarations.long_int
-} {}
-
-# Test: c_variable-4.12
-# Desc: number of children of struct_declarations.long_int
-gdbtk_test c_variable-4.12 {number of children of struct_declarations.long_int} {
-  $var(struct_declarations.long_int) numChildren
-} {0}
-
-# Test: c_variable-4.13
-# Desc: children of int_ptr_ptr
-gdbtk_test c_variable-4.13 {children of int_ptr_ptr} {
-  get_children struct_declarations.int_ptr_ptr
-} {*int_ptr_ptr}
-
-# Test: c_variable-4.14
-# Desc: number of children of int_ptr_ptr
-gdbtk_test c_variable-4.14 {number of children of int_ptr_ptr} {
-  $var(struct_declarations.int_ptr_ptr) numChildren
-} {1}
-
-# Test: c_variable-4.15
-# Desc: children of struct_declarations.long_array
-gdbtk_test c_variable-4.15 {children of struct_declarations.long_array} {
-  get_children struct_declarations.long_array
-} {0 1 2 3 4 5 6 7 8 9}
-
-# Test: c_variable-4.16
-# Desc: number of children of struct_declarations.long_array
-gdbtk_test c_variable-4.16 {number of children of struct_declarations.long_array} {
-  $var(struct_declarations.long_array) numChildren
-} {10}
-
-# Test: c_variable-4.17
-# Desc: children of struct_declarations.func_ptr
-gdbtk_test c_variable-4.17 {children of struct_declarations.func_ptr} {
-  get_children struct_declarations.func_ptr
-} {}
-
-# Test: c_variable-4.18
-# Desc: number of children of struct_declarations.func_ptr
-gdbtk_test c_variable-4.18 {number of children of struct_declarations.func_ptr} {
-  $var(struct_declarations.func_ptr) numChildren
-} {0}
-
-# Test: c_variable-4.19
-# Desc: children of struct_declarations.func_ptr_struct
-gdbtk_test c_variable-4.19 {children of struct_declarations.func_ptr_struct} {
-  get_children struct_declarations.func_ptr_struct
-} {}
-
-# Test: c_variable-4.20
-# Desc: number of children of struct_declarations.func_ptr_struct
-gdbtk_test c_variable-4.20 {number of children of struct_declarations.func_ptr_struct} {
-  $var(struct_declarations.func_ptr_struct) numChildren
-} {0}
-
-# Test: c_variable-4.21
-# Desc: children of struct_declarations.func_ptr_ptr
-gdbtk_test c_variable-4.21 {children of struct_declarations.func_ptr_ptr} {
-  get_children struct_declarations.func_ptr_ptr
-} {}
-
-# Test: c_variable-4.22
-# Desc: number of children of struct_declarations.func_ptr_ptr
-gdbtk_test c_variable-4.22 {number of children of struct_declarations.func_ptr_ptr} {
-  $var(struct_declarations.func_ptr_ptr) numChildren
-} {0}
-
-# Test: c_variable-4.23
-# Desc: children of struct_declarations.u1
-gdbtk_test c_variable-4.23 {children of struct_declarations.u1} {
-  get_children struct_declarations.u1
-} {a b c d}
-
-# Test: c_variable-4.24
-# Desc: number of children of struct_declarations.u1
-gdbtk_test c_variable-4.24 {number of children of struct_declarations.u1} {
-  $var(struct_declarations.u1) numChildren
-} {4}
-
-# Test: c_variable-4.25
-# Desc: children of struct_declarations.s2
-gdbtk_test c_variable-4.25 {children of struct_declarations.s2} {
-  get_children struct_declarations.s2
-} {u2 g h i}
-
-# Test: c_variable-4.26
-# Desc: number of children of struct_declarations.s2
-gdbtk_test c_variable-4.26 {number of children of struct_declarations.s2} {
-  $var(struct_declarations.s2) numChildren
-} {4}
-
-# Test: c_variable-4.27
-# Desc: children of struct_declarations.long_array.1
-gdbtk_test c_variable-4.27 {children of struct_declarations.long_array.1} {
-  get_children struct_declarations.long_array.1
-} {}
-
-# Test: c_variable-4.28
-# Desc: number of children of struct_declarations.long_array.1
-gdbtk_test c_variable-4.28 {number of children of struct_declarations.long_array.1} {
-  $var(struct_declarations.long_array.1) numChildren
-} {0}
-
-# Test: c_variable-4.29
-# Desc: children of struct_declarations.long_array.2
-gdbtk_test c_variable-4.29 {children of struct_declarations.long_array.2} {
-  get_children struct_declarations.long_array.2
-} {}
-
-# Test: c_variable-4.30
-# Desc: number of children of struct_declarations.long_array.2
-gdbtk_test c_variable-4.30 {number of children of struct_declarations.long_array.2} {
-  $var(struct_declarations.long_array.2) numChildren
-} {0}
-
-# Test: c_variable-4.31
-# Desc: children of struct_declarations.long_array.3
-gdbtk_test c_variable-4.31 {children of struct_declarations.long_array.3} {
-  get_children struct_declarations.long_array.3
-} {}
-
-# Test: c_variable-4.32
-# Desc: number of children of struct_declarations.long_array.3
-gdbtk_test c_variable-4.32 {number of children of struct_declarations.long_array.3} {
-  $var(struct_declarations.long_array.3) numChildren
-} {0}
-
-# Test: c_variable-4.33 
-# Desc: children of struct_declarations.long_array.4
-gdbtk_test c_variable-4.33 {children of struct_declarations.long_array.4} {
-  get_children struct_declarations.long_array.4
-} {}
-
-# Test: c_variable-4.34
-# Desc: number of children of struct_declarations.long_array.4
-gdbtk_test c_variable-4.34 {number of children of struct_declarations.long_array.4} {
-  $var(struct_declarations.long_array.4) numChildren
-} {0}
-
-# Test: c_variable-4.35
-# Desc: children of struct_declarations.long_array.5
-gdbtk_test c_variable-4.35 {children of struct_declarations.long_array.5} {
-  get_children struct_declarations.long_array.5
-} {}
-
-# Test: c_variable-4.36
-# Desc: number of children of struct_declarations.long_array.5
-gdbtk_test c_variable-4.36 {number of children of struct_declarations.long_array.5} {
-  $var(struct_declarations.long_array.5) numChildren
-} {0}
-
-# Test: c_variable-4.37
-# Desc: children of struct_declarations.long_array.6
-gdbtk_test c_variable-4.37 {children of struct_declarations.long_array.6} {
-  get_children struct_declarations.long_array.6
-} {}
-
-# Test: c_variable-4.38
-# Desc: number of children of struct_declarations.long_array.6
-gdbtk_test c_variable-4.38 {number of children of struct_declarations.long_array.6} {
-  $var(struct_declarations.long_array.6) numChildren
-} {0}
-
-# Test: c_variable-4.39
-# Desc: children of struct_declarations.long_array.7
-gdbtk_test c_variable-4.39 {children of struct_declarations.long_array.7} {
-  get_children struct_declarations.long_array.7
-} {}
-
-# Test: c_variable-4.40
-# Desc: number of children of struct_declarations.long_array.7
-gdbtk_test c_variable-4.40 {number of children of struct_declarations.long_array.7} {
-  $var(struct_declarations.long_array.7) numChildren
-} {0}
-
-# Test: c_variable-4.41
-# Desc: children of struct_declarations.long_array.8
-gdbtk_test c_variable-4.41 {children of struct_declarations.long_array.8} {
-  get_children struct_declarations.long_array.8
-} {}
-
-# Test: c_variable-4.42
-# Desc: number of children of struct_declarations.long_array.8
-gdbtk_test c_variable-4.42 {number of children of struct_declarations.long_array.8} {
-  $var(struct_declarations.long_array.8) numChildren
-} {0}
-
-# Test: c_variable-4.43
-# Desc: children of struct_declarations.long_array.9
-gdbtk_test c_variable-4.43 {children of struct_declarations.long_array.9} {
-  get_children struct_declarations.long_array.9
-} {}
-
-# Test: c_variable-4.44
-# Desc: number of children of struct_declarations.long_array.9
-gdbtk_test c_variable-4.44 {number of children of struct_declarations.long_array.9} {
-  $var(struct_declarations.long_array.9) numChildren
-} {0}
-
-# Test: c_variable-4.45
-# Desc: children of struct_declarations.u1.a
-gdbtk_test c_variable-4.45 {children of struct_declarations.u1.a} {
-  get_children struct_declarations.u1.a
-} {}
-
-# Test: c_variable-4.46
-# Desc: number of children of struct_declarations.u1.a
-gdbtk_test c_variable-4.46 {number of children of struct_declarations.u1.a} {
-  $var(struct_declarations.u1.a) numChildren
-} {0}
-
-# Test: c_variable-4.47
-# Desc: children of struct_declarations.u1.b
-gdbtk_test c_variable-4.47 {children of struct_declarations.u1.b} {
-  get_children struct_declarations.u1.b
-} {*b}
-
-# Test: c_variable-4.48
-# Desc: number of children of struct_declarations.u1.b
-gdbtk_test c_variable-4.48 {number of children of struct_declarations.u1.b} {
-  $var(struct_declarations.u1.b) numChildren
-} {1}
-
-# Test: c_variable-4.49
-# Desc: children of struct_declarations.u1.c
-gdbtk_test c_variable-4.49 {children of struct_declarations.u1.c} {
-  get_children struct_declarations.u1.c
-} {}
-
-# Test: c_variable-4.50
-# Desc: number of children of struct_declarations.u1.c
-gdbtk_test c_variable-4.50 {number of children of struct_declarations.u1.c} {
-  $var(struct_declarations.u1.c) numChildren
-} {0}
-
-# Test: c_variable-4.51
-# Desc: children of struct_declarations.u1.d
-gdbtk_test c_variable-4.51 {children of struct_declarations.u1.d} {
-  get_children struct_declarations.u1.d
-} {}
-
-# Test: c_variable-4.52
-# Desc: number of children of struct_declarations.u1.d
-gdbtk_test c_variable-4.52 {number of children of struct_declarations.u1.d} {
-  $var(struct_declarations.u1.d) numChildren
-} {0}
-
-# Test: c_variable-4.53
-# Desc: children of struct_declarations.s2.u2
-gdbtk_test c_variable-4.53 {children of struct_declarations.s2.u2} {
-  get_children struct_declarations.s2.u2
-} {u1s1 f u1s2}
-
-# Test: c_variable-4.54
-# Desc: number of children of struct_declarations.s2.u2
-gdbtk_test c_variable-4.54 {number of children of struct_declarations.s2.u2} {
-  $var(struct_declarations.s2.u2) numChildren
-} {3}
-
-# Test: c_variable-4.55
-# Desc: children of struct_declarations.s2.g
-gdbtk_test c_variable-4.55 {children of struct_declarations.s2.g} {
-  get_children struct_declarations.s2.g
-} {}
-
-# Test: c_variable-4.56
-# Desc: number of children of struct_declarations.s2.g
-gdbtk_test c_variable-4.56 {number of children of struct_declarations.s2.g} {
-  $var(struct_declarations.s2.g) numChildren
-} {0}
-
-# Test: c_variable-4.57
-# Desc: children of struct_declarations.s2.h
-gdbtk_test c_variable-4.57 {children of struct_declarations.s2.h} {
-  get_children struct_declarations.s2.h
-} {}
-
-# Test: c_variable-4.58
-# Desc: number of children of struct_declarations.s2.h
-gdbtk_test c_variable-4.58 {number of children of struct_declarations.s2.h} {
-  $var(struct_declarations.s2.h) numChildren
-} {0}
-
-# Test: c_variable-4.59
-# Desc: children of struct_declarations.s2.i
-gdbtk_test c_variable-4.59 {children of struct_declarations.s2.i} {
-  get_children struct_declarations.s2.i
-} {0 1 2 3 4 5 6 7 8 9}
-
-# Test: c_variable-4.60
-# Desc: number of children of struct_declarations.s2.i
-gdbtk_test c_variable-4.60 {number of children of struct_declarations.s2.i} {
-  $var(struct_declarations.s2.i) numChildren
-} {10}
-
-# Test: c_variable-4.61
-# Desc: children of struct_declarations.s2.u2.u1s1
-gdbtk_test c_variable-4.61 {children of struct_declarations.s2.u2.u1s1} {
-  get_children struct_declarations.s2.u2.u1s1
-} {d e func foo}
-
-# Test: c_variable-4.62
-# Desc: number of children of struct_declarations.s2.u2.u1s1
-gdbtk_test c_variable-4.62 {number of children of struct_declarations.s2.u2.u1s1} {
-  $var(struct_declarations.s2.u2.u1s1) numChildren
-} {4}
-
-# Test: c_variable-4.63
-# Desc: children of struct_declarations.s2.u2.f
-gdbtk_test c_variable-4.63 {children of struct_declarations.s2.u2.f} {
-  get_children struct_declarations.s2.u2.f
-} {}
-
-# Test: c_variable-4.64
-# Desc: number of children of struct_declarations.s2.u2.f
-gdbtk_test c_variable-4.64 {number of children of struct_declarations.s2.u2.f} {
-  $var(struct_declarations.s2.u2.f) numChildren
-} {0}
-
-# Test: c_variable-4.65
-# Desc: children of struct_declarations.s2.u2.u1s2
-gdbtk_test c_variable-4.65 {children of struct_declarations.s2.u2.u1s2} {
-  get_children struct_declarations.s2.u2.u1s2
-} {array_ptr func}
-
-# Test: c_variable-4.66
-# Desc: number of children of struct_declarations.s2.u2.u1s2
-gdbtk_test c_variable-4.66 {number of children of struct_declarations.s2.u2.u1s2} {
-  $var(struct_declarations.s2.u2.u1s2) numChildren
-} {2}
-
-# Test: c_variable-4.67
-# Desc: children of struct_declarations.s2.u2.u1s1.d
-gdbtk_test c_variable-4.67 {children of struct_declarations.s2.u2.u1s1.d} {
-  get_children struct_declarations.s2.u2.u1s1.d
-} {}
-
-# Test: c_variable-4.68
-# Desc: number of children of struct_declarations.s2.u2.u1s1.d
-gdbtk_test c_variable-4.68 {number of children of struct_declarations.s2.u2.u1s1.d} {
-  $var(struct_declarations.s2.u2.u1s1.d) numChildren
-} {0}
-
-# Test: c_variable-4.69
-# Desc: children of struct_declarations.s2.u2.u1s1.e
-gdbtk_test c_variable-4.69 {children of struct_declarations.s2.u2.u1s1.e} {
-  get_children struct_declarations.s2.u2.u1s1.e
-} {0 1 2 3 4 5 6 7 8 9}
-
-# Test: c_variable-4.70
-# Desc: number of children of struct_declarations.s2.u2.u1s1.e
-gdbtk_test c_variable-4.70 {number of children of struct_declarations.s2.u2.u1s1.e} {
-  $var(struct_declarations.s2.u2.u1s1.e) numChildren
-} {10}
-
-# Test: c_variable-4.71
-# Desc: children of struct_declarations.s2.u2.u1s1.func
-gdbtk_test c_variable-4.71 {children of struct_declarations.s2.u2.u1s1.func} {
-  get_children struct_declarations.s2.u2.u1s1.func
-} {}
-
-# Test: c_variable-4.72
-# Desc: number of children of struct_declarations.s2.u2.u1s1.func
-gdbtk_test c_variable-4.72 {number of children of struct_declarations.s2.u2.u1s1.func} {
-  $var(struct_declarations.s2.u2.u1s1.func) numChildren
-} {0}
-
-# Test: c_variable-4.73
-# Desc: children of struct_declarations.s2.u2.u1s1.foo
-gdbtk_test c_variable-4.73 {children of struct_declarations.s2.u2.u1s1.foo} {
-  get_children struct_declarations.s2.u2.u1s1.foo
-} {}
-
-# Test: c_variable-4.74
-# Desc: number of children of struct_declarations.s2.u2.u1s1.foo
-gdbtk_test c_variable-4.74 {number of children of struct_declarations.s2.u2.u1s1.foo} {
-  $var(struct_declarations.s2.u2.u1s1.foo) numChildren
-} {0}
-
-# Test: c_variable-4.75
-# Desc: children of struct_declarations.s2.u2.u1s2.array_ptr
-gdbtk_test c_variable-4.75 {children of struct_declarations.s2.u2.u1s2.array_ptr} {
-  get_children struct_declarations.s2.u2.u1s2.array_ptr
-} {0 1}
-
-# Test: c_variable-4.76
-# Desc: number of children of struct_declarations.s2.u2.u1s2.array_ptr
-gdbtk_test c_variable-4.76 {number of children of struct_declarations.s2.u2.u1s2.array_ptr} {
-  $var(struct_declarations.s2.u2.u1s2.array_ptr) numChildren
-} {2}
-
-# Test: c_variable-4.77
-# Desc: children of struct_declarations.s2.u2.u1s2.func
-gdbtk_test c_variable-4.77 {children of struct_declarations.s2.u2.u1s2.func} {
-  get_children struct_declarations.s2.u2.u1s2.func
-} {}
-
-# Test: c_variable-4.78
-# Desc: number of children of struct_declarations.s2.u2.u1s2.func
-gdbtk_test c_variable-4.78 {number of children of struct_declarations.s2.u2.u1s2.func} {
-  $var(struct_declarations.s2.u2.u1s2.func) numChildren
-} {0}
-
-# Test: c_variable-4.79
-# Desc: children of struct_declarations.*int_ptr_ptr
-gdbtk_test c_variable-4.79 {children of struct_declarations.*int_ptr_ptr} {
-  get_children struct_declarations.int_ptr_ptr.*int_ptr_ptr
-} {**int_ptr_ptr}
-
-# Test: c_variable-4.80
-# Desc: Number of children of struct_declarations.*int_ptr_ptr
-gdbtk_test c_variable-4.80 {Number of children of struct_declarations.*int_ptr_ptr} {
-  $var(struct_declarations.int_ptr_ptr.*int_ptr_ptr) numChildren
-} {1}
-
-# Step to "struct_declarations.integer = 123;"
-gdb_cmd "step"
-
-# Test: c_variable-4.81
-# Desc: create local variable "weird"
-gdbtk_test c_variable-4.81 {create local variable "weird"} {
-  create_variable weird
-} {0}
-
-# Test: c_variable-4.82
-# Desc: children of weird
-gdbtk_test c_variable-4.82 {children of weird} {
-  get_children weird
-} {integer character char_ptr long_int int_ptr_ptr long_array func_ptr func_ptr_struct func_ptr_ptr u1 s2}
-
-# Test: c_variable-4.83
-# Desc: number of children of weird
-gdbtk_test c_variable-4.83 {number of children of weird} {
-  $var(weird) numChildren
-} {11}
-
-# Test: c_variable-4.84
-# Desc: children of weird->long_array
-gdbtk_test c_variable-4.84 {children of weird->long_array} {
-  get_children weird.long_array
-} {0 1 2 3 4 5 6 7 8 9}
-
-# Test: c_variable-4.85
-# Desc: number of children of weird->long_array
-gdbtk_test c_variable-4.85 {number of children of weird->long_array} {
-  $var(weird.long_array) numChildren
-} {10}
-
-# Test: c_variable-4.86
-# Desc: children of weird->int_ptr_ptr
-gdbtk_test c_variable-4.86 {children of weird->int_ptr_ptr} {
-  get_children weird.int_ptr_ptr
-} {*int_ptr_ptr}
-
-# Test: c_variable-4.87
-# Desc: number of children of weird->int_ptr_ptr
-gdbtk_test c_variable-4.87 {number of children of weird->int_ptr_ptr} {
-  $var(weird.int_ptr_ptr) numChildren
-} {1}
-
-# Test: c_variable-4.88
-# Desc: children of *weird->int_ptr_ptr
-gdbtk_test c_variable-4.88 {children of *weird->int_ptr_ptr} {
-  get_children weird.int_ptr_ptr.*int_ptr_ptr
-} {**int_ptr_ptr}
-
-# Test: c_variable-4.89
-# Desc: number of children *weird->int_ptr_ptr
-gdbtk_test c_variable-4.89 {number of children *weird->int_ptr_ptr} {
-  $var(weird.int_ptr_ptr.*int_ptr_ptr) numChildren
-} {1}
-
-# Test: c_variable-4.90
-# Desc: create weird->int_ptr_ptr
-gdbtk_test c_variable-4.90 {create weird->int_ptr_ptr} {
-  create_variable weird->int_ptr_ptr
-} {0}
-
-# Test: c_variable-4.91
-# Desc: children of weird->int_ptr_ptr
-gdbtk_test c_variable-4.91 {children of weird->int_ptr_ptr} {
-  get_children weird->int_ptr_ptr
-} {*weird->int_ptr_ptr}
-
-# Test: c_variable-4.92
-# Desc: number of children of (weird->int_ptr_ptr)
-gdbtk_test c_variable-4.92 {number of children of (weird->int_ptr_ptr)} {
-  $var(weird->int_ptr_ptr) numChildren
-} {1}
-
-# Test: c_variable-4.93
-# Desc: children of *(weird->int_ptr_ptr)
-gdbtk_test c_variable-4.93 {children of *(weird->int_ptr_ptr)} {
-  get_children weird->int_ptr_ptr.*weird->int_ptr_ptr
-} {**weird->int_ptr_ptr}
-
-# Test: c_variable-4.94
-# Desc: number of children of *(weird->int_ptr_ptr)
-gdbtk_test c_variable-4.94 {number of children of *(weird->int_ptr_ptr)} {
-  $var(weird->int_ptr_ptr.*weird->int_ptr_ptr) numChildren
-} {1}
-
-# Test: c_variable-4.95
-# Desc: children of *(*(weird->int_ptr_ptr))
-gdbtk_test c_variable-4.95 {children of *(*(weird->int_ptr_ptr))} {
-  get_children weird->int_ptr_ptr.*weird->int_ptr_ptr.**weird->int_ptr_ptr
-} {}
-
-# Test: c_variable-4.96
-# Desc: number of children of *(*(weird->int_ptr_ptr))
-gdbtk_test c_variable-4.96 {number of children of **weird->int_ptr_ptr} {
-  $var(weird->int_ptr_ptr.*weird->int_ptr_ptr.**weird->int_ptr_ptr) numChildren
-} {0}
-
-# Test: c_variable-4.97
-# Desc: is weird editable
-gdbtk_test c_variable-4.97 {is weird editable} {
-  $var(weird) editable
-} {1}
-
-# Test: c_variable-4.98
-# Desc: is weird->int_ptr_ptr editable
-gdbtk_test c_variable-4.98 {is weird->int_ptr_ptr editable} {
-  $var(weird.int_ptr_ptr) editable
-} {1}
-
-# Test: c_variable-4.99
-# Desc: is *(weird->int_ptr_ptr) editable
-gdbtk_test c_variable-4.99 {is *(weird->int_ptr_ptr) editable} {
-  $var(weird.int_ptr_ptr.*int_ptr_ptr) editable
-} {1}
-
-# Test: c_variable-4.100
-# Desc: is *(*(weird->int_ptr_ptr)) editable
-gdbtk_test c_variable-4.100 {is *(*(weird->int_ptr_ptr)) editable} {
-  $var(weird.int_ptr_ptr.*int_ptr_ptr.**int_ptr_ptr) editable
-} {1}
-
-# Test: c_variable-4.101
-# Desc: is weird->u1 editable
-gdbtk_test c_variable-4.101 {is weird->u1 editable} {
-  $var(weird.u1) editable
-} {0}
-
-# Test: c_variable-4.102
-# Desc: is weird->s2 editable
-gdbtk_test c_variable-4.102 {is weird->s2 editable} {
-  $var(weird.s2) editable
-} {0}
-
-# Test: c_variable-4.103
-# Desc: is struct_declarations.u1.a editable
-gdbtk_test c_variable-4.103 {is struct_declarations.u1.a editable} {
-  $var(struct_declarations.u1.a) editable
-} {1}
-
-# Test: c_variable-4.104
-# Desc: is struct_declarations.u1.b editable
-gdbtk_test c_variable-4.104 {is struct_declarations.u1.b editable} {
-  $var(struct_declarations.u1.b) editable
-} {1}
-
-# Test: c_variable-4.105
-# Desc: is struct_declarations.u1.c editable
-gdbtk_test c_variable-4.105 {is struct_declarations.u1.c editable} {
-  $var(struct_declarations.u1.c) editable
-} {1}
-
-# Test: c_variable-4.106
-# Desc: is struct_declarations.long_array editable
-gdbtk_test c_variable-4.106 {is struct_declarations.long_array editable} {
-  $var(struct_declarations.long_array) editable
-} {0}
-
-# Test: c_variable-4.107
-# Desc: is struct_declarations.long_array[0] editable
-gdbtk_test c_variable-4.107 {is struct_declarations.long_array[0] editable} {
-  $var(struct_declarations.long_array.0) editable
-} {1}
-
-# Test: c_variable-4.108
-# Desc: is struct_declarations editable
-gdbtk_test c_variable-4.108 {is struct_declarations editable} {
-  $var(struct_declarations) editable
-} {0}
-
-delete_variable weird
-
-#####                         #####
-#                                 #
-# children and update tests #
-#                                 #
-#####                         #####
-
-# Test: c_variable-5.1
-# Desc: check that nothing changed
-gdbtk_test c_variable-5.1 {check that nothing changed} {
-  check_update
-} {{} {struct_declarations.s2.i.3 struct_declarations.func_ptr_ptr struct_declarations.s2.i.4 struct_declarations.s2.i.5 struct_declarations.s2.i.6 struct_declarations.func_ptr struct_declarations.s2.i.7 struct_declarations.s2.i.8 struct_declarations.s2.i.9 struct_declarations.s2.u2.u1s1.d struct_declarations.func_ptr_struct struct_declarations.s2.u2.u1s1.e struct_declarations.u1 struct_declarations.char_ptr.*char_ptr struct_declarations.long_int struct_declarations.s2.u2.u1s2.func struct_declarations.integer struct_declarations.s2.u2 struct_declarations.s2.u2.u1s1.e.0 struct_declarations.s2.u2.u1s1.e.1 struct_declarations.long_array.0 struct_declarations.s2.u2.u1s1.e.2 struct_declarations.long_array.1 struct_declarations.u1.a struct_declarations.s2.u2.u1s1.e.3 struct_declarations.long_array.2 struct_declarations.u1.b struct_declarations.s2.u2.u1s1.e.4 struct_declarations.long_array.3 struct_declarations.u1.c struct_declarations.s2.u2.u1s1.e.5 struct_declarations.long_array.4 struct_declarations.u1.d struct_declarations.u1.b.*b struct_declarations.int_ptr_ptr.*int_ptr_ptr.**int_ptr_ptr struct_declarations.s2.u2.u1s1.e.6 struct_declarations.long_array.5 struct_declarations.s2.u2.u1s1.e.7 struct_declarations.long_array.6 struct_declarations.s2.u2.u1s1.e.8 struct_declarations.long_array.7 struct_declarations.s2.u2.u1s1.e.9 struct_declarations.long_array.8 struct_declarations.character struct_declarations.long_array.9 struct_declarations.int_ptr_ptr.*int_ptr_ptr struct_declarations.s2.u2.u1s1.func struct_declarations.s2.u2.u1s2.array_ptr struct_declarations.s2.u2.f struct_declarations.s2.u2.u1s1.foo struct_declarations.s2.u2.u1s1 struct_declarations.s2.u2.u1s2.array_ptr.0 struct_declarations.char_ptr struct_declarations.s2.u2.u1s2 struct_declarations.s2.u2.u1s2.array_ptr.1 struct_declarations.int_ptr_ptr struct_declarations.s2 struct_declarations.long_array struct_declarations.s2.g struct_declarations.s2.i.0 struct_declarations.s2.h struct_declarations.s2.i.1 struct_declarations.s2.i struct_declarations.s2.i.2}}
-
-# Step over "struct_declarations.integer = 123;"
-gdb_cmd "step"
-
-# Test: c_variable-5.2
-# Desc: check that integer changed
-gdbtk_test c_variable-5.2 {check that integer changed} {
-  check_update
-} {struct_declarations.integer {struct_declarations.s2.i.3 struct_declarations.func_ptr_ptr struct_declarations.s2.i.4 struct_declarations.s2.i.5 struct_declarations.s2.i.6 struct_declarations.func_ptr struct_declarations.s2.i.7 struct_declarations.s2.i.8 struct_declarations.s2.i.9 struct_declarations.s2.u2.u1s1.d struct_declarations.func_ptr_struct struct_declarations.s2.u2.u1s1.e struct_declarations.u1 struct_declarations.char_ptr.*char_ptr struct_declarations.long_int struct_declarations.s2.u2.u1s2.func struct_declarations.integer struct_declarations.s2.u2 struct_declarations.s2.u2.u1s1.e.0 struct_declarations.s2.u2.u1s1.e.1 struct_declarations.long_array.0 struct_declarations.s2.u2.u1s1.e.2 struct_declarations.long_array.1 struct_declarations.u1.a struct_declarations.s2.u2.u1s1.e.3 struct_declarations.long_array.2 struct_declarations.u1.b struct_declarations.s2.u2.u1s1.e.4 struct_declarations.long_array.3 struct_declarations.u1.c struct_declarations.s2.u2.u1s1.e.5 struct_declarations.long_array.4 struct_declarations.u1.d struct_declarations.u1.b.*b struct_declarations.int_ptr_ptr.*int_ptr_ptr.**int_ptr_ptr struct_declarations.s2.u2.u1s1.e.6 struct_declarations.long_array.5 struct_declarations.s2.u2.u1s1.e.7 struct_declarations.long_array.6 struct_declarations.s2.u2.u1s1.e.8 struct_declarations.long_array.7 struct_declarations.s2.u2.u1s1.e.9 struct_declarations.long_array.8 struct_declarations.character struct_declarations.long_array.9 struct_declarations.int_ptr_ptr.*int_ptr_ptr struct_declarations.s2.u2.u1s1.func struct_declarations.s2.u2.u1s2.array_ptr struct_declarations.s2.u2.f struct_declarations.s2.u2.u1s1.foo struct_declarations.s2.u2.u1s1 struct_declarations.s2.u2.u1s2.array_ptr.0 struct_declarations.char_ptr struct_declarations.s2.u2.u1s2 struct_declarations.s2.u2.u1s2.array_ptr.1 struct_declarations.int_ptr_ptr struct_declarations.s2 struct_declarations.long_array struct_declarations.s2.g struct_declarations.s2.i.0 struct_declarations.s2.h struct_declarations.s2.i.1 struct_declarations.s2.i struct_declarations.s2.i.2}}
-
-# Step over:
-#    weird->char_ptr = "hello";
-#    bar = 2121;
-#    foo = &bar;
-for {set i 0} {$i < 3} {incr i} {
-  gdb_cmd "step"
-}
-
-# Test: c_variable-5.3
-# Desc: check that char_ptr changed
-gdbtk_test c_variable-5.3 {check that char_ptr changed} {
-  check_update
-} {{{struct_declarations.char_ptr struct_declarations.char_ptr.*char_ptr}} {struct_declarations.s2.i.3 struct_declarations.func_ptr_ptr struct_declarations.s2.i.4 struct_declarations.s2.i.5 struct_declarations.s2.i.6 struct_declarations.func_ptr struct_declarations.s2.i.7 struct_declarations.s2.i.8 struct_declarations.s2.i.9 struct_declarations.s2.u2.u1s1.d struct_declarations.func_ptr_struct struct_declarations.s2.u2.u1s1.e struct_declarations.u1 struct_declarations.char_ptr.*char_ptr struct_declarations.long_int struct_declarations.s2.u2.u1s2.func struct_declarations.integer struct_declarations.s2.u2 struct_declarations.s2.u2.u1s1.e.0 struct_declarations.s2.u2.u1s1.e.1 struct_declarations.long_array.0 struct_declarations.s2.u2.u1s1.e.2 struct_declarations.long_array.1 struct_declarations.u1.a struct_declarations.s2.u2.u1s1.e.3 struct_declarations.long_array.2 struct_declarations.u1.b struct_declarations.s2.u2.u1s1.e.4 struct_declarations.long_array.3 struct_declarations.u1.c struct_declarations.s2.u2.u1s1.e.5 struct_declarations.long_array.4 struct_declarations.u1.d struct_declarations.u1.b.*b struct_declarations.int_ptr_ptr.*int_ptr_ptr.**int_ptr_ptr struct_declarations.s2.u2.u1s1.e.6 struct_declarations.long_array.5 struct_declarations.s2.u2.u1s1.e.7 struct_declarations.long_array.6 struct_declarations.s2.u2.u1s1.e.8 struct_declarations.long_array.7 struct_declarations.s2.u2.u1s1.e.9 struct_declarations.long_array.8 struct_declarations.character struct_declarations.long_array.9 struct_declarations.int_ptr_ptr.*int_ptr_ptr struct_declarations.s2.u2.u1s1.func struct_declarations.s2.u2.u1s2.array_ptr struct_declarations.s2.u2.f struct_declarations.s2.u2.u1s1.foo struct_declarations.s2.u2.u1s1 struct_declarations.s2.u2.u1s2.array_ptr.0 struct_declarations.char_ptr struct_declarations.s2.u2.u1s2 struct_declarations.s2.u2.u1s2.array_ptr.1 struct_declarations.int_ptr_ptr struct_declarations.s2 struct_declarations.long_array struct_declarations.s2.g struct_declarations.s2.i.0 struct_declarations.s2.h struct_declarations.s2.i.1 struct_declarations.s2.i struct_declarations.s2.i.2}}
-
-# Step over "struct_declarations.int_ptr_ptr = &foo;"
-gdb_cmd "step"
-
-# Test: c_variable-5.4
-# Desc: check that int_ptr_ptr and children changed
-gdbtk_test c_variable-5.4 {check that int_ptr_ptr and children changed} {
-  check_update
-} {{{struct_declarations.int_ptr_ptr struct_declarations.int_ptr_ptr.*int_ptr_ptr struct_declarations.int_ptr_ptr.*int_ptr_ptr.**int_ptr_ptr}} {struct_declarations.s2.i.3 struct_declarations.func_ptr_ptr struct_declarations.s2.i.4 struct_declarations.s2.i.5 struct_declarations.s2.i.6 struct_declarations.func_ptr struct_declarations.s2.i.7 struct_declarations.s2.i.8 struct_declarations.s2.i.9 struct_declarations.s2.u2.u1s1.d struct_declarations.func_ptr_struct struct_declarations.s2.u2.u1s1.e struct_declarations.u1 struct_declarations.char_ptr.*char_ptr struct_declarations.long_int struct_declarations.s2.u2.u1s2.func struct_declarations.integer struct_declarations.s2.u2 struct_declarations.s2.u2.u1s1.e.0 struct_declarations.s2.u2.u1s1.e.1 struct_declarations.long_array.0 struct_declarations.s2.u2.u1s1.e.2 struct_declarations.long_array.1 struct_declarations.u1.a struct_declarations.s2.u2.u1s1.e.3 struct_declarations.long_array.2 struct_declarations.u1.b struct_declarations.s2.u2.u1s1.e.4 struct_declarations.long_array.3 struct_declarations.u1.c struct_declarations.s2.u2.u1s1.e.5 struct_declarations.long_array.4 struct_declarations.u1.d struct_declarations.u1.b.*b struct_declarations.int_ptr_ptr.*int_ptr_ptr.**int_ptr_ptr struct_declarations.s2.u2.u1s1.e.6 struct_declarations.long_array.5 struct_declarations.s2.u2.u1s1.e.7 struct_declarations.long_array.6 struct_declarations.s2.u2.u1s1.e.8 struct_declarations.long_array.7 struct_declarations.s2.u2.u1s1.e.9 struct_declarations.long_array.8 struct_declarations.character struct_declarations.long_array.9 struct_declarations.int_ptr_ptr.*int_ptr_ptr struct_declarations.s2.u2.u1s1.func struct_declarations.s2.u2.u1s2.array_ptr struct_declarations.s2.u2.f struct_declarations.s2.u2.u1s1.foo struct_declarations.s2.u2.u1s1 struct_declarations.s2.u2.u1s2.array_ptr.0 struct_declarations.char_ptr struct_declarations.s2.u2.u1s2 struct_declarations.s2.u2.u1s2.array_ptr.1 struct_declarations.int_ptr_ptr struct_declarations.s2 struct_declarations.long_array struct_declarations.s2.g struct_declarations.s2.i.0 struct_declarations.s2.h struct_declarations.s2.i.1 struct_declarations.s2.i struct_declarations.s2.i.2}}
-
-# Step over "weird->long_array[0] = 1234;"
-gdb_cmd "step"
-
-# Test: c_variable-5.5
-# Desc: check that long_array[0] changed
-gdbtk_test c_variable-5.5 {check that long_array[0] changed} {
-  check_update
-} {struct_declarations.long_array.0 {struct_declarations.s2.i.3 struct_declarations.func_ptr_ptr struct_declarations.s2.i.4 struct_declarations.s2.i.5 struct_declarations.s2.i.6 struct_declarations.func_ptr struct_declarations.s2.i.7 struct_declarations.s2.i.8 struct_declarations.s2.i.9 struct_declarations.s2.u2.u1s1.d struct_declarations.func_ptr_struct struct_declarations.s2.u2.u1s1.e struct_declarations.u1 struct_declarations.char_ptr.*char_ptr struct_declarations.long_int struct_declarations.s2.u2.u1s2.func struct_declarations.integer struct_declarations.s2.u2 struct_declarations.s2.u2.u1s1.e.0 struct_declarations.s2.u2.u1s1.e.1 struct_declarations.long_array.0 struct_declarations.s2.u2.u1s1.e.2 struct_declarations.long_array.1 struct_declarations.u1.a struct_declarations.s2.u2.u1s1.e.3 struct_declarations.long_array.2 struct_declarations.u1.b struct_declarations.s2.u2.u1s1.e.4 struct_declarations.long_array.3 struct_declarations.u1.c struct_declarations.s2.u2.u1s1.e.5 struct_declarations.long_array.4 struct_declarations.u1.d struct_declarations.u1.b.*b struct_declarations.int_ptr_ptr.*int_ptr_ptr.**int_ptr_ptr struct_declarations.s2.u2.u1s1.e.6 struct_declarations.long_array.5 struct_declarations.s2.u2.u1s1.e.7 struct_declarations.long_array.6 struct_declarations.s2.u2.u1s1.e.8 struct_declarations.long_array.7 struct_declarations.s2.u2.u1s1.e.9 struct_declarations.long_array.8 struct_declarations.character struct_declarations.long_array.9 struct_declarations.int_ptr_ptr.*int_ptr_ptr struct_declarations.s2.u2.u1s1.func struct_declarations.s2.u2.u1s2.array_ptr struct_declarations.s2.u2.f struct_declarations.s2.u2.u1s1.foo struct_declarations.s2.u2.u1s1 struct_declarations.s2.u2.u1s2.array_ptr.0 struct_declarations.char_ptr struct_declarations.s2.u2.u1s2 struct_declarations.s2.u2.u1s2.array_ptr.1 struct_declarations.int_ptr_ptr struct_declarations.s2 struct_declarations.long_array struct_declarations.s2.g struct_declarations.s2.i.0 struct_declarations.s2.h struct_declarations.s2.i.1 struct_declarations.s2.i struct_declarations.s2.i.2}}
-
-# Step over "struct_declarations.long_array[1] = 2345;"
-gdb_cmd "step"
-
-# Test: c_variable-5.6
-# Desc: check that long_array[1] changed
-gdbtk_test c_variable-5.6 {check that long_array[1] changed} {
-  check_update
-} {struct_declarations.long_array.1 {struct_declarations.s2.i.3 struct_declarations.func_ptr_ptr struct_declarations.s2.i.4 struct_declarations.s2.i.5 struct_declarations.s2.i.6 struct_declarations.func_ptr struct_declarations.s2.i.7 struct_declarations.s2.i.8 struct_declarations.s2.i.9 struct_declarations.s2.u2.u1s1.d struct_declarations.func_ptr_struct struct_declarations.s2.u2.u1s1.e struct_declarations.u1 struct_declarations.char_ptr.*char_ptr struct_declarations.long_int struct_declarations.s2.u2.u1s2.func struct_declarations.integer struct_declarations.s2.u2 struct_declarations.s2.u2.u1s1.e.0 struct_declarations.s2.u2.u1s1.e.1 struct_declarations.long_array.0 struct_declarations.s2.u2.u1s1.e.2 struct_declarations.long_array.1 struct_declarations.u1.a struct_declarations.s2.u2.u1s1.e.3 struct_declarations.long_array.2 struct_declarations.u1.b struct_declarations.s2.u2.u1s1.e.4 struct_declarations.long_array.3 struct_declarations.u1.c struct_declarations.s2.u2.u1s1.e.5 struct_declarations.long_array.4 struct_declarations.u1.d struct_declarations.u1.b.*b struct_declarations.int_ptr_ptr.*int_ptr_ptr.**int_ptr_ptr struct_declarations.s2.u2.u1s1.e.6 struct_declarations.long_array.5 struct_declarations.s2.u2.u1s1.e.7 struct_declarations.long_array.6 struct_declarations.s2.u2.u1s1.e.8 struct_declarations.long_array.7 struct_declarations.s2.u2.u1s1.e.9 struct_declarations.long_array.8 struct_declarations.character struct_declarations.long_array.9 struct_declarations.int_ptr_ptr.*int_ptr_ptr struct_declarations.s2.u2.u1s1.func struct_declarations.s2.u2.u1s2.array_ptr struct_declarations.s2.u2.f struct_declarations.s2.u2.u1s1.foo struct_declarations.s2.u2.u1s1 struct_declarations.s2.u2.u1s2.array_ptr.0 struct_declarations.char_ptr struct_declarations.s2.u2.u1s2 struct_declarations.s2.u2.u1s2.array_ptr.1 struct_declarations.int_ptr_ptr struct_declarations.s2 struct_declarations.long_array struct_declarations.s2.g struct_declarations.s2.i.0 struct_declarations.s2.h struct_declarations.s2.i.1 struct_declarations.s2.i struct_declarations.s2.i.2}}
-
-# Step over "weird->long_array[2] = 3456;"
-gdb_cmd "step"
-
-# Test: c_variable-5.7
-# Desc: check that long_array[2] changed
-gdbtk_test c_variable-5.7 {check that long_array[2] changed} {
-  check_update
-} {struct_declarations.long_array.2 {struct_declarations.s2.i.3 struct_declarations.func_ptr_ptr struct_declarations.s2.i.4 struct_declarations.s2.i.5 struct_declarations.s2.i.6 struct_declarations.func_ptr struct_declarations.s2.i.7 struct_declarations.s2.i.8 struct_declarations.s2.i.9 struct_declarations.s2.u2.u1s1.d struct_declarations.func_ptr_struct struct_declarations.s2.u2.u1s1.e struct_declarations.u1 struct_declarations.char_ptr.*char_ptr struct_declarations.long_int struct_declarations.s2.u2.u1s2.func struct_declarations.integer struct_declarations.s2.u2 struct_declarations.s2.u2.u1s1.e.0 struct_declarations.s2.u2.u1s1.e.1 struct_declarations.long_array.0 struct_declarations.s2.u2.u1s1.e.2 struct_declarations.long_array.1 struct_declarations.u1.a struct_declarations.s2.u2.u1s1.e.3 struct_declarations.long_array.2 struct_declarations.u1.b struct_declarations.s2.u2.u1s1.e.4 struct_declarations.long_array.3 struct_declarations.u1.c struct_declarations.s2.u2.u1s1.e.5 struct_declarations.long_array.4 struct_declarations.u1.d struct_declarations.u1.b.*b struct_declarations.int_ptr_ptr.*int_ptr_ptr.**int_ptr_ptr struct_declarations.s2.u2.u1s1.e.6 struct_declarations.long_array.5 struct_declarations.s2.u2.u1s1.e.7 struct_declarations.long_array.6 struct_declarations.s2.u2.u1s1.e.8 struct_declarations.long_array.7 struct_declarations.s2.u2.u1s1.e.9 struct_declarations.long_array.8 struct_declarations.character struct_declarations.long_array.9 struct_declarations.int_ptr_ptr.*int_ptr_ptr struct_declarations.s2.u2.u1s1.func struct_declarations.s2.u2.u1s2.array_ptr struct_declarations.s2.u2.f struct_declarations.s2.u2.u1s1.foo struct_declarations.s2.u2.u1s1 struct_declarations.s2.u2.u1s2.array_ptr.0 struct_declarations.char_ptr struct_declarations.s2.u2.u1s2 struct_declarations.s2.u2.u1s2.array_ptr.1 struct_declarations.int_ptr_ptr struct_declarations.s2 struct_declarations.long_array struct_declarations.s2.g struct_declarations.s2.i.0 struct_declarations.s2.h struct_declarations.s2.i.1 struct_declarations.s2.i struct_declarations.s2.i.2}}
-
-# Step over:
-#    struct_declarations.long_array[3] = 4567;
-#    weird->long_array[4] = 5678;
-#    struct_declarations.long_array[5] = 6789;
-#    weird->long_array[6] = 7890;
-#    struct_declarations.long_array[7] = 8901;
-#    weird->long_array[8] = 9012;
-#    struct_declarations.long_array[9] = 1234;
-for {set i 0} {$i < 7} {incr i} {
-  gdb_cmd "step"
-}
-
-# Test: c_variable-5.8
-# Desc: check that long_array[3-9] changed
-gdbtk_test c_variable-5.8 {check that long_array[3-9] changed} {
-  check_update
-} {{{struct_declarations.long_array.3 struct_declarations.long_array.4 struct_declarations.long_array.5 struct_declarations.long_array.6 struct_declarations.long_array.7 struct_declarations.long_array.8 struct_declarations.long_array.9}} {struct_declarations.s2.i.3 struct_declarations.func_ptr_ptr struct_declarations.s2.i.4 struct_declarations.s2.i.5 struct_declarations.s2.i.6 struct_declarations.func_ptr struct_declarations.s2.i.7 struct_declarations.s2.i.8 struct_declarations.s2.i.9 struct_declarations.s2.u2.u1s1.d struct_declarations.func_ptr_struct struct_declarations.s2.u2.u1s1.e struct_declarations.u1 struct_declarations.char_ptr.*char_ptr struct_declarations.long_int struct_declarations.s2.u2.u1s2.func struct_declarations.integer struct_declarations.s2.u2 struct_declarations.s2.u2.u1s1.e.0 struct_declarations.s2.u2.u1s1.e.1 struct_declarations.long_array.0 struct_declarations.s2.u2.u1s1.e.2 struct_declarations.long_array.1 struct_declarations.u1.a struct_declarations.s2.u2.u1s1.e.3 struct_declarations.long_array.2 struct_declarations.u1.b struct_declarations.s2.u2.u1s1.e.4 struct_declarations.long_array.3 struct_declarations.u1.c struct_declarations.s2.u2.u1s1.e.5 struct_declarations.long_array.4 struct_declarations.u1.d struct_declarations.u1.b.*b struct_declarations.int_ptr_ptr.*int_ptr_ptr.**int_ptr_ptr struct_declarations.s2.u2.u1s1.e.6 struct_declarations.long_array.5 struct_declarations.s2.u2.u1s1.e.7 struct_declarations.long_array.6 struct_declarations.s2.u2.u1s1.e.8 struct_declarations.long_array.7 struct_declarations.s2.u2.u1s1.e.9 struct_declarations.long_array.8 struct_declarations.character struct_declarations.long_array.9 struct_declarations.int_ptr_ptr.*int_ptr_ptr struct_declarations.s2.u2.u1s1.func struct_declarations.s2.u2.u1s2.array_ptr struct_declarations.s2.u2.f struct_declarations.s2.u2.u1s1.foo struct_declarations.s2.u2.u1s1 struct_declarations.s2.u2.u1s2.array_ptr.0 struct_declarations.char_ptr struct_declarations.s2.u2.u1s2 struct_declarations.s2.u2.u1s2.array_ptr.1 struct_declarations.int_ptr_ptr struct_declarations.s2 struct_declarations.long_array struct_declarations.s2.g struct_declarations.s2.i.0 struct_declarations.s2.h struct_declarations.s2.i.1 struct_declarations.s2.i struct_declarations.s2.i.2}}
-
-# Step over "weird->func_ptr = nothing;"
-gdb_cmd "step"
-
-# Test: c_variable-5.9
-# Desc: check that func_ptr changed
-gdbtk_test c_variable-5.9 {check that func_ptr changed} {
-  check_update
-} {struct_declarations.func_ptr {struct_declarations.s2.i.3 struct_declarations.func_ptr_ptr struct_declarations.s2.i.4 struct_declarations.s2.i.5 struct_declarations.s2.i.6 struct_declarations.func_ptr struct_declarations.s2.i.7 struct_declarations.s2.i.8 struct_declarations.s2.i.9 struct_declarations.s2.u2.u1s1.d struct_declarations.func_ptr_struct struct_declarations.s2.u2.u1s1.e struct_declarations.u1 struct_declarations.char_ptr.*char_ptr struct_declarations.long_int struct_declarations.s2.u2.u1s2.func struct_declarations.integer struct_declarations.s2.u2 struct_declarations.s2.u2.u1s1.e.0 struct_declarations.s2.u2.u1s1.e.1 struct_declarations.long_array.0 struct_declarations.s2.u2.u1s1.e.2 struct_declarations.long_array.1 struct_declarations.u1.a struct_declarations.s2.u2.u1s1.e.3 struct_declarations.long_array.2 struct_declarations.u1.b struct_declarations.s2.u2.u1s1.e.4 struct_declarations.long_array.3 struct_declarations.u1.c struct_declarations.s2.u2.u1s1.e.5 struct_declarations.long_array.4 struct_declarations.u1.d struct_declarations.u1.b.*b struct_declarations.int_ptr_ptr.*int_ptr_ptr.**int_ptr_ptr struct_declarations.s2.u2.u1s1.e.6 struct_declarations.long_array.5 struct_declarations.s2.u2.u1s1.e.7 struct_declarations.long_array.6 struct_declarations.s2.u2.u1s1.e.8 struct_declarations.long_array.7 struct_declarations.s2.u2.u1s1.e.9 struct_declarations.long_array.8 struct_declarations.character struct_declarations.long_array.9 struct_declarations.int_ptr_ptr.*int_ptr_ptr struct_declarations.s2.u2.u1s1.func struct_declarations.s2.u2.u1s2.array_ptr struct_declarations.s2.u2.f struct_declarations.s2.u2.u1s1.foo struct_declarations.s2.u2.u1s1 struct_declarations.s2.u2.u1s2.array_ptr.0 struct_declarations.char_ptr struct_declarations.s2.u2.u1s2 struct_declarations.s2.u2.u1s2.array_ptr.1 struct_declarations.int_ptr_ptr struct_declarations.s2 struct_declarations.long_array struct_declarations.s2.g struct_declarations.s2.i.0 struct_declarations.s2.h struct_declarations.s2.i.1 struct_declarations.s2.i struct_declarations.s2.i.2}}
-
-# Delete all variables
-delete_all_variables
-
-# Step over all lines:
-# ...
-#   psnp = &snp0;
-for {set i 0} {$i < 43} {incr i} {
-  gdb_cmd "step"
-}
-
-# Test: c_variable-5.10
-# Desc: create psnp->char_ptr
-gdbtk_test c_variable-5.10 {create psnp->char_ptr} {
-  create_variable psnp->char_ptr
-} {0}
-
-# Test: c_variable-5.11
-# Desc: children of psnp->char_ptr
-gdbtk_test c_variable-5.11 {children of psnp->char_ptr} {
-  get_children psnp->char_ptr
-} {*psnp->char_ptr}
-
-# Test: c_variable-5.12
-# Desc: number of children of psnp->char_ptr
-gdbtk_test c_variable-5.12 {number of children of psnp->char_ptr} {
-  $var(psnp->char_ptr) numChildren
-} {1}
-
-# Test: c_variable-5.13
-# Desc: children of *(psnp->char_ptr)
-gdbtk_test c_variable-5.13 {children of *(psnp->char_ptr)} {
-  get_children psnp->char_ptr.*psnp->char_ptr
-} {**psnp->char_ptr}
-
-# Test: c_variable-5.14
-# Desc: number of children of *(psnp->char_ptr)
-gdbtk_test c_variable-5.14 {number of children of *(psnp->char_ptr)} {
-  $var(psnp->char_ptr.*psnp->char_ptr) numChildren
-} {1}
-
-# Test: c_variable-5.15
-# Desc: children of *(*(psnp->char_ptr))
-gdbtk_test c_variable-5.15 {children of *(*(psnp->char_ptr))} {
-  get_children psnp->char_ptr.*psnp->char_ptr.**psnp->char_ptr
-} {***psnp->char_ptr}
-
-# Test: c_variable-5.16
-# Desc: number of children of *(*(psnp->char_ptr))
-gdbtk_test c_variable-5.16 {number of children of *(*(psnp->char_ptr))} {
-  $var(psnp->char_ptr.*psnp->char_ptr.**psnp->char_ptr) numChildren
-} {1}
-
-# Test: c_variable-5.17
-# Desc: children of *(*(*(psnp->char_ptr)))
-gdbtk_test c_variable-5.17 {children of *(*(*(psnp->char_ptr)))} {
-  get_children psnp->char_ptr.*psnp->char_ptr.**psnp->char_ptr.***psnp->char_ptr
-} {****psnp->char_ptr}
-
-# Test: c_variable-5.18
-# Desc: number of children of *(*(*(psnp->char_ptr)))
-gdbtk_test c_variable-5.18 {number of children of *(*(*(psnp->char_ptr)))} {
-  $var(psnp->char_ptr.*psnp->char_ptr.**psnp->char_ptr.***psnp->char_ptr) numChildren
-} {1}
-
-# Test: c_variable-5.19
-# Desc: create psnp->long_ptr
-gdbtk_test c_variable-5.19 {create psnp->long_ptr} {
-  create_variable psnp->long_ptr
-} {0}
-
-# Test: c_variable-5.20
-# Desc: children of psnp->long_ptr
-gdbtk_test c_variable-5.20 {children of psnp->long_ptr} {
-  get_children psnp->long_ptr
-} {*psnp->long_ptr}
-
-# Test: c_variable-5.21
-# Desc: number of children of psnp->long_ptr
-gdbtk_test c_variable-5.21 {number of children of psnp->long_ptr} {
-  $var(psnp->long_ptr) numChildren
-} {1}
-
-# Test: c_variable-5.22
-# Desc: children of *(psnp->long_ptr)
-gdbtk_test c_variable-5.22 {children of *(psnp->long_ptr)} {
-  get_children psnp->long_ptr.*psnp->long_ptr
-} {**psnp->long_ptr}
-
-# Test: c_variable-5.23
-# Desc: number of children of *(psnp->long_ptr)
-gdbtk_test c_variable-5.23 {number of children of *(psnp->long_ptr)} {
-  $var(psnp->long_ptr.*psnp->long_ptr) numChildren
-} {1}
-
-# Test: c_variable-5.24
-# Desc: children of *(*(psnp->long_ptr))
-gdbtk_test c_variable-5.24 {children of *(*(psnp->long_ptr))} {
-  get_children psnp->long_ptr.*psnp->long_ptr.**psnp->long_ptr
-} {***psnp->long_ptr}
-
-# Test: c_variable-5.25
-# Desc: number of children of *(*(psnp->long_ptr))
-gdbtk_test c_variable-5.25 {number of children of *(*(psnp->long_ptr))} {
-  $var(psnp->long_ptr.*psnp->long_ptr.**psnp->long_ptr) numChildren
-} {1}
-
-# Test: c_variable-5.26
-# Desc: children of *(*(*(psnp->long_ptr)))
-gdbtk_test c_variable-5.26 {children of *(*(*(psnp->long_ptr)))} {
-  get_children psnp->long_ptr.*psnp->long_ptr.**psnp->long_ptr.***psnp->long_ptr
-} {****psnp->long_ptr}
-
-# Test: c_variable-5.27
-# Desc: number of children of *(*(*(psnp->long_ptr)))
-gdbtk_test c_variable-5.27 {number of children of *(*(*(psnp->long_ptr)))} {
-  $var(psnp->long_ptr.*psnp->long_ptr.**psnp->long_ptr.***psnp->long_ptr) numChildren
-} {1}
-
-# Test: c_variable-5.28
-# Desc: children of *(*(*(*(psnp->long_ptr))))
-gdbtk_test c_variable-5.29 {children of *(*(*(*(psnp->long_ptr))))} {
-  get_children psnp->long_ptr.*psnp->long_ptr.**psnp->long_ptr.***psnp->long_ptr.****psnp->long_ptr
-} {}
-
-# Test: c_variable-5.29
-# Desc: number of children of *(*(*(*(psnp->long_ptr))))
-gdbtk_test c_variable-5.29 {number of children of *(*(*(*(psnp->long_ptr))))} {
-  $var(psnp->long_ptr.*psnp->long_ptr.**psnp->long_ptr.***psnp->long_ptr.****psnp->long_ptr) numChildren
-} {0}
-
-# Test: c_variable-5.30
-# Desc: create psnp->ptrs
-gdbtk_test c_variable-5.30 {create psnp->ptrs} {
-  create_variable psnp->ptrs
-} {0}
-
-# Test: c_variable-5.31
-# Desc: children of psnp->ptrs
-gdbtk_test c_variable-5.31 {children of psnp->ptrs} {
-  get_children psnp->ptrs
-} {0 1 2}
-
-# Test: c_variable-5.32
-# Desc: number of children of psnp->ptrs
-gdbtk_test c_variable-5.32 {number of children of psnp->ptrs} {
-  $var(psnp->ptrs) numChildren
-} {3}
-
-# Test: c_variable-5.33
-# Desc: children of psnp->ptrs[0]
-gdbtk_test c_variable-5.33 {children of psnp->ptrs[0]} {
-  get_children psnp->ptrs.0
-} {char_ptr long_ptr ptrs next}
-
-# Test: c_variable-5.34
-# Desc: number of children of psnp->ptrs[0]
-gdbtk_test c_variable-5.34 {number of children of psnp->ptrs[0]} {
-  $var(psnp->ptrs.0) numChildren
-} {4}
-
-# Test: c_variable-5.35
-# Desc: children of psnp->ptrs[0]->next
-gdbtk_test c_variable-5.35 {children of psnp->ptrs.0.next} {
-  get_children psnp->ptrs.0.next
-} {char_ptr long_ptr ptrs next}
-
-# Test: c_variable-5.36
-# Desc: number of children of psnp->ptrs[0]->next
-gdbtk_test c_variable-5.36 {number of children of psnp->ptrs[0]->next} {
-  $var(psnp->ptrs.0.next) numChildren
-} {4}
-
-# Test: c_variable-5.37
-# Desc: children of psnp->ptrs[0]->next->char_ptr
-gdbtk_test c_variable-5.37 {children of psnp->ptrs[0]->next->char_ptr} {
-  get_children psnp->ptrs.0.next.char_ptr
-} {*char_ptr}
-
-# Test: c_variable-5.38
-# Desc: number of children of psnp->ptrs[0]->next->char_ptr
-gdbtk_test c_variable-5.38 {number of children of psnp->ptrs[0]->next->char_ptr} {
-  $var(psnp->ptrs.0.next.char_ptr) numChildren
-} {1}
-
-# Test: c_variable-5.39
-# Desc: children of *psnp->ptrs[0]->next->char_ptr
-gdbtk_test c_variable-5.39 {children of *psnp->ptrs[0]->next->char_ptr} {
-  get_children psnp->ptrs.0.next.char_ptr.*char_ptr
-} {**char_ptr}
-
-# Test: c_variable-5.40
-# Desc: number of children of *psnp->ptrs[0]->next->char_ptr
-gdbtk_test c_variable-5.40 {number of children of *psnp->ptrs[0]->next->char_ptr} {
-  $var(psnp->ptrs.0.next.char_ptr.*char_ptr) numChildren
-} {1}
-
-# Test: c_variable-5.41
-# Desc: children of **psnp->ptrs[0]->next->char_ptr
-gdbtk_test c_variable-5.41 {children of **psnp->ptrs[0]->next->char_ptr} {
-  get_children psnp->ptrs.0.next.char_ptr.*char_ptr.**char_ptr
-} {***char_ptr}
-
-# Test: c_variable-5.42
-# Desc: number of children of **psnp->ptrs[0]->next->char_ptr
-gdbtk_test c_variable-5.42 {number of children of **psnp->ptrs[0]->next->char_ptr} {
-  $var(psnp->ptrs.0.next.char_ptr.*char_ptr.**char_ptr) numChildren
-} {1}
-
-# Test: c_variable-5.43
-# Desc: children of ***psnp->ptrs[0]->next->char_ptr
-gdbtk_test c_variable-5.43 {children of ***psnp->ptrs[0]->next->char_ptr} {
-  get_children psnp->ptrs.0.next.char_ptr.*char_ptr.**char_ptr.***char_ptr
-} {****char_ptr}
-
-# Test: c_variable-5.44
-# Desc: number of children of ***psnp->ptrs[0]->next->char_ptr
-gdbtk_test c_variable-5.44 {number of children of ***psnp->ptrs[0]->next->char_ptr} {
-  $var(psnp->ptrs.0.next.char_ptr.*char_ptr.**char_ptr.***char_ptr) numChildren
-} {1}
-
-# Test: c_variable-5.45
-# Desc: children of psnp->ptrs[0]->next->next
-gdbtk_test c_variable-5.45 {children of psnp->ptrs[0]->next->next} {
-  get_children psnp->ptrs.0.next.next
-} {char_ptr long_ptr ptrs next}
-
-# Test: c_variable-5.46
-# Desc: children of psnp->ptrs[0]->next->next->ptrs
-gdbtk_test c_variable-5.46 {children of psnp->ptrs[0]->next->next->ptrs} {
-  get_children psnp->ptrs.0.next.next.ptrs
-} {0 1 2}
-
-#  Step over "snp0.char_ptr = &b3;"
-gdb_cmd "step"
-
-# Test: c_variable-5.47
-# Desc: check that psnp->char_ptr (and [0].char_ptr) changed
-gdbtk_test c_variable-5.47 {check that psnp->char_ptr (and [0].char_ptr) changed} {
-  check_update
-} {{psnp->ptrs.0.char_ptr {psnp->char_ptr psnp->char_ptr.*psnp->char_ptr psnp->char_ptr.*psnp->char_ptr.**psnp->char_ptr psnp->char_ptr.*psnp->char_ptr.**psnp->char_ptr.***psnp->char_ptr psnp->char_ptr.*psnp->char_ptr.**psnp->char_ptr.***psnp->char_ptr.****psnp->char_ptr}} {psnp->ptrs.0.next psnp->ptrs.0.next.ptrs psnp->ptrs.0.next.next psnp->ptrs.0.next.next.char_ptr psnp->ptrs.0.next.next.long_ptr psnp->ptrs.0.next.char_ptr.*char_ptr.**char_ptr.***char_ptr psnp->char_ptr.*psnp->char_ptr.**psnp->char_ptr.***psnp->char_ptr.****psnp->char_ptr psnp->char_ptr.*psnp->char_ptr.**psnp->char_ptr psnp->ptrs.0.next.char_ptr.*char_ptr.**char_ptr psnp->ptrs.0.next.char_ptr psnp->ptrs.0.next.long_ptr psnp->ptrs.0.next.next.ptrs psnp->ptrs.0.next.char_ptr.*char_ptr psnp->long_ptr.*psnp->long_ptr.**psnp->long_ptr.***psnp->long_ptr.****psnp->long_ptr psnp->ptrs.0.next.next.next psnp->char_ptr.*psnp->char_ptr.**psnp->char_ptr.***psnp->char_ptr psnp->char_ptr.*psnp->char_ptr psnp->ptrs.0.next.next.ptrs.0 psnp->long_ptr.*psnp->long_ptr.**psnp->long_ptr.***psnp->long_ptr psnp->long_ptr.*psnp->long_ptr psnp->ptrs.0.next.next.ptrs.1 psnp->ptrs.0.next.next.ptrs.2 psnp->ptrs.0.char_ptr psnp->ptrs.0.long_ptr psnp->ptrs.0.next.char_ptr.*char_ptr.**char_ptr.***char_ptr.****char_ptr psnp->ptrs.0.ptrs psnp->ptrs.0 psnp->ptrs.1 psnp->ptrs.2 psnp->long_ptr.*psnp->long_ptr.**psnp->long_ptr}}
-
-#  Step over "snp1.char_ptr = &c3;"
-gdb_cmd "step"
-
-# Test: c_variable-5.48
-# Desc: check that psnp->next->char_ptr (and [1].char_ptr) changed
-gdbtk_test c_variable-5.48 {check that psnp->next->char_ptr (and [1].char_ptr) changed} {
-  check_update
-} {{{psnp->ptrs.0.next.char_ptr psnp->ptrs.0.next.char_ptr.*char_ptr psnp->ptrs.0.next.char_ptr.*char_ptr.**char_ptr psnp->ptrs.0.next.char_ptr.*char_ptr.**char_ptr.***char_ptr psnp->ptrs.0.next.char_ptr.*char_ptr.**char_ptr.***char_ptr.****char_ptr}} {psnp->ptrs.0.next psnp->ptrs.0.next.ptrs psnp->ptrs.0.next.next psnp->ptrs.0.next.next.char_ptr psnp->ptrs.0.next.next.long_ptr psnp->ptrs.0.next.char_ptr.*char_ptr.**char_ptr.***char_ptr psnp->char_ptr.*psnp->char_ptr.**psnp->char_ptr.***psnp->char_ptr.****psnp->char_ptr psnp->char_ptr.*psnp->char_ptr.**psnp->char_ptr psnp->ptrs.0.next.char_ptr.*char_ptr.**char_ptr psnp->ptrs.0.next.char_ptr psnp->ptrs.0.next.long_ptr psnp->ptrs.0.next.next.ptrs psnp->ptrs.0.next.char_ptr.*char_ptr psnp->long_ptr.*psnp->long_ptr.**psnp->long_ptr.***psnp->long_ptr.****psnp->long_ptr psnp->ptrs.0.next.next.next psnp->char_ptr.*psnp->char_ptr.**psnp->char_ptr.***psnp->char_ptr psnp->char_ptr.*psnp->char_ptr psnp->ptrs.0.next.next.ptrs.0 psnp->long_ptr.*psnp->long_ptr.**psnp->long_ptr.***psnp->long_ptr psnp->long_ptr.*psnp->long_ptr psnp->ptrs.0.next.next.ptrs.1 psnp->ptrs.0.next.next.ptrs.2 psnp->ptrs.0.char_ptr psnp->ptrs.0.long_ptr psnp->ptrs.0.next.char_ptr.*char_ptr.**char_ptr.***char_ptr.****char_ptr psnp->ptrs.0.ptrs psnp->ptrs.0 psnp->ptrs.1 psnp->ptrs.2 psnp->long_ptr.*psnp->long_ptr.**psnp->long_ptr}}
-
-#  Step over "snp2.char_ptr = &a3;"
-gdb_cmd "step"
-
-# Test: c_variable-5.49
-# Desc: check that psnp->next->next->char_ptr (and [2].char_ptr) changed
-gdbtk_test c_variable-5.49 {heck that psnp->next->next->char_ptr (and [2].char_ptr) changed} {
-  check_update
-} {psnp->ptrs.0.next.next.char_ptr {psnp->ptrs.0.next psnp->ptrs.0.next.ptrs psnp->ptrs.0.next.next psnp->ptrs.0.next.next.char_ptr psnp->ptrs.0.next.next.long_ptr psnp->ptrs.0.next.char_ptr.*char_ptr.**char_ptr.***char_ptr psnp->char_ptr.*psnp->char_ptr.**psnp->char_ptr.***psnp->char_ptr.****psnp->char_ptr psnp->char_ptr.*psnp->char_ptr.**psnp->char_ptr psnp->ptrs.0.next.char_ptr.*char_ptr.**char_ptr psnp->ptrs.0.next.char_ptr psnp->ptrs.0.next.long_ptr psnp->ptrs.0.next.next.ptrs psnp->ptrs.0.next.char_ptr.*char_ptr psnp->long_ptr.*psnp->long_ptr.**psnp->long_ptr.***psnp->long_ptr.****psnp->long_ptr psnp->ptrs.0.next.next.next psnp->char_ptr.*psnp->char_ptr.**psnp->char_ptr.***psnp->char_ptr psnp->char_ptr.*psnp->char_ptr psnp->ptrs.0.next.next.ptrs.0 psnp->long_ptr.*psnp->long_ptr.**psnp->long_ptr.***psnp->long_ptr psnp->long_ptr.*psnp->long_ptr psnp->ptrs.0.next.next.ptrs.1 psnp->ptrs.0.next.next.ptrs.2 psnp->ptrs.0.char_ptr psnp->ptrs.0.long_ptr psnp->ptrs.0.next.char_ptr.*char_ptr.**char_ptr.***char_ptr.****char_ptr psnp->ptrs.0.ptrs psnp->ptrs.0 psnp->ptrs.1 psnp->ptrs.2 psnp->long_ptr.*psnp->long_ptr.**psnp->long_ptr}}
-
-#  Step over "snp0.long_ptr = &y3;"
-gdb_cmd "step"
-
-# Test: c_variable-5.50
-# Desc: check that psnp->long_ptr (and [0].long_ptr) changed
-gdbtk_test c_variable-5.50 {check that psnp->long_ptr (and [0].long_ptr) changed} {
-  check_update
-} {{psnp->ptrs.0.long_ptr {psnp->long_ptr psnp->long_ptr.*psnp->long_ptr psnp->long_ptr.*psnp->long_ptr.**psnp->long_ptr psnp->long_ptr.*psnp->long_ptr.**psnp->long_ptr.***psnp->long_ptr psnp->long_ptr.*psnp->long_ptr.**psnp->long_ptr.***psnp->long_ptr.****psnp->long_ptr}} {psnp->ptrs.0.next psnp->ptrs.0.next.ptrs psnp->ptrs.0.next.next psnp->ptrs.0.next.next.char_ptr psnp->ptrs.0.next.next.long_ptr psnp->ptrs.0.next.char_ptr.*char_ptr.**char_ptr.***char_ptr psnp->char_ptr.*psnp->char_ptr.**psnp->char_ptr.***psnp->char_ptr.****psnp->char_ptr psnp->char_ptr.*psnp->char_ptr.**psnp->char_ptr psnp->ptrs.0.next.char_ptr.*char_ptr.**char_ptr psnp->ptrs.0.next.char_ptr psnp->ptrs.0.next.long_ptr psnp->ptrs.0.next.next.ptrs psnp->ptrs.0.next.char_ptr.*char_ptr psnp->long_ptr.*psnp->long_ptr.**psnp->long_ptr.***psnp->long_ptr.****psnp->long_ptr psnp->ptrs.0.next.next.next psnp->char_ptr.*psnp->char_ptr.**psnp->char_ptr.***psnp->char_ptr psnp->char_ptr.*psnp->char_ptr psnp->ptrs.0.next.next.ptrs.0 psnp->long_ptr.*psnp->long_ptr.**psnp->long_ptr.***psnp->long_ptr psnp->long_ptr.*psnp->long_ptr psnp->ptrs.0.next.next.ptrs.1 psnp->ptrs.0.next.next.ptrs.2 psnp->ptrs.0.char_ptr psnp->ptrs.0.long_ptr psnp->ptrs.0.next.char_ptr.*char_ptr.**char_ptr.***char_ptr.****char_ptr psnp->ptrs.0.ptrs psnp->ptrs.0 psnp->ptrs.1 psnp->ptrs.2 psnp->long_ptr.*psnp->long_ptr.**psnp->long_ptr}}
-
-#  Step over "snp1.long_ptr = &x3;"
-gdb_cmd "step"
-
-# Test: c_variable-5.51
-# Desc: check that psnp->next->long_ptr (and [1].long_ptr) changed
-gdbtk_test c_variable-5.51 {check that psnp->next->long_ptr (and [1].long_ptr) changed} {
-  check_update
-} {psnp->ptrs.0.next.long_ptr {psnp->ptrs.0.next psnp->ptrs.0.next.ptrs psnp->ptrs.0.next.next psnp->ptrs.0.next.next.char_ptr psnp->ptrs.0.next.next.long_ptr psnp->ptrs.0.next.char_ptr.*char_ptr.**char_ptr.***char_ptr psnp->char_ptr.*psnp->char_ptr.**psnp->char_ptr.***psnp->char_ptr.****psnp->char_ptr psnp->char_ptr.*psnp->char_ptr.**psnp->char_ptr psnp->ptrs.0.next.char_ptr.*char_ptr.**char_ptr psnp->ptrs.0.next.char_ptr psnp->ptrs.0.next.long_ptr psnp->ptrs.0.next.next.ptrs psnp->ptrs.0.next.char_ptr.*char_ptr psnp->long_ptr.*psnp->long_ptr.**psnp->long_ptr.***psnp->long_ptr.****psnp->long_ptr psnp->ptrs.0.next.next.next psnp->char_ptr.*psnp->char_ptr.**psnp->char_ptr.***psnp->char_ptr psnp->char_ptr.*psnp->char_ptr psnp->ptrs.0.next.next.ptrs.0 psnp->long_ptr.*psnp->long_ptr.**psnp->long_ptr.***psnp->long_ptr psnp->long_ptr.*psnp->long_ptr psnp->ptrs.0.next.next.ptrs.1 psnp->ptrs.0.next.next.ptrs.2 psnp->ptrs.0.char_ptr psnp->ptrs.0.long_ptr psnp->ptrs.0.next.char_ptr.*char_ptr.**char_ptr.***char_ptr.****char_ptr psnp->ptrs.0.ptrs psnp->ptrs.0 psnp->ptrs.1 psnp->ptrs.2 psnp->long_ptr.*psnp->long_ptr.**psnp->long_ptr}}
-
-#  Step over "snp2.long_ptr = &z3;"
-gdb_cmd "step"
-
-# Test: c_variable-5.52
-# Desc: check that psnp->next->next->long_ptr (and [2].long_ptr) changed
-gdbtk_test c_variable-5.52 {check that psnp->next->next->long_ptr (and [2].long_ptr) changed} {
-  check_update
-} {psnp->ptrs.0.next.next.long_ptr {psnp->ptrs.0.next psnp->ptrs.0.next.ptrs psnp->ptrs.0.next.next psnp->ptrs.0.next.next.char_ptr psnp->ptrs.0.next.next.long_ptr psnp->ptrs.0.next.char_ptr.*char_ptr.**char_ptr.***char_ptr psnp->char_ptr.*psnp->char_ptr.**psnp->char_ptr.***psnp->char_ptr.****psnp->char_ptr psnp->char_ptr.*psnp->char_ptr.**psnp->char_ptr psnp->ptrs.0.next.char_ptr.*char_ptr.**char_ptr psnp->ptrs.0.next.char_ptr psnp->ptrs.0.next.long_ptr psnp->ptrs.0.next.next.ptrs psnp->ptrs.0.next.char_ptr.*char_ptr psnp->long_ptr.*psnp->long_ptr.**psnp->long_ptr.***psnp->long_ptr.****psnp->long_ptr psnp->ptrs.0.next.next.next psnp->char_ptr.*psnp->char_ptr.**psnp->char_ptr.***psnp->char_ptr psnp->char_ptr.*psnp->char_ptr psnp->ptrs.0.next.next.ptrs.0 psnp->long_ptr.*psnp->long_ptr.**psnp->long_ptr.***psnp->long_ptr psnp->long_ptr.*psnp->long_ptr psnp->ptrs.0.next.next.ptrs.1 psnp->ptrs.0.next.next.ptrs.2 psnp->ptrs.0.char_ptr psnp->ptrs.0.long_ptr psnp->ptrs.0.next.char_ptr.*char_ptr.**char_ptr.***char_ptr.****char_ptr psnp->ptrs.0.ptrs psnp->ptrs.0 psnp->ptrs.1 psnp->ptrs.2 psnp->long_ptr.*psnp->long_ptr.**psnp->long_ptr}}
-
-# Test: c_variable-5.53
-# Desc: names of editable variables
-gdbtk_test c_variable-5.53 {names of editable variables} {
-  editable_variables
-} {{psnp->ptrs.0.next psnp->ptrs.0.next.next psnp->ptrs.0.next.next.char_ptr psnp->ptrs.0.next.next.long_ptr psnp->ptrs.0.next.char_ptr.*char_ptr.**char_ptr.***char_ptr psnp->char_ptr.*psnp->char_ptr.**psnp->char_ptr.***psnp->char_ptr.****psnp->char_ptr psnp->char_ptr.*psnp->char_ptr.**psnp->char_ptr psnp->ptrs.0.next.char_ptr.*char_ptr.**char_ptr psnp->ptrs.0.next.char_ptr psnp->ptrs.0.next.long_ptr psnp->ptrs.0.next.char_ptr.*char_ptr psnp->long_ptr.*psnp->long_ptr.**psnp->long_ptr.***psnp->long_ptr.****psnp->long_ptr psnp->ptrs.0.next.next.next psnp->char_ptr.*psnp->char_ptr.**psnp->char_ptr.***psnp->char_ptr psnp->char_ptr.*psnp->char_ptr psnp->ptrs.0.next.next.ptrs.0 psnp->long_ptr.*psnp->long_ptr.**psnp->long_ptr.***psnp->long_ptr psnp->long_ptr.*psnp->long_ptr psnp->ptrs.0.next.next.ptrs.1 psnp->ptrs.0.next.next.ptrs.2 psnp->ptrs.0.char_ptr psnp->ptrs.0.long_ptr psnp->char_ptr psnp->ptrs.0.next.char_ptr.*char_ptr.**char_ptr.***char_ptr.****char_ptr psnp->long_ptr psnp->ptrs.0 psnp->ptrs.1 psnp->ptrs.2 psnp->long_ptr.*psnp->long_ptr.**psnp->long_ptr} {psnp->ptrs.0.next.ptrs psnp->ptrs.0.next.next.ptrs psnp->ptrs psnp->ptrs.0.ptrs}}
-
-#####       #####
-#               #
-# Display tests #
-#               #
-#####       #####
-
-delete_all_variables
-
-# Test: c_variable-6.1
-# Desc: create variable bar
-gdbtk_test c_variable-6.1 {create variable bar} {
-  create_variable bar
-} {0}
-
-# Test: c_variable-6.2
-# Desc: type of variable bar
-gdbtk_test c_variable-6.2 {type of variable bar} {
-  $var(bar) type
-} {int}
-
-# Test: c_variable-6.3
-# Desc: format of variable bar
-gdbtk_test c_variable-6.3 {format of variable bar} {
-  $var(bar) format
-} {natural}
-
-# Test: c_variable-6.4
-# Desc: value of variable bar
-gdbtk_test c_variable-6.4 {value of variable bar} {
-  value bar d
-} {ok}
-
-# Test: c_variable-6.5
-# Desc: change format of bar to hex
-gdbtk_test c_variable-6.5 {change format of bar to hex} {
-  $var(bar) format hex
-  $var(bar) format
-} {hexadecimal}
-
-# Test: c_variable-6.6
-# Desc: value of bar with new format
-gdbtk_test c_variable-6.6 {value of bar with new format} {
-  value bar x
-} {ok}
-
-# Test: c_variable-6.7
-# Desc: change value of bar
-gdbtk_test c_variable-6.7 {change value of bar} {
-  $var(bar) value 3
-  value bar x
-} {ok}
-
-# Test: c_variable-6.8
-# Desc: check new value of bar
-gdbtk_test c_variable-6.8 {change value of bar} {
-  $var(bar) format decimal
-  $var(bar) value
-} {3}
-
-delete_variable bar
-
-# Test: c_variable-6.11
-# Desc: create variable foo
-gdbtk_test c_variable-6.11 {create variable foo} {
-  create_variable foo
-} {0}
-
-# Test: c_variable-6.12
-# Desc: type of variable foo
-gdbtk_test c_variable-6.12 {type of variable foo} {
-  $var(foo) type
-} {int *}
-
-# Test: c_variable-6.13
-# Desc: format of variable foo
-gdbtk_test c_variable-6.13 {format of variable foo} {
-  $var(foo) format
-} {natural}
-
-# Test: c_variable-6.14
-# Desc: value of variable foo
-gdbtk_test c_variable-6.14 {value of variable foo} {
-  value foo x
-} {ok}
-
-# Test: c_variable-6.15
-# Desc: change format of var to octal
-gdbtk_test c_variable-6.15 {change format of foo to octal} {
-  $var(foo) format octal
-  $var(foo) format
-} {octal}
-
-# Test: c_variable-6.16
-# Desc: value of foo with new format
-gdbtk_test c_variable-6.16 {value of foo with new format} {
-  value foo o
-} {ok}
-
-# Test: c_variable-6.17
-# Desc: change value of foo
-gdbtk_test c_variable-6.17 {change value of foo} {
-  $var(foo) value 3
-  value foo o
-} {ok}
-
-# Test: c_variable-6.18
-# Desc: check new value of foo
-gdbtk_test c_variable-6.18 {check new value of foo} {
-  $var(foo) format decimal
-  $var(foo) value
-} {3}
-
-delete_variable foo
-
-# Test: c_variable-6.21
-# Desc: create variable weird and children
-gdbtk_test c_variable-6.21 {create variable foo} {
-  if {![create_variable weird]} {
-    lsort [get_children weird]
-  }
-} {char_ptr character func_ptr func_ptr_ptr func_ptr_struct int_ptr_ptr integer long_array long_int s2 u1}
-
-# Test: c_variable-6.22
-# Desc: type of weird and children
-gdbtk_test c_variable-6.22 {type of weird and children} {
-  set types {}
-  foreach v [lsort [array names var]] {
-    lappend types [$var($v) type]
-  }
-
-  set types
-} {{weird_struct *} {char *} char {void (*)(void)} {struct _struct_decl *(*)(int, char *, long int)} {struct _struct_decl (*)(int, char *, long int)} {int **} int {long int [10]} {long int} struct union}
-
-# Test: c_variable-6.23
-# Desc: change format of weird.func_ptr and weird.func_ptr_ptr
-gdbtk_test c_variable-6.23 {change format of weird.func_ptr and weird.func_ptr_ptr} {
-  $var(weird.func_ptr) format hexadecimal
-  $var(weird.func_ptr_ptr) format hexadecimal
-  set result {}
-  lappend result [$var(weird.func_ptr) format]
-  lappend result [$var(weird.func_ptr_ptr) format]
-  set result
-} {hexadecimal hexadecimal}
-
-# Test: c_variable-6.24
-# Desc: format of weird and children
-gdbtk_test c_variable-6.24 {format of weird and children} {
-  set formats {}
-  foreach v [lsort [array names var]] {
-    lappend formats [$var($v) format]
-  }
-
-  set formats
-} {natural natural natural hexadecimal hexadecimal natural natural natural natural natural natural natural}
-
-# Test: c_variable-6.25
-# Desc: value of weird and children
-gdbtk_test c_variable-6.25 {value of weird and children} {
-  set values {}
-  foreach v [lsort [array names var]] f [list x "" "" x x x x d d d d d] {
-    lappend values [value $v $f]
-  }
-
-  set values
-} {ok ok ok ok ok ok ok ok weird.long_array ok weird.s2 weird.u1}
-
-# Test: c_variable-6.26
-# Desc: change format of weird and children to octal
-gdbtk_test c_variable-6.26 {change format of weird and children to octal} {
-  set formats {}
-  foreach v [lsort [array names var]] {
-    $var($v) format octal
-    lappend formats [$var($v) format]
-  }
-
-  set formats
-} {octal octal octal octal octal octal octal octal octal octal octal octal}
-
-# Test: c_variable-6.27
-# Desc: value of weird and children with new format
-gdbtk_test c_variable-6.27 {value of foo with new format} {
-  set values {}
-  foreach v [lsort [array names var]] {
-    lappend values [value $v o]
-  }
-
-  set values
-} {ok ok ok ok ok ok ok ok weird.long_array ok weird.s2 weird.u1}
-
-# Test: c_variable-6.30
-# Desc: create more children of weird
-gdbtk_test c_variable-6.30 {create more children of weird} {
-  foreach v [array names var] {
-    get_children $v
-  }
-
-  # Do it twice to get more children
-  foreach v [array names var] {
-    get_children $v
-  }
-
-  lsort [array names var]
-} {weird weird.char_ptr weird.char_ptr.*char_ptr weird.character weird.func_ptr weird.func_ptr_ptr weird.func_ptr_struct weird.int_ptr_ptr weird.int_ptr_ptr.*int_ptr_ptr weird.int_ptr_ptr.*int_ptr_ptr.**int_ptr_ptr weird.integer weird.long_array weird.long_array.0 weird.long_array.1 weird.long_array.2 weird.long_array.3 weird.long_array.4 weird.long_array.5 weird.long_array.6 weird.long_array.7 weird.long_array.8 weird.long_array.9 weird.long_int weird.s2 weird.s2.g weird.s2.h weird.s2.i weird.s2.i.0 weird.s2.i.1 weird.s2.i.2 weird.s2.i.3 weird.s2.i.4 weird.s2.i.5 weird.s2.i.6 weird.s2.i.7 weird.s2.i.8 weird.s2.i.9 weird.s2.u2 weird.s2.u2.f weird.s2.u2.u1s1 weird.s2.u2.u1s2 weird.u1 weird.u1.a weird.u1.b weird.u1.b.*b weird.u1.c weird.u1.d}
-
-# Test: c_variable-6.31
-# Desc: check that all children of weird change
-#       Ok, obviously things like weird.s2 and weird.u1 will not change!
-gdbtk_test c_variable-6.31 {check that all children of weird change (ops, we are now reporting array names as changed in this case - seems harmless though)} {
-  $var(weird) value 0x2121
-  check_update
-} {{{weird weird.integer weird.character weird.char_ptr weird.char_ptr.*char_ptr weird.long_int weird.int_ptr_ptr weird.int_ptr_ptr.*int_ptr_ptr weird.long_array.0 weird.long_array.1 weird.long_array.2 weird.long_array.3 weird.long_array.4 weird.long_array.5 weird.long_array.6 weird.long_array.7 weird.long_array.8 weird.long_array.9 weird.func_ptr weird.func_ptr_struct weird.func_ptr_ptr weird.u1.a weird.u1.b weird.u1.c weird.u1.d weird.s2.u2.f weird.s2.g weird.s2.h weird.s2.i.0 weird.s2.i.1 weird.s2.i.2 weird.s2.i.3 weird.s2.i.4 weird.s2.i.5 weird.s2.i.6 weird.s2.i.7 weird.s2.i.8 weird.s2.i.9}} {weird.char_ptr weird.s2.u2.f weird.int_ptr_ptr.*int_ptr_ptr.**int_ptr_ptr weird.s2.g weird.s2.h weird.s2.i weird.func_ptr_ptr weird.func_ptr weird.s2.u2 weird.int_ptr_ptr weird.long_int weird.character weird.s2.u2.u1s1 weird.s2.u2.u1s2 weird.long_array.0 weird.u1.a weird.long_array.1 weird.s2 weird.func_ptr_struct weird.u1.b weird.long_array.2 weird.long_array weird.u1.c weird.long_array.3 weird.u1.d weird.long_array.4 weird.long_array.5 weird.s2.i.0 weird.long_array.6 weird.s2.i.1 weird.long_array.7 weird.s2.i.2 weird.long_array.8 weird.s2.i.3 weird.long_array.9 weird.s2.i.4 weird.integer weird.s2.i.5 weird.s2.i.6 weird.s2.i.7 weird.s2.i.8 weird.int_ptr_ptr.*int_ptr_ptr weird.s2.i.9 weird.char_ptr.*char_ptr weird.u1 weird.u1.b.*b}}
-
-delete_variable weird
-
-#####               #####
-#                       #
-# Special Display Tests #
-#                       #
-#####               #####
-
-# Stop in "do_special_tests"
-gdb_cmd "break do_special_tests"
-gdb_cmd "continue"
-
-# Test: c_variable-7.1
-# Desc: stop in do_special_tests
-gdbtk_test c_variable-7.1 {stop in do_special_tests} {
-  lindex [gdb_loc] 1
-} {do_special_tests}
-
-# Test: c_variable-7.10
-# Desc: create union u
-gdbtk_test c_variable-7.10 {create union u} {
-  create_variable u
-} {0}
-
-# Test: c_variable-7.11
-# Desc: value of u
-gdbtk_test c_variable-7.11 {value of u} {
-  $var(u) value
-} {{...}}
-
-# Test: c_variable-7.12
-# Desc: type of u
-gdbtk_test c_variable-7.12 {type of u} {
-  $var(u) type
-} {union named_union}
-
-# Test: c_variable-7.13
-# Desc: is u editable
-gdbtk_test c_variable-7.13 {is u editable} {
-  $var(u) editable
-} {0}
-
-# Test: c_variable-7.14
-# Desc: number of children of u
-gdbtk_test c_variable-7.14 {number of children of u} {
-  $var(u) numChildren
-} {2}
-
-# Test: c_variable-7.15
-# Desc: children of u
-gdbtk_test c_variable-7.15 {children of u} {
-  get_children u
-} {integer char_ptr}
-
-# Test: c_variable-7.20
-# Desc: create anonu
-gdbtk_test c_variable-7.20 {create anonu} {
-  create_variable anonu
-} {0}
-
-# Test: c_variable-7.21
-# Desc: value of anonu
-gdbtk_test c_variable-7.21 {value of anonu} {
-  $var(anonu) value
-} {{...}}
-
-# Test: c_variable-7.22
-# Desc: type of anonu
-gdbtk_test c_variable-7.22 {type of anonu} {
-  $var(anonu) type
-} {union}
-
-# Test: c_variable-7.23
-# Desc: is anonu editable
-gdbtk_test c_variable-7.23 {is anonu editable} {
-  $var(anonu) editable
-} {0}
-
-# Test: c_variable-7.24
-# Desc: number of children of anonu
-gdbtk_test c_variable-7.24 {number of children of anonu} {
-  $var(anonu) numChildren
-} {3}
-
-# Test: c_variable-7.25
-# Desc: children of anonu
-gdbtk_test c_variable-7.25 {children of anonu} {
-  get_children anonu
-} {a b c}
-
-# Test: c_variable-7.30
-# Desc: create struct s
-gdbtk_test c_variable-7.30 {create struct s} {
-  create_variable s
-} {0}
-
-# Test: c_variable-7.31
-# Desc: value of s
-gdbtk_test c_variable-7.31 {value of s} {
-  $var(s) value
-} {{...}}
-
-# Test: c_variable-7.32
-# Desc: type of s
-gdbtk_test c_variable-7.32 {type of s} {
-  $var(s) type
-} {struct _simple_struct}
-
-# Test: c_variable-7.33
-# Desc: is s editable
-gdbtk_test c_variable-7.33 {is s editable} {
-  $var(s) editable
-} {0}
-
-# Test: c_variable-7.34
-# Desc: number of children of s
-gdbtk_test c_variable-7.34 {number of children of s} {
-  $var(s) numChildren
-} {6}
-
-# Test: c_variable-7.35
-# Desc: children of s
-gdbtk_test c_variable-7.35 {children of s} {
-  get_children s
-} {integer unsigned_integer character signed_character char_ptr array_of_10}
-
-# Test: c_variable-7.40
-# Desc: create anons
-gdbtk_test c_variable-7.40 {create anons} {
-  create_variable anons
-} {0}
-
-# Test: c_variable-7.41
-# Desc: value of anons
-gdbtk_test c_variable-7.41 {value of anons} {
-  $var(anons) value
-} {{...}}
-
-# Test: c_variable-7.42
-# Desc: type of anons
-gdbtk_test c_variable-7.42 {type of anons} {
-  $var(anons) type
-} {struct}
-
-# Test: c_variable-7.43
-# Desc: is anons editable
-gdbtk_test c_variable-7.43 {is anons editable} {
-  $var(anons) editable
-} {0}
-
-# Test: c_variable-7.44
-# Desc: number of children of anons
-gdbtk_test c_variable-7.44 {number of children of anons} {
-  $var(anons) numChildren
-} {3}
-
-# Test: c_variable-7.45
-# Desc: children of anons
-gdbtk_test c_variable-7.45 {children of anons} {
-  get_children anons
-} {a b c}
-
-# Test: c_variable-7.50
-# Desc: create enum e
-gdbtk_test c_variable-7.50 {create enum e} {
-  create_variable e
-} {0}
-
-# Test: c_variable-7.51
-# Desc: value of e
-gdbtk_test c_variable-7.51 {value of e} {
-  $var(e) value bar
-  $var(e) value
-} {bar}
-
-# Test: c_variable-7.52
-# Desc: type of e
-gdbtk_test c_variable-7.52 {type of e} {
-  $var(e) type
-} {enum foo}
-
-# Test: c_variable-7.53
-# Desc: is e editable
-gdbtk_test c_variable-7.53 {is e editable} {
-  $var(e) editable
-} {1}
-
-# Test: c_variable-7.54
-# Desc: number of children of e
-gdbtk_test c_variable-7.54 {number of children of e} {
-  $var(e) numChildren
-} {0}
-
-# Test: c_variable-7.55
-# Desc: children of e
-gdbtk_test c_variable-7.55 {children of e} {
-  get_children e
-} {}
-
-# Test: c_variable-7.60
-# Desc: create anone
-gdbtk_test c_variable-7.60 {create anone} {
-  create_variable anone
-} {0}
-
-# Test: c_variable-7.61
-# Desc: value of anone
-gdbtk_test c_variable-7.61 {value of e} {
-  $var(e) value bar
-  $var(e) value
-} {bar}
-
-# Test: c_variable-7.62
-# Desc: type of e
-gdbtk_test c_variable-7.62 {type of e} {
-  $var(e) type
-} {enum foo}
-
-# Test: c_variable-7.63
-# Desc: is e editable
-gdbtk_test c_variable-7.63 {is e editable} {
-  $var(e) editable
-} {1}
-
-# Test: c_variable-7.64
-# Desc: number of children of e
-gdbtk_test c_variable-7.64 {number of children of e} {
-  $var(e) numChildren
-} {0}
-
-# Test: c_variable-7.65
-# Desc: children of e
-gdbtk_test c_variable-7.65 {children of e} {
-  get_children e
-} {}
-
-# Test: c_variable-7.70
-# Desc: create anone
-gdbtk_test c_variable-7.70 {try to create anone again (duplicate obj name} {
-  create_variable anone
-} {1}
-
-# Test: c_variable-7.71
-# Desc: value of anone
-gdbtk_test c_variable-7.71 {value of anone} {
-  $var(anone) value A
-  $var(anone) value
-} {A}
-
-# Test: c_variable-7.72
-# Desc: type of anone
-gdbtk_test c_variable-7.72 {type of anone} {
-  $var(anone) type
-} {enum}
-
-# Test: c_variable-7.73
-# Desc: is anone editable
-gdbtk_test c_variable-7.73 {is anone editable} {
-  $var(anone) editable
-} {1}
-
-# Test: c_variable-7.74
-# Desc: number of children of anone
-gdbtk_test c_variable-7.74 {number of children of anone} {
-  $var(anone) numChildren
-} {0}
-
-# Test: c_variable-7.75
-# Desc: children of anone
-gdbtk_test c_variable-7.75 {children of anone} {
-  get_children anone
-} {}
-
-# Record fp
-set fp [gdb_cmd "output/x \$fp"]
-gdb_cmd {break incr_a}
-gdb_cmd {continue}
-
-# Test: c_variable-7.80
-# Desc: stop in incr_a
-gdbtk_test c_variable-7.80 {stop in incr_a} {
-  lindex [gdb_loc] 1
-} {incr_a}
-
-# Test: c_variable-7.81
-# Desc: Create variables in different scopes
-gdbtk_test c_variable-7.81 {create variables in different scopes} {
-  set a1 [gdb_variable create -expr a]
-  set a2 [gdb_variable create -expr a -frame $fp]
-
-  set vals {}
-  lappend vals [$a1 value]
-  lappend vals [$a2 value]
-  set vals
-} {2 1}
-
-#  Exit
-#
-gdbtk_test_done
-
-#Local Variables:
-#mode: tcl
diff --git a/gdb/testsuite/gdb.gdbtk/configure b/gdb/testsuite/gdb.gdbtk/configure
deleted file mode 100644
index f6964b2b777..00000000000
--- a/gdb/testsuite/gdb.gdbtk/configure
+++ /dev/null
@@ -1,1010 +0,0 @@
-#! /bin/sh
-
-# Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.13 
-# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
-#
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-
-# Defaults:
-ac_help=
-ac_default_prefix=/usr/local
-# Any additions from configure.in:
-
-# Initialize some variables set by options.
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-build=NONE
-cache_file=./config.cache
-exec_prefix=NONE
-host=NONE
-no_create=
-nonopt=NONE
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-sitefile=
-srcdir=
-target=NONE
-verbose=
-x_includes=NONE
-x_libraries=NONE
-bindir='${exec_prefix}/bin'
-sbindir='${exec_prefix}/sbin'
-libexecdir='${exec_prefix}/libexec'
-datadir='${prefix}/share'
-sysconfdir='${prefix}/etc'
-sharedstatedir='${prefix}/com'
-localstatedir='${prefix}/var'
-libdir='${exec_prefix}/lib'
-includedir='${prefix}/include'
-oldincludedir='/usr/include'
-infodir='${prefix}/info'
-mandir='${prefix}/man'
-
-# Initialize some other variables.
-subdirs=
-MFLAGS= MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
-# Maximum number of lines to put in a shell here document.
-ac_max_here_lines=12
-
-ac_prev=
-for ac_option
-do
-
-  # If the previous option needs an argument, assign it.
-  if test -n "$ac_prev"; then
-    eval "$ac_prev=\$ac_option"
-    ac_prev=
-    continue
-  fi
-
-  case "$ac_option" in
-  -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-  *) ac_optarg= ;;
-  esac
-
-  # Accept the important Cygnus configure options, so we can diagnose typos.
-
-  case "$ac_option" in
-
-  -bindir | --bindir | --bindi | --bind | --bin | --bi)
-    ac_prev=bindir ;;
-  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-    bindir="$ac_optarg" ;;
-
-  -build | --build | --buil | --bui | --bu)
-    ac_prev=build ;;
-  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build="$ac_optarg" ;;
-
-  -cache-file | --cache-file | --cache-fil | --cache-fi \
-  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-    ac_prev=cache_file ;;
-  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-    cache_file="$ac_optarg" ;;
-
-  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
-    ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
-  | --da=*)
-    datadir="$ac_optarg" ;;
-
-  -disable-* | --disable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*disable-//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    eval "enable_${ac_feature}=no" ;;
-
-  -enable-* | --enable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=*) ;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "enable_${ac_feature}='$ac_optarg'" ;;
-
-  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-  | --exec | --exe | --ex)
-    ac_prev=exec_prefix ;;
-  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
-  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
-  | --exec=* | --exe=* | --ex=*)
-    exec_prefix="$ac_optarg" ;;
-
-  -gas | --gas | --ga | --g)
-    # Obsolete; use --with-gas.
-    with_gas=yes ;;
-
-  -help | --help | --hel | --he)
-    # Omit some internal or obsolete options to make the list less imposing.
-    # This message is too long to be a string in the A/UX 3.1 sh.
-    cat << EOF
-Usage: configure [options] [host]
-Options: [defaults in brackets after descriptions]
-Configuration:
-  --cache-file=FILE       cache test results in FILE
-  --help                  print this message
-  --no-create             do not create output files
-  --quiet, --silent       do not print \`checking...' messages
-  --site-file=FILE        use FILE as the site file
-  --version               print the version of autoconf that created configure
-Directory and file names:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-                          [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-                          [same as prefix]
-  --bindir=DIR            user executables in DIR [EPREFIX/bin]
-  --sbindir=DIR           system admin executables in DIR [EPREFIX/sbin]
-  --libexecdir=DIR        program executables in DIR [EPREFIX/libexec]
-  --datadir=DIR           read-only architecture-independent data in DIR
-                          [PREFIX/share]
-  --sysconfdir=DIR        read-only single-machine data in DIR [PREFIX/etc]
-  --sharedstatedir=DIR    modifiable architecture-independent data in DIR
-                          [PREFIX/com]
-  --localstatedir=DIR     modifiable single-machine data in DIR [PREFIX/var]
-  --libdir=DIR            object code libraries in DIR [EPREFIX/lib]
-  --includedir=DIR        C header files in DIR [PREFIX/include]
-  --oldincludedir=DIR     C header files for non-gcc in DIR [/usr/include]
-  --infodir=DIR           info documentation in DIR [PREFIX/info]
-  --mandir=DIR            man documentation in DIR [PREFIX/man]
-  --srcdir=DIR            find the sources in DIR [configure dir or ..]
-  --program-prefix=PREFIX prepend PREFIX to installed program names
-  --program-suffix=SUFFIX append SUFFIX to installed program names
-  --program-transform-name=PROGRAM
-                          run sed PROGRAM on installed program names
-EOF
-    cat << EOF
-Host type:
-  --build=BUILD           configure for building on BUILD [BUILD=HOST]
-  --host=HOST             configure for HOST [guessed]
-  --target=TARGET         configure for TARGET [TARGET=HOST]
-Features and packages:
-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --x-includes=DIR        X include files are in DIR
-  --x-libraries=DIR       X library files are in DIR
-EOF
-    if test -n "$ac_help"; then
-      echo "--enable and --with options recognized:$ac_help"
-    fi
-    exit 0 ;;
-
-  -host | --host | --hos | --ho)
-    ac_prev=host ;;
-  -host=* | --host=* | --hos=* | --ho=*)
-    host="$ac_optarg" ;;
-
-  -includedir | --includedir | --includedi | --included | --include \
-  | --includ | --inclu | --incl | --inc)
-    ac_prev=includedir ;;
-  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
-  | --includ=* | --inclu=* | --incl=* | --inc=*)
-    includedir="$ac_optarg" ;;
-
-  -infodir | --infodir | --infodi | --infod | --info | --inf)
-    ac_prev=infodir ;;
-  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-    infodir="$ac_optarg" ;;
-
-  -libdir | --libdir | --libdi | --libd)
-    ac_prev=libdir ;;
-  -libdir=* | --libdir=* | --libdi=* | --libd=*)
-    libdir="$ac_optarg" ;;
-
-  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
-  | --libexe | --libex | --libe)
-    ac_prev=libexecdir ;;
-  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
-  | --libexe=* | --libex=* | --libe=*)
-    libexecdir="$ac_optarg" ;;
-
-  -localstatedir | --localstatedir | --localstatedi | --localstated \
-  | --localstate | --localstat | --localsta | --localst \
-  | --locals | --local | --loca | --loc | --lo)
-    ac_prev=localstatedir ;;
-  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-  | --localstate=* | --localstat=* | --localsta=* | --localst=* \
-  | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
-    localstatedir="$ac_optarg" ;;
-
-  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-    ac_prev=mandir ;;
-  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-    mandir="$ac_optarg" ;;
-
-  -nfp | --nfp | --nf)
-    # Obsolete; use --without-fp.
-    with_fp=no ;;
-
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c)
-    no_create=yes ;;
-
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
-    no_recursion=yes ;;
-
-  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
-  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
-  | --oldin | --oldi | --old | --ol | --o)
-    ac_prev=oldincludedir ;;
-  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
-  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
-  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-    oldincludedir="$ac_optarg" ;;
-
-  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-    ac_prev=prefix ;;
-  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-    prefix="$ac_optarg" ;;
-
-  -program-prefix | --program-prefix | --program-prefi | --program-pref \
-  | --program-pre | --program-pr | --program-p)
-    ac_prev=program_prefix ;;
-  -program-prefix=* | --program-prefix=* | --program-prefi=* \
-  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-    program_prefix="$ac_optarg" ;;
-
-  -program-suffix | --program-suffix | --program-suffi | --program-suff \
-  | --program-suf | --program-su | --program-s)
-    ac_prev=program_suffix ;;
-  -program-suffix=* | --program-suffix=* | --program-suffi=* \
-  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-    program_suffix="$ac_optarg" ;;
-
-  -program-transform-name | --program-transform-name \
-  | --program-transform-nam | --program-transform-na \
-  | --program-transform-n | --program-transform- \
-  | --program-transform | --program-transfor \
-  | --program-transfo | --program-transf \
-  | --program-trans | --program-tran \
-  | --progr-tra | --program-tr | --program-t)
-    ac_prev=program_transform_name ;;
-  -program-transform-name=* | --program-transform-name=* \
-  | --program-transform-nam=* | --program-transform-na=* \
-  | --program-transform-n=* | --program-transform-=* \
-  | --program-transform=* | --program-transfor=* \
-  | --program-transfo=* | --program-transf=* \
-  | --program-trans=* | --program-tran=* \
-  | --progr-tra=* | --program-tr=* | --program-t=*)
-    program_transform_name="$ac_optarg" ;;
-
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil)
-    silent=yes ;;
-
-  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
-    ac_prev=sbindir ;;
-  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-  | --sbi=* | --sb=*)
-    sbindir="$ac_optarg" ;;
-
-  -sharedstatedir | --sharedstatedir | --sharedstatedi \
-  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
-  | --sharedst | --shareds | --shared | --share | --shar \
-  | --sha | --sh)
-    ac_prev=sharedstatedir ;;
-  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
-  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
-  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
-  | --sha=* | --sh=*)
-    sharedstatedir="$ac_optarg" ;;
-
-  -site | --site | --sit)
-    ac_prev=site ;;
-  -site=* | --site=* | --sit=*)
-    site="$ac_optarg" ;;
-
-  -site-file | --site-file | --site-fil | --site-fi | --site-f)
-    ac_prev=sitefile ;;
-  -site-file=* | --site-file=* | --site-fil=* | --site-fi=* | --site-f=*)
-    sitefile="$ac_optarg" ;;
-
-  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-    ac_prev=srcdir ;;
-  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-    srcdir="$ac_optarg" ;;
-
-  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
-  | --syscon | --sysco | --sysc | --sys | --sy)
-    ac_prev=sysconfdir ;;
-  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
-  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-    sysconfdir="$ac_optarg" ;;
-
-  -target | --target | --targe | --targ | --tar | --ta | --t)
-    ac_prev=target ;;
-  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target="$ac_optarg" ;;
-
-  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-    verbose=yes ;;
-
-  -version | --version | --versio | --versi | --vers)
-    echo "configure generated by autoconf version 2.13"
-    exit 0 ;;
-
-  -with-* | --with-*)
-    ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=*) ;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "with_${ac_package}='$ac_optarg'" ;;
-
-  -without-* | --without-*)
-    ac_package=`echo $ac_option|sed -e 's/-*without-//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    eval "with_${ac_package}=no" ;;
-
-  --x)
-    # Obsolete; use --with-x.
-    with_x=yes ;;
-
-  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
-  | --x-incl | --x-inc | --x-in | --x-i)
-    ac_prev=x_includes ;;
-  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
-  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-    x_includes="$ac_optarg" ;;
-
-  -x-libraries | --x-libraries | --x-librarie | --x-librari \
-  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
-    ac_prev=x_libraries ;;
-  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
-  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-    x_libraries="$ac_optarg" ;;
-
-  -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
-    ;;
-
-  *)
-    if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
-      echo "configure: warning: $ac_option: invalid host type" 1>&2
-    fi
-    if test "x$nonopt" != xNONE; then
-      { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
-    fi
-    nonopt="$ac_option"
-    ;;
-
-  esac
-done
-
-if test -n "$ac_prev"; then
-  { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; }
-fi
-
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-# File descriptor usage:
-# 0 standard input
-# 1 file creation
-# 2 errors and warnings
-# 3 some systems may open it to /dev/tty
-# 4 used on the Kubota Titan
-# 6 checking for... messages and results
-# 5 compiler messages saved in config.log
-if test "$silent" = yes; then
-  exec 6>/dev/null
-else
-  exec 6>&1
-fi
-exec 5>./config.log
-
-echo "\
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-" 1>&5
-
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Also quote any args containing shell metacharacters.
-ac_configure_args=
-for ac_arg
-do
-  case "$ac_arg" in
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c) ;;
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;;
-  *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*)
-  ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-  *) ac_configure_args="$ac_configure_args $ac_arg" ;;
-  esac
-done
-
-# NLS nuisances.
-# Only set these to C if already set.  These must not be set unconditionally
-# because not all systems understand e.g. LANG=C (notably SCO).
-# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
-# Non-C LC_CTYPE values break the ctype check.
-if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
-if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
-if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
-if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
-
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -rf conftest* confdefs.h
-# AIX cpp loses on an empty file, so make sure it contains at least a newline.
-echo > confdefs.h
-
-# A filename unique to this package, relative to the directory that
-# configure is in, which we can look for to find out if srcdir is correct.
-ac_unique_file=defs
-
-# Find the source files, if location was not specified.
-if test -z "$srcdir"; then
-  ac_srcdir_defaulted=yes
-  # Try the directory containing this script, then its parent.
-  ac_prog=$0
-  ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'`
-  test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
-  srcdir=$ac_confdir
-  if test ! -r $srcdir/$ac_unique_file; then
-    srcdir=..
-  fi
-else
-  ac_srcdir_defaulted=no
-fi
-if test ! -r $srcdir/$ac_unique_file; then
-  if test "$ac_srcdir_defaulted" = yes; then
-    { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; }
-  else
-    { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; }
-  fi
-fi
-srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
-
-# Prefer explicitly selected file to automatically selected ones.
-if test -z "$sitefile"; then
-  if test -z "$CONFIG_SITE"; then
-    if test "x$prefix" != xNONE; then
-      CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-    else
-      CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
-    fi
-  fi
-else
-  CONFIG_SITE="$sitefile"
-fi
-for ac_site_file in $CONFIG_SITE; do
-  if test -r "$ac_site_file"; then
-    echo "loading site script $ac_site_file"
-    . "$ac_site_file"
-  fi
-done
-
-if test -r "$cache_file"; then
-  echo "loading cache $cache_file"
-  . $cache_file
-else
-  echo "creating cache $cache_file"
-  > $cache_file
-fi
-
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-ac_exeext=
-ac_objext=o
-if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
-  # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
-  if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
-    ac_n= ac_c='
-' ac_t='	'
-  else
-    ac_n=-n ac_c= ac_t=
-  fi
-else
-  ac_n= ac_c='\c' ac_t=
-fi
-
-
-
-CC=${CC-cc}
-
-ac_aux_dir=
-for ac_dir in `cd $srcdir;pwd`/../../.. $srcdir/`cd $srcdir;pwd`/../../..; do
-  if test -f $ac_dir/install-sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f $ac_dir/install.sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  { echo "configure: error: can not find install-sh or install.sh in `cd $srcdir;pwd`/../../.. $srcdir/`cd $srcdir;pwd`/../../.." 1>&2; exit 1; }
-fi
-ac_config_guess=$ac_aux_dir/config.guess
-ac_config_sub=$ac_aux_dir/config.sub
-ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
-
-
-# Do some error checking and defaulting for the host and target type.
-# The inputs are:
-#    configure --host=HOST --target=TARGET --build=BUILD NONOPT
-#
-# The rules are:
-# 1. You are not allowed to specify --host, --target, and nonopt at the
-#    same time.
-# 2. Host defaults to nonopt.
-# 3. If nonopt is not specified, then host defaults to the current host,
-#    as determined by config.guess.
-# 4. Target and build default to nonopt.
-# 5. If nonopt is not specified, then target and build default to host.
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-case $host---$target---$nonopt in
-NONE---*---* | *---NONE---* | *---*---NONE) ;;
-*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;;
-esac
-
-
-# Make sure we can run config.sub.
-if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
-else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:586: checking host system type" >&5
-
-host_alias=$host
-case "$host_alias" in
-NONE)
-  case $nonopt in
-  NONE)
-    if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then :
-    else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
-    fi ;;
-  *) host_alias=$nonopt ;;
-  esac ;;
-esac
-
-host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias`
-host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$host" 1>&6
-
-echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:607: checking target system type" >&5
-
-target_alias=$target
-case "$target_alias" in
-NONE)
-  case $nonopt in
-  NONE) target_alias=$host_alias ;;
-  *) target_alias=$nonopt ;;
-  esac ;;
-esac
-
-target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias`
-target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$target" 1>&6
-
-echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:625: checking build system type" >&5
-
-build_alias=$build
-case "$build_alias" in
-NONE)
-  case $nonopt in
-  NONE) build_alias=$host_alias ;;
-  *) build_alias=$nonopt ;;
-  esac ;;
-esac
-
-build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
-build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$build" 1>&6
-
-test "$host_alias" != "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-
-
-echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
-echo "configure:649: checking for Cygwin environment" >&5
-if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 654 "configure"
-#include "confdefs.h"
-
-int main() {
-
-#ifndef __CYGWIN__
-#define __CYGWIN__ __CYGWIN32__
-#endif
-return __CYGWIN__;
-; return 0; }
-EOF
-if { (eval echo configure:665: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  ac_cv_cygwin=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_cygwin=no
-fi
-rm -f conftest*
-rm -f conftest*
-fi
-
-echo "$ac_t""$ac_cv_cygwin" 1>&6
-CYGWIN=
-test "$ac_cv_cygwin" = yes && CYGWIN=yes
-echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
-echo "configure:682: checking for mingw32 environment" >&5
-if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 687 "configure"
-#include "confdefs.h"
-
-int main() {
-return __MINGW32__;
-; return 0; }
-EOF
-if { (eval echo configure:694: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  ac_cv_mingw32=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_mingw32=no
-fi
-rm -f conftest*
-rm -f conftest*
-fi
-
-echo "$ac_t""$ac_cv_mingw32" 1>&6
-MINGW32=
-test "$ac_cv_mingw32" = yes && MINGW32=yes
-
-
-echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:713: checking for executable suffix" >&5
-if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test "$CYGWIN" = yes || test "$MINGW32" = yes; then
-  ac_cv_exeext=.exe
-else
-  rm -f conftest*
-  echo 'int main () { return 0; }' > conftest.$ac_ext
-  ac_cv_exeext=
-  if { (eval echo configure:723: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
-    for file in conftest.*; do
-      case $file in
-      *.c | *.o | *.obj | *.ilk | *.pdb) ;;
-      *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
-      esac
-    done
-  else
-    { echo "configure: error: installation or configuration problem: compiler cannot create executables." 1>&2; exit 1; }
-  fi
-  rm -f conftest*
-  test x"${ac_cv_exeext}" = x && ac_cv_exeext=no
-fi
-fi
-
-EXEEXT=""
-test x"${ac_cv_exeext}" != xno && EXEEXT=${ac_cv_exeext}
-echo "$ac_t""${ac_cv_exeext}" 1>&6
-ac_exeext=$EXEEXT
-
-
-trap '' 1 2 15
-cat > confcache <<\EOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs.  It is not useful on other systems.
-# If it contains results you don't want to keep, you may remove or edit it.
-#
-# By default, configure uses ./config.cache as the cache file,
-# creating it if it does not exist already.  You can give configure
-# the --cache-file=FILE option to use a different cache file; that is
-# what configure does when it calls configure scripts in
-# subdirectories, so they share the cache.
-# Giving --cache-file=/dev/null disables caching, for debugging configure.
-# config.status only pays attention to the cache file if you give it the
-# --recheck option to rerun configure.
-#
-EOF
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(set) 2>&1 |
-  case `(ac_space=' '; set | grep ac_space) 2>&1` in
-  *ac_space=\ *)
-    # `set' does not quote correctly, so add quotes (double-quote substitution
-    # turns \\\\ into \\, and sed turns \\ into \).
-    sed -n \
-      -e "s/'/'\\\\''/g" \
-      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
-    ;;
-  *)
-    # `set' quotes correctly as required by POSIX, so do not add quotes.
-    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
-    ;;
-  esac >> confcache
-if cmp -s $cache_file confcache; then
-  :
-else
-  if test -w $cache_file; then
-    echo "updating cache $cache_file"
-    cat confcache > $cache_file
-  else
-    echo "not updating unwritable cache $cache_file"
-  fi
-fi
-rm -f confcache
-
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-# Any assignment to VPATH causes Sun make to only execute
-# the first set of double-colon rules, so remove it if not needed.
-# If there is a colon in the path, we need to keep it.
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[ 	]*VPATH[ 	]*=[^:]*$/d'
-fi
-
-trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
-
-# Transform confdefs.h into DEFS.
-# Protect against shell expansion while executing Makefile rules.
-# Protect against Makefile macro expansion.
-cat > conftest.defs <<\EOF
-s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g
-s%[ 	`~#$^&*(){}\\|;'"<>?]%\\&%g
-s%\[%\\&%g
-s%\]%\\&%g
-s%\$%$$%g
-EOF
-DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '`
-rm -f conftest.defs
-
-
-# Without the "./", some shells look in PATH for config.status.
-: ${CONFIG_STATUS=./config.status}
-
-echo creating $CONFIG_STATUS
-rm -f $CONFIG_STATUS
-cat > $CONFIG_STATUS <<EOF
-#! /bin/sh
-# Generated automatically by configure.
-# Run this file to recreate the current configuration.
-# This directory was configured as follows,
-# on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-#
-# $0 $ac_configure_args
-#
-# Compiler output produced by configure, useful for debugging
-# configure, is in ./config.log if it exists.
-
-ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]"
-for ac_option
-do
-  case "\$ac_option" in
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
-    exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
-  -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
-    echo "$CONFIG_STATUS generated by autoconf version 2.13"
-    exit 0 ;;
-  -help | --help | --hel | --he | --h)
-    echo "\$ac_cs_usage"; exit 0 ;;
-  *) echo "\$ac_cs_usage"; exit 1 ;;
-  esac
-done
-
-ac_given_srcdir=$srcdir
-
-trap 'rm -fr `echo "Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
-EOF
-cat >> $CONFIG_STATUS <<EOF
-
-# Protect against being on the right side of a sed subst in config.status.
-sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g;
- s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
-$ac_vpsub
-$extrasub
-s%@SHELL@%$SHELL%g
-s%@CFLAGS@%$CFLAGS%g
-s%@CPPFLAGS@%$CPPFLAGS%g
-s%@CXXFLAGS@%$CXXFLAGS%g
-s%@FFLAGS@%$FFLAGS%g
-s%@DEFS@%$DEFS%g
-s%@LDFLAGS@%$LDFLAGS%g
-s%@LIBS@%$LIBS%g
-s%@exec_prefix@%$exec_prefix%g
-s%@prefix@%$prefix%g
-s%@program_transform_name@%$program_transform_name%g
-s%@bindir@%$bindir%g
-s%@sbindir@%$sbindir%g
-s%@libexecdir@%$libexecdir%g
-s%@datadir@%$datadir%g
-s%@sysconfdir@%$sysconfdir%g
-s%@sharedstatedir@%$sharedstatedir%g
-s%@localstatedir@%$localstatedir%g
-s%@libdir@%$libdir%g
-s%@includedir@%$includedir%g
-s%@oldincludedir@%$oldincludedir%g
-s%@infodir@%$infodir%g
-s%@mandir@%$mandir%g
-s%@CC@%$CC%g
-s%@host@%$host%g
-s%@host_alias@%$host_alias%g
-s%@host_cpu@%$host_cpu%g
-s%@host_vendor@%$host_vendor%g
-s%@host_os@%$host_os%g
-s%@target@%$target%g
-s%@target_alias@%$target_alias%g
-s%@target_cpu@%$target_cpu%g
-s%@target_vendor@%$target_vendor%g
-s%@target_os@%$target_os%g
-s%@build@%$build%g
-s%@build_alias@%$build_alias%g
-s%@build_cpu@%$build_cpu%g
-s%@build_vendor@%$build_vendor%g
-s%@build_os@%$build_os%g
-s%@EXEEXT@%$EXEEXT%g
-
-CEOF
-EOF
-
-cat >> $CONFIG_STATUS <<\EOF
-
-# Split the substitutions into bite-sized pieces for seds with
-# small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
-ac_file=1 # Number of current file.
-ac_beg=1 # First line for current file.
-ac_end=$ac_max_sed_cmds # Line after last line for current file.
-ac_more_lines=:
-ac_sed_cmds=""
-while $ac_more_lines; do
-  if test $ac_beg -gt 1; then
-    sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file
-  else
-    sed "${ac_end}q" conftest.subs > conftest.s$ac_file
-  fi
-  if test ! -s conftest.s$ac_file; then
-    ac_more_lines=false
-    rm -f conftest.s$ac_file
-  else
-    if test -z "$ac_sed_cmds"; then
-      ac_sed_cmds="sed -f conftest.s$ac_file"
-    else
-      ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file"
-    fi
-    ac_file=`expr $ac_file + 1`
-    ac_beg=$ac_end
-    ac_end=`expr $ac_end + $ac_max_sed_cmds`
-  fi
-done
-if test -z "$ac_sed_cmds"; then
-  ac_sed_cmds=cat
-fi
-EOF
-
-cat >> $CONFIG_STATUS <<EOF
-
-CONFIG_FILES=\${CONFIG_FILES-"Makefile"}
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case "$ac_file" in
-  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
-       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-  *) ac_file_in="${ac_file}.in" ;;
-  esac
-
-  # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
-
-  # Remove last slash and all that follows it.  Not all systems have dirname.
-  ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
-  if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
-    # The file is in a subdirectory.
-    test ! -d "$ac_dir" && mkdir "$ac_dir"
-    ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`"
-    # A "../" for each directory in $ac_dir_suffix.
-    ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'`
-  else
-    ac_dir_suffix= ac_dots=
-  fi
-
-  case "$ac_given_srcdir" in
-  .)  srcdir=.
-      if test -z "$ac_dots"; then top_srcdir=.
-      else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;;
-  /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;;
-  *) # Relative path.
-    srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
-    top_srcdir="$ac_dots$ac_given_srcdir" ;;
-  esac
-
-
-  echo creating "$ac_file"
-  rm -f "$ac_file"
-  configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
-  case "$ac_file" in
-  *Makefile*) ac_comsub="1i\\
-# $configure_input" ;;
-  *) ac_comsub= ;;
-  esac
-
-  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
-  sed -e "$ac_comsub
-s%@configure_input@%$configure_input%g
-s%@srcdir@%$srcdir%g
-s%@top_srcdir@%$top_srcdir%g
-" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file
-fi; done
-rm -f conftest.s*
-
-EOF
-cat >> $CONFIG_STATUS <<EOF
-
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-
-exit 0
-EOF
-chmod +x $CONFIG_STATUS
-rm -fr confdefs* $ac_clean_files
-test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
-
diff --git a/gdb/testsuite/gdb.gdbtk/configure.in b/gdb/testsuite/gdb.gdbtk/configure.in
deleted file mode 100644
index 5ab12edbf15..00000000000
--- a/gdb/testsuite/gdb.gdbtk/configure.in
+++ /dev/null
@@ -1,18 +0,0 @@
-dnl Process this file file with autoconf to produce a configure script.
-dnl This file is a shell script fragment that supplies the information
-dnl necessary to tailor a template configure script into the configure
-dnl script appropriate for this directory.  For more information, check
-dnl any existing configure script.
-
-AC_PREREQ(2.5)
-AC_INIT(defs)
-
-CC=${CC-cc}
-AC_SUBST(CC)
-AC_CONFIG_AUX_DIR(`cd $srcdir;pwd`/../../..)
-AC_CANONICAL_SYSTEM
-
-dnl Check for exe extension set on certain hosts (e.g. Win32)
-AC_EXEEXT
-
-AC_OUTPUT(Makefile)
diff --git a/gdb/testsuite/gdb.gdbtk/console.exp b/gdb/testsuite/gdb.gdbtk/console.exp
deleted file mode 100644
index bb378a957a8..00000000000
--- a/gdb/testsuite/gdb.gdbtk/console.exp
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1998, 1999, 2001 Red Hat, Inc.
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License (GPL) 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.
-
-load_lib insight-support.exp
-
-if {[gdbtk_initialize_display]} {
-  if {$tracelevel} {
-    strace $tracelevel
-  }
-
-  #
-  # test console window
-  #
-  set prms_id 0
-  set bug_id 0
-
-  set testfile "simple"
-  set srcfile ${testfile}.c
-  set binfile ${objdir}/${subdir}/${testfile}
-  set r [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}]
-  if  { $r != "" } {
-    gdb_suppress_entire_file \
-      "Testcase compile failed, so some tests in this file will automatically fail."
-  }
-
-  # Start with a fresh gdbtk
-  gdb_exit
-  set results [gdbtk_start [file join $srcdir $subdir console.test]]
-  set results [split $results \n]
-
-  # Analyze results
-  gdbtk_done $results
-}
diff --git a/gdb/testsuite/gdb.gdbtk/console.test b/gdb/testsuite/gdb.gdbtk/console.test
deleted file mode 100644
index 41e79465cd2..00000000000
--- a/gdb/testsuite/gdb.gdbtk/console.test
+++ /dev/null
@@ -1,491 +0,0 @@
-#   Copyright (C) 1998, 1999, 2002 Red Hat, Inc.
-#
-# 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.
-
-# Please email any bugs, comments, and/or additions to this file to:
-# bug-gdb@prep.ai.mit.edu
-
-# This file was written by Keith Seitz (keiths@cygnus.com)
-
-# Read in the standard defs file
-
-if {![gdbtk_read_defs]} {
-  break
-}
-
-global objdir test_ran
-global console text
-set console [ManagedWin::open Console]
-set text [$console test set _twin]
-
-#####                            #####
-#                                    #
-#  Helper functions for this module  #
-#                                    #
-#####                            #####
-
-# console_command --
-#      Invoke STRING as a command in the console window and
-#      return the result
-proc console_command {string} { 
-  global console text
-
-  # Save current position
-  set line [lindex [split [$text index cmdmark] .] 0]
-  incr line 1
-
-  # Insert and invoke command
-  $text insert end $string
-  $console invoke
-  update
-
-  # Get the result
-  set end [lindex [split [$text index cmdmark] .] 0]
-  incr end -1
-  return [$text get $line.0 [list $end.0 lineend]]
-} 
-
-# get_cmd_line --
-#     Return the command line
-proc get_cmd_line {} {
-  global text
-
-  update
-  set index [$text index cmdmark]
-  return [$text get [list $index linestart] [list $index lineend]]
-}
-
-# clear_command_line --
-#     Clear the command line
-proc clear_command_line {} {
-  global text
-  $text delete {cmdmark + 1 char} insert
-}
-
-#####         #####
-#                 #
-#  CONSOLE TESTS  #
-#                 #
-#####         #####
-
-#
-# Miscellaneous tests
-#
-
-# Test:  console-misc-1
-# Desc:  Change console prompt
-gdbtk_test console-misc-1 {change console prompt} {
-  # Insert the "set prompt" command into the text widget
-  console_command {set prompt (test) }
-
-  $text get {cmdmark linestart} {cmdmark lineend}
-} {(test) }
-if {$test_ran} {
-  console_command {set prompt (gdb) }
-}
-
-#
-# Paste tests
-#
-
-# Test:  console-paste-1
-# Desc:  Paste the X selection into console window
-gdbtk_test console-paste-1 {paste X text} {
-  # This is cheesy, but it works... Create a text widget
-  # which holds the current selection...
-  text .test_text
-  .test_text insert end "this is some pasted text"
-  .test_text tag add sel 1.0 {1.0 lineend}
-  event generate .test_text <<Copy>>
-  event generate $text <<Paste>>
-  get_cmd_line
-} {(gdb) this is some pasted text}
-if {$test_ran} {
-  destroy .test_text
-  clear_command_line
-}
-
-#
-# Test for errors
-#
-
-# Test:  console-error-1
-# Desc:  Check if console window reports internal gdb errors
-gdbtk_test console-error-1 {invoke unknown command} {
-  console_command {this_command_doesn't_exist}
-} {Error: Undefined command: "this".  Try "help".
-}
-
-#
-# History tests
-#
-
-# Test:  console-history-1.1
-# Desc:  Exercise the up-history functionality
-gdbtk_test console-history-1.1 {up history once} {
-  # Add some commands into the command buffer
-  console_command {show annotate}
-  console_command {show complaints}
-  console_command {show confirm}
-  console_command {show height}
-  console_command {show language}
-  console_command {show print demangle}
-  console_command {show remotebaud}
-  console_command {show remotebreak}
-  console_command {show remotecache}
-  console_command {show remotedebug}
-  console_command {show remotedevice}
-  console_command {show remotelogbase}
-  console_command {help quit}
-  console_command {help si}
-  # this doesn't seem to work reliably: event generate $text <Up>
-  $console test _previous
-  get_cmd_line
-} {(gdb) help si}
-if {$test_ran} {
-  clear_command_line
-}
-
-# Test:  console-history-1.2
-# Desc:  Exercise the up-history functionality
-gdbtk_test console-history-1.2 {up history twice} {
-  # Add some commands into the command buffer
-  console_command {show annotate}
-  console_command {show complaints}
-  console_command {show confirm}
-  console_command {show height}
-  console_command {show language}
-  console_command {show print demangle}
-  console_command {show remotebaud}
-  console_command {show remotebreak}
-  console_command {show remotecache}
-  console_command {show remotedebug}
-  console_command {show remotedevice}
-  console_command {show remotelogbase}
-  console_command {help quit}
-  console_command {help si}
-  # this doesn't seem to work reliably: event generate $text <Up>
-  # this doesn't seem to work reliably: event generate $text <Up>
-  $console test _previous
-  $console test _previous
-  get_cmd_line
-} {(gdb) help quit}
-if {$test_ran} {
-  clear_command_line
-}
-
-# Test:  console-history-1.3
-# Desc:  Exercise the up-history functionality
-gdbtk_test console-history-1.3 {up history four times} {
-  # Add some commands into the command buffer
-  console_command {show annotate}
-  console_command {show complaints}
-  console_command {show confirm}
-  console_command {show height}
-  console_command {show language}
-  console_command {show print demangle}
-  console_command {show remotebaud}
-  console_command {show remotebreak}
-  console_command {show remotecache}
-  console_command {show remotedebug}
-  console_command {show remotedevice}
-  console_command {show remotelogbase}
-  console_command {help quit}
-  console_command {help si}
-
-  for {set i 0} {$i < 4} {incr i} {
-    # this doesn't seem to work reliably: event generate $text <Up>
-    $console test _previous
-  }
-  get_cmd_line
-} {(gdb) show remotedevice}
-if {$test_ran} {
-  clear_command_line
-}
-
-# Test:  console-history-1.4
-# Desc:  Exercise the up-history functionality
-gdbtk_test console-history-1.4 {up fourteen times} {
-  # Add some commands into the command buffer
-  console_command {show annotate}
-  console_command {show complaints}
-  console_command {show confirm}
-  console_command {show height}
-  console_command {show language}
-  console_command {show print demangle}
-  console_command {show remotebaud}
-  console_command {show remotebreak}
-  console_command {show remotecache}
-  console_command {show remotedebug}
-  console_command {show remotedevice}
-  console_command {show remotelogbase}
-  console_command {help quit}
-  console_command {help si}
-  for {set i 0} {$i < 14} {incr i} {
-    # this doesn't seem to work reliably: event generate $text <Up>
-    $console test _previous
-  }
-  get_cmd_line
-} {(gdb) show annotate}
-if {$test_ran} {
-  clear_command_line
-}
-
-# Test:  console-history-1.5
-# Desc:  Exercise the up-history search functionality
-gdbtk_test console-history-1.5 {up search} {
- # Add some commands into the command buffer
-  console_command {show height}
-  console_command {show annotate}
-  console_command {show complaints}
-  console_command {print main}
-  console_command {show remotelogbase}
-  console_command {help quit}
-  console_command {help si}
-
-  $text insert end "sh"
-  # this doesn't seem to work reliably: event generate $text <Shift-Up>
-  # this doesn't seem to work reliably: event generate $text <Shift-Up>
-  # this doesn't seem to work reliably: event generate $text <Shift-Up>
-  $console test _search_history
-  $console test _search_history
-  $console test _search_history
-  get_cmd_line
-} {(gdb) show annotate}
-
-
-# Test:  console-history-1.6
-# Desc:  Exercise the down-history search functionality
-gdbtk_test console-history-1.6 {down search} {
-  # this doesn't seem to work reliably: event generate $text <Shift-Down>
-  # this doesn't seem to work reliably: event generate $text <Shift-Down>
-  $console test _rsearch_history
-  $console test _rsearch_history
-  get_cmd_line
-} {(gdb) show remotelogbase}
-
-# Test:  console-history-1.7
-# Desc:  Down-history search to bottom
-# We go back down until the original partialcommand is displayed
-gdbtk_test console-history-1.7 {down search to bottom} {
-  # this doesn't seem to work reliably: event generate $text <Shift-Down>
-  # this doesn't seem to work reliably: event generate $text <Shift-Down>
-  $console test _rsearch_history
-  $console test _rsearch_history
-  get_cmd_line
-} {(gdb) sh}
-
-# Test:  console-history-1.8
-# Desc:  Up-history search to top
-# We go up until there are no matches
-gdbtk_test console-history-1.8 {up search to top} {
-  for {set i 0} {$i < 100} {incr i} {
-    # this doesn't seem to work reliably: event generate $text <Shift-Up>
-    $console test _search_history
-  }
-  get_cmd_line
-} {(gdb) show annotate}
-
-if {$test_ran} {
-  clear_command_line
-}
-
-# Test:  console-history-2.1
-# Desc:  Exercise the down-history functionality
-gdbtk_test console-history-2.1 {down once} {
-  # Add some commands into the command buffer
-  console_command {show annotate}
-  console_command {show complaints}
-  console_command {show confirm}
-  console_command {show height}
-  console_command {show language}
-  console_command {show print demangle}
-  console_command {show remotebaud}
-  console_command {show remotebreak}
-  console_command {show remotecache}
-  console_command {show remotedebug}
-  console_command {show remotedevice}
-  console_command {show remotelogbase}
-  console_command {help quit}
-  console_command {help si}
-
-  for {set i 0} {$i < 14} {incr i} {
-    # this doesn't seem to work reliably: event generate $text <Up>
-    $console test _previous
-  }
-  # this doesn't seem to work reliably: event generate $text <Down>
-  $console test _next
-  get_cmd_line
-} {(gdb) show complaints}
-if {$test_ran} {
-  clear_command_line
-}
-
-# Test:  console-history-2.2
-# Desc:  Exercise the down-history functionality
-gdbtk_test console-history-2.2 {down twice} {
-  # Add some commands into the command buffer
-  console_command {show annotate}
-  console_command {show complaints}
-  console_command {show confirm}
-  console_command {show height}
-  console_command {show language}
-  console_command {show print demangle}
-  console_command {show remotebaud}
-  console_command {show remotebreak}
-  console_command {show remotecache}
-  console_command {show remotedebug}
-  console_command {show remotedevice}
-  console_command {show remotelogbase}
-  console_command {help quit}
-  console_command {help si}
-
-  for {set i 0} {$i < 14} {incr i} {
-    # this doesn't seem to work reliably: event generate $text <Up>
-    $console test _previous
-  }
-
-  # this doesn't seem to work reliably: event generate $text <Down>
-  # this doesn't seem to work reliably: event generate $text <Down>
-  $console test _next
-  $console test _next
-  get_cmd_line
-} {(gdb) show confirm}
-if {$test_ran} {
-  clear_command_line
-}
-
-# Test:  console-history-2.3
-# Desc:  Exercise the down-history functionality
-gdbtk_test console-history-2.3 {down four times} {
-  # Add some commands into the command buffer
-  console_command {show annotate}
-  console_command {show complaints}
-  console_command {show confirm}
-  console_command {show height}
-  console_command {show language}
-  console_command {show print demangle}
-  console_command {show remotebaud}
-  console_command {show remotebreak}
-  console_command {show remotecache}
-  console_command {show remotedebug}
-  console_command {show remotedevice}
-  console_command {show remotelogbase}
-  console_command {help quit}
-  console_command {help si}
-
-  for {set i 0} {$i < 14} {incr i} {
-    # this doesn't seem to work reliably: event generate $text <Up>
-    $console test _previous
-  }
-
-  for {set i 0} {$i < 4} {incr i} {
-    # this doesn't seem to work reliably: event generate $text <Down>
-    $console test _next
-  }
-  get_cmd_line
-} {(gdb) show language}
-if {$test_ran} {
-  clear_command_line
-}
-
-# Test:  console-history-2.4
-# Desc:  Exercise the down-history functionality
-gdbtk_test console-history-2.4 {down infinitely} {
-  # Add some commands into the command buffer
-  console_command {show annotate}
-  console_command {show complaints}
-  console_command {show confirm}
-  console_command {show height}
-  console_command {show language}
-  console_command {show print demangle}
-  console_command {show remotebaud}
-  console_command {show remotebreak}
-  console_command {show remotecache}
-  console_command {show remotedebug}
-  console_command {show remotedevice}
-  console_command {show remotelogbase}
-  console_command {help quit}
-  console_command {help si}
-  for {set i 0} {$i < 14} {incr i} {
-    # this doesn't seem to work reliably: event generate $text <Up>
-    $console test _previous
-  }
-
-  for {set i 0} {$i < 20} {incr i} {
-    # this doesn't seem to work reliably: event generate $text <Down>
-    $console test _next
-  }
-  get_cmd_line
-} {(gdb) }
-if {$test_ran} {
-  clear_command_line
-}
-
-#
-# gdb - gdbtk Interface Tests
-#
-
-# Test:  console-interface-1.1
-# Desc:  Verify that a "file" command in the console window causes
-#        gdb to invoke the pre-/post-add-symbol hooks
-set file_loaded 0
-gdbtk_test console-interface-1.1 {file command goes through hooks} {
-  global TEST1_RESULT TEST2_RESULT
-
-  # This is really ugly, but its the only way to do this...
-  rename gdbtk_tcl_pre_add_symbol pre_add
-  rename gdbtk_tcl_post_add_symbol post_add
-
-  proc gdbtk_tcl_pre_add_symbol {file} {
-    global TEST1_RESULT
-
-    set TEST1_RESULT $file
-    pre_add $file
-  }
-  proc gdbtk_tcl_post_add_symbol {} {
-    global TEST2_RESULT
-
-    set TEST2_RESULT ok
-    post_add
-  }
-
-  # load a file and make sure we went through the pre/post_add_symbol hooks
-  set TEST1_RESULT {}
-  set TEST2_RESULT {}
-  set file [file join $objdir simple]
-  console_command "file $file"
-  if {$TEST1_RESULT != $file} {
-    set result "did not go through gdbtk_tcl_pre_add_symbol ($TEST1_RESULT)"
-  } elseif {$TEST2_RESULT != "ok"} {
-    set result "did not go through gdbtk_tcl_post_add_symbol"
-  } else {
-    set result {}
-    set file_loaded 1
-  }
-
-  set result
-} {}
-if {$test_ran} {
-  rename gdbtk_tcl_pre_add_symbol {}
-  rename gdbtk_tcl_post_add_symbol {}
-  rename pre_add gdbtk_tcl_pre_add_symbol
-  rename post_add gdbtk_tcl_post_add_symbol
-}
-
-#
-#  Exit
-#
-gdbtk_test_done
diff --git a/gdb/testsuite/gdb.gdbtk/cpp_variable.cc b/gdb/testsuite/gdb.gdbtk/cpp_variable.cc
deleted file mode 100644
index deecc295a7f..00000000000
--- a/gdb/testsuite/gdb.gdbtk/cpp_variable.cc
+++ /dev/null
@@ -1,33 +0,0 @@
-#include "cpp_variable.h"
-
-static void do_simple_class_tests (void);
-
-int
-VB::fvb_pub () {return 300 + vb_pub_int;}
-
-int
-VB::vvb_pub () {return 400 + vb_pub_int;}
-
-int
-V::f () {return 600 + v_pub_int;}
-
-int
-V::vv () {return 400 + v_pub_int;}
-
-int
-VC::fvc () {return 300 + vc_pub_int;}
-
-int
-VC::vfvc () {return 100 + vc_pub_int;}
-
-main ()
-{
-  do_simple_class_tests ();
-}
-
-static void
-do_simple_class_tests (void)
-{
-  V *v = new V;
-  V vv;
-}
diff --git a/gdb/testsuite/gdb.gdbtk/cpp_variable.exp b/gdb/testsuite/gdb.gdbtk/cpp_variable.exp
deleted file mode 100644
index 7221e8c5cde..00000000000
--- a/gdb/testsuite/gdb.gdbtk/cpp_variable.exp
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999, 2001 Red Hat, Inc.
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License (GPL) 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.
-
-load_lib insight-support.exp
-
-if {[gdbtk_initialize_display]} {
-  if {$tracelevel} {
-    strace $tracelevel
-  }
-
-  set results {}
-  if {[skip_cplus_tests]} {
-    # Target doesn't have c++ support
-    verbose "No C++ support -- skipping test"
-  } else {
-    #
-    # test variable API
-    #
-    set prms_id 0
-    set bug_id 0
-
-    set testfile "cpp_variable"
-    set srcfile ${testfile}.cc
-    set binfile ${objdir}/${subdir}/${testfile}
-    set r [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug c++}]
-    if  { $r != "" } {
-      gdb_suppress_entire_file \
-	"Testcase compile failed, so some tests in this file will automatically fail."
-    }
-
-    # Start with a fresh gdbtk
-    gdb_exit
-    set results [gdbtk_start [file join $srcdir $subdir ${testfile}.test]]
-    set results [split $results \n]
-  }
-
-  # Analyze results
-  gdbtk_done $results
-}
diff --git a/gdb/testsuite/gdb.gdbtk/cpp_variable.h b/gdb/testsuite/gdb.gdbtk/cpp_variable.h
deleted file mode 100644
index 40fda99a4dd..00000000000
--- a/gdb/testsuite/gdb.gdbtk/cpp_variable.h
+++ /dev/null
@@ -1,54 +0,0 @@
-struct _foo
-{
-  int a[10];
-  char *p;
-};
-
-class VA
-{
- public:
-  int va_pub_int;
-  char *va_pub_charp;
-
- private:
-  int va_priv_int;
-  char *va_priv_charp;
-
- protected:
-  struct _foo bar;
-};
-
-class VB
-{
- public:
-  int vb_pub_int;
-
-  int fvb_pub ();
-  virtual int vvb_pub ();
-
- private:
-  int vb_priv_int;
-  char *vb_priv_charp;
-};
-
-class VC
-{
- public:
-  int vc_pub_int;
-
-  int fvc ();
-  virtual int vfvc ();
-};
-
-class V : public VA, public VB, public VC
-{
- public:
-  int f ();
-  virtual int vv ();
-  int v_pub_int;
-  char *v_pub_charp;
-
- private:
-  int v_priv_int;
-  char *v_priv_charp;
-};
diff --git a/gdb/testsuite/gdb.gdbtk/cpp_variable.test b/gdb/testsuite/gdb.gdbtk/cpp_variable.test
deleted file mode 100644
index d2de6f3deea..00000000000
--- a/gdb/testsuite/gdb.gdbtk/cpp_variable.test
+++ /dev/null
@@ -1,594 +0,0 @@
-# Varobj Tests (C++ language)
-# Copyright (C) 1998, 2003 Red Hat, Inc.
-#
-# 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.
-
-# Please email any bugs, comments, and/or additions to this file to:
-# insight@sources.redhat.com
-
-# This file was written by Keith Seitz (keiths@cygnus.com)
-
-# Read in the standard defs file
-if {![gdbtk_read_defs]} {
-  break
-}
-
-global objdir test_ran
-
-# Load in a file
-set program [file join $objdir cpp_variable]
-if {[catch {gdbtk_test_file $program} t]} {
-  # This isn't a test case, since if this fails, we're hosed.
-  gdbtk_test_error "loading \"$program\": $t"
-}
-
-# The variables that are created are stored in an array called "var".
-
-# proc to tell us which of the variables are changed/out of scope
-proc check_update {} {
-  global var
-
-  set out {}
-  set changed {}
-  foreach ind [array names var] {
-    set ret [$var($ind) update]
-    if {$ret == -1} {
-	lappend out $ind
-    } elseif {$ret != ""} {
-        lappend changed $ret
-    }
-  }
-  return [list $changed $out]
-}
-
-
-# proc to create a variable
-proc create_variable {expr} {
-  global var
-
-  set err [catch {gdb_variable create "$expr" -expr $expr} v]
-  if {!$err} {
-    set var($expr) $v
-  }
-
-  return $err
-}
-
-# proc to get the children
-# Children are stored in the global "var" as
-# PARENT.child. So for struct _foo {int a; int b} bar;,
-# the children returned are {a b} and var(bar.a) and var(bar.b)
-# map the actual objects to their names.
-proc get_children {parent} {
-  global var
-
-  set kiddies [$var($parent) children]
-  set children {}
-  foreach child $kiddies {
-    set name [lindex [split $child .] end]
-    lappend children $name
-    set var($parent.$name) $child
-  }
-
-  return $children
-}
-
-proc delete_variable {varname} {
-  global var
-
-  if {[info exists var($varname)]} {
-    # This has to be caught, since deleting a parent
-    # will erase all children.
-    $var($varname) delete
-    set vars [array names var $varname*]
-    foreach v $vars {
-      if {[info exists var($v)]} {
-	unset var($v)
-      }
-    }
-  }
-}
-
-# Compare the values of variable V in format FMT with value of OBJ
-# with gdb's value.
-proc cppvalue {obj v fmt} {
-  global var
-  global _test
-
-  puts $_test(logfile) "obj=$obj v=$v fmt=$fmt"
-  puts $_test(logfile) "var(\$obj)=$var($obj)"
-
-  set value [$var($obj) value]
-  set gdb [gdb_cmd "output/$fmt $v"]
-  puts $_test(logfile) "output/$fmt $v"
-  if {$value == $gdb} {
-    puts $_test(logfile) "gdbtk: $value == gdb: $gdb"
-    set result ok
-  } else {
-    set result $v
-    puts $_test(logfile) "gdbtk: $value <> gdb: $gdb"
-  }
-
-  return $result
-}
-
-proc delete_all_variables {} {
-  global var
-
-  foreach variable [array names var] {
-    delete_variable $variable
-  }
-}
-
-#####            #####
-#                    #
-# Simple Class Tests #
-#                    #
-#####            #####
-
-# run to "do_simple_class_tests"
-gdb_cmd "break do_simple_class_tests"
-gdbtk_test_run
-
-# Test:  cpp_variable-1.1
-# Desc:  stopped in do_simple_class_tests
-gdbtk_test cpp_variable-1.1 {stopped in do_simple_class_tests} {
-  # G++ can output "do_simple_class_tests(void)". Strip the "(void)" part.
-  set loc [lindex [gdb_loc] 1]
-  set index [string first \( $loc]
-  if {$index > 0} {
-    set loc [string range $loc 0 [expr {$index-1}]]
-  }
-  set loc
-} {do_simple_class_tests}
-
-# Test: cpp_variable-1.2
-# Desc: create variable v
-gdbtk_test cpp_variable-1.2 {create variable v} {
-  create_variable v
-} {0}
-
-# Test: cpp_variable-1.3
-# Desc: number of children of v
-gdbtk_test cpp_variable-1.3 {number of children of v} {
-  $var(v) numChildren
-} {5}
-
-# Test: cpp_variable-1.4a
-# Desc: children of v
-gdbtk_test cpp_variable-1.4a {children of v} {
-  get_children v
-} {VA VB VC public private}
-
-# Test: cpp_variable-1.4b
-# Desc: public children of v
-gdbtk_test cpp_variable-1.4b {public children of v} {
-  get_children v.public
-} {v_pub_int v_pub_charp}
-
-# Test: cpp_variable-1.4c
-# Desc: private children of v
-gdbtk_test cpp_variable-1.4c {private children of v} {
-  get_children v.private
-} {v_priv_int v_priv_charp}
-
-# Test: cpp_variable-1.5
-# Desc: type of v
-gdbtk_test cpp_variable-1.5 {type of v} {
-  $var(v) type
-} {V *}
-
-# Test: cpp_variable-1.6
-# Desc: format of v
-gdbtk_test cpp_variable-1.6 {format of v} {
-  $var(v) format
-} {natural}
-
-set value {}
-catch {$var(v) value} value
-
-# Test: cpp_variable-1.6a
-# Desc: Step over "V *v = new V;"
-gdbtk_test cpp_variable-1.6a {step over "V *v = new V;"} {
-  catch {gdb_cmd "next"}
-} {0}
-
-# Test: cpp_variable-1.7
-# Desc: check value of v changed
-gdbtk_test cpp_variable-1.7 {check value of v changed} {
-  set changes [check_update]
-  # It is undefined whether the children will change values
-  # or not, so ignore them.
-  expr {[lsearch [lindex [lindex $changes 0] 0] v] != -1}
-} {1}
-
-# Test: cpp_variable-1.8
-# Desc: check values of v
-gdbtk_test cpp_variable-1.8 {check values of v} {
-  set new [$var(v) value]
-  expr {$new != $value}
-} {1}
-
-# Test: cpp_variable-1.9
-# Desc: v editable
-gdbtk_test cpp_variable-1.9 {v editable} {
-  $var(v) editable
-} {1}
-
-#####             #####
-#                     #
-# Children of v tests #
-#                     #
-#####             #####
-
-# Test: cpp_variable-2.1
-# Desc: type of v.v_pub_int
-gdbtk_test cpp_variable-2.1 {type of v.v_pub_int} {
-  $var(v.public.v_pub_int) type
-} {int}
-
-# Test: cpp_variable-2.2
-# Desc: format of v.v_pub_int
-gdbtk_test cpp_variable-2.2 {format of v.v_pub_int} {
-  $var(v.public.v_pub_int) format
-} {natural}
-
-# Test: cpp_variable-2.2a
-# Desc: set variable v->v_pub_int=2112 
-gdbtk_test cpp_variable-2.2a {set variable v.v_pub_int=2112} {
-  set err [catch {gdb_cmd "set variable v.v_pub_int=2112"} txt]
-  if {$err} {
-    set txt
-  } else {
-    set err
-  }
-} {0}
-
-# Test: cpp_variable-2.3
-# Desc: value of v.v_pub_int changed
-gdbtk_test cpp_variable-2.3 {value of v.v_pub_int changed} {
-  check_update
-} {v.public.v_pub_int {v.private.v_priv_charp v.VB v.private.v_priv_int v.VC v.public.v_pub_charp v.public.v_pub_int v.private v.public v.VA}}
-
-# Test: cpp_variable-2.4
-# Desc: value of v.v_pub_int
-gdbtk_test cpp_variable-2.4 {value of v.v_pub_int} {
-  $var(v.public.v_pub_int) value
-} {2112}
-
-# Test: cpp_variable-2.5
-# Desc: changed format of v.v_pub_int
-gdbtk_test cpp_variable-2.5 {changed format of v.v_pub_int} {
-  $var(v.public.v_pub_int) format octal
-  $var(v.public.v_pub_int) format
-} {octal}
-
-# Test: cpp_variable-2.6
-# Desc: value of v.v_pub_int with new format
-gdbtk_test cpp_variable-2.6 {value of v.v_pub_int with new format} {
-  $var(v.public.v_pub_int) value
-} {04100}
-
-# Test: cpp_variable-2.7
-# Desc: change value of v.v_pub_int (decimal)
-gdbtk_test cpp_variable-2.7 {change value of v.v_pub_int (decimal)} {
-  $var(v.public.v_pub_int) value 3
-  cppvalue v.public.v_pub_int v.v_pub_int o
-} {ok}
-
-# Test: cpp_variable-2.8
-# Desc: change value of v.v_pub_int (hexadecimal)
-gdbtk_test cpp_variable-2.8 {change value of v.v_pub_int (hexadecimal)} {
-  $var(v.public.v_pub_int) value 0x21
-  cppvalue v.public.v_pub_int v.v_pub_int o
-} {ok}
-
-# Test: cpp_variable-2.9
-# Desc: number of children of v_pub_int
-gdbtk_test cpp_variable-2.9 {number of children of v_pub_int} {
-  $var(v.public.v_pub_int) numChildren
-} {0}
-
-# Test: cpp_variable-2.10
-# Desc: children of v.v_pub_int
-gdbtk_test cpp_variable-2.10 {children of v.v_pub_int} {
-  get_children v.public.v_pub_int
-} {}
-
-# Test: cpp_variable-2.11
-# Desc: v.v_pub_int editable
-gdbtk_test cpp_variable-2.11 {v.v_pub_int editable} {
-  $var(v.public.v_pub_int) editable
-} {1}
-
-# Test: cpp_variable-2.21
-# Desc: type of v.v_priv_charp
-gdbtk_test cpp_variable-2.21 {type of v.v_priv_charp} {
-  $var(v.private.v_priv_charp) type
-} {char *}
-
-# Test: cpp_variable-2.22
-# Desc: format of v.v_priv_charp
-gdbtk_test cpp_variable-2.22 {format of v.v_priv_charp} {
-  $var(v.private.v_priv_charp) format
-} {natural}
-
-# Test: cpp_variable-2.22a
-# Desc: set variable v->v_priv_charp=2112
-gdbtk_test cpp_variable-2.22a {set variable v->v_priv_charp=2112} {
-  set err [catch {gdb_cmd "set variable v->v_priv_charp=2112"} txt]
-  if {$err} {
-    set txt
-  } else {
-    set err
-  }
-} {0}
-
-# Test: cpp_variable-2.23
-# Desc: value of v.v_priv_charp changed
-gdbtk_test cpp_variable-2.23 {value of v.v_priv_charp changed} {
-  check_update
-} {{{v.public.v_pub_int v.private.v_priv_charp}} {v.private.v_priv_charp v.VB v.private.v_priv_int v.VC v.public.v_pub_charp v.public.v_pub_int v.private v.public v.VA}}
-
-# Test: cpp_variable-2.24
-# Desc: value of v.v_priv_charp
-gdbtk_test cpp_variable-2.24 {value of v.v_priv_charp} {
-  $var(v.private.v_priv_charp) format hexadecimal
-  $var(v.private.v_priv_charp) value
-} {0x840}
-
-# Test: cpp_variable-2.25
-# Desc: changed format of v.v_priv_charp
-gdbtk_test cpp_variable-2.25 {changed format of v.v_priv_charp} {
-  $var(v.private.v_priv_charp) format octal
-  $var(v.private.v_priv_charp) format
-} {octal}
-
-# Test: cpp_variable-2.26
-# Desc: value of v.v_priv_charp with new format
-gdbtk_test cpp_variable-2.26 {value of v.v_priv_charp with new format} {
-  $var(v.private.v_priv_charp) value
-} {04100}
-
-# Test: cpp_variable-2.27
-# Desc: change value of v.v_priv_charp (decimal)
-gdbtk_test cpp_variable-2.27 {change value of v.v_priv_charp (decimal)} {
-  $var(v.private.v_priv_charp) value 3
-  cppvalue v.private.v_priv_charp v.v_priv_charp o
-} {ok}
-
-# Test: cpp_variable-2.28
-# Desc: change value of v.v_priv_charp (hexadecimal)
-gdbtk_test cpp_variable-2.28 {change value of v.v_priv_charp (hexadecimal)} {
-  $var(v.private.v_priv_charp) value 0x21
-  cppvalue v.private.v_priv_charp v.v_priv_charp o
-} {ok}
-
-# Test: cpp_variable-2.29
-# Desc: number of children of v_priv_charp
-gdbtk_test cpp_variable-2.29 {number of children of v_priv_charp} {
-  $var(v.private.v_priv_charp) numChildren
-} {1}
-
-# Test: cpp_variable-2.30
-# Desc: children of v.v_priv_charp
-gdbtk_test cpp_variable-2.30 {children of v.v_priv_charp} {
-  get_children v.private.v_priv_charp
-} {*v_priv_charp}
-
-# Test: cpp_variable-2.31
-# Desc: v.v_priv_int editable
-gdbtk_test cpp_variable-2.31 {v.v_priv_int editable} {
-  $var(v.private.v_priv_int) editable
-} {1}
-
-# Test: cpp_variable-2.41
-# Desc: type of v.VA
-gdbtk_test cpp_variable-2.41 {type of v.VA} {
-  $var(v.VA) type
-} {VA}
-
-# Test: cpp_variable-2.42
-# Desc: format of v.VA
-gdbtk_test cpp_variable-2.42 {format of v.VA} {
-  $var(v.VA) format
-} {natural}
-
-# Test: cpp_variable-2.43
-# Desc: value of v.VA changed
-gdbtk_test cpp_variable-2.43 {value of v.VA changed} {
-  check_update
-} {v.private.v_priv_charp {v.private.v_priv_charp v.VB v.private.v_priv_int v.VC v.public.v_pub_charp v.private.v_priv_charp.*v_priv_charp v.public.v_pub_int v.private v.public v.VA}}
-
-# Test: cpp_variable-2.44
-# Desc: value of v.VA
-gdbtk_test cpp_variable-2.44 {value of v.VA} {
-  $var(v.VA) value
-} {{...}}
-
-# Test: cpp_variable-2.45
-# Desc: changed format of v.VA
-gdbtk_test cpp_variable-2.45 {changed format of v.VA} {
-  $var(v.VA) format octal
-  $var(v.VA) format
-} {octal}
-
-# Test: cpp_variable-2.46
-# Desc: value of v.VA with new format
-gdbtk_test cpp_variable-2.46 {value of v.VA with new format} {
-  $var(v.VA) value
-} {{...}}
-
-# Test: cpp_variable-2.47
-# Desc: number of children of VA
-gdbtk_test cpp_variable-2.47 {number of children of VA} {
-  $var(v.VA) numChildren
-} {3}
-
-# Test: cpp_variable-2.48a
-# Desc: children of v.VA
-gdbtk_test cpp_variable-2.48a {children of v.VA} {
-  get_children v.VA
-} {public private protected}
-
-# Test: cpp_variable-2.48b
-# Desc: public children of v.VA
-gdbtk_test cpp_variable-2.48b {children of v.VA} {
-  get_children v.VA.public
-} {va_pub_int va_pub_charp}
-
-# Test: cpp_variable-2.48c
-# Desc: private children of v.VA
-gdbtk_test cpp_variable-2.48c {children of v.VA} {
-  get_children v.VA.private
-} {va_priv_int va_priv_charp}
-
-# Test: cpp_variable-2.48d
-# Desc: protected children of v.VA
-gdbtk_test cpp_variable-2.48d {children of v.VA} {
-  get_children v.VA.protected
-} {bar}
-
-# Test: cpp_variable-2.49
-# Desc: v.VA editable
-gdbtk_test cpp_variable-2.49 {v.VA editable} {
-  $var(v.VA) editable
-} {0}
-
-# Test: cpp_variable-2.61
-# Desc: type of v.VB
-gdbtk_test cpp_variable-2.61 {type of v.VB} {
-  $var(v.VB) type
-} {VB}
-
-# Test: cpp_variable-2.62
-# Desc: format of v.VB
-gdbtk_test cpp_variable-2.62 {format of v.VB} {
-  $var(v.VB) format
-} {natural}
-
-# Test: cpp_variable-2.63
-# Desc: value of v.VB changed
-gdbtk_test cpp_variable-2.63 {value of v.VB changed} {
-  check_update
-} {{} {v.VA.protected v.private.v_priv_charp.*v_priv_charp v.VA.private v.VA.public.va_pub_int v.private.v_priv_int v.public.v_pub_int v.VA.public.va_pub_charp v.private.v_priv_charp v.VA.public v.public.v_pub_charp v.VA.private.va_priv_int v.VA v.public v.VB v.VC v.VA.protected.bar v.VA.private.va_priv_charp v.private}}
-
-# Test: cpp_variable-2.64
- # Desc: value of v.VB
-gdbtk_test cpp_variable-2.64 {value of v.VB} {
-  $var(v.VB) value
-} {{...}}
-
-# Test: cpp_variable-2.65
-# Desc: changed format of v.VB
-gdbtk_test cpp_variable-2.65 {changed format of v.VB} {
-  $var(v.VB) format octal
-  $var(v.VB) format
-} {octal}
-
-# Test: cpp_variable-2.66
-# Desc: value of v.VB with new format
-gdbtk_test cpp_variable-2.66 {value of v.VB with new format} {
-  $var(v.VB) value
-} {{...}}
-
-# Note: The next two tests show whether or not the logic
-# concerning vptr tables is working.
-# Test: cpp_variable-2.67
-# Desc: number of children of VB
-gdbtk_test cpp_variable-2.67 {number of children of VB} {
-  $var(v.VB) numChildren
-} {2}
-
-# Test: cpp_variable-2.68a
-# Desc: children of v.VB
-gdbtk_test cpp_variable-2.68a {children of v.VB} {
-  get_children v.VB
-} {public private}
-
-# Test: cpp_variable-2.68b
-# Desc: public children of v.VB
-gdbtk_test cpp_variable-2.68b {children of v.VB} {
-  get_children v.VB.public
-} {vb_pub_int}
-
-# Test: cpp_variable-2.68c
-# Desc: private children of v.VB
-gdbtk_test cpp_variable-2.68c {children of v.VB} {
-  get_children v.VB.private
-} {vb_priv_int vb_priv_charp}
-
-# Test: cpp_variable-2.69
-# Desc: v.VB editable
-gdbtk_test cpp_variable-2.69 {v.VB editable} {
-  $var(v.VB) editable
-} {0}
-
-# Test: cpp_variable-2.70
-# Desc: v.VB.public editable
-gdbtk_test cpp_variable-2.70 {v.VB.public editable} {
-  $var(v.VB.public) editable
-} {0}
-
-# Test: cpp_variable-2.71
-# Desc: v.VB.vb_pub_int editable
-gdbtk_test cpp_variable-2.71 {v.VB.vb_pub_int editable} {
-  $var(v.VB.public.vb_pub_int) editable
-} {1}
-
-# Test: cpp_variable-2.71a
-# Desc: set variable v->vb_pub_int=2112
-gdbtk_test cpp_variable-2.71a {set variable v->v_pub_int=2112} {
-  set err [catch {gdb_cmd "set variable v->vb_pub_int=2112"} txt]
-  if {$err} {
-    set txt
-  } else {
-    set err
-  }
-} {0}
-
-# Test: cpp_variable-2.72
-# Desc: value of v.vb_pub_int changed
-gdbtk_test cpp_variable-2.72 {value of v.vb_pub_int changed} {
-  check_update
-} {v.VB.public.vb_pub_int {v.VB.public v.VA.protected v.private.v_priv_charp.*v_priv_charp v.VA.private v.VB.private.vb_priv_int v.VB.private v.VA.public.va_pub_int v.private.v_priv_int v.VB.public.vb_pub_int v.public.v_pub_int v.VB.private.vb_priv_charp v.VA.public.va_pub_charp v.private.v_priv_charp v.VA.public v.public.v_pub_charp v.VA.private.va_priv_int v.VA v.public v.VB v.VC v.VA.protected.bar v.VA.private.va_priv_charp v.private}}
-
-# Test: cpp_variable-2.73
-# Desc: value of v.VB.vb_pub_int
-gdbtk_test cpp_variable-2.73 {changed value of v.vb_pub_int} {
-  $var(v.VB.public.vb_pub_int) value
-} {2112}
-
-# Test: cpp_variable-2.74
-# Desc: change value of v.VB.vb_pub_int
-gdbtk_test cpp_variable-2.74 {change value of v.VB.public.vb_pub_int} {
-  $var(v.VB.public.vb_pub_int) value 3
-  cppvalue v.VB.public.vb_pub_int v.vb_pub_int d
-} {ok}
-
-# Test: cpp_variable-2.75
-# Desc: value of v.VB.vb_pub_int
-gdbtk_test cpp_variable-2.75 {changed value of v.VB.public.vb_pub_int} {
-  $var(v.VB.public.vb_pub_int) value
-} {3}
-
-
-#  Exit
-#
-gdbtk_test_done
-
-#Local Variables:
-#mode: tcl
-
diff --git a/gdb/testsuite/gdb.gdbtk/defs b/gdb/testsuite/gdb.gdbtk/defs
deleted file mode 100644
index 8e3fe5b4531..00000000000
--- a/gdb/testsuite/gdb.gdbtk/defs
+++ /dev/null
@@ -1,306 +0,0 @@
-# This file contains support code for the gdbtk test suite.
-# Copyright 2001 Red Hat, Inc.
-#
-# Based on the Tcl testsuite support code, portions of this file
-# are Copyright (c) 1990-1994 The Regents of the University of California and
-# Copyright (c) 1994-1996 Sun Microsystems, Inc.
-#
-global _test env srcdir objdir
-
-if {![info exists srcdir]} {
-  if {[info exists env(SRCDIR)]} {
-    set srcdir $env(SRCDIR)
-  } else {
-    set srcdir .
-  }
-}
-
-if {![info exists objdir]} {
-  if {[info exists env(OBJDIR)]} {
-    set objdir $env(OBJDIR)
-  } elseif {$_test(interactive)} {
-    # If running interactively, assume that the objdir is
-    # relative to the executable's location
-    set objdir [file join [file dirname [info nameofexecutable]] testsuite gdb.gdbtk]
-  } else {
-    set objdir .
-  }
-}
-
-if {![info exists _test(verbose)]} {
-  if {[info exists env(GDBTK_VERBOSE)]} {
-    set _test(verbose) $env(GDBTK_VERBOSE)
-  } else {
-    set _test(verbose) 0
-  }
-}
-if {![info exists _test(tests)]} {
-
-  if {[info exists env(GDBTK_TESTS)]} {
-    set _test(tests) $env(GDBTK_TESTS)
-  } else {
-    set _test(tests) {}
-  }
-}
-
-if {[info exists env(GDBTK_LOGFILE)]} {
-  set _test(logfile) [open $env(GDBTK_LOGFILE) a+]
-  fconfigure $_test(logfile) -buffering none
-} else {
-  set _test(logfile) {}
-}
-
-# Informs gdbtk internals that testsuite is running. An example
-# where this is needed is the window manager, which must place
-# all windows at some place on the screen so that the system's
-# window manager does not interfere. This is reset in gdbtk_test_done.
-set env(GDBTK_TEST_RUNNING) 1
-
-# The gdb "file" command to use for gdbtk testing
-# NOTE: This proc appends ".exe" to all windows' programs
-proc gdbtk_test_file {filename} {
-  global tcl_platform
-
-  if {$tcl_platform(platform) == "windows"} {
-    append filename ".exe"
-  }
-
-  set err [catch {gdb_cmd "file $filename" 1} text]
-  if {$err} {
-    error $text
-  }
-
-  return $text
-}
-
-proc gdbtk_test_run {{prog_args {}}} {
-  global env
-
-  # Get the target_info array from the testsuite
-  array set target_info $env(TARGET_INFO)
-
-  # We get the target ready by:
-  # 1. Run all init commands
-  # 2. Issue target command
-  # 3. Issue load command
-  # 4. Issue run command
-  foreach cmd $target_info(init) {
-    set err [catch {gdb_cmd $cmd 0} txt]
-    if {$err} {
-      _report_error "Target initialization command \"$cmd\" failed: $txt"
-      return 0
-    }
-  }
-
-  if {$target_info(target) != ""} {
-    set err [catch {gdb_cmd $target_info(target) 0} txt]
-    if {$err} {
-      _report_error "Failed to connect to target: $txt"
-      return 0
-    }
-  }
-
-  if {$target_info(load) != ""} {
-    set err [catch {gdb_cmd $target_info(load) 0} txt]
-    if {$err} {
-      _report_error "Failed to load: $txt"
-      return 0
-    }
-  }
-
-  if {$target_info(run) != ""} {
-    set err [catch {gdb_cmd $target_info(run) 0} txt]
-    if {$err} {
-      _report_error "Could not run target with \"$target_info(run)\": $txt"
-      return 0
-    }
-  }
-
-  return 1
-}
-
-proc _report_error {msg} {
-  global _test
-
-  if {[info exists _test(interactive)] && $_test(interactive)} {
-    # Dialog
-    tk_messageBox -message $msg -icon error -type ok
-  } else {
-    # to stderr
-    puts stderr $msg
-  }
-}
-
-proc gdbtk_print_verbose {status name description script code answer} {
-  global _test
-
-  switch $code {
-    0 {
-      set code_words {}
-    }
-    1 {
-      set code_words "Test generated error: $answer"
-    }
-
-    2 {
-      set code_words "Test generated return exception;  result was: $answer"
-    }
-
-    3 {
-      set code_words "Test generated break exception"
-    }
-
-    4 {
-      set code_words "Test generated continue exception"
-    }
-
-    5 {
-      set code_words "Test generated exception $code;  message was:$answer"
-    }
-  }
-
-  if {$_test(verbose) > 1 \
-	|| ($_test(verbose) != 1 && ($status == "ERROR" || $status == "FAIL"))} {
-    # Printed when user verbose mode (verbose > 1) or an error/failure occurs
-    # not running the testsuite (dejagnu)
-    puts stdout "\n"
-    puts stdout "==== $name $description"
-    puts stdout "==== Contents of test case:"
-    puts stdout "$script"
-    if {$code_words != ""} {
-      puts stdout $code_words
-    }
-    puts stdout "==== Result was:"
-    puts stdout "$answer"
-  } elseif {$_test(verbose)} {
-    # Printed for the testsuite (verbose = 1)
-    puts stdout "[list $status $name $description $code_words]"
-
-    if {$_test(logfile) != ""} {
-      puts $_test(logfile) "\n"
-      puts $_test(logfile) "==== $name $description"
-      puts $_test(logfile) "==== Contents of test case:"
-      puts $_test(logfile) "$script"
-      if {$code_words != ""} {
-	puts $_test(logfile) $code_words
-      }
-      puts $_test(logfile) "==== Result was:"
-      puts $_test(logfile) "$answer"
-    }
-  }
-}
-
-# gdbtk_test
-#
-# This procedure runs a test and prints an error message if the
-# test fails.
-#
-# Arguments:
-# name -		Name of test, in the form foo-1.2.
-# description -		Short textual description of the test, to
-#			help humans understand what it does.
-# script -		Script to run to carry out the test.  It must
-#			return a result that can be checked for
-#			correctness.
-# answer -		Expected result from script.
-
-proc gdbtk_test {name description script answer} {
-  global _test test_ran
-
-  set test_ran 0
-  if {[string compare $_test(tests) ""] != 0} then {
-    set ok 0
-    foreach test $_test(tests) {
-      if [string match $test $name] then {
-	set ok 1
-	break
-      }
-    }
-    if !$ok then return
-  }
-
-  set code [catch {uplevel $script} result]
-  set test_ran 1
-  if {$code != 0} {
-    # Error
-    gdbtk_print_verbose ERROR $name $description $script \
-      $code $result
-  } elseif {[string compare $result $answer] == 0} { 
-    if {[string index $name 0] == "*"} {
-      # XPASS
-      set HOW XPASS
-    } else {
-      set HOW PASS
-    }
-
-    if {$_test(verbose)} {
-      gdbtk_print_verbose $HOW $name $description $script \
-	$code $result
-      if {$_test(verbose) != 1} {
-	puts stdout "++++ $name ${HOW}ED"
-      }
-    }
-    if {$_test(logfile) != ""} {
-      puts $_test(logfile) "++++ $name ${HOW}ED"
-    }
-  } else {
-    if {[string index $name 0] == "*"} {
-      # XFAIL
-      set HOW XFAIL
-    } else {
-      set HOW FAIL
-    }
-
-    gdbtk_print_verbose $HOW $name $description $script \
-      $code $result
-    if {$_test(verbose) != 1} {
-      puts stdout "---- Result should have been:"
-      puts stdout "$answer"
-      puts stdout "---- $name ${HOW}ED" 
-    }
-    if {$_test(logfile) != ""} {
-      puts $_test(logfile) "---- Result should have been:"
-      puts $_test(logfile) "$answer"
-      puts $_test(logfile) "---- $name ${HOW}ED" 
-    }
-  }
-}
-
-proc gdbtk_dotests {file args} {
-  global _test
-  set savedTests $_test(tests)
-  set _test(tests) $args
-  source $file
-  set _test(tests) $savedTests
-}
-
-proc gdbtk_test_done {} {
-  global _test env
-
-  if {$_test(logfile) != ""} {
-    close $_test(logfile)
-  }
-
-  set env(GDBTK_TEST_RUNNING) 0
-  if {![info exists _test(interactive)] || !$_test(interactive)} {
-    gdbtk_force_quit
-  }
-}
-
-proc gdbtk_test_error {desc} {
-  set desc [join [split $desc \n] |]
-  puts "ERROR \{$desc\} \{\} \{\}"
-  gdbtk_test_done
-}
-
-# Override the warning dialog. We don't want to see them.
-rename show_warning real_show_warning
-proc show_warning {msg} {
-  global _test
-
-  set str "INSIGHT TESTSUITE WARNING: $msg"
-  puts stdout $str
-  if {$_test(logfile) != ""} {
-    puts $_test(logfile) $str
-  }
-}
diff --git a/gdb/testsuite/gdb.gdbtk/list0.c b/gdb/testsuite/gdb.gdbtk/list0.c
deleted file mode 100644
index b50fdd4323d..00000000000
--- a/gdb/testsuite/gdb.gdbtk/list0.c
+++ /dev/null
@@ -1,43 +0,0 @@
-#include "list0.h"
-
-int main ()
-{
-    int x;
-#ifdef usestubs
-    set_debug_traps();
-    breakpoint();
-#endif
-    x = 0;
-    foo (x++);
-    foo (x++);
-    foo (x++);
-    foo (x++);
-    foo (x++);
-    foo (x++);
-    foo (x++);
-    foo (x++);
-    foo (x++);
-    foo (x++);
-    foo (x++);
-    foo (x++);
-    foo (x++);
-    foo (x++);
-    foo (x++);
-    foo (x++);
-    foo (x++);
-    foo (x++);
-    foo (x++);
-    foo (x++);
-    foo (x++);
-    foo (x++);
-    foo (x++);
-    foo (x++);
-    foo (x++);
-    return 0;
-}
-
-static void
-unused ()
-{
-    /* Not used for anything */
-}
diff --git a/gdb/testsuite/gdb.gdbtk/list0.h b/gdb/testsuite/gdb.gdbtk/list0.h
deleted file mode 100644
index d46833060e5..00000000000
--- a/gdb/testsuite/gdb.gdbtk/list0.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* An include file that actually causes code to be generated in the including file.  This is known to cause problems on some systems. */
-#ifdef PROTOTYPES
-extern void bar(int);
-static void foo (int x)
-#else
-static void foo (x) int x;
-#endif
-{
-    bar (x++);
-    bar (x++);
-    bar (x++);
-    bar (x++);
-    bar (x++);
-    bar (x++);
-    bar (x++);
-    bar (x++);
-    bar (x++);
-    bar (x++);
-    bar (x++);
-    bar (x++);
-    bar (x++);
-    bar (x++);
-    bar (x++);
-    bar (x++);
-    bar (x++);
-    bar (x++);
-    bar (x++);
-    bar (x++);
-    bar (x++);
-    bar (x++);
-    bar (x++);
-    bar (x++);
-    bar (x++);
-    bar (x++);
-    bar (x++);
-    bar (x++);
-}
diff --git a/gdb/testsuite/gdb.gdbtk/list1.c b/gdb/testsuite/gdb.gdbtk/list1.c
deleted file mode 100644
index 6094104b9cd..00000000000
--- a/gdb/testsuite/gdb.gdbtk/list1.c
+++ /dev/null
@@ -1,39 +0,0 @@
-#include <stdio.h>
-
-#ifdef PROTOTYPES
-void long_line (); int oof (int);
-void bar (int x)
-#else
-void bar (x) int x;
-#endif
-{
-    printf ("%d\n", x);
-
-    long_line ();
-}
-
-static void
-unused ()
-{
-    /* Not used for anything */
-}
-/* This routine has a very long line that will break searching in older versions of GDB.  */
-#ifdef PROTOTYPES
-void
-#endif
-long_line ()
-{
-  oof (67);
-
-  oof (6789);
-
-  oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /*    */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /*    */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /*    */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /*    */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /*  5 */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /*    */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /*    */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /*    */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /*    */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /* 10 */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /*    */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /*    */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /*    */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /*    */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /* 15 */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /*    */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /*    */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /*    */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /*    */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /* 20 */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /*    */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /*    */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /*    */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /*    */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /* 25 */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /*    */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /*    */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /*    */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /*    */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /* 30 */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /*    */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /*    */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /*    */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /*    */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /* 35 */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /*    */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /*    */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /*    */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /*    */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /* 40 */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /*    */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /*    */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /*    */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /*    */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /* 45 */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /*    */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /*    */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /*    */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /*    */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /* 50 */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /*    */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /*    */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /*    */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /*    */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /* 55 */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /*    */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /*    */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /*    */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /*    */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /* 60 */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /*    */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /*    */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /*    */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /*    */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /* 65 */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /*    */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /*    */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /*    */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /*    */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (1234); /* 70 */
-}
-#ifdef PROTOTYPES
-int oof (int n)
-#else
-oof (n) int n;
-#endif
-{
-  return n + 1;
-}
diff --git a/gdb/testsuite/gdb.gdbtk/simple.c b/gdb/testsuite/gdb.gdbtk/simple.c
deleted file mode 100644
index 969f6880636..00000000000
--- a/gdb/testsuite/gdb.gdbtk/simple.c
+++ /dev/null
@@ -1,20 +0,0 @@
-int
-main(int argc, char * argv[])
-{
-   int i;
-   char *a;
-   char *b = "abc";
-   long  foo;
-
-   a = (char *) malloc (300);
-
-   for (i=0; i < 50; i++)
-     {
-       int j = i % 3;
-       int k = 3 - j;
-       strncpy (&a[i], &b[k], j);
-       foo = (long) j * k / i + 2 * k * k * k;
-     }
-   return 0;
-}
-
diff --git a/gdb/testsuite/gdb.gdbtk/srcwin.exp b/gdb/testsuite/gdb.gdbtk/srcwin.exp
deleted file mode 100644
index 9d548059718..00000000000
--- a/gdb/testsuite/gdb.gdbtk/srcwin.exp
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999, 2001 Red Hat, Inc.
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License (GPL) 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.
-
-load_lib insight-support.exp
-
-if {[gdbtk_initialize_display]} {
-  if {$tracelevel} {
-    strace $tracelevel
-  }
-
-  #
-  # test source window
-  #
-  set prms_id 0
-  set bug_id 0
-  
-  set testfile "list"
-  set s1 "$srcdir/$subdir/list0.c"
-  set sources "$s1 $srcdir/$subdir/list1.c"
-  set binfile $objdir/$subdir/$testfile
-  if {[file exists $s1.save]} {
-    catch {file delete $s1}
-    file rename $s1.save $s1
-  }
-  set r [gdb_compile $sources "$binfile" executable debug]
-  if  { $r != "" } {
-    gdb_suppress_entire_file \
-      "Testcase compile failed, so some tests in this file will automatically fail."
-  }
-
-  # Start with a fresh gdbtk
-  gdb_exit
-  set results [gdbtk_start [file join $srcdir $subdir srcwin.test]]
-  set results [split $results \n]
-  set all_results $results
-
-  # move file with "main" out of the way
-  file rename $s1 $s1.save
-
-  # run slightly different set of tests
-  gdb_exit
-  set results [gdbtk_start [file join $srcdir $subdir srcwin2.test]]
-  set results [split $results \n]
-  set all_results [concat $all_results $results]
-
-  # restore file
-  file rename $s1.save $s1
-
-  set r [gdb_compile $sources "$binfile" executable ""]
-  if  { $r != "" } {
-    gdb_suppress_entire_file \
-      "Testcase compile failed, so some tests in this file will automatically fail."
-  }
-  # run slightly different set of tests
-  gdb_exit
-  set results [gdbtk_start [file join $srcdir $subdir srcwin3.test]]
-  set results [split $results \n]
-  set all_results [concat $all_results $results]
-
-  # Analyze results
-  gdbtk_done $all_results
-}
diff --git a/gdb/testsuite/gdb.gdbtk/srcwin.test b/gdb/testsuite/gdb.gdbtk/srcwin.test
deleted file mode 100644
index eaa9ba8530e..00000000000
--- a/gdb/testsuite/gdb.gdbtk/srcwin.test
+++ /dev/null
@@ -1,1192 +0,0 @@
-#   Copyright (C) 1999, 2001 Red Hat, Inc.
-#
-# 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.
-
-# Please email any bugs, comments, and/or additions to this file to:
-# bug-gdb@prep.ai.mit.edu
-
-# This file was written by Martin Hunt (hunt@cygnus.com)
-
-# Read in the standard defs file
-
-if {![gdbtk_read_defs]} {
-  break
-}
-
-global objdir srcdir
-
-
-# move the pointer to the center of the bbox relative to $win
-proc move_mouse_to {win bbox} {
-  if {[llength $bbox] != 4} {
-    return 0
-  }
-  set x [expr [lindex $bbox 0] + [lindex $bbox 2] / 2]
-  set y [expr [lindex $bbox 1] + [lindex $bbox 3] / 2]
-  warp_pointer . [winfo rootx $win] [winfo rooty $win]
-
-  set nx 0
-  set ny 0
-
-  while {$nx != $x || $ny != $y} {
-    if {$nx < $x} {incr nx}
-    if {$ny < $y} {incr ny}
-    warp_pointer $win $nx $ny
-  }
-  return 1
-}
-
-proc click {win bbox bnum} {
-  if {![move_mouse_to $win $bbox]} {
-    return 0
-  }
-  update
-
-  set x [expr [lindex $bbox 0] + [lindex $bbox 2] / 2]
-  set y [expr [lindex $bbox 1] + [lindex $bbox 3] / 2]
-
-  if {[catch {event generate $win <Button-$bnum> -x $x -y $y} result]} {
-    return 0
-  }
-  if {[catch {event generate $win <ButtonRelease-$bnum> -x $x -y $y} result]} {
-    return 0
-  }
-  return 1
-}
-
-
-#####                 #####
-#                         #
-#  SECTION 1: Mode Tests  #
-#                         #
-#####                 #####
-
-# Load the test executable
-set program [file join $objdir list]
-if {[catch {gdbtk_test_file $program} t]} {
-  # This isn't a test case, since if this fails, we're hosed.
-  gdbtk_test_error "loading \"$program\": $t"
-}
-
-set srcwin [ManagedWin::open SrcWin]
-set stw [$srcwin test_get twin]
-set twin [$stw test_get twin]
-
-# get things started
-gdb_cmd "break main"
-gdbtk_test_run
-
-# Test: srcwin-1.1
-# Desc: Check for something in source window
-gdbtk_test srcwin-1.1 "source window has contents" {
-  set file1(source) [$twin get 1.0 end]
-  expr {![string compare $file1(source) ""]}
-} {0}
-
-
-# Test: srcwin-1.2
-# Desc: source->assembly mode change
-gdbtk_test srcwin-1.2 "source->assembly mode change" {
-  $srcwin mode "" ASSEMBLY
-  set twin [$stw test_get twin]
-  set file1(assembly) [$twin get 1.0 end]
-  expr {![string compare $file1(source) $file1(assembly)]}
-} {0}
-
-# Test: srcwin-1.3
-# Desc: assembly->mixed mode change
-gdbtk_test srcwin-1.3 "assembly->mixed mode change" {
-  $srcwin mode "" MIXED
-  set twin [$stw test_get twin]
-  set file1(mixed) [$twin get 1.0 end]
-  expr {![string compare $file1(mixed) $file1(assembly)]}
-} {0}
-
-# Test: srcwin-1.4
-# Desc: mixed->src+asm mode change
-gdbtk_test srcwin-1.4 "mixed->src+asm mode change" {
-  $srcwin mode "" SRC+ASM
-  set twin [$stw test_get twin]
-  set bwin [$stw test_get bwin]
-  set s [$twin get 1.0 end]
-  set a [$bwin get 1.0 end]
-  list [string compare $a $file1(assembly)] [string compare $s $file1(source)] [winfo ismapped $bwin]
-} {0 0 1}
-
-# Test: srcwin-1.5
-# Desc: src+asm->source mode change
-gdbtk_test srcwin-1.5 "src+asm->source mode change" {
-  $srcwin mode "" SOURCE
-  set twin [$stw test_get twin]
-  set a [$twin get 1.0 end]
-  set bwin [$stw test_get bwin]
-  list [string compare $file1(source) $a] [winfo ismapped $bwin]
-} {0 0}
-
-# Test: srcwin-1.6
-# Desc: source->mixed mode change
-gdbtk_test srcwin-1.6 "source->mixed mode change" {
-  $srcwin mode "" MIXED
-  set twin [$stw test_get twin]
-  set a [$twin get 1.0 end]
-  string compare $file1(mixed) $a
-} {0}
-
-# Test: srcwin-1.7
-# Desc: mixed->source mode change
-gdbtk_test srcwin-1.7 "mixed->source mode change" {
-  $srcwin mode "" SOURCE
-  set twin [$stw test_get twin]
-  set a [$twin get 1.0 end]
-  string compare $file1(source) $a
-} {0}
-
-# Test: srcwin-1.8
-# Desc: source->src+asm mode change
-gdbtk_test srcwin-1.8 "source->src+asm mode change" {
-  $srcwin mode "" SRC+ASM
-  set twin [$stw test_get twin]
-  set bwin [$stw test_get bwin]
-  set s [$twin get 1.0 end]
-  set a [$bwin get 1.0 end]
-  list [string compare $a $file1(assembly)] [string compare $s $file1(source)] [winfo ismapped $bwin]
-} {0 0 1}
-
-# Test: srcwin-1.9
-# Desc: src+asm->assembly mode change
-gdbtk_test srcwin-1.9 "src+asm->assembly mode change" {
-  $srcwin mode "" ASSEMBLY
-  set twin [$stw test_get twin]
-  set a [$twin get 1.0 end]
-  string compare $file1(assembly) $a
-} {0}
-
-# Test: srcwin-1.10
-# Desc: assembly->src+asm mode change
-gdbtk_test srcwin-1.10 "assembly->src+asm mode change" {
-  $srcwin mode "" SRC+ASM
-  set twin [$stw test_get twin]
-  set bwin [$stw test_get bwin]
-  set s [$twin get 1.0 end]
-  set a [$bwin get 1.0 end]
-  list [string compare $a $file1(assembly)] [string compare $s $file1(source)] [winfo ismapped $bwin]
-} {0 0 1}
-
-# Test: srcwin-1.11
-# Desc: src+asm->mixed mode change
-gdbtk_test srcwin-1.11 "src+asm->mixed mode change" {
-  $srcwin mode "" MIXED
-  set twin [$stw test_get twin]
-  set a [$twin get 1.0 end]
-  set bwin [$stw test_get bwin]
-  expr {[string compare $file1(mixed) $a] ||
-	[winfo ismapped $bwin]}
-} {0}
-
-# Test: srcwin-1.12
-# Desc: mixed->assembly mode change
-gdbtk_test srcwin-1.12 "mixed->assembly mode change" {
-  $srcwin mode "" ASSEMBLY
-  set twin [$stw test_get twin]
-  set a [$twin get 1.0 end]
-  string compare $file1(assembly) $a
-} {0}
-
-# Test: srcwin-1.13
-# Desc: assembly->source mode change
-gdbtk_test srcwin-1.13 "assembly->source mode change" {
-  $srcwin mode "" SOURCE
-  set twin [$stw test_get twin]
-  set a [$twin get 1.0 end]
-  string compare $file1(source) $a
-} {0}
-
-
-#####                       #####
-#                               #
-#  SECTION 2: Basic Operations  #
-#                               #
-#####                       #####
-
-# Test: srcwin-2.1
-# Desc: check contents of filename combobox
-gdbtk_test srcwin-2.1 "check contents of filename combobox" {
-  set statbar [$srcwin test_get _statbar]
-  set names [$statbar.name list get 0 end]
-  set r 0
-  foreach f {list0.c list1.c} {
-    if {[lsearch $names $f] != -1} {
-      incr r
-    }
-  }
-  set r
-} {2}
-
-# Test: srcwin-2.2
-# Desc: check contents of function combobox
-gdbtk_test srcwin-2.2 "check contents of function combobox" {
-  set names [$statbar.func list get 0 end]
-  set r 0
-  foreach f {main foo unused} {
-    if {[lsearch $names $f] != -1} {
-      incr r
-    }
-  }
-  set r
-} {3}
-
-# Test: srcwin-2.3
-# Desc: goto filename
-gdbtk_test srcwin-2.3 "goto filename" {
-  set func [$srcwin test_get _name 1]
-  $func "" list1.c
-  set twin [$stw test_get twin]
-  set file2(source) [$twin get 1.0 end]
-  expr {![string compare $file1(source) $file2(source)]}
-} {0}
-
-# Test: srcwin-2.4
-# Desc: check contents of function combobox
-gdbtk_test srcwin-2.4 "check contents of function combobox" {
-  set names [$statbar.func list get 0 end]
-  set r 0
-  foreach f {bar long_line oof unused} {
-    if {[lsearch $names $f] != -1} {
-      incr r
-    }
-  }
-  set r
-} {4}
-
-# Test: srcwin-2.5
-# Desc: function combobox entry field should be empty after switching to a new file
-gdbtk_test srcwin-2.5 "function combobox entry field should be empty" {
-  set names [$statbar.func get]
-  string length $names
-} {0}
-
-# Test: srcwin-2.6
-# Desc: goto function
-gdbtk_test srcwin-2.6 "goto function bar" {
-  $srcwin goto_func "" bar
-  set r 0
-
-  # now get a dump of all tags and check that only one line is
-  # marked BROWSE_TAG and no lines are STACK_TAG or PC_TAG.
-
-  # We know that list1.c should have BROWSE_TAG set at index 5.2
-  # for function "bar".  If list1.c is changed or the layout of the source
-  # window is changed, this must be updated.
-  if {![catch {set z [$twin dump -tag 1.0 end]}]} {
-    foreach {k v i} $z {
-      if {$k == "tagon"} {
-	if {$v == "BROWSE_TAG"} {
-	  if {$i == "10.2"} {
-	    incr r
-	  } else {
-	    incr r 5
-	  }
-	}
-	if {$v == "STACK_TAG"} { incr r 10}
-	if {$v == "PC_TAG"} { incr r 100}
-      }
-    }
-  } else {
-    set r -1
-  }
-
-  if {$r == 1} {
-    # things are OK so far, so just verify the function name is displayed
-    # in the combobox entry field.
-    set names [$statbar.func get]
-    if {[string compare $names "bar"]} {set r -2}
-  }
-  set r
-} {1}
-
-# Test: srcwin-2.7
-# Desc: goto function "oof". This tests that the correct line is highlighted
-# with BROWSE_TAG and no other lines are highlighted. It also checks that
-# the combobox has the correct function name in it.  Finally, list1.c
-# has an extremely long line, line 32, that breaks some functions.  We verify 
-# that the GDBtk has the correct line number.
-
-gdbtk_test srcwin-2.7 "goto function oof" {
-  $srcwin goto_func "" oof
-  set r 0
-
-  # now get a dump of all tags and check that only one line is
-  # marked BROWSE_TAG and no lines are STACK_TAG or PC_TAG.
-
-  # We know that list1.c should have BROWSE_TAG set at index 32.2
-  # for function "oof".  If list1.c is changed or the layout of the source
-  # window is changed, this must be updated.
-  if {![catch {set z [$twin dump -tag 1.0 end]}]} {
-    foreach {k v i} $z {
-      if {$k == "tagon"} {
-	if {$v == "BROWSE_TAG"} {
-	  if {$i == "38.2"} {
-	    set line_number [$twin get "$i wordstart" "$i wordend"]
-	    if {$line_number == "38"} {
-	      incr r
-	    } else {
-	      incr r -100
-	    }
-	  } else {
-	    incr r 5
-	  }
-	}
-	if {$v == "STACK_TAG"} {incr r 10}
-	if {$v == "PC_TAG"} {incr r 100}
-      }
-    }
-  } else {
-    set r -1
-  }
-
-  if {$r == 1} {
-    # things are OK so far, so just verify the function name is displayed
-    # in the combobox entry field.
-    set names [$statbar.func get]
-    if {[string compare $names "oof"]} {set r -2}
-  }
-  set r
-} {1}
-
-# Test: srcwin-2.8
-# Desc: This test issues a next command while browsing list1.c.
-# It should display list0.c and highlight the correct line.
-gdbtk_test srcwin-2.8 "step while browsing" {
-  gdb_immediate "next" 1
-  set r 0
-  set name [$statbar.name get]
-  set func [$statbar.func get]
-
-  # check contents of name and function comboboxes
-  if {$name != "list0.c"} {set r -1}
-  if {$func != "main"} {set r -2}
-
-  # check that correct file is displayed
-  set twin [$stw test_get twin]
-  set a [$twin get 1.0 end]
-  if {[string compare $file1(source) $a]} {set r -3}
-
-  # check for PC_TAG on correct line
-  if {$r == 0} {
-    if {![catch {set z [$twin dump -tag 1.0 end]}]} {
-      foreach {k v i} $z {
-	if {$k == "tagon"} {
-	  if {$v == "PC_TAG"} {
-	    if {$i == "11.2"} {
-	      incr r
-	    } else {
-	      incr r 5
-	    }
-	  }
-	  if {$v == "STACK_TAG"} {incr r 10}
-	  if {$v == "BROWSE_TAG"} {incr r 100}
-	}
-      }
-    } else {
-      set r -4
-    }
-  }
-  set r
-} {1}
-
-# Test: srcwin-2.9
-# Desc: This test issues a next command while the current
-# PC is ready to call a function.  It should not go into the function and
-# should update the PC highlight correctly.
-gdbtk_test srcwin-2.9 "next" {
-  gdb_immediate "next" 1
-  set r 0
-  set name [$statbar.name get]
-  set func [$statbar.func get]
-
-  # check contents of name and function comboboxes
-  if {$name != "list0.c"} {set r -1}
-  if {$func != "main"} {set r -2}
-
-  # check that correct file is displayed
-  set twin [$stw test_get twin]
-  set a [$twin get 1.0 end]
-  if {[string compare $file1(source) $a]} {set r -3}
-
-  # check for PC_TAG on correct line
-  if {$r == 0} {
-    if {![catch {set z [$twin dump -tag 1.0 end]}]} {
-      foreach {k v i} $z {
-	if {$k == "tagon"} {
-	  if {$v == "PC_TAG"} {
-	    if {$i == "12.2"} {
-	      incr r
-	    } else {
-	      incr r 5
-	    }
-	  }
-	  if {$v == "STACK_TAG"} {incr r 10}
-	  if {$v == "BROWSE_TAG"} {incr r 100}
-	}
-      }
-    } else {
-      set r -4
-    }
-  }
-  set r
-} {1}
-
-# Test: srcwin-2.10
-# Desc: This test issues a step command while the current
-# PC is ready to call a function.  It should step into the function.
-gdbtk_test srcwin-2.10 "step" {
-  gdb_immediate "step" 1
-  set r 0
-  set name [$statbar.name get]
-  set func [$statbar.func get]
-
-  # check contents of name and function comboboxes
-  if {$name != "list0.h"} {set r -1}
-  if {$func != "foo"} {set r -2}
-
-  # check that a new file is displayed
-  set twin [$stw test_get twin]
-  set file3(source) [$twin get 1.0 end]
-  if {![string compare $file1(source) $file3(source)]} {set r -3}
-
-  # check for PC_TAG on correct line
-  if {$r == 0} {
-    if {![catch {set z [$twin dump -tag 1.0 end]}]} {
-      foreach {k v i} $z {
-	if {$k == "tagon"} {
-	  if {$v == "PC_TAG"} {
-	    if {$i == "9.2"} {
-	      incr r
-	    } else {
-	      incr r 5
-	    }
-	  }
-	  if {$v == "STACK_TAG"} {incr r 10}
-	  if {$v == "BROWSE_TAG"} {incr r 100}
-	}
-      }
-    } else {
-      set r -4
-    }
-  }
-  set r
-} {1}
-
-# Test: srcwin-2.11
-# Desc: This test issues a break and a continue
-gdbtk_test srcwin-2.11 "set BP and continue" {
-  gdb_immediate "break oof" 1
-  gdb_immediate "continue" 1
-  set r 0
-  set name [$statbar.name get]
-  set func [$statbar.func get]
-
-  # check contents of name and function comboboxes
-  if {$name != "list1.c"} {set r -1}
-  if {$func != "oof"} {set r -2}
-
-  # check that the correct file is displayed
-  # we must clear the breakpoint first so it doesn't mess up the
-  # comparison...
-  gdb_immediate "clear oof" 1  
-  set twin [$stw test_get twin]
-  set a [$twin get 1.0 end]
-  if {[string compare $file2(source) $a]} {set r -3}
-  
-  # check for PC_TAG on correct line
-  if {$r == 0} {
-    if {![catch {set z [$twin dump -tag 1.0 end]}]} {
-      foreach {k v i} $z {
-	if {$k == "tagon"} {
-	  if {$v == "PC_TAG"} {
-	    if {$i == "38.2"} {
-	      incr r
-	    } else {
-	      incr r 5
-	    }
-	  }
-	  if {$v == "STACK_TAG"} {incr r 10}
-	  if {$v == "BROWSE_TAG"} {incr r 100}
-	}
-      }
-    } else {
-      set r -4
-    }
-  }
-  set r
-} {1}
-
-#####                       #####
-#                               #
-#  SECTION 3: Stack Operations  #
-#                               #
-#####                       #####
-
-# Test: srcwin-3.1
-# Desc: This tests "stack up" 
-gdbtk_test srcwin-3.1 "stack up (1)" {
-  $srcwin stack up
-  set r 0
-  set name [$statbar.name get]
-  set func [$statbar.func get]
-
-  # check contents of name and function comboboxes
-  if {$name != "list1.c"} {set r -1}
-  if {$func != "long_line"} {set r -2}
-
-  # check that the correct file is displayed
-  set twin [$stw test_get twin]
-  set a [$twin get 1.0 end]
-  if {[string compare $file2(source) $a]} {set r -3}
-  
-  # check for PC_TAG and STACK_TAG on correct lines
-  if {$r == 0} {
-    if {![catch {set z [$twin dump -tag 1.0 end]}]} {
-      foreach {k v i} $z {
-	if {$k == "tagon"} {
-	  if {$v == "PC_TAG"} {
-	    # return n + 1;
-	    if {$i == "38.2"} {
-	      incr r
-	    } else {
-	      incr r 5
-	    }
-	  }
-	  if {$v == "STACK_TAG"} {
-	    # oof (67);
-	    if {$i == "26.2"} {
-	      incr r
-	    } else {
-	      incr r 10
-	    }
-	  }
-	  if {$v == "BROWSE_TAG"} {incr r 100}
-	}
-      }
-    } else {
-      set r -4
-    }
-  }
-  set r
-} {2}
-
-# Test: srcwin-3.2
-# Desc: Another "stack up"  test
-gdbtk_test srcwin-3.2 "stack up (2)" {
-  $srcwin stack up
-  set r 0
-  set name [$statbar.name get]
-  set func [$statbar.func get]
-
-  # check contents of name and function comboboxes
-  if {$name != "list1.c"} {set r -1}
-  if {$func != "bar"} {set r -2}
-
-  # check that the correct file is displayed
-  set twin [$stw test_get twin]
-  set a [$twin get 1.0 end]
-  if {[string compare $file2(source) $a]} {set r -3}
-  
-  # check for PC_TAG and STACK_TAG on correct lines
-  if {$r == 0} {
-    if {![catch {set z [$twin dump -tag 1.0 end]}]} {
-      foreach {k v i} $z {
-	if {$k == "tagon"} {
-	  if {$v == "PC_TAG"} {
-	    # return n + 1;
-	    if {$i == "38.2"} {
-	      incr r
-	    } else {
-	      incr r 5
-	    }
-	  }
-	  if {$v == "STACK_TAG"} {
-	    # long_line ();
-	    if {$i == "12.2"} {
-	      incr r
-	    } else {
-	      incr r 10
-	    }
-	  }
-	  if {$v == "BROWSE_TAG"} {incr r 100}
-	}
-      }
-    } else {
-      set r -4
-    }
-  }
-  set r
-} {2}
-
-# Test: srcwin-3.3
-# Desc: Another "stack up"  test
-gdbtk_test srcwin-3.3 "stack up (3)" {
-  $srcwin stack up
-  set r 0
-  set name [$statbar.name get]
-  set func [$statbar.func get]
-
-  # check contents of name and function comboboxes
-  if {$name != "list0.h"} {set r -1}
-  if {$func != "foo"} {set r -2}
-
-  # check that the correct file is displayed
-  set twin [$stw test_get twin]
-  set a [$twin get 1.0 end]
-  if {![string compare $file2(source) $a]} {set r -3}
-  
-  # check for PC_TAG and STACK_TAG on correct lines
-  if {$r == 0} {
-    if {![catch {set z [$twin dump -tag 1.0 end]}]} {
-      foreach {k v i} $z {
-	if {$k == "tagon"} {
-	  if {$v == "STACK_TAG"} {
-	    if {$i == "9.2"} {
-	      incr r
-	    } else {
-	      incr r 5
-	    }
-	  }
-	  if {$v == "PC_TAG"} {incr r 10}
-	  if {$v == "BROWSE_TAG"} {incr r 100}
-	}
-      }
-    } else {
-      set r -4
-    }
-  }
-  set r
-} {1}
-
-# Test: srcwin-3.4
-# Desc: Another "stack up"  test
-gdbtk_test srcwin-3.4 "stack up (4)" {
-  $srcwin stack up
-  set r 0
-  set name [$statbar.name get]
-  set func [$statbar.func get]
-
-  # check contents of name and function comboboxes
-  if {$name != "list0.c"} {set r -1}
-  if {$func != "main"} {set r -2}
-
-  # check that the correct file is displayed
-  set twin [$stw test_get twin]
-  set a [$twin get 1.0 end]
-  if {[string compare $file1(source) $a]} {set r -3}
-  
-  # check for PC_TAG and STACK_TAG on correct lines
-  if {$r == 0} {
-    if {![catch {set z [$twin dump -tag 1.0 end]}]} {
-      foreach {k v i} $z {
-	if {$k == "tagon"} {
-	  if {$v == "STACK_TAG"} {
-	    if {$i == "12.2"} {
-	      incr r
-	    } else {
-	      incr r 5
-	    }
-	  }
-	  if {$v == "PC_TAG"} {incr r 10}
-	  if {$v == "BROWSE_TAG"} {incr r 100}
-	}
-      }
-    } else {
-      set r -4
-    }
-  }
-  set r
-} {1}
-
-# Disabled for now because there are different correct results.
-# Test should be rewritten to include those.
-# Test: srcwin-3.5
-# Desc: "stack up" when we are at the top
-#gdbtk_test srcwin-3.5 "stack up when at the top" {
-#  $srcwin stack up
-#  set r 0
-#  set name [$statbar.name get]
-#  set func [$statbar.func get]
-#
-  # check contents of name and function comboboxes
-#  if {$name != "list0.c"} {set r -1}
-#  if {$func != "main"} {set r -2}
-
-  # check that the correct file is displayed
-#  set twin [$stw test_get twin]
-#  set a [$twin get 1.0 end]
-#  if {[string compare $file1(source) $a]} {set r -3}
-  
-  # check for PC_TAG and STACK_TAG on correct lines
-#  if {$r == 0} {
-#    if {![catch {set z [$twin dump -tag 1.0 end]}]} {
-#      foreach {k v i} $z {
-#	if {$k == "tagon"} {
-#	  if {$v == "STACK_TAG"} {
-#	    if {$i == "12.2"} {
-#	      incr r
-#	    } else {
-#	      incr r 5
-#	    }
-#	  }
-#	  if {$v == "PC_TAG"} {incr r 10}
-#	  if {$v == "BROWSE_TAG"} {incr r 100}
-#	}
-#      }
-#    } else {
-#      set r -4
-#    }
-#  }
-#  set r
-#} {1}
-
-# Test: srcwin-3.6
-# Desc: "stack down"  test
-gdbtk_test srcwin-3.6 "stack down" {
-  $srcwin stack down
-  set r 0
-  set name [$statbar.name get]
-  set func [$statbar.func get]
-
-  # check contents of name and function comboboxes
-  if {$name != "list0.h"} {set r -1}
-  if {$func != "foo"} {set r -2}
-
-  # check that the correct file is displayed
-  set twin [$stw test_get twin]
-  set a [$twin get 1.0 end]
-  if {![string compare $file2(source) $a]} {set r -3}
-  
-  # check for PC_TAG and STACK_TAG on correct lines
-  if {$r == 0} {
-    if {![catch {set z [$twin dump -tag 1.0 end]}]} {
-      foreach {k v i} $z {
-	if {$k == "tagon"} {
-	  if {$v == "STACK_TAG"} {
-	    if {$i == "9.2"} {
-	      incr r
-	    } else {
-	      incr r 5
-	    }
-	  }
-	  if {$v == "PC_TAG"} {incr r 10}
-	  if {$v == "BROWSE_TAG"} {incr r 100}
-	}
-      }
-    } else {
-      set r -4
-    }
-  }
-  set r
-} {1}
-
-# Test: srcwin-3.7
-# Desc: "stack bottom"  test
-gdbtk_test srcwin-3.7 "stack bottom" {
-  $srcwin stack bottom
-  set r 0
-  set name [$statbar.name get]
-  set func [$statbar.func get]
-
-  # check contents of name and function comboboxes
-  if {$name != "list1.c"} {set r -1}
-  if {$func != "oof"} {set r -2}
-
-  # check that the correct file is displayed
-  set twin [$stw test_get twin]
-  set a [$twin get 1.0 end]
-  if {[string compare $file2(source) $a]} {set r -3}
-  
-  # check for PC_TAG on correct line
-  if {$r == 0} {
-    if {![catch {set z [$twin dump -tag 1.0 end]}]} {
-      foreach {k v i} $z {
-	if {$k == "tagon"} {
-	  if {$v == "PC_TAG"} {
-	    if {$i == "38.2"} {
-	      incr r
-	    } else {
-	      incr r 5
-	    }
-	  }
-	  if {$v == "STACK_TAG"} {incr r 10}
-	  if {$v == "BROWSE_TAG"} {incr r 100}
-	}
-      }
-    } else {
-      set r -4
-    }
-  }
-  set r
-} {1}
-
-# Test: srcwin-3.8
-# Desc: "stack down" when at bottom
-gdbtk_test srcwin-3.8 "stack down when at bottom" {
-  $srcwin stack down
-  set r 0
-  set name [$statbar.name get]
-  set func [$statbar.func get]
-
-  # check contents of name and function comboboxes
-  if {$name != "list1.c"} {set r -1}
-  if {$func != "oof"} {set r -2}
-
-  # check that the correct file is displayed
-  set twin [$stw test_get twin]
-  set a [$twin get 1.0 end]
-  if {[string compare $file2(source) $a]} {set r -3}
-  
-  # check for PC_TAG on correct line
-  if {$r == 0} {
-    if {![catch {set z [$twin dump -tag 1.0 end]}]} {
-      foreach {k v i} $z {
-	if {$k == "tagon"} {
-	  if {$v == "PC_TAG"} {
-	    if {$i == "38.2"} {
-	      incr r
-	    } else {
-	      incr r 5
-	    }
-	  }
-	  if {$v == "STACK_TAG"} {incr r 10}
-	  if {$v == "BROWSE_TAG"} {incr r 100}
-	}
-      }
-    } else {
-      set r -4
-    }
-  }
-  set r
-} {1}
-
-# 4 -  BREAKPOINTS
-
-# Test: srcwin-4.1
-# Desc: Set BP in another file. Tests bp and cache functions
-gdbtk_test srcwin-4.1 "set BP in another file" {
-  gdb_immediate "break foo" 1
-  $srcwin goto_func "" foo
-  set r 0
-  set name [$statbar.name get]
-  set func [$statbar.func get]
-
-  # check contents of name and function comboboxes
-  if {$name != "list0.h"} {set r -1}
-  if {$func != "foo"} {set r -2}
-
-  set twin [$stw test_get twin]
-  
-  # check for BROWSE_TAG and BP image on correct line
-  if {$r == 0} {
-    if {![catch {set z [$twin dump 1.0 end]}]} {
-      foreach {k v i} $z {
-	if {$k == "tagon"} {
-	  if {$v == "BROWSE_TAG"} {
-	    if {$i == "9.2"} {
-	      incr r
-	    } else {
-	      incr r 5
-	    }
-	  }
-	  if {$v == "STACK_TAG"} {incr r 10}
-	  if {$v == "PC_TAG"} {incr r 100}
-	} elseif {$k == "image"} {
-	  if {$i == "9.0"} {
-	    incr r
-	  } else {
-	    set r -200
-	  }
-	}
-      }
-    } else {
-      set r -4
-    }
-  }
-  
-  if {$r == 2} {
-    # clear BP and compare with previous contents. This should succeed,
-    gdb_immediate "clear foo" 1
-    set a [$twin get 1.0 end]
-    if {[string compare $file3(source) $a]} {set r -3}
-  }
-  
-  set r
-} {2}
-
-# Test: srcwin-4.2
-# Desc: Test temporary BP
-gdbtk_test srcwin-4.2 "temporary BP" {
-  set r 0
-  if {[catch {gdb_immediate "tbreak foo" 1} msg]} {
-    set r -500
-  }
-  set name [$statbar.name get]
-  set func [$statbar.func get]
-  
-  # check contents of name and function comboboxes
-  if {$name != "list0.h"} {set r -1}
-  if {$func != "foo"} {set r -2}
-
-  set twin [$stw test_get twin]
-  
-  # check for BROWSE_TAG and BP image on correct line
-  if {$r == 0} {
-    if {![catch {set z [$twin dump 1.0 end]}]} {
-      foreach {k v i} $z {
-	if {$k == "tagon"} {
-	  if {$v == "BROWSE_TAG"} {
-	    if {$i == "9.2"} {
-	      incr r
-	    } else {
-	      incr r 5
-	    }
-	  }
-	  if {$v == "STACK_TAG"} {incr r 10}
-	  if {$v == "PC_TAG"} {incr r 100}
-	} elseif {$k == "image"} {
-	  if {$i == "9.0"} {
-	    incr r
-	  } else {
-	    set r -200
-	  }
-	}
-      }
-    } else {
-      set r -4
-    }
-  }
-  
-  gdb_immediate "continue" 1
-  
-  # now check for PC_TAG and no image
-  if {$r == 2} {
-    if {![catch {set z [$twin dump 1.0 end]}]} {
-      foreach {k v i} $z {
-	if {$k == "tagon"} {
-	  if {$v == "PC_TAG"} {
-	    if {$i == "9.2"} {
-	      incr r
-	    } else {
-	      incr r 5
-	    }
-	  }
-	  if {$v == "STACK_TAG"} {incr r 10}
-	  if {$v == "BROWSE_TAG"} {incr r 100}
-	} elseif {$k == "image"} {
-	  set r -200
-	}
-      }
-    } else {
-      set r -4
-    }
-  }
-  
-  set r
-} {3}
-
-# Test: srcwin-4.3
-# Desc: Test BP balloons
-gdbtk_test srcwin-4.3 "BP Balloons" {
-  # move pointer out of the way
-  warp_pointer . 0 0 
-  set r 0
-  gdb_immediate "break 10" 1
-  gdb_immediate "tbreak 10" 1
-
-  set twin [$stw test_get twin]
-  
-  # check for BROWSE_TAG and BP image on correct line
-  if {$r == 0} {
-    if {![catch {set z [$twin dump 1.0 end]}]} {
-      foreach {k v i} $z {
-	if {$k == "tagon"} {
-	  if {$v == "PC_TAG"} {
-	    if {$i == "9.2"} {
-	      incr r
-	    } else {
-	      incr r 5
-	    }
-	  }
-	  if {$v == "STACK_TAG"} {incr r 10}
-	  if {$v == "BROWSE_TAG"} {incr r 100}
-	} elseif {$k == "image"} {
-	  if {$i == "10.0"} {
-	    incr r
-	    # we found the bp image, now we will test the bp balloon messages
-	    set balloon [winfo toplevel [namespace tail $srcwin]].__balloon
-	    # shouldn't be mapped yet
-	    if {[winfo ismapped $balloon]} {
-	      set r -3000
-	      break
-	    }
-	    move_mouse_to $twin [$twin bbox $i]
-	    #wait a second for the balloon message to appear
-	    sleep 1
-	    if {![winfo ismapped $balloon]} {
-	      set r -4000
-	      break
-	    }
-	    # read the contents of the balloon and parse it into lines
-	    set a [split [$balloon.label cget -text] \n]
-	    set i 0
-	    # foreach line parse it and check the type and make sure it is enabled
-	    foreach line $a {
-	      if {[lindex $line 0] == "breakpoint"} {continue}
-	      incr i
-	      set enabled [lindex $line 0]
-	      set bptype [lindex $line 2]
-	      switch $i {
-		1 {
-		  if {$bptype != "donttouch"} {set r -1000}
-		}
-		2 {
-		  if {$bptype != "delete"} {set r -2000}
-		}
-	      }
-	    }
-	  } else {
-	    set r -200
-	  }
-	}
-      }
-    } else {
-      set r -4
-    }
-  }
-  set r
-} {2}
-
-#ManagedWin::open DebugWin
-
-# Test: srcwin-4.4
-# Desc: Click on line to set BP
-gdbtk_test srcwin-4.4 "Click on line to set BP" {
-  set r 0
-
-  # click mouse button 1 at index 20.1
-  if {![click $twin [$twin bbox 20.1] 1]} {
-    set r "Click failed on line 20.1"
-  } else {
-
-    # now look for BP at line 20
-    foreach bpnum [gdb_get_breakpoint_list] {
-      set bpinfo [gdb_get_breakpoint_info $bpnum]
-      lassign $bpinfo file func line pc type enabled disposition \
-	ignore_count commands cond thread hit_count
-      set file [lindex [file split $file] end]
-      if {$file == "list0.h"} {
-	if {$line == "20"} {
-	  if {$enabled == "1"} {incr r}
-	  if {$func == "foo"} {incr r}
-	  if {$type == "breakpoint"} {incr r}
-	  if {$disposition == "donttouch"} {incr r}
-	}
-      }
-    }
-  }
-  set r
-} {4}
-
-
-# Test: srcwin-4.5
-# Desc: Continue till here popup
-gdbtk_test srcwin-4.5 "Continue till here popup" {
-  set twin [$stw test_get twin]
-
-  # Get coordinates of line 16
-  set b [$twin bbox 16.1]
-  set y [expr {[lindex $b 1] + ([lindex $b 3] / 2)}]
-
-  # Continue to here
-  $stw continue_to_here $twin $y
-
-  # Where is the PC_TAG?
-  set pcs {}
-  set tags [$twin tag ranges PC_TAG]
-  foreach {start end} $tags {
-    lappend pcs [expr {int($start)}]
-  }
-
-  # Where are breakpoints?
-  set bps {}
-  set imgs [$twin dump -image 1.0 end]
-  foreach {foo bar line} $imgs {
-    lappend bps $line
-  }
-
-  list $pcs $bps
-} {16 {10.0 20.0}}
-
-# 5.1 balloon variables
-# Test: srcwin-5.1
-# Desc: variable balloon test
-# continues to BP at line 20 and checks to see that value was updated
-gdbtk_test srcwin-5.1 "variable balloon test" {
-  # move pointer out of the way
-  warp_pointer . 0 0 
-  set r 0
-  set twin [$stw test_get twin]
-
-  # move pointer to variable "x" and check balloon
-  set index [string first "x++" [$twin get 20.0 20.end]]
-  move_mouse_to $twin [$twin bbox 20.$index]
-  sleep 1
-  if {[winfo ismapped $balloon]} {
-    if {![string compare "x=9" [$balloon.label cget -text]]} {incr r}
-    gdb_immediate "continue" 1
-    sleep 1
-    if {![string compare "x=13" [$balloon.label cget -text]]} {incr r}
-  } else {
-    set r -1
-  }
-
-  set r
-} {2}
-
-# 6.1 mixed mode disassembly of include file
-# Test: srcwin-6.1
-# Desc: Some versions of GDBtk can't do mixed-mode disassembly of a function
-# that is in an include file. PR# mi/1101
-
-gdbtk_test srcwin-6.1 "mixed mode disassembly of include file (mi/1101)" {
-  set r 0
-  $srcwin mode "" MIXED
-
-  # check contents of name and function comboboxes
-  set name [$statbar.name get]
-  set func [$statbar.func get]
-  if {$name != "list0.h"} {set r -1}
-  if {$func != "foo"} {set r -2}
-  
-  # check contents of source window
-  set twin [$stw test_get twin]
-  set text [$twin get 1.0 end]
-  # Is it correct? I don't know.  Guess we look for some pieces of source...
-  if {[string first "static void" $text] != -1 &&
-      [string first "foo (x)" $text] != -1 &&
-      [string first "bar (x++);" $text] != -1} {
-    set r 1
-  }
-  
-  set r
-} {1}
-
-gdbtk_test_done
diff --git a/gdb/testsuite/gdb.gdbtk/srcwin2.test b/gdb/testsuite/gdb.gdbtk/srcwin2.test
deleted file mode 100644
index ee693e269cb..00000000000
--- a/gdb/testsuite/gdb.gdbtk/srcwin2.test
+++ /dev/null
@@ -1,899 +0,0 @@
-#   Copyright (C) 1999, 2001 Red Hat, Inc.
-#
-# 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.
-
-# Please email any bugs, comments, and/or additions to this file to:
-# bug-gdb@prep.ai.mit.edu
-
-# This file was written by Martin Hunt (hunt@cygnus.com)
-
-
-# same as srcwin.test, except test debugging executables
-# when source files are missing.
-
-# Read in the standard defs file
-
-if {![gdbtk_read_defs]} {
-  break
-}
-
-global objdir srcdir
-
-#####                 #####
-#                         #
-#  SECTION 1: Mode Tests  #
-#                         #
-#####                 #####
-
-# Load the test executable
-set program [file join $objdir list]
-if {[catch {gdbtk_test_file $program} t]} {
-  # This isn't a test case, since if this fails, we're hosed.
-  gdbtk_test_error "loading \"$program\": $t"
-}
-
-set srcwin [ManagedWin::open SrcWin]
-set stw [$srcwin test_get twin]
-set twin [$stw test_get twin]
-set statbar [$srcwin test_get _statbar]
-
-# get things started
-gdb_cmd "break main"
-gdbtk_test_run
-
-# Test: srcwin2-1.1
-# Desc: Check for something in source window
-gdbtk_test srcwin2-1.1 "source window has contents" {
-  set r 0
-  set file1(source) [$twin get 1.0 end]
-  if {$file1(source) == ""} {set r -1}
-  if {[$statbar.mode get] != "ASSEMBLY"} {set r -2}
-  set r
-} {0}
-
-# Test: srcwin2-1.2
-# Desc: source->assembly mode change
-gdbtk_test srcwin2-1.2 "source->assembly mode change" {
-  $srcwin mode "" ASSEMBLY
-  set twin [$stw test_get twin]
-  set file1(assembly) [$twin get 1.0 end]
-  # source == assembly because for there is no source
-  string compare $file1(source) $file1(assembly)
-} {0}
-
-# Test: srcwin2-1.3
-# Desc: assembly->mixed mode change
-gdbtk_test srcwin2-1.3 "assembly->mixed mode change" {
-  set r 0
-  $srcwin mode "" MIXED
-  set twin [$stw test_get twin]
-  set file1(mixed) [$twin get 1.0 end]
-  # mixed != assembly because the lines with source should
-  # be noted, even if source in unavailable. This behaviour is
-  # different for different debug formats, so we accept either.
-  if {$file1(mixed) == ""} {set r -1}
-  if {[$statbar.mode get] != "MIXED"} {set r -2}
-  set r	
-} {0}
-
-# Test: srcwin2-1.4
-# Desc: mixed->src+asm mode change
-gdbtk_test srcwin2-1.4 "mixed->src+asm mode change" {
-  set r 0
-  # mode change may fail if fallover to ASSEMBLY fails
-  if {[catch {$srcwin mode "" SRC+ASM}]} { set r -5 }
-  set twin [$stw test_get twin]
-  if {[$twin get 1.0 end] != $file1(assembly)} {set r -1}
-  if {[$statbar.mode get] != "ASSEMBLY"} {set r -2}
-  set r
-} {0}
-
-# Test: srcwin2-1.5
-# Desc: src+asm->source mode change
-gdbtk_test srcwin2-1.5 "src+asm->source mode change" {
-  set r 0
-  $srcwin mode "" SOURCE
-  set twin [$stw test_get twin]
-  if {[$stw test_get bwin] != ""} {set r -2}
-  if {[$twin get 1.0 end] != $file1(assembly)} {set r -1}
-  if {[$statbar.mode get] != "ASSEMBLY"} {set r -3}
-  set r
-} {0}
-
-# Test: srcwin2-1.6
-# Desc: source->mixed mode change
-gdbtk_test srcwin2-1.6 "source->mixed mode change" {
-  set r 0
-  $srcwin mode "" MIXED
-  set twin [$stw test_get twin]
-  if {[$twin get 1.0 end] != $file1(mixed)} {set r -1}
-  if {[$statbar.mode get] != "MIXED"} {set r -2}
-  set r
-} {0}
-
-# Test: srcwin2-1.7
-# Desc: mixed->source mode change
-gdbtk_test srcwin2-1.7 "mixed->source mode change" {
-  set r 0
-  $srcwin mode "" SOURCE
-  set twin [$stw test_get twin]
-  if {[$twin get 1.0 end] != $file1(source)} {set r -1}
-  if {[$statbar.mode get] != "ASSEMBLY"} {set r -2}
-  set r
-} {0}
-
-# Test: srcwin2-1.8
-# Desc: source->src+asm mode change
-gdbtk_test srcwin2-1.8 "source->src+asm mode change" {
-  set r 0
-  # mode change may fail if fallover to ASSEMBLY fails
-  if {[catch {$srcwin mode "" SRC+ASM}]} { set r -5 }
-  set twin [$stw test_get twin]
-  set bwin [$stw test_get bwin]
-  if {[$twin get 1.0 end] != $file1(assembly)} {set r -1}
-  if {$bwin != ""} {set r -2}
-  if {[$statbar.mode get] != "ASSEMBLY"} {set r -3}
-  set r
-} {0}
-
-# Test: srcwin2-1.9
-# Desc: src+asm->assembly mode change
-gdbtk_test srcwin2-1.9 "src+asm->assembly mode change" {
-  set r 0
-  $srcwin mode "" ASSEMBLY
-  set twin [$stw test_get twin]
-  if {[$twin get 1.0 end] != $file1(assembly)} {set r -1}
-  if {[$statbar.mode get] != "ASSEMBLY"} {set r -2}
-  set r
-} {0}
-
-# Test: srcwin2-1.10
-# Desc: assembly->src+asm mode change
-gdbtk_test srcwin2-1.10 "assembly->src+asm mode change" {
-  set r 0
-  # mode change may fail if fallover to ASSEMBLY fails
-  if {[catch {$srcwin mode "" SRC+ASM}]} { set r -5 }
-  set twin [$stw test_get twin]
-  set bwin [$stw test_get bwin]
-  if {[$twin get 1.0 end] != $file1(assembly)} {set r -1}
-  if {$bwin != ""} {set r -2}
-  if {[$statbar.mode get] != "ASSEMBLY"} {set r -3}
-  set r
-} {0}
-
-# Test: srcwin2-1.11
-# Desc: src+asm->mixed mode change
-gdbtk_test srcwin2-1.11 "src+asm->mixed mode change" {
-  set r 0
-  $srcwin mode "" MIXED
-  set twin [$stw test_get twin]
-  if {[$twin get 1.0 end] != $file1(mixed)} {set r -1}
-  if {[$statbar.mode get] != "MIXED"} {set r -2}
-  set r
-} {0}
-
-# Test: srcwin2-1.12
-# Desc: mixed->assembly mode change
-gdbtk_test srcwin2-1.12 "mixed->assembly mode change" {
-  set r 0
-  $srcwin mode "" ASSEMBLY
-  set twin [$stw test_get twin]
-  if {[$twin get 1.0 end] != $file1(assembly)} {set r -1}
-  if {[$statbar.mode get] != "ASSEMBLY"} {set r -2}
-  set r
-} {0}
-
-# Test: srcwin2-1.13
-# Desc: assembly->source mode change
-gdbtk_test srcwin2-1.13 "assembly->source mode change" {
-  set r 0
-  $srcwin mode "" SOURCE
-  set twin [$stw test_get twin]
-  if {[$twin get 1.0 end] != $file1(source)} {set r -1}
-  if {[$statbar.mode get] != "ASSEMBLY"} {set r -2}
-  set r
-} {0}
-
-
-#####                       #####
-#                               #
-#  SECTION 2: Basic Operations  #
-#                               #
-#####                       #####
-
-# Test: srcwin2-2.1
-# Desc: check contents of filename combobox
-gdbtk_test srcwin2-2.1 "check contents of filename combobox" {
-  set names [$statbar.name list get 0 end]
-  set r 0
-  foreach f {list0.c list1.c} {
-    if {[lsearch $names $f] != -1} {
-      incr r
-    }
-  }
-  set r
-} {2}
-
-# Test: srcwin2-2.2
-# Desc: check contents of function combobox
-gdbtk_test srcwin2-2.2 "check contents of function combobox" {
-  set names [$statbar.func list get 0 end]
-  set r 0
-  foreach f {main foo unused} {
-    if {[lsearch $names $f] != -1} {
-      incr r
-    }
-  }
-  set r
-} {3}
-
-# Test: srcwin2-2.3
-# Desc: goto filename
-gdbtk_test srcwin2-2.3 "goto filename" {
-  set func [$srcwin test_get _name 1]
-  $func "" list1.c
-  set twin [$stw test_get twin]
-  set file2(source) [$twin get 1.0 end]
-  expr {![string compare $file1(source) $file2(source)]}
-} {0}
-
-# Test: srcwin2-2.4
-# Desc: check contents of function combobox
-gdbtk_test srcwin2-2.4 "check contents of function combobox" {
-  set names [$statbar.func list get 0 end]
-  set r 0
-  foreach f {bar long_line oof unused} {
-    if {[lsearch $names $f] != -1} {
-      incr r
-    }
-  }
-  set r
-} {4}
-
-# Test: srcwin2-2.5
-# Desc: function combobox entry field should be empty after switching to a new file
-gdbtk_test srcwin2-2.5 "function combobox entry field should be empty" {
-  set names [$statbar.func get]
-  string length $names
-} {0}
-
-# Test: srcwin2-2.6
-# Desc: goto function
-gdbtk_test srcwin2-2.6 "goto function bar" {
-  $srcwin goto_func "" bar
-  set r 0
-
-  # now get a dump of all tags and check that only one line is
-  # marked BROWSE_TAG and no lines are STACK_TAG or PC_TAG.
-
-  # We know that list1.c should have BROWSE_TAG set at index 10.2
-  # for function "bar".  If list1.c is changed or the layout of the source
-  # window is changed, this must be updated.
-  if {![catch {set z [$twin dump -tag 1.0 end]}]} {
-    foreach {k v i} $z {
-      if {$k == "tagon"} {
-	if {$v == "BROWSE_TAG"} {
-	  if {$i == "10.2"} {
-	    incr r
-	  } else {
-	    incr r 5
-	  }
-	}
-	if {$v == "STACK_TAG"} { incr r 10}
-	if {$v == "PC_TAG"} { incr r 100}
-      }
-    }
-  } else {
-    set r -1
-  }
-
-  if {$r == 1} {
-    # things are OK so far, so just verify the function name is displayed
-    # in the combobox entry field.
-    set names [$statbar.func get]
-    if {[string compare $names "bar"]} {set r -2}
-  }
-  set r
-} {1}
-
-# Test: srcwin2-2.7
-# Desc: goto function "oof". This tests that the correct line is highlighted
-# with BROWSE_TAG and no other lines are highlighted. It also checks that
-# the combobox has the correct function name in it.  Finally, list1.c
-# has an extremely long line, line 32, that breaks some functions.  We verify 
-# that the GDBtk has the correct line number.
-
-gdbtk_test srcwin2-2.7 "goto function oof" {
-  $srcwin goto_func "" oof
-  set r 0
-
-  # now get a dump of all tags and check that only one line is
-  # marked BROWSE_TAG and no lines are STACK_TAG or PC_TAG.
-
-  # We know that list1.c should have BROWSE_TAG set at index 38.2
-  # for function "oof".  If list1.c is changed or the layout of the source
-  # window is changed, this must be updated.
-  if {![catch {set z [$twin dump -tag 1.0 end]}]} {
-    foreach {k v i} $z {
-      if {$k == "tagon"} {
-	if {$v == "BROWSE_TAG"} {
-	  if {$i == "38.2"} {
-	    set line_number [$twin get "$i wordstart" "$i wordend"]
-	    if {$line_number == "38"} {
-	      incr r
-	    } else {
-	      incr r -100
-	    }
-	  } else {
-	    incr r 5
-	  }
-	}
-	if {$v == "STACK_TAG"} {incr r 10}
-	if {$v == "PC_TAG"} {incr r 100}
-      }
-    }
-  } else {
-    set r -1
-  }
-
-  if {$r == 1} {
-    # things are OK so far, so just verify the function name is displayed
-    # in the combobox entry field.
-    set names [$statbar.func get]
-    if {[string compare $names "oof"]} {set r -2}
-  }
-  set r
-} {1}
-
-# Test: srcwin2-2.8
-# Desc: This test issues a next command while browsing list1.c.
-# It should display list0.c and highlight the correct line.
-gdbtk_test srcwin2-2.8 "step while browsing" {
-  gdb_immediate "next" 1
-  set r 0
-  set name [$statbar.name get]
-  set func [$statbar.func get]
-
-  # check contents of name and function comboboxes
-  if {$name != "list0.c"} {set r -1}
-  if {$func != "main"} {set r -2}
-
-  # check that correct file is displayed
-  set twin [$stw test_get twin]
-  set a [$twin get 1.0 end]
-  if {[string compare $file1(source) $a]} {set r -3}
-
-  # check for PC_TAG
-  if {$r == 0} {
-    if {![catch {set z [$twin dump -tag 1.0 end]}]} {
-      foreach {k v i} $z {
-	if {$k == "tagon"} {
-	  if {$v == "PC_TAG"} {
-	    incr r
-	  }
-	  if {$v == "STACK_TAG"} {incr r 10}
-	  if {$v == "BROWSE_TAG"} {incr r 100}
-	}
-      }
-    } else {
-      set r -4
-    }
-  }
-  set r
-} {1}
-
-# Test: srcwin2-2.11
-# Desc: This test issues a break and a continue
-gdbtk_test srcwin2-2.11 "set BP and continue" {
-  gdb_immediate "break oof" 1
-  gdb_immediate "continue" 1
-  set r 0
-  set name [$statbar.name get]
-  set func [$statbar.func get]
-
-  # check contents of name and function comboboxes
-  if {$name != "list1.c"} {set r -1}
-  if {$func != "oof"} {set r -2}
-
-  # check that the correct file is displayed
-  # we must clear the breakpoint first so it doesn't mess up the
-  # comparison...
-  gdb_immediate "clear oof" 1  
-  set twin [$stw test_get twin]
-  set a [$twin get 1.0 end]
-  if {[string compare $file2(source) $a]} {set r -3}
-  
-  # check for PC_TAG on correct line
-  if {$r == 0} {
-    if {![catch {set z [$twin dump -tag 1.0 end]}]} {
-      foreach {k v i} $z {
-	if {$k == "tagon"} {
-	  if {$v == "PC_TAG"} {
-	    if {$i == "38.2"} {
-	      incr r
-	    } else {
-	      incr r 5
-	    }
-	  }
-	  if {$v == "STACK_TAG"} {incr r 10}
-	  if {$v == "BROWSE_TAG"} {incr r 100}
-	}
-      }
-    } else {
-      set r -4
-    }
-  }
-  set r
-} {1}
-
-#####                       #####
-#                               #
-#  SECTION 3: Stack Operations  #
-#                               #
-#####                       #####
-
-# Test: srcwin2-3.1
-# Desc: This tests "stack up" 
-gdbtk_test srcwin2-3.1 "stack up (1)" {
-  $srcwin stack up
-  set r 0
-  set name [$statbar.name get]
-  set func [$statbar.func get]
-
-  # check contents of name and function comboboxes
-  if {$name != "list1.c"} {set r -1}
-  if {$func != "long_line"} {set r -2}
-
-  # check that the correct file is displayed
-  set twin [$stw test_get twin]
-  set a [$twin get 1.0 end]
-  if {[string compare $file2(source) $a]} {set r -3}
-  
-  # check for PC_TAG and STACK_TAG on correct lines
-  if {$r == 0} {
-    if {![catch {set z [$twin dump -tag 1.0 end]}]} {
-      foreach {k v i} $z {
-	if {$k == "tagon"} {
-	  if {$v == "PC_TAG"} {
-	    if {$i == "38.2"} {
-	      incr r
-	    } else {
-	      incr r 5
-	    }
-	  }
-	  if {$v == "STACK_TAG"} {
-	    if {$i == "26.2"} {
-	      incr r
-	    } else {
-	      incr r 10
-	    }
-	  }
-	  if {$v == "BROWSE_TAG"} {incr r 100}
-	}
-      }
-    } else {
-      set r -4
-    }
-  }
-  set r
-} {2}
-
-# Test: srcwin2-3.2
-# Desc: Another "stack up"  test
-gdbtk_test srcwin2-3.2 "stack up (2)" {
-  $srcwin stack up
-  set r 0
-  set name [$statbar.name get]
-  set func [$statbar.func get]
-
-  # check contents of name and function comboboxes
-  if {$name != "list1.c"} {set r -1}
-  if {$func != "bar"} {set r -2}
-
-  # check that the correct file is displayed
-  set twin [$stw test_get twin]
-  set a [$twin get 1.0 end]
-  if {[string compare $file2(source) $a]} {set r -3}
-  
-  # check for PC_TAG and STACK_TAG on correct lines
-  if {$r == 0} {
-    if {![catch {set z [$twin dump -tag 1.0 end]}]} {
-      foreach {k v i} $z {
-	if {$k == "tagon"} {
-	  if {$v == "PC_TAG"} {
-	    if {$i == "38.2"} {
-	      incr r
-	    } else {
-	      incr r 5
-	    }
-	  }
-	  if {$v == "STACK_TAG"} {
-	    if {$i == "12.2"} {
-	      incr r
-	    } else {
-	      incr r 10
-	    }
-	  }
-	  if {$v == "BROWSE_TAG"} {incr r 100}
-	}
-      }
-    } else {
-      set r -4
-    }
-  }
-  set r
-} {2}
-
-# Test: srcwin2-3.3
-# Desc: Another "stack up"  test
-gdbtk_test srcwin2-3.3 "stack up (3)" {
-  $srcwin stack up
-  set r 0
-  set name [$statbar.name get]
-  set func [$statbar.func get]
-
-  # check contents of name and function comboboxes
-  if {$name != "list0.h"} {set r -1}
-  if {$func != "foo"} {set r -2}
-
-  # check that the correct file is displayed
-  set twin [$stw test_get twin]
-  set file3(source) [$twin get 1.0 end]
-  if {![string compare $file2(source) $file3(source)]} {set r -3}
-  
-  # check for PC_TAG and STACK_TAG on correct lines
-  if {$r == 0} {
-    if {![catch {set z [$twin dump -tag 1.0 end]}]} {
-      foreach {k v i} $z {
-	if {$k == "tagon"} {
-	  if {$v == "STACK_TAG"} {
-	    if {$i == "9.2"} {
-	      incr r
-	    } else {
-	      incr r 5
-	    }
-	  }
-	  if {$v == "PC_TAG"} {incr r 10}
-	  if {$v == "BROWSE_TAG"} {incr r 100}
-	}
-      }
-    } else {
-      set r -4
-    }
-  }
-  set r
-} {1}
-
-# Test: srcwin2-3.4
-# Desc: Another "stack up"  test
-gdbtk_test srcwin2-3.4 "stack up (4)" {
-  $srcwin stack up
-  set r 0
-  set name [$statbar.name get]
-  set func [$statbar.func get]
-
-  # check contents of name and function comboboxes
-  if {$name != "list0.c"} {set r -1}
-  if {$func != "main"} {set r -2}
-
-  # check that the correct file is displayed
-  set twin [$stw test_get twin]
-  set a [$twin get 1.0 end]
-  if {[string compare $file1(source) $a]} {set r -3}
-  
-  # check for STACK_TAG
-  if {$r == 0} {
-    if {![catch {set z [$twin dump -tag 1.0 end]}]} {
-      foreach {k v i} $z {
-	if {$k == "tagon"} {
-	  if {$v == "STACK_TAG"} {
-	    incr r
-	  }
-	  if {$v == "PC_TAG"} {incr r 10}
-	  if {$v == "BROWSE_TAG"} {incr r 100}
-	}
-      }
-    } else {
-      set r -4
-    }
-  }
-  set r
-} {1}
-
-
-# Disabled for now because there are different correct results.
-# Test should be rewritten to include those.
-# Test: srcwin2-3.5
-# Desc: "stack up" when we are at the top
-#gdbtk_test srcwin2-3.5 "stack up when at the top" {
-# $srcwin stack up
-#  set r 0
-#  set name [$statbar.name get]
-#  set func [$statbar.func get]
-
-  # check contents of name and function comboboxes
-#  if {$name != "list0.c"} {set r -1}
-#  if {$func != "main"} {set r -2}
-
-  # check that the correct file is displayed
-#  set twin [$stw test_get twin]
-#  set a [$twin get 1.0 end]
-#  if {[string compare $file1(source) $a]} {set r -3}
-  
-  # check for STACK_TAG
-#  if {$r == 0} {
-#    if {![catch {set z [$twin dump -tag 1.0 end]}]} {
-#      foreach {k v i} $z {
-#	if {$k == "tagon"} {
-#	  if {$v == "STACK_TAG"} {
-#	    incr r
-#	  }
-#	  if {$v == "PC_TAG"} {incr r 10}
-#	  if {$v == "BROWSE_TAG"} {incr r 100}
-#	}
-#      }
-#    } else {
-#      set r -4
-#    }
-#  }
-#  set r
-#} {1}
-
-# Test: srcwin2-3.6
-# Desc: "stack down"  test
-gdbtk_test srcwin2-3.6 "stack down" {
-  $srcwin stack down
-  set r 0
-  set name [$statbar.name get]
-  set func [$statbar.func get]
-
-  # check contents of name and function comboboxes
-  if {$name != "list0.h"} {set r -1}
-  if {$func != "foo"} {set r -2}
-
-  # check that the correct file is displayed
-  set twin [$stw test_get twin]
-  set a [$twin get 1.0 end]
-  if {![string compare $file2(source) $a]} {set r -3}
-  
-  # check for PC_TAG and STACK_TAG on correct lines
-  if {$r == 0} {
-    if {![catch {set z [$twin dump -tag 1.0 end]}]} {
-      foreach {k v i} $z {
-	if {$k == "tagon"} {
-	  if {$v == "STACK_TAG"} {
-	    if {$i == "9.2"} {
-	      incr r
-	    } else {
-	      incr r 5
-	    }
-	  }
-	  if {$v == "PC_TAG"} {incr r 10}
-	  if {$v == "BROWSE_TAG"} {incr r 100}
-	}
-      }
-    } else {
-      set r -4
-    }
-  }
-  set r
-} {1}
-
-# Test: srcwin2-3.7
-# Desc: "stack bottom"  test
-gdbtk_test srcwin2-3.7 "stack bottom" {
-  $srcwin stack bottom
-  set r 0
-  set name [$statbar.name get]
-  set func [$statbar.func get]
-
-  # check contents of name and function comboboxes
-  if {$name != "list1.c"} {set r -1}
-  if {$func != "oof"} {set r -2}
-
-  # check that the correct file is displayed
-  set twin [$stw test_get twin]
-  set a [$twin get 1.0 end]
-  if {[string compare $file2(source) $a]} {set r -3}
-  
-  # check for PC_TAG on correct line
-  if {$r == 0} {
-    if {![catch {set z [$twin dump -tag 1.0 end]}]} {
-      foreach {k v i} $z {
-	if {$k == "tagon"} {
-	  if {$v == "PC_TAG"} {
-	    if {$i == "38.2"} {
-	      incr r
-	    } else {
-	      incr r 5
-	    }
-	  }
-	  if {$v == "STACK_TAG"} {incr r 10}
-	  if {$v == "BROWSE_TAG"} {incr r 100}
-	}
-      }
-    } else {
-      set r -4
-    }
-  }
-  set r
-} {1}
-
-# Test: srcwin2-3.8
-# Desc: "stack down" when at bottom
-gdbtk_test srcwin2-3.8 "stack down when at bottom" {
-  $srcwin stack down
-  set r 0
-  set name [$statbar.name get]
-  set func [$statbar.func get]
-
-  # check contents of name and function comboboxes
-  if {$name != "list1.c"} {set r -1}
-  if {$func != "oof"} {set r -2}
-
-  # check that the correct file is displayed
-  set twin [$stw test_get twin]
-  set a [$twin get 1.0 end]
-  if {[string compare $file2(source) $a]} {set r -3}
-  
-  # check for PC_TAG on correct line
-  if {$r == 0} {
-    if {![catch {set z [$twin dump -tag 1.0 end]}]} {
-      foreach {k v i} $z {
-	if {$k == "tagon"} {
-	  if {$v == "PC_TAG"} {
-	    if {$i == "38.2"} {
-	      incr r
-	    } else {
-	      incr r 5
-	    }
-	  }
-	  if {$v == "STACK_TAG"} {incr r 10}
-	  if {$v == "BROWSE_TAG"} {incr r 100}
-	}
-      }
-    } else {
-      set r -4
-    }
-  }
-  set r
-} {1}
-
-# 4.1 bp, multiple, balloon, etc
-
-# Test: srcwin2-4.1
-# Desc: Set BP in another file. Tests bp and cache functions
-gdbtk_test srcwin2-4.1 "set BP in another file" {
-  gdb_immediate "break foo" 1
-  $srcwin goto_func "" foo
-  set r 0
-  set name [$statbar.name get]
-  set func [$statbar.func get]
-
-  # check contents of name and function comboboxes
-  if {$name != "list0.h"} {set r -1}
-  if {$func != "foo"} {set r -2}
-
-  set twin [$stw test_get twin]
-  
-  # check for BROWSE_TAG and BP image on correct line
-  if {$r == 0} {
-    if {![catch {set z [$twin dump 1.0 end]}]} {
-      foreach {k v i} $z {
-	if {$k == "tagon"} {
-	  if {$v == "BROWSE_TAG"} {
-	    if {$i == "9.2"} {
-	      incr r
-	    } else {
-	      incr r 5
-	    }
-	  }
-	  if {$v == "STACK_TAG"} {incr r 10}
-	  if {$v == "PC_TAG"} {incr r 100}
-	} elseif {$k == "image"} {
-	  if {$i == "9.0"} {
-	    incr r
-	  } else {
-	    set r -200
-	  }
-	}
-      }
-    } else {
-      set r -4
-    }
-  }
-  
-  if {$r == 2} {
-    # clear BP and compare with previous contents. This should succeed,
-    gdb_immediate "clear foo" 1
-    set a [$twin get 1.0 end]
-    if {[string compare $file3(source) $a]} {set r -3}
-  }
-  
-  set r
-} {2}
-
-# Test: srcwin2-4.2
-# Desc: Test temporary BP
-gdbtk_test srcwin2-4.2 "temporary BP" {
-  set r 0
-  if {[catch {gdb_immediate "tbreak foo" 1} msg]} {
-    set r -500
-  }
-  set name [$statbar.name get]
-  set func [$statbar.func get]
-  
-  # check contents of name and function comboboxes
-  if {$name != "list0.h"} {set r -1}
-  if {$func != "foo"} {set r -2}
-
-  set twin [$stw test_get twin]
-  
-  # check for BROWSE_TAG and BP image on correct line
-  if {$r == 0} {
-    if {![catch {set z [$twin dump 1.0 end]}]} {
-      foreach {k v i} $z {
-	if {$k == "tagon"} {
-	  if {$v == "BROWSE_TAG"} {
-	    if {$i == "9.2"} {
-	      incr r
-	    } else {
-	      incr r 5
-	    }
-	  }
-	  if {$v == "STACK_TAG"} {incr r 10}
-	  if {$v == "PC_TAG"} {incr r 100}
-	} elseif {$k == "image"} {
-	  if {$i == "9.0"} {
-	    incr r
-	  } else {
-	    set r -200
-	  }
-	}
-      }
-    } else {
-      set r -4
-    }
-  }
-  
-  gdb_immediate "continue" 1
-  
-  # now check for PC_TAG and no image
-  if {$r == 2} {
-    if {![catch {set z [$twin dump 1.0 end]}]} {
-      foreach {k v i} $z {
-	if {$k == "tagon"} {
-	  if {$v == "PC_TAG"} {
-	    if {$i == "9.2"} {
-	      incr r
-	    } else {
-	      incr r 5
-	    }
-	  }
-	  if {$v == "STACK_TAG"} {incr r 10}
-	  if {$v == "BROWSE_TAG"} {incr r 100}
-	} elseif {$k == "image"} {
-	  set r -200
-	}
-      }
-    } else {
-      set r -4
-    }
-  }
-  
-  set r
-} {3}
-
-gdbtk_test_done
diff --git a/gdb/testsuite/gdb.gdbtk/srcwin3.test b/gdb/testsuite/gdb.gdbtk/srcwin3.test
deleted file mode 100644
index b9a1617bb5c..00000000000
--- a/gdb/testsuite/gdb.gdbtk/srcwin3.test
+++ /dev/null
@@ -1,789 +0,0 @@
-#   Copyright (C) 1999, 2001 Red Hat, Inc.
-#
-# 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.
-
-# Please email any bugs, comments, and/or additions to this file to:
-# bug-gdb@prep.ai.mit.edu
-
-# This file was written by Martin Hunt (hunt@cygnus.com)
-
-###########################################################
-# same as srcwin.test, except test debugging executables  #
-# build without "-g"                                      #
-###########################################################
-
-# Read in the standard defs file
-
-if {![gdbtk_read_defs]} {
-  break
-}
-
-global objdir srcdir
-
-#####                 #####
-#                         #
-#  SECTION 1: Mode Tests  #
-#                         #
-#####                 #####
-
-# Load the test executable
-set program [file join $objdir list]
-if {[catch {gdbtk_test_file $program} t]} {
-  # This isn't a test case, since if this fails, we're hosed.
-  gdbtk_test_error "loading \"$program\": $t"
-}
-
-set srcwin [ManagedWin::open SrcWin]
-set stw [$srcwin test_get twin]
-set twin [$stw test_get twin]
-set statbar [$srcwin test_get _statbar]
-
-# get things started
-gdb_cmd "break main"
-gdbtk_test_run
-
-# Test: srcwin3-1.1
-# Desc: Check for something in source window
-gdbtk_test srcwin3-1.1 "source window has contents" {
-  set r 0
-  set source(main) [$twin get 1.0 end]
-  if {$source(main) == ""} {set r -1}
-  if {[$statbar.mode get] != "ASSEMBLY"} {set r -2}
-  set r
-} {0}
-
-# Test: srcwin3-1.2
-# Desc: source->assembly mode change
-gdbtk_test srcwin3-1.2 "source->assembly mode change" {
-  set r 0
-  $srcwin mode "" ASSEMBLY
-  set twin [$stw test_get twin]
-  if {$source(main) != [$twin get 1.0 end]} {set r -1}
-  if {[$statbar.mode get] != "ASSEMBLY"} {set r -2}
-  set r
-} {0}
-
-# Test: srcwin3-1.3
-# Desc: assembly->mixed mode change
-gdbtk_test srcwin3-1.3 "assembly->mixed mode change" {
-  set r 0
-  $srcwin mode "" MIXED
-  set twin [$stw test_get twin]
-  if {$source(main) != [$twin get 1.0 end]} {set r -1}
-  if {[$statbar.mode get] != "MIXED"} {set r -2}
-  set r
-} {0}
-
-# Test: srcwin3-1.4
-# Desc: mixed->src+asm mode change
-gdbtk_test srcwin3-1.4 "mixed->src+asm mode change" {
-  set r 0
-  # mode change may fail if fallover to ASSEMBLY fails
-  if {[catch {$srcwin mode "" SRC+ASM}]} { set r -5 }
-  set twin [$stw test_get twin]
-  if {[$twin get 1.0 end] != $source(main)} {set r -1}
-  if {[$statbar.mode get] != "ASSEMBLY"} {set r -2}
-  set r
-} {0}
-
-# Test: srcwin3-1.5
-# Desc: src+asm->source mode change
-gdbtk_test srcwin3-1.5 "src+asm->source mode change" {
-  set r 0
-  $srcwin mode "" SOURCE
-  set twin [$stw test_get twin]
-  if {[$stw test_get bwin] != ""} {set r -2}
-  if {[$twin get 1.0 end] != $source(main)} {set r -1}
-  if {[$statbar.mode get] != "ASSEMBLY"} {set r -3}
-  set r
-} {0}
-
-# Test: srcwin3-1.6
-# Desc: source->mixed mode change
-gdbtk_test srcwin3-1.6 "source->mixed mode change" {
-  set r 0
-  $srcwin mode "" MIXED
-  set twin [$stw test_get twin]
-  if {[$twin get 1.0 end] != $source(main)} {set r -1}
-  if {[$statbar.mode get] != "MIXED"} {set r -2}
-  set r
-} {0}
-
-# Test: srcwin3-1.7
-# Desc: mixed->source mode change
-gdbtk_test srcwin3-1.7 "mixed->source mode change" {
-  set r 0
-  $srcwin mode "" SOURCE
-  set twin [$stw test_get twin]
-  if {[$twin get 1.0 end] != $source(main)} {set r -1}
-  if {[$statbar.mode get] != "ASSEMBLY"} {set r -2}
-  set r
-} {0}
-
-# Test: srcwin3-1.8
-# Desc: source->src+asm mode change
-gdbtk_test srcwin3-1.8 "source->src+asm mode change" {
-  set r 0
-  # mode change may fail if fallover to ASSEMBLY fails
-  if {[catch {$srcwin mode "" SRC+ASM}]} { set r -5 }
-  set twin [$stw test_get twin]
-  set bwin [$stw test_get bwin]
-  if {[$twin get 1.0 end] != $source(main)} {set r -1}
-  if {$bwin != ""} {set r -2}
-  if {[$statbar.mode get] != "ASSEMBLY"} {set r -3}
-  set r
-} {0}
-
-# Test: srcwin3-1.9
-# Desc: src+asm->assembly mode change
-gdbtk_test srcwin3-1.9 "src+asm->assembly mode change" {
-  set r 0
-  $srcwin mode "" ASSEMBLY
-  set twin [$stw test_get twin]
-  if {[$twin get 1.0 end] != $source(main)} {set r -1}
-  if {[$statbar.mode get] != "ASSEMBLY"} {set r -2}
-  set r
-} {0}
-
-# Test: srcwin3-1.10
-# Desc: assembly->src+asm mode change
-gdbtk_test srcwin3-1.10 "assembly->src+asm mode change" {
-  set r 0
-  # mode change may fail if fallover to ASSEMBLY fails
-  if {[catch {$srcwin mode "" SRC+ASM}]} { set r -5 }
-  set twin [$stw test_get twin]
-  set bwin [$stw test_get bwin]
-  if {[$twin get 1.0 end] != $source(main)} {set r -1}
-  if {$bwin != ""} {set r -2}
-  if {[$statbar.mode get] != "ASSEMBLY"} {set r -3}
-  set r
-} {0}
-
-# Test: srcwin3-1.11
-# Desc: src+asm->mixed mode change
-gdbtk_test srcwin3-1.11 "src+asm->mixed mode change" {
-  set r 0
-  $srcwin mode "" MIXED
-  set twin [$stw test_get twin]
-  if {[$twin get 1.0 end] != $source(main)} {set r -1}
-  if {[$statbar.mode get] != "MIXED"} {set r -2}
-  set r
-} {0}
-
-# Test: srcwin3-1.12
-# Desc: mixed->assembly mode change
-gdbtk_test srcwin3-1.12 "mixed->assembly mode change" {
-  set r 0
-  $srcwin mode "" ASSEMBLY
-  set twin [$stw test_get twin]
-  if {[$twin get 1.0 end] != $source(main)} {set r -1}
-  if {[$statbar.mode get] != "ASSEMBLY"} {set r -2}
-  set r
-} {0}
-
-# Test: srcwin3-1.13
-# Desc: assembly->source mode change
-gdbtk_test srcwin3-1.13 "assembly->source mode change" {
-  set r 0
-  $srcwin mode "" SOURCE
-  set twin [$stw test_get twin]
-  if {[$twin get 1.0 end] != $source(main)} {set r -1}
-  if {[$statbar.mode get] != "ASSEMBLY"} {set r -2}
-  set r
-} {0}
-
-
-#####                       #####
-#                               #
-#  SECTION 2: Basic Operations  #
-#                               #
-#####                       #####
-
-# Test: srcwin3-2.2
-# Desc: check contents of function combobox
-# There won't be any because we have no debug info
-gdbtk_test srcwin3-2.2 "check contents of function combobox" {
-  set names [$statbar.func list get 0 end]
-  llength $names
-} {0}
-
-# Test: srcwin3-2.3
-# Desc: goto filename - this won't work, but should leave things as they were
-gdbtk_test srcwin3-2.3 "goto filename" {
-  set func [$srcwin test_get _name 1]
-  $func "" list1.c
-  set twin [$stw test_get twin]
-  string compare $source(main) [$twin get 1.0 end]
-} {0}
-
-# Test: srcwin3-2.6
-# Desc: goto function
-gdbtk_test srcwin3-2.6 "goto function bar" {
-  $srcwin goto_func "" bar
-  set r 0
-  set twin [$stw test_get twin]
-  set source(bar) [$twin get 1.0 end]
-  
-  if {$source(bar) == $source(main)} {set r -1000}
-
-  # now get a dump of all tags and check that only one line is
-  # marked BROWSE_TAG and no lines are STACK_TAG or PC_TAG.
-
-  # We know that list1.c should have BROWSE_TAG set at index 5.2
-  # for function "bar".  If list1.c is changed or the layout of the source
-  # window is changed, this must be updated.
-  if {![catch {set z [$twin dump -tag 1.0 end]}]} {
-    foreach {k v i} $z {
-      if {$k == "tagon"} {
-	if {$v == "BROWSE_TAG"} {
-	  incr r
-	}
-	if {$v == "STACK_TAG"} { incr r 10}
-	if {$v == "PC_TAG"} { incr r 100}
-      }
-    }
-  } else {
-    set r -1
-  }
-
-  if {$r == 1} {
-    # things are OK so far, so just verify the function name is displayed
-    # in the combobox entry field.
-    set names [$statbar.func get]
-    if {[string compare $names "bar"]} {set r -2}
-  }
-  set r
-} {1}
-
-# Test: srcwin3-2.7
-# Desc: goto function "oof". This tests that the correct line is highlighted
-# with BROWSE_TAG and no other lines are highlighted. It also checks that
-# the combobox has the correct function name in it.  
-
-gdbtk_test srcwin3-2.7 "goto function oof" {
-  $srcwin goto_func "" oof
-  set r 0
-
-  set twin [$stw test_get twin]
-  set source(oof) [$twin get 1.0 end]
-  
-  if {$source(bar) == $source(oof)} {set r -1000}
-  if {$source(oof) == $source(main)} {set r -2000}
-
-  # now get a dump of all tags and check that only one line is
-  # marked BROWSE_TAG and no lines are STACK_TAG or PC_TAG.
-
-  if {![catch {set z [$twin dump -tag 1.0 end]}]} {
-    foreach {k v i} $z {
-      if {$k == "tagon"} {
-	if {$v == "BROWSE_TAG"} {
-	  incr r
-	}
-	if {$v == "STACK_TAG"} {incr r 10}
-	if {$v == "PC_TAG"} {incr r 100}
-      }
-    }
-  } else {
-    set r -1
-  }
-
-  if {$r == 1} {
-    # things are OK so far, so just verify the function name is displayed
-    # in the combobox entry field.
-    set names [$statbar.func get]
-    if {[string compare $names "oof"]} {set r -2}
-  }
-  set r
-} {1}
-
-# Test: srcwin3-2.8
-# Desc: This test issues a nexti command while browsing oof.
-# It should jump back to main
-gdbtk_test srcwin3-2.8 "nexti while browsing" {
-  gdb_immediate "nexti" 1
-  set r 0
-  set name [$statbar.name get]
-  set func [$statbar.func get]
-
-  # check contents of function combobox
-  if {$func != "main"} {set r -2}
-  if {$name != ""} {set r -1}
-
-  # check that correct file is displayed
-  set twin [$stw test_get twin]
-  set a [$twin get 1.0 end]
-  if {[string compare $source(main) $a]} {set r -3}
-
-  # check for PC_TAG
-  if {$r == 0} {
-    if {![catch {set z [$twin dump -tag 1.0 end]}]} {
-      foreach {k v i} $z {
-	if {$k == "tagon"} {
-	  if {$v == "PC_TAG"} {
-	    incr r
-	  }
-	  if {$v == "STACK_TAG"} {incr r 10}
-	  if {$v == "BROWSE_TAG"} {incr r 100}
-	}
-      }
-    } else {
-      set r -4
-    }
-  }
-  set r
-} {1}
-
-# Test: srcwin3-2.11
-# Desc: This test issues a break and a continue
-gdbtk_test srcwin3-2.11 "set BP and continue" {
-  gdb_immediate "break oof" 1
-  gdb_immediate "continue" 1
-  set r 0
-  set name [$statbar.name get]
-  set func [$statbar.func get]
-
-  # check contents of name and function comboboxes
-  if {$name != ""} {set r -1}
-  if {$func != "oof"} {set r -2}
-  
-  # check that the correct file is displayed
-  # we must clear the breakpoint first so it doesn't mess up the
-  # comparison...
-  gdb_immediate "clear oof" 1  
-  set twin [$stw test_get twin]
-  set a [$twin get 1.0 end]
-  if {[string compare $source(oof) $a]} {set r -3}
-  
-  # check for PC_TAG
-  if {$r == 0} {
-    if {![catch {set z [$twin dump -tag 1.0 end]}]} {
-      foreach {k v i} $z {
-	if {$k == "tagon"} {
-	  if {$v == "PC_TAG"} {
-	    incr r
-	  }
-	  if {$v == "STACK_TAG"} {incr r 10}
-	  if {$v == "BROWSE_TAG"} {incr r 100}
-	}
-      }
-    } else {
-      set r -4
-    }
-  }
-  set r
-} {1}
-
-#####                       #####
-#                               #
-#  SECTION 3: Stack Operations  #
-#                               #
-#####                       #####
-
-# Test: srcwin3-3.1
-# Desc: This tests "stack up" 
-gdbtk_test srcwin3-3.1 "stack up (1)" {
-  $srcwin stack up
-  set r 0
-  set name [$statbar.name get]
-  set func [$statbar.func get]
-
-  # check contents of name and function comboboxes
-  if {$name != ""} {set r -1}
-  if {$func != "long_line"} {set r -2}
-
-  # check that the correct file is displayed
-  set twin [$stw test_get twin]
-  set source(long_line) [$twin get 1.0 end]
-  if {![string compare $source(long_line) $source(oof)]} {set r -3}
-  
-  # check for PC_TAG and STACK_TAG on correct lines
-  if {$r == 0} {
-    if {![catch {set z [$twin dump -tag 1.0 end]}]} {
-      foreach {k v i} $z {
-	if {$k == "tagon"} {
-	  if {$v == "PC_TAG"} {incr r 5}
-	  if {$v == "STACK_TAG"} {incr r}
-	  if {$v == "BROWSE_TAG"} {incr r 100}
-	}
-      }
-    } else {
-      set r -4
-    }
-  }
-  set r
-} {1}
-
-# Test: srcwin3-3.2
-# Desc: Another "stack up"  test
-gdbtk_test srcwin3-3.2 "stack up (2)" {
-  $srcwin stack up
-  set r 0
-  set name [$statbar.name get]
-  set func [$statbar.func get]
-
-  # check contents of name and function comboboxes
-  if {$name != ""} {set r -1}
-  if {$func != "bar"} {set r -2}
-
-  # check that the correct file is displayed
-  set twin [$stw test_get twin]
-  set a [$twin get 1.0 end]
-  if {[string compare $source(bar) $a]} {set r -3}
-  
-  # check for PC_TAG and STACK_TAG on correct lines
-  if {$r == 0} {
-    if {![catch {set z [$twin dump -tag 1.0 end]}]} {
-      foreach {k v i} $z {
-	if {$k == "tagon"} {
-	  if {$v == "PC_TAG"} {
-	    set r -100
-	  }
-	  if {$v == "STACK_TAG"} {
-	    incr r
-	  }
-	  if {$v == "BROWSE_TAG"} {incr r 100}
-	}
-      }
-    } else {
-      set r -4
-    }
-  }
-  set r
-} {1}
-
-# Test: srcwin3-3.3
-# Desc: Another "stack up"  test
-gdbtk_test srcwin3-3.3 "stack up (3)" {
-  $srcwin stack up
-  set r 0
-  set name [$statbar.name get]
-  set func [$statbar.func get]
-
-  # check contents of name and function comboboxes
-  if {$name != ""} {set r -1}
-  if {$func != "foo"} {set r -2}
-
-  # check that the correct file is displayed
-  set twin [$stw test_get twin]
-  set source(foo) [$twin get 1.0 end]
-  if {![string compare $source(foo) $source(bar)]} {set r -3}
-  
-  # check for PC_TAG and STACK_TAG on correct lines
-  if {$r == 0} {
-    if {![catch {set z [$twin dump -tag 1.0 end]}]} {
-      foreach {k v i} $z {
-	if {$k == "tagon"} {
-	  if {$v == "STACK_TAG"} {
-	    incr r
-	  }
-	  if {$v == "PC_TAG"} {incr r 10}
-	  if {$v == "BROWSE_TAG"} {incr r 100}
-	}
-      }
-    } else {
-      set r -4
-    }
-  }
-  set r
-} {1}
-
-# Test: srcwin3-3.4
-# Desc: Another "stack up"  test
-gdbtk_test srcwin3-3.4 "stack up (4)" {
-  $srcwin stack up
-  set r 0
-  set name [$statbar.name get]
-  set func [$statbar.func get]
-
-  # check contents of name and function comboboxes
-  if {$name != ""} {set r -1}
-  if {$func != "main"} {set r -2}
-
-  # check that the correct file is displayed
-  set twin [$stw test_get twin]
-  set a [$twin get 1.0 end]
-  if {[string compare $source(main) $a]} {set r -3}
-  
-  # check for STACK_TAG
-  if {$r == 0} {
-    if {![catch {set z [$twin dump -tag 1.0 end]}]} {
-      foreach {k v i} $z {
-	if {$k == "tagon"} {
-	  if {$v == "STACK_TAG"} {
-	    incr r
-	  }
-	  if {$v == "PC_TAG"} {incr r 10}
-	  if {$v == "BROWSE_TAG"} {incr r 100}
-	}
-      }
-    } else {
-      set r -4
-    }
-  }
-  set r
-} {1}
-
-# Disabled for now because there are different correct results.
-# Test should be rewritten to include those.
-# Test: srcwin3-3.5
-# Desc: "stack up" when we are at the top
-#gdbtk_test srcwin3-3.5 "stack up when at the top" {
-#  $srcwin stack up
-#  set r 0
-#  set name [$statbar.name get]
-#  set func [$statbar.func get]
-
-  # check contents of name and function comboboxes
-#  if {$name != ""} {set r -1}
-#  if {$func != "main"} {set r -2}
-
-  # check that the correct file is displayed
-#  set twin [$stw test_get twin]
-#  set a [$twin get 1.0 end]
-#  if {[string compare $source(main) $a]} {set r -3}
-  
-  # check for STACK_TAG
-#  if {$r == 0} {
-#    if {![catch {set z [$twin dump -tag 1.0 end]}]} {
-#      foreach {k v i} $z {
-#	if {$k == "tagon"} {
-#	  if {$v == "STACK_TAG"} {
-#	    incr r
-#	  }
-#	  if {$v == "PC_TAG"} {incr r 10}
-#	  if {$v == "BROWSE_TAG"} {incr r 100}
-#	}
-#      }
-#    } else {
-#      set r -4
-#    }
-#  }
-#  set r
-#} {1}
-
-# Test: srcwin3-3.6
-# Desc: "stack down"  test
-gdbtk_test srcwin3-3.6 "stack down" {
-  $srcwin stack down
-  set r 0
-  set name [$statbar.name get]
-  set func [$statbar.func get]
-
-  # check contents of name and function comboboxes
-  if {$name != ""} {set r -1}
-  if {$func != "foo"} {set r -2}
-
-  # check that the correct file is displayed
-  set twin [$stw test_get twin]
-  set a [$twin get 1.0 end]
-  if {[string compare $source(foo) $a]} {set r -3}
-  
-  # check for PC_TAG and STACK_TAG on correct lines
-  if {$r == 0} {
-    if {![catch {set z [$twin dump -tag 1.0 end]}]} {
-      foreach {k v i} $z {
-	if {$k == "tagon"} {
-	  if {$v == "STACK_TAG"} {
-	    incr r
-	  }
-	  if {$v == "PC_TAG"} {incr r 10}
-	  if {$v == "BROWSE_TAG"} {incr r 100}
-	}
-      }
-    } else {
-      set r -4
-    }
-  }
-  set r
-} {1}
-
-# Test: srcwin3-3.7
-# Desc: "stack bottom"  test
-gdbtk_test srcwin3-3.7 "stack bottom" {
-  $srcwin stack bottom
-  set r 0
-  set name [$statbar.name get]
-  set func [$statbar.func get]
-
-  # check contents of name and function comboboxes
-  if {$name != ""} {set r -1}
-  if {$func != "oof"} {set r -2}
-
-  # check that the correct file is displayed
-  set twin [$stw test_get twin]
-  set a [$twin get 1.0 end]
-  if {[string compare $source(oof) $a]} {set r -3}
-  
-  # check for PC_TAG on correct line
-  if {$r == 0} {
-    if {![catch {set z [$twin dump -tag 1.0 end]}]} {
-      foreach {k v i} $z {
-	if {$k == "tagon"} {
-	  if {$v == "PC_TAG"} {
-	    incr r
-	  }
-	  if {$v == "STACK_TAG"} {incr r 10}
-	  if {$v == "BROWSE_TAG"} {incr r 100}
-	}
-      }
-    } else {
-      set r -4
-    }
-  }
-  set r
-} {1}
-
-# Test: srcwin3-3.8
-# Desc: "stack down" when at bottom
-gdbtk_test srcwin3-3.8 "stack down when at bottom" {
-  $srcwin stack down
-  set r 0
-  set name [$statbar.name get]
-  set func [$statbar.func get]
-
-  # check contents of name and function comboboxes
-  if {$name != ""} {set r -1}
-  if {$func != "oof"} {set r -2}
-
-  # check that the correct file is displayed
-  set twin [$stw test_get twin]
-  set a [$twin get 1.0 end]
-  if {[string compare $source(oof) $a]} {set r -3}
-  
-  # check for PC_TAG on correct line
-  if {$r == 0} {
-    if {![catch {set z [$twin dump -tag 1.0 end]}]} {
-      foreach {k v i} $z {
-	if {$k == "tagon"} {
-	  if {$v == "PC_TAG"} {
-	    incr r
-	  }
-	  if {$v == "STACK_TAG"} {incr r 10}
-	  if {$v == "BROWSE_TAG"} {incr r 100}
-	}
-      }
-    } else {
-      set r -4
-    }
-  }
-  set r
-} {1}
-
-# 4.1 bp, multiple, balloon, etc
-
-# Test: srcwin3-4.1
-# Desc: Set BP in another file. Tests bp and cache functions
-gdbtk_test srcwin3-4.1 "set BP in another file" {
-  gdb_immediate "break foo" 1
-  $srcwin goto_func "" foo
-  set r 0
-  set name [$statbar.name get]
-  set func [$statbar.func get]
-
-  # check contents of name and function comboboxes
-  if {$name != ""} {set r -1}
-  if {$func != "foo"} {set r -2}
-
-  set twin [$stw test_get twin]
-  
-  # check for BROWSE_TAG and BP image
-  if {$r == 0} {
-    if {![catch {set z [$twin dump 1.0 end]}]} {
-      foreach {k v i} $z {
-	if {$k == "tagon"} {
-	  if {$v == "BROWSE_TAG"} {
-	    incr r
-	  }
-	  if {$v == "STACK_TAG"} {incr r 10}
-	  if {$v == "PC_TAG"} {incr r 100}
-	} elseif {$k == "image"} {
-	  incr r
-	}
-      }
-    } else {
-      set r -4
-    }
-  }
-  
-  if {$r == 2} {
-    # clear BP and compare with previous contents. This should succeed,
-    gdb_immediate "clear foo" 1
-    set a [$twin get 1.0 end]
-    if {[string compare $source(foo) $a]} {set r -3}
-  }
-  
-  set r
-} {2}
-
-# Test: srcwin3-4.2
-# Desc: Test temporary BP
-gdbtk_test srcwin3-4.2 "temporary BP" {
-  set r 0
-  if {[catch {gdb_immediate "tbreak foo" 1} msg]} {
-    set r -500
-  }
-  set name [$statbar.name get]
-  set func [$statbar.func get]
-  
-  # check contents of name and function comboboxes
-  if {$name != ""} {set r -1}
-  if {$func != "foo"} {set r -2}
-
-  set twin [$stw test_get twin]
-  
-  # check for BROWSE_TAG and BP image on correct line
-  if {$r == 0} {
-    if {![catch {set z [$twin dump 1.0 end]}]} {
-      foreach {k v i} $z {
-	if {$k == "tagon"} {
-	  if {$v == "BROWSE_TAG"} {
-	    incr r
-	  }
-	  if {$v == "STACK_TAG"} {incr r 10}
-	  if {$v == "PC_TAG"} {incr r 100}
-	} elseif {$k == "image"} {
-	  incr r
-	}
-      }
-    } else {
-      set r -4
-    }
-  }
-  
-  gdb_immediate "continue" 1
-  
-  # now check for PC_TAG and no image
-  if {$r == 2} {
-    if {![catch {set z [$twin dump 1.0 end]}]} {
-      foreach {k v i} $z {
-	if {$k == "tagon"} {
-	  if {$v == "PC_TAG"} {
-	    incr r
-	  }
-	  if {$v == "STACK_TAG"} {incr r 10}
-	  if {$v == "BROWSE_TAG"} {incr r 100}
-	} elseif {$k == "image"} {
-	  set r -200
-	}
-      }
-    } else {
-      set r -4
-    }
-  }
-  
-  set r
-} {3}
-
-gdbtk_test_done
diff --git a/gdb/testsuite/gdb.gdbtk/stack1.c b/gdb/testsuite/gdb.gdbtk/stack1.c
deleted file mode 100644
index 389260a22a5..00000000000
--- a/gdb/testsuite/gdb.gdbtk/stack1.c
+++ /dev/null
@@ -1,231 +0,0 @@
-/* Functions defined in other files */
-extern void extern_func1_1 (int a, char *b, unsigned long c);
-
-/* Functions defined in this file */
-static void static_func_1  (int a, char *b, unsigned long c);
-static void static_func_2  (int a, char *b, unsigned long c);
-static void static_func_3  (int a, char *b, unsigned long c);
-static void static_func_4  (int a, char *b, unsigned long c);
-static void static_func_5  (int a, char *b, unsigned long c);
-static void static_func_6  (int a, char *b, unsigned long c);
-static void static_func_7  (int a, char *b, unsigned long c);
-static void static_func_8  (int a, char *b, unsigned long c);
-static void static_func_9  (int a, char *b, unsigned long c);
-static void static_func_10  (int a, char *b, unsigned long c);
-static void static_func_11  (int a, char *b, unsigned long c);
-static void static_func_12  (int a, char *b, unsigned long c);
-static void static_func_13  (int a, char *b, unsigned long c);
-static void static_func_14  (int a, char *b, unsigned long c);
-static void static_func_15  (int a, char *b, unsigned long c);
-
-void func_1  (int a, char *b, unsigned long c);
-void func_2  (int a, char *b, unsigned long c);
-void func_3  (int a, char *b, unsigned long c);
-void func_4  (int a, char *b, unsigned long c);
-void func_5  (int a, char *b, unsigned long c);
-void func_6  (int a, char *b, unsigned long c);
-void func_7  (int a, char *b, unsigned long c);
-void func_8  (int a, char *b, unsigned long c);
-void func_9  (int a, char *b, unsigned long c);
-void func_10  (int a, char *b, unsigned long c);
-void func_11  (int a, char *b, unsigned long c);
-void func_12  (int a, char *b, unsigned long c);
-void func_13  (int a, char *b, unsigned long c);
-void func_14  (int a, char *b, unsigned long c);
-void func_15  (int a, char *b, unsigned long c);
-
-int
-main (int argc, char *argv[])
-{
-  int a;
-  char *b;
-  unsigned long c;
-
-  a = 1;
-  b = "This is a string.";
-  c = 0xdeadL;
-
-  func_1 (a, b, c);
-
-  exit (0);
-}
-
-void
-func_1 (int a, char *b, unsigned long c)
-{
-  func_2 (a, b, c);
-}
-
-void
-func_2 (int a, char *b, unsigned long c)
-{
-  func_3 (a, b, c);
-}
-
-void
-func_3 (int a, char *b, unsigned long c)
-{
-  func_4 (a, b, c);
-}
-
-void
-func_4 (int a, char *b, unsigned long c)
-{
-  func_5 (a, b, c);
-}
-
-void
-func_5 (int a, char *b, unsigned long c)
-{
-  func_6 (a, b, c);
-}
-
-void
-func_6 (int a, char *b, unsigned long c)
-{
-  func_7 (a, b, c);
-}
-
-void
-func_7 (int a, char *b, unsigned long c)
-{
-  func_8 (a, b, c);
-}
-
-void
-func_8 (int a, char *b, unsigned long c)
-{
-  func_9 (a, b, c);
-}
-
-void
-func_9 (int a, char *b, unsigned long c)
-{
-  func_10 (a, b, c);
-}
-
-void
-func_10 (int a, char *b, unsigned long c)
-{
-  func_11 (a, b, c);
-}
-
-void
-func_11 (int a, char *b, unsigned long c)
-{
-  func_12 (a, b, c);
-}
-
-void
-func_12 (int a, char *b, unsigned long c)
-{
-  func_13 (a, b, c);
-}
-
-void
-func_13 (int a, char *b, unsigned long c)
-{
-  func_14 (a, b, c);
-}
-
-void
-func_14 (int a, char *b, unsigned long c)
-{
-  func_15 (a, b, c);
-}
-
-void
-func_15 (int a, char *b, unsigned long c)
-{
-  static_func_1 (a, b, c);
-}
-
-static void
-static_func_1 (int a, char *b, unsigned long c)
-{
-  static_func_2 (a, b, c);
-}
-
-static void
-static_func_2 (int a, char *b, unsigned long c)
-{
-  static_func_3 (a, b, c);
-}
-
-static void
-static_func_3 (int a, char *b, unsigned long c)
-{
-  static_func_4 (a, b, c);
-}
-
-static void
-static_func_4 (int a, char *b, unsigned long c)
-{
-  static_func_5 (a, b, c);
-}
-
-static void
-static_func_5 (int a, char *b, unsigned long c)
-{
-  static_func_6 (a, b, c);
-}
-
-static void
-static_func_6 (int a, char *b, unsigned long c)
-{
-  static_func_7 (a, b, c);
-}
-
-static void
-static_func_7 (int a, char *b, unsigned long c)
-{
-  static_func_8 (a, b, c);
-}
-
-static void
-static_func_8 (int a, char *b, unsigned long c)
-{
-  static_func_9 (a, b, c);
-}
-
-static void
-static_func_9 (int a, char *b, unsigned long c)
-{
-  static_func_10 (a, b, c);
-}
-
-static void
-static_func_10 (int a, char *b, unsigned long c)
-{
-  static_func_11 (a, b, c);
-}
-
-static void
-static_func_11 (int a, char *b, unsigned long c)
-{
-  static_func_12 (a, b, c);
-}
-
-static void
-static_func_12 (int a, char *b, unsigned long c)
-{
-  static_func_13 (a, b, c);
-}
-
-static void
-static_func_13 (int a, char *b, unsigned long c)
-{
-  static_func_14 (a, b, c);
-}
-
-static void
-static_func_14 (int a, char *b, unsigned long c)
-{
-  static_func_15 (a, b, c);
-}
-
-static void
-static_func_15 (int a, char *b, unsigned long c)
-{
-  extern_func1_1 (a, b, c);
-}
diff --git a/gdb/testsuite/gdb.gdbtk/stack2.c b/gdb/testsuite/gdb.gdbtk/stack2.c
deleted file mode 100644
index db47c469e6e..00000000000
--- a/gdb/testsuite/gdb.gdbtk/stack2.c
+++ /dev/null
@@ -1,107 +0,0 @@
-/* Functions defined in this file */
-void extern_func1_1 (int, char *, unsigned long);
-void extern_func1_2 (int, char *, unsigned long);
-void extern_func1_3 (int, char *, unsigned long);
-void extern_func1_4 (int, char *, unsigned long);
-void extern_func1_5 (int, char *, unsigned long);
-void extern_func1_6 (int, char *, unsigned long);
-void extern_func1_7 (int, char *, unsigned long);
-void extern_func1_8 (int, char *, unsigned long);
-void extern_func1_9 (int, char *, unsigned long);
-void extern_func1_10 (int, char *, unsigned long);
-void extern_func1_11 (int, char *, unsigned long);
-void extern_func1_12 (int, char *, unsigned long);
-void extern_func1_13 (int, char *, unsigned long);
-void extern_func1_14 (int, char *, unsigned long);
-void extern_func1_15 (int, char *, unsigned long);
-
-void
-extern_func1_1 (int a, char *b, unsigned long c)
-{
-  extern_func1_2 (a, b, c);
-}
-
-void
-extern_func1_2 (int a, char *b, unsigned long c)
-{
-  extern_func1_3 (a, b, c);
-}
-
-void
-extern_func1_3 (int a, char *b, unsigned long c)
-{
-  extern_func1_4 (a, b, c);
-}
-
-void
-extern_func1_4 (int a, char *b, unsigned long c)
-{
-  extern_func1_5 (a, b, c);
-}
-
-void
-extern_func1_5 (int a, char *b, unsigned long c)
-{
-  extern_func1_6 (a, b, c);
-}
-
-void
-extern_func1_6 (int a, char *b, unsigned long c)
-{
-  extern_func1_7 (a, b, c);
-}
-
-void
-extern_func1_7 (int a, char *b, unsigned long c)
-{
-  extern_func1_8 (a, b, c);
-}
-
-void
-extern_func1_8 (int a, char *b, unsigned long c)
-{
-  extern_func1_9 (a, b, c);
-}
-
-void
-extern_func1_9 (int a, char *b, unsigned long c)
-{
-  extern_func1_10 (a, b, c);
-}
-
-void
-extern_func1_10 (int a, char *b, unsigned long c)
-{
-  extern_func1_11 (a, b, c);
-}
-
-void
-extern_func1_11 (int a, char *b, unsigned long c)
-{
-  extern_func1_12 (a, b, c);
-}
-
-void
-extern_func1_12 (int a, char *b, unsigned long c)
-{
-  extern_func1_13 (a, b, c);
-}
-
-void
-extern_func1_13 (int a, char *b, unsigned long c)
-{
-  extern_func1_14 (a, b, c);
-}
-
-void
-extern_func1_14 (int a, char *b, unsigned long c)
-{
-  extern_func1_15 (a, b, c);
-}
-
-void
-extern_func1_15 (int a, char *b, unsigned long c)
-{
-  /* THE END */
-  return;
-}
diff --git a/gdb/testsuite/gdb.gdbtk/windows.exp b/gdb/testsuite/gdb.gdbtk/windows.exp
deleted file mode 100644
index 94b09a4d863..00000000000
--- a/gdb/testsuite/gdb.gdbtk/windows.exp
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 2001 Red Hat, Inc.
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License (GPL) 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.
-
-load_lib insight-support.exp
-
-if {[gdbtk_initialize_display]} {
-  if {$tracelevel} {
-    strace $tracelevel
-  }
-
-  #
-  # Basic window tests (basic as in, "do they open")
-  #
-  set prms_id 0
-  set bug_id 0
-
-  set srcfile [file join $srcdir $subdir c_variable.c]
-  set binfile [file join $objdir $subdir c_variable]
-  set r [gdb_compile $srcfile $binfile executable {debug}]
-  if  { $r != "" } {
-    gdb_suppress_entire_file \
-      "Testcase compile failed, so some tests in this file will automatically fail."
-  }
-
-  # Start with a fresh gdbtk
-  gdb_exit
-  set results [gdbtk_start [file join $srcdir $subdir windows.test]]
-  set results [split $results \n]
-
-  # Analyze results
-  gdbtk_done $results
-}
diff --git a/gdb/testsuite/gdb.gdbtk/windows.test b/gdb/testsuite/gdb.gdbtk/windows.test
deleted file mode 100644
index d8f72c549fe..00000000000
--- a/gdb/testsuite/gdb.gdbtk/windows.test
+++ /dev/null
@@ -1,131 +0,0 @@
-# Basic window tests
-# Copyright 2001, 2003 Red Hat, Inc.
-#
-# 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.
-
-# Please email any bugs, comments, and/or additions to this file to:
-# bug-gdb@prep.ai.mit.edu
-
-# This file was written by Keith Seitz (keiths@cygnus.com)
-
-# Read in the standard defs file
-if {![gdbtk_read_defs]} {
-  break
-}
-
-global objdir test_ran
-
-# Windows to test
-# FIXME: TfindArgs needs to be updated before it can go in the list...
-set windows [list BpWin BrowserWin Console DebugWin KodWin LocalsWin \
-	     MemWin ProcessWin RegWin StackWin TdumpWin WatchWin]
-
-# Dialogs to test
-# FIXME: ActionhDlg,TraceDlg cannot be independently opened
-set dialogs [list About AttachDlg GlobalPref SrcPref TargetSelection]
-
-# Helper proc to do all the testing
-proc do_open_close {num winlist} {
-  set i 1
-  foreach win $winlist {
-
-    # Test: windows-$num.*
-    # Desc: Open each window before running
-    set win_obj ""
-    gdbtk_test windows-$num.$i "open $win before running" {
-      set err [catch {ManagedWin::open $win} txt]
-      if {$err} {
-	# display error
-	set txt
-      } else {
-	# display "0"
-	set win_obj $txt
-	set err
-      }
-    } {0}
-
-    # Update screen
-    update idletasks
-
-    # Test: windows-{$num+1}.*
-    # Desc: Close each window before running
-    gdbtk_test windows-[expr {$num+1}].$i "close $win before running" {
-      set err [catch {delete object $win_obj} txt]
-      if {$err} {
-	# display error
-	set txt
-      } else {
-	# display "0"
-	set err
-      }
-    } {0}
-
-    # Update screen
-    update idletasks
-    incr i
-  }
-}
-
-#
-# Tests start here
-#
-
-# Counter for tests. Increment by 2 after each call to do_open_close.
-set num 1
-
-#
-# Check if all windows open with no file loaded
-#
-do_open_close $num $windows
-incr num 2
-
-# Sadly, there is no good way to unpost dialogs (except for setting
-# an after callback). Until something better comes along, skip them.
-# do_open_close $num $dialogs
-# incr num 2
-
-#
-# Check if all windows open with file loaded
-#
-
-# Load in a file
-set program [file join $objdir c_variable]
-if {[catch {gdbtk_test_file $program} t]} {
-  # This isn't a test case, since if this fails, we're hosed.
-  gdbtk_test_error "loading \"$program\": $t"
-}
-
-do_open_close $num $windows
-incr num 2
-#do_open_close $num $dialogs
-incr num 2
-
-#
-# Check if all windows open after running
-#
-
-# Break in main and run
-gdb_cmd "break main"
-gdbtk_test_run
-
-do_open_close $num $windows
-incr num 2
-#do_open_close $num $dialogs
-#incr num 2
-
-#
-#  Exit
-#
-gdbtk_test_done
diff --git a/sim/sh64/ChangeLog b/sim/sh64/ChangeLog
deleted file mode 100644
index 4ad87a57204..00000000000
--- a/sim/sh64/ChangeLog
+++ /dev/null
@@ -1,374 +0,0 @@
-Fri Feb 21 19:49:45 2003  J"orn Rennecke <joern.rennecke@superh.com>
-
-	* sem-media-switch.c, sem-media.c: Regenerate.
-
-2002-06-24  Richard Sandiford  <rsandifo@redhat.com>
-
-        * sh64.c: Update path of "callback.h".
-
-2002-06-20  Elena Zannoni  <ezannoni@redhat.com>
-
-        * sh64.c: Include correct file for register numbers.
-
-Fri May 17 14:27:41 2002  J"orn Rennecke <joern.rennecke@superh.com>
-
-	* sim-if.c (sh64_disassemble_insn): Use  print_insn_sh instead of
-	print_insn_shl.
-
-2001-07-05  Ben Elliston  <bje@redhat.com>
-
-	* Makefile.in (stamp-arch): Use $(CGEN_CPU_DIR).
-	(stamp-desc): Likewise.
-	(stamp-cpu): Likewise.
-	(stamp-defs-compact): Likewise.
-	(stamp-defs-media): Likewise.
-	(stamp-decode-compact): Likewise.
-	(stamp-decode-media): Likewise.
-
-2001-03-30  Ben Elliston  <bje@redhat.com>
-
-	* sim-if.c (sim_open): Set sh64_idesc_{media,compact} to NULL.
-	* sh64-sim.h (sh64_idesc_{compact,media}): Declare extern.
-	* sh64.c (sh64_idesc_{compact,media}): Make non-static.
-
-2001-01-30  Ben Elliston  <bje@redhat.com>
-
-	* sh64.c (SYS_argc, SYS_argn, SYS_argnlen): Define.
-	(trap_handler): Implement these syscalls.
-	(count_argc): New function.
-
-2001-01-24  Alexandre Oliva  <aoliva@redhat.com>
-
-	* sh64.c (trap_handler): Implement time.
-
-	* sh64.c (fetch_str): New function.
-	(trap_handler): Re-implement write, and implement lseek, read,
-	open and close.
-
-2001-01-18  Elena Zannoni  <ezannoni@kwikemart.cygnus.com>
-
-	* sh64.c (sh64_fetch_register): When fetching the PC, return the
- 	PC value and set the LSB according to the current ISA.
-
-2001-01-18  Ben Elliston  <bje@redhat.com>
-
-	* sh64.c (trap_handler): Use sim_engine_halt to indicate a program
-	has terminated, not exit!
-
-2001-01-12  Ben Elliston  <bje@redhat.com>
-
-	* sh64.c (sh64_fcnvds): Re-implement.
-
-	* sh64.c: Include "bfd.h".
-	(trap_handler): New function. Consolidate function bodies of
-	sh64_trapa and sh64_compact_trapa.
-	(sh64_trapa): Use it.
-	(sh64_compact_trapa): Likewise.
-
-2001-01-11  Ben Elliston  <bje@redhat.com>
-
-	* sem-media.c, sem-media-switch.c: Regenerate.
-	* sem-compact.c, sem-compact-switch.c: Likewise.
-
-	* sh64.c (sh64_trapa): Adhere to SH64 sys call conventions.
-
-	* cpu.h, sh-desc.c, sh-desc.h, sh-opc.h: Regenerate.
-	* decode-media.c, decode-media.h, defs-media.h: Likewise.
-	* sem-compact.c, sem-compact-switch.c: Likewise.
-	* sem-media.c, sem-media-switch.c: Likewise.
-
-2001-01-10  Ben Elliston  <bje@redhat.com>
-
-	* sim-main.h (CIA_SET): Encode the current instruction set mode
-	when setting the cia.
-
-2001-01-08  Ben Elliston  <bje@redhat.com>
-
-	* sh64.c (sh64_store_register): Do not set insn set mode--allow
-	sh64_h_pc_set() to do it.
-	(shmedia_init_cpu): Do not initialise the insn set mode--let the
-	loader set it based on bit 0 of the executable's starting address.
-	(shcompact_init_cpu): Likewise.
-	* mloop-compact.c (sh64_compact_pbb_begin): Emit a warning message
-	about malformed programs which have illegal insns in delay slots.
-	(sh64_compact_pbb_cti_chain): Examine the least significant bit of
-	the new pc, not the current instruction set mode to determine if
-	the next pbb in the chain will consist of SHmedia instructions.
-	* mloop-media.c (sh64_media_pbb_cti_chain): Likewise for SHcompact
-	switches. Set bit 0 when setting the pc for the next SHmedia pbb.
-
-	* cpu.c, cpu.h: Regenerate.
-	* sem-compact.c, sem-compact-switch.c: Likewise.
-	* sem-media.c, sem-media-switch.c: Likewise.
-
-	* sh64.c (sh64_compact_trapa): Use sim_io_write_{stdout,error}(),
-	not stdio functions to emit output when executing write traps.
-
-2001-01-07  Alexandre Oliva  <aoliva@redhat.com>
-
-	* sh64.c (sh64_compact_trapa): Support writing to stderr.  Flush
-	output stream after each (compound) write.
-
-2001-01-06  Ben Elliston  <bje@redhat.com>
-
-	* sem-media.c, sem-media-switch.c: Regenerate.
-
-2001-01-04  Ben Elliston  <bje@redhat.com>
-
-	* sem-compact.c, sem-compact-switch.c: Regenerate.
-	* cpu.h: Regenerate.
-
-2001-01-03  Ben Elliston  <bje@redhat.com>
-
-	* cpu.c, cpu.h: Regenerate.
-	* sem-media.c, sem-media-switch.c: Likewise.
-
-2001-01-02  Ben Elliston  <bje@redhat.com>
-
-	* sim-if.c (sh64_disassemble_insn): Set arch and mach fields using
-	BFD primitives.
-
-	* sem-compact.c, sem-compact-switch.c: Regenerate.
-
-2000-12-30  Alexandre Oliva  <aoliva@redhat.com>
-
-	* sh64.c (sh64_nsb): Re-implement correctly.
-
-2000-12-26  Alexandre Oliva  <aoliva@redhat.com>
-
-	* sh64.c (sh64_nsb): Re-implement.
-
-2000-12-27  Ben Elliston  <bje@redhat.com>
-
-	* cpu.c, cpu.h: Regenerate.
-	* sem-compact.c, sem-compact-switch.c: Likewise.
-	* sem-media.c, sem-media-switch.c: Likewise.
-	* sh-desc.c: Likewise.
-
-2000-12-26  Ben Elliston  <bje@redhat.com>
-
-	* mloop-compact.in, mloop-media.in: Remove.
-	* mloop-compact.c, mloop-media.c: New files.
-	* eng-compact.c, eng-media.c: Likewise.
-	* Makefile.in (mloop-compact.c): Remove target.
-	(stamp-mloop-compact): Likewise.
-	(mloop-media.c): Likewise.
-	(stamp-mloop-media): Likewise.
-	(sh64-clean): Update.
-	(stamp-mloop): Remove.
-
-2000-12-23  Ben Elliston  <bje@redhat.com>
-
-	* sh64.c (sh64_prepare_run): Rename from shmedia_prepare_run.
-	(shcompact_prepare_run): Remove.
-	(sh2_mach, sh3_mach, sh3e_mach, sh4_mach, sh5_mach): Update.
-
-2000-12-22  Ben Elliston  <bje@redhat.com>
-
-	* sh64.c (sh64_idesc_media, sh64_idesc_compact): New variables.
-	(sh64_dump): Remove.
-	(sh64_engine_run_full): Only compute idesc tables once.
-	(sh64_engine_run_fast): Likewise.
-	(shmedia_prepare_run): Do nothing.
-	(shcompact_prepare_run): Likewise.
-
-	* sem-compact.c, sem-compact-switch.c: Regenerate.
-	* sem-media.c, sem-media-switch.c: Likewise.
-
-2000-12-19  Ben Elliston  <bje@redhat.com>
-
-	* sem-media.c, sem-media-switch.c: Regenerate.
-
-2000-12-15  Ben Elliston  <bje@redhat.com>
-
-	* sh64.c (sh64_store_register): When storing a new PC, set ISA
-	mode based on the value of bit 0.
-
-	* sh64.c: Include "sim-sh64.h" for GDB interfacing.
-	(sh64_fetch_register): Implement.
-	(sh64_store_register): Likewise.
-
-	* sh64-sim.h (sh64_fmacs): Declare.
-	(sh64_ftrcdl, sh64_ftrcdq, sh64_ftrcsl): Likewise.
-
-	* sem-media.c, sem-media-switch.c: Regenerate.
-
-2000-12-13  Ben Elliston  <bje@redhat.com>
-
-	* sh64-sim.h (sh64_compact_trapa): Renamed from sh64_trapa.
-	(sh64_trapa): Renamed from sh64_trap.
-	* sh64.c (sh64_trapa): Call sh64_compact_trapa for handling.
-	Apply renaming described above.
-
-	* decode-media.c, decode-media.h, defs-media.h: Regenerate.
-	* sem-media.c sem-media-switch.c: Likewise.
-	* sh-desc.c, sh-desc.h, sh-opc.h: Likewise.
-
-2000-12-12  Ben Elliston  <bje@redhat.com>
-
-	* cpu.c, cpu.h, sh-desc.c: Regenerate.
-	* sem-media.c, sem-media-switch.c: Likewise.
-	* sem-compact.c, sem-compact-switch.c: Likewise.
-	* sh64-sim.h (sh64_ftrvs): Declare.
-	* sh64.c (sh64_ftrvs): Bug fixes.
-
-	* sh64.c (sh64_fcmpgtd): Fix order of arguments to sim_fpu_is_gt.
-	(sh64_fcmpgts): Likewise.
-
-2000-12-11  Ben Elliston  <bje@redhat.com>
-
-	* decode-media.c, decode-media.h: Regenerate.
-	* defs-media.h: Likewise.
-	* sem-media.c, sem-media-switch.c: Likewise.
-	* sh-desc.c: Likewise.
-
-2000-12-08  Ben Elliston  <bje@redhat.com>
-
-	* decode-media.c, decode-media.h: Regenerate.
-	* defs-media.h: Likewise.
-	* sem-media.c, sem-media-switch.c: Likewise.
-
-2000-12-07  Ben Elliston  <bje@redhat.com>
-
-	* decode-media.c, decode-media.h: Regenerate.
-	* sem-media.c, sem-media-switch.c: Likewise.
-
-	* defs-media.h: Regenete.
-	* decode-compact.c, decode-media.c: Likewise.
-
-2000-12-06  Ben Elliston  <bje@redhat.com>
-
-	* sh64.c (sh64_fcmpund): Return a BI.
-	(sh64_fcmpuns): Likewise.
-	(sh64_nsb): Treat source value as unsigned.
-	(sh64_compact_model_insn_before): New function.
-	(sh64_media_model_insn_before): Likewise.
-	(sh64_compact_model_insn_after): Likewise.
-	(sh64_media_model_insn_after): Likewise.
-	(sh_models): Use sh5_mach for "sh5".
-	* sh64-sim.h: Add missing function prototypes.
-
-	* cpu.c, cpu.h, defs-media.h, sh-desc.c: Regenerate.
-	* decode-media.c, decode-media.h: Likewise.
-	* sem-media.c, sem-media-switch.c: Likewise.
-
-2000-12-05  Ben Elliston  <bje@redhat.com>
-
-	* mloop-compact.in, mloop-media.in: Use @prefix@.
-	* Makefile.in (stamp-mloop-compact): Pass -outfile-suffix option
-	to make generated files safe in the presence of parallel makes.
-	(stamp-mloop-media): Likewise.
-
-	* decode-media.c, defs-media.h: Regenerate.
-
-2000-12-04  Ben Elliston  <bje@redhat.com>
-
-	* sh64-sim.h: Add function prototypes from sh64.c.
-
-	* Makefile.in (SH64_OBJS): Add ISA variant objects.
-	(SIM_EXTRA_DEPS): Do not depend on opcodes headers.
-	(SH64_INCLUDE_DEPS): Update for ISA variants.
-	(stamp-mloop-compact, stamp-mloop-media): New targets.
-	(decode-compact.o, sem-compact.o): New rules.
-	(decode-media.o, sem-media.o): Likewise.
-	(sh64-clean): Update.
-	(stamp-all, stamp-mloop, stamp-decode, stamp-defs): New targets.
-	(stamp-desc, stamp-cpu): Likewise.
-	(stamp-defs-compact, stamp-defs-media): Likewise.
-	(stamp-decode-compact, stamp-decode-media): Likewise.	
-
-	* defs-compact.h, defs-media.h: Regenerate.
-
-2000-12-03  Ben Elliston  <bje@redhat.com>
-
-	* sh64-sim.h (sh64_fcmpeqd, sh64_fcmpeqs): Declare.
-	(sh64_fcmpged, sh64_fcmpges): Likewise.
-	(sh64_fcmpgtd, sh64_fcmpgts): Likewise.
-
-	* sh64.c (sh64_endian): New function.
-	(sh64_fcmpeqd, sh64_fcmpeqs): Return a BI.
-	(sh64_fcmpged, sh64_fcmpges): Likewise.
-	(sh64_fcmpgtd, sh64_fcmpgts): Likewise.
-	(sh64_trap): Implement a basic syscall facility.
-	(sh64_trapa): Exit with return code in R5, not 0.
-	(sh64_model_sh5_u_exec): Remove.
-	(sh64_engine_run_full): New function.
-	(sh64_engine_run_fast): Likewise.
-	(shmedia_prepare_run): Likewise.
-	(shcompact_prepare_run): Likewise.
-	(sh64_get_idata): Likewise.
-	(sh64_init_cpu): Likewise.
-	(shmedia_init_cpu): Likewise.
-	(shcompact_init_cpu): Likewise.
-	(sh64_model_init): Likewise.
-	(sh_models): Define.
-	(sh5_imp_properties): Likewise.
-	(sh2_mach, sh3_mach, sh4_mach, sh5_mach): Define.
-
-	* sem-compact.c, sem-compact-switch.c: Regenerate.
-
-2000-12-01  Ben Elliston  <bje@redhat.com>
-
-	* sh64-sim.h (sh64_endian): Declare.
-	* sim-main.h (sim_cia): Use UDI, not USI.
-	(WITH_PROFILE_MODEL_P): Remove.
-	* sim-if.c (sim_sh64_disassemble_insn): Remove.
-	(sh64_disassemble_insn): New function.
-	(sim_open): Use as this CPU's disassembler.
-	* eng.h: New file.
-	* decode.h (WITH_PROFILE_MODEL_P): Undefine.
-
-	* decode-compact.c, decode-media.c: Regenerate.
-	* defs-compact.h, defs-media.h: Likewise.
-	* sem-compact.c, sem-compact-switch.c: Likewise.
-	* sh-desc.c, sh-desc.h: Likewise.
-	* cpu.c, cpu.h, cpuall.h: Likewise.
-
-2000-11-30  Ben Elliston  <bje@redhat.com>
-
-	* arch.c, sh-desc.c, sh-desc.h: Regenerate.
-
-	* tconfig.in (SIM_HAVE_BIENDIAN): Define.
-	* configure.in (SIM_AC_OPTION_BIGENDIAN): Do not hard-wire a
-	target byte order, but default to big endian.
-	* configure: Regenerate.
-
-2000-11-27  Ben Elliston  <bje@redhat.com>
-
-	* sim-main.h (WITH_PROFILE_MODEL_P): Define.
-	* sh64-sim.h (ISM_COMPACT, ISM_MEDIA): New enums.
-
-	* sh-desc.c, sh-desc.h: Regenerate.
-	* arch.c, cpu.h, cpuall.h: Regenerate.
-	* decode.h (WITH_PROFILE_MODEL_P): Remove.
-
-	* mloop-compact.in, mloop-media.in: New files.
-	* decode.h: Likewise.
-
-2000-11-26  Ben Elliston  <bje@redhat.com>
-
-	* sem-compact.c, sem-compact-switch.c: Generate.
-	* sem-media.c, sem-media-switch.c: Likewise.
-
-2000-11-25  Ben Elliston  <bje@redhat.com>
-
-	* sh-desc.c, sh-desc.h, sh-opc.h: Generate.
-
-	* arch.c, arch.h, cpuall.h, cpu.c, cpu.h: Generate.
-	* decode-compact.c, decode-compact.h: Likewise.
-	* decode-media.c, decode-media.h: Likewise.
-	* sh64-sim.h: New file.
-	* sim-main.h: Likewise.
-
-2000-11-22  Ben Elliston  <bje@redhat.com>
-
-	* sim-if.c: New file.
-	* sh64.c: Likewise.
-
-2000-11-16  Ben Elliston  <bje@redhat.com>
-
-	* config.in: New file.
-	* tconfig.in: Likewise.
-	* configure.in: Likewise.
-	* configure: Generate.
-	* Makefile.in: New file.
diff --git a/sim/sh64/Makefile.in b/sim/sh64/Makefile.in
deleted file mode 100644
index b8cfb82c585..00000000000
--- a/sim/sh64/Makefile.in
+++ /dev/null
@@ -1,153 +0,0 @@
-# Makefile template for Configure for the SH64 simulator
-# Copyright (C) 2000 Free Software Foundation, Inc.
-# Contributed by Red Hat, Inc.
-#
-# 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.
-
-## COMMON_PRE_CONFIG_FRAG
-
-SH64_OBJS = sh64.o cpu.o sh-desc.o \
-	decode-compact.o sem-compact.o mloop-compact.o \
-	decode-media.o sem-media.o mloop-media.o
-
-CONFIG_DEVICES = dv-sockser.o
-CONFIG_DEVICES =
-
-SIM_OBJS = \
-	$(SIM_NEW_COMMON_OBJS) \
-	sim-cpu.o \
-	sim-hload.o \
-	sim-hrw.o \
-	sim-model.o \
-	sim-reg.o \
-	cgen-utils.o cgen-trace.o cgen-scache.o \
-	cgen-run.o sim-reason.o sim-engine.o sim-stop.o \
-	sim-if.o arch.o \
-	$(SH64_OBJS) \
-	$(CONFIG_DEVICES)
-
-# Extra headers included by sim-main.h.
-SIM_EXTRA_DEPS = \
-	$(CGEN_INCLUDE_DEPS) \
-	arch.h cpuall.h sh64-sim.h
-
-SIM_EXTRA_CFLAGS =
-
-SIM_RUN_OBJS = nrun.o
-SIM_EXTRA_CLEAN = sh64-clean
-
-## COMMON_POST_CONFIG_FRAG
-
-arch = sh
-
-sim-if.o: sim-if.c $(SIM_MAIN_DEPS) $(srcdir)/../common/sim-core.h
-
-arch.o: arch.c $(SIM_MAIN_DEPS)
-
-devices.o: devices.c $(SIM_MAIN_DEPS)
-
-# SH64 objs
-
-SH64_INCLUDE_DEPS = \
-	$(CGEN_MAIN_CPU_DEPS) \
-	cpu.h decode.h \
-	decode-compact.h eng-compact.h defs-compact.h \
-	decode-media.h eng-media.h defs-media.h
-
-sh64.o: sh64.c $(SH64_INCLUDE_DEPS)
-
-mloop-compact.o: mloop-compact.c sem-compact-switch.c $(SH64_INCLUDE_DEPS)
-	$(CC) -c $(srcdir)/mloop-compact.c $(ALL_CFLAGS) -DWANT_ISA_COMPACT
-
-mloop-media.o: mloop-media.c sem-media-switch.c $(SH64_INCLUDE_DEPS)
-	$(CC) -c $(srcdir)/mloop-media.c $(ALL_CFLAGS) -DWANT_ISA_MEDIA
-
-cpu.o: cpu.c $(SH64_INCLUDE_DEPS)
-
-decode-compact.o: decode-compact.c $(SH64_INCLUDE_DEPS)
-	$(CC) -c $(srcdir)/decode-compact.c $(ALL_CFLAGS) -DWANT_ISA_COMPACT
-
-sem-compact.o: sem-compact.c $(SH64_INCLUDE_DEPS)
-	$(CC) -c $(srcdir)/sem-compact.c $(ALL_CFLAGS) -DWANT_ISA_COMPACT
-
-decode-media.o: decode-media.c $(SH64_INCLUDE_DEPS)
-	$(CC) -c $(srcdir)/decode-media.c $(ALL_CFLAGS) -DWANT_ISA_MEDIA
-
-sem-media.o: sem-media.c $(SH64_INCLUDE_DEPS)
-	$(CC) -c $(srcdir)/sem-media.c $(ALL_CFLAGS) -DWANT_ISA_MEDIA
-
-sh64-clean:
-	rm -f tmp-*
-	rm -f stamp-defs-{compact,media}
-	rm -f stamp-arch stamp-desc stamp-cpu stamp-decode-{compact,media}
-
-# cgen support, enable with --enable-cgen-maint
-CGEN_MAINT = ; @true
-# The following line is commented in or out depending upon --enable-cgen-maint.
-@CGEN_MAINT@CGEN_MAINT =
-
-.PHONY: stamp-all stamp-decode stamp-defs
-
-stamp-all: stamp-arch stamp-desc stamp-cpu stamp-decode stamp-defs
-stamp-decode: stamp-decode-compact stamp-decode-media
-stamp-defs: stamp-defs-compact stamp-defs-media
-
-stamp-arch: $(CGEN_READ_SCM) $(CGEN_ARCH_SCM) $(CGEN_CPU_DIR)/sh.cpu $(CGEN_CPU_DIR)/sh.opc $(CGEN_CPU_DIR)/sh64-media.cpu $(CGEN_CPU_DIR)/sh64-compact.cpu Makefile
-	$(MAKE) cgen-arch $(CGEN_FLAGS_TO_PASS) mach=all isa=compact,media \
-	  FLAGS="with-scache"
-	touch $@
-arch.h arch.c cpuall.h: $(CGEN_MAINT) stamp-arch
-	@true
-
-stamp-desc: $(CGEN_READ_SCM) $(CGEN_CPU_SCM) $(CGEN_CPU_DIR)/sh.cpu $(CGEN_CPU_DIR)/sh.opc $(CGEN_CPU_DIR)/sh64-compact.cpu $(CGEN_CPU_DIR)/sh64-media.cpu Makefile
-	$(MAKE) cgen-desc $(CGEN_FLAGS_TO_PASS) cpu=sh64 mach=all isa=compact,media
-	touch $@
-desc.h: $(CGEN_MAINT) stamp-desc
-	@true
-
-stamp-cpu: $(CGEN_READ_SCM) $(CGEN_CPU_SCM) $(CGEN_CPU_DIR)/sh.cpu $(CGEN_CPU_DIR)/sh.opc $(CGEN_CPU_DIR)/sh64-compact.cpu $(CGEN_CPU_DIR)/sh64-media.cpu Makefile
-	$(MAKE) cgen-cpu $(CGEN_FLAGS_TO_PASS) \
-	  cpu=sh64 mach=sh4,sh5 isa=compact,media FLAGS="with-multiple-isa with-scache"
-	rm -f $(srcdir)/model.c
-	touch $@
-cpu.h: $(CGEN_MAINT) stamp-cpu
-	@true
-
-stamp-defs-compact: $(CGEN_READ_SCM) $(CGEN_CPU_SCM) $(CGEN_CPU_DIR)/sh.cpu $(CGEN_CPU_DIR)/sh.opc $(CGEN_CPU_DIR)/sh64-compact.cpu Makefile
-	$(MAKE) cgen-defs $(CGEN_FLAGS_TO_PASS) \
-	  cpu=sh64 mach=sh5 isa=compact FLAGS="with-scache" SUFFIX="-compact"
-	touch $@
-defs-compact.h: $(CGEN_MAINT) stamp-defs-compact
-	@true
-
-stamp-defs-media: $(CGEN_READ_SCM) $(CGEN_CPU_SCM) $(CGEN_CPU_DIR)/sh.cpu $(CGEN_CPU_DIR)/sh.opc $(CGEN_CPU_DIR)/sh64-media.cpu Makefile
-	$(MAKE) cgen-defs $(CGEN_FLAGS_TO_PASS) \
-	  cpu=sh64 mach=sh5 isa=media FLAGS="with-scache" SUFFIX="-media"
-	touch $@
-defs-media.h: $(CGEN_MAINT) stamp-defs-media
-
-stamp-decode-compact: $(CGEN_READ_SCM) $(CGEN_CPU_SCM) $(CGEN_DECODE_SCM) $(CGEN_CPU_DIR)/sh.cpu $(CGEN_CPU_DIR)/sh.opc $(CGEN_CPU_DIR)/sh64-compact.cpu Makefile
-	$(MAKE) cgen-decode $(CGEN_FLAGS_TO_PASS) \
-	  cpu=sh64 mach=sh5 isa=compact FLAGS="with-scache" SUFFIX="-compact" EXTRAFILES="$(CGEN_CPU_SEM) $(CGEN_CPU_SEMSW)"
-	touch $@
-sem-compact.c sem-compact-switch.c decode-compact.c decode-compact.h: $(CGEN_MAINT) stamp-compact
-	@true
-
-stamp-decode-media: $(CGEN_READ_SCM) $(CGEN_CPU_SCM) $(CGEN_DECODE_SCM) $(CGEN_CPU_DIR)/sh.cpu $(CGEN_CPU_DIR)/sh.opc $(CGEN_CPU_DIR)/sh64-media.cpu Makefile
-	$(MAKE) cgen-decode $(CGEN_FLAGS_TO_PASS) \
-	  cpu=sh64 mach=sh5 isa=media FLAGS="with-scache" SUFFIX="-media" EXTRAFILES="$(CGEN_CPU_SEM) $(CGEN_CPU_SEMSW)"
-	touch $@
-sem-media.c sem-media-switch.c decode-media.c decode-media.h: $(CGEN_MAINT) stamp-media
-	@true
diff --git a/sim/sh64/arch.c b/sim/sh64/arch.c
deleted file mode 100644
index c1e8c772583..00000000000
--- a/sim/sh64/arch.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/* Simulator support for sh.
-
-THIS FILE IS MACHINE GENERATED WITH CGEN.
-
-Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
-
-This file is part of the GNU Simulators.
-
-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, 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.
-
-*/
-
-#include "sim-main.h"
-#include "bfd.h"
-
-const MACH *sim_machs[] =
-{
-#ifdef HAVE_CPU_SH64
-  & sh2_mach,
-#endif
-#ifdef HAVE_CPU_SH64
-  & sh3_mach,
-#endif
-#ifdef HAVE_CPU_SH64
-  & sh3e_mach,
-#endif
-#ifdef HAVE_CPU_SH64
-  & sh4_mach,
-#endif
-#ifdef HAVE_CPU_SH64
-  & sh5_mach,
-#endif
-  0
-};
-
diff --git a/sim/sh64/arch.h b/sim/sh64/arch.h
deleted file mode 100644
index 30820a061a9..00000000000
--- a/sim/sh64/arch.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* Simulator header for sh.
-
-THIS FILE IS MACHINE GENERATED WITH CGEN.
-
-Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
-
-This file is part of the GNU Simulators.
-
-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, 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.
-
-*/
-
-#ifndef SH_ARCH_H
-#define SH_ARCH_H
-
-#define TARGET_BIG_ENDIAN 1
-
-/* Enum declaration for model types.  */
-typedef enum model_type {
-  MODEL_SH5, MODEL_MAX
-} MODEL_TYPE;
-
-#define MAX_MODELS ((int) MODEL_MAX)
-
-/* Enum declaration for unit types.  */
-typedef enum unit_type {
-  UNIT_NONE, UNIT_SH5_U_EXEC, UNIT_MAX
-} UNIT_TYPE;
-
-#define MAX_UNITS (1)
-
-#endif /* SH_ARCH_H */
diff --git a/sim/sh64/config.in b/sim/sh64/config.in
deleted file mode 100644
index 6ce594d7c90..00000000000
--- a/sim/sh64/config.in
+++ /dev/null
@@ -1,177 +0,0 @@
-/* config.in.  Generated automatically from configure.in by autoheader.  */
-
-/* Define if using alloca.c.  */
-#undef C_ALLOCA
-
-/* Define to empty if the keyword does not work.  */
-#undef const
-
-/* Define to one of _getb67, GETB67, getb67 for Cray-2 and Cray-YMP systems.
-   This function is required for alloca.c support on those systems.  */
-#undef CRAY_STACKSEG_END
-
-/* Define if you have alloca, as a function or macro.  */
-#undef HAVE_ALLOCA
-
-/* Define if you have <alloca.h> and it should be used (not on Ultrix).  */
-#undef HAVE_ALLOCA_H
-
-/* Define if you have a working `mmap' system call.  */
-#undef HAVE_MMAP
-
-/* Define as __inline if that's what the C compiler calls it.  */
-#undef inline
-
-/* Define to `long' if <sys/types.h> doesn't define.  */
-#undef off_t
-
-/* Define if you need to in order for stat and other things to work.  */
-#undef _POSIX_SOURCE
-
-/* Define as the return type of signal handlers (int or void).  */
-#undef RETSIGTYPE
-
-/* Define to `unsigned' if <sys/types.h> doesn't define.  */
-#undef size_t
-
-/* If using the C implementation of alloca, define if you know the
-   direction of stack growth for your system; otherwise it will be
-   automatically deduced at run-time.
- STACK_DIRECTION > 0 => grows toward higher addresses
- STACK_DIRECTION < 0 => grows toward lower addresses
- STACK_DIRECTION = 0 => direction of growth unknown
- */
-#undef STACK_DIRECTION
-
-/* Define if you have the ANSI C header files.  */
-#undef STDC_HEADERS
-
-/* Define if your processor stores words with the most significant
-   byte first (like Motorola and SPARC, unlike Intel and VAX).  */
-#undef WORDS_BIGENDIAN
-
-/* Define to 1 if NLS is requested.  */
-#undef ENABLE_NLS
-
-/* Define as 1 if you have gettext and don't want to use GNU gettext.  */
-#undef HAVE_GETTEXT
-
-/* Define as 1 if you have the stpcpy function.  */
-#undef HAVE_STPCPY
-
-/* Define if your locale.h file contains LC_MESSAGES.  */
-#undef HAVE_LC_MESSAGES
-
-/* Define if you have the __argz_count function.  */
-#undef HAVE___ARGZ_COUNT
-
-/* Define if you have the __argz_next function.  */
-#undef HAVE___ARGZ_NEXT
-
-/* Define if you have the __argz_stringify function.  */
-#undef HAVE___ARGZ_STRINGIFY
-
-/* Define if you have the __setfpucw function.  */
-#undef HAVE___SETFPUCW
-
-/* Define if you have the dcgettext function.  */
-#undef HAVE_DCGETTEXT
-
-/* Define if you have the getcwd function.  */
-#undef HAVE_GETCWD
-
-/* Define if you have the getpagesize function.  */
-#undef HAVE_GETPAGESIZE
-
-/* Define if you have the getrusage function.  */
-#undef HAVE_GETRUSAGE
-
-/* Define if you have the munmap function.  */
-#undef HAVE_MUNMAP
-
-/* Define if you have the putenv function.  */
-#undef HAVE_PUTENV
-
-/* Define if you have the setenv function.  */
-#undef HAVE_SETENV
-
-/* Define if you have the setlocale function.  */
-#undef HAVE_SETLOCALE
-
-/* Define if you have the sigaction function.  */
-#undef HAVE_SIGACTION
-
-/* Define if you have the stpcpy function.  */
-#undef HAVE_STPCPY
-
-/* Define if you have the strcasecmp function.  */
-#undef HAVE_STRCASECMP
-
-/* Define if you have the strchr function.  */
-#undef HAVE_STRCHR
-
-/* Define if you have the time function.  */
-#undef HAVE_TIME
-
-/* Define if you have the <argz.h> header file.  */
-#undef HAVE_ARGZ_H
-
-/* Define if you have the <dlfcn.h> header file.  */
-#undef HAVE_DLFCN_H
-
-/* Define if you have the <errno.h> header file.  */
-#undef HAVE_ERRNO_H
-
-/* Define if you have the <fcntl.h> header file.  */
-#undef HAVE_FCNTL_H
-
-/* Define if you have the <fpu_control.h> header file.  */
-#undef HAVE_FPU_CONTROL_H
-
-/* Define if you have the <limits.h> header file.  */
-#undef HAVE_LIMITS_H
-
-/* Define if you have the <locale.h> header file.  */
-#undef HAVE_LOCALE_H
-
-/* Define if you have the <malloc.h> header file.  */
-#undef HAVE_MALLOC_H
-
-/* Define if you have the <nl_types.h> header file.  */
-#undef HAVE_NL_TYPES_H
-
-/* Define if you have the <stdlib.h> header file.  */
-#undef HAVE_STDLIB_H
-
-/* Define if you have the <string.h> header file.  */
-#undef HAVE_STRING_H
-
-/* Define if you have the <strings.h> header file.  */
-#undef HAVE_STRINGS_H
-
-/* Define if you have the <sys/param.h> header file.  */
-#undef HAVE_SYS_PARAM_H
-
-/* Define if you have the <sys/resource.h> header file.  */
-#undef HAVE_SYS_RESOURCE_H
-
-/* Define if you have the <sys/stat.h> header file.  */
-#undef HAVE_SYS_STAT_H
-
-/* Define if you have the <sys/time.h> header file.  */
-#undef HAVE_SYS_TIME_H
-
-/* Define if you have the <time.h> header file.  */
-#undef HAVE_TIME_H
-
-/* Define if you have the <unistd.h> header file.  */
-#undef HAVE_UNISTD_H
-
-/* Define if you have the <values.h> header file.  */
-#undef HAVE_VALUES_H
-
-/* Define if you have the nsl library (-lnsl).  */
-#undef HAVE_LIBNSL
-
-/* Define if you have the socket library (-lsocket).  */
-#undef HAVE_LIBSOCKET
diff --git a/sim/sh64/configure b/sim/sh64/configure
deleted file mode 100755
index 240cf755ba9..00000000000
--- a/sim/sh64/configure
+++ /dev/null
@@ -1,4340 +0,0 @@
-#! /bin/sh
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-sim_inline="-DDEFAULT_INLINE=0"
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-# This file is derived from `gettext.m4'.  The difference is that the
-# included macros assume Cygnus-style source and build trees.
-
-# Macro to add for using GNU gettext.
-# Ulrich Drepper <drepper@cygnus.com>, 1995.
-#
-# This file file be copied and used freely without restrictions.  It can
-# be used in projects which are not available under the GNU Public License
-# but which still want to provide support for the GNU gettext functionality.
-# Please note that the actual code is *not* freely available.
-
-# serial 3
-
-
-
-
-
-# Search path for a program which passes the given test.
-# Ulrich Drepper <drepper@cygnus.com>, 1996.
-#
-# This file file be copied and used freely without restrictions.  It can
-# be used in projects which are not available under the GNU Public License
-# but which still want to provide support for the GNU gettext functionality.
-# Please note that the actual code is *not* freely available.
-
-# serial 1
-
-
-
-# Check whether LC_MESSAGES is available in <locale.h>.
-# Ulrich Drepper <drepper@cygnus.com>, 1995.
-#
-# This file file be copied and used freely without restrictions.  It can
-# be used in projects which are not available under the GNU Public License
-# but which still want to provide support for the GNU gettext functionality.
-# Please note that the actual code is *not* freely available.
-
-# serial 1
-
-
-
-
-
-
-# Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.13 
-# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
-#
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-
-# Defaults:
-ac_help=
-ac_default_prefix=/usr/local
-# Any additions from configure.in:
-ac_help="$ac_help
-  --disable-nls           do not use Native Language Support"
-ac_help="$ac_help
-  --with-included-gettext use the GNU gettext library included here"
-ac_help="$ac_help
-  --enable-maintainer-mode		Enable developer functionality."
-ac_help="$ac_help
-  --enable-sim-bswap			Use Host specific BSWAP instruction."
-ac_help="$ac_help
-  --enable-sim-cflags=opts		Extra CFLAGS for use in building simulator"
-ac_help="$ac_help
-  --enable-sim-debug=opts		Enable debugging flags"
-ac_help="$ac_help
-  --enable-sim-stdio			Specify whether to use stdio for console input/output."
-ac_help="$ac_help
-  --enable-sim-trace=opts		Enable tracing flags"
-ac_help="$ac_help
-  --enable-sim-profile=opts		Enable profiling flags"
-ac_help="$ac_help
-  --enable-sim-endian=endian		Specify target byte endian orientation."
-ac_help="$ac_help
-  --enable-sim-alignment=align		Specify strict,  nonstrict or forced alignment of memory accesses."
-ac_help="$ac_help
-  --enable-sim-hostendian=end		Specify host byte endian orientation."
-ac_help="$ac_help
-  --enable-sim-scache=size		Specify simulator execution cache size."
-ac_help="$ac_help
-  --enable-sim-default-model=model	Specify default model to simulate."
-ac_help="$ac_help
-  --enable-sim-environment=environment	Specify mixed, user, virtual or operating environment."
-ac_help="$ac_help
-  --enable-sim-inline=inlines		Specify which functions should be inlined."
-ac_help="$ac_help
-  --enable-cgen-maint[=DIR]    build cgen generated files"
-
-# Initialize some variables set by options.
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-build=NONE
-cache_file=./config.cache
-exec_prefix=NONE
-host=NONE
-no_create=
-nonopt=NONE
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-sitefile=
-srcdir=
-target=NONE
-verbose=
-x_includes=NONE
-x_libraries=NONE
-bindir='${exec_prefix}/bin'
-sbindir='${exec_prefix}/sbin'
-libexecdir='${exec_prefix}/libexec'
-datadir='${prefix}/share'
-sysconfdir='${prefix}/etc'
-sharedstatedir='${prefix}/com'
-localstatedir='${prefix}/var'
-libdir='${exec_prefix}/lib'
-includedir='${prefix}/include'
-oldincludedir='/usr/include'
-infodir='${prefix}/info'
-mandir='${prefix}/man'
-
-# Initialize some other variables.
-subdirs=
-MFLAGS= MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
-# Maximum number of lines to put in a shell here document.
-ac_max_here_lines=12
-
-ac_prev=
-for ac_option
-do
-
-  # If the previous option needs an argument, assign it.
-  if test -n "$ac_prev"; then
-    eval "$ac_prev=\$ac_option"
-    ac_prev=
-    continue
-  fi
-
-  case "$ac_option" in
-  -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-  *) ac_optarg= ;;
-  esac
-
-  # Accept the important Cygnus configure options, so we can diagnose typos.
-
-  case "$ac_option" in
-
-  -bindir | --bindir | --bindi | --bind | --bin | --bi)
-    ac_prev=bindir ;;
-  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-    bindir="$ac_optarg" ;;
-
-  -build | --build | --buil | --bui | --bu)
-    ac_prev=build ;;
-  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build="$ac_optarg" ;;
-
-  -cache-file | --cache-file | --cache-fil | --cache-fi \
-  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-    ac_prev=cache_file ;;
-  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-    cache_file="$ac_optarg" ;;
-
-  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
-    ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
-  | --da=*)
-    datadir="$ac_optarg" ;;
-
-  -disable-* | --disable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*disable-//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    eval "enable_${ac_feature}=no" ;;
-
-  -enable-* | --enable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=*) ;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "enable_${ac_feature}='$ac_optarg'" ;;
-
-  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-  | --exec | --exe | --ex)
-    ac_prev=exec_prefix ;;
-  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
-  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
-  | --exec=* | --exe=* | --ex=*)
-    exec_prefix="$ac_optarg" ;;
-
-  -gas | --gas | --ga | --g)
-    # Obsolete; use --with-gas.
-    with_gas=yes ;;
-
-  -help | --help | --hel | --he)
-    # Omit some internal or obsolete options to make the list less imposing.
-    # This message is too long to be a string in the A/UX 3.1 sh.
-    cat << EOF
-Usage: configure [options] [host]
-Options: [defaults in brackets after descriptions]
-Configuration:
-  --cache-file=FILE       cache test results in FILE
-  --help                  print this message
-  --no-create             do not create output files
-  --quiet, --silent       do not print \`checking...' messages
-  --site-file=FILE        use FILE as the site file
-  --version               print the version of autoconf that created configure
-Directory and file names:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-                          [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-                          [same as prefix]
-  --bindir=DIR            user executables in DIR [EPREFIX/bin]
-  --sbindir=DIR           system admin executables in DIR [EPREFIX/sbin]
-  --libexecdir=DIR        program executables in DIR [EPREFIX/libexec]
-  --datadir=DIR           read-only architecture-independent data in DIR
-                          [PREFIX/share]
-  --sysconfdir=DIR        read-only single-machine data in DIR [PREFIX/etc]
-  --sharedstatedir=DIR    modifiable architecture-independent data in DIR
-                          [PREFIX/com]
-  --localstatedir=DIR     modifiable single-machine data in DIR [PREFIX/var]
-  --libdir=DIR            object code libraries in DIR [EPREFIX/lib]
-  --includedir=DIR        C header files in DIR [PREFIX/include]
-  --oldincludedir=DIR     C header files for non-gcc in DIR [/usr/include]
-  --infodir=DIR           info documentation in DIR [PREFIX/info]
-  --mandir=DIR            man documentation in DIR [PREFIX/man]
-  --srcdir=DIR            find the sources in DIR [configure dir or ..]
-  --program-prefix=PREFIX prepend PREFIX to installed program names
-  --program-suffix=SUFFIX append SUFFIX to installed program names
-  --program-transform-name=PROGRAM
-                          run sed PROGRAM on installed program names
-EOF
-    cat << EOF
-Host type:
-  --build=BUILD           configure for building on BUILD [BUILD=HOST]
-  --host=HOST             configure for HOST [guessed]
-  --target=TARGET         configure for TARGET [TARGET=HOST]
-Features and packages:
-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --x-includes=DIR        X include files are in DIR
-  --x-libraries=DIR       X library files are in DIR
-EOF
-    if test -n "$ac_help"; then
-      echo "--enable and --with options recognized:$ac_help"
-    fi
-    exit 0 ;;
-
-  -host | --host | --hos | --ho)
-    ac_prev=host ;;
-  -host=* | --host=* | --hos=* | --ho=*)
-    host="$ac_optarg" ;;
-
-  -includedir | --includedir | --includedi | --included | --include \
-  | --includ | --inclu | --incl | --inc)
-    ac_prev=includedir ;;
-  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
-  | --includ=* | --inclu=* | --incl=* | --inc=*)
-    includedir="$ac_optarg" ;;
-
-  -infodir | --infodir | --infodi | --infod | --info | --inf)
-    ac_prev=infodir ;;
-  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-    infodir="$ac_optarg" ;;
-
-  -libdir | --libdir | --libdi | --libd)
-    ac_prev=libdir ;;
-  -libdir=* | --libdir=* | --libdi=* | --libd=*)
-    libdir="$ac_optarg" ;;
-
-  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
-  | --libexe | --libex | --libe)
-    ac_prev=libexecdir ;;
-  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
-  | --libexe=* | --libex=* | --libe=*)
-    libexecdir="$ac_optarg" ;;
-
-  -localstatedir | --localstatedir | --localstatedi | --localstated \
-  | --localstate | --localstat | --localsta | --localst \
-  | --locals | --local | --loca | --loc | --lo)
-    ac_prev=localstatedir ;;
-  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-  | --localstate=* | --localstat=* | --localsta=* | --localst=* \
-  | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
-    localstatedir="$ac_optarg" ;;
-
-  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-    ac_prev=mandir ;;
-  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-    mandir="$ac_optarg" ;;
-
-  -nfp | --nfp | --nf)
-    # Obsolete; use --without-fp.
-    with_fp=no ;;
-
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c)
-    no_create=yes ;;
-
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
-    no_recursion=yes ;;
-
-  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
-  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
-  | --oldin | --oldi | --old | --ol | --o)
-    ac_prev=oldincludedir ;;
-  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
-  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
-  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-    oldincludedir="$ac_optarg" ;;
-
-  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-    ac_prev=prefix ;;
-  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-    prefix="$ac_optarg" ;;
-
-  -program-prefix | --program-prefix | --program-prefi | --program-pref \
-  | --program-pre | --program-pr | --program-p)
-    ac_prev=program_prefix ;;
-  -program-prefix=* | --program-prefix=* | --program-prefi=* \
-  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-    program_prefix="$ac_optarg" ;;
-
-  -program-suffix | --program-suffix | --program-suffi | --program-suff \
-  | --program-suf | --program-su | --program-s)
-    ac_prev=program_suffix ;;
-  -program-suffix=* | --program-suffix=* | --program-suffi=* \
-  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-    program_suffix="$ac_optarg" ;;
-
-  -program-transform-name | --program-transform-name \
-  | --program-transform-nam | --program-transform-na \
-  | --program-transform-n | --program-transform- \
-  | --program-transform | --program-transfor \
-  | --program-transfo | --program-transf \
-  | --program-trans | --program-tran \
-  | --progr-tra | --program-tr | --program-t)
-    ac_prev=program_transform_name ;;
-  -program-transform-name=* | --program-transform-name=* \
-  | --program-transform-nam=* | --program-transform-na=* \
-  | --program-transform-n=* | --program-transform-=* \
-  | --program-transform=* | --program-transfor=* \
-  | --program-transfo=* | --program-transf=* \
-  | --program-trans=* | --program-tran=* \
-  | --progr-tra=* | --program-tr=* | --program-t=*)
-    program_transform_name="$ac_optarg" ;;
-
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil)
-    silent=yes ;;
-
-  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
-    ac_prev=sbindir ;;
-  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-  | --sbi=* | --sb=*)
-    sbindir="$ac_optarg" ;;
-
-  -sharedstatedir | --sharedstatedir | --sharedstatedi \
-  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
-  | --sharedst | --shareds | --shared | --share | --shar \
-  | --sha | --sh)
-    ac_prev=sharedstatedir ;;
-  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
-  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
-  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
-  | --sha=* | --sh=*)
-    sharedstatedir="$ac_optarg" ;;
-
-  -site | --site | --sit)
-    ac_prev=site ;;
-  -site=* | --site=* | --sit=*)
-    site="$ac_optarg" ;;
-
-  -site-file | --site-file | --site-fil | --site-fi | --site-f)
-    ac_prev=sitefile ;;
-  -site-file=* | --site-file=* | --site-fil=* | --site-fi=* | --site-f=*)
-    sitefile="$ac_optarg" ;;
-
-  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-    ac_prev=srcdir ;;
-  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-    srcdir="$ac_optarg" ;;
-
-  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
-  | --syscon | --sysco | --sysc | --sys | --sy)
-    ac_prev=sysconfdir ;;
-  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
-  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-    sysconfdir="$ac_optarg" ;;
-
-  -target | --target | --targe | --targ | --tar | --ta | --t)
-    ac_prev=target ;;
-  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target="$ac_optarg" ;;
-
-  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-    verbose=yes ;;
-
-  -version | --version | --versio | --versi | --vers)
-    echo "configure generated by autoconf version 2.13"
-    exit 0 ;;
-
-  -with-* | --with-*)
-    ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=*) ;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "with_${ac_package}='$ac_optarg'" ;;
-
-  -without-* | --without-*)
-    ac_package=`echo $ac_option|sed -e 's/-*without-//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    eval "with_${ac_package}=no" ;;
-
-  --x)
-    # Obsolete; use --with-x.
-    with_x=yes ;;
-
-  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
-  | --x-incl | --x-inc | --x-in | --x-i)
-    ac_prev=x_includes ;;
-  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
-  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-    x_includes="$ac_optarg" ;;
-
-  -x-libraries | --x-libraries | --x-librarie | --x-librari \
-  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
-    ac_prev=x_libraries ;;
-  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
-  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-    x_libraries="$ac_optarg" ;;
-
-  -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
-    ;;
-
-  *)
-    if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
-      echo "configure: warning: $ac_option: invalid host type" 1>&2
-    fi
-    if test "x$nonopt" != xNONE; then
-      { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
-    fi
-    nonopt="$ac_option"
-    ;;
-
-  esac
-done
-
-if test -n "$ac_prev"; then
-  { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; }
-fi
-
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-# File descriptor usage:
-# 0 standard input
-# 1 file creation
-# 2 errors and warnings
-# 3 some systems may open it to /dev/tty
-# 4 used on the Kubota Titan
-# 6 checking for... messages and results
-# 5 compiler messages saved in config.log
-if test "$silent" = yes; then
-  exec 6>/dev/null
-else
-  exec 6>&1
-fi
-exec 5>./config.log
-
-echo "\
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-" 1>&5
-
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Also quote any args containing shell metacharacters.
-ac_configure_args=
-for ac_arg
-do
-  case "$ac_arg" in
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c) ;;
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;;
-  *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*)
-  ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-  *) ac_configure_args="$ac_configure_args $ac_arg" ;;
-  esac
-done
-
-# NLS nuisances.
-# Only set these to C if already set.  These must not be set unconditionally
-# because not all systems understand e.g. LANG=C (notably SCO).
-# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
-# Non-C LC_CTYPE values break the ctype check.
-if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
-if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
-if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
-if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
-
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -rf conftest* confdefs.h
-# AIX cpp loses on an empty file, so make sure it contains at least a newline.
-echo > confdefs.h
-
-# A filename unique to this package, relative to the directory that
-# configure is in, which we can look for to find out if srcdir is correct.
-ac_unique_file=Makefile.in
-
-# Find the source files, if location was not specified.
-if test -z "$srcdir"; then
-  ac_srcdir_defaulted=yes
-  # Try the directory containing this script, then its parent.
-  ac_prog=$0
-  ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'`
-  test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
-  srcdir=$ac_confdir
-  if test ! -r $srcdir/$ac_unique_file; then
-    srcdir=..
-  fi
-else
-  ac_srcdir_defaulted=no
-fi
-if test ! -r $srcdir/$ac_unique_file; then
-  if test "$ac_srcdir_defaulted" = yes; then
-    { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; }
-  else
-    { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; }
-  fi
-fi
-srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
-
-# Prefer explicitly selected file to automatically selected ones.
-if test -z "$sitefile"; then
-  if test -z "$CONFIG_SITE"; then
-    if test "x$prefix" != xNONE; then
-      CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-    else
-      CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
-    fi
-  fi
-else
-  CONFIG_SITE="$sitefile"
-fi
-for ac_site_file in $CONFIG_SITE; do
-  if test -r "$ac_site_file"; then
-    echo "loading site script $ac_site_file"
-    . "$ac_site_file"
-  fi
-done
-
-if test -r "$cache_file"; then
-  echo "loading cache $cache_file"
-  . $cache_file
-else
-  echo "creating cache $cache_file"
-  > $cache_file
-fi
-
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-ac_exeext=
-ac_objext=o
-if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
-  # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
-  if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
-    ac_n= ac_c='
-' ac_t='	'
-  else
-    ac_n=-n ac_c= ac_t=
-  fi
-else
-  ac_n= ac_c='\c' ac_t=
-fi
-
-
-
-echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:695: checking how to run the C preprocessor" >&5
-# On Suns, sometimes $CPP names a directory.
-if test -n "$CPP" && test -d "$CPP"; then
-  CPP=
-fi
-if test -z "$CPP"; then
-if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-    # This must be in double quotes, not single quotes, because CPP may get
-  # substituted into the Makefile and "${CC-cc}" will confuse make.
-  CPP="${CC-cc} -E"
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp.
-  cat > conftest.$ac_ext <<EOF
-#line 710 "configure"
-#include "confdefs.h"
-#include <assert.h>
-Syntax Error
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:716: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  :
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  CPP="${CC-cc} -E -traditional-cpp"
-  cat > conftest.$ac_ext <<EOF
-#line 727 "configure"
-#include "confdefs.h"
-#include <assert.h>
-Syntax Error
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:733: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  :
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  CPP="${CC-cc} -nologo -E"
-  cat > conftest.$ac_ext <<EOF
-#line 744 "configure"
-#include "confdefs.h"
-#include <assert.h>
-Syntax Error
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:750: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  :
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  CPP=/lib/cpp
-fi
-rm -f conftest*
-fi
-rm -f conftest*
-fi
-rm -f conftest*
-  ac_cv_prog_CPP="$CPP"
-fi
-  CPP="$ac_cv_prog_CPP"
-else
-  ac_cv_prog_CPP="$CPP"
-fi
-echo "$ac_t""$CPP" 1>&6
-
-echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:775: checking whether ${MAKE-make} sets \${MAKE}" >&5
-set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftestmake <<\EOF
-all:
-	@echo 'ac_maketemp="${MAKE}"'
-EOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=`
-if test -n "$ac_maketemp"; then
-  eval ac_cv_prog_make_${ac_make}_set=yes
-else
-  eval ac_cv_prog_make_${ac_make}_set=no
-fi
-rm -f conftestmake
-fi
-if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  SET_MAKE=
-else
-  echo "$ac_t""no" 1>&6
-  SET_MAKE="MAKE=${MAKE-make}"
-fi
-
-echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6
-echo "configure:802: checking for POSIXized ISC" >&5
-if test -d /etc/conf/kconfig.d &&
-  grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1
-then
-  echo "$ac_t""yes" 1>&6
-  ISC=yes # If later tests want to check for ISC.
-  cat >> confdefs.h <<\EOF
-#define _POSIX_SOURCE 1
-EOF
-
-  if test "$GCC" = yes; then
-    CC="$CC -posix"
-  else
-    CC="$CC -Xp"
-  fi
-else
-  echo "$ac_t""no" 1>&6
-  ISC=
-fi
-
-echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:823: checking for ANSI C header files" >&5
-if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 828 "configure"
-#include "confdefs.h"
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <float.h>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:836: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  ac_cv_header_stdc=yes
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-if test $ac_cv_header_stdc = yes; then
-  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-cat > conftest.$ac_ext <<EOF
-#line 853 "configure"
-#include "confdefs.h"
-#include <string.h>
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "memchr" >/dev/null 2>&1; then
-  :
-else
-  rm -rf conftest*
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-cat > conftest.$ac_ext <<EOF
-#line 871 "configure"
-#include "confdefs.h"
-#include <stdlib.h>
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "free" >/dev/null 2>&1; then
-  :
-else
-  rm -rf conftest*
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-if test "$cross_compiling" = yes; then
-  :
-else
-  cat > conftest.$ac_ext <<EOF
-#line 892 "configure"
-#include "confdefs.h"
-#include <ctype.h>
-#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-#define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-int main () { int i; for (i = 0; i < 256; i++)
-if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
-exit (0); }
-
-EOF
-if { (eval echo configure:903: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
-  :
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -fr conftest*
-  ac_cv_header_stdc=no
-fi
-rm -fr conftest*
-fi
-
-fi
-fi
-
-echo "$ac_t""$ac_cv_header_stdc" 1>&6
-if test $ac_cv_header_stdc = yes; then
-  cat >> confdefs.h <<\EOF
-#define STDC_HEADERS 1
-EOF
-
-fi
-
-echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:927: checking for working const" >&5
-if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 932 "configure"
-#include "confdefs.h"
-
-int main() {
-
-/* Ultrix mips cc rejects this.  */
-typedef int charset[2]; const charset x;
-/* SunOS 4.1.1 cc rejects this.  */
-char const *const *ccp;
-char **p;
-/* NEC SVR4.0.2 mips cc rejects this.  */
-struct point {int x, y;};
-static struct point const zero = {0,0};
-/* AIX XL C 1.02.0.0 rejects this.
-   It does not let you subtract one const X* pointer from another in an arm
-   of an if-expression whose if-part is not a constant expression */
-const char *g = "string";
-ccp = &g + (g ? g-g : 0);
-/* HPUX 7.0 cc rejects these. */
-++ccp;
-p = (char**) ccp;
-ccp = (char const *const *) p;
-{ /* SCO 3.2v4 cc rejects this.  */
-  char *t;
-  char const *s = 0 ? (char *) 0 : (char const *) 0;
-
-  *t++ = 0;
-}
-{ /* Someone thinks the Sun supposedly-ANSI compiler will reject this.  */
-  int x[] = {25, 17};
-  const int *foo = &x[0];
-  ++foo;
-}
-{ /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
-  typedef const int *iptr;
-  iptr p = 0;
-  ++p;
-}
-{ /* AIX XL C 1.02.0.0 rejects this saying
-     "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
-  struct s { int j; const int *ap[3]; };
-  struct s *b; b->j = 5;
-}
-{ /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
-  const int foo = 10;
-}
-
-; return 0; }
-EOF
-if { (eval echo configure:981: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  ac_cv_c_const=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_c_const=no
-fi
-rm -f conftest*
-fi
-
-echo "$ac_t""$ac_cv_c_const" 1>&6
-if test $ac_cv_c_const = no; then
-  cat >> confdefs.h <<\EOF
-#define const 
-EOF
-
-fi
-
-echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:1002: checking for inline" >&5
-if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_cv_c_inline=no
-for ac_kw in inline __inline__ __inline; do
-  cat > conftest.$ac_ext <<EOF
-#line 1009 "configure"
-#include "confdefs.h"
-
-int main() {
-} $ac_kw foo() {
-; return 0; }
-EOF
-if { (eval echo configure:1016: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  ac_cv_c_inline=$ac_kw; break
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-fi
-rm -f conftest*
-done
-
-fi
-
-echo "$ac_t""$ac_cv_c_inline" 1>&6
-case "$ac_cv_c_inline" in
-  inline | yes) ;;
-  no) cat >> confdefs.h <<\EOF
-#define inline 
-EOF
- ;;
-  *)  cat >> confdefs.h <<EOF
-#define inline $ac_cv_c_inline
-EOF
- ;;
-esac
-
-echo $ac_n "checking for off_t""... $ac_c" 1>&6
-echo "configure:1042: checking for off_t" >&5
-if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 1047 "configure"
-#include "confdefs.h"
-#include <sys/types.h>
-#if STDC_HEADERS
-#include <stdlib.h>
-#include <stddef.h>
-#endif
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "(^|[^a-zA-Z_0-9])off_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
-  rm -rf conftest*
-  ac_cv_type_off_t=yes
-else
-  rm -rf conftest*
-  ac_cv_type_off_t=no
-fi
-rm -f conftest*
-
-fi
-echo "$ac_t""$ac_cv_type_off_t" 1>&6
-if test $ac_cv_type_off_t = no; then
-  cat >> confdefs.h <<\EOF
-#define off_t long
-EOF
-
-fi
-
-echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:1075: checking for size_t" >&5
-if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 1080 "configure"
-#include "confdefs.h"
-#include <sys/types.h>
-#if STDC_HEADERS
-#include <stdlib.h>
-#include <stddef.h>
-#endif
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "(^|[^a-zA-Z_0-9])size_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
-  rm -rf conftest*
-  ac_cv_type_size_t=yes
-else
-  rm -rf conftest*
-  ac_cv_type_size_t=no
-fi
-rm -f conftest*
-
-fi
-echo "$ac_t""$ac_cv_type_size_t" 1>&6
-if test $ac_cv_type_size_t = no; then
-  cat >> confdefs.h <<\EOF
-#define size_t unsigned
-EOF
-
-fi
-
-# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
-# for constant arguments.  Useless!
-echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
-echo "configure:1110: checking for working alloca.h" >&5
-if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 1115 "configure"
-#include "confdefs.h"
-#include <alloca.h>
-int main() {
-char *p = alloca(2 * sizeof(int));
-; return 0; }
-EOF
-if { (eval echo configure:1122: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  ac_cv_header_alloca_h=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_header_alloca_h=no
-fi
-rm -f conftest*
-fi
-
-echo "$ac_t""$ac_cv_header_alloca_h" 1>&6
-if test $ac_cv_header_alloca_h = yes; then
-  cat >> confdefs.h <<\EOF
-#define HAVE_ALLOCA_H 1
-EOF
-
-fi
-
-echo $ac_n "checking for alloca""... $ac_c" 1>&6
-echo "configure:1143: checking for alloca" >&5
-if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 1148 "configure"
-#include "confdefs.h"
-
-#ifdef __GNUC__
-# define alloca __builtin_alloca
-#else
-# ifdef _MSC_VER
-#  include <malloc.h>
-#  define alloca _alloca
-# else
-#  if HAVE_ALLOCA_H
-#   include <alloca.h>
-#  else
-#   ifdef _AIX
- #pragma alloca
-#   else
-#    ifndef alloca /* predefined by HP cc +Olibcalls */
-char *alloca ();
-#    endif
-#   endif
-#  endif
-# endif
-#endif
-
-int main() {
-char *p = (char *) alloca(1);
-; return 0; }
-EOF
-if { (eval echo configure:1176: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  ac_cv_func_alloca_works=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_func_alloca_works=no
-fi
-rm -f conftest*
-fi
-
-echo "$ac_t""$ac_cv_func_alloca_works" 1>&6
-if test $ac_cv_func_alloca_works = yes; then
-  cat >> confdefs.h <<\EOF
-#define HAVE_ALLOCA 1
-EOF
-
-fi
-
-if test $ac_cv_func_alloca_works = no; then
-  # The SVR3 libPW and SVR4 libucb both contain incompatible functions
-  # that cause trouble.  Some versions do not even contain alloca or
-  # contain a buggy version.  If you still want to use their alloca,
-  # use ar to extract alloca.o from them instead of compiling alloca.c.
-  ALLOCA=alloca.${ac_objext}
-  cat >> confdefs.h <<\EOF
-#define C_ALLOCA 1
-EOF
-
-
-echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
-echo "configure:1208: checking whether alloca needs Cray hooks" >&5
-if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 1213 "configure"
-#include "confdefs.h"
-#if defined(CRAY) && ! defined(CRAY2)
-webecray
-#else
-wenotbecray
-#endif
-
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "webecray" >/dev/null 2>&1; then
-  rm -rf conftest*
-  ac_cv_os_cray=yes
-else
-  rm -rf conftest*
-  ac_cv_os_cray=no
-fi
-rm -f conftest*
-
-fi
-
-echo "$ac_t""$ac_cv_os_cray" 1>&6
-if test $ac_cv_os_cray = yes; then
-for ac_func in _getb67 GETB67 getb67; do
-  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:1238: checking for $ac_func" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 1243 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char $ac_func();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-$ac_func();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:1266: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  cat >> confdefs.h <<EOF
-#define CRAY_STACKSEG_END $ac_func
-EOF
-
-  break
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-done
-fi
-
-echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
-echo "configure:1293: checking stack direction for C alloca" >&5
-if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test "$cross_compiling" = yes; then
-  ac_cv_c_stack_direction=0
-else
-  cat > conftest.$ac_ext <<EOF
-#line 1301 "configure"
-#include "confdefs.h"
-find_stack_direction ()
-{
-  static char *addr = 0;
-  auto char dummy;
-  if (addr == 0)
-    {
-      addr = &dummy;
-      return find_stack_direction ();
-    }
-  else
-    return (&dummy > addr) ? 1 : -1;
-}
-main ()
-{
-  exit (find_stack_direction() < 0);
-}
-EOF
-if { (eval echo configure:1320: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
-  ac_cv_c_stack_direction=1
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -fr conftest*
-  ac_cv_c_stack_direction=-1
-fi
-rm -fr conftest*
-fi
-
-fi
-
-echo "$ac_t""$ac_cv_c_stack_direction" 1>&6
-cat >> confdefs.h <<EOF
-#define STACK_DIRECTION $ac_cv_c_stack_direction
-EOF
-
-fi
-
-for ac_hdr in unistd.h
-do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1345: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 1350 "configure"
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1355: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6
-fi
-done
-
-for ac_func in getpagesize
-do
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:1384: checking for $ac_func" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 1389 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char $ac_func();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-$ac_func();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:1412: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6
-fi
-done
-
-echo $ac_n "checking for working mmap""... $ac_c" 1>&6
-echo "configure:1437: checking for working mmap" >&5
-if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test "$cross_compiling" = yes; then
-  ac_cv_func_mmap_fixed_mapped=no
-else
-  cat > conftest.$ac_ext <<EOF
-#line 1445 "configure"
-#include "confdefs.h"
-
-/* Thanks to Mike Haertel and Jim Avera for this test.
-   Here is a matrix of mmap possibilities:
-	mmap private not fixed
-	mmap private fixed at somewhere currently unmapped
-	mmap private fixed at somewhere already mapped
-	mmap shared not fixed
-	mmap shared fixed at somewhere currently unmapped
-	mmap shared fixed at somewhere already mapped
-   For private mappings, we should verify that changes cannot be read()
-   back from the file, nor mmap's back from the file at a different
-   address.  (There have been systems where private was not correctly
-   implemented like the infamous i386 svr4.0, and systems where the
-   VM page cache was not coherent with the filesystem buffer cache
-   like early versions of FreeBSD and possibly contemporary NetBSD.)
-   For shared mappings, we should conversely verify that changes get
-   propogated back to all the places they're supposed to be.
-
-   Grep wants private fixed already mapped.
-   The main things grep needs to know about mmap are:
-   * does it exist and is it safe to write into the mmap'd area
-   * how to use it (BSD variants)  */
-#include <sys/types.h>
-#include <fcntl.h>
-#include <sys/mman.h>
-
-/* This mess was copied from the GNU getpagesize.h.  */
-#ifndef HAVE_GETPAGESIZE
-# ifdef HAVE_UNISTD_H
-#  include <unistd.h>
-# endif
-
-/* Assume that all systems that can run configure have sys/param.h.  */
-# ifndef HAVE_SYS_PARAM_H
-#  define HAVE_SYS_PARAM_H 1
-# endif
-
-# ifdef _SC_PAGESIZE
-#  define getpagesize() sysconf(_SC_PAGESIZE)
-# else /* no _SC_PAGESIZE */
-#  ifdef HAVE_SYS_PARAM_H
-#   include <sys/param.h>
-#   ifdef EXEC_PAGESIZE
-#    define getpagesize() EXEC_PAGESIZE
-#   else /* no EXEC_PAGESIZE */
-#    ifdef NBPG
-#     define getpagesize() NBPG * CLSIZE
-#     ifndef CLSIZE
-#      define CLSIZE 1
-#     endif /* no CLSIZE */
-#    else /* no NBPG */
-#     ifdef NBPC
-#      define getpagesize() NBPC
-#     else /* no NBPC */
-#      ifdef PAGESIZE
-#       define getpagesize() PAGESIZE
-#      endif /* PAGESIZE */
-#     endif /* no NBPC */
-#    endif /* no NBPG */
-#   endif /* no EXEC_PAGESIZE */
-#  else /* no HAVE_SYS_PARAM_H */
-#   define getpagesize() 8192	/* punt totally */
-#  endif /* no HAVE_SYS_PARAM_H */
-# endif /* no _SC_PAGESIZE */
-
-#endif /* no HAVE_GETPAGESIZE */
-
-#ifdef __cplusplus
-extern "C" { void *malloc(unsigned); }
-#else
-char *malloc();
-#endif
-
-int
-main()
-{
-	char *data, *data2, *data3;
-	int i, pagesize;
-	int fd;
-
-	pagesize = getpagesize();
-
-	/*
-	 * First, make a file with some known garbage in it.
-	 */
-	data = malloc(pagesize);
-	if (!data)
-		exit(1);
-	for (i = 0; i < pagesize; ++i)
-		*(data + i) = rand();
-	umask(0);
-	fd = creat("conftestmmap", 0600);
-	if (fd < 0)
-		exit(1);
-	if (write(fd, data, pagesize) != pagesize)
-		exit(1);
-	close(fd);
-
-	/*
-	 * Next, try to mmap the file at a fixed address which
-	 * already has something else allocated at it.  If we can,
-	 * also make sure that we see the same garbage.
-	 */
-	fd = open("conftestmmap", O_RDWR);
-	if (fd < 0)
-		exit(1);
-	data2 = malloc(2 * pagesize);
-	if (!data2)
-		exit(1);
-	data2 += (pagesize - ((int) data2 & (pagesize - 1))) & (pagesize - 1);
-	if (data2 != mmap(data2, pagesize, PROT_READ | PROT_WRITE,
-	    MAP_PRIVATE | MAP_FIXED, fd, 0L))
-		exit(1);
-	for (i = 0; i < pagesize; ++i)
-		if (*(data + i) != *(data2 + i))
-			exit(1);
-
-	/*
-	 * Finally, make sure that changes to the mapped area
-	 * do not percolate back to the file as seen by read().
-	 * (This is a bug on some variants of i386 svr4.0.)
-	 */
-	for (i = 0; i < pagesize; ++i)
-		*(data2 + i) = *(data2 + i) + 1;
-	data3 = malloc(pagesize);
-	if (!data3)
-		exit(1);
-	if (read(fd, data3, pagesize) != pagesize)
-		exit(1);
-	for (i = 0; i < pagesize; ++i)
-		if (*(data + i) != *(data3 + i))
-			exit(1);
-	close(fd);
-	unlink("conftestmmap");
-	exit(0);
-}
-
-EOF
-if { (eval echo configure:1585: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
-  ac_cv_func_mmap_fixed_mapped=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -fr conftest*
-  ac_cv_func_mmap_fixed_mapped=no
-fi
-rm -fr conftest*
-fi
-
-fi
-
-echo "$ac_t""$ac_cv_func_mmap_fixed_mapped" 1>&6
-if test $ac_cv_func_mmap_fixed_mapped = yes; then
-  cat >> confdefs.h <<\EOF
-#define HAVE_MMAP 1
-EOF
-
-fi
-
-echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
-echo "configure:1608: checking for Cygwin environment" >&5
-if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 1613 "configure"
-#include "confdefs.h"
-
-int main() {
-
-#ifndef __CYGWIN__
-#define __CYGWIN__ __CYGWIN32__
-#endif
-return __CYGWIN__;
-; return 0; }
-EOF
-if { (eval echo configure:1624: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  ac_cv_cygwin=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_cygwin=no
-fi
-rm -f conftest*
-rm -f conftest*
-fi
-
-echo "$ac_t""$ac_cv_cygwin" 1>&6
-CYGWIN=
-test "$ac_cv_cygwin" = yes && CYGWIN=yes
-echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
-echo "configure:1641: checking for mingw32 environment" >&5
-if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 1646 "configure"
-#include "confdefs.h"
-
-int main() {
-return __MINGW32__;
-; return 0; }
-EOF
-if { (eval echo configure:1653: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  ac_cv_mingw32=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_mingw32=no
-fi
-rm -f conftest*
-rm -f conftest*
-fi
-
-echo "$ac_t""$ac_cv_mingw32" 1>&6
-MINGW32=
-test "$ac_cv_mingw32" = yes && MINGW32=yes
-
-# autoconf.info says this should be called right after AC_INIT.
-
-
-ac_aux_dir=
-for ac_dir in `cd $srcdir;pwd`/../.. $srcdir/`cd $srcdir;pwd`/../..; do
-  if test -f $ac_dir/install-sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f $ac_dir/install.sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  { echo "configure: error: can not find install-sh or install.sh in `cd $srcdir;pwd`/../.. $srcdir/`cd $srcdir;pwd`/../.." 1>&2; exit 1; }
-fi
-ac_config_guess=$ac_aux_dir/config.guess
-ac_config_sub=$ac_aux_dir/config.sub
-ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
-
-
-# Do some error checking and defaulting for the host and target type.
-# The inputs are:
-#    configure --host=HOST --target=TARGET --build=BUILD NONOPT
-#
-# The rules are:
-# 1. You are not allowed to specify --host, --target, and nonopt at the
-#    same time.
-# 2. Host defaults to nonopt.
-# 3. If nonopt is not specified, then host defaults to the current host,
-#    as determined by config.guess.
-# 4. Target and build default to nonopt.
-# 5. If nonopt is not specified, then target and build default to host.
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-case $host---$target---$nonopt in
-NONE---*---* | *---NONE---* | *---*---NONE) ;;
-*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;;
-esac
-
-
-# Make sure we can run config.sub.
-if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
-else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:1720: checking host system type" >&5
-
-host_alias=$host
-case "$host_alias" in
-NONE)
-  case $nonopt in
-  NONE)
-    if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then :
-    else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
-    fi ;;
-  *) host_alias=$nonopt ;;
-  esac ;;
-esac
-
-host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias`
-host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$host" 1>&6
-
-echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:1741: checking target system type" >&5
-
-target_alias=$target
-case "$target_alias" in
-NONE)
-  case $nonopt in
-  NONE) target_alias=$host_alias ;;
-  *) target_alias=$nonopt ;;
-  esac ;;
-esac
-
-target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias`
-target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$target" 1>&6
-
-echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:1759: checking build system type" >&5
-
-build_alias=$build
-case "$build_alias" in
-NONE)
-  case $nonopt in
-  NONE) build_alias=$host_alias ;;
-  *) build_alias=$nonopt ;;
-  esac ;;
-esac
-
-build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
-build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$build" 1>&6
-
-test "$host_alias" != "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-
-if test "$program_transform_name" = s,x,x,; then
-  program_transform_name=
-else
-  # Double any \ or $.  echo might interpret backslashes.
-  cat <<\EOF_SED > conftestsed
-s,\\,\\\\,g; s,\$,$$,g
-EOF_SED
-  program_transform_name="`echo $program_transform_name|sed -f conftestsed`"
-  rm -f conftestsed
-fi
-test "$program_prefix" != NONE &&
-  program_transform_name="s,^,${program_prefix},; $program_transform_name"
-# Use a double $ so make ignores it.
-test "$program_suffix" != NONE &&
-  program_transform_name="s,\$\$,${program_suffix},; $program_transform_name"
-
-# sed with no file args requires a program.
-test "$program_transform_name" = "" && program_transform_name="s,x,x,"
-
-# Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1803: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CC="gcc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1833: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_prog_rejected=no
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
-        ac_prog_rejected=yes
-	continue
-      fi
-      ac_cv_prog_CC="cc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# -gt 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    set dummy "$ac_dir/$ac_word" "$@"
-    shift
-    ac_cv_prog_CC="$@"
-  fi
-fi
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-  if test -z "$CC"; then
-    case "`uname -s`" in
-    *win32* | *WIN32*)
-      # Extract the first word of "cl", so it can be a program name with args.
-set dummy cl; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1884: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CC="cl"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
- ;;
-    esac
-  fi
-  test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1916: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
-
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-cat > conftest.$ac_ext << EOF
-
-#line 1927 "configure"
-#include "confdefs.h"
-
-main(){return(0);}
-EOF
-if { (eval echo configure:1932: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  ac_cv_prog_cc_works=yes
-  # If we can't run a trivial program, we are probably using a cross compiler.
-  if (./conftest; exit) 2>/dev/null; then
-    ac_cv_prog_cc_cross=no
-  else
-    ac_cv_prog_cc_cross=yes
-  fi
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  ac_cv_prog_cc_works=no
-fi
-rm -fr conftest*
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
-if test $ac_cv_prog_cc_works = no; then
-  { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
-fi
-echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1958: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
-echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
-cross_compiling=$ac_cv_prog_cc_cross
-
-echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1963: checking whether we are using GNU C" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.c <<EOF
-#ifdef __GNUC__
-  yes;
-#endif
-EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1972: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-  ac_cv_prog_gcc=yes
-else
-  ac_cv_prog_gcc=no
-fi
-fi
-
-echo "$ac_t""$ac_cv_prog_gcc" 1>&6
-
-if test $ac_cv_prog_gcc = yes; then
-  GCC=yes
-else
-  GCC=
-fi
-
-ac_test_CFLAGS="${CFLAGS+set}"
-ac_save_CFLAGS="$CFLAGS"
-CFLAGS=
-echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1991: checking whether ${CC-cc} accepts -g" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  echo 'void f(){}' > conftest.c
-if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
-  ac_cv_prog_cc_g=yes
-else
-  ac_cv_prog_cc_g=no
-fi
-rm -f conftest*
-
-fi
-
-echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
-if test "$ac_test_CFLAGS" = set; then
-  CFLAGS="$ac_save_CFLAGS"
-elif test $ac_cv_prog_cc_g = yes; then
-  if test "$GCC" = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-g"
-  fi
-else
-  if test "$GCC" = yes; then
-    CFLAGS="-O2"
-  else
-    CFLAGS=
-  fi
-fi
-
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# ./install, which can be erroneously created by make from ./install.sh.
-echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:2034: checking for a BSD compatible install" >&5
-if test -z "$INSTALL"; then
-if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
-  for ac_dir in $PATH; do
-    # Account for people who put trailing slashes in PATH elements.
-    case "$ac_dir/" in
-    /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
-    *)
-      # OSF1 and SCO ODT 3.0 have their own names for install.
-      # Don't use installbsd from OSF since it installs stuff as root
-      # by default.
-      for ac_prog in ginstall scoinst install; do
-        if test -f $ac_dir/$ac_prog; then
-	  if test $ac_prog = install &&
-            grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  else
-	    ac_cv_path_install="$ac_dir/$ac_prog -c"
-	    break 2
-	  fi
-	fi
-      done
-      ;;
-    esac
-  done
-  IFS="$ac_save_IFS"
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL="$ac_cv_path_install"
-  else
-    # As a last resort, use the slow shell script.  We don't cache a
-    # path for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the path is relative.
-    INSTALL="$ac_install_sh"
-  fi
-fi
-echo "$ac_t""$INSTALL" 1>&6
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-
-# Put a plausible default for CC_FOR_BUILD in Makefile.
-if test "x$cross_compiling" = "xno"; then
-  CC_FOR_BUILD='$(CC)'
-else
-  CC_FOR_BUILD=gcc
-fi
-
-
-
-
-AR=${AR-ar}
-
-# Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2102: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RANLIB="ranlib"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
-fi
-fi
-RANLIB="$ac_cv_prog_RANLIB"
-if test -n "$RANLIB"; then
-  echo "$ac_t""$RANLIB" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-ALL_LINGUAS=
-                              
-   for ac_hdr in argz.h limits.h locale.h nl_types.h malloc.h string.h \
-unistd.h values.h sys/param.h
-do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2137: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 2142 "configure"
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2147: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6
-fi
-done
-
-   for ac_func in getcwd munmap putenv setenv setlocale strchr strcasecmp \
-__argz_count __argz_stringify __argz_next
-do
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2177: checking for $ac_func" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 2182 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char $ac_func();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-$ac_func();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:2205: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6
-fi
-done
-
-
-   if test "${ac_cv_func_stpcpy+set}" != "set"; then
-     for ac_func in stpcpy
-do
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2234: checking for $ac_func" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 2239 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char $ac_func();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-$ac_func();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:2262: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6
-fi
-done
-
-   fi
-   if test "${ac_cv_func_stpcpy}" = "yes"; then
-     cat >> confdefs.h <<\EOF
-#define HAVE_STPCPY 1
-EOF
-
-   fi
-
-   if test $ac_cv_header_locale_h = yes; then
-    echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6
-echo "configure:2296: checking for LC_MESSAGES" >&5
-if eval "test \"`echo '$''{'am_cv_val_LC_MESSAGES'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 2301 "configure"
-#include "confdefs.h"
-#include <locale.h>
-int main() {
-return LC_MESSAGES
-; return 0; }
-EOF
-if { (eval echo configure:2308: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  am_cv_val_LC_MESSAGES=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  am_cv_val_LC_MESSAGES=no
-fi
-rm -f conftest*
-fi
-
-echo "$ac_t""$am_cv_val_LC_MESSAGES" 1>&6
-    if test $am_cv_val_LC_MESSAGES = yes; then
-      cat >> confdefs.h <<\EOF
-#define HAVE_LC_MESSAGES 1
-EOF
-
-    fi
-  fi
-   echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6
-echo "configure:2329: checking whether NLS is requested" >&5
-        # Check whether --enable-nls or --disable-nls was given.
-if test "${enable_nls+set}" = set; then
-  enableval="$enable_nls"
-  USE_NLS=$enableval
-else
-  USE_NLS=yes
-fi
-
-    echo "$ac_t""$USE_NLS" 1>&6
-    
-
-    USE_INCLUDED_LIBINTL=no
-
-        if test "$USE_NLS" = "yes"; then
-      cat >> confdefs.h <<\EOF
-#define ENABLE_NLS 1
-EOF
-
-      echo $ac_n "checking whether included gettext is requested""... $ac_c" 1>&6
-echo "configure:2349: checking whether included gettext is requested" >&5
-      # Check whether --with-included-gettext or --without-included-gettext was given.
-if test "${with_included_gettext+set}" = set; then
-  withval="$with_included_gettext"
-  nls_cv_force_use_gnu_gettext=$withval
-else
-  nls_cv_force_use_gnu_gettext=no
-fi
-
-      echo "$ac_t""$nls_cv_force_use_gnu_gettext" 1>&6
-
-      nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
-      if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
-                        		nls_cv_header_intl=
-	nls_cv_header_libgt=
-	CATOBJEXT=NONE
-
-	ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for libintl.h""... $ac_c" 1>&6
-echo "configure:2368: checking for libintl.h" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 2373 "configure"
-#include "confdefs.h"
-#include <libintl.h>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2378: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  echo $ac_n "checking for gettext in libc""... $ac_c" 1>&6
-echo "configure:2395: checking for gettext in libc" >&5
-if eval "test \"`echo '$''{'gt_cv_func_gettext_libc'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 2400 "configure"
-#include "confdefs.h"
-#include <libintl.h>
-int main() {
-return (int) gettext ("")
-; return 0; }
-EOF
-if { (eval echo configure:2407: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  gt_cv_func_gettext_libc=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  gt_cv_func_gettext_libc=no
-fi
-rm -f conftest*
-fi
-
-echo "$ac_t""$gt_cv_func_gettext_libc" 1>&6
-
-	   if test "$gt_cv_func_gettext_libc" != "yes"; then
-	     echo $ac_n "checking for bindtextdomain in -lintl""... $ac_c" 1>&6
-echo "configure:2423: checking for bindtextdomain in -lintl" >&5
-ac_lib_var=`echo intl'_'bindtextdomain | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-lintl  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 2431 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char bindtextdomain();
-
-int main() {
-bindtextdomain()
-; return 0; }
-EOF
-if { (eval echo configure:2442: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  echo $ac_n "checking for gettext in libintl""... $ac_c" 1>&6
-echo "configure:2458: checking for gettext in libintl" >&5
-if eval "test \"`echo '$''{'gt_cv_func_gettext_libintl'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 2463 "configure"
-#include "confdefs.h"
-
-int main() {
-return (int) gettext ("")
-; return 0; }
-EOF
-if { (eval echo configure:2470: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  gt_cv_func_gettext_libintl=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  gt_cv_func_gettext_libintl=no
-fi
-rm -f conftest*
-fi
-
-echo "$ac_t""$gt_cv_func_gettext_libintl" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-	   fi
-
-	   if test "$gt_cv_func_gettext_libc" = "yes" \
-	      || test "$gt_cv_func_gettext_libintl" = "yes"; then
-	      cat >> confdefs.h <<\EOF
-#define HAVE_GETTEXT 1
-EOF
-
-	      # Extract the first word of "msgfmt", so it can be a program name with args.
-set dummy msgfmt; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2498: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  case "$MSGFMT" in
-  /*)
-  ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path.
-  ;;
-  *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      if test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"; then
-	ac_cv_path_MSGFMT="$ac_dir/$ac_word"
-	break
-      fi
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT="no"
-  ;;
-esac
-fi
-MSGFMT="$ac_cv_path_MSGFMT"
-if test -n "$MSGFMT"; then
-  echo "$ac_t""$MSGFMT" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-	      if test "$MSGFMT" != "no"; then
-		for ac_func in dcgettext
-do
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2532: checking for $ac_func" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 2537 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char $ac_func();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-$ac_func();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:2560: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6
-fi
-done
-
-		# Extract the first word of "gmsgfmt", so it can be a program name with args.
-set dummy gmsgfmt; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2587: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  case "$GMSGFMT" in
-  /*)
-  ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path.
-  ;;
-  ?:/*)			 
-  ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a dos path.
-  ;;
-  *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do 
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_path_GMSGFMT="$ac_dir/$ac_word"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
-  ;;
-esac
-fi
-GMSGFMT="$ac_cv_path_GMSGFMT"
-if test -n "$GMSGFMT"; then
-  echo "$ac_t""$GMSGFMT" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-		# Extract the first word of "xgettext", so it can be a program name with args.
-set dummy xgettext; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2623: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  case "$XGETTEXT" in
-  /*)
-  ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path.
-  ;;
-  *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      if test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"; then
-	ac_cv_path_XGETTEXT="$ac_dir/$ac_word"
-	break
-      fi
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":"
-  ;;
-esac
-fi
-XGETTEXT="$ac_cv_path_XGETTEXT"
-if test -n "$XGETTEXT"; then
-  echo "$ac_t""$XGETTEXT" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-		cat > conftest.$ac_ext <<EOF
-#line 2655 "configure"
-#include "confdefs.h"
-
-int main() {
-extern int _nl_msg_cat_cntr;
-			       return _nl_msg_cat_cntr
-; return 0; }
-EOF
-if { (eval echo configure:2663: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  CATOBJEXT=.gmo
-		   DATADIRNAME=share
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  CATOBJEXT=.mo
-		   DATADIRNAME=lib
-fi
-rm -f conftest*
-		INSTOBJEXT=.mo
-	      fi
-	    fi
-	
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-	        
-        if test "$CATOBJEXT" = "NONE"; then
-	  	  	  nls_cv_use_gnu_gettext=yes
-        fi
-      fi
-
-      if test "$nls_cv_use_gnu_gettext" = "yes"; then
-                INTLOBJS="\$(GETTOBJS)"
-        # Extract the first word of "msgfmt", so it can be a program name with args.
-set dummy msgfmt; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2695: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  case "$MSGFMT" in
-  /*)
-  ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path.
-  ;;
-  *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      if test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"; then
-	ac_cv_path_MSGFMT="$ac_dir/$ac_word"
-	break
-      fi
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT="msgfmt"
-  ;;
-esac
-fi
-MSGFMT="$ac_cv_path_MSGFMT"
-if test -n "$MSGFMT"; then
-  echo "$ac_t""$MSGFMT" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-        # Extract the first word of "gmsgfmt", so it can be a program name with args.
-set dummy gmsgfmt; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2729: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  case "$GMSGFMT" in
-  /*)
-  ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path.
-  ;;
-  ?:/*)			 
-  ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a dos path.
-  ;;
-  *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do 
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_path_GMSGFMT="$ac_dir/$ac_word"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
-  ;;
-esac
-fi
-GMSGFMT="$ac_cv_path_GMSGFMT"
-if test -n "$GMSGFMT"; then
-  echo "$ac_t""$GMSGFMT" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-        # Extract the first word of "xgettext", so it can be a program name with args.
-set dummy xgettext; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2765: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  case "$XGETTEXT" in
-  /*)
-  ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path.
-  ;;
-  *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      if test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"; then
-	ac_cv_path_XGETTEXT="$ac_dir/$ac_word"
-	break
-      fi
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":"
-  ;;
-esac
-fi
-XGETTEXT="$ac_cv_path_XGETTEXT"
-if test -n "$XGETTEXT"; then
-  echo "$ac_t""$XGETTEXT" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-        
-	USE_INCLUDED_LIBINTL=yes
-        CATOBJEXT=.gmo
-        INSTOBJEXT=.mo
-        DATADIRNAME=share
-	INTLDEPS='$(top_builddir)/../intl/libintl.a'
-	INTLLIBS=$INTLDEPS
-	LIBS=`echo $LIBS | sed -e 's/-lintl//'`
-        nls_cv_header_intl=libintl.h
-        nls_cv_header_libgt=libgettext.h
-      fi
-
-            if test "$XGETTEXT" != ":"; then
-			if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
-	  : ;
-	else
-	  echo "$ac_t""found xgettext programs is not GNU xgettext; ignore it" 1>&6
-	  XGETTEXT=":"
-	fi
-      fi
-
-      # We need to process the po/ directory.
-      POSUB=po
-    else
-      DATADIRNAME=share
-      nls_cv_header_intl=libintl.h
-      nls_cv_header_libgt=libgettext.h
-    fi
-
-    # If this is used in GNU gettext we have to set USE_NLS to `yes'
-    # because some of the sources are only built for this goal.
-    if test "$PACKAGE" = gettext; then
-      USE_NLS=yes
-      USE_INCLUDED_LIBINTL=yes
-    fi
-
-                for lang in $ALL_LINGUAS; do
-      GMOFILES="$GMOFILES $lang.gmo"
-      POFILES="$POFILES $lang.po"
-    done
-
-        
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-  
-
-   if test "x$CATOBJEXT" != "x"; then
-     if test "x$ALL_LINGUAS" = "x"; then
-       LINGUAS=
-     else
-       echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6
-echo "configure:2855: checking for catalogs to be installed" >&5
-       NEW_LINGUAS=
-       for lang in ${LINGUAS=$ALL_LINGUAS}; do
-         case "$ALL_LINGUAS" in
-          *$lang*) NEW_LINGUAS="$NEW_LINGUAS $lang" ;;
-         esac
-       done
-       LINGUAS=$NEW_LINGUAS
-       echo "$ac_t""$LINGUAS" 1>&6
-     fi
-
-          if test -n "$LINGUAS"; then
-       for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
-     fi
-   fi
-
-            if test $ac_cv_header_locale_h = yes; then
-     INCLUDE_LOCALE_H="#include <locale.h>"
-   else
-     INCLUDE_LOCALE_H="\
-/* The system does not provide the header <locale.h>.  Take care yourself.  */"
-   fi
-   
-
-            if test -f $srcdir/po2tbl.sed.in; then
-      if test "$CATOBJEXT" = ".cat"; then
-	 ac_safe=`echo "linux/version.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for linux/version.h""... $ac_c" 1>&6
-echo "configure:2883: checking for linux/version.h" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 2888 "configure"
-#include "confdefs.h"
-#include <linux/version.h>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2893: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  msgformat=linux
-else
-  echo "$ac_t""no" 1>&6
-msgformat=xopen
-fi
-
-
-	          	 sed -e '/^#/d' $srcdir/$msgformat-msg.sed > po2msg.sed
-      fi
-            sed -e '/^#.*[^\\]$/d' -e '/^#$/d' \
-	 $srcdir/po2tbl.sed.in > po2tbl.sed
-   fi
-
-            if test "$PACKAGE" = "gettext"; then
-     GT_NO="#NO#"
-     GT_YES=
-   else
-     GT_NO=
-     GT_YES="#YES#"
-   fi
-   
-   
-
-   MKINSTALLDIRS="\$(srcdir)/../../mkinstalldirs"
-   
-
-      l=
-   
-
-            if test -d $srcdir/po; then
-      test -d po || mkdir po
-      if test "x$srcdir" != "x."; then
-	 if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
-	    posrcprefix="$srcdir/"
-	 else
-	    posrcprefix="../$srcdir/"
-	 fi
-      else
-	 posrcprefix="../"
-      fi
-      rm -f po/POTFILES
-      sed -e "/^#/d" -e "/^\$/d" -e "s,.*,	$posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
-	 < $srcdir/po/POTFILES.in > po/POTFILES
-   fi
-  
-
-# Check for common headers.
-# FIXME: Seems to me this can cause problems for i386-windows hosts.
-# At one point there were hardcoded AC_DEFINE's if ${host} = i386-*-windows*.
-for ac_hdr in stdlib.h string.h strings.h unistd.h time.h
-do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2962: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 2967 "configure"
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2972: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6
-fi
-done
-
-for ac_hdr in sys/time.h sys/resource.h
-do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3002: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 3007 "configure"
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3012: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6
-fi
-done
-
-for ac_hdr in fcntl.h fpu_control.h
-do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3042: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 3047 "configure"
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3052: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6
-fi
-done
-
-for ac_hdr in dlfcn.h errno.h sys/stat.h
-do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3082: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 3087 "configure"
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3092: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6
-fi
-done
-
-for ac_func in getrusage time sigaction __setfpucw
-do
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3121: checking for $ac_func" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 3126 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char $ac_func();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-$ac_func();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:3149: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6
-fi
-done
-
-
-# Check for socket libraries
-echo $ac_n "checking for bind in -lsocket""... $ac_c" 1>&6
-echo "configure:3176: checking for bind in -lsocket" >&5
-ac_lib_var=`echo socket'_'bind | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-lsocket  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 3184 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char bind();
-
-int main() {
-bind()
-; return 0; }
-EOF
-if { (eval echo configure:3195: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_lib=HAVE_LIB`echo socket | sed -e 's/[^a-zA-Z0-9_]/_/g' \
-    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_lib 1
-EOF
-
-  LIBS="-lsocket $LIBS"
-
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:3223: checking for gethostbyname in -lnsl" >&5
-ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-lnsl  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 3231 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char gethostbyname();
-
-int main() {
-gethostbyname()
-; return 0; }
-EOF
-if { (eval echo configure:3242: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_lib=HAVE_LIB`echo nsl | sed -e 's/[^a-zA-Z0-9_]/_/g' \
-    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_lib 1
-EOF
-
-  LIBS="-lnsl $LIBS"
-
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-. ${srcdir}/../../bfd/configure.host
-
-
-
-USE_MAINTAINER_MODE=no
-# Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
-if test "${enable_maintainer_mode+set}" = set; then
-  enableval="$enable_maintainer_mode"
-  case "${enableval}" in
-  yes)	MAINT="" USE_MAINTAINER_MODE=yes ;;
-  no)	MAINT="#" ;;
-  *)	{ echo "configure: error: "--enable-maintainer-mode does not take a value"" 1>&2; exit 1; }; MAINT="#" ;;
-esac
-if test x"$silent" != x"yes" && test x"$MAINT" = x""; then
-  echo "Setting maintainer mode" 6>&1
-fi
-else
-  MAINT="#"
-fi
-
-
-
-# Check whether --enable-sim-bswap or --disable-sim-bswap was given.
-if test "${enable_sim_bswap+set}" = set; then
-  enableval="$enable_sim_bswap"
-  case "${enableval}" in
-  yes)	sim_bswap="-DWITH_BSWAP=1 -DUSE_BSWAP=1";;
-  no)	sim_bswap="-DWITH_BSWAP=0";;
-  *)	{ echo "configure: error: "--enable-sim-bswap does not take a value"" 1>&2; exit 1; }; sim_bswap="";;
-esac
-if test x"$silent" != x"yes" && test x"$sim_bswap" != x""; then
-  echo "Setting bswap flags = $sim_bswap" 6>&1
-fi
-else
-  sim_bswap=""
-fi
-
-
-
-# Check whether --enable-sim-cflags or --disable-sim-cflags was given.
-if test "${enable_sim_cflags+set}" = set; then
-  enableval="$enable_sim_cflags"
-  case "${enableval}" in
-  yes)	 sim_cflags="-O2 -fomit-frame-pointer";;
-  trace) { echo "configure: error: "Please use --enable-sim-debug instead."" 1>&2; exit 1; }; sim_cflags="";;
-  no)	 sim_cflags="";;
-  *)	 sim_cflags=`echo "${enableval}" | sed -e "s/,/ /g"`;;
-esac
-if test x"$silent" != x"yes" && test x"$sim_cflags" != x""; then
-  echo "Setting sim cflags = $sim_cflags" 6>&1
-fi
-else
-  sim_cflags=""
-fi
-
-
-
-# Check whether --enable-sim-debug or --disable-sim-debug was given.
-if test "${enable_sim_debug+set}" = set; then
-  enableval="$enable_sim_debug"
-  case "${enableval}" in
-  yes) sim_debug="-DDEBUG=7 -DWITH_DEBUG=7";;
-  no)  sim_debug="-DDEBUG=0 -DWITH_DEBUG=0";;
-  *)   sim_debug="-DDEBUG='(${enableval})' -DWITH_DEBUG='(${enableval})'";;
-esac
-if test x"$silent" != x"yes" && test x"$sim_debug" != x""; then
-  echo "Setting sim debug = $sim_debug" 6>&1
-fi
-else
-  sim_debug=""
-fi
-
-
-
-# Check whether --enable-sim-stdio or --disable-sim-stdio was given.
-if test "${enable_sim_stdio+set}" = set; then
-  enableval="$enable_sim_stdio"
-  case "${enableval}" in
-  yes)	sim_stdio="-DWITH_STDIO=DO_USE_STDIO";;
-  no)	sim_stdio="-DWITH_STDIO=DONT_USE_STDIO";;
-  *)	{ echo "configure: error: "Unknown value $enableval passed to --enable-sim-stdio"" 1>&2; exit 1; }; sim_stdio="";;
-esac
-if test x"$silent" != x"yes" && test x"$sim_stdio" != x""; then
-  echo "Setting stdio flags = $sim_stdio" 6>&1
-fi
-else
-  sim_stdio=""
-fi
-
-
-
-# Check whether --enable-sim-trace or --disable-sim-trace was given.
-if test "${enable_sim_trace+set}" = set; then
-  enableval="$enable_sim_trace"
-  case "${enableval}" in
-  yes)	sim_trace="-DTRACE=1 -DWITH_TRACE=-1";;
-  no)	sim_trace="-DTRACE=0 -DWITH_TRACE=0";;
-  [-0-9]*)
-	sim_trace="-DTRACE='(${enableval})' -DWITH_TRACE='(${enableval})'";;
-  [a-z]*)
-	sim_trace=""
-	for x in `echo "$enableval" | sed -e "s/,/ /g"`; do
-	  if test x"$sim_trace" = x; then
-	    sim_trace="-DWITH_TRACE='(TRACE_$x"
-	  else
-	    sim_trace="${sim_trace}|TRACE_$x"
-	  fi
-	done
-	sim_trace="$sim_trace)'" ;;
-esac
-if test x"$silent" != x"yes" && test x"$sim_trace" != x""; then
-  echo "Setting sim trace = $sim_trace" 6>&1
-fi
-else
-  sim_trace=""
-fi
-
-
-
-# Check whether --enable-sim-profile or --disable-sim-profile was given.
-if test "${enable_sim_profile+set}" = set; then
-  enableval="$enable_sim_profile"
-  case "${enableval}" in
-  yes)	sim_profile="-DPROFILE=1 -DWITH_PROFILE=-1";;
-  no)	sim_profile="-DPROFILE=0 -DWITH_PROFILE=0";;
-  [-0-9]*)
-	sim_profile="-DPROFILE='(${enableval})' -DWITH_PROFILE='(${enableval})'";;
-  [a-z]*)
-	sim_profile=""
-	for x in `echo "$enableval" | sed -e "s/,/ /g"`; do
-	  if test x"$sim_profile" = x; then
-	    sim_profile="-DWITH_PROFILE='(PROFILE_$x"
-	  else
-	    sim_profile="${sim_profile}|PROFILE_$x"
-	  fi
-	done
-	sim_profile="$sim_profile)'" ;;
-esac
-if test x"$silent" != x"yes" && test x"$sim_profile" != x""; then
-  echo "Setting sim profile = $sim_profile" 6>&1
-fi
-else
-  sim_profile="-DPROFILE=1 -DWITH_PROFILE=-1"
-fi
-
-
-
-echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
-echo "configure:3418: checking return type of signal handlers" >&5
-if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 3423 "configure"
-#include "confdefs.h"
-#include <sys/types.h>
-#include <signal.h>
-#ifdef signal
-#undef signal
-#endif
-#ifdef __cplusplus
-extern "C" void (*signal (int, void (*)(int)))(int);
-#else
-void (*signal ()) ();
-#endif
-
-int main() {
-int i;
-; return 0; }
-EOF
-if { (eval echo configure:3440: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  ac_cv_type_signal=void
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_type_signal=int
-fi
-rm -f conftest*
-fi
-
-echo "$ac_t""$ac_cv_type_signal" 1>&6
-cat >> confdefs.h <<EOF
-#define RETSIGTYPE $ac_cv_type_signal
-EOF
-
-
-
-
-
-echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:3462: checking for executable suffix" >&5
-if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test "$CYGWIN" = yes || test "$MINGW32" = yes; then
-  ac_cv_exeext=.exe
-else
-  rm -f conftest*
-  echo 'int main () { return 0; }' > conftest.$ac_ext
-  ac_cv_exeext=
-  if { (eval echo configure:3472: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
-    for file in conftest.*; do
-      case $file in
-      *.c | *.o | *.obj | *.ilk | *.pdb) ;;
-      *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
-      esac
-    done
-  else
-    { echo "configure: error: installation or configuration problem: compiler cannot create executables." 1>&2; exit 1; }
-  fi
-  rm -f conftest*
-  test x"${ac_cv_exeext}" = x && ac_cv_exeext=no
-fi
-fi
-
-EXEEXT=""
-test x"${ac_cv_exeext}" != xno && EXEEXT=${ac_cv_exeext}
-echo "$ac_t""${ac_cv_exeext}" 1>&6
-ac_exeext=$EXEEXT
-
-
-sim_link_files=
-sim_link_links=
-
-sim_link_links=tconfig.h
-if test -f ${srcdir}/tconfig.in
-then
-  sim_link_files=tconfig.in
-else
-  sim_link_files=../common/tconfig.in
-fi
-
-# targ-vals.def points to the libc macro description file.
-case "${target}" in
-*-*-*) TARG_VALS_DEF=../common/nltvals.def ;;
-esac
-sim_link_files="${sim_link_files} ${TARG_VALS_DEF}"
-sim_link_links="${sim_link_links} targ-vals.def"
-
-
-
-
-wire_endian=""
-default_endian="BIG_ENDIAN"
-# Check whether --enable-sim-endian or --disable-sim-endian was given.
-if test "${enable_sim_endian+set}" = set; then
-  enableval="$enable_sim_endian"
-  case "${enableval}" in
-  b*|B*) sim_endian="-DWITH_TARGET_BYTE_ORDER=BIG_ENDIAN";;
-  l*|L*) sim_endian="-DWITH_TARGET_BYTE_ORDER=LITTLE_ENDIAN";;
-  yes)	 if test x"$wire_endian" != x; then
-	   sim_endian="-DWITH_TARGET_BYTE_ORDER=${wire_endian}"
-	 else
-           if test x"$default_endian" != x; then
-	     sim_endian="-DWITH_TARGET_BYTE_ORDER=${default_endian}"
-	   else
-	     echo "No hard-wired endian for target $target" 1>&6
-	     sim_endian="-DWITH_TARGET_BYTE_ORDER=0"
-	   fi
-	 fi;;
-  no)	 if test x"$default_endian" != x; then
-	   sim_endian="-DWITH_DEFAULT_TARGET_BYTE_ORDER=${default_endian}"
-	 else
-	   if test x"$wire_endian" != x; then
-	     sim_endian="-DWITH_DEFAULT_TARGET_BYTE_ORDER=${wire_endian}"
-	   else
-	     echo "No default endian for target $target" 1>&6
-	     sim_endian="-DWITH_DEFAULT_TARGET_BYTE_ORDER=0"
-	   fi
-	 fi;;
-  *)	 { echo "configure: error: "Unknown value $enableval for --enable-sim-endian"" 1>&2; exit 1; }; sim_endian="";;
-esac
-if test x"$silent" != x"yes" && test x"$sim_endian" != x""; then
-  echo "Setting endian flags = $sim_endian" 6>&1
-fi
-else
-  if test x"$default_endian" != x; then
-  sim_endian="-DWITH_DEFAULT_TARGET_BYTE_ORDER=${default_endian}"
-else
-  if test x"$wire_endian" != x; then
-    sim_endian="-DWITH_TARGET_BYTE_ORDER=${wire_endian}"
-  else
-    sim_endian=
-  fi
-fi
-fi
-
-wire_alignment="STRICT_ALIGNMENT"
-default_alignment=""
-
-# Check whether --enable-sim-alignment or --disable-sim-alignment was given.
-if test "${enable_sim_alignment+set}" = set; then
-  enableval="$enable_sim_alignment"
-  case "${enableval}" in
-  strict | STRICT)       sim_alignment="-DWITH_ALIGNMENT=STRICT_ALIGNMENT";;
-  nonstrict | NONSTRICT) sim_alignment="-DWITH_ALIGNMENT=NONSTRICT_ALIGNMENT";;
-  forced | FORCED)       sim_alignment="-DWITH_ALIGNMENT=FORCED_ALIGNMENT";;
-  yes) if test x"$wire_alignment" != x; then
-	 sim_alignment="-DWITH_ALIGNMENT=${wire_alignment}"
-       else
-         if test x"$default_alignment" != x; then
-           sim_alignment="-DWITH_ALIGNMENT=${default_alignment}"
-         else
-	   echo "No hard-wired alignment for target $target" 1>&6
-	   sim_alignment="-DWITH_ALIGNMENT=0"
-         fi
-       fi;;
-  no)  if test x"$default_alignment" != x; then
-	 sim_alignment="-DWITH_DEFAULT_ALIGNMENT=${default_alignment}"
-       else
-         if test x"$wire_alignment" != x; then
-	   sim_alignment="-DWITH_DEFAULT_ALIGNMENT=${wire_alignment}"
-         else
-           echo "No default alignment for target $target" 1>&6
-           sim_alignment="-DWITH_DEFAULT_ALIGNMENT=0"
-         fi
-       fi;;
-  *)   { echo "configure: error: "Unknown value $enableval passed to --enable-sim-alignment"" 1>&2; exit 1; }; sim_alignment="";;
-esac
-if test x"$silent" != x"yes" && test x"$sim_alignment" != x""; then
-  echo "Setting alignment flags = $sim_alignment" 6>&1
-fi
-else
-  if test x"$default_alignment" != x; then
-  sim_alignment="-DWITH_DEFAULT_ALIGNMENT=${default_alignment}"
-else
-  if test x"$wire_alignment" != x; then
-    sim_alignment="-DWITH_ALIGNMENT=${wire_alignment}"
-  else
-    sim_alignment=
-  fi
-fi
-fi
-
-
-# Check whether --enable-sim-hostendian or --disable-sim-hostendian was given.
-if test "${enable_sim_hostendian+set}" = set; then
-  enableval="$enable_sim_hostendian"
-  case "${enableval}" in
-  no)	 sim_hostendian="-DWITH_HOST_BYTE_ORDER=0";;
-  b*|B*) sim_hostendian="-DWITH_HOST_BYTE_ORDER=BIG_ENDIAN";;
-  l*|L*) sim_hostendian="-DWITH_HOST_BYTE_ORDER=LITTLE_ENDIAN";;
-  *)	 { echo "configure: error: "Unknown value $enableval for --enable-sim-hostendian"" 1>&2; exit 1; }; sim_hostendian="";;
-esac
-if test x"$silent" != x"yes" && test x"$sim_hostendian" != x""; then
-  echo "Setting hostendian flags = $sim_hostendian" 6>&1
-fi
-else
-  
-if test "x$cross_compiling" = "xno"; then
-  echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
-echo "configure:3623: checking whether byte ordering is bigendian" >&5
-if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_cv_c_bigendian=unknown
-# See if sys/param.h defines the BYTE_ORDER macro.
-cat > conftest.$ac_ext <<EOF
-#line 3630 "configure"
-#include "confdefs.h"
-#include <sys/types.h>
-#include <sys/param.h>
-int main() {
-
-#if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN
- bogus endian macros
-#endif
-; return 0; }
-EOF
-if { (eval echo configure:3641: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  # It does; now see whether it defined to BIG_ENDIAN or not.
-cat > conftest.$ac_ext <<EOF
-#line 3645 "configure"
-#include "confdefs.h"
-#include <sys/types.h>
-#include <sys/param.h>
-int main() {
-
-#if BYTE_ORDER != BIG_ENDIAN
- not big endian
-#endif
-; return 0; }
-EOF
-if { (eval echo configure:3656: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  ac_cv_c_bigendian=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_c_bigendian=no
-fi
-rm -f conftest*
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-fi
-rm -f conftest*
-if test $ac_cv_c_bigendian = unknown; then
-if test "$cross_compiling" = yes; then
-    { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
-else
-  cat > conftest.$ac_ext <<EOF
-#line 3676 "configure"
-#include "confdefs.h"
-main () {
-  /* Are we little or big endian?  From Harbison&Steele.  */
-  union
-  {
-    long l;
-    char c[sizeof (long)];
-  } u;
-  u.l = 1;
-  exit (u.c[sizeof (long) - 1] == 1);
-}
-EOF
-if { (eval echo configure:3689: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
-  ac_cv_c_bigendian=no
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -fr conftest*
-  ac_cv_c_bigendian=yes
-fi
-rm -fr conftest*
-fi
-
-fi
-fi
-
-echo "$ac_t""$ac_cv_c_bigendian" 1>&6
-if test $ac_cv_c_bigendian = yes; then
-  cat >> confdefs.h <<\EOF
-#define WORDS_BIGENDIAN 1
-EOF
-
-fi
-
-  if test $ac_cv_c_bigendian = yes; then
-    sim_hostendian="-DWITH_HOST_BYTE_ORDER=BIG_ENDIAN"
-  else
-    sim_hostendian="-DWITH_HOST_BYTE_ORDER=LITTLE_ENDIAN"
-  fi
-else
-  sim_hostendian="-DWITH_HOST_BYTE_ORDER=0"
-fi
-fi
-
-
-default_sim_scache="16384"
-# Check whether --enable-sim-scache or --disable-sim-scache was given.
-if test "${enable_sim_scache+set}" = set; then
-  enableval="$enable_sim_scache"
-  case "${enableval}" in
-  yes)	sim_scache="-DWITH_SCACHE=${default_sim_scache}";;
-  no)	sim_scache="-DWITH_SCACHE=0" ;;
-  [0-9]*) sim_cache=${enableval};;
-  *)	{ echo "configure: error: "Bad value $enableval passed to --enable-sim-scache"" 1>&2; exit 1; };
-	sim_scache="";;
-esac
-if test x"$silent" != x"yes" && test x"$sim_scache" != x""; then
-  echo "Setting scache size = $sim_scache" 6>&1
-fi
-else
-  sim_scache="-DWITH_SCACHE=${default_sim_scache}"
-fi
-
-
-
-default_sim_default_model="sh5"
-# Check whether --enable-sim-default-model or --disable-sim-default-model was given.
-if test "${enable_sim_default_model+set}" = set; then
-  enableval="$enable_sim_default_model"
-  case "${enableval}" in
-  yes|no) { echo "configure: error: "Missing argument to --enable-sim-default-model"" 1>&2; exit 1; };;
-  *)	sim_default_model="-DWITH_DEFAULT_MODEL='\"${enableval}\"'";;
-esac
-if test x"$silent" != x"yes" && test x"$sim_default_model" != x""; then
-  echo "Setting default model = $sim_default_model" 6>&1
-fi
-else
-  sim_default_model="-DWITH_DEFAULT_MODEL='\"${default_sim_default_model}\"'"
-fi
-
-
-
-# Check whether --enable-sim-environment or --disable-sim-environment was given.
-if test "${enable_sim_environment+set}" = set; then
-  enableval="$enable_sim_environment"
-  case "${enableval}" in
-  all | ALL)             sim_environment="-DWITH_ENVIRONMENT=ALL_ENVIRONMENT";;
-  user | USER)           sim_environment="-DWITH_ENVIRONMENT=USER_ENVIRONMENT";;
-  virtual | VIRTUAL)     sim_environment="-DWITH_ENVIRONMENT=VIRTUAL_ENVIRONMENT";;
-  operating | OPERATING) sim_environment="-DWITH_ENVIRONMENT=OPERATING_ENVIRONMENT";;
-  *)   { echo "configure: error: "Unknown value $enableval passed to --enable-sim-environment"" 1>&2; exit 1; };
-       sim_environment="";;
-esac
-if test x"$silent" != x"yes" && test x"$sim_environment" != x""; then
-  echo "Setting sim environment = $sim_environment" 6>&1
-fi
-else
-  sim_environment="-DWITH_ENVIRONMENT=ALL_ENVIRONMENT"
-fi
-
-
-default_sim_inline=""
-# Check whether --enable-sim-inline or --disable-sim-inline was given.
-if test "${enable_sim_inline+set}" = set; then
-  enableval="$enable_sim_inline"
-  sim_inline=""
-case "$enableval" in
-  no)		sim_inline="-DDEFAULT_INLINE=0";;
-  0)		sim_inline="-DDEFAULT_INLINE=0";;
-  yes | 2)	sim_inline="-DDEFAULT_INLINE=ALL_C_INLINE";;
-  1)		sim_inline="-DDEFAULT_INLINE=INLINE_LOCALS";;
-  *) for x in `echo "$enableval" | sed -e "s/,/ /g"`; do
-       new_flag=""
-       case "$x" in
-	 *_INLINE=*)	new_flag="-D$x";;
-	 *=*)		new_flag=`echo "$x" | sed -e "s/=/_INLINE=/" -e "s/^/-D/"`;;
-	 *_INLINE)	new_flag="-D$x=ALL_C_INLINE";;
-	 *)		new_flag="-D$x""_INLINE=ALL_C_INLINE";;
-       esac
-       if test x"$sim_inline" = x""; then
-	 sim_inline="$new_flag"
-       else
-	 sim_inline="$sim_inline $new_flag"
-       fi
-     done;;
-esac
-if test x"$silent" != x"yes" && test x"$sim_inline" != x""; then
-  echo "Setting inline flags = $sim_inline" 6>&1
-fi
-else
-  
-if test "x$cross_compiling" = "xno"; then
-  if test x"$GCC" != "x" -a x"${default_sim_inline}" != "x" ; then
-    sim_inline="${default_sim_inline}"
-    if test x"$silent" != x"yes"; then
-      echo "Setting inline flags = $sim_inline" 6>&1
-    fi
-  else
-    sim_inline=""
-  fi
-else
-  sim_inline="-DDEFAULT_INLINE=0"
-fi
-fi
-
-
-cgen_maint=no
-cgendir='$(srcdir)/../../cgen'
-
-# Check whether --enable-cgen-maint or --disable-cgen-maint was given.
-if test "${enable_cgen_maint+set}" = set; then
-  enableval="$enable_cgen_maint"
-  case "${enableval}" in
-  yes)	cgen_maint=yes ;;
-  no)	cgen_maint=no ;;
-  *)
-	# argument is cgen install directory (not implemented yet).
-	# Having a `share' directory might be more appropriate for the .scm,
-	# .cpu, etc. files.
-	cgendir=${cgen_maint}/lib/cgen
-	;;
-esac
-fi
-if test x${cgen_maint} != xno ; then
-  CGEN_MAINT=''
-else
-  CGEN_MAINT='#'
-fi
-
-
-
-
-
-
-
-trap '' 1 2 15
-cat > confcache <<\EOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs.  It is not useful on other systems.
-# If it contains results you don't want to keep, you may remove or edit it.
-#
-# By default, configure uses ./config.cache as the cache file,
-# creating it if it does not exist already.  You can give configure
-# the --cache-file=FILE option to use a different cache file; that is
-# what configure does when it calls configure scripts in
-# subdirectories, so they share the cache.
-# Giving --cache-file=/dev/null disables caching, for debugging configure.
-# config.status only pays attention to the cache file if you give it the
-# --recheck option to rerun configure.
-#
-EOF
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(set) 2>&1 |
-  case `(ac_space=' '; set | grep ac_space) 2>&1` in
-  *ac_space=\ *)
-    # `set' does not quote correctly, so add quotes (double-quote substitution
-    # turns \\\\ into \\, and sed turns \\ into \).
-    sed -n \
-      -e "s/'/'\\\\''/g" \
-      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
-    ;;
-  *)
-    # `set' quotes correctly as required by POSIX, so do not add quotes.
-    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
-    ;;
-  esac >> confcache
-if cmp -s $cache_file confcache; then
-  :
-else
-  if test -w $cache_file; then
-    echo "updating cache $cache_file"
-    cat confcache > $cache_file
-  else
-    echo "not updating unwritable cache $cache_file"
-  fi
-fi
-rm -f confcache
-
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-# Any assignment to VPATH causes Sun make to only execute
-# the first set of double-colon rules, so remove it if not needed.
-# If there is a colon in the path, we need to keep it.
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[ 	]*VPATH[ 	]*=[^:]*$/d'
-fi
-
-trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
-
-DEFS=-DHAVE_CONFIG_H
-
-# Without the "./", some shells look in PATH for config.status.
-: ${CONFIG_STATUS=./config.status}
-
-echo creating $CONFIG_STATUS
-rm -f $CONFIG_STATUS
-cat > $CONFIG_STATUS <<EOF
-#! /bin/sh
-# Generated automatically by configure.
-# Run this file to recreate the current configuration.
-# This directory was configured as follows,
-# on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-#
-# $0 $ac_configure_args
-#
-# Compiler output produced by configure, useful for debugging
-# configure, is in ./config.log if it exists.
-
-ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]"
-for ac_option
-do
-  case "\$ac_option" in
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
-    exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
-  -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
-    echo "$CONFIG_STATUS generated by autoconf version 2.13"
-    exit 0 ;;
-  -help | --help | --hel | --he | --h)
-    echo "\$ac_cs_usage"; exit 0 ;;
-  *) echo "\$ac_cs_usage"; exit 1 ;;
-  esac
-done
-
-ac_given_srcdir=$srcdir
-ac_given_INSTALL="$INSTALL"
-
-trap 'rm -fr `echo "Makefile.sim:Makefile.in Make-common.sim:../common/Make-common.in .gdbinit:../common/gdbinit.in config.h:config.in" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
-EOF
-cat >> $CONFIG_STATUS <<EOF
-
-# Protect against being on the right side of a sed subst in config.status.
-sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g;
- s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
-$ac_vpsub
-$extrasub
-s%@sim_environment@%$sim_environment%g
-s%@sim_alignment@%$sim_alignment%g
-s%@sim_assert@%$sim_assert%g
-s%@sim_bitsize@%$sim_bitsize%g
-s%@sim_endian@%$sim_endian%g
-s%@sim_hostendian@%$sim_hostendian%g
-s%@sim_float@%$sim_float%g
-s%@sim_scache@%$sim_scache%g
-s%@sim_default_model@%$sim_default_model%g
-s%@sim_hw_cflags@%$sim_hw_cflags%g
-s%@sim_hw_objs@%$sim_hw_objs%g
-s%@sim_hw@%$sim_hw%g
-s%@sim_inline@%$sim_inline%g
-s%@sim_packages@%$sim_packages%g
-s%@sim_regparm@%$sim_regparm%g
-s%@sim_reserved_bits@%$sim_reserved_bits%g
-s%@sim_smp@%$sim_smp%g
-s%@sim_stdcall@%$sim_stdcall%g
-s%@sim_xor_endian@%$sim_xor_endian%g
-s%@WARN_CFLAGS@%$WARN_CFLAGS%g
-s%@WERROR_CFLAGS@%$WERROR_CFLAGS%g
-s%@SHELL@%$SHELL%g
-s%@CFLAGS@%$CFLAGS%g
-s%@CPPFLAGS@%$CPPFLAGS%g
-s%@CXXFLAGS@%$CXXFLAGS%g
-s%@FFLAGS@%$FFLAGS%g
-s%@DEFS@%$DEFS%g
-s%@LDFLAGS@%$LDFLAGS%g
-s%@LIBS@%$LIBS%g
-s%@exec_prefix@%$exec_prefix%g
-s%@prefix@%$prefix%g
-s%@program_transform_name@%$program_transform_name%g
-s%@bindir@%$bindir%g
-s%@sbindir@%$sbindir%g
-s%@libexecdir@%$libexecdir%g
-s%@datadir@%$datadir%g
-s%@sysconfdir@%$sysconfdir%g
-s%@sharedstatedir@%$sharedstatedir%g
-s%@localstatedir@%$localstatedir%g
-s%@libdir@%$libdir%g
-s%@includedir@%$includedir%g
-s%@oldincludedir@%$oldincludedir%g
-s%@infodir@%$infodir%g
-s%@mandir@%$mandir%g
-s%@host@%$host%g
-s%@host_alias@%$host_alias%g
-s%@host_cpu@%$host_cpu%g
-s%@host_vendor@%$host_vendor%g
-s%@host_os@%$host_os%g
-s%@target@%$target%g
-s%@target_alias@%$target_alias%g
-s%@target_cpu@%$target_cpu%g
-s%@target_vendor@%$target_vendor%g
-s%@target_os@%$target_os%g
-s%@build@%$build%g
-s%@build_alias@%$build_alias%g
-s%@build_cpu@%$build_cpu%g
-s%@build_vendor@%$build_vendor%g
-s%@build_os@%$build_os%g
-s%@CC@%$CC%g
-s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
-s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
-s%@INSTALL_DATA@%$INSTALL_DATA%g
-s%@CC_FOR_BUILD@%$CC_FOR_BUILD%g
-s%@HDEFINES@%$HDEFINES%g
-s%@AR@%$AR%g
-s%@RANLIB@%$RANLIB%g
-s%@SET_MAKE@%$SET_MAKE%g
-s%@CPP@%$CPP%g
-s%@ALLOCA@%$ALLOCA%g
-s%@USE_NLS@%$USE_NLS%g
-s%@MSGFMT@%$MSGFMT%g
-s%@GMSGFMT@%$GMSGFMT%g
-s%@XGETTEXT@%$XGETTEXT%g
-s%@USE_INCLUDED_LIBINTL@%$USE_INCLUDED_LIBINTL%g
-s%@CATALOGS@%$CATALOGS%g
-s%@CATOBJEXT@%$CATOBJEXT%g
-s%@DATADIRNAME@%$DATADIRNAME%g
-s%@GMOFILES@%$GMOFILES%g
-s%@INSTOBJEXT@%$INSTOBJEXT%g
-s%@INTLDEPS@%$INTLDEPS%g
-s%@INTLLIBS@%$INTLLIBS%g
-s%@INTLOBJS@%$INTLOBJS%g
-s%@POFILES@%$POFILES%g
-s%@POSUB@%$POSUB%g
-s%@INCLUDE_LOCALE_H@%$INCLUDE_LOCALE_H%g
-s%@GT_NO@%$GT_NO%g
-s%@GT_YES@%$GT_YES%g
-s%@MKINSTALLDIRS@%$MKINSTALLDIRS%g
-s%@l@%$l%g
-s%@MAINT@%$MAINT%g
-s%@sim_bswap@%$sim_bswap%g
-s%@sim_cflags@%$sim_cflags%g
-s%@sim_debug@%$sim_debug%g
-s%@sim_stdio@%$sim_stdio%g
-s%@sim_trace@%$sim_trace%g
-s%@sim_profile@%$sim_profile%g
-s%@EXEEXT@%$EXEEXT%g
-s%@CGEN_MAINT@%$CGEN_MAINT%g
-s%@cgendir@%$cgendir%g
-s%@cgen@%$cgen%g
-
-CEOF
-EOF
-
-cat >> $CONFIG_STATUS <<\EOF
-
-# Split the substitutions into bite-sized pieces for seds with
-# small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
-ac_file=1 # Number of current file.
-ac_beg=1 # First line for current file.
-ac_end=$ac_max_sed_cmds # Line after last line for current file.
-ac_more_lines=:
-ac_sed_cmds=""
-while $ac_more_lines; do
-  if test $ac_beg -gt 1; then
-    sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file
-  else
-    sed "${ac_end}q" conftest.subs > conftest.s$ac_file
-  fi
-  if test ! -s conftest.s$ac_file; then
-    ac_more_lines=false
-    rm -f conftest.s$ac_file
-  else
-    if test -z "$ac_sed_cmds"; then
-      ac_sed_cmds="sed -f conftest.s$ac_file"
-    else
-      ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file"
-    fi
-    ac_file=`expr $ac_file + 1`
-    ac_beg=$ac_end
-    ac_end=`expr $ac_end + $ac_max_sed_cmds`
-  fi
-done
-if test -z "$ac_sed_cmds"; then
-  ac_sed_cmds=cat
-fi
-EOF
-
-cat >> $CONFIG_STATUS <<EOF
-
-CONFIG_FILES=\${CONFIG_FILES-"Makefile.sim:Makefile.in Make-common.sim:../common/Make-common.in .gdbinit:../common/gdbinit.in"}
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case "$ac_file" in
-  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
-       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-  *) ac_file_in="${ac_file}.in" ;;
-  esac
-
-  # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
-
-  # Remove last slash and all that follows it.  Not all systems have dirname.
-  ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
-  if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
-    # The file is in a subdirectory.
-    test ! -d "$ac_dir" && mkdir "$ac_dir"
-    ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`"
-    # A "../" for each directory in $ac_dir_suffix.
-    ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'`
-  else
-    ac_dir_suffix= ac_dots=
-  fi
-
-  case "$ac_given_srcdir" in
-  .)  srcdir=.
-      if test -z "$ac_dots"; then top_srcdir=.
-      else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;;
-  /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;;
-  *) # Relative path.
-    srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
-    top_srcdir="$ac_dots$ac_given_srcdir" ;;
-  esac
-
-  case "$ac_given_INSTALL" in
-  [/$]*) INSTALL="$ac_given_INSTALL" ;;
-  *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
-  esac
-
-  echo creating "$ac_file"
-  rm -f "$ac_file"
-  configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
-  case "$ac_file" in
-  *Makefile*) ac_comsub="1i\\
-# $configure_input" ;;
-  *) ac_comsub= ;;
-  esac
-
-  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
-  sed -e "$ac_comsub
-s%@configure_input@%$configure_input%g
-s%@srcdir@%$srcdir%g
-s%@top_srcdir@%$top_srcdir%g
-s%@INSTALL@%$INSTALL%g
-" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file
-fi; done
-rm -f conftest.s*
-
-# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where
-# NAME is the cpp macro being defined and VALUE is the value it is being given.
-#
-# ac_d sets the value in "#define NAME VALUE" lines.
-ac_dA='s%^\([ 	]*\)#\([ 	]*define[ 	][ 	]*\)'
-ac_dB='\([ 	][ 	]*\)[^ 	]*%\1#\2'
-ac_dC='\3'
-ac_dD='%g'
-# ac_u turns "#undef NAME" with trailing blanks into "#define NAME VALUE".
-ac_uA='s%^\([ 	]*\)#\([ 	]*\)undef\([ 	][ 	]*\)'
-ac_uB='\([ 	]\)%\1#\2define\3'
-ac_uC=' '
-ac_uD='\4%g'
-# ac_e turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
-ac_eA='s%^\([ 	]*\)#\([ 	]*\)undef\([ 	][ 	]*\)'
-ac_eB='$%\1#\2define\3'
-ac_eC=' '
-ac_eD='%g'
-
-if test "${CONFIG_HEADERS+set}" != set; then
-EOF
-cat >> $CONFIG_STATUS <<EOF
-  CONFIG_HEADERS="config.h:config.in"
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-fi
-for ac_file in .. $CONFIG_HEADERS; do if test "x$ac_file" != x..; then
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case "$ac_file" in
-  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
-       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-  *) ac_file_in="${ac_file}.in" ;;
-  esac
-
-  echo creating $ac_file
-
-  rm -f conftest.frag conftest.in conftest.out
-  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
-  cat $ac_file_inputs > conftest.in
-
-EOF
-
-# Transform confdefs.h into a sed script conftest.vals that substitutes
-# the proper values into config.h.in to produce config.h.  And first:
-# Protect against being on the right side of a sed subst in config.status.
-# Protect against being in an unquoted here document in config.status.
-rm -f conftest.vals
-cat > conftest.hdr <<\EOF
-s/[\\&%]/\\&/g
-s%[\\$`]%\\&%g
-s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD}%gp
-s%ac_d%ac_u%gp
-s%ac_u%ac_e%gp
-EOF
-sed -n -f conftest.hdr confdefs.h > conftest.vals
-rm -f conftest.hdr
-
-# This sed command replaces #undef with comments.  This is necessary, for
-# example, in the case of _POSIX_SOURCE, which is predefined and required
-# on some systems where configure will not decide to define it.
-cat >> conftest.vals <<\EOF
-s%^[ 	]*#[ 	]*undef[ 	][ 	]*[a-zA-Z_][a-zA-Z_0-9]*%/* & */%
-EOF
-
-# Break up conftest.vals because some shells have a limit on
-# the size of here documents, and old seds have small limits too.
-
-rm -f conftest.tail
-while :
-do
-  ac_lines=`grep -c . conftest.vals`
-  # grep -c gives empty output for an empty file on some AIX systems.
-  if test -z "$ac_lines" || test "$ac_lines" -eq 0; then break; fi
-  # Write a limited-size here document to conftest.frag.
-  echo '  cat > conftest.frag <<CEOF' >> $CONFIG_STATUS
-  sed ${ac_max_here_lines}q conftest.vals >> $CONFIG_STATUS
-  echo 'CEOF
-  sed -f conftest.frag conftest.in > conftest.out
-  rm -f conftest.in
-  mv conftest.out conftest.in
-' >> $CONFIG_STATUS
-  sed 1,${ac_max_here_lines}d conftest.vals > conftest.tail
-  rm -f conftest.vals
-  mv conftest.tail conftest.vals
-done
-rm -f conftest.vals
-
-cat >> $CONFIG_STATUS <<\EOF
-  rm -f conftest.frag conftest.h
-  echo "/* $ac_file.  Generated automatically by configure.  */" > conftest.h
-  cat conftest.in >> conftest.h
-  rm -f conftest.in
-  if cmp -s $ac_file conftest.h 2>/dev/null; then
-    echo "$ac_file is unchanged"
-    rm -f conftest.h
-  else
-    # Remove last slash and all that follows it.  Not all systems have dirname.
-      ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
-      if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
-      # The file is in a subdirectory.
-      test ! -d "$ac_dir" && mkdir "$ac_dir"
-    fi
-    rm -f $ac_file
-    mv conftest.h $ac_file
-  fi
-fi; done
-
-EOF
-
-cat >> $CONFIG_STATUS <<EOF
-ac_sources="$sim_link_files"
-ac_dests="$sim_link_links"
-EOF
-
-cat >> $CONFIG_STATUS <<\EOF
-srcdir=$ac_given_srcdir
-while test -n "$ac_sources"; do
-  set $ac_dests; ac_dest=$1; shift; ac_dests=$*
-  set $ac_sources; ac_source=$1; shift; ac_sources=$*
-
-  echo "linking $srcdir/$ac_source to $ac_dest"
-
-  if test ! -r $srcdir/$ac_source; then
-    { echo "configure: error: $srcdir/$ac_source: File not found" 1>&2; exit 1; }
-  fi
-  rm -f $ac_dest
-
-  # Make relative symlinks.
-  # Remove last slash and all that follows it.  Not all systems have dirname.
-  ac_dest_dir=`echo $ac_dest|sed 's%/[^/][^/]*$%%'`
-  if test "$ac_dest_dir" != "$ac_dest" && test "$ac_dest_dir" != .; then
-    # The dest file is in a subdirectory.
-    test ! -d "$ac_dest_dir" && mkdir "$ac_dest_dir"
-    ac_dest_dir_suffix="/`echo $ac_dest_dir|sed 's%^\./%%'`"
-    # A "../" for each directory in $ac_dest_dir_suffix.
-    ac_dots=`echo $ac_dest_dir_suffix|sed 's%/[^/]*%../%g'`
-  else
-    ac_dest_dir_suffix= ac_dots=
-  fi
-
-  case "$srcdir" in
-  [/$]*) ac_rel_source="$srcdir/$ac_source" ;;
-  *) ac_rel_source="$ac_dots$srcdir/$ac_source" ;;
-  esac
-
-  # Make a symlink if possible; otherwise try a hard link.
-  if ln -s $ac_rel_source $ac_dest 2>/dev/null ||
-    ln $srcdir/$ac_source $ac_dest; then :
-  else
-    { echo "configure: error: can not link $ac_dest to $srcdir/$ac_source" 1>&2; exit 1; }
-  fi
-done
-EOF
-cat >> $CONFIG_STATUS <<EOF
-
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-case "x$CONFIG_FILES" in
- xMakefile*)
-   echo "Merging Makefile.sim+Make-common.sim into Makefile ..."
-   rm -f Makesim1.tmp Makesim2.tmp Makefile
-   sed -n -e '/^## COMMON_PRE_/,/^## End COMMON_PRE_/ p' <Make-common.sim >Makesim1.tmp
-   sed -n -e '/^## COMMON_POST_/,/^## End COMMON_POST_/ p' <Make-common.sim >Makesim2.tmp
-   sed -e '/^## COMMON_PRE_/ r Makesim1.tmp' \
-	-e '/^## COMMON_POST_/ r Makesim2.tmp' \
-	<Makefile.sim >Makefile
-   rm -f Makefile.sim Make-common.sim Makesim1.tmp Makesim2.tmp
-   ;;
- esac
- case "x$CONFIG_HEADERS" in xconfig.h:config.in) echo > stamp-h ;; esac
-
-exit 0
-EOF
-chmod +x $CONFIG_STATUS
-rm -fr confdefs* $ac_clean_files
-test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
-
-
diff --git a/sim/sh64/configure.in b/sim/sh64/configure.in
deleted file mode 100644
index 18b36146670..00000000000
--- a/sim/sh64/configure.in
+++ /dev/null
@@ -1,17 +0,0 @@
-dnl Process this file with autoconf to produce a configure script.
-sinclude(../common/aclocal.m4)
-AC_PREREQ(2.5)dnl
-AC_INIT(Makefile.in)
-
-SIM_AC_COMMON
-
-SIM_AC_OPTION_ENDIAN([], BIG_ENDIAN)
-SIM_AC_OPTION_ALIGNMENT(STRICT_ALIGNMENT)
-SIM_AC_OPTION_HOSTENDIAN
-SIM_AC_OPTION_SCACHE(16384)
-SIM_AC_OPTION_DEFAULT_MODEL(sh5)
-SIM_AC_OPTION_ENVIRONMENT
-SIM_AC_OPTION_INLINE()
-SIM_AC_OPTION_CGEN_MAINT
-
-SIM_AC_OUTPUT
diff --git a/sim/sh64/cpu.c b/sim/sh64/cpu.c
deleted file mode 100644
index bf3e2b2f7c3..00000000000
--- a/sim/sh64/cpu.c
+++ /dev/null
@@ -1,533 +0,0 @@
-/* Misc. support for CPU family sh64.
-
-THIS FILE IS MACHINE GENERATED WITH CGEN.
-
-Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
-
-This file is part of the GNU Simulators.
-
-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, 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 WANT_CPU sh64
-#define WANT_CPU_SH64
-
-#include "sim-main.h"
-#include "cgen-ops.h"
-
-/* Get the value of h-pc.  */
-
-UDI
-sh64_h_pc_get (SIM_CPU *current_cpu)
-{
-  return GET_H_PC ();
-}
-
-/* Set a value for h-pc.  */
-
-void
-sh64_h_pc_set (SIM_CPU *current_cpu, UDI newval)
-{
-  SET_H_PC (newval);
-}
-
-/* Get the value of h-gr.  */
-
-DI
-sh64_h_gr_get (SIM_CPU *current_cpu, UINT regno)
-{
-  return GET_H_GR (regno);
-}
-
-/* Set a value for h-gr.  */
-
-void
-sh64_h_gr_set (SIM_CPU *current_cpu, UINT regno, DI newval)
-{
-  SET_H_GR (regno, newval);
-}
-
-/* Get the value of h-grc.  */
-
-SI
-sh64_h_grc_get (SIM_CPU *current_cpu, UINT regno)
-{
-  return GET_H_GRC (regno);
-}
-
-/* Set a value for h-grc.  */
-
-void
-sh64_h_grc_set (SIM_CPU *current_cpu, UINT regno, SI newval)
-{
-  SET_H_GRC (regno, newval);
-}
-
-/* Get the value of h-cr.  */
-
-DI
-sh64_h_cr_get (SIM_CPU *current_cpu, UINT regno)
-{
-  return GET_H_CR (regno);
-}
-
-/* Set a value for h-cr.  */
-
-void
-sh64_h_cr_set (SIM_CPU *current_cpu, UINT regno, DI newval)
-{
-  SET_H_CR (regno, newval);
-}
-
-/* Get the value of h-sr.  */
-
-SI
-sh64_h_sr_get (SIM_CPU *current_cpu)
-{
-  return CPU (h_sr);
-}
-
-/* Set a value for h-sr.  */
-
-void
-sh64_h_sr_set (SIM_CPU *current_cpu, SI newval)
-{
-  CPU (h_sr) = newval;
-}
-
-/* Get the value of h-fpscr.  */
-
-SI
-sh64_h_fpscr_get (SIM_CPU *current_cpu)
-{
-  return CPU (h_fpscr);
-}
-
-/* Set a value for h-fpscr.  */
-
-void
-sh64_h_fpscr_set (SIM_CPU *current_cpu, SI newval)
-{
-  CPU (h_fpscr) = newval;
-}
-
-/* Get the value of h-frbit.  */
-
-BI
-sh64_h_frbit_get (SIM_CPU *current_cpu)
-{
-  return GET_H_FRBIT ();
-}
-
-/* Set a value for h-frbit.  */
-
-void
-sh64_h_frbit_set (SIM_CPU *current_cpu, BI newval)
-{
-  SET_H_FRBIT (newval);
-}
-
-/* Get the value of h-szbit.  */
-
-BI
-sh64_h_szbit_get (SIM_CPU *current_cpu)
-{
-  return GET_H_SZBIT ();
-}
-
-/* Set a value for h-szbit.  */
-
-void
-sh64_h_szbit_set (SIM_CPU *current_cpu, BI newval)
-{
-  SET_H_SZBIT (newval);
-}
-
-/* Get the value of h-prbit.  */
-
-BI
-sh64_h_prbit_get (SIM_CPU *current_cpu)
-{
-  return GET_H_PRBIT ();
-}
-
-/* Set a value for h-prbit.  */
-
-void
-sh64_h_prbit_set (SIM_CPU *current_cpu, BI newval)
-{
-  SET_H_PRBIT (newval);
-}
-
-/* Get the value of h-sbit.  */
-
-BI
-sh64_h_sbit_get (SIM_CPU *current_cpu)
-{
-  return GET_H_SBIT ();
-}
-
-/* Set a value for h-sbit.  */
-
-void
-sh64_h_sbit_set (SIM_CPU *current_cpu, BI newval)
-{
-  SET_H_SBIT (newval);
-}
-
-/* Get the value of h-mbit.  */
-
-BI
-sh64_h_mbit_get (SIM_CPU *current_cpu)
-{
-  return GET_H_MBIT ();
-}
-
-/* Set a value for h-mbit.  */
-
-void
-sh64_h_mbit_set (SIM_CPU *current_cpu, BI newval)
-{
-  SET_H_MBIT (newval);
-}
-
-/* Get the value of h-qbit.  */
-
-BI
-sh64_h_qbit_get (SIM_CPU *current_cpu)
-{
-  return GET_H_QBIT ();
-}
-
-/* Set a value for h-qbit.  */
-
-void
-sh64_h_qbit_set (SIM_CPU *current_cpu, BI newval)
-{
-  SET_H_QBIT (newval);
-}
-
-/* Get the value of h-fr.  */
-
-SF
-sh64_h_fr_get (SIM_CPU *current_cpu, UINT regno)
-{
-  return CPU (h_fr[regno]);
-}
-
-/* Set a value for h-fr.  */
-
-void
-sh64_h_fr_set (SIM_CPU *current_cpu, UINT regno, SF newval)
-{
-  CPU (h_fr[regno]) = newval;
-}
-
-/* Get the value of h-fp.  */
-
-DF
-sh64_h_fp_get (SIM_CPU *current_cpu, UINT regno)
-{
-  return CPU (h_fp[regno]);
-}
-
-/* Set a value for h-fp.  */
-
-void
-sh64_h_fp_set (SIM_CPU *current_cpu, UINT regno, DF newval)
-{
-  CPU (h_fp[regno]) = newval;
-}
-
-/* Get the value of h-fv.  */
-
-SF
-sh64_h_fv_get (SIM_CPU *current_cpu, UINT regno)
-{
-  return GET_H_FV (regno);
-}
-
-/* Set a value for h-fv.  */
-
-void
-sh64_h_fv_set (SIM_CPU *current_cpu, UINT regno, SF newval)
-{
-  SET_H_FV (regno, newval);
-}
-
-/* Get the value of h-fmtx.  */
-
-SF
-sh64_h_fmtx_get (SIM_CPU *current_cpu, UINT regno)
-{
-  return GET_H_FMTX (regno);
-}
-
-/* Set a value for h-fmtx.  */
-
-void
-sh64_h_fmtx_set (SIM_CPU *current_cpu, UINT regno, SF newval)
-{
-  SET_H_FMTX (regno, newval);
-}
-
-/* Get the value of h-dr.  */
-
-DF
-sh64_h_dr_get (SIM_CPU *current_cpu, UINT regno)
-{
-  return GET_H_DR (regno);
-}
-
-/* Set a value for h-dr.  */
-
-void
-sh64_h_dr_set (SIM_CPU *current_cpu, UINT regno, DF newval)
-{
-  SET_H_DR (regno, newval);
-}
-
-/* Get the value of h-tr.  */
-
-DI
-sh64_h_tr_get (SIM_CPU *current_cpu, UINT regno)
-{
-  return CPU (h_tr[regno]);
-}
-
-/* Set a value for h-tr.  */
-
-void
-sh64_h_tr_set (SIM_CPU *current_cpu, UINT regno, DI newval)
-{
-  CPU (h_tr[regno]) = newval;
-}
-
-/* Get the value of h-endian.  */
-
-BI
-sh64_h_endian_get (SIM_CPU *current_cpu)
-{
-  return GET_H_ENDIAN ();
-}
-
-/* Set a value for h-endian.  */
-
-void
-sh64_h_endian_set (SIM_CPU *current_cpu, BI newval)
-{
-  SET_H_ENDIAN (newval);
-}
-
-/* Get the value of h-ism.  */
-
-BI
-sh64_h_ism_get (SIM_CPU *current_cpu)
-{
-  return GET_H_ISM ();
-}
-
-/* Set a value for h-ism.  */
-
-void
-sh64_h_ism_set (SIM_CPU *current_cpu, BI newval)
-{
-  SET_H_ISM (newval);
-}
-
-/* Get the value of h-frc.  */
-
-SF
-sh64_h_frc_get (SIM_CPU *current_cpu, UINT regno)
-{
-  return GET_H_FRC (regno);
-}
-
-/* Set a value for h-frc.  */
-
-void
-sh64_h_frc_set (SIM_CPU *current_cpu, UINT regno, SF newval)
-{
-  SET_H_FRC (regno, newval);
-}
-
-/* Get the value of h-drc.  */
-
-DF
-sh64_h_drc_get (SIM_CPU *current_cpu, UINT regno)
-{
-  return GET_H_DRC (regno);
-}
-
-/* Set a value for h-drc.  */
-
-void
-sh64_h_drc_set (SIM_CPU *current_cpu, UINT regno, DF newval)
-{
-  SET_H_DRC (regno, newval);
-}
-
-/* Get the value of h-xf.  */
-
-SF
-sh64_h_xf_get (SIM_CPU *current_cpu, UINT regno)
-{
-  return GET_H_XF (regno);
-}
-
-/* Set a value for h-xf.  */
-
-void
-sh64_h_xf_set (SIM_CPU *current_cpu, UINT regno, SF newval)
-{
-  SET_H_XF (regno, newval);
-}
-
-/* Get the value of h-xd.  */
-
-DF
-sh64_h_xd_get (SIM_CPU *current_cpu, UINT regno)
-{
-  return GET_H_XD (regno);
-}
-
-/* Set a value for h-xd.  */
-
-void
-sh64_h_xd_set (SIM_CPU *current_cpu, UINT regno, DF newval)
-{
-  SET_H_XD (regno, newval);
-}
-
-/* Get the value of h-fvc.  */
-
-SF
-sh64_h_fvc_get (SIM_CPU *current_cpu, UINT regno)
-{
-  return GET_H_FVC (regno);
-}
-
-/* Set a value for h-fvc.  */
-
-void
-sh64_h_fvc_set (SIM_CPU *current_cpu, UINT regno, SF newval)
-{
-  SET_H_FVC (regno, newval);
-}
-
-/* Get the value of h-fpccr.  */
-
-SI
-sh64_h_fpccr_get (SIM_CPU *current_cpu)
-{
-  return GET_H_FPCCR ();
-}
-
-/* Set a value for h-fpccr.  */
-
-void
-sh64_h_fpccr_set (SIM_CPU *current_cpu, SI newval)
-{
-  SET_H_FPCCR (newval);
-}
-
-/* Get the value of h-gbr.  */
-
-SI
-sh64_h_gbr_get (SIM_CPU *current_cpu)
-{
-  return GET_H_GBR ();
-}
-
-/* Set a value for h-gbr.  */
-
-void
-sh64_h_gbr_set (SIM_CPU *current_cpu, SI newval)
-{
-  SET_H_GBR (newval);
-}
-
-/* Get the value of h-pr.  */
-
-SI
-sh64_h_pr_get (SIM_CPU *current_cpu)
-{
-  return GET_H_PR ();
-}
-
-/* Set a value for h-pr.  */
-
-void
-sh64_h_pr_set (SIM_CPU *current_cpu, SI newval)
-{
-  SET_H_PR (newval);
-}
-
-/* Get the value of h-macl.  */
-
-SI
-sh64_h_macl_get (SIM_CPU *current_cpu)
-{
-  return GET_H_MACL ();
-}
-
-/* Set a value for h-macl.  */
-
-void
-sh64_h_macl_set (SIM_CPU *current_cpu, SI newval)
-{
-  SET_H_MACL (newval);
-}
-
-/* Get the value of h-mach.  */
-
-SI
-sh64_h_mach_get (SIM_CPU *current_cpu)
-{
-  return GET_H_MACH ();
-}
-
-/* Set a value for h-mach.  */
-
-void
-sh64_h_mach_set (SIM_CPU *current_cpu, SI newval)
-{
-  SET_H_MACH (newval);
-}
-
-/* Get the value of h-tbit.  */
-
-BI
-sh64_h_tbit_get (SIM_CPU *current_cpu)
-{
-  return GET_H_TBIT ();
-}
-
-/* Set a value for h-tbit.  */
-
-void
-sh64_h_tbit_set (SIM_CPU *current_cpu, BI newval)
-{
-  SET_H_TBIT (newval);
-}
-
-/* Record trace results for INSN.  */
-
-void
-sh64_record_trace_results (SIM_CPU *current_cpu, CGEN_INSN *insn,
-			    int *indices, TRACE_RECORD *tr)
-{
-}
diff --git a/sim/sh64/cpu.h b/sim/sh64/cpu.h
deleted file mode 100644
index 6e0d35880f9..00000000000
--- a/sim/sh64/cpu.h
+++ /dev/null
@@ -1,302 +0,0 @@
-/* CPU family header for sh64.
-
-THIS FILE IS MACHINE GENERATED WITH CGEN.
-
-Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
-
-This file is part of the GNU Simulators.
-
-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, 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.
-
-*/
-
-#ifndef CPU_SH64_H
-#define CPU_SH64_H
-
-/* Maximum number of instructions that are fetched at a time.
-   This is for LIW type instructions sets (e.g. m32r).  */
-#define MAX_LIW_INSNS 1
-
-/* Maximum number of instructions that can be executed in parallel.  */
-#define MAX_PARALLEL_INSNS 1
-
-/* CPU state information.  */
-typedef struct {
-  /* Hardware elements.  */
-  struct {
-  /* Program counter */
-  UDI h_pc;
-#define GET_H_PC() CPU (h_pc)
-#define SET_H_PC(x) \
-do { \
-{\
-CPU (h_ism) = ANDDI ((x), 1);\
-CPU (h_pc) = ANDDI ((x), INVDI (1));\
-}\
-;} while (0)
-  /* General purpose integer registers */
-  DI h_gr[64];
-#define GET_H_GR(index) ((((index) == (63))) ? (0) : (CPU (h_gr[index])))
-#define SET_H_GR(index, x) \
-do { \
-if ((((index)) != (63))) {\
-CPU (h_gr[(index)]) = (x);\
-} else {\
-((void) 0); /*nop*/\
-}\
-;} while (0)
-  /* Control registers */
-  DI h_cr[64];
-#define GET_H_CR(index) ((((index) == (0))) ? (ZEXTSIDI (CPU (h_sr))) : (CPU (h_cr[index])))
-#define SET_H_CR(index, x) \
-do { \
-if ((((index)) == (0))) {\
-CPU (h_sr) = (x);\
-} else {\
-CPU (h_cr[(index)]) = (x);\
-}\
-;} while (0)
-  /* Status register */
-  SI h_sr;
-#define GET_H_SR() CPU (h_sr)
-#define SET_H_SR(x) (CPU (h_sr) = (x))
-  /* Floating point status and control register */
-  SI h_fpscr;
-#define GET_H_FPSCR() CPU (h_fpscr)
-#define SET_H_FPSCR(x) (CPU (h_fpscr) = (x))
-  /* Single precision floating point registers */
-  SF h_fr[64];
-#define GET_H_FR(a1) CPU (h_fr)[a1]
-#define SET_H_FR(a1, x) (CPU (h_fr)[a1] = (x))
-  /* Single precision floating point register pairs */
-  DF h_fp[32];
-#define GET_H_FP(a1) CPU (h_fp)[a1]
-#define SET_H_FP(a1, x) (CPU (h_fp)[a1] = (x))
-  /* Branch target registers */
-  DI h_tr[8];
-#define GET_H_TR(a1) CPU (h_tr)[a1]
-#define SET_H_TR(a1, x) (CPU (h_tr)[a1] = (x))
-  /* Current instruction set mode */
-  BI h_ism;
-#define GET_H_ISM() CPU (h_ism)
-#define SET_H_ISM(x) \
-do { \
-cgen_rtx_error (current_cpu, "cannot set ism directly");\
-;} while (0)
-  } hardware;
-#define CPU_CGEN_HW(cpu) (& (cpu)->cpu_data.hardware)
-} SH64_CPU_DATA;
-
-/* Virtual regs.  */
-
-#define GET_H_GRC(index) ANDDI (CPU (h_gr[index]), ZEXTSIDI (0xffffffff))
-#define SET_H_GRC(index, x) \
-do { \
-CPU (h_gr[(index)]) = EXTSIDI ((x));\
-;} while (0)
-#define GET_H_FRBIT() ANDSI (SRLSI (CPU (h_sr), 14), 1)
-#define SET_H_FRBIT(x) \
-do { \
-CPU (h_sr) = ORSI (ANDSI (CPU (h_sr), (~ (((1) << (14))))), SLLSI ((x), 14));\
-;} while (0)
-#define GET_H_SZBIT() ANDSI (SRLSI (CPU (h_sr), 13), 1)
-#define SET_H_SZBIT(x) \
-do { \
-CPU (h_sr) = ORSI (ANDSI (CPU (h_sr), (~ (((1) << (13))))), SLLSI ((x), 13));\
-;} while (0)
-#define GET_H_PRBIT() ANDSI (SRLSI (CPU (h_sr), 12), 1)
-#define SET_H_PRBIT(x) \
-do { \
-CPU (h_sr) = ORSI (ANDSI (CPU (h_sr), (~ (((1) << (12))))), SLLSI ((x), 12));\
-;} while (0)
-#define GET_H_SBIT() ANDSI (SRLSI (CPU (h_sr), 1), 1)
-#define SET_H_SBIT(x) \
-do { \
-CPU (h_sr) = ORSI (ANDSI (CPU (h_sr), (~ (2))), SLLSI ((x), 1));\
-;} while (0)
-#define GET_H_MBIT() ANDSI (SRLSI (CPU (h_sr), 9), 1)
-#define SET_H_MBIT(x) \
-do { \
-CPU (h_sr) = ORSI (ANDSI (CPU (h_sr), (~ (((1) << (9))))), SLLSI ((x), 9));\
-;} while (0)
-#define GET_H_QBIT() ANDSI (SRLSI (CPU (h_sr), 8), 1)
-#define SET_H_QBIT(x) \
-do { \
-CPU (h_sr) = ORSI (ANDSI (CPU (h_sr), (~ (((1) << (8))))), SLLSI ((x), 8));\
-;} while (0)
-#define GET_H_FV(index) CPU (h_fr[MULQI (ANDQI (index, 15), 4)])
-#define SET_H_FV(index, x) \
-do { \
-CPU (h_fr[MULQI (ANDQI ((index), 15), 4)]) = (x);\
-;} while (0)
-#define GET_H_FMTX(index) CPU (h_fr[MULQI (ANDQI (index, 3), 16)])
-#define SET_H_FMTX(index, x) \
-do { \
-CPU (h_fr[MULQI (ANDQI ((index), 3), 16)]) = (x);\
-;} while (0)
-#define GET_H_DR(index) SUBWORDDIDF (ORDI (SLLDI (ZEXTSIDI (SUBWORDSFSI (CPU (h_fr[index]))), 32), ZEXTSIDI (SUBWORDSFSI (CPU (h_fr[((index) + (1))])))))
-#define SET_H_DR(index, x) \
-do { \
-{\
-CPU (h_fr[(index)]) = SUBWORDSISF (SUBWORDDFSI ((x), 0));\
-CPU (h_fr[(((index)) + (1))]) = SUBWORDSISF (SUBWORDDFSI ((x), 1));\
-}\
-;} while (0)
-#define GET_H_ENDIAN() sh64_endian (current_cpu)
-#define SET_H_ENDIAN(x) \
-do { \
-cgen_rtx_error (current_cpu, "cannot alter target byte order mid-program");\
-;} while (0)
-#define GET_H_FRC(index) CPU (h_fr[((((16) * (GET_H_FRBIT ()))) + (index))])
-#define SET_H_FRC(index, x) \
-do { \
-CPU (h_fr[((((16) * (GET_H_FRBIT ()))) + ((index)))]) = (x);\
-;} while (0)
-#define GET_H_DRC(index) GET_H_DR (((((16) * (GET_H_FRBIT ()))) + (index)))
-#define SET_H_DRC(index, x) \
-do { \
-SET_H_DR (((((16) * (GET_H_FRBIT ()))) + ((index))), (x));\
-;} while (0)
-#define GET_H_XF(index) CPU (h_fr[((((16) * (NOTBI (GET_H_FRBIT ())))) + (index))])
-#define SET_H_XF(index, x) \
-do { \
-CPU (h_fr[((((16) * (NOTBI (GET_H_FRBIT ())))) + ((index)))]) = (x);\
-;} while (0)
-#define GET_H_XD(index) GET_H_DR (((((16) * (NOTBI (GET_H_FRBIT ())))) + (index)))
-#define SET_H_XD(index, x) \
-do { \
-SET_H_DR (((((16) * (NOTBI (GET_H_FRBIT ())))) + ((index))), (x));\
-;} while (0)
-#define GET_H_FVC(index) CPU (h_fr[((((16) * (GET_H_FRBIT ()))) + (index))])
-#define SET_H_FVC(index, x) \
-do { \
-CPU (h_fr[((((16) * (GET_H_FRBIT ()))) + ((index)))]) = (x);\
-;} while (0)
-#define GET_H_FPCCR() ORSI (ORSI (ORSI (CPU (h_fpscr), SLLSI (GET_H_PRBIT (), 19)), SLLSI (GET_H_SZBIT (), 20)), SLLSI (GET_H_FRBIT (), 21))
-#define SET_H_FPCCR(x) \
-do { \
-{\
-CPU (h_fpscr) = (x);\
-SET_H_PRBIT (ANDSI (SRLSI ((x), 19), 1));\
-SET_H_SZBIT (ANDSI (SRLSI ((x), 20), 1));\
-SET_H_FRBIT (ANDSI (SRLSI ((x), 21), 1));\
-}\
-;} while (0)
-#define GET_H_GBR() SUBWORDDISI (CPU (h_gr[((UINT) 16)]), 1)
-#define SET_H_GBR(x) \
-do { \
-CPU (h_gr[((UINT) 16)]) = EXTSIDI ((x));\
-;} while (0)
-#define GET_H_PR() SUBWORDDISI (CPU (h_gr[((UINT) 18)]), 1)
-#define SET_H_PR(x) \
-do { \
-CPU (h_gr[((UINT) 18)]) = EXTSIDI ((x));\
-;} while (0)
-#define GET_H_MACL() SUBWORDDISI (CPU (h_gr[((UINT) 17)]), 1)
-#define SET_H_MACL(x) \
-do { \
-CPU (h_gr[((UINT) 17)]) = ORDI (SLLDI (ZEXTSIDI (SUBWORDDISI (CPU (h_gr[((UINT) 17)]), 0)), 32), ZEXTSIDI ((x)));\
-;} while (0)
-#define GET_H_MACH() SUBWORDDISI (CPU (h_gr[((UINT) 17)]), 0)
-#define SET_H_MACH(x) \
-do { \
-CPU (h_gr[((UINT) 17)]) = ORDI (SLLDI (ZEXTSIDI ((x)), 32), ZEXTSIDI (SUBWORDDISI (CPU (h_gr[((UINT) 17)]), 1)));\
-;} while (0)
-#define GET_H_TBIT() ANDBI (CPU (h_gr[((UINT) 19)]), 1)
-#define SET_H_TBIT(x) \
-do { \
-CPU (h_gr[((UINT) 19)]) = ORDI (ANDDI (CPU (h_gr[((UINT) 19)]), INVDI (1)), ZEXTBIDI ((x)));\
-;} while (0)
-
-/* Cover fns for register access.  */
-UDI sh64_h_pc_get (SIM_CPU *);
-void sh64_h_pc_set (SIM_CPU *, UDI);
-DI sh64_h_gr_get (SIM_CPU *, UINT);
-void sh64_h_gr_set (SIM_CPU *, UINT, DI);
-SI sh64_h_grc_get (SIM_CPU *, UINT);
-void sh64_h_grc_set (SIM_CPU *, UINT, SI);
-DI sh64_h_cr_get (SIM_CPU *, UINT);
-void sh64_h_cr_set (SIM_CPU *, UINT, DI);
-SI sh64_h_sr_get (SIM_CPU *);
-void sh64_h_sr_set (SIM_CPU *, SI);
-SI sh64_h_fpscr_get (SIM_CPU *);
-void sh64_h_fpscr_set (SIM_CPU *, SI);
-BI sh64_h_frbit_get (SIM_CPU *);
-void sh64_h_frbit_set (SIM_CPU *, BI);
-BI sh64_h_szbit_get (SIM_CPU *);
-void sh64_h_szbit_set (SIM_CPU *, BI);
-BI sh64_h_prbit_get (SIM_CPU *);
-void sh64_h_prbit_set (SIM_CPU *, BI);
-BI sh64_h_sbit_get (SIM_CPU *);
-void sh64_h_sbit_set (SIM_CPU *, BI);
-BI sh64_h_mbit_get (SIM_CPU *);
-void sh64_h_mbit_set (SIM_CPU *, BI);
-BI sh64_h_qbit_get (SIM_CPU *);
-void sh64_h_qbit_set (SIM_CPU *, BI);
-SF sh64_h_fr_get (SIM_CPU *, UINT);
-void sh64_h_fr_set (SIM_CPU *, UINT, SF);
-DF sh64_h_fp_get (SIM_CPU *, UINT);
-void sh64_h_fp_set (SIM_CPU *, UINT, DF);
-SF sh64_h_fv_get (SIM_CPU *, UINT);
-void sh64_h_fv_set (SIM_CPU *, UINT, SF);
-SF sh64_h_fmtx_get (SIM_CPU *, UINT);
-void sh64_h_fmtx_set (SIM_CPU *, UINT, SF);
-DF sh64_h_dr_get (SIM_CPU *, UINT);
-void sh64_h_dr_set (SIM_CPU *, UINT, DF);
-DI sh64_h_tr_get (SIM_CPU *, UINT);
-void sh64_h_tr_set (SIM_CPU *, UINT, DI);
-BI sh64_h_endian_get (SIM_CPU *);
-void sh64_h_endian_set (SIM_CPU *, BI);
-BI sh64_h_ism_get (SIM_CPU *);
-void sh64_h_ism_set (SIM_CPU *, BI);
-SF sh64_h_frc_get (SIM_CPU *, UINT);
-void sh64_h_frc_set (SIM_CPU *, UINT, SF);
-DF sh64_h_drc_get (SIM_CPU *, UINT);
-void sh64_h_drc_set (SIM_CPU *, UINT, DF);
-SF sh64_h_xf_get (SIM_CPU *, UINT);
-void sh64_h_xf_set (SIM_CPU *, UINT, SF);
-DF sh64_h_xd_get (SIM_CPU *, UINT);
-void sh64_h_xd_set (SIM_CPU *, UINT, DF);
-SF sh64_h_fvc_get (SIM_CPU *, UINT);
-void sh64_h_fvc_set (SIM_CPU *, UINT, SF);
-SI sh64_h_fpccr_get (SIM_CPU *);
-void sh64_h_fpccr_set (SIM_CPU *, SI);
-SI sh64_h_gbr_get (SIM_CPU *);
-void sh64_h_gbr_set (SIM_CPU *, SI);
-SI sh64_h_pr_get (SIM_CPU *);
-void sh64_h_pr_set (SIM_CPU *, SI);
-SI sh64_h_macl_get (SIM_CPU *);
-void sh64_h_macl_set (SIM_CPU *, SI);
-SI sh64_h_mach_get (SIM_CPU *);
-void sh64_h_mach_set (SIM_CPU *, SI);
-BI sh64_h_tbit_get (SIM_CPU *);
-void sh64_h_tbit_set (SIM_CPU *, BI);
-
-/* These must be hand-written.  */
-extern CPUREG_FETCH_FN sh64_fetch_register;
-extern CPUREG_STORE_FN sh64_store_register;
-
-typedef struct {
-  int empty;
-} MODEL_SH5_DATA;
-
-/* Collection of various things for the trace handler to use.  */
-
-typedef struct trace_record {
-  IADDR pc;
-  /* FIXME:wip */
-} TRACE_RECORD;
-
-#endif /* CPU_SH64_H */
diff --git a/sim/sh64/cpuall.h b/sim/sh64/cpuall.h
deleted file mode 100644
index ba6a1e5d714..00000000000
--- a/sim/sh64/cpuall.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/* Simulator CPU header for sh.
-
-THIS FILE IS MACHINE GENERATED WITH CGEN.
-
-Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
-
-This file is part of the GNU Simulators.
-
-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, 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.
-
-*/
-
-#ifndef SH_CPUALL_H
-#define SH_CPUALL_H
-
-/* Include files for each cpu family.  */
-
-#ifdef WANT_CPU_SH64
-#include "eng.h"
-#include "cgen-engine.h"
-#include "cpu.h"
-#include "decode.h"
-#endif
-
-extern const MACH sh2_mach;
-extern const MACH sh3_mach;
-extern const MACH sh3e_mach;
-extern const MACH sh4_mach;
-extern const MACH sh5_mach;
-
-#ifndef WANT_CPU
-/* The ARGBUF struct.  */
-struct argbuf {
-  /* These are the baseclass definitions.  */
-  IADDR addr;
-  const IDESC *idesc;
-  char trace_p;
-  char profile_p;
-  /* ??? Temporary hack for skip insns.  */
-  char skip_count;
-  char unused;
-  /* cpu specific data follows */
-};
-#endif
-
-#ifndef WANT_CPU
-/* A cached insn.
-
-   ??? SCACHE used to contain more than just argbuf.  We could delete the
-   type entirely and always just use ARGBUF, but for future concerns and as
-   a level of abstraction it is left in.  */
-
-struct scache {
-  struct argbuf argbuf;
-};
-#endif
-
-#endif /* SH_CPUALL_H */
diff --git a/sim/sh64/decode-compact.c b/sim/sh64/decode-compact.c
deleted file mode 100644
index ce85438323c..00000000000
--- a/sim/sh64/decode-compact.c
+++ /dev/null
@@ -1,2640 +0,0 @@
-/* Simulator instruction decoder for sh64_compact.
-
-THIS FILE IS MACHINE GENERATED WITH CGEN.
-
-Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
-
-This file is part of the GNU Simulators.
-
-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, 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 WANT_CPU sh64
-#define WANT_CPU_SH64
-
-#include "sim-main.h"
-#include "sim-assert.h"
-
-/* The instruction descriptor array.
-   This is computed at runtime.  Space for it is not malloc'd to save a
-   teensy bit of cpu in the decoder.  Moving it to malloc space is trivial
-   but won't be done until necessary (we don't currently support the runtime
-   addition of instructions nor an SMP machine with different cpus).  */
-static IDESC sh64_compact_insn_data[SH64_COMPACT_INSN_MAX];
-
-/* Commas between elements are contained in the macros.
-   Some of these are conditionally compiled out.  */
-
-static const struct insn_sem sh64_compact_insn_sem[] =
-{
-  { VIRTUAL_INSN_X_INVALID, SH64_COMPACT_INSN_X_INVALID, SH64_COMPACT_SFMT_EMPTY },
-  { VIRTUAL_INSN_X_AFTER, SH64_COMPACT_INSN_X_AFTER, SH64_COMPACT_SFMT_EMPTY },
-  { VIRTUAL_INSN_X_BEFORE, SH64_COMPACT_INSN_X_BEFORE, SH64_COMPACT_SFMT_EMPTY },
-  { VIRTUAL_INSN_X_CTI_CHAIN, SH64_COMPACT_INSN_X_CTI_CHAIN, SH64_COMPACT_SFMT_EMPTY },
-  { VIRTUAL_INSN_X_CHAIN, SH64_COMPACT_INSN_X_CHAIN, SH64_COMPACT_SFMT_EMPTY },
-  { VIRTUAL_INSN_X_BEGIN, SH64_COMPACT_INSN_X_BEGIN, SH64_COMPACT_SFMT_EMPTY },
-  { SH_INSN_ADD_COMPACT, SH64_COMPACT_INSN_ADD_COMPACT, SH64_COMPACT_SFMT_ADD_COMPACT },
-  { SH_INSN_ADDI_COMPACT, SH64_COMPACT_INSN_ADDI_COMPACT, SH64_COMPACT_SFMT_ADDI_COMPACT },
-  { SH_INSN_ADDC_COMPACT, SH64_COMPACT_INSN_ADDC_COMPACT, SH64_COMPACT_SFMT_ADDC_COMPACT },
-  { SH_INSN_ADDV_COMPACT, SH64_COMPACT_INSN_ADDV_COMPACT, SH64_COMPACT_SFMT_ADDV_COMPACT },
-  { SH_INSN_AND_COMPACT, SH64_COMPACT_INSN_AND_COMPACT, SH64_COMPACT_SFMT_AND_COMPACT },
-  { SH_INSN_ANDI_COMPACT, SH64_COMPACT_INSN_ANDI_COMPACT, SH64_COMPACT_SFMT_ANDI_COMPACT },
-  { SH_INSN_ANDB_COMPACT, SH64_COMPACT_INSN_ANDB_COMPACT, SH64_COMPACT_SFMT_ANDB_COMPACT },
-  { SH_INSN_BF_COMPACT, SH64_COMPACT_INSN_BF_COMPACT, SH64_COMPACT_SFMT_BF_COMPACT },
-  { SH_INSN_BFS_COMPACT, SH64_COMPACT_INSN_BFS_COMPACT, SH64_COMPACT_SFMT_BF_COMPACT },
-  { SH_INSN_BRA_COMPACT, SH64_COMPACT_INSN_BRA_COMPACT, SH64_COMPACT_SFMT_BRA_COMPACT },
-  { SH_INSN_BRAF_COMPACT, SH64_COMPACT_INSN_BRAF_COMPACT, SH64_COMPACT_SFMT_BRAF_COMPACT },
-  { SH_INSN_BRK_COMPACT, SH64_COMPACT_INSN_BRK_COMPACT, SH64_COMPACT_SFMT_BRK_COMPACT },
-  { SH_INSN_BSR_COMPACT, SH64_COMPACT_INSN_BSR_COMPACT, SH64_COMPACT_SFMT_BSR_COMPACT },
-  { SH_INSN_BSRF_COMPACT, SH64_COMPACT_INSN_BSRF_COMPACT, SH64_COMPACT_SFMT_BSRF_COMPACT },
-  { SH_INSN_BT_COMPACT, SH64_COMPACT_INSN_BT_COMPACT, SH64_COMPACT_SFMT_BF_COMPACT },
-  { SH_INSN_BTS_COMPACT, SH64_COMPACT_INSN_BTS_COMPACT, SH64_COMPACT_SFMT_BF_COMPACT },
-  { SH_INSN_CLRMAC_COMPACT, SH64_COMPACT_INSN_CLRMAC_COMPACT, SH64_COMPACT_SFMT_CLRMAC_COMPACT },
-  { SH_INSN_CLRS_COMPACT, SH64_COMPACT_INSN_CLRS_COMPACT, SH64_COMPACT_SFMT_CLRS_COMPACT },
-  { SH_INSN_CLRT_COMPACT, SH64_COMPACT_INSN_CLRT_COMPACT, SH64_COMPACT_SFMT_CLRT_COMPACT },
-  { SH_INSN_CMPEQ_COMPACT, SH64_COMPACT_INSN_CMPEQ_COMPACT, SH64_COMPACT_SFMT_CMPEQ_COMPACT },
-  { SH_INSN_CMPEQI_COMPACT, SH64_COMPACT_INSN_CMPEQI_COMPACT, SH64_COMPACT_SFMT_CMPEQI_COMPACT },
-  { SH_INSN_CMPGE_COMPACT, SH64_COMPACT_INSN_CMPGE_COMPACT, SH64_COMPACT_SFMT_CMPEQ_COMPACT },
-  { SH_INSN_CMPGT_COMPACT, SH64_COMPACT_INSN_CMPGT_COMPACT, SH64_COMPACT_SFMT_CMPEQ_COMPACT },
-  { SH_INSN_CMPHI_COMPACT, SH64_COMPACT_INSN_CMPHI_COMPACT, SH64_COMPACT_SFMT_CMPEQ_COMPACT },
-  { SH_INSN_CMPHS_COMPACT, SH64_COMPACT_INSN_CMPHS_COMPACT, SH64_COMPACT_SFMT_CMPEQ_COMPACT },
-  { SH_INSN_CMPPL_COMPACT, SH64_COMPACT_INSN_CMPPL_COMPACT, SH64_COMPACT_SFMT_CMPPL_COMPACT },
-  { SH_INSN_CMPPZ_COMPACT, SH64_COMPACT_INSN_CMPPZ_COMPACT, SH64_COMPACT_SFMT_CMPPL_COMPACT },
-  { SH_INSN_CMPSTR_COMPACT, SH64_COMPACT_INSN_CMPSTR_COMPACT, SH64_COMPACT_SFMT_CMPEQ_COMPACT },
-  { SH_INSN_DIV0S_COMPACT, SH64_COMPACT_INSN_DIV0S_COMPACT, SH64_COMPACT_SFMT_DIV0S_COMPACT },
-  { SH_INSN_DIV0U_COMPACT, SH64_COMPACT_INSN_DIV0U_COMPACT, SH64_COMPACT_SFMT_DIV0U_COMPACT },
-  { SH_INSN_DIV1_COMPACT, SH64_COMPACT_INSN_DIV1_COMPACT, SH64_COMPACT_SFMT_DIV1_COMPACT },
-  { SH_INSN_DMULSL_COMPACT, SH64_COMPACT_INSN_DMULSL_COMPACT, SH64_COMPACT_SFMT_DMULSL_COMPACT },
-  { SH_INSN_DMULUL_COMPACT, SH64_COMPACT_INSN_DMULUL_COMPACT, SH64_COMPACT_SFMT_DMULSL_COMPACT },
-  { SH_INSN_DT_COMPACT, SH64_COMPACT_INSN_DT_COMPACT, SH64_COMPACT_SFMT_DT_COMPACT },
-  { SH_INSN_EXTSB_COMPACT, SH64_COMPACT_INSN_EXTSB_COMPACT, SH64_COMPACT_SFMT_EXTSB_COMPACT },
-  { SH_INSN_EXTSW_COMPACT, SH64_COMPACT_INSN_EXTSW_COMPACT, SH64_COMPACT_SFMT_EXTSB_COMPACT },
-  { SH_INSN_EXTUB_COMPACT, SH64_COMPACT_INSN_EXTUB_COMPACT, SH64_COMPACT_SFMT_EXTSB_COMPACT },
-  { SH_INSN_EXTUW_COMPACT, SH64_COMPACT_INSN_EXTUW_COMPACT, SH64_COMPACT_SFMT_EXTSB_COMPACT },
-  { SH_INSN_FABS_COMPACT, SH64_COMPACT_INSN_FABS_COMPACT, SH64_COMPACT_SFMT_FABS_COMPACT },
-  { SH_INSN_FADD_COMPACT, SH64_COMPACT_INSN_FADD_COMPACT, SH64_COMPACT_SFMT_FADD_COMPACT },
-  { SH_INSN_FCMPEQ_COMPACT, SH64_COMPACT_INSN_FCMPEQ_COMPACT, SH64_COMPACT_SFMT_FCMPEQ_COMPACT },
-  { SH_INSN_FCMPGT_COMPACT, SH64_COMPACT_INSN_FCMPGT_COMPACT, SH64_COMPACT_SFMT_FCMPEQ_COMPACT },
-  { SH_INSN_FCNVDS_COMPACT, SH64_COMPACT_INSN_FCNVDS_COMPACT, SH64_COMPACT_SFMT_FCNVDS_COMPACT },
-  { SH_INSN_FCNVSD_COMPACT, SH64_COMPACT_INSN_FCNVSD_COMPACT, SH64_COMPACT_SFMT_FCNVSD_COMPACT },
-  { SH_INSN_FDIV_COMPACT, SH64_COMPACT_INSN_FDIV_COMPACT, SH64_COMPACT_SFMT_FADD_COMPACT },
-  { SH_INSN_FIPR_COMPACT, SH64_COMPACT_INSN_FIPR_COMPACT, SH64_COMPACT_SFMT_FIPR_COMPACT },
-  { SH_INSN_FLDS_COMPACT, SH64_COMPACT_INSN_FLDS_COMPACT, SH64_COMPACT_SFMT_FLDS_COMPACT },
-  { SH_INSN_FLDI0_COMPACT, SH64_COMPACT_INSN_FLDI0_COMPACT, SH64_COMPACT_SFMT_FLDI0_COMPACT },
-  { SH_INSN_FLDI1_COMPACT, SH64_COMPACT_INSN_FLDI1_COMPACT, SH64_COMPACT_SFMT_FLDI0_COMPACT },
-  { SH_INSN_FLOAT_COMPACT, SH64_COMPACT_INSN_FLOAT_COMPACT, SH64_COMPACT_SFMT_FLOAT_COMPACT },
-  { SH_INSN_FMAC_COMPACT, SH64_COMPACT_INSN_FMAC_COMPACT, SH64_COMPACT_SFMT_FMAC_COMPACT },
-  { SH_INSN_FMOV1_COMPACT, SH64_COMPACT_INSN_FMOV1_COMPACT, SH64_COMPACT_SFMT_FMOV1_COMPACT },
-  { SH_INSN_FMOV2_COMPACT, SH64_COMPACT_INSN_FMOV2_COMPACT, SH64_COMPACT_SFMT_FMOV2_COMPACT },
-  { SH_INSN_FMOV3_COMPACT, SH64_COMPACT_INSN_FMOV3_COMPACT, SH64_COMPACT_SFMT_FMOV3_COMPACT },
-  { SH_INSN_FMOV4_COMPACT, SH64_COMPACT_INSN_FMOV4_COMPACT, SH64_COMPACT_SFMT_FMOV4_COMPACT },
-  { SH_INSN_FMOV5_COMPACT, SH64_COMPACT_INSN_FMOV5_COMPACT, SH64_COMPACT_SFMT_FMOV5_COMPACT },
-  { SH_INSN_FMOV6_COMPACT, SH64_COMPACT_INSN_FMOV6_COMPACT, SH64_COMPACT_SFMT_FMOV6_COMPACT },
-  { SH_INSN_FMOV7_COMPACT, SH64_COMPACT_INSN_FMOV7_COMPACT, SH64_COMPACT_SFMT_FMOV7_COMPACT },
-  { SH_INSN_FMUL_COMPACT, SH64_COMPACT_INSN_FMUL_COMPACT, SH64_COMPACT_SFMT_FADD_COMPACT },
-  { SH_INSN_FNEG_COMPACT, SH64_COMPACT_INSN_FNEG_COMPACT, SH64_COMPACT_SFMT_FABS_COMPACT },
-  { SH_INSN_FRCHG_COMPACT, SH64_COMPACT_INSN_FRCHG_COMPACT, SH64_COMPACT_SFMT_FRCHG_COMPACT },
-  { SH_INSN_FSCHG_COMPACT, SH64_COMPACT_INSN_FSCHG_COMPACT, SH64_COMPACT_SFMT_FSCHG_COMPACT },
-  { SH_INSN_FSQRT_COMPACT, SH64_COMPACT_INSN_FSQRT_COMPACT, SH64_COMPACT_SFMT_FABS_COMPACT },
-  { SH_INSN_FSTS_COMPACT, SH64_COMPACT_INSN_FSTS_COMPACT, SH64_COMPACT_SFMT_FSTS_COMPACT },
-  { SH_INSN_FSUB_COMPACT, SH64_COMPACT_INSN_FSUB_COMPACT, SH64_COMPACT_SFMT_FADD_COMPACT },
-  { SH_INSN_FTRC_COMPACT, SH64_COMPACT_INSN_FTRC_COMPACT, SH64_COMPACT_SFMT_FTRC_COMPACT },
-  { SH_INSN_FTRV_COMPACT, SH64_COMPACT_INSN_FTRV_COMPACT, SH64_COMPACT_SFMT_FTRV_COMPACT },
-  { SH_INSN_JMP_COMPACT, SH64_COMPACT_INSN_JMP_COMPACT, SH64_COMPACT_SFMT_JMP_COMPACT },
-  { SH_INSN_JSR_COMPACT, SH64_COMPACT_INSN_JSR_COMPACT, SH64_COMPACT_SFMT_BSRF_COMPACT },
-  { SH_INSN_LDC_COMPACT, SH64_COMPACT_INSN_LDC_COMPACT, SH64_COMPACT_SFMT_LDC_COMPACT },
-  { SH_INSN_LDCL_COMPACT, SH64_COMPACT_INSN_LDCL_COMPACT, SH64_COMPACT_SFMT_LDCL_COMPACT },
-  { SH_INSN_LDS_FPSCR_COMPACT, SH64_COMPACT_INSN_LDS_FPSCR_COMPACT, SH64_COMPACT_SFMT_LDS_FPSCR_COMPACT },
-  { SH_INSN_LDSL_FPSCR_COMPACT, SH64_COMPACT_INSN_LDSL_FPSCR_COMPACT, SH64_COMPACT_SFMT_LDSL_FPSCR_COMPACT },
-  { SH_INSN_LDS_FPUL_COMPACT, SH64_COMPACT_INSN_LDS_FPUL_COMPACT, SH64_COMPACT_SFMT_LDS_FPUL_COMPACT },
-  { SH_INSN_LDSL_FPUL_COMPACT, SH64_COMPACT_INSN_LDSL_FPUL_COMPACT, SH64_COMPACT_SFMT_LDSL_FPUL_COMPACT },
-  { SH_INSN_LDS_MACH_COMPACT, SH64_COMPACT_INSN_LDS_MACH_COMPACT, SH64_COMPACT_SFMT_LDS_MACH_COMPACT },
-  { SH_INSN_LDSL_MACH_COMPACT, SH64_COMPACT_INSN_LDSL_MACH_COMPACT, SH64_COMPACT_SFMT_LDSL_MACH_COMPACT },
-  { SH_INSN_LDS_MACL_COMPACT, SH64_COMPACT_INSN_LDS_MACL_COMPACT, SH64_COMPACT_SFMT_LDS_MACL_COMPACT },
-  { SH_INSN_LDSL_MACL_COMPACT, SH64_COMPACT_INSN_LDSL_MACL_COMPACT, SH64_COMPACT_SFMT_LDSL_MACL_COMPACT },
-  { SH_INSN_LDS_PR_COMPACT, SH64_COMPACT_INSN_LDS_PR_COMPACT, SH64_COMPACT_SFMT_LDS_PR_COMPACT },
-  { SH_INSN_LDSL_PR_COMPACT, SH64_COMPACT_INSN_LDSL_PR_COMPACT, SH64_COMPACT_SFMT_LDSL_PR_COMPACT },
-  { SH_INSN_MACL_COMPACT, SH64_COMPACT_INSN_MACL_COMPACT, SH64_COMPACT_SFMT_MACL_COMPACT },
-  { SH_INSN_MACW_COMPACT, SH64_COMPACT_INSN_MACW_COMPACT, SH64_COMPACT_SFMT_MACW_COMPACT },
-  { SH_INSN_MOV_COMPACT, SH64_COMPACT_INSN_MOV_COMPACT, SH64_COMPACT_SFMT_MOV_COMPACT },
-  { SH_INSN_MOVI_COMPACT, SH64_COMPACT_INSN_MOVI_COMPACT, SH64_COMPACT_SFMT_MOVI_COMPACT },
-  { SH_INSN_MOVB1_COMPACT, SH64_COMPACT_INSN_MOVB1_COMPACT, SH64_COMPACT_SFMT_MOVB1_COMPACT },
-  { SH_INSN_MOVB2_COMPACT, SH64_COMPACT_INSN_MOVB2_COMPACT, SH64_COMPACT_SFMT_MOVB2_COMPACT },
-  { SH_INSN_MOVB3_COMPACT, SH64_COMPACT_INSN_MOVB3_COMPACT, SH64_COMPACT_SFMT_MOVB3_COMPACT },
-  { SH_INSN_MOVB4_COMPACT, SH64_COMPACT_INSN_MOVB4_COMPACT, SH64_COMPACT_SFMT_MOVB4_COMPACT },
-  { SH_INSN_MOVB5_COMPACT, SH64_COMPACT_INSN_MOVB5_COMPACT, SH64_COMPACT_SFMT_MOVB5_COMPACT },
-  { SH_INSN_MOVB6_COMPACT, SH64_COMPACT_INSN_MOVB6_COMPACT, SH64_COMPACT_SFMT_MOVB6_COMPACT },
-  { SH_INSN_MOVB7_COMPACT, SH64_COMPACT_INSN_MOVB7_COMPACT, SH64_COMPACT_SFMT_MOVB7_COMPACT },
-  { SH_INSN_MOVB8_COMPACT, SH64_COMPACT_INSN_MOVB8_COMPACT, SH64_COMPACT_SFMT_MOVB8_COMPACT },
-  { SH_INSN_MOVB9_COMPACT, SH64_COMPACT_INSN_MOVB9_COMPACT, SH64_COMPACT_SFMT_MOVB9_COMPACT },
-  { SH_INSN_MOVB10_COMPACT, SH64_COMPACT_INSN_MOVB10_COMPACT, SH64_COMPACT_SFMT_MOVB10_COMPACT },
-  { SH_INSN_MOVL1_COMPACT, SH64_COMPACT_INSN_MOVL1_COMPACT, SH64_COMPACT_SFMT_MOVB1_COMPACT },
-  { SH_INSN_MOVL2_COMPACT, SH64_COMPACT_INSN_MOVL2_COMPACT, SH64_COMPACT_SFMT_MOVB2_COMPACT },
-  { SH_INSN_MOVL3_COMPACT, SH64_COMPACT_INSN_MOVL3_COMPACT, SH64_COMPACT_SFMT_MOVB3_COMPACT },
-  { SH_INSN_MOVL4_COMPACT, SH64_COMPACT_INSN_MOVL4_COMPACT, SH64_COMPACT_SFMT_MOVL4_COMPACT },
-  { SH_INSN_MOVL5_COMPACT, SH64_COMPACT_INSN_MOVL5_COMPACT, SH64_COMPACT_SFMT_MOVL5_COMPACT },
-  { SH_INSN_MOVL6_COMPACT, SH64_COMPACT_INSN_MOVL6_COMPACT, SH64_COMPACT_SFMT_MOVB6_COMPACT },
-  { SH_INSN_MOVL7_COMPACT, SH64_COMPACT_INSN_MOVL7_COMPACT, SH64_COMPACT_SFMT_MOVL7_COMPACT },
-  { SH_INSN_MOVL8_COMPACT, SH64_COMPACT_INSN_MOVL8_COMPACT, SH64_COMPACT_SFMT_MOVB8_COMPACT },
-  { SH_INSN_MOVL9_COMPACT, SH64_COMPACT_INSN_MOVL9_COMPACT, SH64_COMPACT_SFMT_MOVL9_COMPACT },
-  { SH_INSN_MOVL10_COMPACT, SH64_COMPACT_INSN_MOVL10_COMPACT, SH64_COMPACT_SFMT_MOVL10_COMPACT },
-  { SH_INSN_MOVL11_COMPACT, SH64_COMPACT_INSN_MOVL11_COMPACT, SH64_COMPACT_SFMT_MOVL11_COMPACT },
-  { SH_INSN_MOVW1_COMPACT, SH64_COMPACT_INSN_MOVW1_COMPACT, SH64_COMPACT_SFMT_MOVB1_COMPACT },
-  { SH_INSN_MOVW2_COMPACT, SH64_COMPACT_INSN_MOVW2_COMPACT, SH64_COMPACT_SFMT_MOVB2_COMPACT },
-  { SH_INSN_MOVW3_COMPACT, SH64_COMPACT_INSN_MOVW3_COMPACT, SH64_COMPACT_SFMT_MOVB3_COMPACT },
-  { SH_INSN_MOVW4_COMPACT, SH64_COMPACT_INSN_MOVW4_COMPACT, SH64_COMPACT_SFMT_MOVW4_COMPACT },
-  { SH_INSN_MOVW5_COMPACT, SH64_COMPACT_INSN_MOVW5_COMPACT, SH64_COMPACT_SFMT_MOVW5_COMPACT },
-  { SH_INSN_MOVW6_COMPACT, SH64_COMPACT_INSN_MOVW6_COMPACT, SH64_COMPACT_SFMT_MOVB6_COMPACT },
-  { SH_INSN_MOVW7_COMPACT, SH64_COMPACT_INSN_MOVW7_COMPACT, SH64_COMPACT_SFMT_MOVB7_COMPACT },
-  { SH_INSN_MOVW8_COMPACT, SH64_COMPACT_INSN_MOVW8_COMPACT, SH64_COMPACT_SFMT_MOVB8_COMPACT },
-  { SH_INSN_MOVW9_COMPACT, SH64_COMPACT_INSN_MOVW9_COMPACT, SH64_COMPACT_SFMT_MOVW9_COMPACT },
-  { SH_INSN_MOVW10_COMPACT, SH64_COMPACT_INSN_MOVW10_COMPACT, SH64_COMPACT_SFMT_MOVW10_COMPACT },
-  { SH_INSN_MOVW11_COMPACT, SH64_COMPACT_INSN_MOVW11_COMPACT, SH64_COMPACT_SFMT_MOVW11_COMPACT },
-  { SH_INSN_MOVA_COMPACT, SH64_COMPACT_INSN_MOVA_COMPACT, SH64_COMPACT_SFMT_MOVA_COMPACT },
-  { SH_INSN_MOVCAL_COMPACT, SH64_COMPACT_INSN_MOVCAL_COMPACT, SH64_COMPACT_SFMT_MOVCAL_COMPACT },
-  { SH_INSN_MOVT_COMPACT, SH64_COMPACT_INSN_MOVT_COMPACT, SH64_COMPACT_SFMT_MOVT_COMPACT },
-  { SH_INSN_MULL_COMPACT, SH64_COMPACT_INSN_MULL_COMPACT, SH64_COMPACT_SFMT_MULL_COMPACT },
-  { SH_INSN_MULSW_COMPACT, SH64_COMPACT_INSN_MULSW_COMPACT, SH64_COMPACT_SFMT_MULL_COMPACT },
-  { SH_INSN_MULUW_COMPACT, SH64_COMPACT_INSN_MULUW_COMPACT, SH64_COMPACT_SFMT_MULL_COMPACT },
-  { SH_INSN_NEG_COMPACT, SH64_COMPACT_INSN_NEG_COMPACT, SH64_COMPACT_SFMT_EXTSB_COMPACT },
-  { SH_INSN_NEGC_COMPACT, SH64_COMPACT_INSN_NEGC_COMPACT, SH64_COMPACT_SFMT_NEGC_COMPACT },
-  { SH_INSN_NOP_COMPACT, SH64_COMPACT_INSN_NOP_COMPACT, SH64_COMPACT_SFMT_NOP_COMPACT },
-  { SH_INSN_NOT_COMPACT, SH64_COMPACT_INSN_NOT_COMPACT, SH64_COMPACT_SFMT_MOV_COMPACT },
-  { SH_INSN_OCBI_COMPACT, SH64_COMPACT_INSN_OCBI_COMPACT, SH64_COMPACT_SFMT_NOP_COMPACT },
-  { SH_INSN_OCBP_COMPACT, SH64_COMPACT_INSN_OCBP_COMPACT, SH64_COMPACT_SFMT_NOP_COMPACT },
-  { SH_INSN_OCBWB_COMPACT, SH64_COMPACT_INSN_OCBWB_COMPACT, SH64_COMPACT_SFMT_NOP_COMPACT },
-  { SH_INSN_OR_COMPACT, SH64_COMPACT_INSN_OR_COMPACT, SH64_COMPACT_SFMT_AND_COMPACT },
-  { SH_INSN_ORI_COMPACT, SH64_COMPACT_INSN_ORI_COMPACT, SH64_COMPACT_SFMT_ANDI_COMPACT },
-  { SH_INSN_ORB_COMPACT, SH64_COMPACT_INSN_ORB_COMPACT, SH64_COMPACT_SFMT_ANDB_COMPACT },
-  { SH_INSN_PREF_COMPACT, SH64_COMPACT_INSN_PREF_COMPACT, SH64_COMPACT_SFMT_NOP_COMPACT },
-  { SH_INSN_ROTCL_COMPACT, SH64_COMPACT_INSN_ROTCL_COMPACT, SH64_COMPACT_SFMT_ROTCL_COMPACT },
-  { SH_INSN_ROTCR_COMPACT, SH64_COMPACT_INSN_ROTCR_COMPACT, SH64_COMPACT_SFMT_ROTCL_COMPACT },
-  { SH_INSN_ROTL_COMPACT, SH64_COMPACT_INSN_ROTL_COMPACT, SH64_COMPACT_SFMT_DT_COMPACT },
-  { SH_INSN_ROTR_COMPACT, SH64_COMPACT_INSN_ROTR_COMPACT, SH64_COMPACT_SFMT_DT_COMPACT },
-  { SH_INSN_RTS_COMPACT, SH64_COMPACT_INSN_RTS_COMPACT, SH64_COMPACT_SFMT_RTS_COMPACT },
-  { SH_INSN_SETS_COMPACT, SH64_COMPACT_INSN_SETS_COMPACT, SH64_COMPACT_SFMT_CLRS_COMPACT },
-  { SH_INSN_SETT_COMPACT, SH64_COMPACT_INSN_SETT_COMPACT, SH64_COMPACT_SFMT_CLRT_COMPACT },
-  { SH_INSN_SHAD_COMPACT, SH64_COMPACT_INSN_SHAD_COMPACT, SH64_COMPACT_SFMT_SHAD_COMPACT },
-  { SH_INSN_SHAL_COMPACT, SH64_COMPACT_INSN_SHAL_COMPACT, SH64_COMPACT_SFMT_DT_COMPACT },
-  { SH_INSN_SHAR_COMPACT, SH64_COMPACT_INSN_SHAR_COMPACT, SH64_COMPACT_SFMT_DT_COMPACT },
-  { SH_INSN_SHLD_COMPACT, SH64_COMPACT_INSN_SHLD_COMPACT, SH64_COMPACT_SFMT_SHAD_COMPACT },
-  { SH_INSN_SHLL_COMPACT, SH64_COMPACT_INSN_SHLL_COMPACT, SH64_COMPACT_SFMT_DT_COMPACT },
-  { SH_INSN_SHLL2_COMPACT, SH64_COMPACT_INSN_SHLL2_COMPACT, SH64_COMPACT_SFMT_SHLL2_COMPACT },
-  { SH_INSN_SHLL8_COMPACT, SH64_COMPACT_INSN_SHLL8_COMPACT, SH64_COMPACT_SFMT_SHLL2_COMPACT },
-  { SH_INSN_SHLL16_COMPACT, SH64_COMPACT_INSN_SHLL16_COMPACT, SH64_COMPACT_SFMT_SHLL2_COMPACT },
-  { SH_INSN_SHLR_COMPACT, SH64_COMPACT_INSN_SHLR_COMPACT, SH64_COMPACT_SFMT_DT_COMPACT },
-  { SH_INSN_SHLR2_COMPACT, SH64_COMPACT_INSN_SHLR2_COMPACT, SH64_COMPACT_SFMT_SHLL2_COMPACT },
-  { SH_INSN_SHLR8_COMPACT, SH64_COMPACT_INSN_SHLR8_COMPACT, SH64_COMPACT_SFMT_SHLL2_COMPACT },
-  { SH_INSN_SHLR16_COMPACT, SH64_COMPACT_INSN_SHLR16_COMPACT, SH64_COMPACT_SFMT_SHLL2_COMPACT },
-  { SH_INSN_STC_GBR_COMPACT, SH64_COMPACT_INSN_STC_GBR_COMPACT, SH64_COMPACT_SFMT_STC_GBR_COMPACT },
-  { SH_INSN_STCL_GBR_COMPACT, SH64_COMPACT_INSN_STCL_GBR_COMPACT, SH64_COMPACT_SFMT_STCL_GBR_COMPACT },
-  { SH_INSN_STS_FPSCR_COMPACT, SH64_COMPACT_INSN_STS_FPSCR_COMPACT, SH64_COMPACT_SFMT_STS_FPSCR_COMPACT },
-  { SH_INSN_STSL_FPSCR_COMPACT, SH64_COMPACT_INSN_STSL_FPSCR_COMPACT, SH64_COMPACT_SFMT_STSL_FPSCR_COMPACT },
-  { SH_INSN_STS_FPUL_COMPACT, SH64_COMPACT_INSN_STS_FPUL_COMPACT, SH64_COMPACT_SFMT_STS_FPUL_COMPACT },
-  { SH_INSN_STSL_FPUL_COMPACT, SH64_COMPACT_INSN_STSL_FPUL_COMPACT, SH64_COMPACT_SFMT_STSL_FPUL_COMPACT },
-  { SH_INSN_STS_MACH_COMPACT, SH64_COMPACT_INSN_STS_MACH_COMPACT, SH64_COMPACT_SFMT_STS_MACH_COMPACT },
-  { SH_INSN_STSL_MACH_COMPACT, SH64_COMPACT_INSN_STSL_MACH_COMPACT, SH64_COMPACT_SFMT_STSL_MACH_COMPACT },
-  { SH_INSN_STS_MACL_COMPACT, SH64_COMPACT_INSN_STS_MACL_COMPACT, SH64_COMPACT_SFMT_STS_MACL_COMPACT },
-  { SH_INSN_STSL_MACL_COMPACT, SH64_COMPACT_INSN_STSL_MACL_COMPACT, SH64_COMPACT_SFMT_STSL_MACL_COMPACT },
-  { SH_INSN_STS_PR_COMPACT, SH64_COMPACT_INSN_STS_PR_COMPACT, SH64_COMPACT_SFMT_STS_PR_COMPACT },
-  { SH_INSN_STSL_PR_COMPACT, SH64_COMPACT_INSN_STSL_PR_COMPACT, SH64_COMPACT_SFMT_STSL_PR_COMPACT },
-  { SH_INSN_SUB_COMPACT, SH64_COMPACT_INSN_SUB_COMPACT, SH64_COMPACT_SFMT_ADD_COMPACT },
-  { SH_INSN_SUBC_COMPACT, SH64_COMPACT_INSN_SUBC_COMPACT, SH64_COMPACT_SFMT_ADDC_COMPACT },
-  { SH_INSN_SUBV_COMPACT, SH64_COMPACT_INSN_SUBV_COMPACT, SH64_COMPACT_SFMT_ADDV_COMPACT },
-  { SH_INSN_SWAPB_COMPACT, SH64_COMPACT_INSN_SWAPB_COMPACT, SH64_COMPACT_SFMT_EXTSB_COMPACT },
-  { SH_INSN_SWAPW_COMPACT, SH64_COMPACT_INSN_SWAPW_COMPACT, SH64_COMPACT_SFMT_EXTSB_COMPACT },
-  { SH_INSN_TASB_COMPACT, SH64_COMPACT_INSN_TASB_COMPACT, SH64_COMPACT_SFMT_TASB_COMPACT },
-  { SH_INSN_TRAPA_COMPACT, SH64_COMPACT_INSN_TRAPA_COMPACT, SH64_COMPACT_SFMT_TRAPA_COMPACT },
-  { SH_INSN_TST_COMPACT, SH64_COMPACT_INSN_TST_COMPACT, SH64_COMPACT_SFMT_CMPEQ_COMPACT },
-  { SH_INSN_TSTI_COMPACT, SH64_COMPACT_INSN_TSTI_COMPACT, SH64_COMPACT_SFMT_TSTI_COMPACT },
-  { SH_INSN_TSTB_COMPACT, SH64_COMPACT_INSN_TSTB_COMPACT, SH64_COMPACT_SFMT_TSTB_COMPACT },
-  { SH_INSN_XOR_COMPACT, SH64_COMPACT_INSN_XOR_COMPACT, SH64_COMPACT_SFMT_AND_COMPACT },
-  { SH_INSN_XORI_COMPACT, SH64_COMPACT_INSN_XORI_COMPACT, SH64_COMPACT_SFMT_XORI_COMPACT },
-  { SH_INSN_XORB_COMPACT, SH64_COMPACT_INSN_XORB_COMPACT, SH64_COMPACT_SFMT_ANDB_COMPACT },
-  { SH_INSN_XTRCT_COMPACT, SH64_COMPACT_INSN_XTRCT_COMPACT, SH64_COMPACT_SFMT_ADD_COMPACT },
-};
-
-static const struct insn_sem sh64_compact_insn_sem_invalid = {
-  VIRTUAL_INSN_X_INVALID, SH64_COMPACT_INSN_X_INVALID, SH64_COMPACT_SFMT_EMPTY
-};
-
-/* Initialize an IDESC from the compile-time computable parts.  */
-
-static INLINE void
-init_idesc (SIM_CPU *cpu, IDESC *id, const struct insn_sem *t)
-{
-  const CGEN_INSN *insn_table = CGEN_CPU_INSN_TABLE (CPU_CPU_DESC (cpu))->init_entries;
-
-  id->num = t->index;
-  id->sfmt = t->sfmt;
-  if ((int) t->type <= 0)
-    id->idata = & cgen_virtual_insn_table[- (int) t->type];
-  else
-    id->idata = & insn_table[t->type];
-  id->attrs = CGEN_INSN_ATTRS (id->idata);
-  /* Oh my god, a magic number.  */
-  id->length = CGEN_INSN_BITSIZE (id->idata) / 8;
-
-#if WITH_PROFILE_MODEL_P
-  id->timing = & MODEL_TIMING (CPU_MODEL (cpu)) [t->index];
-  {
-    SIM_DESC sd = CPU_STATE (cpu);
-    SIM_ASSERT (t->index == id->timing->num);
-  }
-#endif
-
-  /* Semantic pointers are initialized elsewhere.  */
-}
-
-/* Initialize the instruction descriptor table.  */
-
-void
-sh64_compact_init_idesc_table (SIM_CPU *cpu)
-{
-  IDESC *id,*tabend;
-  const struct insn_sem *t,*tend;
-  int tabsize = SH64_COMPACT_INSN_MAX;
-  IDESC *table = sh64_compact_insn_data;
-
-  memset (table, 0, tabsize * sizeof (IDESC));
-
-  /* First set all entries to the `invalid insn'.  */
-  t = & sh64_compact_insn_sem_invalid;
-  for (id = table, tabend = table + tabsize; id < tabend; ++id)
-    init_idesc (cpu, id, t);
-
-  /* Now fill in the values for the chosen cpu.  */
-  for (t = sh64_compact_insn_sem, tend = t + sizeof (sh64_compact_insn_sem) / sizeof (*t);
-       t != tend; ++t)
-    {
-      init_idesc (cpu, & table[t->index], t);
-    }
-
-  /* Link the IDESC table into the cpu.  */
-  CPU_IDESC (cpu) = table;
-}
-
-/* Given an instruction, return a pointer to its IDESC entry.  */
-
-const IDESC *
-sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc,
-              CGEN_INSN_INT base_insn, CGEN_INSN_INT entire_insn,
-              ARGBUF *abuf)
-{
-  /* Result of decoder.  */
-  SH64_COMPACT_INSN_TYPE itype;
-
-  {
-    CGEN_INSN_INT insn = base_insn;
-
-    {
-      unsigned int val = (((insn >> 8) & (15 << 4)) | ((insn >> 0) & (15 << 0)));
-      switch (val)
-      {
-      case 2 : itype = SH64_COMPACT_INSN_STC_GBR_COMPACT; goto extract_sfmt_stc_gbr_compact;      case 3 :
-        {
-          unsigned int val = (((insn >> 4) & (15 << 0)));
-          switch (val)
-          {
-          case 0 : itype = SH64_COMPACT_INSN_BSRF_COMPACT; goto extract_sfmt_bsrf_compact;          case 2 : itype = SH64_COMPACT_INSN_BRAF_COMPACT; goto extract_sfmt_braf_compact;          case 8 : itype = SH64_COMPACT_INSN_PREF_COMPACT; goto extract_sfmt_nop_compact;          case 9 : itype = SH64_COMPACT_INSN_OCBI_COMPACT; goto extract_sfmt_nop_compact;          case 10 : itype = SH64_COMPACT_INSN_OCBP_COMPACT; goto extract_sfmt_nop_compact;          case 11 : itype = SH64_COMPACT_INSN_OCBWB_COMPACT; goto extract_sfmt_nop_compact;          case 12 : itype = SH64_COMPACT_INSN_MOVCAL_COMPACT; goto extract_sfmt_movcal_compact;          default : itype = SH64_COMPACT_INSN_X_INVALID; goto extract_sfmt_empty;
-          }
-        }
-      case 4 : itype = SH64_COMPACT_INSN_MOVB3_COMPACT; goto extract_sfmt_movb3_compact;      case 5 : itype = SH64_COMPACT_INSN_MOVW3_COMPACT; goto extract_sfmt_movb3_compact;      case 6 : itype = SH64_COMPACT_INSN_MOVL3_COMPACT; goto extract_sfmt_movb3_compact;      case 7 : itype = SH64_COMPACT_INSN_MULL_COMPACT; goto extract_sfmt_mull_compact;      case 8 :
-        {
-          unsigned int val = (((insn >> 4) & (7 << 0)));
-          switch (val)
-          {
-          case 0 : itype = SH64_COMPACT_INSN_CLRT_COMPACT; goto extract_sfmt_clrt_compact;          case 1 : itype = SH64_COMPACT_INSN_SETT_COMPACT; goto extract_sfmt_clrt_compact;          case 2 : itype = SH64_COMPACT_INSN_CLRMAC_COMPACT; goto extract_sfmt_clrmac_compact;          case 4 : itype = SH64_COMPACT_INSN_CLRS_COMPACT; goto extract_sfmt_clrs_compact;          case 5 : itype = SH64_COMPACT_INSN_SETS_COMPACT; goto extract_sfmt_clrs_compact;          default : itype = SH64_COMPACT_INSN_X_INVALID; goto extract_sfmt_empty;
-          }
-        }
-      case 9 :
-        {
-          unsigned int val = (((insn >> 4) & (3 << 0)));
-          switch (val)
-          {
-          case 0 : itype = SH64_COMPACT_INSN_NOP_COMPACT; goto extract_sfmt_nop_compact;          case 1 : itype = SH64_COMPACT_INSN_DIV0U_COMPACT; goto extract_sfmt_div0u_compact;          case 2 : itype = SH64_COMPACT_INSN_MOVT_COMPACT; goto extract_sfmt_movt_compact;          default : itype = SH64_COMPACT_INSN_X_INVALID; goto extract_sfmt_empty;
-          }
-        }
-      case 10 :
-        {
-          unsigned int val = (((insn >> 4) & (7 << 0)));
-          switch (val)
-          {
-          case 0 : itype = SH64_COMPACT_INSN_STS_MACH_COMPACT; goto extract_sfmt_sts_mach_compact;          case 1 : itype = SH64_COMPACT_INSN_STS_MACL_COMPACT; goto extract_sfmt_sts_macl_compact;          case 2 : itype = SH64_COMPACT_INSN_STS_PR_COMPACT; goto extract_sfmt_sts_pr_compact;          case 5 : itype = SH64_COMPACT_INSN_STS_FPUL_COMPACT; goto extract_sfmt_sts_fpul_compact;          case 6 : itype = SH64_COMPACT_INSN_STS_FPSCR_COMPACT; goto extract_sfmt_sts_fpscr_compact;          default : itype = SH64_COMPACT_INSN_X_INVALID; goto extract_sfmt_empty;
-          }
-        }
-      case 11 :
-        {
-          unsigned int val = (((insn >> 4) & (3 << 0)));
-          switch (val)
-          {
-          case 0 : itype = SH64_COMPACT_INSN_RTS_COMPACT; goto extract_sfmt_rts_compact;          case 3 : itype = SH64_COMPACT_INSN_BRK_COMPACT; goto extract_sfmt_brk_compact;          default : itype = SH64_COMPACT_INSN_X_INVALID; goto extract_sfmt_empty;
-          }
-        }
-      case 12 : itype = SH64_COMPACT_INSN_MOVB8_COMPACT; goto extract_sfmt_movb8_compact;      case 13 : itype = SH64_COMPACT_INSN_MOVW8_COMPACT; goto extract_sfmt_movb8_compact;      case 14 : itype = SH64_COMPACT_INSN_MOVL8_COMPACT; goto extract_sfmt_movb8_compact;      case 15 : itype = SH64_COMPACT_INSN_MACL_COMPACT; goto extract_sfmt_macl_compact;      case 16 : /* fall through */
-      case 17 : /* fall through */
-      case 18 : /* fall through */
-      case 19 : /* fall through */
-      case 20 : /* fall through */
-      case 21 : /* fall through */
-      case 22 : /* fall through */
-      case 23 : /* fall through */
-      case 24 : /* fall through */
-      case 25 : /* fall through */
-      case 26 : /* fall through */
-      case 27 : /* fall through */
-      case 28 : /* fall through */
-      case 29 : /* fall through */
-      case 30 : /* fall through */
-      case 31 : itype = SH64_COMPACT_INSN_MOVL5_COMPACT; goto extract_sfmt_movl5_compact;      case 32 : itype = SH64_COMPACT_INSN_MOVB1_COMPACT; goto extract_sfmt_movb1_compact;      case 33 : itype = SH64_COMPACT_INSN_MOVW1_COMPACT; goto extract_sfmt_movb1_compact;      case 34 : itype = SH64_COMPACT_INSN_MOVL1_COMPACT; goto extract_sfmt_movb1_compact;      case 36 : itype = SH64_COMPACT_INSN_MOVB2_COMPACT; goto extract_sfmt_movb2_compact;      case 37 : itype = SH64_COMPACT_INSN_MOVW2_COMPACT; goto extract_sfmt_movb2_compact;      case 38 : itype = SH64_COMPACT_INSN_MOVL2_COMPACT; goto extract_sfmt_movb2_compact;      case 39 : itype = SH64_COMPACT_INSN_DIV0S_COMPACT; goto extract_sfmt_div0s_compact;      case 40 : itype = SH64_COMPACT_INSN_TST_COMPACT; goto extract_sfmt_cmpeq_compact;      case 41 : itype = SH64_COMPACT_INSN_AND_COMPACT; goto extract_sfmt_and_compact;      case 42 : itype = SH64_COMPACT_INSN_XOR_COMPACT; goto extract_sfmt_and_compact;      case 43 : itype = SH64_COMPACT_INSN_OR_COMPACT; goto extract_sfmt_and_compact;      case 44 : itype = SH64_COMPACT_INSN_CMPSTR_COMPACT; goto extract_sfmt_cmpeq_compact;      case 45 : itype = SH64_COMPACT_INSN_XTRCT_COMPACT; goto extract_sfmt_add_compact;      case 46 : itype = SH64_COMPACT_INSN_MULUW_COMPACT; goto extract_sfmt_mull_compact;      case 47 : itype = SH64_COMPACT_INSN_MULSW_COMPACT; goto extract_sfmt_mull_compact;      case 48 : itype = SH64_COMPACT_INSN_CMPEQ_COMPACT; goto extract_sfmt_cmpeq_compact;      case 50 : itype = SH64_COMPACT_INSN_CMPHS_COMPACT; goto extract_sfmt_cmpeq_compact;      case 51 : itype = SH64_COMPACT_INSN_CMPGE_COMPACT; goto extract_sfmt_cmpeq_compact;      case 52 : itype = SH64_COMPACT_INSN_DIV1_COMPACT; goto extract_sfmt_div1_compact;      case 53 : itype = SH64_COMPACT_INSN_DMULUL_COMPACT; goto extract_sfmt_dmulsl_compact;      case 54 : itype = SH64_COMPACT_INSN_CMPHI_COMPACT; goto extract_sfmt_cmpeq_compact;      case 55 : itype = SH64_COMPACT_INSN_CMPGT_COMPACT; goto extract_sfmt_cmpeq_compact;      case 56 : itype = SH64_COMPACT_INSN_SUB_COMPACT; goto extract_sfmt_add_compact;      case 58 : itype = SH64_COMPACT_INSN_SUBC_COMPACT; goto extract_sfmt_addc_compact;      case 59 : itype = SH64_COMPACT_INSN_SUBV_COMPACT; goto extract_sfmt_addv_compact;      case 60 : itype = SH64_COMPACT_INSN_ADD_COMPACT; goto extract_sfmt_add_compact;      case 61 : itype = SH64_COMPACT_INSN_DMULSL_COMPACT; goto extract_sfmt_dmulsl_compact;      case 62 : itype = SH64_COMPACT_INSN_ADDC_COMPACT; goto extract_sfmt_addc_compact;      case 63 : itype = SH64_COMPACT_INSN_ADDV_COMPACT; goto extract_sfmt_addv_compact;      case 64 :
-        {
-          unsigned int val = (((insn >> 4) & (3 << 0)));
-          switch (val)
-          {
-          case 0 : itype = SH64_COMPACT_INSN_SHLL_COMPACT; goto extract_sfmt_dt_compact;          case 1 : itype = SH64_COMPACT_INSN_DT_COMPACT; goto extract_sfmt_dt_compact;          case 2 : itype = SH64_COMPACT_INSN_SHAL_COMPACT; goto extract_sfmt_dt_compact;          default : itype = SH64_COMPACT_INSN_X_INVALID; goto extract_sfmt_empty;
-          }
-        }
-      case 65 :
-        {
-          unsigned int val = (((insn >> 4) & (3 << 0)));
-          switch (val)
-          {
-          case 0 : itype = SH64_COMPACT_INSN_SHLR_COMPACT; goto extract_sfmt_dt_compact;          case 1 : itype = SH64_COMPACT_INSN_CMPPZ_COMPACT; goto extract_sfmt_cmppl_compact;          case 2 : itype = SH64_COMPACT_INSN_SHAR_COMPACT; goto extract_sfmt_dt_compact;          default : itype = SH64_COMPACT_INSN_X_INVALID; goto extract_sfmt_empty;
-          }
-        }
-      case 66 :
-        {
-          unsigned int val = (((insn >> 4) & (7 << 0)));
-          switch (val)
-          {
-          case 0 : itype = SH64_COMPACT_INSN_STSL_MACH_COMPACT; goto extract_sfmt_stsl_mach_compact;          case 1 : itype = SH64_COMPACT_INSN_STSL_MACL_COMPACT; goto extract_sfmt_stsl_macl_compact;          case 2 : itype = SH64_COMPACT_INSN_STSL_PR_COMPACT; goto extract_sfmt_stsl_pr_compact;          case 5 : itype = SH64_COMPACT_INSN_STSL_FPUL_COMPACT; goto extract_sfmt_stsl_fpul_compact;          case 6 : itype = SH64_COMPACT_INSN_STSL_FPSCR_COMPACT; goto extract_sfmt_stsl_fpscr_compact;          default : itype = SH64_COMPACT_INSN_X_INVALID; goto extract_sfmt_empty;
-          }
-        }
-      case 67 : itype = SH64_COMPACT_INSN_STCL_GBR_COMPACT; goto extract_sfmt_stcl_gbr_compact;      case 68 :
-        {
-          unsigned int val = (((insn >> 5) & (1 << 0)));
-          switch (val)
-          {
-          case 0 : itype = SH64_COMPACT_INSN_ROTL_COMPACT; goto extract_sfmt_dt_compact;          case 1 : itype = SH64_COMPACT_INSN_ROTCL_COMPACT; goto extract_sfmt_rotcl_compact;          default : itype = SH64_COMPACT_INSN_X_INVALID; goto extract_sfmt_empty;
-          }
-        }
-      case 69 :
-        {
-          unsigned int val = (((insn >> 4) & (3 << 0)));
-          switch (val)
-          {
-          case 0 : itype = SH64_COMPACT_INSN_ROTR_COMPACT; goto extract_sfmt_dt_compact;          case 1 : itype = SH64_COMPACT_INSN_CMPPL_COMPACT; goto extract_sfmt_cmppl_compact;          case 2 : itype = SH64_COMPACT_INSN_ROTCR_COMPACT; goto extract_sfmt_rotcl_compact;          default : itype = SH64_COMPACT_INSN_X_INVALID; goto extract_sfmt_empty;
-          }
-        }
-      case 70 :
-        {
-          unsigned int val = (((insn >> 4) & (7 << 0)));
-          switch (val)
-          {
-          case 0 : itype = SH64_COMPACT_INSN_LDSL_MACH_COMPACT; goto extract_sfmt_ldsl_mach_compact;          case 1 : itype = SH64_COMPACT_INSN_LDSL_MACL_COMPACT; goto extract_sfmt_ldsl_macl_compact;          case 2 : itype = SH64_COMPACT_INSN_LDSL_PR_COMPACT; goto extract_sfmt_ldsl_pr_compact;          case 5 : itype = SH64_COMPACT_INSN_LDSL_FPUL_COMPACT; goto extract_sfmt_ldsl_fpul_compact;          case 6 : itype = SH64_COMPACT_INSN_LDSL_FPSCR_COMPACT; goto extract_sfmt_ldsl_fpscr_compact;          default : itype = SH64_COMPACT_INSN_X_INVALID; goto extract_sfmt_empty;
-          }
-        }
-      case 71 : itype = SH64_COMPACT_INSN_LDCL_COMPACT; goto extract_sfmt_ldcl_compact;      case 72 :
-        {
-          unsigned int val = (((insn >> 4) & (3 << 0)));
-          switch (val)
-          {
-          case 0 : itype = SH64_COMPACT_INSN_SHLL2_COMPACT; goto extract_sfmt_shll2_compact;          case 1 : itype = SH64_COMPACT_INSN_SHLL8_COMPACT; goto extract_sfmt_shll2_compact;          case 2 : itype = SH64_COMPACT_INSN_SHLL16_COMPACT; goto extract_sfmt_shll2_compact;          default : itype = SH64_COMPACT_INSN_X_INVALID; goto extract_sfmt_empty;
-          }
-        }
-      case 73 :
-        {
-          unsigned int val = (((insn >> 4) & (3 << 0)));
-          switch (val)
-          {
-          case 0 : itype = SH64_COMPACT_INSN_SHLR2_COMPACT; goto extract_sfmt_shll2_compact;          case 1 : itype = SH64_COMPACT_INSN_SHLR8_COMPACT; goto extract_sfmt_shll2_compact;          case 2 : itype = SH64_COMPACT_INSN_SHLR16_COMPACT; goto extract_sfmt_shll2_compact;          default : itype = SH64_COMPACT_INSN_X_INVALID; goto extract_sfmt_empty;
-          }
-        }
-      case 74 :
-        {
-          unsigned int val = (((insn >> 4) & (7 << 0)));
-          switch (val)
-          {
-          case 0 : itype = SH64_COMPACT_INSN_LDS_MACH_COMPACT; goto extract_sfmt_lds_mach_compact;          case 1 : itype = SH64_COMPACT_INSN_LDS_MACL_COMPACT; goto extract_sfmt_lds_macl_compact;          case 2 : itype = SH64_COMPACT_INSN_LDS_PR_COMPACT; goto extract_sfmt_lds_pr_compact;          case 5 : itype = SH64_COMPACT_INSN_LDS_FPUL_COMPACT; goto extract_sfmt_lds_fpul_compact;          case 6 : itype = SH64_COMPACT_INSN_LDS_FPSCR_COMPACT; goto extract_sfmt_lds_fpscr_compact;          default : itype = SH64_COMPACT_INSN_X_INVALID; goto extract_sfmt_empty;
-          }
-        }
-      case 75 :
-        {
-          unsigned int val = (((insn >> 4) & (3 << 0)));
-          switch (val)
-          {
-          case 0 : itype = SH64_COMPACT_INSN_JSR_COMPACT; goto extract_sfmt_bsrf_compact;          case 1 : itype = SH64_COMPACT_INSN_TASB_COMPACT; goto extract_sfmt_tasb_compact;          case 2 : itype = SH64_COMPACT_INSN_JMP_COMPACT; goto extract_sfmt_jmp_compact;          default : itype = SH64_COMPACT_INSN_X_INVALID; goto extract_sfmt_empty;
-          }
-        }
-      case 76 : itype = SH64_COMPACT_INSN_SHAD_COMPACT; goto extract_sfmt_shad_compact;      case 77 : itype = SH64_COMPACT_INSN_SHLD_COMPACT; goto extract_sfmt_shad_compact;      case 78 : itype = SH64_COMPACT_INSN_LDC_COMPACT; goto extract_sfmt_ldc_compact;      case 79 : itype = SH64_COMPACT_INSN_MACW_COMPACT; goto extract_sfmt_macw_compact;      case 80 : /* fall through */
-      case 81 : /* fall through */
-      case 82 : /* fall through */
-      case 83 : /* fall through */
-      case 84 : /* fall through */
-      case 85 : /* fall through */
-      case 86 : /* fall through */
-      case 87 : /* fall through */
-      case 88 : /* fall through */
-      case 89 : /* fall through */
-      case 90 : /* fall through */
-      case 91 : /* fall through */
-      case 92 : /* fall through */
-      case 93 : /* fall through */
-      case 94 : /* fall through */
-      case 95 : itype = SH64_COMPACT_INSN_MOVL11_COMPACT; goto extract_sfmt_movl11_compact;      case 96 : itype = SH64_COMPACT_INSN_MOVB6_COMPACT; goto extract_sfmt_movb6_compact;      case 97 : itype = SH64_COMPACT_INSN_MOVW6_COMPACT; goto extract_sfmt_movb6_compact;      case 98 : itype = SH64_COMPACT_INSN_MOVL6_COMPACT; goto extract_sfmt_movb6_compact;      case 99 : itype = SH64_COMPACT_INSN_MOV_COMPACT; goto extract_sfmt_mov_compact;      case 100 : itype = SH64_COMPACT_INSN_MOVB7_COMPACT; goto extract_sfmt_movb7_compact;      case 101 : itype = SH64_COMPACT_INSN_MOVW7_COMPACT; goto extract_sfmt_movb7_compact;      case 102 : itype = SH64_COMPACT_INSN_MOVL7_COMPACT; goto extract_sfmt_movl7_compact;      case 103 : itype = SH64_COMPACT_INSN_NOT_COMPACT; goto extract_sfmt_mov_compact;      case 104 : itype = SH64_COMPACT_INSN_SWAPB_COMPACT; goto extract_sfmt_extsb_compact;      case 105 : itype = SH64_COMPACT_INSN_SWAPW_COMPACT; goto extract_sfmt_extsb_compact;      case 106 : itype = SH64_COMPACT_INSN_NEGC_COMPACT; goto extract_sfmt_negc_compact;      case 107 : itype = SH64_COMPACT_INSN_NEG_COMPACT; goto extract_sfmt_extsb_compact;      case 108 : itype = SH64_COMPACT_INSN_EXTUB_COMPACT; goto extract_sfmt_extsb_compact;      case 109 : itype = SH64_COMPACT_INSN_EXTUW_COMPACT; goto extract_sfmt_extsb_compact;      case 110 : itype = SH64_COMPACT_INSN_EXTSB_COMPACT; goto extract_sfmt_extsb_compact;      case 111 : itype = SH64_COMPACT_INSN_EXTSW_COMPACT; goto extract_sfmt_extsb_compact;      case 112 : /* fall through */
-      case 113 : /* fall through */
-      case 114 : /* fall through */
-      case 115 : /* fall through */
-      case 116 : /* fall through */
-      case 117 : /* fall through */
-      case 118 : /* fall through */
-      case 119 : /* fall through */
-      case 120 : /* fall through */
-      case 121 : /* fall through */
-      case 122 : /* fall through */
-      case 123 : /* fall through */
-      case 124 : /* fall through */
-      case 125 : /* fall through */
-      case 126 : /* fall through */
-      case 127 : itype = SH64_COMPACT_INSN_ADDI_COMPACT; goto extract_sfmt_addi_compact;      case 128 : /* fall through */
-      case 129 : /* fall through */
-      case 130 : /* fall through */
-      case 131 : /* fall through */
-      case 132 : /* fall through */
-      case 133 : /* fall through */
-      case 134 : /* fall through */
-      case 135 : /* fall through */
-      case 136 : /* fall through */
-      case 137 : /* fall through */
-      case 138 : /* fall through */
-      case 139 : /* fall through */
-      case 140 : /* fall through */
-      case 141 : /* fall through */
-      case 142 : /* fall through */
-      case 143 :
-        {
-          unsigned int val = (((insn >> 8) & (15 << 0)));
-          switch (val)
-          {
-          case 0 : itype = SH64_COMPACT_INSN_MOVB5_COMPACT; goto extract_sfmt_movb5_compact;          case 1 : itype = SH64_COMPACT_INSN_MOVW5_COMPACT; goto extract_sfmt_movw5_compact;          case 4 : itype = SH64_COMPACT_INSN_MOVB10_COMPACT; goto extract_sfmt_movb10_compact;          case 5 : itype = SH64_COMPACT_INSN_MOVW11_COMPACT; goto extract_sfmt_movw11_compact;          case 8 : itype = SH64_COMPACT_INSN_CMPEQI_COMPACT; goto extract_sfmt_cmpeqi_compact;          case 9 : itype = SH64_COMPACT_INSN_BT_COMPACT; goto extract_sfmt_bf_compact;          case 11 : itype = SH64_COMPACT_INSN_BF_COMPACT; goto extract_sfmt_bf_compact;          case 13 : itype = SH64_COMPACT_INSN_BTS_COMPACT; goto extract_sfmt_bf_compact;          case 15 : itype = SH64_COMPACT_INSN_BFS_COMPACT; goto extract_sfmt_bf_compact;          default : itype = SH64_COMPACT_INSN_X_INVALID; goto extract_sfmt_empty;
-          }
-        }
-      case 144 : /* fall through */
-      case 145 : /* fall through */
-      case 146 : /* fall through */
-      case 147 : /* fall through */
-      case 148 : /* fall through */
-      case 149 : /* fall through */
-      case 150 : /* fall through */
-      case 151 : /* fall through */
-      case 152 : /* fall through */
-      case 153 : /* fall through */
-      case 154 : /* fall through */
-      case 155 : /* fall through */
-      case 156 : /* fall through */
-      case 157 : /* fall through */
-      case 158 : /* fall through */
-      case 159 : itype = SH64_COMPACT_INSN_MOVW10_COMPACT; goto extract_sfmt_movw10_compact;      case 160 : /* fall through */
-      case 161 : /* fall through */
-      case 162 : /* fall through */
-      case 163 : /* fall through */
-      case 164 : /* fall through */
-      case 165 : /* fall through */
-      case 166 : /* fall through */
-      case 167 : /* fall through */
-      case 168 : /* fall through */
-      case 169 : /* fall through */
-      case 170 : /* fall through */
-      case 171 : /* fall through */
-      case 172 : /* fall through */
-      case 173 : /* fall through */
-      case 174 : /* fall through */
-      case 175 : itype = SH64_COMPACT_INSN_BRA_COMPACT; goto extract_sfmt_bra_compact;      case 176 : /* fall through */
-      case 177 : /* fall through */
-      case 178 : /* fall through */
-      case 179 : /* fall through */
-      case 180 : /* fall through */
-      case 181 : /* fall through */
-      case 182 : /* fall through */
-      case 183 : /* fall through */
-      case 184 : /* fall through */
-      case 185 : /* fall through */
-      case 186 : /* fall through */
-      case 187 : /* fall through */
-      case 188 : /* fall through */
-      case 189 : /* fall through */
-      case 190 : /* fall through */
-      case 191 : itype = SH64_COMPACT_INSN_BSR_COMPACT; goto extract_sfmt_bsr_compact;      case 192 : /* fall through */
-      case 193 : /* fall through */
-      case 194 : /* fall through */
-      case 195 : /* fall through */
-      case 196 : /* fall through */
-      case 197 : /* fall through */
-      case 198 : /* fall through */
-      case 199 : /* fall through */
-      case 200 : /* fall through */
-      case 201 : /* fall through */
-      case 202 : /* fall through */
-      case 203 : /* fall through */
-      case 204 : /* fall through */
-      case 205 : /* fall through */
-      case 206 : /* fall through */
-      case 207 :
-        {
-          unsigned int val = (((insn >> 8) & (15 << 0)));
-          switch (val)
-          {
-          case 0 : itype = SH64_COMPACT_INSN_MOVB4_COMPACT; goto extract_sfmt_movb4_compact;          case 1 : itype = SH64_COMPACT_INSN_MOVW4_COMPACT; goto extract_sfmt_movw4_compact;          case 2 : itype = SH64_COMPACT_INSN_MOVL4_COMPACT; goto extract_sfmt_movl4_compact;          case 3 : itype = SH64_COMPACT_INSN_TRAPA_COMPACT; goto extract_sfmt_trapa_compact;          case 4 : itype = SH64_COMPACT_INSN_MOVB9_COMPACT; goto extract_sfmt_movb9_compact;          case 5 : itype = SH64_COMPACT_INSN_MOVW9_COMPACT; goto extract_sfmt_movw9_compact;          case 6 : itype = SH64_COMPACT_INSN_MOVL9_COMPACT; goto extract_sfmt_movl9_compact;          case 7 : itype = SH64_COMPACT_INSN_MOVA_COMPACT; goto extract_sfmt_mova_compact;          case 8 : itype = SH64_COMPACT_INSN_TSTI_COMPACT; goto extract_sfmt_tsti_compact;          case 9 : itype = SH64_COMPACT_INSN_ANDI_COMPACT; goto extract_sfmt_andi_compact;          case 10 : itype = SH64_COMPACT_INSN_XORI_COMPACT; goto extract_sfmt_xori_compact;          case 11 : itype = SH64_COMPACT_INSN_ORI_COMPACT; goto extract_sfmt_andi_compact;          case 12 : itype = SH64_COMPACT_INSN_TSTB_COMPACT; goto extract_sfmt_tstb_compact;          case 13 : itype = SH64_COMPACT_INSN_ANDB_COMPACT; goto extract_sfmt_andb_compact;          case 14 : itype = SH64_COMPACT_INSN_XORB_COMPACT; goto extract_sfmt_andb_compact;          case 15 : itype = SH64_COMPACT_INSN_ORB_COMPACT; goto extract_sfmt_andb_compact;          default : itype = SH64_COMPACT_INSN_X_INVALID; goto extract_sfmt_empty;
-          }
-        }
-      case 208 : /* fall through */
-      case 209 : /* fall through */
-      case 210 : /* fall through */
-      case 211 : /* fall through */
-      case 212 : /* fall through */
-      case 213 : /* fall through */
-      case 214 : /* fall through */
-      case 215 : /* fall through */
-      case 216 : /* fall through */
-      case 217 : /* fall through */
-      case 218 : /* fall through */
-      case 219 : /* fall through */
-      case 220 : /* fall through */
-      case 221 : /* fall through */
-      case 222 : /* fall through */
-      case 223 : itype = SH64_COMPACT_INSN_MOVL10_COMPACT; goto extract_sfmt_movl10_compact;      case 224 : /* fall through */
-      case 225 : /* fall through */
-      case 226 : /* fall through */
-      case 227 : /* fall through */
-      case 228 : /* fall through */
-      case 229 : /* fall through */
-      case 230 : /* fall through */
-      case 231 : /* fall through */
-      case 232 : /* fall through */
-      case 233 : /* fall through */
-      case 234 : /* fall through */
-      case 235 : /* fall through */
-      case 236 : /* fall through */
-      case 237 : /* fall through */
-      case 238 : /* fall through */
-      case 239 : itype = SH64_COMPACT_INSN_MOVI_COMPACT; goto extract_sfmt_movi_compact;      case 240 : itype = SH64_COMPACT_INSN_FADD_COMPACT; goto extract_sfmt_fadd_compact;      case 241 : itype = SH64_COMPACT_INSN_FSUB_COMPACT; goto extract_sfmt_fadd_compact;      case 242 : itype = SH64_COMPACT_INSN_FMUL_COMPACT; goto extract_sfmt_fadd_compact;      case 243 : itype = SH64_COMPACT_INSN_FDIV_COMPACT; goto extract_sfmt_fadd_compact;      case 244 : itype = SH64_COMPACT_INSN_FCMPEQ_COMPACT; goto extract_sfmt_fcmpeq_compact;      case 245 : itype = SH64_COMPACT_INSN_FCMPGT_COMPACT; goto extract_sfmt_fcmpeq_compact;      case 246 : itype = SH64_COMPACT_INSN_FMOV4_COMPACT; goto extract_sfmt_fmov4_compact;      case 247 : itype = SH64_COMPACT_INSN_FMOV7_COMPACT; goto extract_sfmt_fmov7_compact;      case 248 : itype = SH64_COMPACT_INSN_FMOV2_COMPACT; goto extract_sfmt_fmov2_compact;      case 249 : itype = SH64_COMPACT_INSN_FMOV3_COMPACT; goto extract_sfmt_fmov3_compact;      case 250 : itype = SH64_COMPACT_INSN_FMOV5_COMPACT; goto extract_sfmt_fmov5_compact;      case 251 : itype = SH64_COMPACT_INSN_FMOV6_COMPACT; goto extract_sfmt_fmov6_compact;      case 252 : itype = SH64_COMPACT_INSN_FMOV1_COMPACT; goto extract_sfmt_fmov1_compact;      case 253 :
-        {
-          unsigned int val = (((insn >> 4) & (15 << 0)));
-          switch (val)
-          {
-          case 0 : itype = SH64_COMPACT_INSN_FSTS_COMPACT; goto extract_sfmt_fsts_compact;          case 1 : itype = SH64_COMPACT_INSN_FLDS_COMPACT; goto extract_sfmt_flds_compact;          case 2 : itype = SH64_COMPACT_INSN_FLOAT_COMPACT; goto extract_sfmt_float_compact;          case 3 : itype = SH64_COMPACT_INSN_FTRC_COMPACT; goto extract_sfmt_ftrc_compact;          case 4 : itype = SH64_COMPACT_INSN_FNEG_COMPACT; goto extract_sfmt_fabs_compact;          case 5 : itype = SH64_COMPACT_INSN_FABS_COMPACT; goto extract_sfmt_fabs_compact;          case 6 : itype = SH64_COMPACT_INSN_FSQRT_COMPACT; goto extract_sfmt_fabs_compact;          case 8 : itype = SH64_COMPACT_INSN_FLDI0_COMPACT; goto extract_sfmt_fldi0_compact;          case 9 : itype = SH64_COMPACT_INSN_FLDI1_COMPACT; goto extract_sfmt_fldi0_compact;          case 10 : itype = SH64_COMPACT_INSN_FCNVSD_COMPACT; goto extract_sfmt_fcnvsd_compact;          case 11 : itype = SH64_COMPACT_INSN_FCNVDS_COMPACT; goto extract_sfmt_fcnvds_compact;          case 14 : itype = SH64_COMPACT_INSN_FIPR_COMPACT; goto extract_sfmt_fipr_compact;          case 15 :
-            {
-              unsigned int val = (((insn >> 9) & (1 << 0)));
-              switch (val)
-              {
-              case 0 : itype = SH64_COMPACT_INSN_FTRV_COMPACT; goto extract_sfmt_ftrv_compact;              case 1 :
-                {
-                  unsigned int val = (((insn >> 11) & (1 << 0)));
-                  switch (val)
-                  {
-                  case 0 : itype = SH64_COMPACT_INSN_FSCHG_COMPACT; goto extract_sfmt_fschg_compact;                  case 1 : itype = SH64_COMPACT_INSN_FRCHG_COMPACT; goto extract_sfmt_frchg_compact;                  default : itype = SH64_COMPACT_INSN_X_INVALID; goto extract_sfmt_empty;
-                  }
-                }
-              default : itype = SH64_COMPACT_INSN_X_INVALID; goto extract_sfmt_empty;
-              }
-            }
-          default : itype = SH64_COMPACT_INSN_X_INVALID; goto extract_sfmt_empty;
-          }
-        }
-      case 254 : itype = SH64_COMPACT_INSN_FMAC_COMPACT; goto extract_sfmt_fmac_compact;      default : itype = SH64_COMPACT_INSN_X_INVALID; goto extract_sfmt_empty;
-      }
-    }
-  }
-
-  /* The instruction has been decoded, now extract the fields.  */
-
- extract_sfmt_empty:
-  {
-    const IDESC *idesc = &sh64_compact_insn_data[itype];
-#define FLD(f) abuf->fields.fmt_empty.f
-
-
-  /* Record the fields for the semantic handler.  */
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_empty", (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_add_compact:
-  {
-    const IDESC *idesc = &sh64_compact_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-    UINT f_rn;
-    UINT f_rm;
-
-    f_rn = EXTRACT_LSB0_UINT (insn, 16, 11, 4);
-    f_rm = EXTRACT_LSB0_UINT (insn, 16, 7, 4);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_rm) = f_rm;
-  FLD (f_rn) = f_rn;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_add_compact", "f_rm 0x%x", 'x', f_rm, "f_rn 0x%x", 'x', f_rn, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_addi_compact:
-  {
-    const IDESC *idesc = &sh64_compact_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_addi_compact.f
-    UINT f_rn;
-    UINT f_imm8;
-
-    f_rn = EXTRACT_LSB0_UINT (insn, 16, 11, 4);
-    f_imm8 = EXTRACT_LSB0_UINT (insn, 16, 7, 8);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_imm8) = f_imm8;
-  FLD (f_rn) = f_rn;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addi_compact", "f_imm8 0x%x", 'x', f_imm8, "f_rn 0x%x", 'x', f_rn, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_addc_compact:
-  {
-    const IDESC *idesc = &sh64_compact_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-    UINT f_rn;
-    UINT f_rm;
-
-    f_rn = EXTRACT_LSB0_UINT (insn, 16, 11, 4);
-    f_rm = EXTRACT_LSB0_UINT (insn, 16, 7, 4);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_rm) = f_rm;
-  FLD (f_rn) = f_rn;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addc_compact", "f_rm 0x%x", 'x', f_rm, "f_rn 0x%x", 'x', f_rn, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_addv_compact:
-  {
-    const IDESC *idesc = &sh64_compact_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-    UINT f_rn;
-    UINT f_rm;
-
-    f_rn = EXTRACT_LSB0_UINT (insn, 16, 11, 4);
-    f_rm = EXTRACT_LSB0_UINT (insn, 16, 7, 4);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_rm) = f_rm;
-  FLD (f_rn) = f_rn;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addv_compact", "f_rm 0x%x", 'x', f_rm, "f_rn 0x%x", 'x', f_rn, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_and_compact:
-  {
-    const IDESC *idesc = &sh64_compact_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-    UINT f_rn;
-    UINT f_rm;
-
-    f_rn = EXTRACT_LSB0_UINT (insn, 16, 11, 4);
-    f_rm = EXTRACT_LSB0_UINT (insn, 16, 7, 4);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_rm) = f_rm;
-  FLD (f_rn) = f_rn;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_and_compact", "f_rm 0x%x", 'x', f_rm, "f_rn 0x%x", 'x', f_rn, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_andi_compact:
-  {
-    const IDESC *idesc = &sh64_compact_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_addi_compact.f
-    UINT f_imm8;
-
-    f_imm8 = EXTRACT_LSB0_UINT (insn, 16, 7, 8);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_imm8) = f_imm8;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_andi_compact", "f_imm8 0x%x", 'x', f_imm8, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_andb_compact:
-  {
-    const IDESC *idesc = &sh64_compact_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_addi_compact.f
-    UINT f_imm8;
-
-    f_imm8 = EXTRACT_LSB0_UINT (insn, 16, 7, 8);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_imm8) = f_imm8;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_andb_compact", "f_imm8 0x%x", 'x', f_imm8, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_bf_compact:
-  {
-    const IDESC *idesc = &sh64_compact_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_bf_compact.f
-    SI f_disp8;
-
-    f_disp8 = ((((EXTRACT_LSB0_INT (insn, 16, 7, 8)) << (1))) + (((pc) + (4))));
-
-  /* Record the fields for the semantic handler.  */
-  FLD (i_disp8) = f_disp8;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bf_compact", "disp8 0x%x", 'x', f_disp8, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_bra_compact:
-  {
-    const IDESC *idesc = &sh64_compact_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_bra_compact.f
-    SI f_disp12;
-
-    f_disp12 = ((((EXTRACT_LSB0_INT (insn, 16, 11, 12)) << (1))) + (((pc) + (4))));
-
-  /* Record the fields for the semantic handler.  */
-  FLD (i_disp12) = f_disp12;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bra_compact", "disp12 0x%x", 'x', f_disp12, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_braf_compact:
-  {
-    const IDESC *idesc = &sh64_compact_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-    UINT f_rn;
-
-    f_rn = EXTRACT_LSB0_UINT (insn, 16, 11, 4);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_rn) = f_rn;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_braf_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_brk_compact:
-  {
-    const IDESC *idesc = &sh64_compact_insn_data[itype];
-#define FLD(f) abuf->fields.fmt_empty.f
-
-
-  /* Record the fields for the semantic handler.  */
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_brk_compact", (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_bsr_compact:
-  {
-    const IDESC *idesc = &sh64_compact_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_bra_compact.f
-    SI f_disp12;
-
-    f_disp12 = ((((EXTRACT_LSB0_INT (insn, 16, 11, 12)) << (1))) + (((pc) + (4))));
-
-  /* Record the fields for the semantic handler.  */
-  FLD (i_disp12) = f_disp12;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bsr_compact", "disp12 0x%x", 'x', f_disp12, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_bsrf_compact:
-  {
-    const IDESC *idesc = &sh64_compact_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-    UINT f_rn;
-
-    f_rn = EXTRACT_LSB0_UINT (insn, 16, 11, 4);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_rn) = f_rn;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bsrf_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_clrmac_compact:
-  {
-    const IDESC *idesc = &sh64_compact_insn_data[itype];
-#define FLD(f) abuf->fields.fmt_empty.f
-
-
-  /* Record the fields for the semantic handler.  */
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_clrmac_compact", (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_clrs_compact:
-  {
-    const IDESC *idesc = &sh64_compact_insn_data[itype];
-#define FLD(f) abuf->fields.fmt_empty.f
-
-
-  /* Record the fields for the semantic handler.  */
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_clrs_compact", (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_clrt_compact:
-  {
-    const IDESC *idesc = &sh64_compact_insn_data[itype];
-#define FLD(f) abuf->fields.fmt_empty.f
-
-
-  /* Record the fields for the semantic handler.  */
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_clrt_compact", (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_cmpeq_compact:
-  {
-    const IDESC *idesc = &sh64_compact_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-    UINT f_rn;
-    UINT f_rm;
-
-    f_rn = EXTRACT_LSB0_UINT (insn, 16, 11, 4);
-    f_rm = EXTRACT_LSB0_UINT (insn, 16, 7, 4);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_rm) = f_rm;
-  FLD (f_rn) = f_rn;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmpeq_compact", "f_rm 0x%x", 'x', f_rm, "f_rn 0x%x", 'x', f_rn, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_cmpeqi_compact:
-  {
-    const IDESC *idesc = &sh64_compact_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_addi_compact.f
-    UINT f_imm8;
-
-    f_imm8 = EXTRACT_LSB0_UINT (insn, 16, 7, 8);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_imm8) = f_imm8;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmpeqi_compact", "f_imm8 0x%x", 'x', f_imm8, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_cmppl_compact:
-  {
-    const IDESC *idesc = &sh64_compact_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-    UINT f_rn;
-
-    f_rn = EXTRACT_LSB0_UINT (insn, 16, 11, 4);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_rn) = f_rn;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmppl_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_div0s_compact:
-  {
-    const IDESC *idesc = &sh64_compact_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-    UINT f_rn;
-    UINT f_rm;
-
-    f_rn = EXTRACT_LSB0_UINT (insn, 16, 11, 4);
-    f_rm = EXTRACT_LSB0_UINT (insn, 16, 7, 4);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_rm) = f_rm;
-  FLD (f_rn) = f_rn;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_div0s_compact", "f_rm 0x%x", 'x', f_rm, "f_rn 0x%x", 'x', f_rn, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_div0u_compact:
-  {
-    const IDESC *idesc = &sh64_compact_insn_data[itype];
-#define FLD(f) abuf->fields.fmt_empty.f
-
-
-  /* Record the fields for the semantic handler.  */
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_div0u_compact", (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_div1_compact:
-  {
-    const IDESC *idesc = &sh64_compact_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-    UINT f_rn;
-    UINT f_rm;
-
-    f_rn = EXTRACT_LSB0_UINT (insn, 16, 11, 4);
-    f_rm = EXTRACT_LSB0_UINT (insn, 16, 7, 4);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_rm) = f_rm;
-  FLD (f_rn) = f_rn;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_div1_compact", "f_rm 0x%x", 'x', f_rm, "f_rn 0x%x", 'x', f_rn, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_dmulsl_compact:
-  {
-    const IDESC *idesc = &sh64_compact_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-    UINT f_rn;
-    UINT f_rm;
-
-    f_rn = EXTRACT_LSB0_UINT (insn, 16, 11, 4);
-    f_rm = EXTRACT_LSB0_UINT (insn, 16, 7, 4);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_rm) = f_rm;
-  FLD (f_rn) = f_rn;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_dmulsl_compact", "f_rm 0x%x", 'x', f_rm, "f_rn 0x%x", 'x', f_rn, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_dt_compact:
-  {
-    const IDESC *idesc = &sh64_compact_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-    UINT f_rn;
-
-    f_rn = EXTRACT_LSB0_UINT (insn, 16, 11, 4);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_rn) = f_rn;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_dt_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_extsb_compact:
-  {
-    const IDESC *idesc = &sh64_compact_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-    UINT f_rn;
-    UINT f_rm;
-
-    f_rn = EXTRACT_LSB0_UINT (insn, 16, 11, 4);
-    f_rm = EXTRACT_LSB0_UINT (insn, 16, 7, 4);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_rm) = f_rm;
-  FLD (f_rn) = f_rn;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_extsb_compact", "f_rm 0x%x", 'x', f_rm, "f_rn 0x%x", 'x', f_rn, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_fabs_compact:
-  {
-    const IDESC *idesc = &sh64_compact_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-    UINT f_rn;
-
-    f_rn = EXTRACT_LSB0_UINT (insn, 16, 11, 4);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_rn) = f_rn;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fabs_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_fadd_compact:
-  {
-    const IDESC *idesc = &sh64_compact_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-    UINT f_rn;
-    UINT f_rm;
-
-    f_rn = EXTRACT_LSB0_UINT (insn, 16, 11, 4);
-    f_rm = EXTRACT_LSB0_UINT (insn, 16, 7, 4);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_rm) = f_rm;
-  FLD (f_rn) = f_rn;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fadd_compact", "f_rm 0x%x", 'x', f_rm, "f_rn 0x%x", 'x', f_rn, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_fcmpeq_compact:
-  {
-    const IDESC *idesc = &sh64_compact_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-    UINT f_rn;
-    UINT f_rm;
-
-    f_rn = EXTRACT_LSB0_UINT (insn, 16, 11, 4);
-    f_rm = EXTRACT_LSB0_UINT (insn, 16, 7, 4);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_rm) = f_rm;
-  FLD (f_rn) = f_rn;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fcmpeq_compact", "f_rm 0x%x", 'x', f_rm, "f_rn 0x%x", 'x', f_rn, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_fcnvds_compact:
-  {
-    const IDESC *idesc = &sh64_compact_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_fcnvds_compact.f
-    SI f_dn;
-
-    f_dn = ((EXTRACT_LSB0_UINT (insn, 16, 11, 3)) << (1));
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_dn) = f_dn;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fcnvds_compact", "f_dn 0x%x", 'x', f_dn, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_fcnvsd_compact:
-  {
-    const IDESC *idesc = &sh64_compact_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_fcnvds_compact.f
-    SI f_dn;
-
-    f_dn = ((EXTRACT_LSB0_UINT (insn, 16, 11, 3)) << (1));
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_dn) = f_dn;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fcnvsd_compact", "f_dn 0x%x", 'x', f_dn, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_fipr_compact:
-  {
-    const IDESC *idesc = &sh64_compact_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_fipr_compact.f
-    SI f_vn;
-    SI f_vm;
-
-    f_vn = ((EXTRACT_LSB0_UINT (insn, 16, 11, 2)) << (2));
-    f_vm = ((EXTRACT_LSB0_UINT (insn, 16, 9, 2)) << (2));
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_vm) = f_vm;
-  FLD (f_vn) = f_vn;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fipr_compact", "f_vm 0x%x", 'x', f_vm, "f_vn 0x%x", 'x', f_vn, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_flds_compact:
-  {
-    const IDESC *idesc = &sh64_compact_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-    UINT f_rn;
-
-    f_rn = EXTRACT_LSB0_UINT (insn, 16, 11, 4);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_rn) = f_rn;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_flds_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_fldi0_compact:
-  {
-    const IDESC *idesc = &sh64_compact_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-    UINT f_rn;
-
-    f_rn = EXTRACT_LSB0_UINT (insn, 16, 11, 4);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_rn) = f_rn;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fldi0_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_float_compact:
-  {
-    const IDESC *idesc = &sh64_compact_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-    UINT f_rn;
-
-    f_rn = EXTRACT_LSB0_UINT (insn, 16, 11, 4);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_rn) = f_rn;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_float_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_fmac_compact:
-  {
-    const IDESC *idesc = &sh64_compact_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-    UINT f_rn;
-    UINT f_rm;
-
-    f_rn = EXTRACT_LSB0_UINT (insn, 16, 11, 4);
-    f_rm = EXTRACT_LSB0_UINT (insn, 16, 7, 4);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_rm) = f_rm;
-  FLD (f_rn) = f_rn;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fmac_compact", "f_rm 0x%x", 'x', f_rm, "f_rn 0x%x", 'x', f_rn, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_fmov1_compact:
-  {
-    const IDESC *idesc = &sh64_compact_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-    UINT f_rn;
-    UINT f_rm;
-
-    f_rn = EXTRACT_LSB0_UINT (insn, 16, 11, 4);
-    f_rm = EXTRACT_LSB0_UINT (insn, 16, 7, 4);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_rm) = f_rm;
-  FLD (f_rn) = f_rn;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fmov1_compact", "f_rm 0x%x", 'x', f_rm, "f_rn 0x%x", 'x', f_rn, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_fmov2_compact:
-  {
-    const IDESC *idesc = &sh64_compact_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-    UINT f_rn;
-    UINT f_rm;
-
-    f_rn = EXTRACT_LSB0_UINT (insn, 16, 11, 4);
-    f_rm = EXTRACT_LSB0_UINT (insn, 16, 7, 4);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_rn) = f_rn;
-  FLD (f_rm) = f_rm;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fmov2_compact", "f_rn 0x%x", 'x', f_rn, "f_rm 0x%x", 'x', f_rm, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_fmov3_compact:
-  {
-    const IDESC *idesc = &sh64_compact_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-    UINT f_rn;
-    UINT f_rm;
-
-    f_rn = EXTRACT_LSB0_UINT (insn, 16, 11, 4);
-    f_rm = EXTRACT_LSB0_UINT (insn, 16, 7, 4);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_rn) = f_rn;
-  FLD (f_rm) = f_rm;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fmov3_compact", "f_rn 0x%x", 'x', f_rn, "f_rm 0x%x", 'x', f_rm, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_fmov4_compact:
-  {
-    const IDESC *idesc = &sh64_compact_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-    UINT f_rn;
-    UINT f_rm;
-
-    f_rn = EXTRACT_LSB0_UINT (insn, 16, 11, 4);
-    f_rm = EXTRACT_LSB0_UINT (insn, 16, 7, 4);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_rn) = f_rn;
-  FLD (f_rm) = f_rm;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fmov4_compact", "f_rn 0x%x", 'x', f_rn, "f_rm 0x%x", 'x', f_rm, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_fmov5_compact:
-  {
-    const IDESC *idesc = &sh64_compact_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-    UINT f_rn;
-    UINT f_rm;
-
-    f_rn = EXTRACT_LSB0_UINT (insn, 16, 11, 4);
-    f_rm = EXTRACT_LSB0_UINT (insn, 16, 7, 4);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_rm) = f_rm;
-  FLD (f_rn) = f_rn;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fmov5_compact", "f_rm 0x%x", 'x', f_rm, "f_rn 0x%x", 'x', f_rn, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_fmov6_compact:
-  {
-    const IDESC *idesc = &sh64_compact_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-    UINT f_rn;
-    UINT f_rm;
-
-    f_rn = EXTRACT_LSB0_UINT (insn, 16, 11, 4);
-    f_rm = EXTRACT_LSB0_UINT (insn, 16, 7, 4);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_rm) = f_rm;
-  FLD (f_rn) = f_rn;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fmov6_compact", "f_rm 0x%x", 'x', f_rm, "f_rn 0x%x", 'x', f_rn, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_fmov7_compact:
-  {
-    const IDESC *idesc = &sh64_compact_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-    UINT f_rn;
-    UINT f_rm;
-
-    f_rn = EXTRACT_LSB0_UINT (insn, 16, 11, 4);
-    f_rm = EXTRACT_LSB0_UINT (insn, 16, 7, 4);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_rm) = f_rm;
-  FLD (f_rn) = f_rn;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fmov7_compact", "f_rm 0x%x", 'x', f_rm, "f_rn 0x%x", 'x', f_rn, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_frchg_compact:
-  {
-    const IDESC *idesc = &sh64_compact_insn_data[itype];
-#define FLD(f) abuf->fields.fmt_empty.f
-
-
-  /* Record the fields for the semantic handler.  */
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_frchg_compact", (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_fschg_compact:
-  {
-    const IDESC *idesc = &sh64_compact_insn_data[itype];
-#define FLD(f) abuf->fields.fmt_empty.f
-
-
-  /* Record the fields for the semantic handler.  */
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fschg_compact", (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_fsts_compact:
-  {
-    const IDESC *idesc = &sh64_compact_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-    UINT f_rn;
-
-    f_rn = EXTRACT_LSB0_UINT (insn, 16, 11, 4);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_rn) = f_rn;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fsts_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_ftrc_compact:
-  {
-    const IDESC *idesc = &sh64_compact_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-    UINT f_rn;
-
-    f_rn = EXTRACT_LSB0_UINT (insn, 16, 11, 4);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_rn) = f_rn;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ftrc_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_ftrv_compact:
-  {
-    const IDESC *idesc = &sh64_compact_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_fipr_compact.f
-    SI f_vn;
-
-    f_vn = ((EXTRACT_LSB0_UINT (insn, 16, 11, 2)) << (2));
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_vn) = f_vn;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ftrv_compact", "f_vn 0x%x", 'x', f_vn, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_jmp_compact:
-  {
-    const IDESC *idesc = &sh64_compact_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-    UINT f_rn;
-
-    f_rn = EXTRACT_LSB0_UINT (insn, 16, 11, 4);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_rn) = f_rn;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_jmp_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_ldc_compact:
-  {
-    const IDESC *idesc = &sh64_compact_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-    UINT f_rn;
-
-    f_rn = EXTRACT_LSB0_UINT (insn, 16, 11, 4);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_rn) = f_rn;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldc_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_ldcl_compact:
-  {
-    const IDESC *idesc = &sh64_compact_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-    UINT f_rn;
-
-    f_rn = EXTRACT_LSB0_UINT (insn, 16, 11, 4);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_rn) = f_rn;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldcl_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_lds_fpscr_compact:
-  {
-    const IDESC *idesc = &sh64_compact_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-    UINT f_rn;
-
-    f_rn = EXTRACT_LSB0_UINT (insn, 16, 11, 4);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_rn) = f_rn;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_lds_fpscr_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_ldsl_fpscr_compact:
-  {
-    const IDESC *idesc = &sh64_compact_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-    UINT f_rn;
-
-    f_rn = EXTRACT_LSB0_UINT (insn, 16, 11, 4);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_rn) = f_rn;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldsl_fpscr_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_lds_fpul_compact:
-  {
-    const IDESC *idesc = &sh64_compact_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-    UINT f_rn;
-
-    f_rn = EXTRACT_LSB0_UINT (insn, 16, 11, 4);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_rn) = f_rn;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_lds_fpul_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_ldsl_fpul_compact:
-  {
-    const IDESC *idesc = &sh64_compact_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-    UINT f_rn;
-
-    f_rn = EXTRACT_LSB0_UINT (insn, 16, 11, 4);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_rn) = f_rn;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldsl_fpul_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_lds_mach_compact:
-  {
-    const IDESC *idesc = &sh64_compact_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-    UINT f_rn;
-
-    f_rn = EXTRACT_LSB0_UINT (insn, 16, 11, 4);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_rn) = f_rn;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_lds_mach_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_ldsl_mach_compact:
-  {
-    const IDESC *idesc = &sh64_compact_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-    UINT f_rn;
-
-    f_rn = EXTRACT_LSB0_UINT (insn, 16, 11, 4);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_rn) = f_rn;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldsl_mach_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_lds_macl_compact:
-  {
-    const IDESC *idesc = &sh64_compact_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-    UINT f_rn;
-
-    f_rn = EXTRACT_LSB0_UINT (insn, 16, 11, 4);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_rn) = f_rn;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_lds_macl_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_ldsl_macl_compact:
-  {
-    const IDESC *idesc = &sh64_compact_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-    UINT f_rn;
-
-    f_rn = EXTRACT_LSB0_UINT (insn, 16, 11, 4);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_rn) = f_rn;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldsl_macl_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_lds_pr_compact:
-  {
-    const IDESC *idesc = &sh64_compact_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-    UINT f_rn;
-
-    f_rn = EXTRACT_LSB0_UINT (insn, 16, 11, 4);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_rn) = f_rn;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_lds_pr_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_ldsl_pr_compact:
-  {
-    const IDESC *idesc = &sh64_compact_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-    UINT f_rn;
-
-    f_rn = EXTRACT_LSB0_UINT (insn, 16, 11, 4);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_rn) = f_rn;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldsl_pr_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_macl_compact:
-  {
-    const IDESC *idesc = &sh64_compact_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-    UINT f_rn;
-    UINT f_rm;
-
-    f_rn = EXTRACT_LSB0_UINT (insn, 16, 11, 4);
-    f_rm = EXTRACT_LSB0_UINT (insn, 16, 7, 4);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_rm) = f_rm;
-  FLD (f_rn) = f_rn;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_macl_compact", "f_rm 0x%x", 'x', f_rm, "f_rn 0x%x", 'x', f_rn, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_macw_compact:
-  {
-    const IDESC *idesc = &sh64_compact_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-    UINT f_rn;
-    UINT f_rm;
-
-    f_rn = EXTRACT_LSB0_UINT (insn, 16, 11, 4);
-    f_rm = EXTRACT_LSB0_UINT (insn, 16, 7, 4);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_rm) = f_rm;
-  FLD (f_rn) = f_rn;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_macw_compact", "f_rm 0x%x", 'x', f_rm, "f_rn 0x%x", 'x', f_rn, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_mov_compact:
-  {
-    const IDESC *idesc = &sh64_compact_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-    UINT f_rn;
-    UINT f_rm;
-
-    f_rn = EXTRACT_LSB0_UINT (insn, 16, 11, 4);
-    f_rm = EXTRACT_LSB0_UINT (insn, 16, 7, 4);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_rm) = f_rm;
-  FLD (f_rn) = f_rn;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mov_compact", "f_rm 0x%x", 'x', f_rm, "f_rn 0x%x", 'x', f_rn, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_movi_compact:
-  {
-    const IDESC *idesc = &sh64_compact_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_addi_compact.f
-    UINT f_rn;
-    UINT f_imm8;
-
-    f_rn = EXTRACT_LSB0_UINT (insn, 16, 11, 4);
-    f_imm8 = EXTRACT_LSB0_UINT (insn, 16, 7, 8);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_imm8) = f_imm8;
-  FLD (f_rn) = f_rn;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movi_compact", "f_imm8 0x%x", 'x', f_imm8, "f_rn 0x%x", 'x', f_rn, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_movb1_compact:
-  {
-    const IDESC *idesc = &sh64_compact_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-    UINT f_rn;
-    UINT f_rm;
-
-    f_rn = EXTRACT_LSB0_UINT (insn, 16, 11, 4);
-    f_rm = EXTRACT_LSB0_UINT (insn, 16, 7, 4);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_rm) = f_rm;
-  FLD (f_rn) = f_rn;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movb1_compact", "f_rm 0x%x", 'x', f_rm, "f_rn 0x%x", 'x', f_rn, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_movb2_compact:
-  {
-    const IDESC *idesc = &sh64_compact_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-    UINT f_rn;
-    UINT f_rm;
-
-    f_rn = EXTRACT_LSB0_UINT (insn, 16, 11, 4);
-    f_rm = EXTRACT_LSB0_UINT (insn, 16, 7, 4);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_rm) = f_rm;
-  FLD (f_rn) = f_rn;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movb2_compact", "f_rm 0x%x", 'x', f_rm, "f_rn 0x%x", 'x', f_rn, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_movb3_compact:
-  {
-    const IDESC *idesc = &sh64_compact_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-    UINT f_rn;
-    UINT f_rm;
-
-    f_rn = EXTRACT_LSB0_UINT (insn, 16, 11, 4);
-    f_rm = EXTRACT_LSB0_UINT (insn, 16, 7, 4);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_rm) = f_rm;
-  FLD (f_rn) = f_rn;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movb3_compact", "f_rm 0x%x", 'x', f_rm, "f_rn 0x%x", 'x', f_rn, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_movb4_compact:
-  {
-    const IDESC *idesc = &sh64_compact_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_addi_compact.f
-    UINT f_imm8;
-
-    f_imm8 = EXTRACT_LSB0_UINT (insn, 16, 7, 8);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_imm8) = f_imm8;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movb4_compact", "f_imm8 0x%x", 'x', f_imm8, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_movb5_compact:
-  {
-    const IDESC *idesc = &sh64_compact_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_movb5_compact.f
-    UINT f_rm;
-    UINT f_imm4;
-
-    f_rm = EXTRACT_LSB0_UINT (insn, 16, 7, 4);
-    f_imm4 = EXTRACT_LSB0_UINT (insn, 16, 3, 4);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_imm4) = f_imm4;
-  FLD (f_rm) = f_rm;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movb5_compact", "f_imm4 0x%x", 'x', f_imm4, "f_rm 0x%x", 'x', f_rm, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_movb6_compact:
-  {
-    const IDESC *idesc = &sh64_compact_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-    UINT f_rn;
-    UINT f_rm;
-
-    f_rn = EXTRACT_LSB0_UINT (insn, 16, 11, 4);
-    f_rm = EXTRACT_LSB0_UINT (insn, 16, 7, 4);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_rm) = f_rm;
-  FLD (f_rn) = f_rn;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movb6_compact", "f_rm 0x%x", 'x', f_rm, "f_rn 0x%x", 'x', f_rn, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_movb7_compact:
-  {
-    const IDESC *idesc = &sh64_compact_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-    UINT f_rn;
-    UINT f_rm;
-
-    f_rn = EXTRACT_LSB0_UINT (insn, 16, 11, 4);
-    f_rm = EXTRACT_LSB0_UINT (insn, 16, 7, 4);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_rm) = f_rm;
-  FLD (f_rn) = f_rn;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movb7_compact", "f_rm 0x%x", 'x', f_rm, "f_rn 0x%x", 'x', f_rn, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_movb8_compact:
-  {
-    const IDESC *idesc = &sh64_compact_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-    UINT f_rn;
-    UINT f_rm;
-
-    f_rn = EXTRACT_LSB0_UINT (insn, 16, 11, 4);
-    f_rm = EXTRACT_LSB0_UINT (insn, 16, 7, 4);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_rm) = f_rm;
-  FLD (f_rn) = f_rn;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movb8_compact", "f_rm 0x%x", 'x', f_rm, "f_rn 0x%x", 'x', f_rn, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_movb9_compact:
-  {
-    const IDESC *idesc = &sh64_compact_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_addi_compact.f
-    UINT f_imm8;
-
-    f_imm8 = EXTRACT_LSB0_UINT (insn, 16, 7, 8);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_imm8) = f_imm8;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movb9_compact", "f_imm8 0x%x", 'x', f_imm8, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_movb10_compact:
-  {
-    const IDESC *idesc = &sh64_compact_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_movb5_compact.f
-    UINT f_rm;
-    UINT f_imm4;
-
-    f_rm = EXTRACT_LSB0_UINT (insn, 16, 7, 4);
-    f_imm4 = EXTRACT_LSB0_UINT (insn, 16, 3, 4);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_imm4) = f_imm4;
-  FLD (f_rm) = f_rm;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movb10_compact", "f_imm4 0x%x", 'x', f_imm4, "f_rm 0x%x", 'x', f_rm, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_movl4_compact:
-  {
-    const IDESC *idesc = &sh64_compact_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_movl10_compact.f
-    SI f_imm8x4;
-
-    f_imm8x4 = ((EXTRACT_LSB0_UINT (insn, 16, 7, 8)) << (2));
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_imm8x4) = f_imm8x4;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movl4_compact", "f_imm8x4 0x%x", 'x', f_imm8x4, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_movl5_compact:
-  {
-    const IDESC *idesc = &sh64_compact_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-    UINT f_rn;
-    UINT f_rm;
-    SI f_imm4x4;
-
-    f_rn = EXTRACT_LSB0_UINT (insn, 16, 11, 4);
-    f_rm = EXTRACT_LSB0_UINT (insn, 16, 7, 4);
-    f_imm4x4 = ((EXTRACT_LSB0_UINT (insn, 16, 3, 4)) << (2));
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_imm4x4) = f_imm4x4;
-  FLD (f_rm) = f_rm;
-  FLD (f_rn) = f_rn;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movl5_compact", "f_imm4x4 0x%x", 'x', f_imm4x4, "f_rm 0x%x", 'x', f_rm, "f_rn 0x%x", 'x', f_rn, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_movl7_compact:
-  {
-    const IDESC *idesc = &sh64_compact_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-    UINT f_rn;
-    UINT f_rm;
-
-    f_rn = EXTRACT_LSB0_UINT (insn, 16, 11, 4);
-    f_rm = EXTRACT_LSB0_UINT (insn, 16, 7, 4);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_rm) = f_rm;
-  FLD (f_rn) = f_rn;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movl7_compact", "f_rm 0x%x", 'x', f_rm, "f_rn 0x%x", 'x', f_rn, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_movl9_compact:
-  {
-    const IDESC *idesc = &sh64_compact_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_movl10_compact.f
-    SI f_imm8x4;
-
-    f_imm8x4 = ((EXTRACT_LSB0_UINT (insn, 16, 7, 8)) << (2));
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_imm8x4) = f_imm8x4;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movl9_compact", "f_imm8x4 0x%x", 'x', f_imm8x4, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_movl10_compact:
-  {
-    const IDESC *idesc = &sh64_compact_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_movl10_compact.f
-    UINT f_rn;
-    SI f_imm8x4;
-
-    f_rn = EXTRACT_LSB0_UINT (insn, 16, 11, 4);
-    f_imm8x4 = ((EXTRACT_LSB0_UINT (insn, 16, 7, 8)) << (2));
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_imm8x4) = f_imm8x4;
-  FLD (f_rn) = f_rn;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movl10_compact", "f_imm8x4 0x%x", 'x', f_imm8x4, "f_rn 0x%x", 'x', f_rn, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_movl11_compact:
-  {
-    const IDESC *idesc = &sh64_compact_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-    UINT f_rn;
-    UINT f_rm;
-    SI f_imm4x4;
-
-    f_rn = EXTRACT_LSB0_UINT (insn, 16, 11, 4);
-    f_rm = EXTRACT_LSB0_UINT (insn, 16, 7, 4);
-    f_imm4x4 = ((EXTRACT_LSB0_UINT (insn, 16, 3, 4)) << (2));
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_imm4x4) = f_imm4x4;
-  FLD (f_rm) = f_rm;
-  FLD (f_rn) = f_rn;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movl11_compact", "f_imm4x4 0x%x", 'x', f_imm4x4, "f_rm 0x%x", 'x', f_rm, "f_rn 0x%x", 'x', f_rn, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_movw4_compact:
-  {
-    const IDESC *idesc = &sh64_compact_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-    SI f_imm8x2;
-
-    f_imm8x2 = ((EXTRACT_LSB0_UINT (insn, 16, 7, 8)) << (1));
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_imm8x2) = f_imm8x2;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movw4_compact", "f_imm8x2 0x%x", 'x', f_imm8x2, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_movw5_compact:
-  {
-    const IDESC *idesc = &sh64_compact_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_movw5_compact.f
-    UINT f_rn;
-    SI f_imm4x2;
-
-    f_rn = EXTRACT_LSB0_UINT (insn, 16, 11, 4);
-    f_imm4x2 = ((EXTRACT_LSB0_UINT (insn, 16, 3, 4)) << (1));
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_imm4x2) = f_imm4x2;
-  FLD (f_rn) = f_rn;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movw5_compact", "f_imm4x2 0x%x", 'x', f_imm4x2, "f_rn 0x%x", 'x', f_rn, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_movw9_compact:
-  {
-    const IDESC *idesc = &sh64_compact_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-    SI f_imm8x2;
-
-    f_imm8x2 = ((EXTRACT_LSB0_UINT (insn, 16, 7, 8)) << (1));
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_imm8x2) = f_imm8x2;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movw9_compact", "f_imm8x2 0x%x", 'x', f_imm8x2, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_movw10_compact:
-  {
-    const IDESC *idesc = &sh64_compact_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-    UINT f_rn;
-    SI f_imm8x2;
-
-    f_rn = EXTRACT_LSB0_UINT (insn, 16, 11, 4);
-    f_imm8x2 = ((EXTRACT_LSB0_UINT (insn, 16, 7, 8)) << (1));
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_imm8x2) = f_imm8x2;
-  FLD (f_rn) = f_rn;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movw10_compact", "f_imm8x2 0x%x", 'x', f_imm8x2, "f_rn 0x%x", 'x', f_rn, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_movw11_compact:
-  {
-    const IDESC *idesc = &sh64_compact_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_movw11_compact.f
-    UINT f_rm;
-    SI f_imm4x2;
-
-    f_rm = EXTRACT_LSB0_UINT (insn, 16, 7, 4);
-    f_imm4x2 = ((EXTRACT_LSB0_UINT (insn, 16, 3, 4)) << (1));
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_imm4x2) = f_imm4x2;
-  FLD (f_rm) = f_rm;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movw11_compact", "f_imm4x2 0x%x", 'x', f_imm4x2, "f_rm 0x%x", 'x', f_rm, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_mova_compact:
-  {
-    const IDESC *idesc = &sh64_compact_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_movl10_compact.f
-    SI f_imm8x4;
-
-    f_imm8x4 = ((EXTRACT_LSB0_UINT (insn, 16, 7, 8)) << (2));
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_imm8x4) = f_imm8x4;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mova_compact", "f_imm8x4 0x%x", 'x', f_imm8x4, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_movcal_compact:
-  {
-    const IDESC *idesc = &sh64_compact_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-    UINT f_rn;
-
-    f_rn = EXTRACT_LSB0_UINT (insn, 16, 11, 4);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_rn) = f_rn;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movcal_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_movt_compact:
-  {
-    const IDESC *idesc = &sh64_compact_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-    UINT f_rn;
-
-    f_rn = EXTRACT_LSB0_UINT (insn, 16, 11, 4);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_rn) = f_rn;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movt_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_mull_compact:
-  {
-    const IDESC *idesc = &sh64_compact_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-    UINT f_rn;
-    UINT f_rm;
-
-    f_rn = EXTRACT_LSB0_UINT (insn, 16, 11, 4);
-    f_rm = EXTRACT_LSB0_UINT (insn, 16, 7, 4);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_rm) = f_rm;
-  FLD (f_rn) = f_rn;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mull_compact", "f_rm 0x%x", 'x', f_rm, "f_rn 0x%x", 'x', f_rn, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_negc_compact:
-  {
-    const IDESC *idesc = &sh64_compact_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-    UINT f_rn;
-    UINT f_rm;
-
-    f_rn = EXTRACT_LSB0_UINT (insn, 16, 11, 4);
-    f_rm = EXTRACT_LSB0_UINT (insn, 16, 7, 4);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_rm) = f_rm;
-  FLD (f_rn) = f_rn;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_negc_compact", "f_rm 0x%x", 'x', f_rm, "f_rn 0x%x", 'x', f_rn, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_nop_compact:
-  {
-    const IDESC *idesc = &sh64_compact_insn_data[itype];
-#define FLD(f) abuf->fields.fmt_empty.f
-
-
-  /* Record the fields for the semantic handler.  */
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_nop_compact", (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_rotcl_compact:
-  {
-    const IDESC *idesc = &sh64_compact_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-    UINT f_rn;
-
-    f_rn = EXTRACT_LSB0_UINT (insn, 16, 11, 4);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_rn) = f_rn;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_rotcl_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_rts_compact:
-  {
-    const IDESC *idesc = &sh64_compact_insn_data[itype];
-#define FLD(f) abuf->fields.fmt_empty.f
-
-
-  /* Record the fields for the semantic handler.  */
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_rts_compact", (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_shad_compact:
-  {
-    const IDESC *idesc = &sh64_compact_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-    UINT f_rn;
-    UINT f_rm;
-
-    f_rn = EXTRACT_LSB0_UINT (insn, 16, 11, 4);
-    f_rm = EXTRACT_LSB0_UINT (insn, 16, 7, 4);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_rm) = f_rm;
-  FLD (f_rn) = f_rn;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_shad_compact", "f_rm 0x%x", 'x', f_rm, "f_rn 0x%x", 'x', f_rn, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_shll2_compact:
-  {
-    const IDESC *idesc = &sh64_compact_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-    UINT f_rn;
-
-    f_rn = EXTRACT_LSB0_UINT (insn, 16, 11, 4);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_rn) = f_rn;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_shll2_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_stc_gbr_compact:
-  {
-    const IDESC *idesc = &sh64_compact_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-    UINT f_rn;
-
-    f_rn = EXTRACT_LSB0_UINT (insn, 16, 11, 4);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_rn) = f_rn;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stc_gbr_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_stcl_gbr_compact:
-  {
-    const IDESC *idesc = &sh64_compact_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-    UINT f_rn;
-
-    f_rn = EXTRACT_LSB0_UINT (insn, 16, 11, 4);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_rn) = f_rn;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stcl_gbr_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_sts_fpscr_compact:
-  {
-    const IDESC *idesc = &sh64_compact_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-    UINT f_rn;
-
-    f_rn = EXTRACT_LSB0_UINT (insn, 16, 11, 4);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_rn) = f_rn;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_sts_fpscr_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_stsl_fpscr_compact:
-  {
-    const IDESC *idesc = &sh64_compact_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-    UINT f_rn;
-
-    f_rn = EXTRACT_LSB0_UINT (insn, 16, 11, 4);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_rn) = f_rn;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stsl_fpscr_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_sts_fpul_compact:
-  {
-    const IDESC *idesc = &sh64_compact_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-    UINT f_rn;
-
-    f_rn = EXTRACT_LSB0_UINT (insn, 16, 11, 4);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_rn) = f_rn;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_sts_fpul_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_stsl_fpul_compact:
-  {
-    const IDESC *idesc = &sh64_compact_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-    UINT f_rn;
-
-    f_rn = EXTRACT_LSB0_UINT (insn, 16, 11, 4);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_rn) = f_rn;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stsl_fpul_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_sts_mach_compact:
-  {
-    const IDESC *idesc = &sh64_compact_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-    UINT f_rn;
-
-    f_rn = EXTRACT_LSB0_UINT (insn, 16, 11, 4);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_rn) = f_rn;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_sts_mach_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_stsl_mach_compact:
-  {
-    const IDESC *idesc = &sh64_compact_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-    UINT f_rn;
-
-    f_rn = EXTRACT_LSB0_UINT (insn, 16, 11, 4);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_rn) = f_rn;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stsl_mach_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_sts_macl_compact:
-  {
-    const IDESC *idesc = &sh64_compact_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-    UINT f_rn;
-
-    f_rn = EXTRACT_LSB0_UINT (insn, 16, 11, 4);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_rn) = f_rn;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_sts_macl_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_stsl_macl_compact:
-  {
-    const IDESC *idesc = &sh64_compact_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-    UINT f_rn;
-
-    f_rn = EXTRACT_LSB0_UINT (insn, 16, 11, 4);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_rn) = f_rn;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stsl_macl_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_sts_pr_compact:
-  {
-    const IDESC *idesc = &sh64_compact_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-    UINT f_rn;
-
-    f_rn = EXTRACT_LSB0_UINT (insn, 16, 11, 4);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_rn) = f_rn;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_sts_pr_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_stsl_pr_compact:
-  {
-    const IDESC *idesc = &sh64_compact_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-    UINT f_rn;
-
-    f_rn = EXTRACT_LSB0_UINT (insn, 16, 11, 4);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_rn) = f_rn;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stsl_pr_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_tasb_compact:
-  {
-    const IDESC *idesc = &sh64_compact_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-    UINT f_rn;
-
-    f_rn = EXTRACT_LSB0_UINT (insn, 16, 11, 4);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_rn) = f_rn;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_tasb_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_trapa_compact:
-  {
-    const IDESC *idesc = &sh64_compact_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_addi_compact.f
-    UINT f_imm8;
-
-    f_imm8 = EXTRACT_LSB0_UINT (insn, 16, 7, 8);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_imm8) = f_imm8;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_trapa_compact", "f_imm8 0x%x", 'x', f_imm8, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_tsti_compact:
-  {
-    const IDESC *idesc = &sh64_compact_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_addi_compact.f
-    UINT f_imm8;
-
-    f_imm8 = EXTRACT_LSB0_UINT (insn, 16, 7, 8);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_imm8) = f_imm8;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_tsti_compact", "f_imm8 0x%x", 'x', f_imm8, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_tstb_compact:
-  {
-    const IDESC *idesc = &sh64_compact_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_addi_compact.f
-    UINT f_imm8;
-
-    f_imm8 = EXTRACT_LSB0_UINT (insn, 16, 7, 8);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_imm8) = f_imm8;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_tstb_compact", "f_imm8 0x%x", 'x', f_imm8, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_xori_compact:
-  {
-    const IDESC *idesc = &sh64_compact_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_addi_compact.f
-    UINT f_imm8;
-
-    f_imm8 = EXTRACT_LSB0_UINT (insn, 16, 7, 8);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_imm8) = f_imm8;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_xori_compact", "f_imm8 0x%x", 'x', f_imm8, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
-}
diff --git a/sim/sh64/decode-compact.h b/sim/sh64/decode-compact.h
deleted file mode 100644
index 8ca92a9d05d..00000000000
--- a/sim/sh64/decode-compact.h
+++ /dev/null
@@ -1,128 +0,0 @@
-/* Decode header for sh64_compact.
-
-THIS FILE IS MACHINE GENERATED WITH CGEN.
-
-Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
-
-This file is part of the GNU Simulators.
-
-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, 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.
-
-*/
-
-#ifndef SH64_COMPACT_DECODE_H
-#define SH64_COMPACT_DECODE_H
-
-extern const IDESC *sh64_compact_decode (SIM_CPU *, IADDR,
-                                  CGEN_INSN_INT, CGEN_INSN_INT,
-                                  ARGBUF *);
-extern void sh64_compact_init_idesc_table (SIM_CPU *);
-extern void sh64_compact_sem_init_idesc_table (SIM_CPU *);
-extern void sh64_compact_semf_init_idesc_table (SIM_CPU *);
-
-/* Enum declaration for instructions in cpu family sh64.  */
-typedef enum sh64_compact_insn_type {
-  SH64_COMPACT_INSN_X_INVALID, SH64_COMPACT_INSN_X_AFTER, SH64_COMPACT_INSN_X_BEFORE, SH64_COMPACT_INSN_X_CTI_CHAIN
- , SH64_COMPACT_INSN_X_CHAIN, SH64_COMPACT_INSN_X_BEGIN, SH64_COMPACT_INSN_ADD_COMPACT, SH64_COMPACT_INSN_ADDI_COMPACT
- , SH64_COMPACT_INSN_ADDC_COMPACT, SH64_COMPACT_INSN_ADDV_COMPACT, SH64_COMPACT_INSN_AND_COMPACT, SH64_COMPACT_INSN_ANDI_COMPACT
- , SH64_COMPACT_INSN_ANDB_COMPACT, SH64_COMPACT_INSN_BF_COMPACT, SH64_COMPACT_INSN_BFS_COMPACT, SH64_COMPACT_INSN_BRA_COMPACT
- , SH64_COMPACT_INSN_BRAF_COMPACT, SH64_COMPACT_INSN_BRK_COMPACT, SH64_COMPACT_INSN_BSR_COMPACT, SH64_COMPACT_INSN_BSRF_COMPACT
- , SH64_COMPACT_INSN_BT_COMPACT, SH64_COMPACT_INSN_BTS_COMPACT, SH64_COMPACT_INSN_CLRMAC_COMPACT, SH64_COMPACT_INSN_CLRS_COMPACT
- , SH64_COMPACT_INSN_CLRT_COMPACT, SH64_COMPACT_INSN_CMPEQ_COMPACT, SH64_COMPACT_INSN_CMPEQI_COMPACT, SH64_COMPACT_INSN_CMPGE_COMPACT
- , SH64_COMPACT_INSN_CMPGT_COMPACT, SH64_COMPACT_INSN_CMPHI_COMPACT, SH64_COMPACT_INSN_CMPHS_COMPACT, SH64_COMPACT_INSN_CMPPL_COMPACT
- , SH64_COMPACT_INSN_CMPPZ_COMPACT, SH64_COMPACT_INSN_CMPSTR_COMPACT, SH64_COMPACT_INSN_DIV0S_COMPACT, SH64_COMPACT_INSN_DIV0U_COMPACT
- , SH64_COMPACT_INSN_DIV1_COMPACT, SH64_COMPACT_INSN_DMULSL_COMPACT, SH64_COMPACT_INSN_DMULUL_COMPACT, SH64_COMPACT_INSN_DT_COMPACT
- , SH64_COMPACT_INSN_EXTSB_COMPACT, SH64_COMPACT_INSN_EXTSW_COMPACT, SH64_COMPACT_INSN_EXTUB_COMPACT, SH64_COMPACT_INSN_EXTUW_COMPACT
- , SH64_COMPACT_INSN_FABS_COMPACT, SH64_COMPACT_INSN_FADD_COMPACT, SH64_COMPACT_INSN_FCMPEQ_COMPACT, SH64_COMPACT_INSN_FCMPGT_COMPACT
- , SH64_COMPACT_INSN_FCNVDS_COMPACT, SH64_COMPACT_INSN_FCNVSD_COMPACT, SH64_COMPACT_INSN_FDIV_COMPACT, SH64_COMPACT_INSN_FIPR_COMPACT
- , SH64_COMPACT_INSN_FLDS_COMPACT, SH64_COMPACT_INSN_FLDI0_COMPACT, SH64_COMPACT_INSN_FLDI1_COMPACT, SH64_COMPACT_INSN_FLOAT_COMPACT
- , SH64_COMPACT_INSN_FMAC_COMPACT, SH64_COMPACT_INSN_FMOV1_COMPACT, SH64_COMPACT_INSN_FMOV2_COMPACT, SH64_COMPACT_INSN_FMOV3_COMPACT
- , SH64_COMPACT_INSN_FMOV4_COMPACT, SH64_COMPACT_INSN_FMOV5_COMPACT, SH64_COMPACT_INSN_FMOV6_COMPACT, SH64_COMPACT_INSN_FMOV7_COMPACT
- , SH64_COMPACT_INSN_FMUL_COMPACT, SH64_COMPACT_INSN_FNEG_COMPACT, SH64_COMPACT_INSN_FRCHG_COMPACT, SH64_COMPACT_INSN_FSCHG_COMPACT
- , SH64_COMPACT_INSN_FSQRT_COMPACT, SH64_COMPACT_INSN_FSTS_COMPACT, SH64_COMPACT_INSN_FSUB_COMPACT, SH64_COMPACT_INSN_FTRC_COMPACT
- , SH64_COMPACT_INSN_FTRV_COMPACT, SH64_COMPACT_INSN_JMP_COMPACT, SH64_COMPACT_INSN_JSR_COMPACT, SH64_COMPACT_INSN_LDC_COMPACT
- , SH64_COMPACT_INSN_LDCL_COMPACT, SH64_COMPACT_INSN_LDS_FPSCR_COMPACT, SH64_COMPACT_INSN_LDSL_FPSCR_COMPACT, SH64_COMPACT_INSN_LDS_FPUL_COMPACT
- , SH64_COMPACT_INSN_LDSL_FPUL_COMPACT, SH64_COMPACT_INSN_LDS_MACH_COMPACT, SH64_COMPACT_INSN_LDSL_MACH_COMPACT, SH64_COMPACT_INSN_LDS_MACL_COMPACT
- , SH64_COMPACT_INSN_LDSL_MACL_COMPACT, SH64_COMPACT_INSN_LDS_PR_COMPACT, SH64_COMPACT_INSN_LDSL_PR_COMPACT, SH64_COMPACT_INSN_MACL_COMPACT
- , SH64_COMPACT_INSN_MACW_COMPACT, SH64_COMPACT_INSN_MOV_COMPACT, SH64_COMPACT_INSN_MOVI_COMPACT, SH64_COMPACT_INSN_MOVB1_COMPACT
- , SH64_COMPACT_INSN_MOVB2_COMPACT, SH64_COMPACT_INSN_MOVB3_COMPACT, SH64_COMPACT_INSN_MOVB4_COMPACT, SH64_COMPACT_INSN_MOVB5_COMPACT
- , SH64_COMPACT_INSN_MOVB6_COMPACT, SH64_COMPACT_INSN_MOVB7_COMPACT, SH64_COMPACT_INSN_MOVB8_COMPACT, SH64_COMPACT_INSN_MOVB9_COMPACT
- , SH64_COMPACT_INSN_MOVB10_COMPACT, SH64_COMPACT_INSN_MOVL1_COMPACT, SH64_COMPACT_INSN_MOVL2_COMPACT, SH64_COMPACT_INSN_MOVL3_COMPACT
- , SH64_COMPACT_INSN_MOVL4_COMPACT, SH64_COMPACT_INSN_MOVL5_COMPACT, SH64_COMPACT_INSN_MOVL6_COMPACT, SH64_COMPACT_INSN_MOVL7_COMPACT
- , SH64_COMPACT_INSN_MOVL8_COMPACT, SH64_COMPACT_INSN_MOVL9_COMPACT, SH64_COMPACT_INSN_MOVL10_COMPACT, SH64_COMPACT_INSN_MOVL11_COMPACT
- , SH64_COMPACT_INSN_MOVW1_COMPACT, SH64_COMPACT_INSN_MOVW2_COMPACT, SH64_COMPACT_INSN_MOVW3_COMPACT, SH64_COMPACT_INSN_MOVW4_COMPACT
- , SH64_COMPACT_INSN_MOVW5_COMPACT, SH64_COMPACT_INSN_MOVW6_COMPACT, SH64_COMPACT_INSN_MOVW7_COMPACT, SH64_COMPACT_INSN_MOVW8_COMPACT
- , SH64_COMPACT_INSN_MOVW9_COMPACT, SH64_COMPACT_INSN_MOVW10_COMPACT, SH64_COMPACT_INSN_MOVW11_COMPACT, SH64_COMPACT_INSN_MOVA_COMPACT
- , SH64_COMPACT_INSN_MOVCAL_COMPACT, SH64_COMPACT_INSN_MOVT_COMPACT, SH64_COMPACT_INSN_MULL_COMPACT, SH64_COMPACT_INSN_MULSW_COMPACT
- , SH64_COMPACT_INSN_MULUW_COMPACT, SH64_COMPACT_INSN_NEG_COMPACT, SH64_COMPACT_INSN_NEGC_COMPACT, SH64_COMPACT_INSN_NOP_COMPACT
- , SH64_COMPACT_INSN_NOT_COMPACT, SH64_COMPACT_INSN_OCBI_COMPACT, SH64_COMPACT_INSN_OCBP_COMPACT, SH64_COMPACT_INSN_OCBWB_COMPACT
- , SH64_COMPACT_INSN_OR_COMPACT, SH64_COMPACT_INSN_ORI_COMPACT, SH64_COMPACT_INSN_ORB_COMPACT, SH64_COMPACT_INSN_PREF_COMPACT
- , SH64_COMPACT_INSN_ROTCL_COMPACT, SH64_COMPACT_INSN_ROTCR_COMPACT, SH64_COMPACT_INSN_ROTL_COMPACT, SH64_COMPACT_INSN_ROTR_COMPACT
- , SH64_COMPACT_INSN_RTS_COMPACT, SH64_COMPACT_INSN_SETS_COMPACT, SH64_COMPACT_INSN_SETT_COMPACT, SH64_COMPACT_INSN_SHAD_COMPACT
- , SH64_COMPACT_INSN_SHAL_COMPACT, SH64_COMPACT_INSN_SHAR_COMPACT, SH64_COMPACT_INSN_SHLD_COMPACT, SH64_COMPACT_INSN_SHLL_COMPACT
- , SH64_COMPACT_INSN_SHLL2_COMPACT, SH64_COMPACT_INSN_SHLL8_COMPACT, SH64_COMPACT_INSN_SHLL16_COMPACT, SH64_COMPACT_INSN_SHLR_COMPACT
- , SH64_COMPACT_INSN_SHLR2_COMPACT, SH64_COMPACT_INSN_SHLR8_COMPACT, SH64_COMPACT_INSN_SHLR16_COMPACT, SH64_COMPACT_INSN_STC_GBR_COMPACT
- , SH64_COMPACT_INSN_STCL_GBR_COMPACT, SH64_COMPACT_INSN_STS_FPSCR_COMPACT, SH64_COMPACT_INSN_STSL_FPSCR_COMPACT, SH64_COMPACT_INSN_STS_FPUL_COMPACT
- , SH64_COMPACT_INSN_STSL_FPUL_COMPACT, SH64_COMPACT_INSN_STS_MACH_COMPACT, SH64_COMPACT_INSN_STSL_MACH_COMPACT, SH64_COMPACT_INSN_STS_MACL_COMPACT
- , SH64_COMPACT_INSN_STSL_MACL_COMPACT, SH64_COMPACT_INSN_STS_PR_COMPACT, SH64_COMPACT_INSN_STSL_PR_COMPACT, SH64_COMPACT_INSN_SUB_COMPACT
- , SH64_COMPACT_INSN_SUBC_COMPACT, SH64_COMPACT_INSN_SUBV_COMPACT, SH64_COMPACT_INSN_SWAPB_COMPACT, SH64_COMPACT_INSN_SWAPW_COMPACT
- , SH64_COMPACT_INSN_TASB_COMPACT, SH64_COMPACT_INSN_TRAPA_COMPACT, SH64_COMPACT_INSN_TST_COMPACT, SH64_COMPACT_INSN_TSTI_COMPACT
- , SH64_COMPACT_INSN_TSTB_COMPACT, SH64_COMPACT_INSN_XOR_COMPACT, SH64_COMPACT_INSN_XORI_COMPACT, SH64_COMPACT_INSN_XORB_COMPACT
- , SH64_COMPACT_INSN_XTRCT_COMPACT, SH64_COMPACT_INSN_MAX
-} SH64_COMPACT_INSN_TYPE;
-
-/* Enum declaration for semantic formats in cpu family sh64.  */
-typedef enum sh64_compact_sfmt_type {
-  SH64_COMPACT_SFMT_EMPTY, SH64_COMPACT_SFMT_ADD_COMPACT, SH64_COMPACT_SFMT_ADDI_COMPACT, SH64_COMPACT_SFMT_ADDC_COMPACT
- , SH64_COMPACT_SFMT_ADDV_COMPACT, SH64_COMPACT_SFMT_AND_COMPACT, SH64_COMPACT_SFMT_ANDI_COMPACT, SH64_COMPACT_SFMT_ANDB_COMPACT
- , SH64_COMPACT_SFMT_BF_COMPACT, SH64_COMPACT_SFMT_BRA_COMPACT, SH64_COMPACT_SFMT_BRAF_COMPACT, SH64_COMPACT_SFMT_BRK_COMPACT
- , SH64_COMPACT_SFMT_BSR_COMPACT, SH64_COMPACT_SFMT_BSRF_COMPACT, SH64_COMPACT_SFMT_CLRMAC_COMPACT, SH64_COMPACT_SFMT_CLRS_COMPACT
- , SH64_COMPACT_SFMT_CLRT_COMPACT, SH64_COMPACT_SFMT_CMPEQ_COMPACT, SH64_COMPACT_SFMT_CMPEQI_COMPACT, SH64_COMPACT_SFMT_CMPPL_COMPACT
- , SH64_COMPACT_SFMT_DIV0S_COMPACT, SH64_COMPACT_SFMT_DIV0U_COMPACT, SH64_COMPACT_SFMT_DIV1_COMPACT, SH64_COMPACT_SFMT_DMULSL_COMPACT
- , SH64_COMPACT_SFMT_DT_COMPACT, SH64_COMPACT_SFMT_EXTSB_COMPACT, SH64_COMPACT_SFMT_FABS_COMPACT, SH64_COMPACT_SFMT_FADD_COMPACT
- , SH64_COMPACT_SFMT_FCMPEQ_COMPACT, SH64_COMPACT_SFMT_FCNVDS_COMPACT, SH64_COMPACT_SFMT_FCNVSD_COMPACT, SH64_COMPACT_SFMT_FIPR_COMPACT
- , SH64_COMPACT_SFMT_FLDS_COMPACT, SH64_COMPACT_SFMT_FLDI0_COMPACT, SH64_COMPACT_SFMT_FLOAT_COMPACT, SH64_COMPACT_SFMT_FMAC_COMPACT
- , SH64_COMPACT_SFMT_FMOV1_COMPACT, SH64_COMPACT_SFMT_FMOV2_COMPACT, SH64_COMPACT_SFMT_FMOV3_COMPACT, SH64_COMPACT_SFMT_FMOV4_COMPACT
- , SH64_COMPACT_SFMT_FMOV5_COMPACT, SH64_COMPACT_SFMT_FMOV6_COMPACT, SH64_COMPACT_SFMT_FMOV7_COMPACT, SH64_COMPACT_SFMT_FRCHG_COMPACT
- , SH64_COMPACT_SFMT_FSCHG_COMPACT, SH64_COMPACT_SFMT_FSTS_COMPACT, SH64_COMPACT_SFMT_FTRC_COMPACT, SH64_COMPACT_SFMT_FTRV_COMPACT
- , SH64_COMPACT_SFMT_JMP_COMPACT, SH64_COMPACT_SFMT_LDC_COMPACT, SH64_COMPACT_SFMT_LDCL_COMPACT, SH64_COMPACT_SFMT_LDS_FPSCR_COMPACT
- , SH64_COMPACT_SFMT_LDSL_FPSCR_COMPACT, SH64_COMPACT_SFMT_LDS_FPUL_COMPACT, SH64_COMPACT_SFMT_LDSL_FPUL_COMPACT, SH64_COMPACT_SFMT_LDS_MACH_COMPACT
- , SH64_COMPACT_SFMT_LDSL_MACH_COMPACT, SH64_COMPACT_SFMT_LDS_MACL_COMPACT, SH64_COMPACT_SFMT_LDSL_MACL_COMPACT, SH64_COMPACT_SFMT_LDS_PR_COMPACT
- , SH64_COMPACT_SFMT_LDSL_PR_COMPACT, SH64_COMPACT_SFMT_MACL_COMPACT, SH64_COMPACT_SFMT_MACW_COMPACT, SH64_COMPACT_SFMT_MOV_COMPACT
- , SH64_COMPACT_SFMT_MOVI_COMPACT, SH64_COMPACT_SFMT_MOVB1_COMPACT, SH64_COMPACT_SFMT_MOVB2_COMPACT, SH64_COMPACT_SFMT_MOVB3_COMPACT
- , SH64_COMPACT_SFMT_MOVB4_COMPACT, SH64_COMPACT_SFMT_MOVB5_COMPACT, SH64_COMPACT_SFMT_MOVB6_COMPACT, SH64_COMPACT_SFMT_MOVB7_COMPACT
- , SH64_COMPACT_SFMT_MOVB8_COMPACT, SH64_COMPACT_SFMT_MOVB9_COMPACT, SH64_COMPACT_SFMT_MOVB10_COMPACT, SH64_COMPACT_SFMT_MOVL4_COMPACT
- , SH64_COMPACT_SFMT_MOVL5_COMPACT, SH64_COMPACT_SFMT_MOVL7_COMPACT, SH64_COMPACT_SFMT_MOVL9_COMPACT, SH64_COMPACT_SFMT_MOVL10_COMPACT
- , SH64_COMPACT_SFMT_MOVL11_COMPACT, SH64_COMPACT_SFMT_MOVW4_COMPACT, SH64_COMPACT_SFMT_MOVW5_COMPACT, SH64_COMPACT_SFMT_MOVW9_COMPACT
- , SH64_COMPACT_SFMT_MOVW10_COMPACT, SH64_COMPACT_SFMT_MOVW11_COMPACT, SH64_COMPACT_SFMT_MOVA_COMPACT, SH64_COMPACT_SFMT_MOVCAL_COMPACT
- , SH64_COMPACT_SFMT_MOVT_COMPACT, SH64_COMPACT_SFMT_MULL_COMPACT, SH64_COMPACT_SFMT_NEGC_COMPACT, SH64_COMPACT_SFMT_NOP_COMPACT
- , SH64_COMPACT_SFMT_ROTCL_COMPACT, SH64_COMPACT_SFMT_RTS_COMPACT, SH64_COMPACT_SFMT_SHAD_COMPACT, SH64_COMPACT_SFMT_SHLL2_COMPACT
- , SH64_COMPACT_SFMT_STC_GBR_COMPACT, SH64_COMPACT_SFMT_STCL_GBR_COMPACT, SH64_COMPACT_SFMT_STS_FPSCR_COMPACT, SH64_COMPACT_SFMT_STSL_FPSCR_COMPACT
- , SH64_COMPACT_SFMT_STS_FPUL_COMPACT, SH64_COMPACT_SFMT_STSL_FPUL_COMPACT, SH64_COMPACT_SFMT_STS_MACH_COMPACT, SH64_COMPACT_SFMT_STSL_MACH_COMPACT
- , SH64_COMPACT_SFMT_STS_MACL_COMPACT, SH64_COMPACT_SFMT_STSL_MACL_COMPACT, SH64_COMPACT_SFMT_STS_PR_COMPACT, SH64_COMPACT_SFMT_STSL_PR_COMPACT
- , SH64_COMPACT_SFMT_TASB_COMPACT, SH64_COMPACT_SFMT_TRAPA_COMPACT, SH64_COMPACT_SFMT_TSTI_COMPACT, SH64_COMPACT_SFMT_TSTB_COMPACT
- , SH64_COMPACT_SFMT_XORI_COMPACT
-} SH64_COMPACT_SFMT_TYPE;
-
-/* Function unit handlers (user written).  */
-
-extern int sh64_model_sh5_u_exec (SIM_CPU *, const IDESC *, int /*unit_num*/, int /*referenced*/);
-
-/* Profiling before/after handlers (user written) */
-
-extern void sh64_model_insn_before (SIM_CPU *, int /*first_p*/);
-extern void sh64_model_insn_after (SIM_CPU *, int /*last_p*/, int /*cycles*/);
-
-#endif /* SH64_COMPACT_DECODE_H */
diff --git a/sim/sh64/decode-media.c b/sim/sh64/decode-media.c
deleted file mode 100644
index f1471f332bb..00000000000
--- a/sim/sh64/decode-media.c
+++ /dev/null
@@ -1,2109 +0,0 @@
-/* Simulator instruction decoder for sh64_media.
-
-THIS FILE IS MACHINE GENERATED WITH CGEN.
-
-Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
-
-This file is part of the GNU Simulators.
-
-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, 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 WANT_CPU sh64
-#define WANT_CPU_SH64
-
-#include "sim-main.h"
-#include "sim-assert.h"
-
-/* The instruction descriptor array.
-   This is computed at runtime.  Space for it is not malloc'd to save a
-   teensy bit of cpu in the decoder.  Moving it to malloc space is trivial
-   but won't be done until necessary (we don't currently support the runtime
-   addition of instructions nor an SMP machine with different cpus).  */
-static IDESC sh64_media_insn_data[SH64_MEDIA_INSN_MAX];
-
-/* Commas between elements are contained in the macros.
-   Some of these are conditionally compiled out.  */
-
-static const struct insn_sem sh64_media_insn_sem[] =
-{
-  { VIRTUAL_INSN_X_INVALID, SH64_MEDIA_INSN_X_INVALID, SH64_MEDIA_SFMT_EMPTY },
-  { VIRTUAL_INSN_X_AFTER, SH64_MEDIA_INSN_X_AFTER, SH64_MEDIA_SFMT_EMPTY },
-  { VIRTUAL_INSN_X_BEFORE, SH64_MEDIA_INSN_X_BEFORE, SH64_MEDIA_SFMT_EMPTY },
-  { VIRTUAL_INSN_X_CTI_CHAIN, SH64_MEDIA_INSN_X_CTI_CHAIN, SH64_MEDIA_SFMT_EMPTY },
-  { VIRTUAL_INSN_X_CHAIN, SH64_MEDIA_INSN_X_CHAIN, SH64_MEDIA_SFMT_EMPTY },
-  { VIRTUAL_INSN_X_BEGIN, SH64_MEDIA_INSN_X_BEGIN, SH64_MEDIA_SFMT_EMPTY },
-  { SH_INSN_ADD, SH64_MEDIA_INSN_ADD, SH64_MEDIA_SFMT_ADD },
-  { SH_INSN_ADDL, SH64_MEDIA_INSN_ADDL, SH64_MEDIA_SFMT_ADD },
-  { SH_INSN_ADDI, SH64_MEDIA_INSN_ADDI, SH64_MEDIA_SFMT_ADDI },
-  { SH_INSN_ADDIL, SH64_MEDIA_INSN_ADDIL, SH64_MEDIA_SFMT_ADDI },
-  { SH_INSN_ADDZL, SH64_MEDIA_INSN_ADDZL, SH64_MEDIA_SFMT_ADD },
-  { SH_INSN_ALLOCO, SH64_MEDIA_INSN_ALLOCO, SH64_MEDIA_SFMT_ALLOCO },
-  { SH_INSN_AND, SH64_MEDIA_INSN_AND, SH64_MEDIA_SFMT_ADD },
-  { SH_INSN_ANDC, SH64_MEDIA_INSN_ANDC, SH64_MEDIA_SFMT_ADD },
-  { SH_INSN_ANDI, SH64_MEDIA_INSN_ANDI, SH64_MEDIA_SFMT_ADDI },
-  { SH_INSN_BEQ, SH64_MEDIA_INSN_BEQ, SH64_MEDIA_SFMT_BEQ },
-  { SH_INSN_BEQI, SH64_MEDIA_INSN_BEQI, SH64_MEDIA_SFMT_BEQI },
-  { SH_INSN_BGE, SH64_MEDIA_INSN_BGE, SH64_MEDIA_SFMT_BEQ },
-  { SH_INSN_BGEU, SH64_MEDIA_INSN_BGEU, SH64_MEDIA_SFMT_BEQ },
-  { SH_INSN_BGT, SH64_MEDIA_INSN_BGT, SH64_MEDIA_SFMT_BEQ },
-  { SH_INSN_BGTU, SH64_MEDIA_INSN_BGTU, SH64_MEDIA_SFMT_BEQ },
-  { SH_INSN_BLINK, SH64_MEDIA_INSN_BLINK, SH64_MEDIA_SFMT_BLINK },
-  { SH_INSN_BNE, SH64_MEDIA_INSN_BNE, SH64_MEDIA_SFMT_BEQ },
-  { SH_INSN_BNEI, SH64_MEDIA_INSN_BNEI, SH64_MEDIA_SFMT_BEQI },
-  { SH_INSN_BRK, SH64_MEDIA_INSN_BRK, SH64_MEDIA_SFMT_BRK },
-  { SH_INSN_BYTEREV, SH64_MEDIA_INSN_BYTEREV, SH64_MEDIA_SFMT_BYTEREV },
-  { SH_INSN_CMPEQ, SH64_MEDIA_INSN_CMPEQ, SH64_MEDIA_SFMT_ADD },
-  { SH_INSN_CMPGT, SH64_MEDIA_INSN_CMPGT, SH64_MEDIA_SFMT_ADD },
-  { SH_INSN_CMPGTU, SH64_MEDIA_INSN_CMPGTU, SH64_MEDIA_SFMT_ADD },
-  { SH_INSN_CMVEQ, SH64_MEDIA_INSN_CMVEQ, SH64_MEDIA_SFMT_CMVEQ },
-  { SH_INSN_CMVNE, SH64_MEDIA_INSN_CMVNE, SH64_MEDIA_SFMT_CMVEQ },
-  { SH_INSN_FABSD, SH64_MEDIA_INSN_FABSD, SH64_MEDIA_SFMT_FABSD },
-  { SH_INSN_FABSS, SH64_MEDIA_INSN_FABSS, SH64_MEDIA_SFMT_FABSS },
-  { SH_INSN_FADDD, SH64_MEDIA_INSN_FADDD, SH64_MEDIA_SFMT_FADDD },
-  { SH_INSN_FADDS, SH64_MEDIA_INSN_FADDS, SH64_MEDIA_SFMT_FADDS },
-  { SH_INSN_FCMPEQD, SH64_MEDIA_INSN_FCMPEQD, SH64_MEDIA_SFMT_FCMPEQD },
-  { SH_INSN_FCMPEQS, SH64_MEDIA_INSN_FCMPEQS, SH64_MEDIA_SFMT_FCMPEQS },
-  { SH_INSN_FCMPGED, SH64_MEDIA_INSN_FCMPGED, SH64_MEDIA_SFMT_FCMPEQD },
-  { SH_INSN_FCMPGES, SH64_MEDIA_INSN_FCMPGES, SH64_MEDIA_SFMT_FCMPEQS },
-  { SH_INSN_FCMPGTD, SH64_MEDIA_INSN_FCMPGTD, SH64_MEDIA_SFMT_FCMPEQD },
-  { SH_INSN_FCMPGTS, SH64_MEDIA_INSN_FCMPGTS, SH64_MEDIA_SFMT_FCMPEQS },
-  { SH_INSN_FCMPUND, SH64_MEDIA_INSN_FCMPUND, SH64_MEDIA_SFMT_FCMPEQD },
-  { SH_INSN_FCMPUNS, SH64_MEDIA_INSN_FCMPUNS, SH64_MEDIA_SFMT_FCMPEQS },
-  { SH_INSN_FCNVDS, SH64_MEDIA_INSN_FCNVDS, SH64_MEDIA_SFMT_FCNVDS },
-  { SH_INSN_FCNVSD, SH64_MEDIA_INSN_FCNVSD, SH64_MEDIA_SFMT_FCNVSD },
-  { SH_INSN_FDIVD, SH64_MEDIA_INSN_FDIVD, SH64_MEDIA_SFMT_FADDD },
-  { SH_INSN_FDIVS, SH64_MEDIA_INSN_FDIVS, SH64_MEDIA_SFMT_FADDS },
-  { SH_INSN_FGETSCR, SH64_MEDIA_INSN_FGETSCR, SH64_MEDIA_SFMT_ALLOCO },
-  { SH_INSN_FIPRS, SH64_MEDIA_INSN_FIPRS, SH64_MEDIA_SFMT_FIPRS },
-  { SH_INSN_FLDD, SH64_MEDIA_INSN_FLDD, SH64_MEDIA_SFMT_FLDD },
-  { SH_INSN_FLDP, SH64_MEDIA_INSN_FLDP, SH64_MEDIA_SFMT_FLDP },
-  { SH_INSN_FLDS, SH64_MEDIA_INSN_FLDS, SH64_MEDIA_SFMT_FLDS },
-  { SH_INSN_FLDXD, SH64_MEDIA_INSN_FLDXD, SH64_MEDIA_SFMT_FLDXD },
-  { SH_INSN_FLDXP, SH64_MEDIA_INSN_FLDXP, SH64_MEDIA_SFMT_FLDXP },
-  { SH_INSN_FLDXS, SH64_MEDIA_INSN_FLDXS, SH64_MEDIA_SFMT_FLDXS },
-  { SH_INSN_FLOATLD, SH64_MEDIA_INSN_FLOATLD, SH64_MEDIA_SFMT_FCNVSD },
-  { SH_INSN_FLOATLS, SH64_MEDIA_INSN_FLOATLS, SH64_MEDIA_SFMT_FABSS },
-  { SH_INSN_FLOATQD, SH64_MEDIA_INSN_FLOATQD, SH64_MEDIA_SFMT_FABSD },
-  { SH_INSN_FLOATQS, SH64_MEDIA_INSN_FLOATQS, SH64_MEDIA_SFMT_FCNVDS },
-  { SH_INSN_FMACS, SH64_MEDIA_INSN_FMACS, SH64_MEDIA_SFMT_FMACS },
-  { SH_INSN_FMOVD, SH64_MEDIA_INSN_FMOVD, SH64_MEDIA_SFMT_FABSD },
-  { SH_INSN_FMOVDQ, SH64_MEDIA_INSN_FMOVDQ, SH64_MEDIA_SFMT_FMOVDQ },
-  { SH_INSN_FMOVLS, SH64_MEDIA_INSN_FMOVLS, SH64_MEDIA_SFMT_FMOVLS },
-  { SH_INSN_FMOVQD, SH64_MEDIA_INSN_FMOVQD, SH64_MEDIA_SFMT_FMOVQD },
-  { SH_INSN_FMOVS, SH64_MEDIA_INSN_FMOVS, SH64_MEDIA_SFMT_FABSS },
-  { SH_INSN_FMOVSL, SH64_MEDIA_INSN_FMOVSL, SH64_MEDIA_SFMT_FMOVSL },
-  { SH_INSN_FMULD, SH64_MEDIA_INSN_FMULD, SH64_MEDIA_SFMT_FADDD },
-  { SH_INSN_FMULS, SH64_MEDIA_INSN_FMULS, SH64_MEDIA_SFMT_FADDS },
-  { SH_INSN_FNEGD, SH64_MEDIA_INSN_FNEGD, SH64_MEDIA_SFMT_FABSD },
-  { SH_INSN_FNEGS, SH64_MEDIA_INSN_FNEGS, SH64_MEDIA_SFMT_FABSS },
-  { SH_INSN_FPUTSCR, SH64_MEDIA_INSN_FPUTSCR, SH64_MEDIA_SFMT_ALLOCO },
-  { SH_INSN_FSQRTD, SH64_MEDIA_INSN_FSQRTD, SH64_MEDIA_SFMT_FABSD },
-  { SH_INSN_FSQRTS, SH64_MEDIA_INSN_FSQRTS, SH64_MEDIA_SFMT_FABSS },
-  { SH_INSN_FSTD, SH64_MEDIA_INSN_FSTD, SH64_MEDIA_SFMT_FSTD },
-  { SH_INSN_FSTP, SH64_MEDIA_INSN_FSTP, SH64_MEDIA_SFMT_FSTP },
-  { SH_INSN_FSTS, SH64_MEDIA_INSN_FSTS, SH64_MEDIA_SFMT_FSTS },
-  { SH_INSN_FSTXD, SH64_MEDIA_INSN_FSTXD, SH64_MEDIA_SFMT_FSTXD },
-  { SH_INSN_FSTXP, SH64_MEDIA_INSN_FSTXP, SH64_MEDIA_SFMT_FSTXP },
-  { SH_INSN_FSTXS, SH64_MEDIA_INSN_FSTXS, SH64_MEDIA_SFMT_FSTXS },
-  { SH_INSN_FSUBD, SH64_MEDIA_INSN_FSUBD, SH64_MEDIA_SFMT_FADDD },
-  { SH_INSN_FSUBS, SH64_MEDIA_INSN_FSUBS, SH64_MEDIA_SFMT_FADDS },
-  { SH_INSN_FTRCDL, SH64_MEDIA_INSN_FTRCDL, SH64_MEDIA_SFMT_FCNVDS },
-  { SH_INSN_FTRCSL, SH64_MEDIA_INSN_FTRCSL, SH64_MEDIA_SFMT_FABSS },
-  { SH_INSN_FTRCDQ, SH64_MEDIA_INSN_FTRCDQ, SH64_MEDIA_SFMT_FABSD },
-  { SH_INSN_FTRCSQ, SH64_MEDIA_INSN_FTRCSQ, SH64_MEDIA_SFMT_FCNVSD },
-  { SH_INSN_FTRVS, SH64_MEDIA_INSN_FTRVS, SH64_MEDIA_SFMT_FTRVS },
-  { SH_INSN_GETCFG, SH64_MEDIA_INSN_GETCFG, SH64_MEDIA_SFMT_ALLOCO },
-  { SH_INSN_GETCON, SH64_MEDIA_INSN_GETCON, SH64_MEDIA_SFMT_GETCON },
-  { SH_INSN_GETTR, SH64_MEDIA_INSN_GETTR, SH64_MEDIA_SFMT_GETTR },
-  { SH_INSN_ICBI, SH64_MEDIA_INSN_ICBI, SH64_MEDIA_SFMT_ALLOCO },
-  { SH_INSN_LDB, SH64_MEDIA_INSN_LDB, SH64_MEDIA_SFMT_LDB },
-  { SH_INSN_LDL, SH64_MEDIA_INSN_LDL, SH64_MEDIA_SFMT_LDL },
-  { SH_INSN_LDQ, SH64_MEDIA_INSN_LDQ, SH64_MEDIA_SFMT_LDQ },
-  { SH_INSN_LDUB, SH64_MEDIA_INSN_LDUB, SH64_MEDIA_SFMT_LDB },
-  { SH_INSN_LDUW, SH64_MEDIA_INSN_LDUW, SH64_MEDIA_SFMT_LDUW },
-  { SH_INSN_LDW, SH64_MEDIA_INSN_LDW, SH64_MEDIA_SFMT_LDUW },
-  { SH_INSN_LDHIL, SH64_MEDIA_INSN_LDHIL, SH64_MEDIA_SFMT_ALLOCO },
-  { SH_INSN_LDHIQ, SH64_MEDIA_INSN_LDHIQ, SH64_MEDIA_SFMT_ALLOCO },
-  { SH_INSN_LDLOL, SH64_MEDIA_INSN_LDLOL, SH64_MEDIA_SFMT_ALLOCO },
-  { SH_INSN_LDLOQ, SH64_MEDIA_INSN_LDLOQ, SH64_MEDIA_SFMT_ALLOCO },
-  { SH_INSN_LDXB, SH64_MEDIA_INSN_LDXB, SH64_MEDIA_SFMT_LDXB },
-  { SH_INSN_LDXL, SH64_MEDIA_INSN_LDXL, SH64_MEDIA_SFMT_LDXB },
-  { SH_INSN_LDXQ, SH64_MEDIA_INSN_LDXQ, SH64_MEDIA_SFMT_LDXB },
-  { SH_INSN_LDXUB, SH64_MEDIA_INSN_LDXUB, SH64_MEDIA_SFMT_LDXB },
-  { SH_INSN_LDXUW, SH64_MEDIA_INSN_LDXUW, SH64_MEDIA_SFMT_LDXB },
-  { SH_INSN_LDXW, SH64_MEDIA_INSN_LDXW, SH64_MEDIA_SFMT_LDXB },
-  { SH_INSN_MABSL, SH64_MEDIA_INSN_MABSL, SH64_MEDIA_SFMT_BYTEREV },
-  { SH_INSN_MABSW, SH64_MEDIA_INSN_MABSW, SH64_MEDIA_SFMT_BYTEREV },
-  { SH_INSN_MADDL, SH64_MEDIA_INSN_MADDL, SH64_MEDIA_SFMT_ADD },
-  { SH_INSN_MADDW, SH64_MEDIA_INSN_MADDW, SH64_MEDIA_SFMT_ADD },
-  { SH_INSN_MADDSL, SH64_MEDIA_INSN_MADDSL, SH64_MEDIA_SFMT_ADD },
-  { SH_INSN_MADDSUB, SH64_MEDIA_INSN_MADDSUB, SH64_MEDIA_SFMT_ADD },
-  { SH_INSN_MADDSW, SH64_MEDIA_INSN_MADDSW, SH64_MEDIA_SFMT_ADD },
-  { SH_INSN_MCMPEQB, SH64_MEDIA_INSN_MCMPEQB, SH64_MEDIA_SFMT_ADD },
-  { SH_INSN_MCMPEQL, SH64_MEDIA_INSN_MCMPEQL, SH64_MEDIA_SFMT_ADD },
-  { SH_INSN_MCMPEQW, SH64_MEDIA_INSN_MCMPEQW, SH64_MEDIA_SFMT_ADD },
-  { SH_INSN_MCMPGTL, SH64_MEDIA_INSN_MCMPGTL, SH64_MEDIA_SFMT_ADD },
-  { SH_INSN_MCMPGTUB, SH64_MEDIA_INSN_MCMPGTUB, SH64_MEDIA_SFMT_ADD },
-  { SH_INSN_MCMPGTW, SH64_MEDIA_INSN_MCMPGTW, SH64_MEDIA_SFMT_ADD },
-  { SH_INSN_MCMV, SH64_MEDIA_INSN_MCMV, SH64_MEDIA_SFMT_MCMV },
-  { SH_INSN_MCNVSLW, SH64_MEDIA_INSN_MCNVSLW, SH64_MEDIA_SFMT_ADD },
-  { SH_INSN_MCNVSWB, SH64_MEDIA_INSN_MCNVSWB, SH64_MEDIA_SFMT_ADD },
-  { SH_INSN_MCNVSWUB, SH64_MEDIA_INSN_MCNVSWUB, SH64_MEDIA_SFMT_ADD },
-  { SH_INSN_MEXTR1, SH64_MEDIA_INSN_MEXTR1, SH64_MEDIA_SFMT_ADD },
-  { SH_INSN_MEXTR2, SH64_MEDIA_INSN_MEXTR2, SH64_MEDIA_SFMT_ADD },
-  { SH_INSN_MEXTR3, SH64_MEDIA_INSN_MEXTR3, SH64_MEDIA_SFMT_ADD },
-  { SH_INSN_MEXTR4, SH64_MEDIA_INSN_MEXTR4, SH64_MEDIA_SFMT_ADD },
-  { SH_INSN_MEXTR5, SH64_MEDIA_INSN_MEXTR5, SH64_MEDIA_SFMT_ADD },
-  { SH_INSN_MEXTR6, SH64_MEDIA_INSN_MEXTR6, SH64_MEDIA_SFMT_ADD },
-  { SH_INSN_MEXTR7, SH64_MEDIA_INSN_MEXTR7, SH64_MEDIA_SFMT_ADD },
-  { SH_INSN_MMACFXWL, SH64_MEDIA_INSN_MMACFXWL, SH64_MEDIA_SFMT_MCMV },
-  { SH_INSN_MMACNFX_WL, SH64_MEDIA_INSN_MMACNFX_WL, SH64_MEDIA_SFMT_MCMV },
-  { SH_INSN_MMULL, SH64_MEDIA_INSN_MMULL, SH64_MEDIA_SFMT_ADD },
-  { SH_INSN_MMULW, SH64_MEDIA_INSN_MMULW, SH64_MEDIA_SFMT_ADD },
-  { SH_INSN_MMULFXL, SH64_MEDIA_INSN_MMULFXL, SH64_MEDIA_SFMT_ADD },
-  { SH_INSN_MMULFXW, SH64_MEDIA_INSN_MMULFXW, SH64_MEDIA_SFMT_ADD },
-  { SH_INSN_MMULFXRPW, SH64_MEDIA_INSN_MMULFXRPW, SH64_MEDIA_SFMT_ADD },
-  { SH_INSN_MMULHIWL, SH64_MEDIA_INSN_MMULHIWL, SH64_MEDIA_SFMT_ADD },
-  { SH_INSN_MMULLOWL, SH64_MEDIA_INSN_MMULLOWL, SH64_MEDIA_SFMT_ADD },
-  { SH_INSN_MMULSUMWQ, SH64_MEDIA_INSN_MMULSUMWQ, SH64_MEDIA_SFMT_MCMV },
-  { SH_INSN_MOVI, SH64_MEDIA_INSN_MOVI, SH64_MEDIA_SFMT_MOVI },
-  { SH_INSN_MPERMW, SH64_MEDIA_INSN_MPERMW, SH64_MEDIA_SFMT_MPERMW },
-  { SH_INSN_MSADUBQ, SH64_MEDIA_INSN_MSADUBQ, SH64_MEDIA_SFMT_MCMV },
-  { SH_INSN_MSHALDSL, SH64_MEDIA_INSN_MSHALDSL, SH64_MEDIA_SFMT_ADD },
-  { SH_INSN_MSHALDSW, SH64_MEDIA_INSN_MSHALDSW, SH64_MEDIA_SFMT_ADD },
-  { SH_INSN_MSHARDL, SH64_MEDIA_INSN_MSHARDL, SH64_MEDIA_SFMT_ADD },
-  { SH_INSN_MSHARDW, SH64_MEDIA_INSN_MSHARDW, SH64_MEDIA_SFMT_ADD },
-  { SH_INSN_MSHARDSQ, SH64_MEDIA_INSN_MSHARDSQ, SH64_MEDIA_SFMT_ADD },
-  { SH_INSN_MSHFHIB, SH64_MEDIA_INSN_MSHFHIB, SH64_MEDIA_SFMT_ADD },
-  { SH_INSN_MSHFHIL, SH64_MEDIA_INSN_MSHFHIL, SH64_MEDIA_SFMT_ADD },
-  { SH_INSN_MSHFHIW, SH64_MEDIA_INSN_MSHFHIW, SH64_MEDIA_SFMT_ADD },
-  { SH_INSN_MSHFLOB, SH64_MEDIA_INSN_MSHFLOB, SH64_MEDIA_SFMT_ADD },
-  { SH_INSN_MSHFLOL, SH64_MEDIA_INSN_MSHFLOL, SH64_MEDIA_SFMT_ADD },
-  { SH_INSN_MSHFLOW, SH64_MEDIA_INSN_MSHFLOW, SH64_MEDIA_SFMT_ADD },
-  { SH_INSN_MSHLLDL, SH64_MEDIA_INSN_MSHLLDL, SH64_MEDIA_SFMT_ADD },
-  { SH_INSN_MSHLLDW, SH64_MEDIA_INSN_MSHLLDW, SH64_MEDIA_SFMT_ADD },
-  { SH_INSN_MSHLRDL, SH64_MEDIA_INSN_MSHLRDL, SH64_MEDIA_SFMT_ADD },
-  { SH_INSN_MSHLRDW, SH64_MEDIA_INSN_MSHLRDW, SH64_MEDIA_SFMT_ADD },
-  { SH_INSN_MSUBL, SH64_MEDIA_INSN_MSUBL, SH64_MEDIA_SFMT_ADD },
-  { SH_INSN_MSUBW, SH64_MEDIA_INSN_MSUBW, SH64_MEDIA_SFMT_ADD },
-  { SH_INSN_MSUBSL, SH64_MEDIA_INSN_MSUBSL, SH64_MEDIA_SFMT_ADD },
-  { SH_INSN_MSUBSUB, SH64_MEDIA_INSN_MSUBSUB, SH64_MEDIA_SFMT_ADD },
-  { SH_INSN_MSUBSW, SH64_MEDIA_INSN_MSUBSW, SH64_MEDIA_SFMT_ADD },
-  { SH_INSN_MULSL, SH64_MEDIA_INSN_MULSL, SH64_MEDIA_SFMT_ADD },
-  { SH_INSN_MULUL, SH64_MEDIA_INSN_MULUL, SH64_MEDIA_SFMT_ADD },
-  { SH_INSN_NOP, SH64_MEDIA_INSN_NOP, SH64_MEDIA_SFMT_ALLOCO },
-  { SH_INSN_NSB, SH64_MEDIA_INSN_NSB, SH64_MEDIA_SFMT_BYTEREV },
-  { SH_INSN_OCBI, SH64_MEDIA_INSN_OCBI, SH64_MEDIA_SFMT_ALLOCO },
-  { SH_INSN_OCBP, SH64_MEDIA_INSN_OCBP, SH64_MEDIA_SFMT_ALLOCO },
-  { SH_INSN_OCBWB, SH64_MEDIA_INSN_OCBWB, SH64_MEDIA_SFMT_ALLOCO },
-  { SH_INSN_OR, SH64_MEDIA_INSN_OR, SH64_MEDIA_SFMT_ADD },
-  { SH_INSN_ORI, SH64_MEDIA_INSN_ORI, SH64_MEDIA_SFMT_ORI },
-  { SH_INSN_PREFI, SH64_MEDIA_INSN_PREFI, SH64_MEDIA_SFMT_ALLOCO },
-  { SH_INSN_PTA, SH64_MEDIA_INSN_PTA, SH64_MEDIA_SFMT_PTA },
-  { SH_INSN_PTABS, SH64_MEDIA_INSN_PTABS, SH64_MEDIA_SFMT_PTABS },
-  { SH_INSN_PTB, SH64_MEDIA_INSN_PTB, SH64_MEDIA_SFMT_PTA },
-  { SH_INSN_PTREL, SH64_MEDIA_INSN_PTREL, SH64_MEDIA_SFMT_PTREL },
-  { SH_INSN_PUTCFG, SH64_MEDIA_INSN_PUTCFG, SH64_MEDIA_SFMT_ALLOCO },
-  { SH_INSN_PUTCON, SH64_MEDIA_INSN_PUTCON, SH64_MEDIA_SFMT_PUTCON },
-  { SH_INSN_RTE, SH64_MEDIA_INSN_RTE, SH64_MEDIA_SFMT_ALLOCO },
-  { SH_INSN_SHARD, SH64_MEDIA_INSN_SHARD, SH64_MEDIA_SFMT_ADD },
-  { SH_INSN_SHARDL, SH64_MEDIA_INSN_SHARDL, SH64_MEDIA_SFMT_ADD },
-  { SH_INSN_SHARI, SH64_MEDIA_INSN_SHARI, SH64_MEDIA_SFMT_SHARI },
-  { SH_INSN_SHARIL, SH64_MEDIA_INSN_SHARIL, SH64_MEDIA_SFMT_SHARIL },
-  { SH_INSN_SHLLD, SH64_MEDIA_INSN_SHLLD, SH64_MEDIA_SFMT_ADD },
-  { SH_INSN_SHLLDL, SH64_MEDIA_INSN_SHLLDL, SH64_MEDIA_SFMT_ADD },
-  { SH_INSN_SHLLI, SH64_MEDIA_INSN_SHLLI, SH64_MEDIA_SFMT_SHARI },
-  { SH_INSN_SHLLIL, SH64_MEDIA_INSN_SHLLIL, SH64_MEDIA_SFMT_SHARIL },
-  { SH_INSN_SHLRD, SH64_MEDIA_INSN_SHLRD, SH64_MEDIA_SFMT_ADD },
-  { SH_INSN_SHLRDL, SH64_MEDIA_INSN_SHLRDL, SH64_MEDIA_SFMT_ADD },
-  { SH_INSN_SHLRI, SH64_MEDIA_INSN_SHLRI, SH64_MEDIA_SFMT_SHARI },
-  { SH_INSN_SHLRIL, SH64_MEDIA_INSN_SHLRIL, SH64_MEDIA_SFMT_SHARIL },
-  { SH_INSN_SHORI, SH64_MEDIA_INSN_SHORI, SH64_MEDIA_SFMT_SHORI },
-  { SH_INSN_SLEEP, SH64_MEDIA_INSN_SLEEP, SH64_MEDIA_SFMT_ALLOCO },
-  { SH_INSN_STB, SH64_MEDIA_INSN_STB, SH64_MEDIA_SFMT_STB },
-  { SH_INSN_STL, SH64_MEDIA_INSN_STL, SH64_MEDIA_SFMT_STL },
-  { SH_INSN_STQ, SH64_MEDIA_INSN_STQ, SH64_MEDIA_SFMT_STQ },
-  { SH_INSN_STW, SH64_MEDIA_INSN_STW, SH64_MEDIA_SFMT_STW },
-  { SH_INSN_STHIL, SH64_MEDIA_INSN_STHIL, SH64_MEDIA_SFMT_STHIL },
-  { SH_INSN_STHIQ, SH64_MEDIA_INSN_STHIQ, SH64_MEDIA_SFMT_STHIL },
-  { SH_INSN_STLOL, SH64_MEDIA_INSN_STLOL, SH64_MEDIA_SFMT_ALLOCO },
-  { SH_INSN_STLOQ, SH64_MEDIA_INSN_STLOQ, SH64_MEDIA_SFMT_ALLOCO },
-  { SH_INSN_STXB, SH64_MEDIA_INSN_STXB, SH64_MEDIA_SFMT_STXB },
-  { SH_INSN_STXL, SH64_MEDIA_INSN_STXL, SH64_MEDIA_SFMT_STXB },
-  { SH_INSN_STXQ, SH64_MEDIA_INSN_STXQ, SH64_MEDIA_SFMT_STXB },
-  { SH_INSN_STXW, SH64_MEDIA_INSN_STXW, SH64_MEDIA_SFMT_STXB },
-  { SH_INSN_SUB, SH64_MEDIA_INSN_SUB, SH64_MEDIA_SFMT_ADD },
-  { SH_INSN_SUBL, SH64_MEDIA_INSN_SUBL, SH64_MEDIA_SFMT_ADD },
-  { SH_INSN_SWAPQ, SH64_MEDIA_INSN_SWAPQ, SH64_MEDIA_SFMT_SWAPQ },
-  { SH_INSN_SYNCI, SH64_MEDIA_INSN_SYNCI, SH64_MEDIA_SFMT_ALLOCO },
-  { SH_INSN_SYNCO, SH64_MEDIA_INSN_SYNCO, SH64_MEDIA_SFMT_ALLOCO },
-  { SH_INSN_TRAPA, SH64_MEDIA_INSN_TRAPA, SH64_MEDIA_SFMT_TRAPA },
-  { SH_INSN_XOR, SH64_MEDIA_INSN_XOR, SH64_MEDIA_SFMT_ADD },
-  { SH_INSN_XORI, SH64_MEDIA_INSN_XORI, SH64_MEDIA_SFMT_XORI },
-};
-
-static const struct insn_sem sh64_media_insn_sem_invalid = {
-  VIRTUAL_INSN_X_INVALID, SH64_MEDIA_INSN_X_INVALID, SH64_MEDIA_SFMT_EMPTY
-};
-
-/* Initialize an IDESC from the compile-time computable parts.  */
-
-static INLINE void
-init_idesc (SIM_CPU *cpu, IDESC *id, const struct insn_sem *t)
-{
-  const CGEN_INSN *insn_table = CGEN_CPU_INSN_TABLE (CPU_CPU_DESC (cpu))->init_entries;
-
-  id->num = t->index;
-  id->sfmt = t->sfmt;
-  if ((int) t->type <= 0)
-    id->idata = & cgen_virtual_insn_table[- (int) t->type];
-  else
-    id->idata = & insn_table[t->type];
-  id->attrs = CGEN_INSN_ATTRS (id->idata);
-  /* Oh my god, a magic number.  */
-  id->length = CGEN_INSN_BITSIZE (id->idata) / 8;
-
-#if WITH_PROFILE_MODEL_P
-  id->timing = & MODEL_TIMING (CPU_MODEL (cpu)) [t->index];
-  {
-    SIM_DESC sd = CPU_STATE (cpu);
-    SIM_ASSERT (t->index == id->timing->num);
-  }
-#endif
-
-  /* Semantic pointers are initialized elsewhere.  */
-}
-
-/* Initialize the instruction descriptor table.  */
-
-void
-sh64_media_init_idesc_table (SIM_CPU *cpu)
-{
-  IDESC *id,*tabend;
-  const struct insn_sem *t,*tend;
-  int tabsize = SH64_MEDIA_INSN_MAX;
-  IDESC *table = sh64_media_insn_data;
-
-  memset (table, 0, tabsize * sizeof (IDESC));
-
-  /* First set all entries to the `invalid insn'.  */
-  t = & sh64_media_insn_sem_invalid;
-  for (id = table, tabend = table + tabsize; id < tabend; ++id)
-    init_idesc (cpu, id, t);
-
-  /* Now fill in the values for the chosen cpu.  */
-  for (t = sh64_media_insn_sem, tend = t + sizeof (sh64_media_insn_sem) / sizeof (*t);
-       t != tend; ++t)
-    {
-      init_idesc (cpu, & table[t->index], t);
-    }
-
-  /* Link the IDESC table into the cpu.  */
-  CPU_IDESC (cpu) = table;
-}
-
-/* Given an instruction, return a pointer to its IDESC entry.  */
-
-const IDESC *
-sh64_media_decode (SIM_CPU *current_cpu, IADDR pc,
-              CGEN_INSN_INT base_insn, CGEN_INSN_INT entire_insn,
-              ARGBUF *abuf)
-{
-  /* Result of decoder.  */
-  SH64_MEDIA_INSN_TYPE itype;
-
-  {
-    CGEN_INSN_INT insn = base_insn;
-
-    {
-      unsigned int val = (((insn >> 22) & (63 << 4)) | ((insn >> 16) & (15 << 0)));
-      switch (val)
-      {
-      case 1 : itype = SH64_MEDIA_INSN_CMPEQ; goto extract_sfmt_add;      case 3 : itype = SH64_MEDIA_INSN_CMPGT; goto extract_sfmt_add;      case 7 : itype = SH64_MEDIA_INSN_CMPGTU; goto extract_sfmt_add;      case 8 : itype = SH64_MEDIA_INSN_ADDL; goto extract_sfmt_add;      case 9 : itype = SH64_MEDIA_INSN_ADD; goto extract_sfmt_add;      case 10 : itype = SH64_MEDIA_INSN_SUBL; goto extract_sfmt_add;      case 11 : itype = SH64_MEDIA_INSN_SUB; goto extract_sfmt_add;      case 12 : itype = SH64_MEDIA_INSN_ADDZL; goto extract_sfmt_add;      case 13 : itype = SH64_MEDIA_INSN_NSB; goto extract_sfmt_byterev;      case 14 : itype = SH64_MEDIA_INSN_MULUL; goto extract_sfmt_add;      case 15 : itype = SH64_MEDIA_INSN_BYTEREV; goto extract_sfmt_byterev;      case 16 : itype = SH64_MEDIA_INSN_SHLLDL; goto extract_sfmt_add;      case 17 : itype = SH64_MEDIA_INSN_SHLLD; goto extract_sfmt_add;      case 18 : itype = SH64_MEDIA_INSN_SHLRDL; goto extract_sfmt_add;      case 19 : itype = SH64_MEDIA_INSN_SHLRD; goto extract_sfmt_add;      case 22 : itype = SH64_MEDIA_INSN_SHARDL; goto extract_sfmt_add;      case 23 : itype = SH64_MEDIA_INSN_SHARD; goto extract_sfmt_add;      case 25 : itype = SH64_MEDIA_INSN_OR; goto extract_sfmt_add;      case 27 : itype = SH64_MEDIA_INSN_AND; goto extract_sfmt_add;      case 29 : itype = SH64_MEDIA_INSN_XOR; goto extract_sfmt_add;      case 30 : itype = SH64_MEDIA_INSN_MULSL; goto extract_sfmt_add;      case 31 : itype = SH64_MEDIA_INSN_ANDC; goto extract_sfmt_add;      case 33 : itype = SH64_MEDIA_INSN_MADDW; goto extract_sfmt_add;      case 34 : itype = SH64_MEDIA_INSN_MADDL; goto extract_sfmt_add;      case 36 : itype = SH64_MEDIA_INSN_MADDSUB; goto extract_sfmt_add;      case 37 : itype = SH64_MEDIA_INSN_MADDSW; goto extract_sfmt_add;      case 38 : itype = SH64_MEDIA_INSN_MADDSL; goto extract_sfmt_add;      case 41 : itype = SH64_MEDIA_INSN_MSUBW; goto extract_sfmt_add;      case 42 : itype = SH64_MEDIA_INSN_MSUBL; goto extract_sfmt_add;      case 44 : itype = SH64_MEDIA_INSN_MSUBSUB; goto extract_sfmt_add;      case 45 : itype = SH64_MEDIA_INSN_MSUBSW; goto extract_sfmt_add;      case 46 : itype = SH64_MEDIA_INSN_MSUBSL; goto extract_sfmt_add;      case 49 : itype = SH64_MEDIA_INSN_MSHLLDW; goto extract_sfmt_add;      case 50 : itype = SH64_MEDIA_INSN_MSHLLDL; goto extract_sfmt_add;      case 53 : itype = SH64_MEDIA_INSN_MSHALDSW; goto extract_sfmt_add;      case 54 : itype = SH64_MEDIA_INSN_MSHALDSL; goto extract_sfmt_add;      case 57 : itype = SH64_MEDIA_INSN_MSHARDW; goto extract_sfmt_add;      case 58 : itype = SH64_MEDIA_INSN_MSHARDL; goto extract_sfmt_add;      case 59 : itype = SH64_MEDIA_INSN_MSHARDSQ; goto extract_sfmt_add;      case 61 : itype = SH64_MEDIA_INSN_MSHLRDW; goto extract_sfmt_add;      case 62 : itype = SH64_MEDIA_INSN_MSHLRDL; goto extract_sfmt_add;      case 86 : itype = SH64_MEDIA_INSN_FIPRS; goto extract_sfmt_fiprs;      case 94 : itype = SH64_MEDIA_INSN_FTRVS; goto extract_sfmt_ftrvs;      case 96 : itype = SH64_MEDIA_INSN_FABSS; goto extract_sfmt_fabss;      case 97 : itype = SH64_MEDIA_INSN_FABSD; goto extract_sfmt_fabsd;      case 98 : itype = SH64_MEDIA_INSN_FNEGS; goto extract_sfmt_fabss;      case 99 : itype = SH64_MEDIA_INSN_FNEGD; goto extract_sfmt_fabsd;      case 112 : itype = SH64_MEDIA_INSN_FMOVLS; goto extract_sfmt_fmovls;      case 113 : itype = SH64_MEDIA_INSN_FMOVQD; goto extract_sfmt_fmovqd;      case 114 : itype = SH64_MEDIA_INSN_FGETSCR; goto extract_sfmt_alloco;      case 120 : itype = SH64_MEDIA_INSN_FLDXS; goto extract_sfmt_fldxs;      case 121 : itype = SH64_MEDIA_INSN_FLDXD; goto extract_sfmt_fldxd;      case 125 : itype = SH64_MEDIA_INSN_FLDXP; goto extract_sfmt_fldxp;      case 129 : itype = SH64_MEDIA_INSN_CMVEQ; goto extract_sfmt_cmveq;      case 131 : itype = SH64_MEDIA_INSN_SWAPQ; goto extract_sfmt_swapq;      case 133 : itype = SH64_MEDIA_INSN_CMVNE; goto extract_sfmt_cmveq;      case 159 : itype = SH64_MEDIA_INSN_GETCON; goto extract_sfmt_getcon;      case 160 : itype = SH64_MEDIA_INSN_MCMPEQB; goto extract_sfmt_add;      case 161 : itype = SH64_MEDIA_INSN_MCMPEQW; goto extract_sfmt_add;      case 162 : itype = SH64_MEDIA_INSN_MCMPEQL; goto extract_sfmt_add;      case 164 : itype = SH64_MEDIA_INSN_MCMPGTUB; goto extract_sfmt_add;      case 165 : itype = SH64_MEDIA_INSN_MCMPGTW; goto extract_sfmt_add;      case 166 : itype = SH64_MEDIA_INSN_MCMPGTL; goto extract_sfmt_add;      case 167 : itype = SH64_MEDIA_INSN_MEXTR1; goto extract_sfmt_add;      case 169 : itype = SH64_MEDIA_INSN_MABSW; goto extract_sfmt_byterev;      case 170 : itype = SH64_MEDIA_INSN_MABSL; goto extract_sfmt_byterev;      case 171 : itype = SH64_MEDIA_INSN_MEXTR2; goto extract_sfmt_add;      case 173 : itype = SH64_MEDIA_INSN_MPERMW; goto extract_sfmt_mpermw;      case 175 : itype = SH64_MEDIA_INSN_MEXTR3; goto extract_sfmt_add;      case 176 : itype = SH64_MEDIA_INSN_MSHFLOB; goto extract_sfmt_add;      case 177 : itype = SH64_MEDIA_INSN_MSHFLOW; goto extract_sfmt_add;      case 178 : itype = SH64_MEDIA_INSN_MSHFLOL; goto extract_sfmt_add;      case 179 : itype = SH64_MEDIA_INSN_MEXTR4; goto extract_sfmt_add;      case 180 : itype = SH64_MEDIA_INSN_MSHFHIB; goto extract_sfmt_add;      case 181 : itype = SH64_MEDIA_INSN_MSHFHIW; goto extract_sfmt_add;      case 182 : itype = SH64_MEDIA_INSN_MSHFHIL; goto extract_sfmt_add;      case 183 : itype = SH64_MEDIA_INSN_MEXTR5; goto extract_sfmt_add;      case 187 : itype = SH64_MEDIA_INSN_MEXTR6; goto extract_sfmt_add;      case 191 : itype = SH64_MEDIA_INSN_MEXTR7; goto extract_sfmt_add;      case 192 : itype = SH64_MEDIA_INSN_FMOVSL; goto extract_sfmt_fmovsl;      case 193 : itype = SH64_MEDIA_INSN_FMOVDQ; goto extract_sfmt_fmovdq;      case 194 : itype = SH64_MEDIA_INSN_FPUTSCR; goto extract_sfmt_alloco;      case 200 : itype = SH64_MEDIA_INSN_FCMPEQS; goto extract_sfmt_fcmpeqs;      case 201 : itype = SH64_MEDIA_INSN_FCMPEQD; goto extract_sfmt_fcmpeqd;      case 202 : itype = SH64_MEDIA_INSN_FCMPUNS; goto extract_sfmt_fcmpeqs;      case 203 : itype = SH64_MEDIA_INSN_FCMPUND; goto extract_sfmt_fcmpeqd;      case 204 : itype = SH64_MEDIA_INSN_FCMPGTS; goto extract_sfmt_fcmpeqs;      case 205 : itype = SH64_MEDIA_INSN_FCMPGTD; goto extract_sfmt_fcmpeqd;      case 206 : itype = SH64_MEDIA_INSN_FCMPGES; goto extract_sfmt_fcmpeqs;      case 207 : itype = SH64_MEDIA_INSN_FCMPGED; goto extract_sfmt_fcmpeqd;      case 208 : itype = SH64_MEDIA_INSN_FADDS; goto extract_sfmt_fadds;      case 209 : itype = SH64_MEDIA_INSN_FADDD; goto extract_sfmt_faddd;      case 210 : itype = SH64_MEDIA_INSN_FSUBS; goto extract_sfmt_fadds;      case 211 : itype = SH64_MEDIA_INSN_FSUBD; goto extract_sfmt_faddd;      case 212 : itype = SH64_MEDIA_INSN_FDIVS; goto extract_sfmt_fadds;      case 213 : itype = SH64_MEDIA_INSN_FDIVD; goto extract_sfmt_faddd;      case 214 : itype = SH64_MEDIA_INSN_FMULS; goto extract_sfmt_fadds;      case 215 : itype = SH64_MEDIA_INSN_FMULD; goto extract_sfmt_faddd;      case 222 : itype = SH64_MEDIA_INSN_FMACS; goto extract_sfmt_fmacs;      case 224 : itype = SH64_MEDIA_INSN_FMOVS; goto extract_sfmt_fabss;      case 225 : itype = SH64_MEDIA_INSN_FMOVD; goto extract_sfmt_fabsd;      case 228 : itype = SH64_MEDIA_INSN_FSQRTS; goto extract_sfmt_fabss;      case 229 : itype = SH64_MEDIA_INSN_FSQRTD; goto extract_sfmt_fabsd;      case 230 : itype = SH64_MEDIA_INSN_FCNVSD; goto extract_sfmt_fcnvsd;      case 231 : itype = SH64_MEDIA_INSN_FCNVDS; goto extract_sfmt_fcnvds;      case 232 : itype = SH64_MEDIA_INSN_FTRCSL; goto extract_sfmt_fabss;      case 233 : itype = SH64_MEDIA_INSN_FTRCDQ; goto extract_sfmt_fabsd;      case 234 : itype = SH64_MEDIA_INSN_FTRCSQ; goto extract_sfmt_fcnvsd;      case 235 : itype = SH64_MEDIA_INSN_FTRCDL; goto extract_sfmt_fcnvds;      case 236 : itype = SH64_MEDIA_INSN_FLOATLS; goto extract_sfmt_fabss;      case 237 : itype = SH64_MEDIA_INSN_FLOATQD; goto extract_sfmt_fabsd;      case 238 : itype = SH64_MEDIA_INSN_FLOATLD; goto extract_sfmt_fcnvsd;      case 239 : itype = SH64_MEDIA_INSN_FLOATQS; goto extract_sfmt_fcnvds;      case 248 : itype = SH64_MEDIA_INSN_FSTXS; goto extract_sfmt_fstxs;      case 249 : itype = SH64_MEDIA_INSN_FSTXD; goto extract_sfmt_fstxd;      case 253 : itype = SH64_MEDIA_INSN_FSTXP; goto extract_sfmt_fstxp;      case 256 : itype = SH64_MEDIA_INSN_LDXB; goto extract_sfmt_ldxb;      case 257 : itype = SH64_MEDIA_INSN_LDXW; goto extract_sfmt_ldxb;      case 258 : itype = SH64_MEDIA_INSN_LDXL; goto extract_sfmt_ldxb;      case 259 : itype = SH64_MEDIA_INSN_LDXQ; goto extract_sfmt_ldxb;      case 260 : itype = SH64_MEDIA_INSN_LDXUB; goto extract_sfmt_ldxb;      case 261 : itype = SH64_MEDIA_INSN_LDXUW; goto extract_sfmt_ldxb;      case 273 : itype = SH64_MEDIA_INSN_BLINK; goto extract_sfmt_blink;      case 277 : itype = SH64_MEDIA_INSN_GETTR; goto extract_sfmt_gettr;      case 288 : itype = SH64_MEDIA_INSN_MSADUBQ; goto extract_sfmt_mcmv;      case 289 : itype = SH64_MEDIA_INSN_MMACFXWL; goto extract_sfmt_mcmv;      case 291 : itype = SH64_MEDIA_INSN_MCMV; goto extract_sfmt_mcmv;      case 293 : itype = SH64_MEDIA_INSN_MMACNFX_WL; goto extract_sfmt_mcmv;      case 297 : itype = SH64_MEDIA_INSN_MMULSUMWQ; goto extract_sfmt_mcmv;      case 305 : itype = SH64_MEDIA_INSN_MMULW; goto extract_sfmt_add;      case 306 : itype = SH64_MEDIA_INSN_MMULL; goto extract_sfmt_add;      case 309 : itype = SH64_MEDIA_INSN_MMULFXW; goto extract_sfmt_add;      case 310 : itype = SH64_MEDIA_INSN_MMULFXL; goto extract_sfmt_add;      case 312 : itype = SH64_MEDIA_INSN_MCNVSWB; goto extract_sfmt_add;      case 313 : itype = SH64_MEDIA_INSN_MMULFXRPW; goto extract_sfmt_add;      case 314 : itype = SH64_MEDIA_INSN_MMULLOWL; goto extract_sfmt_add;      case 316 : itype = SH64_MEDIA_INSN_MCNVSWUB; goto extract_sfmt_add;      case 317 : itype = SH64_MEDIA_INSN_MCNVSLW; goto extract_sfmt_add;      case 318 : itype = SH64_MEDIA_INSN_MMULHIWL; goto extract_sfmt_add;      case 384 : itype = SH64_MEDIA_INSN_STXB; goto extract_sfmt_stxb;      case 385 : itype = SH64_MEDIA_INSN_STXW; goto extract_sfmt_stxb;      case 386 : itype = SH64_MEDIA_INSN_STXL; goto extract_sfmt_stxb;      case 387 : itype = SH64_MEDIA_INSN_STXQ; goto extract_sfmt_stxb;      case 401 : itype = SH64_MEDIA_INSN_BEQ; goto extract_sfmt_beq;      case 403 : itype = SH64_MEDIA_INSN_BGE; goto extract_sfmt_beq;      case 405 : itype = SH64_MEDIA_INSN_BNE; goto extract_sfmt_beq;      case 407 : itype = SH64_MEDIA_INSN_BGT; goto extract_sfmt_beq;      case 411 : itype = SH64_MEDIA_INSN_BGEU; goto extract_sfmt_beq;      case 415 : itype = SH64_MEDIA_INSN_BGTU; goto extract_sfmt_beq;      case 417 : itype = SH64_MEDIA_INSN_PTABS; goto extract_sfmt_ptabs;      case 421 : itype = SH64_MEDIA_INSN_PTREL; goto extract_sfmt_ptrel;      case 432 : itype = SH64_MEDIA_INSN_NOP; goto extract_sfmt_alloco;      case 433 : itype = SH64_MEDIA_INSN_TRAPA; goto extract_sfmt_trapa;      case 434 : itype = SH64_MEDIA_INSN_SYNCI; goto extract_sfmt_alloco;      case 435 : itype = SH64_MEDIA_INSN_RTE; goto extract_sfmt_alloco;      case 437 : itype = SH64_MEDIA_INSN_BRK; goto extract_sfmt_brk;      case 438 : itype = SH64_MEDIA_INSN_SYNCO; goto extract_sfmt_alloco;      case 439 : itype = SH64_MEDIA_INSN_SLEEP; goto extract_sfmt_alloco;      case 447 : itype = SH64_MEDIA_INSN_PUTCON; goto extract_sfmt_putcon;      case 512 : /* fall through */
-      case 513 : /* fall through */
-      case 514 : /* fall through */
-      case 515 : /* fall through */
-      case 516 : /* fall through */
-      case 517 : /* fall through */
-      case 518 : /* fall through */
-      case 519 : /* fall through */
-      case 520 : /* fall through */
-      case 521 : /* fall through */
-      case 522 : /* fall through */
-      case 523 : /* fall through */
-      case 524 : /* fall through */
-      case 525 : /* fall through */
-      case 526 : /* fall through */
-      case 527 : itype = SH64_MEDIA_INSN_LDB; goto extract_sfmt_ldb;      case 528 : /* fall through */
-      case 529 : /* fall through */
-      case 530 : /* fall through */
-      case 531 : /* fall through */
-      case 532 : /* fall through */
-      case 533 : /* fall through */
-      case 534 : /* fall through */
-      case 535 : /* fall through */
-      case 536 : /* fall through */
-      case 537 : /* fall through */
-      case 538 : /* fall through */
-      case 539 : /* fall through */
-      case 540 : /* fall through */
-      case 541 : /* fall through */
-      case 542 : /* fall through */
-      case 543 : itype = SH64_MEDIA_INSN_LDW; goto extract_sfmt_lduw;      case 544 : /* fall through */
-      case 545 : /* fall through */
-      case 546 : /* fall through */
-      case 547 : /* fall through */
-      case 548 : /* fall through */
-      case 549 : /* fall through */
-      case 550 : /* fall through */
-      case 551 : /* fall through */
-      case 552 : /* fall through */
-      case 553 : /* fall through */
-      case 554 : /* fall through */
-      case 555 : /* fall through */
-      case 556 : /* fall through */
-      case 557 : /* fall through */
-      case 558 : /* fall through */
-      case 559 : itype = SH64_MEDIA_INSN_LDL; goto extract_sfmt_ldl;      case 560 : /* fall through */
-      case 561 : /* fall through */
-      case 562 : /* fall through */
-      case 563 : /* fall through */
-      case 564 : /* fall through */
-      case 565 : /* fall through */
-      case 566 : /* fall through */
-      case 567 : /* fall through */
-      case 568 : /* fall through */
-      case 569 : /* fall through */
-      case 570 : /* fall through */
-      case 571 : /* fall through */
-      case 572 : /* fall through */
-      case 573 : /* fall through */
-      case 574 : /* fall through */
-      case 575 : itype = SH64_MEDIA_INSN_LDQ; goto extract_sfmt_ldq;      case 576 : /* fall through */
-      case 577 : /* fall through */
-      case 578 : /* fall through */
-      case 579 : /* fall through */
-      case 580 : /* fall through */
-      case 581 : /* fall through */
-      case 582 : /* fall through */
-      case 583 : /* fall through */
-      case 584 : /* fall through */
-      case 585 : /* fall through */
-      case 586 : /* fall through */
-      case 587 : /* fall through */
-      case 588 : /* fall through */
-      case 589 : /* fall through */
-      case 590 : /* fall through */
-      case 591 : itype = SH64_MEDIA_INSN_LDUB; goto extract_sfmt_ldb;      case 592 : /* fall through */
-      case 593 : /* fall through */
-      case 594 : /* fall through */
-      case 595 : /* fall through */
-      case 596 : /* fall through */
-      case 597 : /* fall through */
-      case 598 : /* fall through */
-      case 599 : /* fall through */
-      case 600 : /* fall through */
-      case 601 : /* fall through */
-      case 602 : /* fall through */
-      case 603 : /* fall through */
-      case 604 : /* fall through */
-      case 605 : /* fall through */
-      case 606 : /* fall through */
-      case 607 : itype = SH64_MEDIA_INSN_FLDS; goto extract_sfmt_flds;      case 608 : /* fall through */
-      case 609 : /* fall through */
-      case 610 : /* fall through */
-      case 611 : /* fall through */
-      case 612 : /* fall through */
-      case 613 : /* fall through */
-      case 614 : /* fall through */
-      case 615 : /* fall through */
-      case 616 : /* fall through */
-      case 617 : /* fall through */
-      case 618 : /* fall through */
-      case 619 : /* fall through */
-      case 620 : /* fall through */
-      case 621 : /* fall through */
-      case 622 : /* fall through */
-      case 623 : itype = SH64_MEDIA_INSN_FLDP; goto extract_sfmt_fldp;      case 624 : /* fall through */
-      case 625 : /* fall through */
-      case 626 : /* fall through */
-      case 627 : /* fall through */
-      case 628 : /* fall through */
-      case 629 : /* fall through */
-      case 630 : /* fall through */
-      case 631 : /* fall through */
-      case 632 : /* fall through */
-      case 633 : /* fall through */
-      case 634 : /* fall through */
-      case 635 : /* fall through */
-      case 636 : /* fall through */
-      case 637 : /* fall through */
-      case 638 : /* fall through */
-      case 639 : itype = SH64_MEDIA_INSN_FLDD; goto extract_sfmt_fldd;      case 640 : /* fall through */
-      case 641 : /* fall through */
-      case 642 : /* fall through */
-      case 643 : /* fall through */
-      case 644 : /* fall through */
-      case 645 : /* fall through */
-      case 646 : /* fall through */
-      case 647 : /* fall through */
-      case 648 : /* fall through */
-      case 649 : /* fall through */
-      case 650 : /* fall through */
-      case 651 : /* fall through */
-      case 652 : /* fall through */
-      case 653 : /* fall through */
-      case 654 : /* fall through */
-      case 655 : itype = SH64_MEDIA_INSN_STB; goto extract_sfmt_stb;      case 656 : /* fall through */
-      case 657 : /* fall through */
-      case 658 : /* fall through */
-      case 659 : /* fall through */
-      case 660 : /* fall through */
-      case 661 : /* fall through */
-      case 662 : /* fall through */
-      case 663 : /* fall through */
-      case 664 : /* fall through */
-      case 665 : /* fall through */
-      case 666 : /* fall through */
-      case 667 : /* fall through */
-      case 668 : /* fall through */
-      case 669 : /* fall through */
-      case 670 : /* fall through */
-      case 671 : itype = SH64_MEDIA_INSN_STW; goto extract_sfmt_stw;      case 672 : /* fall through */
-      case 673 : /* fall through */
-      case 674 : /* fall through */
-      case 675 : /* fall through */
-      case 676 : /* fall through */
-      case 677 : /* fall through */
-      case 678 : /* fall through */
-      case 679 : /* fall through */
-      case 680 : /* fall through */
-      case 681 : /* fall through */
-      case 682 : /* fall through */
-      case 683 : /* fall through */
-      case 684 : /* fall through */
-      case 685 : /* fall through */
-      case 686 : /* fall through */
-      case 687 : itype = SH64_MEDIA_INSN_STL; goto extract_sfmt_stl;      case 688 : /* fall through */
-      case 689 : /* fall through */
-      case 690 : /* fall through */
-      case 691 : /* fall through */
-      case 692 : /* fall through */
-      case 693 : /* fall through */
-      case 694 : /* fall through */
-      case 695 : /* fall through */
-      case 696 : /* fall through */
-      case 697 : /* fall through */
-      case 698 : /* fall through */
-      case 699 : /* fall through */
-      case 700 : /* fall through */
-      case 701 : /* fall through */
-      case 702 : /* fall through */
-      case 703 : itype = SH64_MEDIA_INSN_STQ; goto extract_sfmt_stq;      case 704 : /* fall through */
-      case 705 : /* fall through */
-      case 706 : /* fall through */
-      case 707 : /* fall through */
-      case 708 : /* fall through */
-      case 709 : /* fall through */
-      case 710 : /* fall through */
-      case 711 : /* fall through */
-      case 712 : /* fall through */
-      case 713 : /* fall through */
-      case 714 : /* fall through */
-      case 715 : /* fall through */
-      case 716 : /* fall through */
-      case 717 : /* fall through */
-      case 718 : /* fall through */
-      case 719 : itype = SH64_MEDIA_INSN_LDUW; goto extract_sfmt_lduw;      case 720 : /* fall through */
-      case 721 : /* fall through */
-      case 722 : /* fall through */
-      case 723 : /* fall through */
-      case 724 : /* fall through */
-      case 725 : /* fall through */
-      case 726 : /* fall through */
-      case 727 : /* fall through */
-      case 728 : /* fall through */
-      case 729 : /* fall through */
-      case 730 : /* fall through */
-      case 731 : /* fall through */
-      case 732 : /* fall through */
-      case 733 : /* fall through */
-      case 734 : /* fall through */
-      case 735 : itype = SH64_MEDIA_INSN_FSTS; goto extract_sfmt_fsts;      case 736 : /* fall through */
-      case 737 : /* fall through */
-      case 738 : /* fall through */
-      case 739 : /* fall through */
-      case 740 : /* fall through */
-      case 741 : /* fall through */
-      case 742 : /* fall through */
-      case 743 : /* fall through */
-      case 744 : /* fall through */
-      case 745 : /* fall through */
-      case 746 : /* fall through */
-      case 747 : /* fall through */
-      case 748 : /* fall through */
-      case 749 : /* fall through */
-      case 750 : /* fall through */
-      case 751 : itype = SH64_MEDIA_INSN_FSTP; goto extract_sfmt_fstp;      case 752 : /* fall through */
-      case 753 : /* fall through */
-      case 754 : /* fall through */
-      case 755 : /* fall through */
-      case 756 : /* fall through */
-      case 757 : /* fall through */
-      case 758 : /* fall through */
-      case 759 : /* fall through */
-      case 760 : /* fall through */
-      case 761 : /* fall through */
-      case 762 : /* fall through */
-      case 763 : /* fall through */
-      case 764 : /* fall through */
-      case 765 : /* fall through */
-      case 766 : /* fall through */
-      case 767 : itype = SH64_MEDIA_INSN_FSTD; goto extract_sfmt_fstd;      case 770 : itype = SH64_MEDIA_INSN_LDLOL; goto extract_sfmt_alloco;      case 771 : itype = SH64_MEDIA_INSN_LDLOQ; goto extract_sfmt_alloco;      case 774 : itype = SH64_MEDIA_INSN_LDHIL; goto extract_sfmt_alloco;      case 775 : itype = SH64_MEDIA_INSN_LDHIQ; goto extract_sfmt_alloco;      case 783 : itype = SH64_MEDIA_INSN_GETCFG; goto extract_sfmt_alloco;      case 784 : itype = SH64_MEDIA_INSN_SHLLIL; goto extract_sfmt_sharil;      case 785 : itype = SH64_MEDIA_INSN_SHLLI; goto extract_sfmt_shari;      case 786 : itype = SH64_MEDIA_INSN_SHLRIL; goto extract_sfmt_sharil;      case 787 : itype = SH64_MEDIA_INSN_SHLRI; goto extract_sfmt_shari;      case 790 : itype = SH64_MEDIA_INSN_SHARIL; goto extract_sfmt_sharil;      case 791 : itype = SH64_MEDIA_INSN_SHARI; goto extract_sfmt_shari;      case 797 : itype = SH64_MEDIA_INSN_XORI; goto extract_sfmt_xori;      case 800 : /* fall through */
-      case 801 : /* fall through */
-      case 802 : /* fall through */
-      case 803 : /* fall through */
-      case 804 : /* fall through */
-      case 805 : /* fall through */
-      case 806 : /* fall through */
-      case 807 : /* fall through */
-      case 808 : /* fall through */
-      case 809 : /* fall through */
-      case 810 : /* fall through */
-      case 811 : /* fall through */
-      case 812 : /* fall through */
-      case 813 : /* fall through */
-      case 814 : /* fall through */
-      case 815 : itype = SH64_MEDIA_INSN_SHORI; goto extract_sfmt_shori;      case 816 : /* fall through */
-      case 817 : /* fall through */
-      case 818 : /* fall through */
-      case 819 : /* fall through */
-      case 820 : /* fall through */
-      case 821 : /* fall through */
-      case 822 : /* fall through */
-      case 823 : /* fall through */
-      case 824 : /* fall through */
-      case 825 : /* fall through */
-      case 826 : /* fall through */
-      case 827 : /* fall through */
-      case 828 : /* fall through */
-      case 829 : /* fall through */
-      case 830 : /* fall through */
-      case 831 : itype = SH64_MEDIA_INSN_MOVI; goto extract_sfmt_movi;      case 832 : /* fall through */
-      case 833 : /* fall through */
-      case 834 : /* fall through */
-      case 835 : /* fall through */
-      case 836 : /* fall through */
-      case 837 : /* fall through */
-      case 838 : /* fall through */
-      case 839 : /* fall through */
-      case 840 : /* fall through */
-      case 841 : /* fall through */
-      case 842 : /* fall through */
-      case 843 : /* fall through */
-      case 844 : /* fall through */
-      case 845 : /* fall through */
-      case 846 : /* fall through */
-      case 847 : itype = SH64_MEDIA_INSN_ADDI; goto extract_sfmt_addi;      case 848 : /* fall through */
-      case 849 : /* fall through */
-      case 850 : /* fall through */
-      case 851 : /* fall through */
-      case 852 : /* fall through */
-      case 853 : /* fall through */
-      case 854 : /* fall through */
-      case 855 : /* fall through */
-      case 856 : /* fall through */
-      case 857 : /* fall through */
-      case 858 : /* fall through */
-      case 859 : /* fall through */
-      case 860 : /* fall through */
-      case 861 : /* fall through */
-      case 862 : /* fall through */
-      case 863 : itype = SH64_MEDIA_INSN_ADDIL; goto extract_sfmt_addi;      case 864 : /* fall through */
-      case 865 : /* fall through */
-      case 866 : /* fall through */
-      case 867 : /* fall through */
-      case 868 : /* fall through */
-      case 869 : /* fall through */
-      case 870 : /* fall through */
-      case 871 : /* fall through */
-      case 872 : /* fall through */
-      case 873 : /* fall through */
-      case 874 : /* fall through */
-      case 875 : /* fall through */
-      case 876 : /* fall through */
-      case 877 : /* fall through */
-      case 878 : /* fall through */
-      case 879 : itype = SH64_MEDIA_INSN_ANDI; goto extract_sfmt_addi;      case 880 : /* fall through */
-      case 881 : /* fall through */
-      case 882 : /* fall through */
-      case 883 : /* fall through */
-      case 884 : /* fall through */
-      case 885 : /* fall through */
-      case 886 : /* fall through */
-      case 887 : /* fall through */
-      case 888 : /* fall through */
-      case 889 : /* fall through */
-      case 890 : /* fall through */
-      case 891 : /* fall through */
-      case 892 : /* fall through */
-      case 893 : /* fall through */
-      case 894 : /* fall through */
-      case 895 : itype = SH64_MEDIA_INSN_ORI; goto extract_sfmt_ori;      case 897 : itype = SH64_MEDIA_INSN_PREFI; goto extract_sfmt_alloco;      case 898 : itype = SH64_MEDIA_INSN_STLOL; goto extract_sfmt_alloco;      case 899 : itype = SH64_MEDIA_INSN_STLOQ; goto extract_sfmt_alloco;      case 900 : itype = SH64_MEDIA_INSN_ALLOCO; goto extract_sfmt_alloco;      case 901 : itype = SH64_MEDIA_INSN_ICBI; goto extract_sfmt_alloco;      case 902 : itype = SH64_MEDIA_INSN_STHIL; goto extract_sfmt_sthil;      case 903 : itype = SH64_MEDIA_INSN_STHIQ; goto extract_sfmt_sthil;      case 904 : itype = SH64_MEDIA_INSN_OCBP; goto extract_sfmt_alloco;      case 905 : itype = SH64_MEDIA_INSN_OCBI; goto extract_sfmt_alloco;      case 908 : itype = SH64_MEDIA_INSN_OCBWB; goto extract_sfmt_alloco;      case 911 : itype = SH64_MEDIA_INSN_PUTCFG; goto extract_sfmt_alloco;      case 913 : itype = SH64_MEDIA_INSN_BEQI; goto extract_sfmt_beqi;      case 917 : itype = SH64_MEDIA_INSN_BNEI; goto extract_sfmt_beqi;      case 928 : /* fall through */
-      case 929 : /* fall through */
-      case 930 : /* fall through */
-      case 931 : /* fall through */
-      case 932 : /* fall through */
-      case 933 : /* fall through */
-      case 934 : /* fall through */
-      case 935 : /* fall through */
-      case 936 : /* fall through */
-      case 937 : /* fall through */
-      case 938 : /* fall through */
-      case 939 : /* fall through */
-      case 940 : /* fall through */
-      case 941 : /* fall through */
-      case 942 : /* fall through */
-      case 943 : itype = SH64_MEDIA_INSN_PTA; goto extract_sfmt_pta;      case 944 : /* fall through */
-      case 945 : /* fall through */
-      case 946 : /* fall through */
-      case 947 : /* fall through */
-      case 948 : /* fall through */
-      case 949 : /* fall through */
-      case 950 : /* fall through */
-      case 951 : /* fall through */
-      case 952 : /* fall through */
-      case 953 : /* fall through */
-      case 954 : /* fall through */
-      case 955 : /* fall through */
-      case 956 : /* fall through */
-      case 957 : /* fall through */
-      case 958 : /* fall through */
-      case 959 : itype = SH64_MEDIA_INSN_PTB; goto extract_sfmt_pta;      default : itype = SH64_MEDIA_INSN_X_INVALID; goto extract_sfmt_empty;
-      }
-    }
-  }
-
-  /* The instruction has been decoded, now extract the fields.  */
-
- extract_sfmt_empty:
-  {
-    const IDESC *idesc = &sh64_media_insn_data[itype];
-#define FLD(f) abuf->fields.fmt_empty.f
-
-
-  /* Record the fields for the semantic handler.  */
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_empty", (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_add:
-  {
-    const IDESC *idesc = &sh64_media_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_add.f
-    UINT f_left;
-    UINT f_right;
-    UINT f_dest;
-
-    f_left = EXTRACT_LSB0_UINT (insn, 32, 25, 6);
-    f_right = EXTRACT_LSB0_UINT (insn, 32, 15, 6);
-    f_dest = EXTRACT_LSB0_UINT (insn, 32, 9, 6);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_left) = f_left;
-  FLD (f_right) = f_right;
-  FLD (f_dest) = f_dest;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_add", "f_left 0x%x", 'x', f_left, "f_right 0x%x", 'x', f_right, "f_dest 0x%x", 'x', f_dest, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_addi:
-  {
-    const IDESC *idesc = &sh64_media_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_addi.f
-    UINT f_left;
-    INT f_disp10;
-    UINT f_dest;
-
-    f_left = EXTRACT_LSB0_UINT (insn, 32, 25, 6);
-    f_disp10 = EXTRACT_LSB0_INT (insn, 32, 19, 10);
-    f_dest = EXTRACT_LSB0_UINT (insn, 32, 9, 6);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_disp10) = f_disp10;
-  FLD (f_left) = f_left;
-  FLD (f_dest) = f_dest;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addi", "f_disp10 0x%x", 'x', f_disp10, "f_left 0x%x", 'x', f_left, "f_dest 0x%x", 'x', f_dest, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_alloco:
-  {
-    const IDESC *idesc = &sh64_media_insn_data[itype];
-#define FLD(f) abuf->fields.fmt_empty.f
-
-
-  /* Record the fields for the semantic handler.  */
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_alloco", (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_beq:
-  {
-    const IDESC *idesc = &sh64_media_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_beq.f
-    UINT f_left;
-    UINT f_right;
-    UINT f_tra;
-
-    f_left = EXTRACT_LSB0_UINT (insn, 32, 25, 6);
-    f_right = EXTRACT_LSB0_UINT (insn, 32, 15, 6);
-    f_tra = EXTRACT_LSB0_UINT (insn, 32, 6, 3);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_left) = f_left;
-  FLD (f_right) = f_right;
-  FLD (f_tra) = f_tra;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_beq", "f_left 0x%x", 'x', f_left, "f_right 0x%x", 'x', f_right, "f_tra 0x%x", 'x', f_tra, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_beqi:
-  {
-    const IDESC *idesc = &sh64_media_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_beqi.f
-    UINT f_left;
-    INT f_imm6;
-    UINT f_tra;
-
-    f_left = EXTRACT_LSB0_UINT (insn, 32, 25, 6);
-    f_imm6 = EXTRACT_LSB0_INT (insn, 32, 15, 6);
-    f_tra = EXTRACT_LSB0_UINT (insn, 32, 6, 3);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_imm6) = f_imm6;
-  FLD (f_left) = f_left;
-  FLD (f_tra) = f_tra;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_beqi", "f_imm6 0x%x", 'x', f_imm6, "f_left 0x%x", 'x', f_left, "f_tra 0x%x", 'x', f_tra, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_blink:
-  {
-    const IDESC *idesc = &sh64_media_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_blink.f
-    UINT f_trb;
-    UINT f_dest;
-
-    f_trb = EXTRACT_LSB0_UINT (insn, 32, 22, 3);
-    f_dest = EXTRACT_LSB0_UINT (insn, 32, 9, 6);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_trb) = f_trb;
-  FLD (f_dest) = f_dest;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_blink", "f_trb 0x%x", 'x', f_trb, "f_dest 0x%x", 'x', f_dest, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_brk:
-  {
-    const IDESC *idesc = &sh64_media_insn_data[itype];
-#define FLD(f) abuf->fields.fmt_empty.f
-
-
-  /* Record the fields for the semantic handler.  */
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_brk", (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_byterev:
-  {
-    const IDESC *idesc = &sh64_media_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_xori.f
-    UINT f_left;
-    UINT f_dest;
-
-    f_left = EXTRACT_LSB0_UINT (insn, 32, 25, 6);
-    f_dest = EXTRACT_LSB0_UINT (insn, 32, 9, 6);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_left) = f_left;
-  FLD (f_dest) = f_dest;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_byterev", "f_left 0x%x", 'x', f_left, "f_dest 0x%x", 'x', f_dest, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_cmveq:
-  {
-    const IDESC *idesc = &sh64_media_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_add.f
-    UINT f_left;
-    UINT f_right;
-    UINT f_dest;
-
-    f_left = EXTRACT_LSB0_UINT (insn, 32, 25, 6);
-    f_right = EXTRACT_LSB0_UINT (insn, 32, 15, 6);
-    f_dest = EXTRACT_LSB0_UINT (insn, 32, 9, 6);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_left) = f_left;
-  FLD (f_right) = f_right;
-  FLD (f_dest) = f_dest;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmveq", "f_left 0x%x", 'x', f_left, "f_right 0x%x", 'x', f_right, "f_dest 0x%x", 'x', f_dest, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_fabsd:
-  {
-    const IDESC *idesc = &sh64_media_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_fabsd.f
-    UINT f_left;
-    UINT f_right;
-    UINT f_dest;
-    UINT f_left_right;
-
-    f_left = EXTRACT_LSB0_UINT (insn, 32, 25, 6);
-    f_right = EXTRACT_LSB0_UINT (insn, 32, 15, 6);
-    f_dest = EXTRACT_LSB0_UINT (insn, 32, 9, 6);
-  f_left_right = f_left;
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_left_right) = f_left_right;
-  FLD (f_dest) = f_dest;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fabsd", "f_left_right 0x%x", 'x', f_left_right, "f_dest 0x%x", 'x', f_dest, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_fabss:
-  {
-    const IDESC *idesc = &sh64_media_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_fabsd.f
-    UINT f_left;
-    UINT f_right;
-    UINT f_dest;
-    UINT f_left_right;
-
-    f_left = EXTRACT_LSB0_UINT (insn, 32, 25, 6);
-    f_right = EXTRACT_LSB0_UINT (insn, 32, 15, 6);
-    f_dest = EXTRACT_LSB0_UINT (insn, 32, 9, 6);
-  f_left_right = f_left;
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_left_right) = f_left_right;
-  FLD (f_dest) = f_dest;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fabss", "f_left_right 0x%x", 'x', f_left_right, "f_dest 0x%x", 'x', f_dest, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_faddd:
-  {
-    const IDESC *idesc = &sh64_media_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_add.f
-    UINT f_left;
-    UINT f_right;
-    UINT f_dest;
-
-    f_left = EXTRACT_LSB0_UINT (insn, 32, 25, 6);
-    f_right = EXTRACT_LSB0_UINT (insn, 32, 15, 6);
-    f_dest = EXTRACT_LSB0_UINT (insn, 32, 9, 6);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_left) = f_left;
-  FLD (f_right) = f_right;
-  FLD (f_dest) = f_dest;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_faddd", "f_left 0x%x", 'x', f_left, "f_right 0x%x", 'x', f_right, "f_dest 0x%x", 'x', f_dest, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_fadds:
-  {
-    const IDESC *idesc = &sh64_media_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_add.f
-    UINT f_left;
-    UINT f_right;
-    UINT f_dest;
-
-    f_left = EXTRACT_LSB0_UINT (insn, 32, 25, 6);
-    f_right = EXTRACT_LSB0_UINT (insn, 32, 15, 6);
-    f_dest = EXTRACT_LSB0_UINT (insn, 32, 9, 6);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_left) = f_left;
-  FLD (f_right) = f_right;
-  FLD (f_dest) = f_dest;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fadds", "f_left 0x%x", 'x', f_left, "f_right 0x%x", 'x', f_right, "f_dest 0x%x", 'x', f_dest, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_fcmpeqd:
-  {
-    const IDESC *idesc = &sh64_media_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_add.f
-    UINT f_left;
-    UINT f_right;
-    UINT f_dest;
-
-    f_left = EXTRACT_LSB0_UINT (insn, 32, 25, 6);
-    f_right = EXTRACT_LSB0_UINT (insn, 32, 15, 6);
-    f_dest = EXTRACT_LSB0_UINT (insn, 32, 9, 6);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_left) = f_left;
-  FLD (f_right) = f_right;
-  FLD (f_dest) = f_dest;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fcmpeqd", "f_left 0x%x", 'x', f_left, "f_right 0x%x", 'x', f_right, "f_dest 0x%x", 'x', f_dest, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_fcmpeqs:
-  {
-    const IDESC *idesc = &sh64_media_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_add.f
-    UINT f_left;
-    UINT f_right;
-    UINT f_dest;
-
-    f_left = EXTRACT_LSB0_UINT (insn, 32, 25, 6);
-    f_right = EXTRACT_LSB0_UINT (insn, 32, 15, 6);
-    f_dest = EXTRACT_LSB0_UINT (insn, 32, 9, 6);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_left) = f_left;
-  FLD (f_right) = f_right;
-  FLD (f_dest) = f_dest;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fcmpeqs", "f_left 0x%x", 'x', f_left, "f_right 0x%x", 'x', f_right, "f_dest 0x%x", 'x', f_dest, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_fcnvds:
-  {
-    const IDESC *idesc = &sh64_media_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_fabsd.f
-    UINT f_left;
-    UINT f_right;
-    UINT f_dest;
-    UINT f_left_right;
-
-    f_left = EXTRACT_LSB0_UINT (insn, 32, 25, 6);
-    f_right = EXTRACT_LSB0_UINT (insn, 32, 15, 6);
-    f_dest = EXTRACT_LSB0_UINT (insn, 32, 9, 6);
-  f_left_right = f_left;
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_left_right) = f_left_right;
-  FLD (f_dest) = f_dest;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fcnvds", "f_left_right 0x%x", 'x', f_left_right, "f_dest 0x%x", 'x', f_dest, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_fcnvsd:
-  {
-    const IDESC *idesc = &sh64_media_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_fabsd.f
-    UINT f_left;
-    UINT f_right;
-    UINT f_dest;
-    UINT f_left_right;
-
-    f_left = EXTRACT_LSB0_UINT (insn, 32, 25, 6);
-    f_right = EXTRACT_LSB0_UINT (insn, 32, 15, 6);
-    f_dest = EXTRACT_LSB0_UINT (insn, 32, 9, 6);
-  f_left_right = f_left;
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_left_right) = f_left_right;
-  FLD (f_dest) = f_dest;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fcnvsd", "f_left_right 0x%x", 'x', f_left_right, "f_dest 0x%x", 'x', f_dest, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_fiprs:
-  {
-    const IDESC *idesc = &sh64_media_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_add.f
-    UINT f_left;
-    UINT f_right;
-    UINT f_dest;
-
-    f_left = EXTRACT_LSB0_UINT (insn, 32, 25, 6);
-    f_right = EXTRACT_LSB0_UINT (insn, 32, 15, 6);
-    f_dest = EXTRACT_LSB0_UINT (insn, 32, 9, 6);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_left) = f_left;
-  FLD (f_right) = f_right;
-  FLD (f_dest) = f_dest;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fiprs", "f_left 0x%x", 'x', f_left, "f_right 0x%x", 'x', f_right, "f_dest 0x%x", 'x', f_dest, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_fldd:
-  {
-    const IDESC *idesc = &sh64_media_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_fldd.f
-    UINT f_left;
-    SI f_disp10x8;
-    UINT f_dest;
-
-    f_left = EXTRACT_LSB0_UINT (insn, 32, 25, 6);
-    f_disp10x8 = ((EXTRACT_LSB0_INT (insn, 32, 19, 10)) << (3));
-    f_dest = EXTRACT_LSB0_UINT (insn, 32, 9, 6);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_disp10x8) = f_disp10x8;
-  FLD (f_left) = f_left;
-  FLD (f_dest) = f_dest;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fldd", "f_disp10x8 0x%x", 'x', f_disp10x8, "f_left 0x%x", 'x', f_left, "f_dest 0x%x", 'x', f_dest, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_fldp:
-  {
-    const IDESC *idesc = &sh64_media_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_fldd.f
-    UINT f_left;
-    SI f_disp10x8;
-    UINT f_dest;
-
-    f_left = EXTRACT_LSB0_UINT (insn, 32, 25, 6);
-    f_disp10x8 = ((EXTRACT_LSB0_INT (insn, 32, 19, 10)) << (3));
-    f_dest = EXTRACT_LSB0_UINT (insn, 32, 9, 6);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_disp10x8) = f_disp10x8;
-  FLD (f_dest) = f_dest;
-  FLD (f_left) = f_left;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fldp", "f_disp10x8 0x%x", 'x', f_disp10x8, "f_dest 0x%x", 'x', f_dest, "f_left 0x%x", 'x', f_left, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_flds:
-  {
-    const IDESC *idesc = &sh64_media_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_flds.f
-    UINT f_left;
-    SI f_disp10x4;
-    UINT f_dest;
-
-    f_left = EXTRACT_LSB0_UINT (insn, 32, 25, 6);
-    f_disp10x4 = ((EXTRACT_LSB0_INT (insn, 32, 19, 10)) << (2));
-    f_dest = EXTRACT_LSB0_UINT (insn, 32, 9, 6);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_disp10x4) = f_disp10x4;
-  FLD (f_left) = f_left;
-  FLD (f_dest) = f_dest;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_flds", "f_disp10x4 0x%x", 'x', f_disp10x4, "f_left 0x%x", 'x', f_left, "f_dest 0x%x", 'x', f_dest, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_fldxd:
-  {
-    const IDESC *idesc = &sh64_media_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_add.f
-    UINT f_left;
-    UINT f_right;
-    UINT f_dest;
-
-    f_left = EXTRACT_LSB0_UINT (insn, 32, 25, 6);
-    f_right = EXTRACT_LSB0_UINT (insn, 32, 15, 6);
-    f_dest = EXTRACT_LSB0_UINT (insn, 32, 9, 6);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_left) = f_left;
-  FLD (f_right) = f_right;
-  FLD (f_dest) = f_dest;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fldxd", "f_left 0x%x", 'x', f_left, "f_right 0x%x", 'x', f_right, "f_dest 0x%x", 'x', f_dest, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_fldxp:
-  {
-    const IDESC *idesc = &sh64_media_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_add.f
-    UINT f_left;
-    UINT f_right;
-    UINT f_dest;
-
-    f_left = EXTRACT_LSB0_UINT (insn, 32, 25, 6);
-    f_right = EXTRACT_LSB0_UINT (insn, 32, 15, 6);
-    f_dest = EXTRACT_LSB0_UINT (insn, 32, 9, 6);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_dest) = f_dest;
-  FLD (f_left) = f_left;
-  FLD (f_right) = f_right;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fldxp", "f_dest 0x%x", 'x', f_dest, "f_left 0x%x", 'x', f_left, "f_right 0x%x", 'x', f_right, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_fldxs:
-  {
-    const IDESC *idesc = &sh64_media_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_add.f
-    UINT f_left;
-    UINT f_right;
-    UINT f_dest;
-
-    f_left = EXTRACT_LSB0_UINT (insn, 32, 25, 6);
-    f_right = EXTRACT_LSB0_UINT (insn, 32, 15, 6);
-    f_dest = EXTRACT_LSB0_UINT (insn, 32, 9, 6);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_left) = f_left;
-  FLD (f_right) = f_right;
-  FLD (f_dest) = f_dest;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fldxs", "f_left 0x%x", 'x', f_left, "f_right 0x%x", 'x', f_right, "f_dest 0x%x", 'x', f_dest, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_fmacs:
-  {
-    const IDESC *idesc = &sh64_media_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_add.f
-    UINT f_left;
-    UINT f_right;
-    UINT f_dest;
-
-    f_left = EXTRACT_LSB0_UINT (insn, 32, 25, 6);
-    f_right = EXTRACT_LSB0_UINT (insn, 32, 15, 6);
-    f_dest = EXTRACT_LSB0_UINT (insn, 32, 9, 6);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_dest) = f_dest;
-  FLD (f_left) = f_left;
-  FLD (f_right) = f_right;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fmacs", "f_dest 0x%x", 'x', f_dest, "f_left 0x%x", 'x', f_left, "f_right 0x%x", 'x', f_right, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_fmovdq:
-  {
-    const IDESC *idesc = &sh64_media_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_fabsd.f
-    UINT f_left;
-    UINT f_right;
-    UINT f_dest;
-    UINT f_left_right;
-
-    f_left = EXTRACT_LSB0_UINT (insn, 32, 25, 6);
-    f_right = EXTRACT_LSB0_UINT (insn, 32, 15, 6);
-    f_dest = EXTRACT_LSB0_UINT (insn, 32, 9, 6);
-  f_left_right = f_left;
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_left_right) = f_left_right;
-  FLD (f_dest) = f_dest;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fmovdq", "f_left_right 0x%x", 'x', f_left_right, "f_dest 0x%x", 'x', f_dest, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_fmovls:
-  {
-    const IDESC *idesc = &sh64_media_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_xori.f
-    UINT f_left;
-    UINT f_dest;
-
-    f_left = EXTRACT_LSB0_UINT (insn, 32, 25, 6);
-    f_dest = EXTRACT_LSB0_UINT (insn, 32, 9, 6);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_left) = f_left;
-  FLD (f_dest) = f_dest;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fmovls", "f_left 0x%x", 'x', f_left, "f_dest 0x%x", 'x', f_dest, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_fmovqd:
-  {
-    const IDESC *idesc = &sh64_media_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_xori.f
-    UINT f_left;
-    UINT f_dest;
-
-    f_left = EXTRACT_LSB0_UINT (insn, 32, 25, 6);
-    f_dest = EXTRACT_LSB0_UINT (insn, 32, 9, 6);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_left) = f_left;
-  FLD (f_dest) = f_dest;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fmovqd", "f_left 0x%x", 'x', f_left, "f_dest 0x%x", 'x', f_dest, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_fmovsl:
-  {
-    const IDESC *idesc = &sh64_media_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_fabsd.f
-    UINT f_left;
-    UINT f_right;
-    UINT f_dest;
-    UINT f_left_right;
-
-    f_left = EXTRACT_LSB0_UINT (insn, 32, 25, 6);
-    f_right = EXTRACT_LSB0_UINT (insn, 32, 15, 6);
-    f_dest = EXTRACT_LSB0_UINT (insn, 32, 9, 6);
-  f_left_right = f_left;
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_left_right) = f_left_right;
-  FLD (f_dest) = f_dest;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fmovsl", "f_left_right 0x%x", 'x', f_left_right, "f_dest 0x%x", 'x', f_dest, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_fstd:
-  {
-    const IDESC *idesc = &sh64_media_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_fldd.f
-    UINT f_left;
-    SI f_disp10x8;
-    UINT f_dest;
-
-    f_left = EXTRACT_LSB0_UINT (insn, 32, 25, 6);
-    f_disp10x8 = ((EXTRACT_LSB0_INT (insn, 32, 19, 10)) << (3));
-    f_dest = EXTRACT_LSB0_UINT (insn, 32, 9, 6);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_disp10x8) = f_disp10x8;
-  FLD (f_dest) = f_dest;
-  FLD (f_left) = f_left;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fstd", "f_disp10x8 0x%x", 'x', f_disp10x8, "f_dest 0x%x", 'x', f_dest, "f_left 0x%x", 'x', f_left, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_fstp:
-  {
-    const IDESC *idesc = &sh64_media_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_fldd.f
-    UINT f_left;
-    SI f_disp10x8;
-    UINT f_dest;
-
-    f_left = EXTRACT_LSB0_UINT (insn, 32, 25, 6);
-    f_disp10x8 = ((EXTRACT_LSB0_INT (insn, 32, 19, 10)) << (3));
-    f_dest = EXTRACT_LSB0_UINT (insn, 32, 9, 6);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_disp10x8) = f_disp10x8;
-  FLD (f_dest) = f_dest;
-  FLD (f_left) = f_left;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fstp", "f_disp10x8 0x%x", 'x', f_disp10x8, "f_dest 0x%x", 'x', f_dest, "f_left 0x%x", 'x', f_left, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_fsts:
-  {
-    const IDESC *idesc = &sh64_media_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_flds.f
-    UINT f_left;
-    SI f_disp10x4;
-    UINT f_dest;
-
-    f_left = EXTRACT_LSB0_UINT (insn, 32, 25, 6);
-    f_disp10x4 = ((EXTRACT_LSB0_INT (insn, 32, 19, 10)) << (2));
-    f_dest = EXTRACT_LSB0_UINT (insn, 32, 9, 6);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_disp10x4) = f_disp10x4;
-  FLD (f_dest) = f_dest;
-  FLD (f_left) = f_left;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fsts", "f_disp10x4 0x%x", 'x', f_disp10x4, "f_dest 0x%x", 'x', f_dest, "f_left 0x%x", 'x', f_left, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_fstxd:
-  {
-    const IDESC *idesc = &sh64_media_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_add.f
-    UINT f_left;
-    UINT f_right;
-    UINT f_dest;
-
-    f_left = EXTRACT_LSB0_UINT (insn, 32, 25, 6);
-    f_right = EXTRACT_LSB0_UINT (insn, 32, 15, 6);
-    f_dest = EXTRACT_LSB0_UINT (insn, 32, 9, 6);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_dest) = f_dest;
-  FLD (f_left) = f_left;
-  FLD (f_right) = f_right;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fstxd", "f_dest 0x%x", 'x', f_dest, "f_left 0x%x", 'x', f_left, "f_right 0x%x", 'x', f_right, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_fstxp:
-  {
-    const IDESC *idesc = &sh64_media_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_add.f
-    UINT f_left;
-    UINT f_right;
-    UINT f_dest;
-
-    f_left = EXTRACT_LSB0_UINT (insn, 32, 25, 6);
-    f_right = EXTRACT_LSB0_UINT (insn, 32, 15, 6);
-    f_dest = EXTRACT_LSB0_UINT (insn, 32, 9, 6);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_dest) = f_dest;
-  FLD (f_left) = f_left;
-  FLD (f_right) = f_right;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fstxp", "f_dest 0x%x", 'x', f_dest, "f_left 0x%x", 'x', f_left, "f_right 0x%x", 'x', f_right, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_fstxs:
-  {
-    const IDESC *idesc = &sh64_media_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_add.f
-    UINT f_left;
-    UINT f_right;
-    UINT f_dest;
-
-    f_left = EXTRACT_LSB0_UINT (insn, 32, 25, 6);
-    f_right = EXTRACT_LSB0_UINT (insn, 32, 15, 6);
-    f_dest = EXTRACT_LSB0_UINT (insn, 32, 9, 6);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_dest) = f_dest;
-  FLD (f_left) = f_left;
-  FLD (f_right) = f_right;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fstxs", "f_dest 0x%x", 'x', f_dest, "f_left 0x%x", 'x', f_left, "f_right 0x%x", 'x', f_right, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_ftrvs:
-  {
-    const IDESC *idesc = &sh64_media_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_add.f
-    UINT f_left;
-    UINT f_right;
-    UINT f_dest;
-
-    f_left = EXTRACT_LSB0_UINT (insn, 32, 25, 6);
-    f_right = EXTRACT_LSB0_UINT (insn, 32, 15, 6);
-    f_dest = EXTRACT_LSB0_UINT (insn, 32, 9, 6);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_dest) = f_dest;
-  FLD (f_left) = f_left;
-  FLD (f_right) = f_right;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ftrvs", "f_dest 0x%x", 'x', f_dest, "f_left 0x%x", 'x', f_left, "f_right 0x%x", 'x', f_right, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_getcon:
-  {
-    const IDESC *idesc = &sh64_media_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_xori.f
-    UINT f_left;
-    UINT f_dest;
-
-    f_left = EXTRACT_LSB0_UINT (insn, 32, 25, 6);
-    f_dest = EXTRACT_LSB0_UINT (insn, 32, 9, 6);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_left) = f_left;
-  FLD (f_dest) = f_dest;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_getcon", "f_left 0x%x", 'x', f_left, "f_dest 0x%x", 'x', f_dest, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_gettr:
-  {
-    const IDESC *idesc = &sh64_media_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_blink.f
-    UINT f_trb;
-    UINT f_dest;
-
-    f_trb = EXTRACT_LSB0_UINT (insn, 32, 22, 3);
-    f_dest = EXTRACT_LSB0_UINT (insn, 32, 9, 6);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_trb) = f_trb;
-  FLD (f_dest) = f_dest;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_gettr", "f_trb 0x%x", 'x', f_trb, "f_dest 0x%x", 'x', f_dest, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_ldb:
-  {
-    const IDESC *idesc = &sh64_media_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_addi.f
-    UINT f_left;
-    INT f_disp10;
-    UINT f_dest;
-
-    f_left = EXTRACT_LSB0_UINT (insn, 32, 25, 6);
-    f_disp10 = EXTRACT_LSB0_INT (insn, 32, 19, 10);
-    f_dest = EXTRACT_LSB0_UINT (insn, 32, 9, 6);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_disp10) = f_disp10;
-  FLD (f_left) = f_left;
-  FLD (f_dest) = f_dest;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldb", "f_disp10 0x%x", 'x', f_disp10, "f_left 0x%x", 'x', f_left, "f_dest 0x%x", 'x', f_dest, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_ldl:
-  {
-    const IDESC *idesc = &sh64_media_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_flds.f
-    UINT f_left;
-    SI f_disp10x4;
-    UINT f_dest;
-
-    f_left = EXTRACT_LSB0_UINT (insn, 32, 25, 6);
-    f_disp10x4 = ((EXTRACT_LSB0_INT (insn, 32, 19, 10)) << (2));
-    f_dest = EXTRACT_LSB0_UINT (insn, 32, 9, 6);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_disp10x4) = f_disp10x4;
-  FLD (f_left) = f_left;
-  FLD (f_dest) = f_dest;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldl", "f_disp10x4 0x%x", 'x', f_disp10x4, "f_left 0x%x", 'x', f_left, "f_dest 0x%x", 'x', f_dest, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_ldq:
-  {
-    const IDESC *idesc = &sh64_media_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_fldd.f
-    UINT f_left;
-    SI f_disp10x8;
-    UINT f_dest;
-
-    f_left = EXTRACT_LSB0_UINT (insn, 32, 25, 6);
-    f_disp10x8 = ((EXTRACT_LSB0_INT (insn, 32, 19, 10)) << (3));
-    f_dest = EXTRACT_LSB0_UINT (insn, 32, 9, 6);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_disp10x8) = f_disp10x8;
-  FLD (f_left) = f_left;
-  FLD (f_dest) = f_dest;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldq", "f_disp10x8 0x%x", 'x', f_disp10x8, "f_left 0x%x", 'x', f_left, "f_dest 0x%x", 'x', f_dest, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_lduw:
-  {
-    const IDESC *idesc = &sh64_media_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_lduw.f
-    UINT f_left;
-    SI f_disp10x2;
-    UINT f_dest;
-
-    f_left = EXTRACT_LSB0_UINT (insn, 32, 25, 6);
-    f_disp10x2 = ((EXTRACT_LSB0_INT (insn, 32, 19, 10)) << (1));
-    f_dest = EXTRACT_LSB0_UINT (insn, 32, 9, 6);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_disp10x2) = f_disp10x2;
-  FLD (f_left) = f_left;
-  FLD (f_dest) = f_dest;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_lduw", "f_disp10x2 0x%x", 'x', f_disp10x2, "f_left 0x%x", 'x', f_left, "f_dest 0x%x", 'x', f_dest, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_ldxb:
-  {
-    const IDESC *idesc = &sh64_media_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_add.f
-    UINT f_left;
-    UINT f_right;
-    UINT f_dest;
-
-    f_left = EXTRACT_LSB0_UINT (insn, 32, 25, 6);
-    f_right = EXTRACT_LSB0_UINT (insn, 32, 15, 6);
-    f_dest = EXTRACT_LSB0_UINT (insn, 32, 9, 6);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_left) = f_left;
-  FLD (f_right) = f_right;
-  FLD (f_dest) = f_dest;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldxb", "f_left 0x%x", 'x', f_left, "f_right 0x%x", 'x', f_right, "f_dest 0x%x", 'x', f_dest, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_mcmv:
-  {
-    const IDESC *idesc = &sh64_media_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_add.f
-    UINT f_left;
-    UINT f_right;
-    UINT f_dest;
-
-    f_left = EXTRACT_LSB0_UINT (insn, 32, 25, 6);
-    f_right = EXTRACT_LSB0_UINT (insn, 32, 15, 6);
-    f_dest = EXTRACT_LSB0_UINT (insn, 32, 9, 6);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_dest) = f_dest;
-  FLD (f_left) = f_left;
-  FLD (f_right) = f_right;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mcmv", "f_dest 0x%x", 'x', f_dest, "f_left 0x%x", 'x', f_left, "f_right 0x%x", 'x', f_right, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_movi:
-  {
-    const IDESC *idesc = &sh64_media_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_movi.f
-    INT f_imm16;
-    UINT f_dest;
-
-    f_imm16 = EXTRACT_LSB0_INT (insn, 32, 25, 16);
-    f_dest = EXTRACT_LSB0_UINT (insn, 32, 9, 6);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_imm16) = f_imm16;
-  FLD (f_dest) = f_dest;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movi", "f_imm16 0x%x", 'x', f_imm16, "f_dest 0x%x", 'x', f_dest, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_mpermw:
-  {
-    const IDESC *idesc = &sh64_media_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_add.f
-    UINT f_left;
-    UINT f_right;
-    UINT f_dest;
-
-    f_left = EXTRACT_LSB0_UINT (insn, 32, 25, 6);
-    f_right = EXTRACT_LSB0_UINT (insn, 32, 15, 6);
-    f_dest = EXTRACT_LSB0_UINT (insn, 32, 9, 6);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_left) = f_left;
-  FLD (f_right) = f_right;
-  FLD (f_dest) = f_dest;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mpermw", "f_left 0x%x", 'x', f_left, "f_right 0x%x", 'x', f_right, "f_dest 0x%x", 'x', f_dest, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_ori:
-  {
-    const IDESC *idesc = &sh64_media_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_ori.f
-    UINT f_left;
-    INT f_imm10;
-    UINT f_dest;
-
-    f_left = EXTRACT_LSB0_UINT (insn, 32, 25, 6);
-    f_imm10 = EXTRACT_LSB0_INT (insn, 32, 19, 10);
-    f_dest = EXTRACT_LSB0_UINT (insn, 32, 9, 6);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_imm10) = f_imm10;
-  FLD (f_left) = f_left;
-  FLD (f_dest) = f_dest;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ori", "f_imm10 0x%x", 'x', f_imm10, "f_left 0x%x", 'x', f_left, "f_dest 0x%x", 'x', f_dest, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_pta:
-  {
-    const IDESC *idesc = &sh64_media_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_pta.f
-    DI f_disp16;
-    UINT f_tra;
-
-    f_disp16 = ((((EXTRACT_LSB0_INT (insn, 32, 25, 16)) << (2))) + (pc));
-    f_tra = EXTRACT_LSB0_UINT (insn, 32, 6, 3);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_disp16) = f_disp16;
-  FLD (f_tra) = f_tra;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_pta", "f_disp16 0x%x", 'x', f_disp16, "f_tra 0x%x", 'x', f_tra, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_ptabs:
-  {
-    const IDESC *idesc = &sh64_media_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_beq.f
-    UINT f_right;
-    UINT f_tra;
-
-    f_right = EXTRACT_LSB0_UINT (insn, 32, 15, 6);
-    f_tra = EXTRACT_LSB0_UINT (insn, 32, 6, 3);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_right) = f_right;
-  FLD (f_tra) = f_tra;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ptabs", "f_right 0x%x", 'x', f_right, "f_tra 0x%x", 'x', f_tra, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_ptrel:
-  {
-    const IDESC *idesc = &sh64_media_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_beq.f
-    UINT f_right;
-    UINT f_tra;
-
-    f_right = EXTRACT_LSB0_UINT (insn, 32, 15, 6);
-    f_tra = EXTRACT_LSB0_UINT (insn, 32, 6, 3);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_right) = f_right;
-  FLD (f_tra) = f_tra;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ptrel", "f_right 0x%x", 'x', f_right, "f_tra 0x%x", 'x', f_tra, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_putcon:
-  {
-    const IDESC *idesc = &sh64_media_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_xori.f
-    UINT f_left;
-    UINT f_dest;
-
-    f_left = EXTRACT_LSB0_UINT (insn, 32, 25, 6);
-    f_dest = EXTRACT_LSB0_UINT (insn, 32, 9, 6);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_left) = f_left;
-  FLD (f_dest) = f_dest;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_putcon", "f_left 0x%x", 'x', f_left, "f_dest 0x%x", 'x', f_dest, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_shari:
-  {
-    const IDESC *idesc = &sh64_media_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_shari.f
-    UINT f_left;
-    UINT f_uimm6;
-    UINT f_dest;
-
-    f_left = EXTRACT_LSB0_UINT (insn, 32, 25, 6);
-    f_uimm6 = EXTRACT_LSB0_UINT (insn, 32, 15, 6);
-    f_dest = EXTRACT_LSB0_UINT (insn, 32, 9, 6);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_left) = f_left;
-  FLD (f_uimm6) = f_uimm6;
-  FLD (f_dest) = f_dest;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_shari", "f_left 0x%x", 'x', f_left, "f_uimm6 0x%x", 'x', f_uimm6, "f_dest 0x%x", 'x', f_dest, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_sharil:
-  {
-    const IDESC *idesc = &sh64_media_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_shari.f
-    UINT f_left;
-    UINT f_uimm6;
-    UINT f_dest;
-
-    f_left = EXTRACT_LSB0_UINT (insn, 32, 25, 6);
-    f_uimm6 = EXTRACT_LSB0_UINT (insn, 32, 15, 6);
-    f_dest = EXTRACT_LSB0_UINT (insn, 32, 9, 6);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_left) = f_left;
-  FLD (f_uimm6) = f_uimm6;
-  FLD (f_dest) = f_dest;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_sharil", "f_left 0x%x", 'x', f_left, "f_uimm6 0x%x", 'x', f_uimm6, "f_dest 0x%x", 'x', f_dest, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_shori:
-  {
-    const IDESC *idesc = &sh64_media_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_shori.f
-    UINT f_uimm16;
-    UINT f_dest;
-
-    f_uimm16 = EXTRACT_LSB0_UINT (insn, 32, 25, 16);
-    f_dest = EXTRACT_LSB0_UINT (insn, 32, 9, 6);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_dest) = f_dest;
-  FLD (f_uimm16) = f_uimm16;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_shori", "f_dest 0x%x", 'x', f_dest, "f_uimm16 0x%x", 'x', f_uimm16, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_stb:
-  {
-    const IDESC *idesc = &sh64_media_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_addi.f
-    UINT f_left;
-    INT f_disp10;
-    UINT f_dest;
-
-    f_left = EXTRACT_LSB0_UINT (insn, 32, 25, 6);
-    f_disp10 = EXTRACT_LSB0_INT (insn, 32, 19, 10);
-    f_dest = EXTRACT_LSB0_UINT (insn, 32, 9, 6);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_disp10) = f_disp10;
-  FLD (f_dest) = f_dest;
-  FLD (f_left) = f_left;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stb", "f_disp10 0x%x", 'x', f_disp10, "f_dest 0x%x", 'x', f_dest, "f_left 0x%x", 'x', f_left, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_stl:
-  {
-    const IDESC *idesc = &sh64_media_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_flds.f
-    UINT f_left;
-    SI f_disp10x4;
-    UINT f_dest;
-
-    f_left = EXTRACT_LSB0_UINT (insn, 32, 25, 6);
-    f_disp10x4 = ((EXTRACT_LSB0_INT (insn, 32, 19, 10)) << (2));
-    f_dest = EXTRACT_LSB0_UINT (insn, 32, 9, 6);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_disp10x4) = f_disp10x4;
-  FLD (f_dest) = f_dest;
-  FLD (f_left) = f_left;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stl", "f_disp10x4 0x%x", 'x', f_disp10x4, "f_dest 0x%x", 'x', f_dest, "f_left 0x%x", 'x', f_left, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_stq:
-  {
-    const IDESC *idesc = &sh64_media_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_fldd.f
-    UINT f_left;
-    SI f_disp10x8;
-    UINT f_dest;
-
-    f_left = EXTRACT_LSB0_UINT (insn, 32, 25, 6);
-    f_disp10x8 = ((EXTRACT_LSB0_INT (insn, 32, 19, 10)) << (3));
-    f_dest = EXTRACT_LSB0_UINT (insn, 32, 9, 6);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_disp10x8) = f_disp10x8;
-  FLD (f_dest) = f_dest;
-  FLD (f_left) = f_left;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stq", "f_disp10x8 0x%x", 'x', f_disp10x8, "f_dest 0x%x", 'x', f_dest, "f_left 0x%x", 'x', f_left, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_stw:
-  {
-    const IDESC *idesc = &sh64_media_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_lduw.f
-    UINT f_left;
-    SI f_disp10x2;
-    UINT f_dest;
-
-    f_left = EXTRACT_LSB0_UINT (insn, 32, 25, 6);
-    f_disp10x2 = ((EXTRACT_LSB0_INT (insn, 32, 19, 10)) << (1));
-    f_dest = EXTRACT_LSB0_UINT (insn, 32, 9, 6);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_disp10x2) = f_disp10x2;
-  FLD (f_dest) = f_dest;
-  FLD (f_left) = f_left;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stw", "f_disp10x2 0x%x", 'x', f_disp10x2, "f_dest 0x%x", 'x', f_dest, "f_left 0x%x", 'x', f_left, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_sthil:
-  {
-    const IDESC *idesc = &sh64_media_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_sthil.f
-    UINT f_left;
-    INT f_disp6;
-    UINT f_dest;
-
-    f_left = EXTRACT_LSB0_UINT (insn, 32, 25, 6);
-    f_disp6 = EXTRACT_LSB0_INT (insn, 32, 15, 6);
-    f_dest = EXTRACT_LSB0_UINT (insn, 32, 9, 6);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_disp6) = f_disp6;
-  FLD (f_dest) = f_dest;
-  FLD (f_left) = f_left;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_sthil", "f_disp6 0x%x", 'x', f_disp6, "f_dest 0x%x", 'x', f_dest, "f_left 0x%x", 'x', f_left, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_stxb:
-  {
-    const IDESC *idesc = &sh64_media_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_add.f
-    UINT f_left;
-    UINT f_right;
-    UINT f_dest;
-
-    f_left = EXTRACT_LSB0_UINT (insn, 32, 25, 6);
-    f_right = EXTRACT_LSB0_UINT (insn, 32, 15, 6);
-    f_dest = EXTRACT_LSB0_UINT (insn, 32, 9, 6);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_dest) = f_dest;
-  FLD (f_left) = f_left;
-  FLD (f_right) = f_right;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stxb", "f_dest 0x%x", 'x', f_dest, "f_left 0x%x", 'x', f_left, "f_right 0x%x", 'x', f_right, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_swapq:
-  {
-    const IDESC *idesc = &sh64_media_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_add.f
-    UINT f_left;
-    UINT f_right;
-    UINT f_dest;
-
-    f_left = EXTRACT_LSB0_UINT (insn, 32, 25, 6);
-    f_right = EXTRACT_LSB0_UINT (insn, 32, 15, 6);
-    f_dest = EXTRACT_LSB0_UINT (insn, 32, 9, 6);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_dest) = f_dest;
-  FLD (f_left) = f_left;
-  FLD (f_right) = f_right;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_swapq", "f_dest 0x%x", 'x', f_dest, "f_left 0x%x", 'x', f_left, "f_right 0x%x", 'x', f_right, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_trapa:
-  {
-    const IDESC *idesc = &sh64_media_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_xori.f
-    UINT f_left;
-
-    f_left = EXTRACT_LSB0_UINT (insn, 32, 25, 6);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_left) = f_left;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_trapa", "f_left 0x%x", 'x', f_left, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_xori:
-  {
-    const IDESC *idesc = &sh64_media_insn_data[itype];
-    CGEN_INSN_INT insn = entire_insn;
-#define FLD(f) abuf->fields.sfmt_xori.f
-    UINT f_left;
-    INT f_imm6;
-    UINT f_dest;
-
-    f_left = EXTRACT_LSB0_UINT (insn, 32, 25, 6);
-    f_imm6 = EXTRACT_LSB0_INT (insn, 32, 15, 6);
-    f_dest = EXTRACT_LSB0_UINT (insn, 32, 9, 6);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_imm6) = f_imm6;
-  FLD (f_left) = f_left;
-  FLD (f_dest) = f_dest;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_xori", "f_imm6 0x%x", 'x', f_imm6, "f_left 0x%x", 'x', f_left, "f_dest 0x%x", 'x', f_dest, (char *) 0));
-
-#undef FLD
-    return idesc;
-  }
-
-}
diff --git a/sim/sh64/decode-media.h b/sim/sh64/decode-media.h
deleted file mode 100644
index 8a84d4e6fe1..00000000000
--- a/sim/sh64/decode-media.h
+++ /dev/null
@@ -1,122 +0,0 @@
-/* Decode header for sh64_media.
-
-THIS FILE IS MACHINE GENERATED WITH CGEN.
-
-Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
-
-This file is part of the GNU Simulators.
-
-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, 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.
-
-*/
-
-#ifndef SH64_MEDIA_DECODE_H
-#define SH64_MEDIA_DECODE_H
-
-extern const IDESC *sh64_media_decode (SIM_CPU *, IADDR,
-                                  CGEN_INSN_INT, CGEN_INSN_INT,
-                                  ARGBUF *);
-extern void sh64_media_init_idesc_table (SIM_CPU *);
-extern void sh64_media_sem_init_idesc_table (SIM_CPU *);
-extern void sh64_media_semf_init_idesc_table (SIM_CPU *);
-
-/* Enum declaration for instructions in cpu family sh64.  */
-typedef enum sh64_media_insn_type {
-  SH64_MEDIA_INSN_X_INVALID, SH64_MEDIA_INSN_X_AFTER, SH64_MEDIA_INSN_X_BEFORE, SH64_MEDIA_INSN_X_CTI_CHAIN
- , SH64_MEDIA_INSN_X_CHAIN, SH64_MEDIA_INSN_X_BEGIN, SH64_MEDIA_INSN_ADD, SH64_MEDIA_INSN_ADDL
- , SH64_MEDIA_INSN_ADDI, SH64_MEDIA_INSN_ADDIL, SH64_MEDIA_INSN_ADDZL, SH64_MEDIA_INSN_ALLOCO
- , SH64_MEDIA_INSN_AND, SH64_MEDIA_INSN_ANDC, SH64_MEDIA_INSN_ANDI, SH64_MEDIA_INSN_BEQ
- , SH64_MEDIA_INSN_BEQI, SH64_MEDIA_INSN_BGE, SH64_MEDIA_INSN_BGEU, SH64_MEDIA_INSN_BGT
- , SH64_MEDIA_INSN_BGTU, SH64_MEDIA_INSN_BLINK, SH64_MEDIA_INSN_BNE, SH64_MEDIA_INSN_BNEI
- , SH64_MEDIA_INSN_BRK, SH64_MEDIA_INSN_BYTEREV, SH64_MEDIA_INSN_CMPEQ, SH64_MEDIA_INSN_CMPGT
- , SH64_MEDIA_INSN_CMPGTU, SH64_MEDIA_INSN_CMVEQ, SH64_MEDIA_INSN_CMVNE, SH64_MEDIA_INSN_FABSD
- , SH64_MEDIA_INSN_FABSS, SH64_MEDIA_INSN_FADDD, SH64_MEDIA_INSN_FADDS, SH64_MEDIA_INSN_FCMPEQD
- , SH64_MEDIA_INSN_FCMPEQS, SH64_MEDIA_INSN_FCMPGED, SH64_MEDIA_INSN_FCMPGES, SH64_MEDIA_INSN_FCMPGTD
- , SH64_MEDIA_INSN_FCMPGTS, SH64_MEDIA_INSN_FCMPUND, SH64_MEDIA_INSN_FCMPUNS, SH64_MEDIA_INSN_FCNVDS
- , SH64_MEDIA_INSN_FCNVSD, SH64_MEDIA_INSN_FDIVD, SH64_MEDIA_INSN_FDIVS, SH64_MEDIA_INSN_FGETSCR
- , SH64_MEDIA_INSN_FIPRS, SH64_MEDIA_INSN_FLDD, SH64_MEDIA_INSN_FLDP, SH64_MEDIA_INSN_FLDS
- , SH64_MEDIA_INSN_FLDXD, SH64_MEDIA_INSN_FLDXP, SH64_MEDIA_INSN_FLDXS, SH64_MEDIA_INSN_FLOATLD
- , SH64_MEDIA_INSN_FLOATLS, SH64_MEDIA_INSN_FLOATQD, SH64_MEDIA_INSN_FLOATQS, SH64_MEDIA_INSN_FMACS
- , SH64_MEDIA_INSN_FMOVD, SH64_MEDIA_INSN_FMOVDQ, SH64_MEDIA_INSN_FMOVLS, SH64_MEDIA_INSN_FMOVQD
- , SH64_MEDIA_INSN_FMOVS, SH64_MEDIA_INSN_FMOVSL, SH64_MEDIA_INSN_FMULD, SH64_MEDIA_INSN_FMULS
- , SH64_MEDIA_INSN_FNEGD, SH64_MEDIA_INSN_FNEGS, SH64_MEDIA_INSN_FPUTSCR, SH64_MEDIA_INSN_FSQRTD
- , SH64_MEDIA_INSN_FSQRTS, SH64_MEDIA_INSN_FSTD, SH64_MEDIA_INSN_FSTP, SH64_MEDIA_INSN_FSTS
- , SH64_MEDIA_INSN_FSTXD, SH64_MEDIA_INSN_FSTXP, SH64_MEDIA_INSN_FSTXS, SH64_MEDIA_INSN_FSUBD
- , SH64_MEDIA_INSN_FSUBS, SH64_MEDIA_INSN_FTRCDL, SH64_MEDIA_INSN_FTRCSL, SH64_MEDIA_INSN_FTRCDQ
- , SH64_MEDIA_INSN_FTRCSQ, SH64_MEDIA_INSN_FTRVS, SH64_MEDIA_INSN_GETCFG, SH64_MEDIA_INSN_GETCON
- , SH64_MEDIA_INSN_GETTR, SH64_MEDIA_INSN_ICBI, SH64_MEDIA_INSN_LDB, SH64_MEDIA_INSN_LDL
- , SH64_MEDIA_INSN_LDQ, SH64_MEDIA_INSN_LDUB, SH64_MEDIA_INSN_LDUW, SH64_MEDIA_INSN_LDW
- , SH64_MEDIA_INSN_LDHIL, SH64_MEDIA_INSN_LDHIQ, SH64_MEDIA_INSN_LDLOL, SH64_MEDIA_INSN_LDLOQ
- , SH64_MEDIA_INSN_LDXB, SH64_MEDIA_INSN_LDXL, SH64_MEDIA_INSN_LDXQ, SH64_MEDIA_INSN_LDXUB
- , SH64_MEDIA_INSN_LDXUW, SH64_MEDIA_INSN_LDXW, SH64_MEDIA_INSN_MABSL, SH64_MEDIA_INSN_MABSW
- , SH64_MEDIA_INSN_MADDL, SH64_MEDIA_INSN_MADDW, SH64_MEDIA_INSN_MADDSL, SH64_MEDIA_INSN_MADDSUB
- , SH64_MEDIA_INSN_MADDSW, SH64_MEDIA_INSN_MCMPEQB, SH64_MEDIA_INSN_MCMPEQL, SH64_MEDIA_INSN_MCMPEQW
- , SH64_MEDIA_INSN_MCMPGTL, SH64_MEDIA_INSN_MCMPGTUB, SH64_MEDIA_INSN_MCMPGTW, SH64_MEDIA_INSN_MCMV
- , SH64_MEDIA_INSN_MCNVSLW, SH64_MEDIA_INSN_MCNVSWB, SH64_MEDIA_INSN_MCNVSWUB, SH64_MEDIA_INSN_MEXTR1
- , SH64_MEDIA_INSN_MEXTR2, SH64_MEDIA_INSN_MEXTR3, SH64_MEDIA_INSN_MEXTR4, SH64_MEDIA_INSN_MEXTR5
- , SH64_MEDIA_INSN_MEXTR6, SH64_MEDIA_INSN_MEXTR7, SH64_MEDIA_INSN_MMACFXWL, SH64_MEDIA_INSN_MMACNFX_WL
- , SH64_MEDIA_INSN_MMULL, SH64_MEDIA_INSN_MMULW, SH64_MEDIA_INSN_MMULFXL, SH64_MEDIA_INSN_MMULFXW
- , SH64_MEDIA_INSN_MMULFXRPW, SH64_MEDIA_INSN_MMULHIWL, SH64_MEDIA_INSN_MMULLOWL, SH64_MEDIA_INSN_MMULSUMWQ
- , SH64_MEDIA_INSN_MOVI, SH64_MEDIA_INSN_MPERMW, SH64_MEDIA_INSN_MSADUBQ, SH64_MEDIA_INSN_MSHALDSL
- , SH64_MEDIA_INSN_MSHALDSW, SH64_MEDIA_INSN_MSHARDL, SH64_MEDIA_INSN_MSHARDW, SH64_MEDIA_INSN_MSHARDSQ
- , SH64_MEDIA_INSN_MSHFHIB, SH64_MEDIA_INSN_MSHFHIL, SH64_MEDIA_INSN_MSHFHIW, SH64_MEDIA_INSN_MSHFLOB
- , SH64_MEDIA_INSN_MSHFLOL, SH64_MEDIA_INSN_MSHFLOW, SH64_MEDIA_INSN_MSHLLDL, SH64_MEDIA_INSN_MSHLLDW
- , SH64_MEDIA_INSN_MSHLRDL, SH64_MEDIA_INSN_MSHLRDW, SH64_MEDIA_INSN_MSUBL, SH64_MEDIA_INSN_MSUBW
- , SH64_MEDIA_INSN_MSUBSL, SH64_MEDIA_INSN_MSUBSUB, SH64_MEDIA_INSN_MSUBSW, SH64_MEDIA_INSN_MULSL
- , SH64_MEDIA_INSN_MULUL, SH64_MEDIA_INSN_NOP, SH64_MEDIA_INSN_NSB, SH64_MEDIA_INSN_OCBI
- , SH64_MEDIA_INSN_OCBP, SH64_MEDIA_INSN_OCBWB, SH64_MEDIA_INSN_OR, SH64_MEDIA_INSN_ORI
- , SH64_MEDIA_INSN_PREFI, SH64_MEDIA_INSN_PTA, SH64_MEDIA_INSN_PTABS, SH64_MEDIA_INSN_PTB
- , SH64_MEDIA_INSN_PTREL, SH64_MEDIA_INSN_PUTCFG, SH64_MEDIA_INSN_PUTCON, SH64_MEDIA_INSN_RTE
- , SH64_MEDIA_INSN_SHARD, SH64_MEDIA_INSN_SHARDL, SH64_MEDIA_INSN_SHARI, SH64_MEDIA_INSN_SHARIL
- , SH64_MEDIA_INSN_SHLLD, SH64_MEDIA_INSN_SHLLDL, SH64_MEDIA_INSN_SHLLI, SH64_MEDIA_INSN_SHLLIL
- , SH64_MEDIA_INSN_SHLRD, SH64_MEDIA_INSN_SHLRDL, SH64_MEDIA_INSN_SHLRI, SH64_MEDIA_INSN_SHLRIL
- , SH64_MEDIA_INSN_SHORI, SH64_MEDIA_INSN_SLEEP, SH64_MEDIA_INSN_STB, SH64_MEDIA_INSN_STL
- , SH64_MEDIA_INSN_STQ, SH64_MEDIA_INSN_STW, SH64_MEDIA_INSN_STHIL, SH64_MEDIA_INSN_STHIQ
- , SH64_MEDIA_INSN_STLOL, SH64_MEDIA_INSN_STLOQ, SH64_MEDIA_INSN_STXB, SH64_MEDIA_INSN_STXL
- , SH64_MEDIA_INSN_STXQ, SH64_MEDIA_INSN_STXW, SH64_MEDIA_INSN_SUB, SH64_MEDIA_INSN_SUBL
- , SH64_MEDIA_INSN_SWAPQ, SH64_MEDIA_INSN_SYNCI, SH64_MEDIA_INSN_SYNCO, SH64_MEDIA_INSN_TRAPA
- , SH64_MEDIA_INSN_XOR, SH64_MEDIA_INSN_XORI, SH64_MEDIA_INSN_MAX
-} SH64_MEDIA_INSN_TYPE;
-
-/* Enum declaration for semantic formats in cpu family sh64.  */
-typedef enum sh64_media_sfmt_type {
-  SH64_MEDIA_SFMT_EMPTY, SH64_MEDIA_SFMT_ADD, SH64_MEDIA_SFMT_ADDI, SH64_MEDIA_SFMT_ALLOCO
- , SH64_MEDIA_SFMT_BEQ, SH64_MEDIA_SFMT_BEQI, SH64_MEDIA_SFMT_BLINK, SH64_MEDIA_SFMT_BRK
- , SH64_MEDIA_SFMT_BYTEREV, SH64_MEDIA_SFMT_CMVEQ, SH64_MEDIA_SFMT_FABSD, SH64_MEDIA_SFMT_FABSS
- , SH64_MEDIA_SFMT_FADDD, SH64_MEDIA_SFMT_FADDS, SH64_MEDIA_SFMT_FCMPEQD, SH64_MEDIA_SFMT_FCMPEQS
- , SH64_MEDIA_SFMT_FCNVDS, SH64_MEDIA_SFMT_FCNVSD, SH64_MEDIA_SFMT_FIPRS, SH64_MEDIA_SFMT_FLDD
- , SH64_MEDIA_SFMT_FLDP, SH64_MEDIA_SFMT_FLDS, SH64_MEDIA_SFMT_FLDXD, SH64_MEDIA_SFMT_FLDXP
- , SH64_MEDIA_SFMT_FLDXS, SH64_MEDIA_SFMT_FMACS, SH64_MEDIA_SFMT_FMOVDQ, SH64_MEDIA_SFMT_FMOVLS
- , SH64_MEDIA_SFMT_FMOVQD, SH64_MEDIA_SFMT_FMOVSL, SH64_MEDIA_SFMT_FSTD, SH64_MEDIA_SFMT_FSTP
- , SH64_MEDIA_SFMT_FSTS, SH64_MEDIA_SFMT_FSTXD, SH64_MEDIA_SFMT_FSTXP, SH64_MEDIA_SFMT_FSTXS
- , SH64_MEDIA_SFMT_FTRVS, SH64_MEDIA_SFMT_GETCON, SH64_MEDIA_SFMT_GETTR, SH64_MEDIA_SFMT_LDB
- , SH64_MEDIA_SFMT_LDL, SH64_MEDIA_SFMT_LDQ, SH64_MEDIA_SFMT_LDUW, SH64_MEDIA_SFMT_LDXB
- , SH64_MEDIA_SFMT_MCMV, SH64_MEDIA_SFMT_MOVI, SH64_MEDIA_SFMT_MPERMW, SH64_MEDIA_SFMT_ORI
- , SH64_MEDIA_SFMT_PTA, SH64_MEDIA_SFMT_PTABS, SH64_MEDIA_SFMT_PTREL, SH64_MEDIA_SFMT_PUTCON
- , SH64_MEDIA_SFMT_SHARI, SH64_MEDIA_SFMT_SHARIL, SH64_MEDIA_SFMT_SHORI, SH64_MEDIA_SFMT_STB
- , SH64_MEDIA_SFMT_STL, SH64_MEDIA_SFMT_STQ, SH64_MEDIA_SFMT_STW, SH64_MEDIA_SFMT_STHIL
- , SH64_MEDIA_SFMT_STXB, SH64_MEDIA_SFMT_SWAPQ, SH64_MEDIA_SFMT_TRAPA, SH64_MEDIA_SFMT_XORI
-} SH64_MEDIA_SFMT_TYPE;
-
-/* Function unit handlers (user written).  */
-
-extern int sh64_model_sh5_u_exec (SIM_CPU *, const IDESC *, int /*unit_num*/, int /*referenced*/);
-
-/* Profiling before/after handlers (user written) */
-
-extern void sh64_model_insn_before (SIM_CPU *, int /*first_p*/);
-extern void sh64_model_insn_after (SIM_CPU *, int /*last_p*/, int /*cycles*/);
-
-#endif /* SH64_MEDIA_DECODE_H */
diff --git a/sim/sh64/decode.h b/sim/sh64/decode.h
deleted file mode 100644
index 2582807d8d1..00000000000
--- a/sim/sh64/decode.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef DECODE_H
-#define DECODE_H
-
-#undef WITH_PROFILE_MODEL_P
-
-#ifdef WANT_ISA_COMPACT
-#include "decode-compact.h"
-#include "defs-compact.h"
-#endif /* WANT_ISA_COMPACT */
-
-#ifdef WANT_ISA_MEDIA
-#include "decode-media.h"
-#include "defs-media.h"
-#endif /* WANT_ISA_MEDIA */
-
-#endif /* DECODE_H */
diff --git a/sim/sh64/defs-compact.h b/sim/sh64/defs-compact.h
deleted file mode 100644
index fb0b7e41640..00000000000
--- a/sim/sh64/defs-compact.h
+++ /dev/null
@@ -1,424 +0,0 @@
-/* ISA definitions header for compact.
-
-THIS FILE IS MACHINE GENERATED WITH CGEN.
-
-Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
-
-This file is part of the GNU Simulators.
-
-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, 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.
-
-*/
-
-#ifndef DEFS_SH64_COMPACT_H
-#define DEFS_SH64_COMPACT_H
-
-/* Instruction argument buffer.  */
-
-union sem_fields {
-  struct { /* no operands */
-    int empty;
-  } fmt_empty;
-  struct { /*  */
-    SI f_dn;
-  } sfmt_fcnvds_compact;
-  struct { /*  */
-    IADDR i_disp12;
-  } sfmt_bra_compact;
-  struct { /*  */
-    IADDR i_disp8;
-  } sfmt_bf_compact;
-  struct { /*  */
-    SI f_imm4x2;
-    UINT f_rm;
-  } sfmt_movw11_compact;
-  struct { /*  */
-    SI f_imm8x2;
-    UINT f_rn;
-  } sfmt_movw10_compact;
-  struct { /*  */
-    SI f_imm4x2;
-    UINT f_rn;
-  } sfmt_movw5_compact;
-  struct { /*  */
-    SI f_imm8x4;
-    UINT f_rn;
-  } sfmt_movl10_compact;
-  struct { /*  */
-    UINT f_imm4;
-    UINT f_rm;
-  } sfmt_movb5_compact;
-  struct { /*  */
-    SI f_vm;
-    SI f_vn;
-  } sfmt_fipr_compact;
-  struct { /*  */
-    UINT f_imm8;
-    UINT f_rn;
-  } sfmt_addi_compact;
-  struct { /*  */
-    SI f_imm4x4;
-    UINT f_rm;
-    UINT f_rn;
-  } sfmt_movl5_compact;
-#if WITH_SCACHE_PBB
-  /* Writeback handler.  */
-  struct {
-    /* Pointer to argbuf entry for insn whose results need writing back.  */
-    const struct argbuf *abuf;
-  } write;
-  /* x-before handler */
-  struct {
-    /*const SCACHE *insns[MAX_PARALLEL_INSNS];*/
-    int first_p;
-  } before;
-  /* x-after handler */
-  struct {
-    int empty;
-  } after;
-  /* This entry is used to terminate each pbb.  */
-  struct {
-    /* Number of insns in pbb.  */
-    int insn_count;
-    /* Next pbb to execute.  */
-    SCACHE *next;
-    SCACHE *branch_target;
-  } chain;
-#endif
-};
-
-/* The ARGBUF struct.  */
-struct argbuf {
-  /* These are the baseclass definitions.  */
-  IADDR addr;
-  const IDESC *idesc;
-  char trace_p;
-  char profile_p;
-  /* ??? Temporary hack for skip insns.  */
-  char skip_count;
-  char unused;
-  /* cpu specific data follows */
-  union sem semantic;
-  int written;
-  union sem_fields fields;
-};
-
-/* A cached insn.
-
-   ??? SCACHE used to contain more than just argbuf.  We could delete the
-   type entirely and always just use ARGBUF, but for future concerns and as
-   a level of abstraction it is left in.  */
-
-struct scache {
-  struct argbuf argbuf;
-};
-
-/* Macros to simplify extraction, reading and semantic code.
-   These define and assign the local vars that contain the insn's fields.  */
-
-#define EXTRACT_IFMT_EMPTY_VARS \
-  unsigned int length;
-#define EXTRACT_IFMT_EMPTY_CODE \
-  length = 0; \
-
-#define EXTRACT_IFMT_ADD_COMPACT_VARS \
-  UINT f_op4; \
-  UINT f_rn; \
-  UINT f_rm; \
-  UINT f_sub4; \
-  unsigned int length;
-#define EXTRACT_IFMT_ADD_COMPACT_CODE \
-  length = 2; \
-  f_op4 = EXTRACT_LSB0_UINT (insn, 16, 15, 4); \
-  f_rn = EXTRACT_LSB0_UINT (insn, 16, 11, 4); \
-  f_rm = EXTRACT_LSB0_UINT (insn, 16, 7, 4); \
-  f_sub4 = EXTRACT_LSB0_UINT (insn, 16, 3, 4); \
-
-#define EXTRACT_IFMT_ADDI_COMPACT_VARS \
-  UINT f_op4; \
-  UINT f_rn; \
-  UINT f_imm8; \
-  unsigned int length;
-#define EXTRACT_IFMT_ADDI_COMPACT_CODE \
-  length = 2; \
-  f_op4 = EXTRACT_LSB0_UINT (insn, 16, 15, 4); \
-  f_rn = EXTRACT_LSB0_UINT (insn, 16, 11, 4); \
-  f_imm8 = EXTRACT_LSB0_UINT (insn, 16, 7, 8); \
-
-#define EXTRACT_IFMT_AND_COMPACT_VARS \
-  UINT f_op4; \
-  UINT f_rn; \
-  UINT f_rm; \
-  UINT f_sub4; \
-  unsigned int length;
-#define EXTRACT_IFMT_AND_COMPACT_CODE \
-  length = 2; \
-  f_op4 = EXTRACT_LSB0_UINT (insn, 16, 15, 4); \
-  f_rn = EXTRACT_LSB0_UINT (insn, 16, 11, 4); \
-  f_rm = EXTRACT_LSB0_UINT (insn, 16, 7, 4); \
-  f_sub4 = EXTRACT_LSB0_UINT (insn, 16, 3, 4); \
-
-#define EXTRACT_IFMT_ANDI_COMPACT_VARS \
-  UINT f_op8; \
-  UINT f_imm8; \
-  unsigned int length;
-#define EXTRACT_IFMT_ANDI_COMPACT_CODE \
-  length = 2; \
-  f_op8 = EXTRACT_LSB0_UINT (insn, 16, 15, 8); \
-  f_imm8 = EXTRACT_LSB0_UINT (insn, 16, 7, 8); \
-
-#define EXTRACT_IFMT_ANDB_COMPACT_VARS \
-  UINT f_op8; \
-  UINT f_imm8; \
-  unsigned int length;
-#define EXTRACT_IFMT_ANDB_COMPACT_CODE \
-  length = 2; \
-  f_op8 = EXTRACT_LSB0_UINT (insn, 16, 15, 8); \
-  f_imm8 = EXTRACT_LSB0_UINT (insn, 16, 7, 8); \
-
-#define EXTRACT_IFMT_BF_COMPACT_VARS \
-  UINT f_op8; \
-  SI f_disp8; \
-  unsigned int length;
-#define EXTRACT_IFMT_BF_COMPACT_CODE \
-  length = 2; \
-  f_op8 = EXTRACT_LSB0_UINT (insn, 16, 15, 8); \
-  f_disp8 = ((((EXTRACT_LSB0_INT (insn, 16, 7, 8)) << (1))) + (((pc) + (4)))); \
-
-#define EXTRACT_IFMT_BRA_COMPACT_VARS \
-  UINT f_op4; \
-  SI f_disp12; \
-  unsigned int length;
-#define EXTRACT_IFMT_BRA_COMPACT_CODE \
-  length = 2; \
-  f_op4 = EXTRACT_LSB0_UINT (insn, 16, 15, 4); \
-  f_disp12 = ((((EXTRACT_LSB0_INT (insn, 16, 11, 12)) << (1))) + (((pc) + (4)))); \
-
-#define EXTRACT_IFMT_BRAF_COMPACT_VARS \
-  UINT f_op4; \
-  UINT f_rn; \
-  UINT f_sub8; \
-  unsigned int length;
-#define EXTRACT_IFMT_BRAF_COMPACT_CODE \
-  length = 2; \
-  f_op4 = EXTRACT_LSB0_UINT (insn, 16, 15, 4); \
-  f_rn = EXTRACT_LSB0_UINT (insn, 16, 11, 4); \
-  f_sub8 = EXTRACT_LSB0_UINT (insn, 16, 7, 8); \
-
-#define EXTRACT_IFMT_BRK_COMPACT_VARS \
-  UINT f_op16; \
-  unsigned int length;
-#define EXTRACT_IFMT_BRK_COMPACT_CODE \
-  length = 2; \
-  f_op16 = EXTRACT_LSB0_UINT (insn, 16, 15, 16); \
-
-#define EXTRACT_IFMT_FABS_COMPACT_VARS \
-  UINT f_op4; \
-  UINT f_rn; \
-  UINT f_sub8; \
-  unsigned int length;
-#define EXTRACT_IFMT_FABS_COMPACT_CODE \
-  length = 2; \
-  f_op4 = EXTRACT_LSB0_UINT (insn, 16, 15, 4); \
-  f_rn = EXTRACT_LSB0_UINT (insn, 16, 11, 4); \
-  f_sub8 = EXTRACT_LSB0_UINT (insn, 16, 7, 8); \
-
-#define EXTRACT_IFMT_FADD_COMPACT_VARS \
-  UINT f_op4; \
-  UINT f_rn; \
-  UINT f_rm; \
-  UINT f_sub4; \
-  unsigned int length;
-#define EXTRACT_IFMT_FADD_COMPACT_CODE \
-  length = 2; \
-  f_op4 = EXTRACT_LSB0_UINT (insn, 16, 15, 4); \
-  f_rn = EXTRACT_LSB0_UINT (insn, 16, 11, 4); \
-  f_rm = EXTRACT_LSB0_UINT (insn, 16, 7, 4); \
-  f_sub4 = EXTRACT_LSB0_UINT (insn, 16, 3, 4); \
-
-#define EXTRACT_IFMT_FCNVDS_COMPACT_VARS \
-  UINT f_op4; \
-  SI f_dn; \
-  UINT f_8_1; \
-  UINT f_sub8; \
-  unsigned int length;
-#define EXTRACT_IFMT_FCNVDS_COMPACT_CODE \
-  length = 2; \
-  f_op4 = EXTRACT_LSB0_UINT (insn, 16, 15, 4); \
-  f_dn = ((EXTRACT_LSB0_UINT (insn, 16, 11, 3)) << (1)); \
-  f_8_1 = EXTRACT_LSB0_UINT (insn, 16, 8, 1); \
-  f_sub8 = EXTRACT_LSB0_UINT (insn, 16, 7, 8); \
-
-#define EXTRACT_IFMT_FIPR_COMPACT_VARS \
-  UINT f_op4; \
-  SI f_vn; \
-  SI f_vm; \
-  UINT f_sub8; \
-  unsigned int length;
-#define EXTRACT_IFMT_FIPR_COMPACT_CODE \
-  length = 2; \
-  f_op4 = EXTRACT_LSB0_UINT (insn, 16, 15, 4); \
-  f_vn = ((EXTRACT_LSB0_UINT (insn, 16, 11, 2)) << (2)); \
-  f_vm = ((EXTRACT_LSB0_UINT (insn, 16, 9, 2)) << (2)); \
-  f_sub8 = EXTRACT_LSB0_UINT (insn, 16, 7, 8); \
-
-#define EXTRACT_IFMT_FLDS_COMPACT_VARS \
-  UINT f_op4; \
-  UINT f_rn; \
-  UINT f_sub8; \
-  unsigned int length;
-#define EXTRACT_IFMT_FLDS_COMPACT_CODE \
-  length = 2; \
-  f_op4 = EXTRACT_LSB0_UINT (insn, 16, 15, 4); \
-  f_rn = EXTRACT_LSB0_UINT (insn, 16, 11, 4); \
-  f_sub8 = EXTRACT_LSB0_UINT (insn, 16, 7, 8); \
-
-#define EXTRACT_IFMT_FMAC_COMPACT_VARS \
-  UINT f_op4; \
-  UINT f_rn; \
-  UINT f_rm; \
-  UINT f_sub4; \
-  unsigned int length;
-#define EXTRACT_IFMT_FMAC_COMPACT_CODE \
-  length = 2; \
-  f_op4 = EXTRACT_LSB0_UINT (insn, 16, 15, 4); \
-  f_rn = EXTRACT_LSB0_UINT (insn, 16, 11, 4); \
-  f_rm = EXTRACT_LSB0_UINT (insn, 16, 7, 4); \
-  f_sub4 = EXTRACT_LSB0_UINT (insn, 16, 3, 4); \
-
-#define EXTRACT_IFMT_FMOV2_COMPACT_VARS \
-  UINT f_op4; \
-  UINT f_rn; \
-  UINT f_rm; \
-  UINT f_sub4; \
-  unsigned int length;
-#define EXTRACT_IFMT_FMOV2_COMPACT_CODE \
-  length = 2; \
-  f_op4 = EXTRACT_LSB0_UINT (insn, 16, 15, 4); \
-  f_rn = EXTRACT_LSB0_UINT (insn, 16, 11, 4); \
-  f_rm = EXTRACT_LSB0_UINT (insn, 16, 7, 4); \
-  f_sub4 = EXTRACT_LSB0_UINT (insn, 16, 3, 4); \
-
-#define EXTRACT_IFMT_FMOV5_COMPACT_VARS \
-  UINT f_op4; \
-  UINT f_rn; \
-  UINT f_rm; \
-  UINT f_sub4; \
-  unsigned int length;
-#define EXTRACT_IFMT_FMOV5_COMPACT_CODE \
-  length = 2; \
-  f_op4 = EXTRACT_LSB0_UINT (insn, 16, 15, 4); \
-  f_rn = EXTRACT_LSB0_UINT (insn, 16, 11, 4); \
-  f_rm = EXTRACT_LSB0_UINT (insn, 16, 7, 4); \
-  f_sub4 = EXTRACT_LSB0_UINT (insn, 16, 3, 4); \
-
-#define EXTRACT_IFMT_FTRV_COMPACT_VARS \
-  UINT f_op4; \
-  SI f_vn; \
-  UINT f_sub10; \
-  unsigned int length;
-#define EXTRACT_IFMT_FTRV_COMPACT_CODE \
-  length = 2; \
-  f_op4 = EXTRACT_LSB0_UINT (insn, 16, 15, 4); \
-  f_vn = ((EXTRACT_LSB0_UINT (insn, 16, 11, 2)) << (2)); \
-  f_sub10 = EXTRACT_LSB0_UINT (insn, 16, 9, 10); \
-
-#define EXTRACT_IFMT_MOVB5_COMPACT_VARS \
-  UINT f_op8; \
-  UINT f_rm; \
-  UINT f_imm4; \
-  unsigned int length;
-#define EXTRACT_IFMT_MOVB5_COMPACT_CODE \
-  length = 2; \
-  f_op8 = EXTRACT_LSB0_UINT (insn, 16, 15, 8); \
-  f_rm = EXTRACT_LSB0_UINT (insn, 16, 7, 4); \
-  f_imm4 = EXTRACT_LSB0_UINT (insn, 16, 3, 4); \
-
-#define EXTRACT_IFMT_MOVL4_COMPACT_VARS \
-  UINT f_op8; \
-  SI f_imm8x4; \
-  unsigned int length;
-#define EXTRACT_IFMT_MOVL4_COMPACT_CODE \
-  length = 2; \
-  f_op8 = EXTRACT_LSB0_UINT (insn, 16, 15, 8); \
-  f_imm8x4 = ((EXTRACT_LSB0_UINT (insn, 16, 7, 8)) << (2)); \
-
-#define EXTRACT_IFMT_MOVL5_COMPACT_VARS \
-  UINT f_op4; \
-  UINT f_rn; \
-  UINT f_rm; \
-  SI f_imm4x4; \
-  unsigned int length;
-#define EXTRACT_IFMT_MOVL5_COMPACT_CODE \
-  length = 2; \
-  f_op4 = EXTRACT_LSB0_UINT (insn, 16, 15, 4); \
-  f_rn = EXTRACT_LSB0_UINT (insn, 16, 11, 4); \
-  f_rm = EXTRACT_LSB0_UINT (insn, 16, 7, 4); \
-  f_imm4x4 = ((EXTRACT_LSB0_UINT (insn, 16, 3, 4)) << (2)); \
-
-#define EXTRACT_IFMT_MOVL10_COMPACT_VARS \
-  UINT f_op4; \
-  UINT f_rn; \
-  SI f_imm8x4; \
-  unsigned int length;
-#define EXTRACT_IFMT_MOVL10_COMPACT_CODE \
-  length = 2; \
-  f_op4 = EXTRACT_LSB0_UINT (insn, 16, 15, 4); \
-  f_rn = EXTRACT_LSB0_UINT (insn, 16, 11, 4); \
-  f_imm8x4 = ((EXTRACT_LSB0_UINT (insn, 16, 7, 8)) << (2)); \
-
-#define EXTRACT_IFMT_MOVW4_COMPACT_VARS \
-  UINT f_op8; \
-  SI f_imm8x2; \
-  unsigned int length;
-#define EXTRACT_IFMT_MOVW4_COMPACT_CODE \
-  length = 2; \
-  f_op8 = EXTRACT_LSB0_UINT (insn, 16, 15, 8); \
-  f_imm8x2 = ((EXTRACT_LSB0_UINT (insn, 16, 7, 8)) << (1)); \
-
-#define EXTRACT_IFMT_MOVW5_COMPACT_VARS \
-  UINT f_op8; \
-  UINT f_rn; \
-  SI f_imm4x2; \
-  unsigned int length;
-#define EXTRACT_IFMT_MOVW5_COMPACT_CODE \
-  length = 2; \
-  f_op8 = EXTRACT_LSB0_UINT (insn, 16, 15, 8); \
-  f_rn = EXTRACT_LSB0_UINT (insn, 16, 11, 4); \
-  f_imm4x2 = ((EXTRACT_LSB0_UINT (insn, 16, 3, 4)) << (1)); \
-
-#define EXTRACT_IFMT_MOVW10_COMPACT_VARS \
-  UINT f_op4; \
-  UINT f_rn; \
-  SI f_imm8x2; \
-  unsigned int length;
-#define EXTRACT_IFMT_MOVW10_COMPACT_CODE \
-  length = 2; \
-  f_op4 = EXTRACT_LSB0_UINT (insn, 16, 15, 4); \
-  f_rn = EXTRACT_LSB0_UINT (insn, 16, 11, 4); \
-  f_imm8x2 = ((EXTRACT_LSB0_UINT (insn, 16, 7, 8)) << (1)); \
-
-#define EXTRACT_IFMT_MOVW11_COMPACT_VARS \
-  UINT f_op8; \
-  UINT f_rm; \
-  SI f_imm4x2; \
-  unsigned int length;
-#define EXTRACT_IFMT_MOVW11_COMPACT_CODE \
-  length = 2; \
-  f_op8 = EXTRACT_LSB0_UINT (insn, 16, 15, 8); \
-  f_rm = EXTRACT_LSB0_UINT (insn, 16, 7, 4); \
-  f_imm4x2 = ((EXTRACT_LSB0_UINT (insn, 16, 3, 4)) << (1)); \
-
-#endif /* DEFS_SH64_COMPACT_H */
diff --git a/sim/sh64/defs-media.h b/sim/sh64/defs-media.h
deleted file mode 100644
index c225627543a..00000000000
--- a/sim/sh64/defs-media.h
+++ /dev/null
@@ -1,921 +0,0 @@
-/* ISA definitions header for media.
-
-THIS FILE IS MACHINE GENERATED WITH CGEN.
-
-Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
-
-This file is part of the GNU Simulators.
-
-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, 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.
-
-*/
-
-#ifndef DEFS_SH64_MEDIA_H
-#define DEFS_SH64_MEDIA_H
-
-/* Instruction argument buffer.  */
-
-union sem_fields {
-  struct { /* no operands */
-    int empty;
-  } fmt_empty;
-  struct { /*  */
-    UINT f_dest;
-    UINT f_uimm16;
-  } sfmt_shori;
-  struct { /*  */
-    DI f_disp16;
-    UINT f_tra;
-  } sfmt_pta;
-  struct { /*  */
-    INT f_imm16;
-    UINT f_dest;
-  } sfmt_movi;
-  struct { /*  */
-    UINT f_dest;
-    UINT f_left_right;
-  } sfmt_fabsd;
-  struct { /*  */
-    UINT f_dest;
-    UINT f_trb;
-  } sfmt_blink;
-  struct { /*  */
-    INT f_imm6;
-    UINT f_dest;
-    UINT f_left;
-  } sfmt_xori;
-  struct { /*  */
-    INT f_disp6;
-    UINT f_dest;
-    UINT f_left;
-  } sfmt_sthil;
-  struct { /*  */
-    UINT f_dest;
-    UINT f_left;
-    UINT f_uimm6;
-  } sfmt_shari;
-  struct { /*  */
-    INT f_imm10;
-    UINT f_dest;
-    UINT f_left;
-  } sfmt_ori;
-  struct { /*  */
-    SI f_disp10x2;
-    UINT f_dest;
-    UINT f_left;
-  } sfmt_lduw;
-  struct { /*  */
-    SI f_disp10x4;
-    UINT f_dest;
-    UINT f_left;
-  } sfmt_flds;
-  struct { /*  */
-    SI f_disp10x8;
-    UINT f_dest;
-    UINT f_left;
-  } sfmt_fldd;
-  struct { /*  */
-    INT f_imm6;
-    UINT f_left;
-    UINT f_tra;
-  } sfmt_beqi;
-  struct { /*  */
-    UINT f_left;
-    UINT f_right;
-    UINT f_tra;
-  } sfmt_beq;
-  struct { /*  */
-    INT f_disp10;
-    UINT f_dest;
-    UINT f_left;
-  } sfmt_addi;
-  struct { /*  */
-    UINT f_dest;
-    UINT f_left;
-    UINT f_right;
-  } sfmt_add;
-#if WITH_SCACHE_PBB
-  /* Writeback handler.  */
-  struct {
-    /* Pointer to argbuf entry for insn whose results need writing back.  */
-    const struct argbuf *abuf;
-  } write;
-  /* x-before handler */
-  struct {
-    /*const SCACHE *insns[MAX_PARALLEL_INSNS];*/
-    int first_p;
-  } before;
-  /* x-after handler */
-  struct {
-    int empty;
-  } after;
-  /* This entry is used to terminate each pbb.  */
-  struct {
-    /* Number of insns in pbb.  */
-    int insn_count;
-    /* Next pbb to execute.  */
-    SCACHE *next;
-    SCACHE *branch_target;
-  } chain;
-#endif
-};
-
-/* The ARGBUF struct.  */
-struct argbuf {
-  /* These are the baseclass definitions.  */
-  IADDR addr;
-  const IDESC *idesc;
-  char trace_p;
-  char profile_p;
-  /* ??? Temporary hack for skip insns.  */
-  char skip_count;
-  char unused;
-  /* cpu specific data follows */
-  union sem semantic;
-  int written;
-  union sem_fields fields;
-};
-
-/* A cached insn.
-
-   ??? SCACHE used to contain more than just argbuf.  We could delete the
-   type entirely and always just use ARGBUF, but for future concerns and as
-   a level of abstraction it is left in.  */
-
-struct scache {
-  struct argbuf argbuf;
-};
-
-/* Macros to simplify extraction, reading and semantic code.
-   These define and assign the local vars that contain the insn's fields.  */
-
-#define EXTRACT_IFMT_EMPTY_VARS \
-  unsigned int length;
-#define EXTRACT_IFMT_EMPTY_CODE \
-  length = 0; \
-
-#define EXTRACT_IFMT_ADD_VARS \
-  UINT f_op; \
-  UINT f_left; \
-  UINT f_ext; \
-  UINT f_right; \
-  UINT f_dest; \
-  UINT f_rsvd; \
-  unsigned int length;
-#define EXTRACT_IFMT_ADD_CODE \
-  length = 4; \
-  f_op = EXTRACT_LSB0_UINT (insn, 32, 31, 6); \
-  f_left = EXTRACT_LSB0_UINT (insn, 32, 25, 6); \
-  f_ext = EXTRACT_LSB0_UINT (insn, 32, 19, 4); \
-  f_right = EXTRACT_LSB0_UINT (insn, 32, 15, 6); \
-  f_dest = EXTRACT_LSB0_UINT (insn, 32, 9, 6); \
-  f_rsvd = EXTRACT_LSB0_UINT (insn, 32, 3, 4); \
-
-#define EXTRACT_IFMT_ADDI_VARS \
-  UINT f_op; \
-  UINT f_left; \
-  INT f_disp10; \
-  UINT f_dest; \
-  UINT f_rsvd; \
-  unsigned int length;
-#define EXTRACT_IFMT_ADDI_CODE \
-  length = 4; \
-  f_op = EXTRACT_LSB0_UINT (insn, 32, 31, 6); \
-  f_left = EXTRACT_LSB0_UINT (insn, 32, 25, 6); \
-  f_disp10 = EXTRACT_LSB0_INT (insn, 32, 19, 10); \
-  f_dest = EXTRACT_LSB0_UINT (insn, 32, 9, 6); \
-  f_rsvd = EXTRACT_LSB0_UINT (insn, 32, 3, 4); \
-
-#define EXTRACT_IFMT_ALLOCO_VARS \
-  UINT f_op; \
-  UINT f_left; \
-  UINT f_ext; \
-  SI f_disp6x32; \
-  UINT f_dest; \
-  UINT f_rsvd; \
-  unsigned int length;
-#define EXTRACT_IFMT_ALLOCO_CODE \
-  length = 4; \
-  f_op = EXTRACT_LSB0_UINT (insn, 32, 31, 6); \
-  f_left = EXTRACT_LSB0_UINT (insn, 32, 25, 6); \
-  f_ext = EXTRACT_LSB0_UINT (insn, 32, 19, 4); \
-  f_disp6x32 = ((EXTRACT_LSB0_INT (insn, 32, 15, 6)) << (5)); \
-  f_dest = EXTRACT_LSB0_UINT (insn, 32, 9, 6); \
-  f_rsvd = EXTRACT_LSB0_UINT (insn, 32, 3, 4); \
-
-#define EXTRACT_IFMT_BEQ_VARS \
-  UINT f_op; \
-  UINT f_left; \
-  UINT f_ext; \
-  UINT f_right; \
-  UINT f_likely; \
-  UINT f_8_2; \
-  UINT f_tra; \
-  UINT f_rsvd; \
-  unsigned int length;
-#define EXTRACT_IFMT_BEQ_CODE \
-  length = 4; \
-  f_op = EXTRACT_LSB0_UINT (insn, 32, 31, 6); \
-  f_left = EXTRACT_LSB0_UINT (insn, 32, 25, 6); \
-  f_ext = EXTRACT_LSB0_UINT (insn, 32, 19, 4); \
-  f_right = EXTRACT_LSB0_UINT (insn, 32, 15, 6); \
-  f_likely = EXTRACT_LSB0_UINT (insn, 32, 9, 1); \
-  f_8_2 = EXTRACT_LSB0_UINT (insn, 32, 8, 2); \
-  f_tra = EXTRACT_LSB0_UINT (insn, 32, 6, 3); \
-  f_rsvd = EXTRACT_LSB0_UINT (insn, 32, 3, 4); \
-
-#define EXTRACT_IFMT_BEQI_VARS \
-  UINT f_op; \
-  UINT f_left; \
-  UINT f_ext; \
-  INT f_imm6; \
-  UINT f_likely; \
-  UINT f_8_2; \
-  UINT f_tra; \
-  UINT f_rsvd; \
-  unsigned int length;
-#define EXTRACT_IFMT_BEQI_CODE \
-  length = 4; \
-  f_op = EXTRACT_LSB0_UINT (insn, 32, 31, 6); \
-  f_left = EXTRACT_LSB0_UINT (insn, 32, 25, 6); \
-  f_ext = EXTRACT_LSB0_UINT (insn, 32, 19, 4); \
-  f_imm6 = EXTRACT_LSB0_INT (insn, 32, 15, 6); \
-  f_likely = EXTRACT_LSB0_UINT (insn, 32, 9, 1); \
-  f_8_2 = EXTRACT_LSB0_UINT (insn, 32, 8, 2); \
-  f_tra = EXTRACT_LSB0_UINT (insn, 32, 6, 3); \
-  f_rsvd = EXTRACT_LSB0_UINT (insn, 32, 3, 4); \
-
-#define EXTRACT_IFMT_BLINK_VARS \
-  UINT f_op; \
-  UINT f_25; \
-  UINT f_trb; \
-  UINT f_ext; \
-  UINT f_right; \
-  UINT f_dest; \
-  UINT f_rsvd; \
-  unsigned int length;
-#define EXTRACT_IFMT_BLINK_CODE \
-  length = 4; \
-  f_op = EXTRACT_LSB0_UINT (insn, 32, 31, 6); \
-  f_25 = EXTRACT_LSB0_UINT (insn, 32, 25, 3); \
-  f_trb = EXTRACT_LSB0_UINT (insn, 32, 22, 3); \
-  f_ext = EXTRACT_LSB0_UINT (insn, 32, 19, 4); \
-  f_right = EXTRACT_LSB0_UINT (insn, 32, 15, 6); \
-  f_dest = EXTRACT_LSB0_UINT (insn, 32, 9, 6); \
-  f_rsvd = EXTRACT_LSB0_UINT (insn, 32, 3, 4); \
-
-#define EXTRACT_IFMT_BRK_VARS \
-  UINT f_op; \
-  UINT f_left; \
-  UINT f_ext; \
-  UINT f_right; \
-  UINT f_dest; \
-  UINT f_rsvd; \
-  unsigned int length;
-#define EXTRACT_IFMT_BRK_CODE \
-  length = 4; \
-  f_op = EXTRACT_LSB0_UINT (insn, 32, 31, 6); \
-  f_left = EXTRACT_LSB0_UINT (insn, 32, 25, 6); \
-  f_ext = EXTRACT_LSB0_UINT (insn, 32, 19, 4); \
-  f_right = EXTRACT_LSB0_UINT (insn, 32, 15, 6); \
-  f_dest = EXTRACT_LSB0_UINT (insn, 32, 9, 6); \
-  f_rsvd = EXTRACT_LSB0_UINT (insn, 32, 3, 4); \
-
-#define EXTRACT_IFMT_BYTEREV_VARS \
-  UINT f_op; \
-  UINT f_left; \
-  UINT f_ext; \
-  UINT f_right; \
-  UINT f_dest; \
-  UINT f_rsvd; \
-  unsigned int length;
-#define EXTRACT_IFMT_BYTEREV_CODE \
-  length = 4; \
-  f_op = EXTRACT_LSB0_UINT (insn, 32, 31, 6); \
-  f_left = EXTRACT_LSB0_UINT (insn, 32, 25, 6); \
-  f_ext = EXTRACT_LSB0_UINT (insn, 32, 19, 4); \
-  f_right = EXTRACT_LSB0_UINT (insn, 32, 15, 6); \
-  f_dest = EXTRACT_LSB0_UINT (insn, 32, 9, 6); \
-  f_rsvd = EXTRACT_LSB0_UINT (insn, 32, 3, 4); \
-
-#define EXTRACT_IFMT_FABSD_VARS \
-  UINT f_op; \
-  UINT f_ext; \
-  UINT f_left; \
-  UINT f_right; \
-  UINT f_left_right; \
-  UINT f_dest; \
-  UINT f_rsvd; \
-  unsigned int length;
-#define EXTRACT_IFMT_FABSD_CODE \
-  length = 4; \
-  f_op = EXTRACT_LSB0_UINT (insn, 32, 31, 6); \
-  f_ext = EXTRACT_LSB0_UINT (insn, 32, 19, 4); \
-  f_left = EXTRACT_LSB0_UINT (insn, 32, 25, 6); \
-  f_right = EXTRACT_LSB0_UINT (insn, 32, 15, 6); \
-  f_left_right = f_left;\
-  f_dest = EXTRACT_LSB0_UINT (insn, 32, 9, 6); \
-  f_rsvd = EXTRACT_LSB0_UINT (insn, 32, 3, 4); \
-
-#define EXTRACT_IFMT_FABSS_VARS \
-  UINT f_op; \
-  UINT f_ext; \
-  UINT f_left; \
-  UINT f_right; \
-  UINT f_left_right; \
-  UINT f_dest; \
-  UINT f_rsvd; \
-  unsigned int length;
-#define EXTRACT_IFMT_FABSS_CODE \
-  length = 4; \
-  f_op = EXTRACT_LSB0_UINT (insn, 32, 31, 6); \
-  f_ext = EXTRACT_LSB0_UINT (insn, 32, 19, 4); \
-  f_left = EXTRACT_LSB0_UINT (insn, 32, 25, 6); \
-  f_right = EXTRACT_LSB0_UINT (insn, 32, 15, 6); \
-  f_left_right = f_left;\
-  f_dest = EXTRACT_LSB0_UINT (insn, 32, 9, 6); \
-  f_rsvd = EXTRACT_LSB0_UINT (insn, 32, 3, 4); \
-
-#define EXTRACT_IFMT_FADDD_VARS \
-  UINT f_op; \
-  UINT f_left; \
-  UINT f_ext; \
-  UINT f_right; \
-  UINT f_dest; \
-  UINT f_rsvd; \
-  unsigned int length;
-#define EXTRACT_IFMT_FADDD_CODE \
-  length = 4; \
-  f_op = EXTRACT_LSB0_UINT (insn, 32, 31, 6); \
-  f_left = EXTRACT_LSB0_UINT (insn, 32, 25, 6); \
-  f_ext = EXTRACT_LSB0_UINT (insn, 32, 19, 4); \
-  f_right = EXTRACT_LSB0_UINT (insn, 32, 15, 6); \
-  f_dest = EXTRACT_LSB0_UINT (insn, 32, 9, 6); \
-  f_rsvd = EXTRACT_LSB0_UINT (insn, 32, 3, 4); \
-
-#define EXTRACT_IFMT_FADDS_VARS \
-  UINT f_op; \
-  UINT f_left; \
-  UINT f_ext; \
-  UINT f_right; \
-  UINT f_dest; \
-  UINT f_rsvd; \
-  unsigned int length;
-#define EXTRACT_IFMT_FADDS_CODE \
-  length = 4; \
-  f_op = EXTRACT_LSB0_UINT (insn, 32, 31, 6); \
-  f_left = EXTRACT_LSB0_UINT (insn, 32, 25, 6); \
-  f_ext = EXTRACT_LSB0_UINT (insn, 32, 19, 4); \
-  f_right = EXTRACT_LSB0_UINT (insn, 32, 15, 6); \
-  f_dest = EXTRACT_LSB0_UINT (insn, 32, 9, 6); \
-  f_rsvd = EXTRACT_LSB0_UINT (insn, 32, 3, 4); \
-
-#define EXTRACT_IFMT_FCMPEQD_VARS \
-  UINT f_op; \
-  UINT f_left; \
-  UINT f_ext; \
-  UINT f_right; \
-  UINT f_dest; \
-  UINT f_rsvd; \
-  unsigned int length;
-#define EXTRACT_IFMT_FCMPEQD_CODE \
-  length = 4; \
-  f_op = EXTRACT_LSB0_UINT (insn, 32, 31, 6); \
-  f_left = EXTRACT_LSB0_UINT (insn, 32, 25, 6); \
-  f_ext = EXTRACT_LSB0_UINT (insn, 32, 19, 4); \
-  f_right = EXTRACT_LSB0_UINT (insn, 32, 15, 6); \
-  f_dest = EXTRACT_LSB0_UINT (insn, 32, 9, 6); \
-  f_rsvd = EXTRACT_LSB0_UINT (insn, 32, 3, 4); \
-
-#define EXTRACT_IFMT_FCMPEQS_VARS \
-  UINT f_op; \
-  UINT f_left; \
-  UINT f_ext; \
-  UINT f_right; \
-  UINT f_dest; \
-  UINT f_rsvd; \
-  unsigned int length;
-#define EXTRACT_IFMT_FCMPEQS_CODE \
-  length = 4; \
-  f_op = EXTRACT_LSB0_UINT (insn, 32, 31, 6); \
-  f_left = EXTRACT_LSB0_UINT (insn, 32, 25, 6); \
-  f_ext = EXTRACT_LSB0_UINT (insn, 32, 19, 4); \
-  f_right = EXTRACT_LSB0_UINT (insn, 32, 15, 6); \
-  f_dest = EXTRACT_LSB0_UINT (insn, 32, 9, 6); \
-  f_rsvd = EXTRACT_LSB0_UINT (insn, 32, 3, 4); \
-
-#define EXTRACT_IFMT_FCNVDS_VARS \
-  UINT f_op; \
-  UINT f_ext; \
-  UINT f_left; \
-  UINT f_right; \
-  UINT f_left_right; \
-  UINT f_dest; \
-  UINT f_rsvd; \
-  unsigned int length;
-#define EXTRACT_IFMT_FCNVDS_CODE \
-  length = 4; \
-  f_op = EXTRACT_LSB0_UINT (insn, 32, 31, 6); \
-  f_ext = EXTRACT_LSB0_UINT (insn, 32, 19, 4); \
-  f_left = EXTRACT_LSB0_UINT (insn, 32, 25, 6); \
-  f_right = EXTRACT_LSB0_UINT (insn, 32, 15, 6); \
-  f_left_right = f_left;\
-  f_dest = EXTRACT_LSB0_UINT (insn, 32, 9, 6); \
-  f_rsvd = EXTRACT_LSB0_UINT (insn, 32, 3, 4); \
-
-#define EXTRACT_IFMT_FCNVSD_VARS \
-  UINT f_op; \
-  UINT f_ext; \
-  UINT f_left; \
-  UINT f_right; \
-  UINT f_left_right; \
-  UINT f_dest; \
-  UINT f_rsvd; \
-  unsigned int length;
-#define EXTRACT_IFMT_FCNVSD_CODE \
-  length = 4; \
-  f_op = EXTRACT_LSB0_UINT (insn, 32, 31, 6); \
-  f_ext = EXTRACT_LSB0_UINT (insn, 32, 19, 4); \
-  f_left = EXTRACT_LSB0_UINT (insn, 32, 25, 6); \
-  f_right = EXTRACT_LSB0_UINT (insn, 32, 15, 6); \
-  f_left_right = f_left;\
-  f_dest = EXTRACT_LSB0_UINT (insn, 32, 9, 6); \
-  f_rsvd = EXTRACT_LSB0_UINT (insn, 32, 3, 4); \
-
-#define EXTRACT_IFMT_FGETSCR_VARS \
-  UINT f_op; \
-  UINT f_left; \
-  UINT f_ext; \
-  UINT f_right; \
-  UINT f_dest; \
-  UINT f_rsvd; \
-  unsigned int length;
-#define EXTRACT_IFMT_FGETSCR_CODE \
-  length = 4; \
-  f_op = EXTRACT_LSB0_UINT (insn, 32, 31, 6); \
-  f_left = EXTRACT_LSB0_UINT (insn, 32, 25, 6); \
-  f_ext = EXTRACT_LSB0_UINT (insn, 32, 19, 4); \
-  f_right = EXTRACT_LSB0_UINT (insn, 32, 15, 6); \
-  f_dest = EXTRACT_LSB0_UINT (insn, 32, 9, 6); \
-  f_rsvd = EXTRACT_LSB0_UINT (insn, 32, 3, 4); \
-
-#define EXTRACT_IFMT_FIPRS_VARS \
-  UINT f_op; \
-  UINT f_left; \
-  UINT f_ext; \
-  UINT f_right; \
-  UINT f_dest; \
-  UINT f_rsvd; \
-  unsigned int length;
-#define EXTRACT_IFMT_FIPRS_CODE \
-  length = 4; \
-  f_op = EXTRACT_LSB0_UINT (insn, 32, 31, 6); \
-  f_left = EXTRACT_LSB0_UINT (insn, 32, 25, 6); \
-  f_ext = EXTRACT_LSB0_UINT (insn, 32, 19, 4); \
-  f_right = EXTRACT_LSB0_UINT (insn, 32, 15, 6); \
-  f_dest = EXTRACT_LSB0_UINT (insn, 32, 9, 6); \
-  f_rsvd = EXTRACT_LSB0_UINT (insn, 32, 3, 4); \
-
-#define EXTRACT_IFMT_FLDD_VARS \
-  UINT f_op; \
-  UINT f_left; \
-  SI f_disp10x8; \
-  UINT f_dest; \
-  UINT f_rsvd; \
-  unsigned int length;
-#define EXTRACT_IFMT_FLDD_CODE \
-  length = 4; \
-  f_op = EXTRACT_LSB0_UINT (insn, 32, 31, 6); \
-  f_left = EXTRACT_LSB0_UINT (insn, 32, 25, 6); \
-  f_disp10x8 = ((EXTRACT_LSB0_INT (insn, 32, 19, 10)) << (3)); \
-  f_dest = EXTRACT_LSB0_UINT (insn, 32, 9, 6); \
-  f_rsvd = EXTRACT_LSB0_UINT (insn, 32, 3, 4); \
-
-#define EXTRACT_IFMT_FLDP_VARS \
-  UINT f_op; \
-  UINT f_left; \
-  SI f_disp10x8; \
-  UINT f_dest; \
-  UINT f_rsvd; \
-  unsigned int length;
-#define EXTRACT_IFMT_FLDP_CODE \
-  length = 4; \
-  f_op = EXTRACT_LSB0_UINT (insn, 32, 31, 6); \
-  f_left = EXTRACT_LSB0_UINT (insn, 32, 25, 6); \
-  f_disp10x8 = ((EXTRACT_LSB0_INT (insn, 32, 19, 10)) << (3)); \
-  f_dest = EXTRACT_LSB0_UINT (insn, 32, 9, 6); \
-  f_rsvd = EXTRACT_LSB0_UINT (insn, 32, 3, 4); \
-
-#define EXTRACT_IFMT_FLDS_VARS \
-  UINT f_op; \
-  UINT f_left; \
-  SI f_disp10x4; \
-  UINT f_dest; \
-  UINT f_rsvd; \
-  unsigned int length;
-#define EXTRACT_IFMT_FLDS_CODE \
-  length = 4; \
-  f_op = EXTRACT_LSB0_UINT (insn, 32, 31, 6); \
-  f_left = EXTRACT_LSB0_UINT (insn, 32, 25, 6); \
-  f_disp10x4 = ((EXTRACT_LSB0_INT (insn, 32, 19, 10)) << (2)); \
-  f_dest = EXTRACT_LSB0_UINT (insn, 32, 9, 6); \
-  f_rsvd = EXTRACT_LSB0_UINT (insn, 32, 3, 4); \
-
-#define EXTRACT_IFMT_FLDXD_VARS \
-  UINT f_op; \
-  UINT f_left; \
-  UINT f_ext; \
-  UINT f_right; \
-  UINT f_dest; \
-  UINT f_rsvd; \
-  unsigned int length;
-#define EXTRACT_IFMT_FLDXD_CODE \
-  length = 4; \
-  f_op = EXTRACT_LSB0_UINT (insn, 32, 31, 6); \
-  f_left = EXTRACT_LSB0_UINT (insn, 32, 25, 6); \
-  f_ext = EXTRACT_LSB0_UINT (insn, 32, 19, 4); \
-  f_right = EXTRACT_LSB0_UINT (insn, 32, 15, 6); \
-  f_dest = EXTRACT_LSB0_UINT (insn, 32, 9, 6); \
-  f_rsvd = EXTRACT_LSB0_UINT (insn, 32, 3, 4); \
-
-#define EXTRACT_IFMT_FLDXP_VARS \
-  UINT f_op; \
-  UINT f_left; \
-  UINT f_ext; \
-  UINT f_right; \
-  UINT f_dest; \
-  UINT f_rsvd; \
-  unsigned int length;
-#define EXTRACT_IFMT_FLDXP_CODE \
-  length = 4; \
-  f_op = EXTRACT_LSB0_UINT (insn, 32, 31, 6); \
-  f_left = EXTRACT_LSB0_UINT (insn, 32, 25, 6); \
-  f_ext = EXTRACT_LSB0_UINT (insn, 32, 19, 4); \
-  f_right = EXTRACT_LSB0_UINT (insn, 32, 15, 6); \
-  f_dest = EXTRACT_LSB0_UINT (insn, 32, 9, 6); \
-  f_rsvd = EXTRACT_LSB0_UINT (insn, 32, 3, 4); \
-
-#define EXTRACT_IFMT_FMOVDQ_VARS \
-  UINT f_op; \
-  UINT f_ext; \
-  UINT f_left; \
-  UINT f_right; \
-  UINT f_left_right; \
-  UINT f_dest; \
-  UINT f_rsvd; \
-  unsigned int length;
-#define EXTRACT_IFMT_FMOVDQ_CODE \
-  length = 4; \
-  f_op = EXTRACT_LSB0_UINT (insn, 32, 31, 6); \
-  f_ext = EXTRACT_LSB0_UINT (insn, 32, 19, 4); \
-  f_left = EXTRACT_LSB0_UINT (insn, 32, 25, 6); \
-  f_right = EXTRACT_LSB0_UINT (insn, 32, 15, 6); \
-  f_left_right = f_left;\
-  f_dest = EXTRACT_LSB0_UINT (insn, 32, 9, 6); \
-  f_rsvd = EXTRACT_LSB0_UINT (insn, 32, 3, 4); \
-
-#define EXTRACT_IFMT_FMOVLS_VARS \
-  UINT f_op; \
-  UINT f_left; \
-  UINT f_ext; \
-  UINT f_right; \
-  UINT f_dest; \
-  UINT f_rsvd; \
-  unsigned int length;
-#define EXTRACT_IFMT_FMOVLS_CODE \
-  length = 4; \
-  f_op = EXTRACT_LSB0_UINT (insn, 32, 31, 6); \
-  f_left = EXTRACT_LSB0_UINT (insn, 32, 25, 6); \
-  f_ext = EXTRACT_LSB0_UINT (insn, 32, 19, 4); \
-  f_right = EXTRACT_LSB0_UINT (insn, 32, 15, 6); \
-  f_dest = EXTRACT_LSB0_UINT (insn, 32, 9, 6); \
-  f_rsvd = EXTRACT_LSB0_UINT (insn, 32, 3, 4); \
-
-#define EXTRACT_IFMT_FMOVSL_VARS \
-  UINT f_op; \
-  UINT f_ext; \
-  UINT f_left; \
-  UINT f_right; \
-  UINT f_left_right; \
-  UINT f_dest; \
-  UINT f_rsvd; \
-  unsigned int length;
-#define EXTRACT_IFMT_FMOVSL_CODE \
-  length = 4; \
-  f_op = EXTRACT_LSB0_UINT (insn, 32, 31, 6); \
-  f_ext = EXTRACT_LSB0_UINT (insn, 32, 19, 4); \
-  f_left = EXTRACT_LSB0_UINT (insn, 32, 25, 6); \
-  f_right = EXTRACT_LSB0_UINT (insn, 32, 15, 6); \
-  f_left_right = f_left;\
-  f_dest = EXTRACT_LSB0_UINT (insn, 32, 9, 6); \
-  f_rsvd = EXTRACT_LSB0_UINT (insn, 32, 3, 4); \
-
-#define EXTRACT_IFMT_FPUTSCR_VARS \
-  UINT f_op; \
-  UINT f_ext; \
-  UINT f_left; \
-  UINT f_right; \
-  UINT f_left_right; \
-  UINT f_dest; \
-  UINT f_rsvd; \
-  unsigned int length;
-#define EXTRACT_IFMT_FPUTSCR_CODE \
-  length = 4; \
-  f_op = EXTRACT_LSB0_UINT (insn, 32, 31, 6); \
-  f_ext = EXTRACT_LSB0_UINT (insn, 32, 19, 4); \
-  f_left = EXTRACT_LSB0_UINT (insn, 32, 25, 6); \
-  f_right = EXTRACT_LSB0_UINT (insn, 32, 15, 6); \
-  f_left_right = f_left;\
-  f_dest = EXTRACT_LSB0_UINT (insn, 32, 9, 6); \
-  f_rsvd = EXTRACT_LSB0_UINT (insn, 32, 3, 4); \
-
-#define EXTRACT_IFMT_FSTXD_VARS \
-  UINT f_op; \
-  UINT f_left; \
-  UINT f_ext; \
-  UINT f_right; \
-  UINT f_dest; \
-  UINT f_rsvd; \
-  unsigned int length;
-#define EXTRACT_IFMT_FSTXD_CODE \
-  length = 4; \
-  f_op = EXTRACT_LSB0_UINT (insn, 32, 31, 6); \
-  f_left = EXTRACT_LSB0_UINT (insn, 32, 25, 6); \
-  f_ext = EXTRACT_LSB0_UINT (insn, 32, 19, 4); \
-  f_right = EXTRACT_LSB0_UINT (insn, 32, 15, 6); \
-  f_dest = EXTRACT_LSB0_UINT (insn, 32, 9, 6); \
-  f_rsvd = EXTRACT_LSB0_UINT (insn, 32, 3, 4); \
-
-#define EXTRACT_IFMT_FTRVS_VARS \
-  UINT f_op; \
-  UINT f_left; \
-  UINT f_ext; \
-  UINT f_right; \
-  UINT f_dest; \
-  UINT f_rsvd; \
-  unsigned int length;
-#define EXTRACT_IFMT_FTRVS_CODE \
-  length = 4; \
-  f_op = EXTRACT_LSB0_UINT (insn, 32, 31, 6); \
-  f_left = EXTRACT_LSB0_UINT (insn, 32, 25, 6); \
-  f_ext = EXTRACT_LSB0_UINT (insn, 32, 19, 4); \
-  f_right = EXTRACT_LSB0_UINT (insn, 32, 15, 6); \
-  f_dest = EXTRACT_LSB0_UINT (insn, 32, 9, 6); \
-  f_rsvd = EXTRACT_LSB0_UINT (insn, 32, 3, 4); \
-
-#define EXTRACT_IFMT_GETCFG_VARS \
-  UINT f_op; \
-  UINT f_left; \
-  UINT f_ext; \
-  INT f_disp6; \
-  UINT f_dest; \
-  UINT f_rsvd; \
-  unsigned int length;
-#define EXTRACT_IFMT_GETCFG_CODE \
-  length = 4; \
-  f_op = EXTRACT_LSB0_UINT (insn, 32, 31, 6); \
-  f_left = EXTRACT_LSB0_UINT (insn, 32, 25, 6); \
-  f_ext = EXTRACT_LSB0_UINT (insn, 32, 19, 4); \
-  f_disp6 = EXTRACT_LSB0_INT (insn, 32, 15, 6); \
-  f_dest = EXTRACT_LSB0_UINT (insn, 32, 9, 6); \
-  f_rsvd = EXTRACT_LSB0_UINT (insn, 32, 3, 4); \
-
-#define EXTRACT_IFMT_GETCON_VARS \
-  UINT f_op; \
-  UINT f_left; \
-  UINT f_ext; \
-  UINT f_right; \
-  UINT f_dest; \
-  UINT f_rsvd; \
-  unsigned int length;
-#define EXTRACT_IFMT_GETCON_CODE \
-  length = 4; \
-  f_op = EXTRACT_LSB0_UINT (insn, 32, 31, 6); \
-  f_left = EXTRACT_LSB0_UINT (insn, 32, 25, 6); \
-  f_ext = EXTRACT_LSB0_UINT (insn, 32, 19, 4); \
-  f_right = EXTRACT_LSB0_UINT (insn, 32, 15, 6); \
-  f_dest = EXTRACT_LSB0_UINT (insn, 32, 9, 6); \
-  f_rsvd = EXTRACT_LSB0_UINT (insn, 32, 3, 4); \
-
-#define EXTRACT_IFMT_LDL_VARS \
-  UINT f_op; \
-  UINT f_left; \
-  SI f_disp10x4; \
-  UINT f_dest; \
-  UINT f_rsvd; \
-  unsigned int length;
-#define EXTRACT_IFMT_LDL_CODE \
-  length = 4; \
-  f_op = EXTRACT_LSB0_UINT (insn, 32, 31, 6); \
-  f_left = EXTRACT_LSB0_UINT (insn, 32, 25, 6); \
-  f_disp10x4 = ((EXTRACT_LSB0_INT (insn, 32, 19, 10)) << (2)); \
-  f_dest = EXTRACT_LSB0_UINT (insn, 32, 9, 6); \
-  f_rsvd = EXTRACT_LSB0_UINT (insn, 32, 3, 4); \
-
-#define EXTRACT_IFMT_LDQ_VARS \
-  UINT f_op; \
-  UINT f_left; \
-  SI f_disp10x8; \
-  UINT f_dest; \
-  UINT f_rsvd; \
-  unsigned int length;
-#define EXTRACT_IFMT_LDQ_CODE \
-  length = 4; \
-  f_op = EXTRACT_LSB0_UINT (insn, 32, 31, 6); \
-  f_left = EXTRACT_LSB0_UINT (insn, 32, 25, 6); \
-  f_disp10x8 = ((EXTRACT_LSB0_INT (insn, 32, 19, 10)) << (3)); \
-  f_dest = EXTRACT_LSB0_UINT (insn, 32, 9, 6); \
-  f_rsvd = EXTRACT_LSB0_UINT (insn, 32, 3, 4); \
-
-#define EXTRACT_IFMT_MMACNFX_WL_VARS \
-  UINT f_op; \
-  UINT f_ext; \
-  UINT f_right; \
-  UINT f_right; \
-  UINT f_dest; \
-  UINT f_rsvd; \
-  unsigned int length;
-#define EXTRACT_IFMT_MMACNFX_WL_CODE \
-  length = 4; \
-  f_op = EXTRACT_LSB0_UINT (insn, 32, 31, 6); \
-  f_ext = EXTRACT_LSB0_UINT (insn, 32, 19, 4); \
-  f_right = EXTRACT_LSB0_UINT (insn, 32, 15, 6); \
-  f_right = EXTRACT_LSB0_UINT (insn, 32, 15, 6); \
-  f_dest = EXTRACT_LSB0_UINT (insn, 32, 9, 6); \
-  f_rsvd = EXTRACT_LSB0_UINT (insn, 32, 3, 4); \
-
-#define EXTRACT_IFMT_MOVI_VARS \
-  UINT f_op; \
-  INT f_imm16; \
-  UINT f_dest; \
-  UINT f_rsvd; \
-  unsigned int length;
-#define EXTRACT_IFMT_MOVI_CODE \
-  length = 4; \
-  f_op = EXTRACT_LSB0_UINT (insn, 32, 31, 6); \
-  f_imm16 = EXTRACT_LSB0_INT (insn, 32, 25, 16); \
-  f_dest = EXTRACT_LSB0_UINT (insn, 32, 9, 6); \
-  f_rsvd = EXTRACT_LSB0_UINT (insn, 32, 3, 4); \
-
-#define EXTRACT_IFMT_ORI_VARS \
-  UINT f_op; \
-  UINT f_left; \
-  INT f_imm10; \
-  UINT f_dest; \
-  UINT f_rsvd; \
-  unsigned int length;
-#define EXTRACT_IFMT_ORI_CODE \
-  length = 4; \
-  f_op = EXTRACT_LSB0_UINT (insn, 32, 31, 6); \
-  f_left = EXTRACT_LSB0_UINT (insn, 32, 25, 6); \
-  f_imm10 = EXTRACT_LSB0_INT (insn, 32, 19, 10); \
-  f_dest = EXTRACT_LSB0_UINT (insn, 32, 9, 6); \
-  f_rsvd = EXTRACT_LSB0_UINT (insn, 32, 3, 4); \
-
-#define EXTRACT_IFMT_PREFI_VARS \
-  UINT f_op; \
-  UINT f_left; \
-  UINT f_ext; \
-  SI f_disp6x32; \
-  UINT f_right; \
-  UINT f_rsvd; \
-  unsigned int length;
-#define EXTRACT_IFMT_PREFI_CODE \
-  length = 4; \
-  f_op = EXTRACT_LSB0_UINT (insn, 32, 31, 6); \
-  f_left = EXTRACT_LSB0_UINT (insn, 32, 25, 6); \
-  f_ext = EXTRACT_LSB0_UINT (insn, 32, 19, 4); \
-  f_disp6x32 = ((EXTRACT_LSB0_INT (insn, 32, 15, 6)) << (5)); \
-  f_right = EXTRACT_LSB0_UINT (insn, 32, 15, 6); \
-  f_rsvd = EXTRACT_LSB0_UINT (insn, 32, 3, 4); \
-
-#define EXTRACT_IFMT_PTA_VARS \
-  UINT f_op; \
-  DI f_disp16; \
-  UINT f_likely; \
-  UINT f_8_2; \
-  UINT f_tra; \
-  UINT f_rsvd; \
-  unsigned int length;
-#define EXTRACT_IFMT_PTA_CODE \
-  length = 4; \
-  f_op = EXTRACT_LSB0_UINT (insn, 32, 31, 6); \
-  f_disp16 = ((((EXTRACT_LSB0_INT (insn, 32, 25, 16)) << (2))) + (pc)); \
-  f_likely = EXTRACT_LSB0_UINT (insn, 32, 9, 1); \
-  f_8_2 = EXTRACT_LSB0_UINT (insn, 32, 8, 2); \
-  f_tra = EXTRACT_LSB0_UINT (insn, 32, 6, 3); \
-  f_rsvd = EXTRACT_LSB0_UINT (insn, 32, 3, 4); \
-
-#define EXTRACT_IFMT_PTABS_VARS \
-  UINT f_op; \
-  UINT f_left; \
-  UINT f_ext; \
-  UINT f_right; \
-  UINT f_likely; \
-  UINT f_8_2; \
-  UINT f_tra; \
-  UINT f_rsvd; \
-  unsigned int length;
-#define EXTRACT_IFMT_PTABS_CODE \
-  length = 4; \
-  f_op = EXTRACT_LSB0_UINT (insn, 32, 31, 6); \
-  f_left = EXTRACT_LSB0_UINT (insn, 32, 25, 6); \
-  f_ext = EXTRACT_LSB0_UINT (insn, 32, 19, 4); \
-  f_right = EXTRACT_LSB0_UINT (insn, 32, 15, 6); \
-  f_likely = EXTRACT_LSB0_UINT (insn, 32, 9, 1); \
-  f_8_2 = EXTRACT_LSB0_UINT (insn, 32, 8, 2); \
-  f_tra = EXTRACT_LSB0_UINT (insn, 32, 6, 3); \
-  f_rsvd = EXTRACT_LSB0_UINT (insn, 32, 3, 4); \
-
-#define EXTRACT_IFMT_PUTCON_VARS \
-  UINT f_op; \
-  UINT f_left; \
-  UINT f_ext; \
-  UINT f_right; \
-  UINT f_dest; \
-  UINT f_rsvd; \
-  unsigned int length;
-#define EXTRACT_IFMT_PUTCON_CODE \
-  length = 4; \
-  f_op = EXTRACT_LSB0_UINT (insn, 32, 31, 6); \
-  f_left = EXTRACT_LSB0_UINT (insn, 32, 25, 6); \
-  f_ext = EXTRACT_LSB0_UINT (insn, 32, 19, 4); \
-  f_right = EXTRACT_LSB0_UINT (insn, 32, 15, 6); \
-  f_dest = EXTRACT_LSB0_UINT (insn, 32, 9, 6); \
-  f_rsvd = EXTRACT_LSB0_UINT (insn, 32, 3, 4); \
-
-#define EXTRACT_IFMT_SHARI_VARS \
-  UINT f_op; \
-  UINT f_left; \
-  UINT f_ext; \
-  UINT f_uimm6; \
-  UINT f_dest; \
-  UINT f_rsvd; \
-  unsigned int length;
-#define EXTRACT_IFMT_SHARI_CODE \
-  length = 4; \
-  f_op = EXTRACT_LSB0_UINT (insn, 32, 31, 6); \
-  f_left = EXTRACT_LSB0_UINT (insn, 32, 25, 6); \
-  f_ext = EXTRACT_LSB0_UINT (insn, 32, 19, 4); \
-  f_uimm6 = EXTRACT_LSB0_UINT (insn, 32, 15, 6); \
-  f_dest = EXTRACT_LSB0_UINT (insn, 32, 9, 6); \
-  f_rsvd = EXTRACT_LSB0_UINT (insn, 32, 3, 4); \
-
-#define EXTRACT_IFMT_SHORI_VARS \
-  UINT f_op; \
-  UINT f_uimm16; \
-  UINT f_dest; \
-  UINT f_rsvd; \
-  unsigned int length;
-#define EXTRACT_IFMT_SHORI_CODE \
-  length = 4; \
-  f_op = EXTRACT_LSB0_UINT (insn, 32, 31, 6); \
-  f_uimm16 = EXTRACT_LSB0_UINT (insn, 32, 25, 16); \
-  f_dest = EXTRACT_LSB0_UINT (insn, 32, 9, 6); \
-  f_rsvd = EXTRACT_LSB0_UINT (insn, 32, 3, 4); \
-
-#define EXTRACT_IFMT_STW_VARS \
-  UINT f_op; \
-  UINT f_left; \
-  SI f_disp10x2; \
-  UINT f_dest; \
-  UINT f_rsvd; \
-  unsigned int length;
-#define EXTRACT_IFMT_STW_CODE \
-  length = 4; \
-  f_op = EXTRACT_LSB0_UINT (insn, 32, 31, 6); \
-  f_left = EXTRACT_LSB0_UINT (insn, 32, 25, 6); \
-  f_disp10x2 = ((EXTRACT_LSB0_INT (insn, 32, 19, 10)) << (1)); \
-  f_dest = EXTRACT_LSB0_UINT (insn, 32, 9, 6); \
-  f_rsvd = EXTRACT_LSB0_UINT (insn, 32, 3, 4); \
-
-#define EXTRACT_IFMT_TRAPA_VARS \
-  UINT f_op; \
-  UINT f_left; \
-  UINT f_ext; \
-  UINT f_right; \
-  UINT f_dest; \
-  UINT f_rsvd; \
-  unsigned int length;
-#define EXTRACT_IFMT_TRAPA_CODE \
-  length = 4; \
-  f_op = EXTRACT_LSB0_UINT (insn, 32, 31, 6); \
-  f_left = EXTRACT_LSB0_UINT (insn, 32, 25, 6); \
-  f_ext = EXTRACT_LSB0_UINT (insn, 32, 19, 4); \
-  f_right = EXTRACT_LSB0_UINT (insn, 32, 15, 6); \
-  f_dest = EXTRACT_LSB0_UINT (insn, 32, 9, 6); \
-  f_rsvd = EXTRACT_LSB0_UINT (insn, 32, 3, 4); \
-
-#endif /* DEFS_SH64_MEDIA_H */
diff --git a/sim/sh64/eng-compact.h b/sim/sh64/eng-compact.h
deleted file mode 100644
index 521b2f8a977..00000000000
--- a/sim/sh64/eng-compact.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* engine configuration for sh64 */
-
-/* WITH_FAST: non-zero if a fast version of the engine is available
-   in addition to the full-featured version.  */
-#define WITH_FAST 1
-
-/* WITH_SCACHE_PBB_SH64_COMPACT: non-zero if the pbb engine was selected.  */
-#define WITH_SCACHE_PBB_SH64_COMPACT 1
-
-/* HAVE_PARALLEL_INSNS: non-zero if cpu can parallelly execute > 1 insn.  */
-#define HAVE_PARALLEL_INSNS 0
-#define WITH_PARALLEL_READ 0
-#define WITH_PARALLEL_WRITE 0
-#define WITH_PARALLEL_GENWRITE 0
-
-/* WITH_SEM_SWITCH_FULL: non-zero if full-featured engine is
-   implemented as a switch().  */
-#define WITH_SEM_SWITCH_FULL 0
-
-/* WITH_SEM_SWITCH_FAST: non-zero if fast engine is
-   implemented as a switch().  */
-#define WITH_SEM_SWITCH_FAST 1
-
-/* Functions defined in the generated mainloop.c file
-   (which doesn't necessarily have that file name).  */
-
-extern ENGINE_FN sh64_compact_engine_run_full;
-extern ENGINE_FN sh64_compact_engine_run_fast;
-
-extern SEM_PC sh64_compact_pbb_begin (SIM_CPU *, int);
-extern SEM_PC sh64_compact_pbb_chain (SIM_CPU *, SEM_ARG);
-extern SEM_PC sh64_compact_pbb_cti_chain (SIM_CPU *, SEM_ARG, SEM_BRANCH_TYPE, PCADDR);
-extern void sh64_compact_pbb_before (SIM_CPU *, SCACHE *);
-extern void sh64_compact_pbb_after (SIM_CPU *, SCACHE *);
diff --git a/sim/sh64/eng-media.h b/sim/sh64/eng-media.h
deleted file mode 100644
index db1c21da640..00000000000
--- a/sim/sh64/eng-media.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* engine configuration for sh64 */
-
-/* WITH_FAST: non-zero if a fast version of the engine is available
-   in addition to the full-featured version.  */
-#define WITH_FAST 1
-
-/* WITH_SCACHE_PBB_SH64_MEDIA: non-zero if the pbb engine was selected.  */
-#define WITH_SCACHE_PBB_SH64_MEDIA 1
-
-/* HAVE_PARALLEL_INSNS: non-zero if cpu can parallelly execute > 1 insn.  */
-#define HAVE_PARALLEL_INSNS 0
-#define WITH_PARALLEL_READ 0
-#define WITH_PARALLEL_WRITE 0
-#define WITH_PARALLEL_GENWRITE 0
-
-/* WITH_SEM_SWITCH_FULL: non-zero if full-featured engine is
-   implemented as a switch().  */
-#define WITH_SEM_SWITCH_FULL 0
-
-/* WITH_SEM_SWITCH_FAST: non-zero if fast engine is
-   implemented as a switch().  */
-#define WITH_SEM_SWITCH_FAST 1
-
-/* Functions defined in the generated mainloop.c file
-   (which doesn't necessarily have that file name).  */
-
-extern ENGINE_FN sh64_media_engine_run_full;
-extern ENGINE_FN sh64_media_engine_run_fast;
-
-extern SEM_PC sh64_media_pbb_begin (SIM_CPU *, int);
-extern SEM_PC sh64_media_pbb_chain (SIM_CPU *, SEM_ARG);
-extern SEM_PC sh64_media_pbb_cti_chain (SIM_CPU *, SEM_ARG, SEM_BRANCH_TYPE, PCADDR);
-extern void sh64_media_pbb_before (SIM_CPU *, SCACHE *);
-extern void sh64_media_pbb_after (SIM_CPU *, SCACHE *);
diff --git a/sim/sh64/eng.h b/sim/sh64/eng.h
deleted file mode 100644
index fb9d8c566b1..00000000000
--- a/sim/sh64/eng.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Engine declarations.
-   Copyright (C) 2000 Free Software Foundation, Inc.
-   Contributed by Red Hat, Inc.
-
-This file is part of the GNU simulators.
-
-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, 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.  */
-
-/* Include declarations for SHmedia and SHcompact ISAs. */
-
-#include "eng-compact.h"
-#include "eng-media.h"
diff --git a/sim/sh64/mloop-compact.c b/sim/sh64/mloop-compact.c
deleted file mode 100644
index fb6b55202cf..00000000000
--- a/sim/sh64/mloop-compact.c
+++ /dev/null
@@ -1,635 +0,0 @@
-/* This file is generated by the genmloop script.  DO NOT EDIT! */
-
-/* Enable switch() support in cgen headers.  */
-#define SEM_IN_SWITCH
-
-#define WANT_CPU sh64
-#define WANT_CPU_SH64
-
-#include "sim-main.h"
-#include "bfd.h"
-#include "cgen-mem.h"
-#include "cgen-ops.h"
-#include "sim-assert.h"
-
-/* Fill in the administrative ARGBUF fields required by all insns,
-   virtual and real.  */
-
-static INLINE void
-sh64_compact_fill_argbuf (const SIM_CPU *cpu, ARGBUF *abuf, const IDESC *idesc,
-		    PCADDR pc, int fast_p)
-{
-#if WITH_SCACHE
-  SEM_SET_CODE (abuf, idesc, fast_p);
-  ARGBUF_ADDR (abuf) = pc;
-#endif
-  ARGBUF_IDESC (abuf) = idesc;
-}
-
-/* Fill in tracing/profiling fields of an ARGBUF.  */
-
-static INLINE void
-sh64_compact_fill_argbuf_tp (const SIM_CPU *cpu, ARGBUF *abuf,
-		       int trace_p, int profile_p)
-{
-  ARGBUF_TRACE_P (abuf) = trace_p;
-  ARGBUF_PROFILE_P (abuf) = profile_p;
-}
-
-#if WITH_SCACHE_PBB
-
-/* Emit the "x-before" handler.
-   x-before is emitted before each insn (serial or parallel).
-   This is as opposed to x-after which is only emitted at the end of a group
-   of parallel insns.  */
-
-static INLINE void
-sh64_compact_emit_before (SIM_CPU *current_cpu, SCACHE *sc, PCADDR pc, int first_p)
-{
-  ARGBUF *abuf = &sc[0].argbuf;
-  const IDESC *id = & CPU_IDESC (current_cpu) [SH64_COMPACT_INSN_X_BEFORE];
-
-  abuf->fields.before.first_p = first_p;
-  sh64_compact_fill_argbuf (current_cpu, abuf, id, pc, 0);
-  /* no need to set trace_p,profile_p */
-}
-
-/* Emit the "x-after" handler.
-   x-after is emitted after a serial insn or at the end of a group of
-   parallel insns.  */
-
-static INLINE void
-sh64_compact_emit_after (SIM_CPU *current_cpu, SCACHE *sc, PCADDR pc)
-{
-  ARGBUF *abuf = &sc[0].argbuf;
-  const IDESC *id = & CPU_IDESC (current_cpu) [SH64_COMPACT_INSN_X_AFTER];
-
-  sh64_compact_fill_argbuf (current_cpu, abuf, id, pc, 0);
-  /* no need to set trace_p,profile_p */
-}
-
-#endif /* WITH_SCACHE_PBB */
-
-
-static INLINE const IDESC *
-extract (SIM_CPU *current_cpu, PCADDR pc, CGEN_INSN_INT insn, ARGBUF *abuf,
-         int fast_p)
-{
-  const IDESC *id = sh64_compact_decode (current_cpu, pc, insn, insn, abuf);
-
-  sh64_compact_fill_argbuf (current_cpu, abuf, id, pc, fast_p);
-  if (! fast_p)
-    {
-      int trace_p = PC_IN_TRACE_RANGE_P (current_cpu, pc);
-      int profile_p = PC_IN_PROFILE_RANGE_P (current_cpu, pc);
-      sh64_compact_fill_argbuf_tp (current_cpu, abuf, trace_p, profile_p);
-    }
-  return id;
-}
-
-static INLINE SEM_PC
-execute (SIM_CPU *current_cpu, SCACHE *sc, int fast_p)
-{
-  SEM_PC vpc;
-
-  if (fast_p)
-    {
-#if ! WITH_SEM_SWITCH_FAST
-#if WITH_SCACHE
-      vpc = (*sc->argbuf.semantic.sem_fast) (current_cpu, sc);
-#else
-      vpc = (*sc->argbuf.semantic.sem_fast) (current_cpu, &sc->argbuf);
-#endif
-#else
-      abort ();
-#endif /* WITH_SEM_SWITCH_FAST */
-    }
-  else
-    {
-#if ! WITH_SEM_SWITCH_FULL
-      ARGBUF *abuf = &sc->argbuf;
-      const IDESC *idesc = abuf->idesc;
-#if WITH_SCACHE_PBB
-      int virtual_p = CGEN_ATTR_VALUE (NULL, idesc->attrs, CGEN_INSN_VIRTUAL);
-#else
-      int virtual_p = 0;
-#endif
-
-      if (! virtual_p)
-	{
-	  /* FIXME: call x-before */
-	  if (ARGBUF_PROFILE_P (abuf))
-	    PROFILE_COUNT_INSN (current_cpu, abuf->addr, idesc->num);
-	  /* FIXME: Later make cover macros: PROFILE_INSN_{INIT,FINI}.  */
-	  if (PROFILE_MODEL_P (current_cpu)
-	      && ARGBUF_PROFILE_P (abuf))
-	    sh64_compact_model_insn_before (current_cpu, 1 /*first_p*/);
-	  TRACE_INSN_INIT (current_cpu, abuf, 1);
-	  TRACE_INSN (current_cpu, idesc->idata,
-		      (const struct argbuf *) abuf, abuf->addr);
-	}
-#if WITH_SCACHE
-      vpc = (*sc->argbuf.semantic.sem_full) (current_cpu, sc);
-#else
-      vpc = (*sc->argbuf.semantic.sem_full) (current_cpu, abuf);
-#endif
-      if (! virtual_p)
-	{
-	  /* FIXME: call x-after */
-	  if (PROFILE_MODEL_P (current_cpu)
-	      && ARGBUF_PROFILE_P (abuf))
-	    {
-	      int cycles;
-
-	      cycles = (*idesc->timing->model_fn) (current_cpu, sc);
-	      sh64_compact_model_insn_after (current_cpu, 1 /*last_p*/, cycles);
-	    }
-	  TRACE_INSN_FINI (current_cpu, abuf, 1);
-	}
-#else
-      abort ();
-#endif /* WITH_SEM_SWITCH_FULL */
-    }
-
-  return vpc;
-}
-
-
-/* Record address of cti terminating a pbb.  */
-#define SET_CTI_VPC(sc) do { _cti_sc = (sc); } while (0)
-/* Record number of [real] insns in pbb.  */
-#define SET_INSN_COUNT(n) do { _insn_count = (n); } while (0)
-
-/* Fetch and extract a pseudo-basic-block.
-   FAST_P is non-zero if no tracing/profiling/etc. is wanted.  */
-
-INLINE SEM_PC
-sh64_compact_pbb_begin (SIM_CPU *current_cpu, int FAST_P)
-{
-  SEM_PC new_vpc;
-  PCADDR pc;
-  SCACHE *sc;
-  int max_insns = CPU_SCACHE_MAX_CHAIN_LENGTH (current_cpu);
-
-  pc = GET_H_PC ();
-
-  new_vpc = scache_lookup_or_alloc (current_cpu, pc, max_insns, &sc);
-  if (! new_vpc)
-    {
-      /* Leading '_' to avoid collision with mainloop.in.  */
-      int _insn_count = 0;
-      SCACHE *orig_sc = sc;
-      SCACHE *_cti_sc = NULL;
-      int slice_insns = CPU_MAX_SLICE_INSNS (current_cpu);
-
-      /* First figure out how many instructions to compile.
-	 MAX_INSNS is the size of the allocated buffer, which includes space
-	 for before/after handlers if they're being used.
-	 SLICE_INSNS is the maxinum number of real insns that can be
-	 executed.  Zero means "as many as we want".  */
-      /* ??? max_insns is serving two incompatible roles.
-	 1) Number of slots available in scache buffer.
-	 2) Number of real insns to execute.
-	 They're incompatible because there are virtual insns emitted too
-	 (chain,cti-chain,before,after handlers).  */
-
-      if (slice_insns == 1)
-	{
-	  /* No need to worry about extra slots required for virtual insns
-	     and parallel exec support because MAX_CHAIN_LENGTH is
-	     guaranteed to be big enough to execute at least 1 insn!  */
-	  max_insns = 1;
-	}
-      else
-	{
-	  /* Allow enough slop so that while compiling insns, if max_insns > 0
-	     then there's guaranteed to be enough space to emit one real insn.
-	     MAX_CHAIN_LENGTH is typically much longer than
-	     the normal number of insns between cti's anyway.  */
-	  max_insns -= (1 /* one for the trailing chain insn */
-			+ (FAST_P
-			   ? 0
-			   : (1 + MAX_PARALLEL_INSNS) /* before+after */)
-			+ (MAX_PARALLEL_INSNS > 1
-			   ? (MAX_PARALLEL_INSNS * 2)
-			   : 0));
-
-	  /* Account for before/after handlers.  */
-	  if (! FAST_P)
-	    slice_insns *= 3;
-
-	  if (slice_insns > 0
-	      && slice_insns < max_insns)
-	    max_insns = slice_insns;
-	}
-
-      new_vpc = sc;
-
-      /* SC,PC must be updated to point passed the last entry used.
-	 SET_CTI_VPC must be called if pbb is terminated by a cti.
-	 SET_INSN_COUNT must be called to record number of real insns in
-	 pbb [could be computed by us of course, extra cpu but perhaps
-	 negligible enough].  */
-
-/* begin extract-pbb */
-{
-  const IDESC *idesc;
-  int icount = 0;
-
- while (max_insns > 0)
-    {
-      UHI insn = GETIMEMUHI (current_cpu, pc);
-      
-      idesc = extract (current_cpu, pc, insn, &sc->argbuf, FAST_P);
-      SEM_SKIP_COMPILE (current_cpu, sc, 1);
-      ++sc;
-      --max_insns;
-      ++icount;
-      pc += idesc->length;
-
-      if (IDESC_CTI_P (idesc))
-        {
-          SET_CTI_VPC (sc - 1);
-
-          if (CGEN_ATTR_VALUE (NULL, idesc->attrs, CGEN_INSN_DELAY_SLOT))
-            {
-              USI insn = GETIMEMUHI (current_cpu, pc);
-	      idesc = extract (current_cpu, pc, insn, &sc->argbuf, FAST_P);
-
-              if (IDESC_CTI_P (idesc) ||
-	          CGEN_ATTR_VALUE (NULL, idesc->attrs, CGEN_INSN_ILLSLOT))
-	        {
-		  SIM_DESC sd = CPU_STATE (current_cpu);
-                  sim_io_eprintf (CPU_STATE (current_cpu),
-		    "malformed program, `%s' insn in delay slot\n",
-                    CGEN_INSN_NAME (idesc->idata));    
-		  sim_engine_halt (sd, current_cpu, NULL, pc,
-  				   sim_stopped, SIM_SIGILL);
-                }
-	      else
-                { 
-                  ++sc;
-	          --max_insns;
-	          ++icount;
-	          pc += idesc->length;
-                }
-            }
-	  break;
-      }
-    }
-
- Finish:
-  SET_INSN_COUNT (icount);
-}
-/* end extract-pbb */
-
-      /* The last one is a pseudo-insn to link to the next chain.
-	 It is also used to record the insn count for this chain.  */
-      {
-	const IDESC *id;
-
-	/* Was pbb terminated by a cti?  */
-	if (_cti_sc)
-	  {
-	    id = & CPU_IDESC (current_cpu) [SH64_COMPACT_INSN_X_CTI_CHAIN];
-	  }
-	else
-	  {
-	    id = & CPU_IDESC (current_cpu) [SH64_COMPACT_INSN_X_CHAIN];
-	  }
-	SEM_SET_CODE (&sc->argbuf, id, FAST_P);
-	sc->argbuf.idesc = id;
-	sc->argbuf.addr = pc;
-	sc->argbuf.fields.chain.insn_count = _insn_count;
-	sc->argbuf.fields.chain.next = 0;
-	sc->argbuf.fields.chain.branch_target = 0;
-	++sc;
-      }
-
-      /* Update the pointer to the next free entry, may not have used as
-	 many entries as was asked for.  */
-      CPU_SCACHE_NEXT_FREE (current_cpu) = sc;
-      /* Record length of chain if profiling.
-	 This includes virtual insns since they count against
-	 max_insns too.  */
-      if (! FAST_P)
-	PROFILE_COUNT_SCACHE_CHAIN_LENGTH (current_cpu, sc - orig_sc);
-    }
-
-  return new_vpc;
-}
-
-/* Chain to the next block from a non-cti terminated previous block.  */
-
-INLINE SEM_PC
-sh64_compact_pbb_chain (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-
-  PBB_UPDATE_INSN_COUNT (current_cpu, sem_arg);
-
-  SET_H_PC (abuf->addr);
-
-
-  /* If not running forever, exit back to main loop.  */
-  if (CPU_MAX_SLICE_INSNS (current_cpu) != 0
-      /* Also exit back to main loop if there's an event.
-         Note that if CPU_MAX_SLICE_INSNS != 1, events won't get processed
-	 at the "right" time, but then that was what was asked for.
-	 There is no silver bullet for simulator engines.
-         ??? Clearly this needs a cleaner interface.
-	 At present it's just so Ctrl-C works.  */
-      || STATE_EVENTS (CPU_STATE (current_cpu))->work_pending)
-    CPU_RUNNING_P (current_cpu) = 0;
-
-  /* If chained to next block, go straight to it.  */
-  if (abuf->fields.chain.next)
-    return abuf->fields.chain.next;
-  /* See if next block has already been compiled.  */
-  abuf->fields.chain.next = scache_lookup (current_cpu, abuf->addr);
-  if (abuf->fields.chain.next)
-    return abuf->fields.chain.next;
-  /* Nope, so next insn is a virtual insn to invoke the compiler
-     (begin a pbb).  */
-  return CPU_SCACHE_PBB_BEGIN (current_cpu);
-}
-
-/* Chain to the next block from a cti terminated previous block.
-   BR_TYPE indicates whether the branch was taken and whether we can cache
-   the vpc of the branch target.
-   NEW_PC is the target's branch address, and is only valid if
-   BR_TYPE != SEM_BRANCH_UNTAKEN.  */
-
-INLINE SEM_PC
-sh64_compact_pbb_cti_chain (SIM_CPU *current_cpu, SEM_ARG sem_arg,
-		     SEM_BRANCH_TYPE br_type, PCADDR new_pc)
-{
-  SEM_PC *new_vpc_ptr;
-
-  PBB_UPDATE_INSN_COUNT (current_cpu, sem_arg);
-
-  /* If we have switched ISAs, exit back to main loop.
-     Set idesc to 0 to cause the engine to point to the right insn table.  */
-  if (new_pc & 1)
-  {
-    /* Switch to SHmedia.  */
-    CPU_IDESC_SEM_INIT_P (current_cpu) = 0;
-    CPU_RUNNING_P (current_cpu) = 0;
-  }
-
-  /* If not running forever, exit back to main loop.  */
-  if (CPU_MAX_SLICE_INSNS (current_cpu) != 0
-      /* Also exit back to main loop if there's an event.
-         Note that if CPU_MAX_SLICE_INSNS != 1, events won't get processed
-	 at the "right" time, but then that was what was asked for.
-	 There is no silver bullet for simulator engines.
-         ??? Clearly this needs a cleaner interface.
-	 At present it's just so Ctrl-C works.  */
-      || STATE_EVENTS (CPU_STATE (current_cpu))->work_pending)
-    CPU_RUNNING_P (current_cpu) = 0;
-
-  /* Restart compiler if we branched to an uncacheable address
-     (e.g. "j reg").  */
-  if (br_type == SEM_BRANCH_UNCACHEABLE)
-    {
-      SET_H_PC (new_pc);
-      return CPU_SCACHE_PBB_BEGIN (current_cpu);
-    }
-
-  /* If branch wasn't taken, update the pc and set BR_ADDR_PTR to our
-     next chain ptr.  */
-  if (br_type == SEM_BRANCH_UNTAKEN)
-    {
-      ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-      new_pc = abuf->addr;
-      SET_H_PC (new_pc);
-      new_vpc_ptr = &abuf->fields.chain.next;
-    }
-  else
-    {
-      ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-      SET_H_PC (new_pc);
-      new_vpc_ptr = &abuf->fields.chain.branch_target;
-    }
-
-  /* If chained to next block, go straight to it.  */
-  if (*new_vpc_ptr)
-    return *new_vpc_ptr;
-  /* See if next block has already been compiled.  */
-  *new_vpc_ptr = scache_lookup (current_cpu, new_pc);
-  if (*new_vpc_ptr)
-    return *new_vpc_ptr;
-  /* Nope, so next insn is a virtual insn to invoke the compiler
-     (begin a pbb).  */
-  return CPU_SCACHE_PBB_BEGIN (current_cpu);
-}
-
-/* x-before handler.
-   This is called before each insn.  */
-
-void
-sh64_compact_pbb_before (SIM_CPU *current_cpu, SCACHE *sc)
-{
-  SEM_ARG sem_arg = sc;
-  const ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int first_p = abuf->fields.before.first_p;
-  const ARGBUF *cur_abuf = SEM_ARGBUF (sc + 1);
-  const IDESC *cur_idesc = cur_abuf->idesc;
-  PCADDR pc = cur_abuf->addr;
-
-  if (ARGBUF_PROFILE_P (cur_abuf))
-    PROFILE_COUNT_INSN (current_cpu, pc, cur_idesc->num);
-
-  /* If this isn't the first insn, finish up the previous one.  */
-
-  if (! first_p)
-    {
-      if (PROFILE_MODEL_P (current_cpu))
-	{
-	  const SEM_ARG prev_sem_arg = sc - 1;
-	  const ARGBUF *prev_abuf = SEM_ARGBUF (prev_sem_arg);
-	  const IDESC *prev_idesc = prev_abuf->idesc;
-	  int cycles;
-
-	  /* ??? May want to measure all insns if doing insn tracing.  */
-	  if (ARGBUF_PROFILE_P (prev_abuf))
-	    {
-	      cycles = (*prev_idesc->timing->model_fn) (current_cpu, prev_sem_arg);
-	      sh64_compact_model_insn_after (current_cpu, 0 /*last_p*/, cycles);
-	    }
-	}
-
-      TRACE_INSN_FINI (current_cpu, cur_abuf, 0 /*last_p*/);
-    }
-
-  /* FIXME: Later make cover macros: PROFILE_INSN_{INIT,FINI}.  */
-  if (PROFILE_MODEL_P (current_cpu)
-      && ARGBUF_PROFILE_P (cur_abuf))
-    sh64_compact_model_insn_before (current_cpu, first_p);
-
-  TRACE_INSN_INIT (current_cpu, cur_abuf, first_p);
-  TRACE_INSN (current_cpu, cur_idesc->idata, cur_abuf, pc);
-}
-
-/* x-after handler.
-   This is called after a serial insn or at the end of a group of parallel
-   insns.  */
-
-void
-sh64_compact_pbb_after (SIM_CPU *current_cpu, SCACHE *sc)
-{
-  SEM_ARG sem_arg = sc;
-  const ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  const SEM_ARG prev_sem_arg = sc - 1;
-  const ARGBUF *prev_abuf = SEM_ARGBUF (prev_sem_arg);
-
-  /* ??? May want to measure all insns if doing insn tracing.  */
-  if (PROFILE_MODEL_P (current_cpu)
-      && ARGBUF_PROFILE_P (prev_abuf))
-    {
-      const IDESC *prev_idesc = prev_abuf->idesc;
-      int cycles;
-
-      cycles = (*prev_idesc->timing->model_fn) (current_cpu, prev_sem_arg);
-      sh64_compact_model_insn_after (current_cpu, 1 /*last_p*/, cycles);
-    }
-  TRACE_INSN_FINI (current_cpu, prev_abuf, 1 /*last_p*/);
-}
-
-#define FAST_P 0
-
-void
-sh64_compact_engine_run_full (SIM_CPU *current_cpu)
-{
-  SIM_DESC current_state = CPU_STATE (current_cpu);
-  SCACHE *scache = CPU_SCACHE_CACHE (current_cpu);
-  /* virtual program counter */
-  SEM_PC vpc;
-#if WITH_SEM_SWITCH_FULL
-  /* For communication between cti's and cti-chain.  */
-  SEM_BRANCH_TYPE pbb_br_type;
-  PCADDR pbb_br_npc;
-#endif
-
-
-  if (! CPU_IDESC_SEM_INIT_P (current_cpu))
-    {
-      /* ??? 'twould be nice to move this up a level and only call it once.
-	 On the other hand, in the "let's go fast" case the test is only done
-	 once per pbb (since we only return to the main loop at the end of
-	 a pbb).  And in the "let's run until we're done" case we don't return
-	 until the program exits.  */
-
-#if WITH_SEM_SWITCH_FULL
-#if defined (__GNUC__)
-/* ??? Later maybe paste sem-switch.c in when building mainloop.c.  */
-#define DEFINE_LABELS
-#include "sem-compact-switch.c"
-#endif
-#else
-      sh64_compact_sem_init_idesc_table (current_cpu);
-#endif
-
-      /* Initialize the "begin (compile) a pbb" virtual insn.  */
-      vpc = CPU_SCACHE_PBB_BEGIN (current_cpu);
-      SEM_SET_FULL_CODE (SEM_ARGBUF (vpc),
-			 & CPU_IDESC (current_cpu) [SH64_COMPACT_INSN_X_BEGIN]);
-      vpc->argbuf.idesc = & CPU_IDESC (current_cpu) [SH64_COMPACT_INSN_X_BEGIN];
-
-      CPU_IDESC_SEM_INIT_P (current_cpu) = 1;
-    }
-
-  CPU_RUNNING_P (current_cpu) = 1;
-  /* ??? In the case where we're returning to the main loop after every
-     pbb we don't want to call pbb_begin each time (which hashes on the pc
-     and does a table lookup).  A way to speed this up is to save vpc
-     between calls.  */
-  vpc = sh64_compact_pbb_begin (current_cpu, FAST_P);
-
-  do
-    {
-/* begin full-exec-pbb */
-{
-#if (! FAST_P && WITH_SEM_SWITCH_FULL) || (FAST_P && WITH_SEM_SWITCH_FAST)
-#define DEFINE_SWITCH
-#include "sem-compact-switch.c"
-#else
-  vpc = execute (current_cpu, vpc, FAST_P);
-#endif
-}
-/* end full-exec-pbb */
-    }
-  while (CPU_RUNNING_P (current_cpu));
-}
-
-#undef FAST_P
-
-
-#define FAST_P 1
-
-void
-sh64_compact_engine_run_fast (SIM_CPU *current_cpu)
-{
-  SIM_DESC current_state = CPU_STATE (current_cpu);
-  SCACHE *scache = CPU_SCACHE_CACHE (current_cpu);
-  /* virtual program counter */
-  SEM_PC vpc;
-#if WITH_SEM_SWITCH_FAST
-  /* For communication between cti's and cti-chain.  */
-  SEM_BRANCH_TYPE pbb_br_type;
-  PCADDR pbb_br_npc;
-#endif
-
-
-  if (! CPU_IDESC_SEM_INIT_P (current_cpu))
-    {
-      /* ??? 'twould be nice to move this up a level and only call it once.
-	 On the other hand, in the "let's go fast" case the test is only done
-	 once per pbb (since we only return to the main loop at the end of
-	 a pbb).  And in the "let's run until we're done" case we don't return
-	 until the program exits.  */
-
-#if WITH_SEM_SWITCH_FAST
-#if defined (__GNUC__)
-/* ??? Later maybe paste sem-switch.c in when building mainloop.c.  */
-#define DEFINE_LABELS
-#include "sem-compact-switch.c"
-#endif
-#else
-      sh64_compact_semf_init_idesc_table (current_cpu);
-#endif
-
-      /* Initialize the "begin (compile) a pbb" virtual insn.  */
-      vpc = CPU_SCACHE_PBB_BEGIN (current_cpu);
-      SEM_SET_FAST_CODE (SEM_ARGBUF (vpc),
-			 & CPU_IDESC (current_cpu) [SH64_COMPACT_INSN_X_BEGIN]);
-      vpc->argbuf.idesc = & CPU_IDESC (current_cpu) [SH64_COMPACT_INSN_X_BEGIN];
-
-      CPU_IDESC_SEM_INIT_P (current_cpu) = 1;
-    }
-
-  CPU_RUNNING_P (current_cpu) = 1;
-  /* ??? In the case where we're returning to the main loop after every
-     pbb we don't want to call pbb_begin each time (which hashes on the pc
-     and does a table lookup).  A way to speed this up is to save vpc
-     between calls.  */
-  vpc = sh64_compact_pbb_begin (current_cpu, FAST_P);
-
-  do
-    {
-/* begin fast-exec-pbb */
-{
-#if (! FAST_P && WITH_SEM_SWITCH_FULL) || (FAST_P && WITH_SEM_SWITCH_FAST)
-#define DEFINE_SWITCH
-#include "sem-compact-switch.c"
-#else
-  vpc = execute (current_cpu, vpc, FAST_P);
-#endif
-}
-/* end fast-exec-pbb */
-    }
-  while (CPU_RUNNING_P (current_cpu));
-}
-
-#undef FAST_P
-
diff --git a/sim/sh64/mloop-media.c b/sim/sh64/mloop-media.c
deleted file mode 100644
index 03c5df534c5..00000000000
--- a/sim/sh64/mloop-media.c
+++ /dev/null
@@ -1,624 +0,0 @@
-/* This file is generated by the genmloop script.  DO NOT EDIT! */
-
-/* Enable switch() support in cgen headers.  */
-#define SEM_IN_SWITCH
-
-#define WANT_CPU sh64
-#define WANT_CPU_SH64
-
-#include "sim-main.h"
-#include "bfd.h"
-#include "cgen-mem.h"
-#include "cgen-ops.h"
-#include "sim-assert.h"
-
-/* Fill in the administrative ARGBUF fields required by all insns,
-   virtual and real.  */
-
-static INLINE void
-sh64_media_fill_argbuf (const SIM_CPU *cpu, ARGBUF *abuf, const IDESC *idesc,
-		    PCADDR pc, int fast_p)
-{
-#if WITH_SCACHE
-  SEM_SET_CODE (abuf, idesc, fast_p);
-  ARGBUF_ADDR (abuf) = pc;
-#endif
-  ARGBUF_IDESC (abuf) = idesc;
-}
-
-/* Fill in tracing/profiling fields of an ARGBUF.  */
-
-static INLINE void
-sh64_media_fill_argbuf_tp (const SIM_CPU *cpu, ARGBUF *abuf,
-		       int trace_p, int profile_p)
-{
-  ARGBUF_TRACE_P (abuf) = trace_p;
-  ARGBUF_PROFILE_P (abuf) = profile_p;
-}
-
-#if WITH_SCACHE_PBB
-
-/* Emit the "x-before" handler.
-   x-before is emitted before each insn (serial or parallel).
-   This is as opposed to x-after which is only emitted at the end of a group
-   of parallel insns.  */
-
-static INLINE void
-sh64_media_emit_before (SIM_CPU *current_cpu, SCACHE *sc, PCADDR pc, int first_p)
-{
-  ARGBUF *abuf = &sc[0].argbuf;
-  const IDESC *id = & CPU_IDESC (current_cpu) [SH64_MEDIA_INSN_X_BEFORE];
-
-  abuf->fields.before.first_p = first_p;
-  sh64_media_fill_argbuf (current_cpu, abuf, id, pc, 0);
-  /* no need to set trace_p,profile_p */
-}
-
-/* Emit the "x-after" handler.
-   x-after is emitted after a serial insn or at the end of a group of
-   parallel insns.  */
-
-static INLINE void
-sh64_media_emit_after (SIM_CPU *current_cpu, SCACHE *sc, PCADDR pc)
-{
-  ARGBUF *abuf = &sc[0].argbuf;
-  const IDESC *id = & CPU_IDESC (current_cpu) [SH64_MEDIA_INSN_X_AFTER];
-
-  sh64_media_fill_argbuf (current_cpu, abuf, id, pc, 0);
-  /* no need to set trace_p,profile_p */
-}
-
-#endif /* WITH_SCACHE_PBB */
-
-
-static INLINE const IDESC *
-extract (SIM_CPU *current_cpu, PCADDR pc, CGEN_INSN_INT insn, ARGBUF *abuf,
-         int fast_p)
-{
-  const IDESC *id = sh64_media_decode (current_cpu, pc, insn, insn, abuf);
-
-  sh64_media_fill_argbuf (current_cpu, abuf, id, pc, fast_p);
-  if (! fast_p)
-    {
-      int trace_p = PC_IN_TRACE_RANGE_P (current_cpu, pc);
-      int profile_p = PC_IN_PROFILE_RANGE_P (current_cpu, pc);
-      sh64_media_fill_argbuf_tp (current_cpu, abuf, trace_p, profile_p);
-    }
-  return id;
-}
-
-static INLINE SEM_PC
-execute (SIM_CPU *current_cpu, SCACHE *sc, int fast_p)
-{
-  SEM_PC vpc;
-
-  if (fast_p)
-    {
-#if ! WITH_SEM_SWITCH_FAST
-#if WITH_SCACHE
-      vpc = (*sc->argbuf.semantic.sem_fast) (current_cpu, sc);
-#else
-      vpc = (*sc->argbuf.semantic.sem_fast) (current_cpu, &sc->argbuf);
-#endif
-#else
-      abort ();
-#endif /* WITH_SEM_SWITCH_FAST */
-    }
-  else
-    {
-#if ! WITH_SEM_SWITCH_FULL
-      ARGBUF *abuf = &sc->argbuf;
-      const IDESC *idesc = abuf->idesc;
-#if WITH_SCACHE_PBB
-      int virtual_p = CGEN_ATTR_VALUE (NULL, idesc->attrs, CGEN_INSN_VIRTUAL);
-#else
-      int virtual_p = 0;
-#endif
-
-      if (! virtual_p)
-	{
-	  /* FIXME: call x-before */
-	  if (ARGBUF_PROFILE_P (abuf))
-	    PROFILE_COUNT_INSN (current_cpu, abuf->addr, idesc->num);
-	  /* FIXME: Later make cover macros: PROFILE_INSN_{INIT,FINI}.  */
-	  if (PROFILE_MODEL_P (current_cpu)
-	      && ARGBUF_PROFILE_P (abuf))
-	    sh64_media_model_insn_before (current_cpu, 1 /*first_p*/);
-	  TRACE_INSN_INIT (current_cpu, abuf, 1);
-	  TRACE_INSN (current_cpu, idesc->idata,
-		      (const struct argbuf *) abuf, abuf->addr);
-	}
-#if WITH_SCACHE
-      vpc = (*sc->argbuf.semantic.sem_full) (current_cpu, sc);
-#else
-      vpc = (*sc->argbuf.semantic.sem_full) (current_cpu, abuf);
-#endif
-      if (! virtual_p)
-	{
-	  /* FIXME: call x-after */
-	  if (PROFILE_MODEL_P (current_cpu)
-	      && ARGBUF_PROFILE_P (abuf))
-	    {
-	      int cycles;
-
-	      cycles = (*idesc->timing->model_fn) (current_cpu, sc);
-	      sh64_media_model_insn_after (current_cpu, 1 /*last_p*/, cycles);
-	    }
-	  TRACE_INSN_FINI (current_cpu, abuf, 1);
-	}
-#else
-      abort ();
-#endif /* WITH_SEM_SWITCH_FULL */
-    }
-
-  return vpc;
-}
-
-
-/* Record address of cti terminating a pbb.  */
-#define SET_CTI_VPC(sc) do { _cti_sc = (sc); } while (0)
-/* Record number of [real] insns in pbb.  */
-#define SET_INSN_COUNT(n) do { _insn_count = (n); } while (0)
-
-/* Fetch and extract a pseudo-basic-block.
-   FAST_P is non-zero if no tracing/profiling/etc. is wanted.  */
-
-INLINE SEM_PC
-sh64_media_pbb_begin (SIM_CPU *current_cpu, int FAST_P)
-{
-  SEM_PC new_vpc;
-  PCADDR pc;
-  SCACHE *sc;
-  int max_insns = CPU_SCACHE_MAX_CHAIN_LENGTH (current_cpu);
-
-  pc = GET_H_PC ();
-
-  new_vpc = scache_lookup_or_alloc (current_cpu, pc, max_insns, &sc);
-  if (! new_vpc)
-    {
-      /* Leading '_' to avoid collision with mainloop.in.  */
-      int _insn_count = 0;
-      SCACHE *orig_sc = sc;
-      SCACHE *_cti_sc = NULL;
-      int slice_insns = CPU_MAX_SLICE_INSNS (current_cpu);
-
-      /* First figure out how many instructions to compile.
-	 MAX_INSNS is the size of the allocated buffer, which includes space
-	 for before/after handlers if they're being used.
-	 SLICE_INSNS is the maxinum number of real insns that can be
-	 executed.  Zero means "as many as we want".  */
-      /* ??? max_insns is serving two incompatible roles.
-	 1) Number of slots available in scache buffer.
-	 2) Number of real insns to execute.
-	 They're incompatible because there are virtual insns emitted too
-	 (chain,cti-chain,before,after handlers).  */
-
-      if (slice_insns == 1)
-	{
-	  /* No need to worry about extra slots required for virtual insns
-	     and parallel exec support because MAX_CHAIN_LENGTH is
-	     guaranteed to be big enough to execute at least 1 insn!  */
-	  max_insns = 1;
-	}
-      else
-	{
-	  /* Allow enough slop so that while compiling insns, if max_insns > 0
-	     then there's guaranteed to be enough space to emit one real insn.
-	     MAX_CHAIN_LENGTH is typically much longer than
-	     the normal number of insns between cti's anyway.  */
-	  max_insns -= (1 /* one for the trailing chain insn */
-			+ (FAST_P
-			   ? 0
-			   : (1 + MAX_PARALLEL_INSNS) /* before+after */)
-			+ (MAX_PARALLEL_INSNS > 1
-			   ? (MAX_PARALLEL_INSNS * 2)
-			   : 0));
-
-	  /* Account for before/after handlers.  */
-	  if (! FAST_P)
-	    slice_insns *= 3;
-
-	  if (slice_insns > 0
-	      && slice_insns < max_insns)
-	    max_insns = slice_insns;
-	}
-
-      new_vpc = sc;
-
-      /* SC,PC must be updated to point passed the last entry used.
-	 SET_CTI_VPC must be called if pbb is terminated by a cti.
-	 SET_INSN_COUNT must be called to record number of real insns in
-	 pbb [could be computed by us of course, extra cpu but perhaps
-	 negligible enough].  */
-
-/* begin extract-pbb */
-{
-  const IDESC *idesc;
-  int icount = 0;
-
- while (max_insns > 0)
-    {
-      USI insn = GETIMEMUSI (current_cpu, pc);
-      
-      idesc = extract (current_cpu, pc, insn, &sc->argbuf, FAST_P);
-      SEM_SKIP_COMPILE (current_cpu, sc, 1);
-      ++sc;
-      --max_insns;
-      ++icount;
-      pc += idesc->length;
-
-      if (IDESC_CTI_P (idesc))
-        {
-          SET_CTI_VPC (sc - 1);
-
-          if (CGEN_ATTR_VALUE (NULL, idesc->attrs, CGEN_INSN_DELAY_SLOT))
-            {
-              USI insn = GETIMEMUSI (current_cpu, pc);
-	      idesc = extract (current_cpu, pc, insn, &sc->argbuf, FAST_P);
-
-              ++sc;
-	      --max_insns;
-	      ++icount;
-	      pc += idesc->length;
-            }
-	  break;
-        }
-    }
-
- Finish:
-  SET_INSN_COUNT (icount);
-}
-/* end extract-pbb */
-
-      /* The last one is a pseudo-insn to link to the next chain.
-	 It is also used to record the insn count for this chain.  */
-      {
-	const IDESC *id;
-
-	/* Was pbb terminated by a cti?  */
-	if (_cti_sc)
-	  {
-	    id = & CPU_IDESC (current_cpu) [SH64_MEDIA_INSN_X_CTI_CHAIN];
-	  }
-	else
-	  {
-	    id = & CPU_IDESC (current_cpu) [SH64_MEDIA_INSN_X_CHAIN];
-	  }
-	SEM_SET_CODE (&sc->argbuf, id, FAST_P);
-	sc->argbuf.idesc = id;
-	sc->argbuf.addr = pc;
-	sc->argbuf.fields.chain.insn_count = _insn_count;
-	sc->argbuf.fields.chain.next = 0;
-	sc->argbuf.fields.chain.branch_target = 0;
-	++sc;
-      }
-
-      /* Update the pointer to the next free entry, may not have used as
-	 many entries as was asked for.  */
-      CPU_SCACHE_NEXT_FREE (current_cpu) = sc;
-      /* Record length of chain if profiling.
-	 This includes virtual insns since they count against
-	 max_insns too.  */
-      if (! FAST_P)
-	PROFILE_COUNT_SCACHE_CHAIN_LENGTH (current_cpu, sc - orig_sc);
-    }
-
-  return new_vpc;
-}
-
-/* Chain to the next block from a non-cti terminated previous block.  */
-
-INLINE SEM_PC
-sh64_media_pbb_chain (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-
-  PBB_UPDATE_INSN_COUNT (current_cpu, sem_arg);
-
-  SET_H_PC (abuf->addr | 1);
-
-  /* If not running forever, exit back to main loop.  */
-  if (CPU_MAX_SLICE_INSNS (current_cpu) != 0
-      /* Also exit back to main loop if there's an event.
-         Note that if CPU_MAX_SLICE_INSNS != 1, events won't get processed
-	 at the "right" time, but then that was what was asked for.
-	 There is no silver bullet for simulator engines.
-         ??? Clearly this needs a cleaner interface.
-	 At present it's just so Ctrl-C works.  */
-      || STATE_EVENTS (CPU_STATE (current_cpu))->work_pending)
-    CPU_RUNNING_P (current_cpu) = 0;
-
-  /* If chained to next block, go straight to it.  */
-  if (abuf->fields.chain.next)
-    return abuf->fields.chain.next;
-  /* See if next block has already been compiled.  */
-  abuf->fields.chain.next = scache_lookup (current_cpu, abuf->addr);
-  if (abuf->fields.chain.next)
-    return abuf->fields.chain.next;
-  /* Nope, so next insn is a virtual insn to invoke the compiler
-     (begin a pbb).  */
-  return CPU_SCACHE_PBB_BEGIN (current_cpu);
-}
-
-/* Chain to the next block from a cti terminated previous block.
-   BR_TYPE indicates whether the branch was taken and whether we can cache
-   the vpc of the branch target.
-   NEW_PC is the target's branch address, and is only valid if
-   BR_TYPE != SEM_BRANCH_UNTAKEN.  */
-
-INLINE SEM_PC
-sh64_media_pbb_cti_chain (SIM_CPU *current_cpu, SEM_ARG sem_arg,
-		     SEM_BRANCH_TYPE br_type, PCADDR new_pc)
-{
-  SEM_PC *new_vpc_ptr;
-
-  PBB_UPDATE_INSN_COUNT (current_cpu, sem_arg);
-
-  /* If we have switched ISAs, exit back to main loop.
-     Set idesc to 0 to cause the engine to point to the right insn table.  */
-  if ((new_pc & 1) == 0)
-  {
-    /* Switch to SHcompact.  */
-    CPU_IDESC_SEM_INIT_P (current_cpu) = 0;
-    CPU_RUNNING_P (current_cpu) = 0;
-  }
-  
-  /* If not running forever, exit back to main loop.  */
-  if (CPU_MAX_SLICE_INSNS (current_cpu) != 0
-      /* Also exit back to main loop if there's an event.
-         Note that if CPU_MAX_SLICE_INSNS != 1, events won't get processed
-	 at the "right" time, but then that was what was asked for.
-	 There is no silver bullet for simulator engines.
-         ??? Clearly this needs a cleaner interface.
-	 At present it's just so Ctrl-C works.  */
-      || STATE_EVENTS (CPU_STATE (current_cpu))->work_pending)
-    CPU_RUNNING_P (current_cpu) = 0;
-
-  /* Restart compiler if we branched to an uncacheable address
-     (e.g. "j reg").  */
-  if (br_type == SEM_BRANCH_UNCACHEABLE)
-    {
-      SET_H_PC (new_pc);
-      return CPU_SCACHE_PBB_BEGIN (current_cpu);
-    }
-
-  /* If branch wasn't taken, update the pc and set BR_ADDR_PTR to our
-     next chain ptr.  */
-  if (br_type == SEM_BRANCH_UNTAKEN)
-    {
-      ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-      new_pc = abuf->addr;
-      /* Set bit 0 to stay in SHmedia mode.  */
-      SET_H_PC (new_pc | 1);
-      new_vpc_ptr = &abuf->fields.chain.next;
-    }
-  else
-    {
-      ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-      SET_H_PC (new_pc);
-      new_vpc_ptr = &abuf->fields.chain.branch_target;
-    }
-
-  /* If chained to next block, go straight to it.  */
-  if (*new_vpc_ptr)
-    return *new_vpc_ptr;
-  /* See if next block has already been compiled.  */
-  *new_vpc_ptr = scache_lookup (current_cpu, new_pc);
-  if (*new_vpc_ptr)
-    return *new_vpc_ptr;
-  /* Nope, so next insn is a virtual insn to invoke the compiler
-     (begin a pbb).  */
-  return CPU_SCACHE_PBB_BEGIN (current_cpu);
-}
-
-/* x-before handler.
-   This is called before each insn.  */
-
-void
-sh64_media_pbb_before (SIM_CPU *current_cpu, SCACHE *sc)
-{
-  SEM_ARG sem_arg = sc;
-  const ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int first_p = abuf->fields.before.first_p;
-  const ARGBUF *cur_abuf = SEM_ARGBUF (sc + 1);
-  const IDESC *cur_idesc = cur_abuf->idesc;
-  PCADDR pc = cur_abuf->addr;
-
-  if (ARGBUF_PROFILE_P (cur_abuf))
-    PROFILE_COUNT_INSN (current_cpu, pc, cur_idesc->num);
-
-  /* If this isn't the first insn, finish up the previous one.  */
-
-  if (! first_p)
-    {
-      if (PROFILE_MODEL_P (current_cpu))
-	{
-	  const SEM_ARG prev_sem_arg = sc - 1;
-	  const ARGBUF *prev_abuf = SEM_ARGBUF (prev_sem_arg);
-	  const IDESC *prev_idesc = prev_abuf->idesc;
-	  int cycles;
-
-	  /* ??? May want to measure all insns if doing insn tracing.  */
-	  if (ARGBUF_PROFILE_P (prev_abuf))
-	    {
-	      cycles = (*prev_idesc->timing->model_fn) (current_cpu, prev_sem_arg);
-	      sh64_media_model_insn_after (current_cpu, 0 /*last_p*/, cycles);
-	    }
-	}
-
-      TRACE_INSN_FINI (current_cpu, cur_abuf, 0 /*last_p*/);
-    }
-
-  /* FIXME: Later make cover macros: PROFILE_INSN_{INIT,FINI}.  */
-  if (PROFILE_MODEL_P (current_cpu)
-      && ARGBUF_PROFILE_P (cur_abuf))
-    sh64_media_model_insn_before (current_cpu, first_p);
-
-  TRACE_INSN_INIT (current_cpu, cur_abuf, first_p);
-  TRACE_INSN (current_cpu, cur_idesc->idata, cur_abuf, pc);
-}
-
-/* x-after handler.
-   This is called after a serial insn or at the end of a group of parallel
-   insns.  */
-
-void
-sh64_media_pbb_after (SIM_CPU *current_cpu, SCACHE *sc)
-{
-  SEM_ARG sem_arg = sc;
-  const ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  const SEM_ARG prev_sem_arg = sc - 1;
-  const ARGBUF *prev_abuf = SEM_ARGBUF (prev_sem_arg);
-
-  /* ??? May want to measure all insns if doing insn tracing.  */
-  if (PROFILE_MODEL_P (current_cpu)
-      && ARGBUF_PROFILE_P (prev_abuf))
-    {
-      const IDESC *prev_idesc = prev_abuf->idesc;
-      int cycles;
-
-      cycles = (*prev_idesc->timing->model_fn) (current_cpu, prev_sem_arg);
-      sh64_media_model_insn_after (current_cpu, 1 /*last_p*/, cycles);
-    }
-  TRACE_INSN_FINI (current_cpu, prev_abuf, 1 /*last_p*/);
-}
-
-#define FAST_P 0
-
-void
-sh64_media_engine_run_full (SIM_CPU *current_cpu)
-{
-  SIM_DESC current_state = CPU_STATE (current_cpu);
-  SCACHE *scache = CPU_SCACHE_CACHE (current_cpu);
-  /* virtual program counter */
-  SEM_PC vpc;
-#if WITH_SEM_SWITCH_FULL
-  /* For communication between cti's and cti-chain.  */
-  SEM_BRANCH_TYPE pbb_br_type;
-  PCADDR pbb_br_npc;
-#endif
-
-
-  if (! CPU_IDESC_SEM_INIT_P (current_cpu))
-    {
-      /* ??? 'twould be nice to move this up a level and only call it once.
-	 On the other hand, in the "let's go fast" case the test is only done
-	 once per pbb (since we only return to the main loop at the end of
-	 a pbb).  And in the "let's run until we're done" case we don't return
-	 until the program exits.  */
-
-#if WITH_SEM_SWITCH_FULL
-#if defined (__GNUC__)
-/* ??? Later maybe paste sem-switch.c in when building mainloop.c.  */
-#define DEFINE_LABELS
-#include "sem-media-switch.c"
-#endif
-#else
-      sh64_media_sem_init_idesc_table (current_cpu);
-#endif
-
-      /* Initialize the "begin (compile) a pbb" virtual insn.  */
-      vpc = CPU_SCACHE_PBB_BEGIN (current_cpu);
-      SEM_SET_FULL_CODE (SEM_ARGBUF (vpc),
-			 & CPU_IDESC (current_cpu) [SH64_MEDIA_INSN_X_BEGIN]);
-      vpc->argbuf.idesc = & CPU_IDESC (current_cpu) [SH64_MEDIA_INSN_X_BEGIN];
-
-      CPU_IDESC_SEM_INIT_P (current_cpu) = 1;
-    }
-
-  CPU_RUNNING_P (current_cpu) = 1;
-  /* ??? In the case where we're returning to the main loop after every
-     pbb we don't want to call pbb_begin each time (which hashes on the pc
-     and does a table lookup).  A way to speed this up is to save vpc
-     between calls.  */
-  vpc = sh64_media_pbb_begin (current_cpu, FAST_P);
-
-  do
-    {
-/* begin full-exec-pbb */
-{
-#if (! FAST_P && WITH_SEM_SWITCH_FULL) || (FAST_P && WITH_SEM_SWITCH_FAST)
-#define DEFINE_SWITCH
-#define WITH_ISA_COMPACT
-#include "sem-media-switch.c"
-#else
-  vpc = execute (current_cpu, vpc, FAST_P);
-#endif
-}
-/* end full-exec-pbb */
-    }
-  while (CPU_RUNNING_P (current_cpu));
-}
-
-#undef FAST_P
-
-
-#define FAST_P 1
-
-void
-sh64_media_engine_run_fast (SIM_CPU *current_cpu)
-{
-  SIM_DESC current_state = CPU_STATE (current_cpu);
-  SCACHE *scache = CPU_SCACHE_CACHE (current_cpu);
-  /* virtual program counter */
-  SEM_PC vpc;
-#if WITH_SEM_SWITCH_FAST
-  /* For communication between cti's and cti-chain.  */
-  SEM_BRANCH_TYPE pbb_br_type;
-  PCADDR pbb_br_npc;
-#endif
-
-
-  if (! CPU_IDESC_SEM_INIT_P (current_cpu))
-    {
-      /* ??? 'twould be nice to move this up a level and only call it once.
-	 On the other hand, in the "let's go fast" case the test is only done
-	 once per pbb (since we only return to the main loop at the end of
-	 a pbb).  And in the "let's run until we're done" case we don't return
-	 until the program exits.  */
-
-#if WITH_SEM_SWITCH_FAST
-#if defined (__GNUC__)
-/* ??? Later maybe paste sem-switch.c in when building mainloop.c.  */
-#define DEFINE_LABELS
-#include "sem-media-switch.c"
-#endif
-#else
-      sh64_media_semf_init_idesc_table (current_cpu);
-#endif
-
-      /* Initialize the "begin (compile) a pbb" virtual insn.  */
-      vpc = CPU_SCACHE_PBB_BEGIN (current_cpu);
-      SEM_SET_FAST_CODE (SEM_ARGBUF (vpc),
-			 & CPU_IDESC (current_cpu) [SH64_MEDIA_INSN_X_BEGIN]);
-      vpc->argbuf.idesc = & CPU_IDESC (current_cpu) [SH64_MEDIA_INSN_X_BEGIN];
-
-      CPU_IDESC_SEM_INIT_P (current_cpu) = 1;
-    }
-
-  CPU_RUNNING_P (current_cpu) = 1;
-  /* ??? In the case where we're returning to the main loop after every
-     pbb we don't want to call pbb_begin each time (which hashes on the pc
-     and does a table lookup).  A way to speed this up is to save vpc
-     between calls.  */
-  vpc = sh64_media_pbb_begin (current_cpu, FAST_P);
-
-  do
-    {
-/* begin fast-exec-pbb */
-{
-#if (! FAST_P && WITH_SEM_SWITCH_FULL) || (FAST_P && WITH_SEM_SWITCH_FAST)
-#define DEFINE_SWITCH
-#define WITH_ISA_COMPACT
-#include "sem-media-switch.c"
-#else
-  vpc = execute (current_cpu, vpc, FAST_P);
-#endif
-}
-/* end fast-exec-pbb */
-    }
-  while (CPU_RUNNING_P (current_cpu));
-}
-
-#undef FAST_P
-
diff --git a/sim/sh64/sem-compact-switch.c b/sim/sh64/sem-compact-switch.c
deleted file mode 100644
index 59270e83905..00000000000
--- a/sim/sh64/sem-compact-switch.c
+++ /dev/null
@@ -1,4941 +0,0 @@
-/* Simulator instruction semantics for sh64.
-
-THIS FILE IS MACHINE GENERATED WITH CGEN.
-
-Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
-
-This file is part of the GNU Simulators.
-
-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, 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.
-
-*/
-
-#ifdef DEFINE_LABELS
-
-  /* The labels have the case they have because the enum of insn types
-     is all uppercase and in the non-stdc case the insn symbol is built
-     into the enum name.  */
-
-  static struct {
-    int index;
-    void *label;
-  } labels[] = {
-    { SH64_COMPACT_INSN_X_INVALID, && case_sem_INSN_X_INVALID },
-    { SH64_COMPACT_INSN_X_AFTER, && case_sem_INSN_X_AFTER },
-    { SH64_COMPACT_INSN_X_BEFORE, && case_sem_INSN_X_BEFORE },
-    { SH64_COMPACT_INSN_X_CTI_CHAIN, && case_sem_INSN_X_CTI_CHAIN },
-    { SH64_COMPACT_INSN_X_CHAIN, && case_sem_INSN_X_CHAIN },
-    { SH64_COMPACT_INSN_X_BEGIN, && case_sem_INSN_X_BEGIN },
-    { SH64_COMPACT_INSN_ADD_COMPACT, && case_sem_INSN_ADD_COMPACT },
-    { SH64_COMPACT_INSN_ADDI_COMPACT, && case_sem_INSN_ADDI_COMPACT },
-    { SH64_COMPACT_INSN_ADDC_COMPACT, && case_sem_INSN_ADDC_COMPACT },
-    { SH64_COMPACT_INSN_ADDV_COMPACT, && case_sem_INSN_ADDV_COMPACT },
-    { SH64_COMPACT_INSN_AND_COMPACT, && case_sem_INSN_AND_COMPACT },
-    { SH64_COMPACT_INSN_ANDI_COMPACT, && case_sem_INSN_ANDI_COMPACT },
-    { SH64_COMPACT_INSN_ANDB_COMPACT, && case_sem_INSN_ANDB_COMPACT },
-    { SH64_COMPACT_INSN_BF_COMPACT, && case_sem_INSN_BF_COMPACT },
-    { SH64_COMPACT_INSN_BFS_COMPACT, && case_sem_INSN_BFS_COMPACT },
-    { SH64_COMPACT_INSN_BRA_COMPACT, && case_sem_INSN_BRA_COMPACT },
-    { SH64_COMPACT_INSN_BRAF_COMPACT, && case_sem_INSN_BRAF_COMPACT },
-    { SH64_COMPACT_INSN_BRK_COMPACT, && case_sem_INSN_BRK_COMPACT },
-    { SH64_COMPACT_INSN_BSR_COMPACT, && case_sem_INSN_BSR_COMPACT },
-    { SH64_COMPACT_INSN_BSRF_COMPACT, && case_sem_INSN_BSRF_COMPACT },
-    { SH64_COMPACT_INSN_BT_COMPACT, && case_sem_INSN_BT_COMPACT },
-    { SH64_COMPACT_INSN_BTS_COMPACT, && case_sem_INSN_BTS_COMPACT },
-    { SH64_COMPACT_INSN_CLRMAC_COMPACT, && case_sem_INSN_CLRMAC_COMPACT },
-    { SH64_COMPACT_INSN_CLRS_COMPACT, && case_sem_INSN_CLRS_COMPACT },
-    { SH64_COMPACT_INSN_CLRT_COMPACT, && case_sem_INSN_CLRT_COMPACT },
-    { SH64_COMPACT_INSN_CMPEQ_COMPACT, && case_sem_INSN_CMPEQ_COMPACT },
-    { SH64_COMPACT_INSN_CMPEQI_COMPACT, && case_sem_INSN_CMPEQI_COMPACT },
-    { SH64_COMPACT_INSN_CMPGE_COMPACT, && case_sem_INSN_CMPGE_COMPACT },
-    { SH64_COMPACT_INSN_CMPGT_COMPACT, && case_sem_INSN_CMPGT_COMPACT },
-    { SH64_COMPACT_INSN_CMPHI_COMPACT, && case_sem_INSN_CMPHI_COMPACT },
-    { SH64_COMPACT_INSN_CMPHS_COMPACT, && case_sem_INSN_CMPHS_COMPACT },
-    { SH64_COMPACT_INSN_CMPPL_COMPACT, && case_sem_INSN_CMPPL_COMPACT },
-    { SH64_COMPACT_INSN_CMPPZ_COMPACT, && case_sem_INSN_CMPPZ_COMPACT },
-    { SH64_COMPACT_INSN_CMPSTR_COMPACT, && case_sem_INSN_CMPSTR_COMPACT },
-    { SH64_COMPACT_INSN_DIV0S_COMPACT, && case_sem_INSN_DIV0S_COMPACT },
-    { SH64_COMPACT_INSN_DIV0U_COMPACT, && case_sem_INSN_DIV0U_COMPACT },
-    { SH64_COMPACT_INSN_DIV1_COMPACT, && case_sem_INSN_DIV1_COMPACT },
-    { SH64_COMPACT_INSN_DMULSL_COMPACT, && case_sem_INSN_DMULSL_COMPACT },
-    { SH64_COMPACT_INSN_DMULUL_COMPACT, && case_sem_INSN_DMULUL_COMPACT },
-    { SH64_COMPACT_INSN_DT_COMPACT, && case_sem_INSN_DT_COMPACT },
-    { SH64_COMPACT_INSN_EXTSB_COMPACT, && case_sem_INSN_EXTSB_COMPACT },
-    { SH64_COMPACT_INSN_EXTSW_COMPACT, && case_sem_INSN_EXTSW_COMPACT },
-    { SH64_COMPACT_INSN_EXTUB_COMPACT, && case_sem_INSN_EXTUB_COMPACT },
-    { SH64_COMPACT_INSN_EXTUW_COMPACT, && case_sem_INSN_EXTUW_COMPACT },
-    { SH64_COMPACT_INSN_FABS_COMPACT, && case_sem_INSN_FABS_COMPACT },
-    { SH64_COMPACT_INSN_FADD_COMPACT, && case_sem_INSN_FADD_COMPACT },
-    { SH64_COMPACT_INSN_FCMPEQ_COMPACT, && case_sem_INSN_FCMPEQ_COMPACT },
-    { SH64_COMPACT_INSN_FCMPGT_COMPACT, && case_sem_INSN_FCMPGT_COMPACT },
-    { SH64_COMPACT_INSN_FCNVDS_COMPACT, && case_sem_INSN_FCNVDS_COMPACT },
-    { SH64_COMPACT_INSN_FCNVSD_COMPACT, && case_sem_INSN_FCNVSD_COMPACT },
-    { SH64_COMPACT_INSN_FDIV_COMPACT, && case_sem_INSN_FDIV_COMPACT },
-    { SH64_COMPACT_INSN_FIPR_COMPACT, && case_sem_INSN_FIPR_COMPACT },
-    { SH64_COMPACT_INSN_FLDS_COMPACT, && case_sem_INSN_FLDS_COMPACT },
-    { SH64_COMPACT_INSN_FLDI0_COMPACT, && case_sem_INSN_FLDI0_COMPACT },
-    { SH64_COMPACT_INSN_FLDI1_COMPACT, && case_sem_INSN_FLDI1_COMPACT },
-    { SH64_COMPACT_INSN_FLOAT_COMPACT, && case_sem_INSN_FLOAT_COMPACT },
-    { SH64_COMPACT_INSN_FMAC_COMPACT, && case_sem_INSN_FMAC_COMPACT },
-    { SH64_COMPACT_INSN_FMOV1_COMPACT, && case_sem_INSN_FMOV1_COMPACT },
-    { SH64_COMPACT_INSN_FMOV2_COMPACT, && case_sem_INSN_FMOV2_COMPACT },
-    { SH64_COMPACT_INSN_FMOV3_COMPACT, && case_sem_INSN_FMOV3_COMPACT },
-    { SH64_COMPACT_INSN_FMOV4_COMPACT, && case_sem_INSN_FMOV4_COMPACT },
-    { SH64_COMPACT_INSN_FMOV5_COMPACT, && case_sem_INSN_FMOV5_COMPACT },
-    { SH64_COMPACT_INSN_FMOV6_COMPACT, && case_sem_INSN_FMOV6_COMPACT },
-    { SH64_COMPACT_INSN_FMOV7_COMPACT, && case_sem_INSN_FMOV7_COMPACT },
-    { SH64_COMPACT_INSN_FMUL_COMPACT, && case_sem_INSN_FMUL_COMPACT },
-    { SH64_COMPACT_INSN_FNEG_COMPACT, && case_sem_INSN_FNEG_COMPACT },
-    { SH64_COMPACT_INSN_FRCHG_COMPACT, && case_sem_INSN_FRCHG_COMPACT },
-    { SH64_COMPACT_INSN_FSCHG_COMPACT, && case_sem_INSN_FSCHG_COMPACT },
-    { SH64_COMPACT_INSN_FSQRT_COMPACT, && case_sem_INSN_FSQRT_COMPACT },
-    { SH64_COMPACT_INSN_FSTS_COMPACT, && case_sem_INSN_FSTS_COMPACT },
-    { SH64_COMPACT_INSN_FSUB_COMPACT, && case_sem_INSN_FSUB_COMPACT },
-    { SH64_COMPACT_INSN_FTRC_COMPACT, && case_sem_INSN_FTRC_COMPACT },
-    { SH64_COMPACT_INSN_FTRV_COMPACT, && case_sem_INSN_FTRV_COMPACT },
-    { SH64_COMPACT_INSN_JMP_COMPACT, && case_sem_INSN_JMP_COMPACT },
-    { SH64_COMPACT_INSN_JSR_COMPACT, && case_sem_INSN_JSR_COMPACT },
-    { SH64_COMPACT_INSN_LDC_COMPACT, && case_sem_INSN_LDC_COMPACT },
-    { SH64_COMPACT_INSN_LDCL_COMPACT, && case_sem_INSN_LDCL_COMPACT },
-    { SH64_COMPACT_INSN_LDS_FPSCR_COMPACT, && case_sem_INSN_LDS_FPSCR_COMPACT },
-    { SH64_COMPACT_INSN_LDSL_FPSCR_COMPACT, && case_sem_INSN_LDSL_FPSCR_COMPACT },
-    { SH64_COMPACT_INSN_LDS_FPUL_COMPACT, && case_sem_INSN_LDS_FPUL_COMPACT },
-    { SH64_COMPACT_INSN_LDSL_FPUL_COMPACT, && case_sem_INSN_LDSL_FPUL_COMPACT },
-    { SH64_COMPACT_INSN_LDS_MACH_COMPACT, && case_sem_INSN_LDS_MACH_COMPACT },
-    { SH64_COMPACT_INSN_LDSL_MACH_COMPACT, && case_sem_INSN_LDSL_MACH_COMPACT },
-    { SH64_COMPACT_INSN_LDS_MACL_COMPACT, && case_sem_INSN_LDS_MACL_COMPACT },
-    { SH64_COMPACT_INSN_LDSL_MACL_COMPACT, && case_sem_INSN_LDSL_MACL_COMPACT },
-    { SH64_COMPACT_INSN_LDS_PR_COMPACT, && case_sem_INSN_LDS_PR_COMPACT },
-    { SH64_COMPACT_INSN_LDSL_PR_COMPACT, && case_sem_INSN_LDSL_PR_COMPACT },
-    { SH64_COMPACT_INSN_MACL_COMPACT, && case_sem_INSN_MACL_COMPACT },
-    { SH64_COMPACT_INSN_MACW_COMPACT, && case_sem_INSN_MACW_COMPACT },
-    { SH64_COMPACT_INSN_MOV_COMPACT, && case_sem_INSN_MOV_COMPACT },
-    { SH64_COMPACT_INSN_MOVI_COMPACT, && case_sem_INSN_MOVI_COMPACT },
-    { SH64_COMPACT_INSN_MOVB1_COMPACT, && case_sem_INSN_MOVB1_COMPACT },
-    { SH64_COMPACT_INSN_MOVB2_COMPACT, && case_sem_INSN_MOVB2_COMPACT },
-    { SH64_COMPACT_INSN_MOVB3_COMPACT, && case_sem_INSN_MOVB3_COMPACT },
-    { SH64_COMPACT_INSN_MOVB4_COMPACT, && case_sem_INSN_MOVB4_COMPACT },
-    { SH64_COMPACT_INSN_MOVB5_COMPACT, && case_sem_INSN_MOVB5_COMPACT },
-    { SH64_COMPACT_INSN_MOVB6_COMPACT, && case_sem_INSN_MOVB6_COMPACT },
-    { SH64_COMPACT_INSN_MOVB7_COMPACT, && case_sem_INSN_MOVB7_COMPACT },
-    { SH64_COMPACT_INSN_MOVB8_COMPACT, && case_sem_INSN_MOVB8_COMPACT },
-    { SH64_COMPACT_INSN_MOVB9_COMPACT, && case_sem_INSN_MOVB9_COMPACT },
-    { SH64_COMPACT_INSN_MOVB10_COMPACT, && case_sem_INSN_MOVB10_COMPACT },
-    { SH64_COMPACT_INSN_MOVL1_COMPACT, && case_sem_INSN_MOVL1_COMPACT },
-    { SH64_COMPACT_INSN_MOVL2_COMPACT, && case_sem_INSN_MOVL2_COMPACT },
-    { SH64_COMPACT_INSN_MOVL3_COMPACT, && case_sem_INSN_MOVL3_COMPACT },
-    { SH64_COMPACT_INSN_MOVL4_COMPACT, && case_sem_INSN_MOVL4_COMPACT },
-    { SH64_COMPACT_INSN_MOVL5_COMPACT, && case_sem_INSN_MOVL5_COMPACT },
-    { SH64_COMPACT_INSN_MOVL6_COMPACT, && case_sem_INSN_MOVL6_COMPACT },
-    { SH64_COMPACT_INSN_MOVL7_COMPACT, && case_sem_INSN_MOVL7_COMPACT },
-    { SH64_COMPACT_INSN_MOVL8_COMPACT, && case_sem_INSN_MOVL8_COMPACT },
-    { SH64_COMPACT_INSN_MOVL9_COMPACT, && case_sem_INSN_MOVL9_COMPACT },
-    { SH64_COMPACT_INSN_MOVL10_COMPACT, && case_sem_INSN_MOVL10_COMPACT },
-    { SH64_COMPACT_INSN_MOVL11_COMPACT, && case_sem_INSN_MOVL11_COMPACT },
-    { SH64_COMPACT_INSN_MOVW1_COMPACT, && case_sem_INSN_MOVW1_COMPACT },
-    { SH64_COMPACT_INSN_MOVW2_COMPACT, && case_sem_INSN_MOVW2_COMPACT },
-    { SH64_COMPACT_INSN_MOVW3_COMPACT, && case_sem_INSN_MOVW3_COMPACT },
-    { SH64_COMPACT_INSN_MOVW4_COMPACT, && case_sem_INSN_MOVW4_COMPACT },
-    { SH64_COMPACT_INSN_MOVW5_COMPACT, && case_sem_INSN_MOVW5_COMPACT },
-    { SH64_COMPACT_INSN_MOVW6_COMPACT, && case_sem_INSN_MOVW6_COMPACT },
-    { SH64_COMPACT_INSN_MOVW7_COMPACT, && case_sem_INSN_MOVW7_COMPACT },
-    { SH64_COMPACT_INSN_MOVW8_COMPACT, && case_sem_INSN_MOVW8_COMPACT },
-    { SH64_COMPACT_INSN_MOVW9_COMPACT, && case_sem_INSN_MOVW9_COMPACT },
-    { SH64_COMPACT_INSN_MOVW10_COMPACT, && case_sem_INSN_MOVW10_COMPACT },
-    { SH64_COMPACT_INSN_MOVW11_COMPACT, && case_sem_INSN_MOVW11_COMPACT },
-    { SH64_COMPACT_INSN_MOVA_COMPACT, && case_sem_INSN_MOVA_COMPACT },
-    { SH64_COMPACT_INSN_MOVCAL_COMPACT, && case_sem_INSN_MOVCAL_COMPACT },
-    { SH64_COMPACT_INSN_MOVT_COMPACT, && case_sem_INSN_MOVT_COMPACT },
-    { SH64_COMPACT_INSN_MULL_COMPACT, && case_sem_INSN_MULL_COMPACT },
-    { SH64_COMPACT_INSN_MULSW_COMPACT, && case_sem_INSN_MULSW_COMPACT },
-    { SH64_COMPACT_INSN_MULUW_COMPACT, && case_sem_INSN_MULUW_COMPACT },
-    { SH64_COMPACT_INSN_NEG_COMPACT, && case_sem_INSN_NEG_COMPACT },
-    { SH64_COMPACT_INSN_NEGC_COMPACT, && case_sem_INSN_NEGC_COMPACT },
-    { SH64_COMPACT_INSN_NOP_COMPACT, && case_sem_INSN_NOP_COMPACT },
-    { SH64_COMPACT_INSN_NOT_COMPACT, && case_sem_INSN_NOT_COMPACT },
-    { SH64_COMPACT_INSN_OCBI_COMPACT, && case_sem_INSN_OCBI_COMPACT },
-    { SH64_COMPACT_INSN_OCBP_COMPACT, && case_sem_INSN_OCBP_COMPACT },
-    { SH64_COMPACT_INSN_OCBWB_COMPACT, && case_sem_INSN_OCBWB_COMPACT },
-    { SH64_COMPACT_INSN_OR_COMPACT, && case_sem_INSN_OR_COMPACT },
-    { SH64_COMPACT_INSN_ORI_COMPACT, && case_sem_INSN_ORI_COMPACT },
-    { SH64_COMPACT_INSN_ORB_COMPACT, && case_sem_INSN_ORB_COMPACT },
-    { SH64_COMPACT_INSN_PREF_COMPACT, && case_sem_INSN_PREF_COMPACT },
-    { SH64_COMPACT_INSN_ROTCL_COMPACT, && case_sem_INSN_ROTCL_COMPACT },
-    { SH64_COMPACT_INSN_ROTCR_COMPACT, && case_sem_INSN_ROTCR_COMPACT },
-    { SH64_COMPACT_INSN_ROTL_COMPACT, && case_sem_INSN_ROTL_COMPACT },
-    { SH64_COMPACT_INSN_ROTR_COMPACT, && case_sem_INSN_ROTR_COMPACT },
-    { SH64_COMPACT_INSN_RTS_COMPACT, && case_sem_INSN_RTS_COMPACT },
-    { SH64_COMPACT_INSN_SETS_COMPACT, && case_sem_INSN_SETS_COMPACT },
-    { SH64_COMPACT_INSN_SETT_COMPACT, && case_sem_INSN_SETT_COMPACT },
-    { SH64_COMPACT_INSN_SHAD_COMPACT, && case_sem_INSN_SHAD_COMPACT },
-    { SH64_COMPACT_INSN_SHAL_COMPACT, && case_sem_INSN_SHAL_COMPACT },
-    { SH64_COMPACT_INSN_SHAR_COMPACT, && case_sem_INSN_SHAR_COMPACT },
-    { SH64_COMPACT_INSN_SHLD_COMPACT, && case_sem_INSN_SHLD_COMPACT },
-    { SH64_COMPACT_INSN_SHLL_COMPACT, && case_sem_INSN_SHLL_COMPACT },
-    { SH64_COMPACT_INSN_SHLL2_COMPACT, && case_sem_INSN_SHLL2_COMPACT },
-    { SH64_COMPACT_INSN_SHLL8_COMPACT, && case_sem_INSN_SHLL8_COMPACT },
-    { SH64_COMPACT_INSN_SHLL16_COMPACT, && case_sem_INSN_SHLL16_COMPACT },
-    { SH64_COMPACT_INSN_SHLR_COMPACT, && case_sem_INSN_SHLR_COMPACT },
-    { SH64_COMPACT_INSN_SHLR2_COMPACT, && case_sem_INSN_SHLR2_COMPACT },
-    { SH64_COMPACT_INSN_SHLR8_COMPACT, && case_sem_INSN_SHLR8_COMPACT },
-    { SH64_COMPACT_INSN_SHLR16_COMPACT, && case_sem_INSN_SHLR16_COMPACT },
-    { SH64_COMPACT_INSN_STC_GBR_COMPACT, && case_sem_INSN_STC_GBR_COMPACT },
-    { SH64_COMPACT_INSN_STCL_GBR_COMPACT, && case_sem_INSN_STCL_GBR_COMPACT },
-    { SH64_COMPACT_INSN_STS_FPSCR_COMPACT, && case_sem_INSN_STS_FPSCR_COMPACT },
-    { SH64_COMPACT_INSN_STSL_FPSCR_COMPACT, && case_sem_INSN_STSL_FPSCR_COMPACT },
-    { SH64_COMPACT_INSN_STS_FPUL_COMPACT, && case_sem_INSN_STS_FPUL_COMPACT },
-    { SH64_COMPACT_INSN_STSL_FPUL_COMPACT, && case_sem_INSN_STSL_FPUL_COMPACT },
-    { SH64_COMPACT_INSN_STS_MACH_COMPACT, && case_sem_INSN_STS_MACH_COMPACT },
-    { SH64_COMPACT_INSN_STSL_MACH_COMPACT, && case_sem_INSN_STSL_MACH_COMPACT },
-    { SH64_COMPACT_INSN_STS_MACL_COMPACT, && case_sem_INSN_STS_MACL_COMPACT },
-    { SH64_COMPACT_INSN_STSL_MACL_COMPACT, && case_sem_INSN_STSL_MACL_COMPACT },
-    { SH64_COMPACT_INSN_STS_PR_COMPACT, && case_sem_INSN_STS_PR_COMPACT },
-    { SH64_COMPACT_INSN_STSL_PR_COMPACT, && case_sem_INSN_STSL_PR_COMPACT },
-    { SH64_COMPACT_INSN_SUB_COMPACT, && case_sem_INSN_SUB_COMPACT },
-    { SH64_COMPACT_INSN_SUBC_COMPACT, && case_sem_INSN_SUBC_COMPACT },
-    { SH64_COMPACT_INSN_SUBV_COMPACT, && case_sem_INSN_SUBV_COMPACT },
-    { SH64_COMPACT_INSN_SWAPB_COMPACT, && case_sem_INSN_SWAPB_COMPACT },
-    { SH64_COMPACT_INSN_SWAPW_COMPACT, && case_sem_INSN_SWAPW_COMPACT },
-    { SH64_COMPACT_INSN_TASB_COMPACT, && case_sem_INSN_TASB_COMPACT },
-    { SH64_COMPACT_INSN_TRAPA_COMPACT, && case_sem_INSN_TRAPA_COMPACT },
-    { SH64_COMPACT_INSN_TST_COMPACT, && case_sem_INSN_TST_COMPACT },
-    { SH64_COMPACT_INSN_TSTI_COMPACT, && case_sem_INSN_TSTI_COMPACT },
-    { SH64_COMPACT_INSN_TSTB_COMPACT, && case_sem_INSN_TSTB_COMPACT },
-    { SH64_COMPACT_INSN_XOR_COMPACT, && case_sem_INSN_XOR_COMPACT },
-    { SH64_COMPACT_INSN_XORI_COMPACT, && case_sem_INSN_XORI_COMPACT },
-    { SH64_COMPACT_INSN_XORB_COMPACT, && case_sem_INSN_XORB_COMPACT },
-    { SH64_COMPACT_INSN_XTRCT_COMPACT, && case_sem_INSN_XTRCT_COMPACT },
-    { 0, 0 }
-  };
-  int i;
-
-  for (i = 0; labels[i].label != 0; ++i)
-    {
-#if FAST_P
-      CPU_IDESC (current_cpu) [labels[i].index].sem_fast_lab = labels[i].label;
-#else
-      CPU_IDESC (current_cpu) [labels[i].index].sem_full_lab = labels[i].label;
-#endif
-    }
-
-#undef DEFINE_LABELS
-#endif /* DEFINE_LABELS */
-
-#ifdef DEFINE_SWITCH
-
-/* If hyper-fast [well not unnecessarily slow] execution is selected, turn
-   off frills like tracing and profiling.  */
-/* FIXME: A better way would be to have TRACE_RESULT check for something
-   that can cause it to be optimized out.  Another way would be to emit
-   special handlers into the instruction "stream".  */
-
-#if FAST_P
-#undef TRACE_RESULT
-#define TRACE_RESULT(cpu, abuf, name, type, val)
-#endif
-
-#undef GET_ATTR
-#if defined (__STDC__) || defined (ALMOST_STDC) || defined (HAVE_STRINGIZE)
-#define GET_ATTR(cpu, num, attr) CGEN_ATTR_VALUE (NULL, abuf->idesc->attrs, CGEN_INSN_##attr)
-#else
-#define GET_ATTR(cpu, num, attr) CGEN_ATTR_VALUE (NULL, abuf->idesc->attrs, CGEN_INSN_/**/attr)
-#endif
-
-{
-
-#if WITH_SCACHE_PBB
-
-/* Branch to next handler without going around main loop.  */
-#define NEXT(vpc) goto * SEM_ARGBUF (vpc) -> semantic.sem_case
-SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case)
-
-#else /* ! WITH_SCACHE_PBB */
-
-#define NEXT(vpc) BREAK (sem)
-#ifdef __GNUC__
-#if FAST_P
-  SWITCH (sem, SEM_ARGBUF (sc) -> idesc->sem_fast_lab)
-#else
-  SWITCH (sem, SEM_ARGBUF (sc) -> idesc->sem_full_lab)
-#endif
-#else
-  SWITCH (sem, SEM_ARGBUF (sc) -> idesc->num)
-#endif
-
-#endif /* ! WITH_SCACHE_PBB */
-
-    {
-
-  CASE (sem, INSN_X_INVALID) : /* --invalid-- */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.fmt_empty.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 0);
-
-  {
-    /* Update the recorded pc in the cpu state struct.
-       Only necessary for WITH_SCACHE case, but to avoid the
-       conditional compilation ....  */
-    SET_H_PC (pc);
-    /* Virtual insns have zero size.  Overwrite vpc with address of next insn
-       using the default-insn-bitsize spec.  When executing insns in parallel
-       we may want to queue the fault and continue execution.  */
-    vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-    vpc = sim_engine_invalid_insn (current_cpu, pc, vpc);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_X_AFTER) : /* --after-- */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.fmt_empty.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 0);
-
-  {
-#if WITH_SCACHE_PBB_SH64_COMPACT
-    sh64_compact_pbb_after (current_cpu, sem_arg);
-#endif
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_X_BEFORE) : /* --before-- */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.fmt_empty.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 0);
-
-  {
-#if WITH_SCACHE_PBB_SH64_COMPACT
-    sh64_compact_pbb_before (current_cpu, sem_arg);
-#endif
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_X_CTI_CHAIN) : /* --cti-chain-- */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.fmt_empty.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 0);
-
-  {
-#if WITH_SCACHE_PBB_SH64_COMPACT
-#ifdef DEFINE_SWITCH
-    vpc = sh64_compact_pbb_cti_chain (current_cpu, sem_arg,
-			       pbb_br_type, pbb_br_npc);
-    BREAK (sem);
-#else
-    /* FIXME: Allow provision of explicit ifmt spec in insn spec.  */
-    vpc = sh64_compact_pbb_cti_chain (current_cpu, sem_arg,
-			       CPU_PBB_BR_TYPE (current_cpu),
-			       CPU_PBB_BR_NPC (current_cpu));
-#endif
-#endif
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_X_CHAIN) : /* --chain-- */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.fmt_empty.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 0);
-
-  {
-#if WITH_SCACHE_PBB_SH64_COMPACT
-    vpc = sh64_compact_pbb_chain (current_cpu, sem_arg);
-#ifdef DEFINE_SWITCH
-    BREAK (sem);
-#endif
-#endif
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_X_BEGIN) : /* --begin-- */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.fmt_empty.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 0);
-
-  {
-#if WITH_SCACHE_PBB_SH64_COMPACT
-#if defined DEFINE_SWITCH || defined FAST_P
-    /* In the switch case FAST_P is a constant, allowing several optimizations
-       in any called inline functions.  */
-    vpc = sh64_compact_pbb_begin (current_cpu, FAST_P);
-#else
-#if 0 /* cgen engine can't handle dynamic fast/full switching yet.  */
-    vpc = sh64_compact_pbb_begin (current_cpu, STATE_RUN_FAST_P (CPU_STATE (current_cpu)));
-#else
-    vpc = sh64_compact_pbb_begin (current_cpu, 0);
-#endif
-#endif
-#endif
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_ADD_COMPACT) : /* add $rm, $rn */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    SI opval = ADDSI (GET_H_GRC (FLD (f_rn)), GET_H_GRC (FLD (f_rm)));
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_ADDI_COMPACT) : /* add #$imm8, $rn */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_addi_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    SI opval = ADDSI (GET_H_GRC (FLD (f_rn)), EXTQISI (ANDQI (FLD (f_imm8), 255)));
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_ADDC_COMPACT) : /* addc $rm, $rn */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-{
-  BI tmp_flag;
-  tmp_flag = ADDCFSI (GET_H_GRC (FLD (f_rn)), GET_H_GRC (FLD (f_rm)), GET_H_TBIT ());
-  {
-    SI opval = ADDCSI (GET_H_GRC (FLD (f_rn)), GET_H_GRC (FLD (f_rm)), GET_H_TBIT ());
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-  {
-    BI opval = tmp_flag;
-    SET_H_TBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
-  }
-}
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_ADDV_COMPACT) : /* addv $rm, $rn */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-{
-  BI tmp_t;
-  tmp_t = ADDOFSI (GET_H_GRC (FLD (f_rn)), GET_H_GRC (FLD (f_rm)), 0);
-  {
-    SI opval = ADDSI (GET_H_GRC (FLD (f_rn)), GET_H_GRC (FLD (f_rm)));
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-  {
-    BI opval = tmp_t;
-    SET_H_TBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
-  }
-}
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_AND_COMPACT) : /* and $rm64, $rn64 */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    DI opval = ANDDI (GET_H_GR (FLD (f_rm)), GET_H_GR (FLD (f_rn)));
-    SET_H_GR (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn64", 'D', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_ANDI_COMPACT) : /* and #$uimm8, r0 */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_addi_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    SI opval = ANDSI (GET_H_GRC (((UINT) 0)), ZEXTSIDI (FLD (f_imm8)));
-    SET_H_GRC (((UINT) 0), opval);
-    TRACE_RESULT (current_cpu, abuf, "r0", 'x', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_ANDB_COMPACT) : /* and.b #$imm8, @(r0, gbr) */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_addi_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-{
-  DI tmp_addr;
-  UQI tmp_data;
-  tmp_addr = ADDSI (GET_H_GRC (((UINT) 0)), GET_H_GBR ());
-  tmp_data = ANDQI (GETMEMUQI (current_cpu, pc, tmp_addr), FLD (f_imm8));
-  {
-    UQI opval = tmp_data;
-    SETMEMUQI (current_cpu, pc, tmp_addr, opval);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
-  }
-}
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_BF_COMPACT) : /* bf $disp8 */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_bf_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_BRANCH_INIT
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-if (NOTBI (GET_H_TBIT ())) {
-  {
-    UDI opval = FLD (i_disp8);
-    SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc);
-    written |= (1 << 2);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval);
-  }
-}
-
-  abuf->written = written;
-  SEM_BRANCH_FINI (vpc);
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_BFS_COMPACT) : /* bf/s $disp8 */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_bf_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_BRANCH_INIT
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-if (NOTBI (GET_H_TBIT ())) {
-{
-  {
-    UDI opval = FLD (i_disp8);
-    SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc);
-    written |= (1 << 2);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval);
-  }
-}
-}
-
-  abuf->written = written;
-  SEM_BRANCH_FINI (vpc);
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_BRA_COMPACT) : /* bra $disp12 */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_bra_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_BRANCH_INIT
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-{
-  {
-    UDI opval = FLD (i_disp12);
-    SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval);
-  }
-}
-
-  SEM_BRANCH_FINI (vpc);
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_BRAF_COMPACT) : /* braf $rn */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_BRANCH_INIT
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-{
-  {
-    UDI opval = ADDDI (EXTSIDI (GET_H_GRC (FLD (f_rn))), ADDDI (pc, 4));
-    SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval);
-  }
-}
-
-  SEM_BRANCH_FINI (vpc);
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_BRK_COMPACT) : /* brk */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.fmt_empty.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-sh64_break (current_cpu, pc);
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_BSR_COMPACT) : /* bsr $disp12 */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_bra_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_BRANCH_INIT
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-{
-{
-  {
-    SI opval = ADDDI (pc, 4);
-    SET_H_PR (opval);
-    TRACE_RESULT (current_cpu, abuf, "pr", 'x', opval);
-  }
-  {
-    UDI opval = FLD (i_disp12);
-    SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval);
-  }
-}
-}
-
-  SEM_BRANCH_FINI (vpc);
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_BSRF_COMPACT) : /* bsrf $rn */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_BRANCH_INIT
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-{
-{
-  {
-    SI opval = ADDDI (pc, 4);
-    SET_H_PR (opval);
-    TRACE_RESULT (current_cpu, abuf, "pr", 'x', opval);
-  }
-  {
-    UDI opval = ADDDI (EXTSIDI (GET_H_GRC (FLD (f_rn))), ADDDI (pc, 4));
-    SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval);
-  }
-}
-}
-
-  SEM_BRANCH_FINI (vpc);
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_BT_COMPACT) : /* bt $disp8 */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_bf_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_BRANCH_INIT
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-if (GET_H_TBIT ()) {
-  {
-    UDI opval = FLD (i_disp8);
-    SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc);
-    written |= (1 << 2);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval);
-  }
-}
-
-  abuf->written = written;
-  SEM_BRANCH_FINI (vpc);
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_BTS_COMPACT) : /* bt/s $disp8 */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_bf_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_BRANCH_INIT
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-if (GET_H_TBIT ()) {
-{
-  {
-    UDI opval = FLD (i_disp8);
-    SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc);
-    written |= (1 << 2);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval);
-  }
-}
-}
-
-  abuf->written = written;
-  SEM_BRANCH_FINI (vpc);
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_CLRMAC_COMPACT) : /* clrmac */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.fmt_empty.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-{
-  {
-    SI opval = 0;
-    SET_H_MACL (opval);
-    TRACE_RESULT (current_cpu, abuf, "macl", 'x', opval);
-  }
-  {
-    SI opval = 0;
-    SET_H_MACH (opval);
-    TRACE_RESULT (current_cpu, abuf, "mach", 'x', opval);
-  }
-}
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_CLRS_COMPACT) : /* clrs */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.fmt_empty.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    BI opval = 0;
-    SET_H_SBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "sbit", 'x', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_CLRT_COMPACT) : /* clrt */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.fmt_empty.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    BI opval = 0;
-    SET_H_TBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_CMPEQ_COMPACT) : /* cmp/eq $rm, $rn */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    BI opval = EQSI (GET_H_GRC (FLD (f_rm)), GET_H_GRC (FLD (f_rn)));
-    SET_H_TBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_CMPEQI_COMPACT) : /* cmp/eq #$imm8, r0 */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_addi_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    BI opval = EQSI (GET_H_GRC (((UINT) 0)), EXTQISI (ANDQI (FLD (f_imm8), 255)));
-    SET_H_TBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_CMPGE_COMPACT) : /* cmp/ge $rm, $rn */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    BI opval = GESI (GET_H_GRC (FLD (f_rn)), GET_H_GRC (FLD (f_rm)));
-    SET_H_TBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_CMPGT_COMPACT) : /* cmp/gt $rm, $rn */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    BI opval = GTSI (GET_H_GRC (FLD (f_rn)), GET_H_GRC (FLD (f_rm)));
-    SET_H_TBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_CMPHI_COMPACT) : /* cmp/hi $rm, $rn */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    BI opval = GTUSI (GET_H_GRC (FLD (f_rn)), GET_H_GRC (FLD (f_rm)));
-    SET_H_TBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_CMPHS_COMPACT) : /* cmp/hs $rm, $rn */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    BI opval = GEUSI (GET_H_GRC (FLD (f_rn)), GET_H_GRC (FLD (f_rm)));
-    SET_H_TBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_CMPPL_COMPACT) : /* cmp/pl $rn */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    BI opval = GTSI (GET_H_GRC (FLD (f_rn)), 0);
-    SET_H_TBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_CMPPZ_COMPACT) : /* cmp/pz $rn */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    BI opval = GESI (GET_H_GRC (FLD (f_rn)), 0);
-    SET_H_TBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_CMPSTR_COMPACT) : /* cmp/str $rm, $rn */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-{
-  BI tmp_t;
-  SI tmp_temp;
-  tmp_temp = XORSI (GET_H_GRC (FLD (f_rm)), GET_H_GRC (FLD (f_rn)));
-  tmp_t = EQSI (ANDSI (tmp_temp, 0xff000000), 0);
-  tmp_t = ORBI (EQSI (ANDSI (tmp_temp, 16711680), 0), tmp_t);
-  tmp_t = ORBI (EQSI (ANDSI (tmp_temp, 65280), 0), tmp_t);
-  tmp_t = ORBI (EQSI (ANDSI (tmp_temp, 255), 0), tmp_t);
-  {
-    BI opval = ((GTUBI (tmp_t, 0)) ? (1) : (0));
-    SET_H_TBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
-  }
-}
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_DIV0S_COMPACT) : /* div0s $rm, $rn */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-{
-  {
-    BI opval = SRLSI (GET_H_GRC (FLD (f_rn)), 31);
-    SET_H_QBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "qbit", 'x', opval);
-  }
-  {
-    BI opval = SRLSI (GET_H_GRC (FLD (f_rm)), 31);
-    SET_H_MBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "mbit", 'x', opval);
-  }
-  {
-    BI opval = ((EQSI (SRLSI (GET_H_GRC (FLD (f_rm)), 31), SRLSI (GET_H_GRC (FLD (f_rn)), 31))) ? (0) : (1));
-    SET_H_TBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
-  }
-}
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_DIV0U_COMPACT) : /* div0u */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.fmt_empty.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-{
-  {
-    BI opval = 0;
-    SET_H_TBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
-  }
-  {
-    BI opval = 0;
-    SET_H_QBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "qbit", 'x', opval);
-  }
-  {
-    BI opval = 0;
-    SET_H_MBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "mbit", 'x', opval);
-  }
-}
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_DIV1_COMPACT) : /* div1 $rm, $rn */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-{
-  BI tmp_oldq;
-  SI tmp_tmp0;
-  UQI tmp_tmp1;
-  tmp_oldq = GET_H_QBIT ();
-  {
-    BI opval = SRLSI (GET_H_GRC (FLD (f_rn)), 31);
-    SET_H_QBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "qbit", 'x', opval);
-  }
-  {
-    SI opval = ORSI (SLLSI (GET_H_GRC (FLD (f_rn)), 1), ZEXTBISI (GET_H_TBIT ()));
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-if (NOTBI (tmp_oldq)) {
-if (NOTBI (GET_H_MBIT ())) {
-{
-  tmp_tmp0 = GET_H_GRC (FLD (f_rn));
-  {
-    SI opval = SUBSI (GET_H_GRC (FLD (f_rn)), GET_H_GRC (FLD (f_rm)));
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-  tmp_tmp1 = GTUSI (GET_H_GRC (FLD (f_rn)), tmp_tmp0);
-if (NOTBI (GET_H_QBIT ())) {
-  {
-    BI opval = ((tmp_tmp1) ? (1) : (0));
-    SET_H_QBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "qbit", 'x', opval);
-  }
-} else {
-  {
-    BI opval = ((EQQI (tmp_tmp1, 0)) ? (1) : (0));
-    SET_H_QBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "qbit", 'x', opval);
-  }
-}
-}
-} else {
-{
-  tmp_tmp0 = GET_H_GRC (FLD (f_rn));
-  {
-    SI opval = ADDSI (GET_H_GRC (FLD (f_rn)), GET_H_GRC (FLD (f_rm)));
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-  tmp_tmp1 = LTUSI (GET_H_GRC (FLD (f_rn)), tmp_tmp0);
-if (NOTBI (GET_H_QBIT ())) {
-  {
-    BI opval = ((EQQI (tmp_tmp1, 0)) ? (1) : (0));
-    SET_H_QBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "qbit", 'x', opval);
-  }
-} else {
-  {
-    BI opval = ((tmp_tmp1) ? (1) : (0));
-    SET_H_QBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "qbit", 'x', opval);
-  }
-}
-}
-}
-} else {
-if (NOTBI (GET_H_MBIT ())) {
-{
-  tmp_tmp0 = GET_H_GRC (FLD (f_rn));
-  {
-    SI opval = ADDSI (GET_H_GRC (FLD (f_rm)), GET_H_GRC (FLD (f_rn)));
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-  tmp_tmp1 = LTUSI (GET_H_GRC (FLD (f_rn)), tmp_tmp0);
-if (NOTBI (GET_H_QBIT ())) {
-  {
-    BI opval = ((tmp_tmp1) ? (1) : (0));
-    SET_H_QBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "qbit", 'x', opval);
-  }
-} else {
-  {
-    BI opval = ((EQQI (tmp_tmp1, 0)) ? (1) : (0));
-    SET_H_QBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "qbit", 'x', opval);
-  }
-}
-}
-} else {
-{
-  tmp_tmp0 = GET_H_GRC (FLD (f_rn));
-  {
-    SI opval = SUBSI (GET_H_GRC (FLD (f_rn)), GET_H_GRC (FLD (f_rm)));
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-  tmp_tmp1 = GTUSI (GET_H_GRC (FLD (f_rn)), tmp_tmp0);
-if (NOTBI (GET_H_QBIT ())) {
-  {
-    BI opval = ((EQQI (tmp_tmp1, 0)) ? (1) : (0));
-    SET_H_QBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "qbit", 'x', opval);
-  }
-} else {
-  {
-    BI opval = ((tmp_tmp1) ? (1) : (0));
-    SET_H_QBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "qbit", 'x', opval);
-  }
-}
-}
-}
-}
-  {
-    BI opval = ((EQBI (GET_H_QBIT (), GET_H_MBIT ())) ? (1) : (0));
-    SET_H_TBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
-  }
-}
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_DMULSL_COMPACT) : /* dmuls.l $rm, $rn */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-{
-  DI tmp_result;
-  tmp_result = MULDI (EXTSIDI (GET_H_GRC (FLD (f_rm))), EXTSIDI (GET_H_GRC (FLD (f_rn))));
-  {
-    SI opval = SUBWORDDISI (tmp_result, 0);
-    SET_H_MACH (opval);
-    TRACE_RESULT (current_cpu, abuf, "mach", 'x', opval);
-  }
-  {
-    SI opval = SUBWORDDISI (tmp_result, 1);
-    SET_H_MACL (opval);
-    TRACE_RESULT (current_cpu, abuf, "macl", 'x', opval);
-  }
-}
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_DMULUL_COMPACT) : /* dmulu.l $rm, $rn */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-{
-  DI tmp_result;
-  tmp_result = MULDI (ZEXTSIDI (GET_H_GRC (FLD (f_rm))), ZEXTSIDI (GET_H_GRC (FLD (f_rn))));
-  {
-    SI opval = SUBWORDDISI (tmp_result, 0);
-    SET_H_MACH (opval);
-    TRACE_RESULT (current_cpu, abuf, "mach", 'x', opval);
-  }
-  {
-    SI opval = SUBWORDDISI (tmp_result, 1);
-    SET_H_MACL (opval);
-    TRACE_RESULT (current_cpu, abuf, "macl", 'x', opval);
-  }
-}
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_DT_COMPACT) : /* dt $rn */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-{
-  {
-    SI opval = SUBSI (GET_H_GRC (FLD (f_rn)), 1);
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-  {
-    BI opval = EQSI (GET_H_GRC (FLD (f_rn)), 0);
-    SET_H_TBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
-  }
-}
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_EXTSB_COMPACT) : /* exts.b $rm, $rn */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    SI opval = EXTQISI (SUBWORDSIQI (GET_H_GRC (FLD (f_rm)), 3));
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_EXTSW_COMPACT) : /* exts.w $rm, $rn */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    SI opval = EXTHISI (SUBWORDSIHI (GET_H_GRC (FLD (f_rm)), 1));
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_EXTUB_COMPACT) : /* extu.b $rm, $rn */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    SI opval = ZEXTQISI (SUBWORDSIQI (GET_H_GRC (FLD (f_rm)), 3));
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_EXTUW_COMPACT) : /* extu.w $rm, $rn */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    SI opval = ZEXTHISI (SUBWORDSIHI (GET_H_GRC (FLD (f_rm)), 1));
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_FABS_COMPACT) : /* fabs $fsdn */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-if (GET_H_PRBIT ()) {
-  {
-    DF opval = sh64_fabsd (current_cpu, GET_H_DR (FLD (f_rn)));
-    SET_H_DR (FLD (f_rn), opval);
-    written |= (1 << 5);
-    TRACE_RESULT (current_cpu, abuf, "dr-index-of--DFLT-fsdn", 'f', opval);
-  }
-} else {
-  {
-    SF opval = sh64_fabss (current_cpu, GET_H_FRC (FLD (f_rn)));
-    SET_H_FRC (FLD (f_rn), opval);
-    written |= (1 << 4);
-    TRACE_RESULT (current_cpu, abuf, "fsdn", 'f', opval);
-  }
-}
-
-  abuf->written = written;
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_FADD_COMPACT) : /* fadd $fsdm, $fsdn */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-if (GET_H_PRBIT ()) {
-  {
-    DF opval = sh64_faddd (current_cpu, GET_H_DR (FLD (f_rm)), GET_H_DR (FLD (f_rn)));
-    SET_H_DR (FLD (f_rn), opval);
-    written |= (1 << 8);
-    TRACE_RESULT (current_cpu, abuf, "dr-index-of--DFLT-fsdn", 'f', opval);
-  }
-} else {
-  {
-    SF opval = sh64_fadds (current_cpu, GET_H_FRC (FLD (f_rm)), GET_H_FRC (FLD (f_rn)));
-    SET_H_FRC (FLD (f_rn), opval);
-    written |= (1 << 7);
-    TRACE_RESULT (current_cpu, abuf, "fsdn", 'f', opval);
-  }
-}
-
-  abuf->written = written;
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_FCMPEQ_COMPACT) : /* fcmp/eq $fsdm, $fsdn */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-if (GET_H_PRBIT ()) {
-  {
-    BI opval = sh64_fcmpeqd (current_cpu, GET_H_DR (FLD (f_rm)), GET_H_DR (FLD (f_rn)));
-    SET_H_TBIT (opval);
-    written |= (1 << 7);
-    TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
-  }
-} else {
-  {
-    BI opval = sh64_fcmpeqs (current_cpu, GET_H_FRC (FLD (f_rm)), GET_H_FRC (FLD (f_rn)));
-    SET_H_TBIT (opval);
-    written |= (1 << 7);
-    TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
-  }
-}
-
-  abuf->written = written;
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_FCMPGT_COMPACT) : /* fcmp/gt $fsdm, $fsdn */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-if (GET_H_PRBIT ()) {
-  {
-    BI opval = sh64_fcmpgtd (current_cpu, GET_H_DR (FLD (f_rn)), GET_H_DR (FLD (f_rm)));
-    SET_H_TBIT (opval);
-    written |= (1 << 7);
-    TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
-  }
-} else {
-  {
-    BI opval = sh64_fcmpgts (current_cpu, GET_H_FRC (FLD (f_rn)), GET_H_FRC (FLD (f_rm)));
-    SET_H_TBIT (opval);
-    written |= (1 << 7);
-    TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
-  }
-}
-
-  abuf->written = written;
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_FCNVDS_COMPACT) : /* fcnvds $drn, fpul */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_fcnvds_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    SF opval = sh64_fcnvds (current_cpu, GET_H_DRC (FLD (f_dn)));
-    CPU (h_fr[((UINT) 32)]) = opval;
-    TRACE_RESULT (current_cpu, abuf, "fpul", 'f', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_FCNVSD_COMPACT) : /* fcnvsd fpul, $drn */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_fcnvds_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    DF opval = sh64_fcnvsd (current_cpu, CPU (h_fr[((UINT) 32)]));
-    SET_H_DRC (FLD (f_dn), opval);
-    TRACE_RESULT (current_cpu, abuf, "drn", 'f', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_FDIV_COMPACT) : /* fdiv $fsdm, $fsdn */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-if (GET_H_PRBIT ()) {
-  {
-    DF opval = sh64_fdivd (current_cpu, GET_H_DR (FLD (f_rn)), GET_H_DR (FLD (f_rm)));
-    SET_H_DR (FLD (f_rn), opval);
-    written |= (1 << 8);
-    TRACE_RESULT (current_cpu, abuf, "dr-index-of--DFLT-fsdn", 'f', opval);
-  }
-} else {
-  {
-    SF opval = sh64_fdivs (current_cpu, GET_H_FRC (FLD (f_rn)), GET_H_FRC (FLD (f_rm)));
-    SET_H_FRC (FLD (f_rn), opval);
-    written |= (1 << 7);
-    TRACE_RESULT (current_cpu, abuf, "fsdn", 'f', opval);
-  }
-}
-
-  abuf->written = written;
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_FIPR_COMPACT) : /* fipr $fvm, $fvn */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_fipr_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-{
-  QI tmp_m;
-  QI tmp_n;
-  SF tmp_res;
-  tmp_m = FLD (f_vm);
-  tmp_n = FLD (f_vn);
-  tmp_res = sh64_fmuls (current_cpu, GET_H_FVC (FLD (f_vm)), GET_H_FVC (FLD (f_vn)));
-  tmp_res = sh64_fadds (current_cpu, tmp_res, sh64_fmuls (current_cpu, GET_H_FRC (ADDQI (tmp_m, 1)), GET_H_FRC (ADDQI (tmp_n, 1))));
-  tmp_res = sh64_fadds (current_cpu, tmp_res, sh64_fmuls (current_cpu, GET_H_FRC (ADDQI (tmp_m, 2)), GET_H_FRC (ADDQI (tmp_n, 2))));
-  tmp_res = sh64_fadds (current_cpu, tmp_res, sh64_fmuls (current_cpu, GET_H_FRC (ADDQI (tmp_m, 3)), GET_H_FRC (ADDQI (tmp_n, 3))));
-  {
-    SF opval = tmp_res;
-    SET_H_FRC (ADDQI (tmp_n, 3), opval);
-    TRACE_RESULT (current_cpu, abuf, "frc-add--DFLT-n-3", 'f', opval);
-  }
-}
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_FLDS_COMPACT) : /* flds $frn */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    SF opval = GET_H_FRC (FLD (f_rn));
-    CPU (h_fr[((UINT) 32)]) = opval;
-    TRACE_RESULT (current_cpu, abuf, "fpul", 'f', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_FLDI0_COMPACT) : /* fldi0 $frn */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    SF opval = sh64_fldi0 (current_cpu);
-    SET_H_FRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "frn", 'f', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_FLDI1_COMPACT) : /* fldi1 $frn */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    SF opval = sh64_fldi1 (current_cpu);
-    SET_H_FRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "frn", 'f', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_FLOAT_COMPACT) : /* float fpul, $fsdn */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-if (GET_H_PRBIT ()) {
-  {
-    DF opval = sh64_floatld (current_cpu, CPU (h_fr[((UINT) 32)]));
-    SET_H_DR (FLD (f_rn), opval);
-    written |= (1 << 4);
-    TRACE_RESULT (current_cpu, abuf, "dr-index-of--DFLT-fsdn", 'f', opval);
-  }
-} else {
-  {
-    SF opval = sh64_floatls (current_cpu, CPU (h_fr[((UINT) 32)]));
-    SET_H_FRC (FLD (f_rn), opval);
-    written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "fsdn", 'f', opval);
-  }
-}
-
-  abuf->written = written;
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_FMAC_COMPACT) : /* fmac fr0, $frm, $frn */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    SF opval = sh64_fmacs (current_cpu, GET_H_FRC (((UINT) 0)), GET_H_FRC (FLD (f_rm)), GET_H_FRC (FLD (f_rn)));
-    SET_H_FRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "frn", 'f', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_FMOV1_COMPACT) : /* fmov $frm, $frn */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-if (NOTBI (GET_H_SZBIT ())) {
-  {
-    SF opval = GET_H_FRC (FLD (f_rm));
-    SET_H_FRC (FLD (f_rn), opval);
-    written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "frn", 'f', opval);
-  }
-} else {
-if (EQSI (ANDSI (FLD (f_rm), 1), 1)) {
-if (EQSI (ANDSI (FLD (f_rn), 1), 1)) {
-  {
-    DF opval = GET_H_XD (((FLD (f_rm)) & (INVQI (1))));
-    SET_H_XD (((FLD (f_rn)) & (INVQI (1))), opval);
-    written |= (1 << 8);
-    TRACE_RESULT (current_cpu, abuf, "xd-and--DFLT-index-of--DFLT-frn-inv--QI-1", 'f', opval);
-  }
-} else {
-  {
-    DF opval = GET_H_XD (((FLD (f_rm)) & (INVQI (1))));
-    SET_H_DR (FLD (f_rn), opval);
-    written |= (1 << 7);
-    TRACE_RESULT (current_cpu, abuf, "dr-index-of--DFLT-frn", 'f', opval);
-  }
-}
-} else {
-if (EQSI (ANDSI (FLD (f_rn), 1), 1)) {
-  {
-    DF opval = GET_H_DR (FLD (f_rm));
-    SET_H_XD (((FLD (f_rn)) & (INVQI (1))), opval);
-    written |= (1 << 8);
-    TRACE_RESULT (current_cpu, abuf, "xd-and--DFLT-index-of--DFLT-frn-inv--QI-1", 'f', opval);
-  }
-} else {
-  {
-    DF opval = GET_H_DR (FLD (f_rm));
-    SET_H_DR (FLD (f_rn), opval);
-    written |= (1 << 7);
-    TRACE_RESULT (current_cpu, abuf, "dr-index-of--DFLT-frn", 'f', opval);
-  }
-}
-}
-}
-
-  abuf->written = written;
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_FMOV2_COMPACT) : /* fmov @$rm, $frn */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-if (NOTBI (GET_H_SZBIT ())) {
-  {
-    SF opval = GETMEMSF (current_cpu, pc, GET_H_GRC (FLD (f_rm)));
-    SET_H_FRC (FLD (f_rn), opval);
-    written |= (1 << 5);
-    TRACE_RESULT (current_cpu, abuf, "frn", 'f', opval);
-  }
-} else {
-if (EQSI (ANDSI (FLD (f_rn), 1), 1)) {
-  {
-    DF opval = GETMEMDF (current_cpu, pc, GET_H_GRC (FLD (f_rm)));
-    SET_H_XD (((FLD (f_rn)) & (INVQI (1))), opval);
-    written |= (1 << 7);
-    TRACE_RESULT (current_cpu, abuf, "xd-and--DFLT-index-of--DFLT-frn-inv--QI-1", 'f', opval);
-  }
-} else {
-  {
-    DF opval = GETMEMDF (current_cpu, pc, GET_H_GRC (FLD (f_rm)));
-    SET_H_DR (FLD (f_rn), opval);
-    written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "dr-index-of--DFLT-frn", 'f', opval);
-  }
-}
-}
-
-  abuf->written = written;
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_FMOV3_COMPACT) : /* fmov @${rm}+, frn */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-if (NOTBI (GET_H_SZBIT ())) {
-{
-  {
-    SF opval = GETMEMSF (current_cpu, pc, GET_H_GRC (FLD (f_rm)));
-    SET_H_FRC (FLD (f_rn), opval);
-    written |= (1 << 5);
-    TRACE_RESULT (current_cpu, abuf, "frn", 'f', opval);
-  }
-  {
-    SI opval = ADDSI (GET_H_GRC (FLD (f_rm)), 4);
-    SET_H_GRC (FLD (f_rm), opval);
-    written |= (1 << 8);
-    TRACE_RESULT (current_cpu, abuf, "rm", 'x', opval);
-  }
-}
-} else {
-{
-if (EQSI (ANDSI (FLD (f_rn), 1), 1)) {
-  {
-    DF opval = GETMEMDF (current_cpu, pc, GET_H_GRC (FLD (f_rm)));
-    SET_H_XD (((FLD (f_rn)) & (INVQI (1))), opval);
-    written |= (1 << 7);
-    TRACE_RESULT (current_cpu, abuf, "xd-and--DFLT-index-of--DFLT-frn-inv--QI-1", 'f', opval);
-  }
-} else {
-  {
-    DF opval = GETMEMDF (current_cpu, pc, GET_H_GRC (FLD (f_rm)));
-    SET_H_DR (FLD (f_rn), opval);
-    written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "dr-index-of--DFLT-frn", 'f', opval);
-  }
-}
-  {
-    SI opval = ADDSI (GET_H_GRC (FLD (f_rm)), 8);
-    SET_H_GRC (FLD (f_rm), opval);
-    written |= (1 << 8);
-    TRACE_RESULT (current_cpu, abuf, "rm", 'x', opval);
-  }
-}
-}
-
-  abuf->written = written;
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_FMOV4_COMPACT) : /* fmov @(r0, $rm), $frn */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-if (NOTBI (GET_H_SZBIT ())) {
-  {
-    SF opval = GETMEMSF (current_cpu, pc, ADDSI (GET_H_GRC (((UINT) 0)), GET_H_GRC (FLD (f_rm))));
-    SET_H_FRC (FLD (f_rn), opval);
-    written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "frn", 'f', opval);
-  }
-} else {
-if (EQSI (ANDSI (FLD (f_rn), 1), 1)) {
-  {
-    DF opval = GETMEMDF (current_cpu, pc, ADDSI (GET_H_GRC (((UINT) 0)), GET_H_GRC (FLD (f_rm))));
-    SET_H_XD (((FLD (f_rn)) & (INVQI (1))), opval);
-    written |= (1 << 8);
-    TRACE_RESULT (current_cpu, abuf, "xd-and--DFLT-index-of--DFLT-frn-inv--QI-1", 'f', opval);
-  }
-} else {
-  {
-    DF opval = GETMEMDF (current_cpu, pc, ADDSI (GET_H_GRC (((UINT) 0)), GET_H_GRC (FLD (f_rm))));
-    SET_H_DR (FLD (f_rn), opval);
-    written |= (1 << 7);
-    TRACE_RESULT (current_cpu, abuf, "dr-index-of--DFLT-frn", 'f', opval);
-  }
-}
-}
-
-  abuf->written = written;
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_FMOV5_COMPACT) : /* fmov $frm, @$rn */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-if (NOTBI (GET_H_SZBIT ())) {
-  {
-    SF opval = GET_H_FRC (FLD (f_rm));
-    SETMEMSF (current_cpu, pc, GET_H_GRC (FLD (f_rn)), opval);
-    written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'f', opval);
-  }
-} else {
-if (EQSI (ANDSI (FLD (f_rm), 1), 1)) {
-  {
-    DF opval = GET_H_XD (((FLD (f_rm)) & (INVQI (1))));
-    SETMEMDF (current_cpu, pc, GET_H_GRC (FLD (f_rn)), opval);
-    written |= (1 << 7);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'f', opval);
-  }
-} else {
-  {
-    DF opval = GET_H_DR (FLD (f_rm));
-    SETMEMDF (current_cpu, pc, GET_H_GRC (FLD (f_rn)), opval);
-    written |= (1 << 7);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'f', opval);
-  }
-}
-}
-
-  abuf->written = written;
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_FMOV6_COMPACT) : /* fmov $frm, @-$rn */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-if (NOTBI (GET_H_SZBIT ())) {
-{
-  {
-    SI opval = SUBSI (GET_H_GRC (FLD (f_rn)), 4);
-    SET_H_GRC (FLD (f_rn), opval);
-    written |= (1 << 8);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-  {
-    SF opval = GET_H_FRC (FLD (f_rm));
-    SETMEMSF (current_cpu, pc, GET_H_GRC (FLD (f_rn)), opval);
-    written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'f', opval);
-  }
-}
-} else {
-{
-  {
-    SI opval = SUBSI (GET_H_GRC (FLD (f_rn)), 8);
-    SET_H_GRC (FLD (f_rn), opval);
-    written |= (1 << 8);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-if (EQSI (ANDSI (FLD (f_rm), 1), 1)) {
-  {
-    DF opval = GET_H_XD (((FLD (f_rm)) & (INVQI (1))));
-    SETMEMDF (current_cpu, pc, GET_H_GRC (FLD (f_rn)), opval);
-    written |= (1 << 7);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'f', opval);
-  }
-} else {
-  {
-    DF opval = GET_H_DR (FLD (f_rm));
-    SETMEMDF (current_cpu, pc, GET_H_GRC (FLD (f_rn)), opval);
-    written |= (1 << 7);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'f', opval);
-  }
-}
-}
-}
-
-  abuf->written = written;
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_FMOV7_COMPACT) : /* fmov $frm, @(r0, $rn) */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-if (NOTBI (GET_H_SZBIT ())) {
-  {
-    SF opval = GET_H_FRC (FLD (f_rm));
-    SETMEMSF (current_cpu, pc, ADDSI (GET_H_GRC (((UINT) 0)), GET_H_GRC (FLD (f_rn))), opval);
-    written |= (1 << 7);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'f', opval);
-  }
-} else {
-if (EQSI (ANDSI (FLD (f_rm), 1), 1)) {
-  {
-    DF opval = GET_H_XD (((FLD (f_rm)) & (INVQI (1))));
-    SETMEMDF (current_cpu, pc, ADDSI (GET_H_GRC (((UINT) 0)), GET_H_GRC (FLD (f_rn))), opval);
-    written |= (1 << 8);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'f', opval);
-  }
-} else {
-  {
-    DF opval = GET_H_DR (FLD (f_rm));
-    SETMEMDF (current_cpu, pc, ADDSI (GET_H_GRC (((UINT) 0)), GET_H_GRC (FLD (f_rn))), opval);
-    written |= (1 << 8);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'f', opval);
-  }
-}
-}
-
-  abuf->written = written;
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_FMUL_COMPACT) : /* fmul $fsdm, $fsdn */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-if (GET_H_PRBIT ()) {
-  {
-    DF opval = sh64_fmuld (current_cpu, GET_H_DR (FLD (f_rm)), GET_H_DR (FLD (f_rn)));
-    SET_H_DR (FLD (f_rn), opval);
-    written |= (1 << 8);
-    TRACE_RESULT (current_cpu, abuf, "dr-index-of--DFLT-fsdn", 'f', opval);
-  }
-} else {
-  {
-    SF opval = sh64_fmuls (current_cpu, GET_H_FRC (FLD (f_rm)), GET_H_FRC (FLD (f_rn)));
-    SET_H_FRC (FLD (f_rn), opval);
-    written |= (1 << 7);
-    TRACE_RESULT (current_cpu, abuf, "fsdn", 'f', opval);
-  }
-}
-
-  abuf->written = written;
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_FNEG_COMPACT) : /* fneg $fsdn */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-if (GET_H_PRBIT ()) {
-  {
-    DF opval = sh64_fnegd (current_cpu, GET_H_DR (FLD (f_rn)));
-    SET_H_DR (FLD (f_rn), opval);
-    written |= (1 << 5);
-    TRACE_RESULT (current_cpu, abuf, "dr-index-of--DFLT-fsdn", 'f', opval);
-  }
-} else {
-  {
-    SF opval = sh64_fnegs (current_cpu, GET_H_FRC (FLD (f_rn)));
-    SET_H_FRC (FLD (f_rn), opval);
-    written |= (1 << 4);
-    TRACE_RESULT (current_cpu, abuf, "fsdn", 'f', opval);
-  }
-}
-
-  abuf->written = written;
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_FRCHG_COMPACT) : /* frchg */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.fmt_empty.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    BI opval = NOTBI (GET_H_FRBIT ());
-    SET_H_FRBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "frbit", 'x', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_FSCHG_COMPACT) : /* fschg */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.fmt_empty.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    BI opval = NOTBI (GET_H_SZBIT ());
-    SET_H_SZBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "szbit", 'x', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_FSQRT_COMPACT) : /* fsqrt $fsdn */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-if (GET_H_PRBIT ()) {
-  {
-    DF opval = sh64_fsqrtd (current_cpu, GET_H_DR (FLD (f_rn)));
-    SET_H_DR (FLD (f_rn), opval);
-    written |= (1 << 5);
-    TRACE_RESULT (current_cpu, abuf, "dr-index-of--DFLT-fsdn", 'f', opval);
-  }
-} else {
-  {
-    SF opval = sh64_fsqrts (current_cpu, GET_H_FRC (FLD (f_rn)));
-    SET_H_FRC (FLD (f_rn), opval);
-    written |= (1 << 4);
-    TRACE_RESULT (current_cpu, abuf, "fsdn", 'f', opval);
-  }
-}
-
-  abuf->written = written;
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_FSTS_COMPACT) : /* fsts fpul, $frn */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    SF opval = CPU (h_fr[((UINT) 32)]);
-    SET_H_FRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "frn", 'f', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_FSUB_COMPACT) : /* fsub $fsdm, $fsdn */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-if (GET_H_PRBIT ()) {
-  {
-    DF opval = sh64_fsubd (current_cpu, GET_H_DR (FLD (f_rn)), GET_H_DR (FLD (f_rm)));
-    SET_H_DR (FLD (f_rn), opval);
-    written |= (1 << 8);
-    TRACE_RESULT (current_cpu, abuf, "dr-index-of--DFLT-fsdn", 'f', opval);
-  }
-} else {
-  {
-    SF opval = sh64_fsubs (current_cpu, GET_H_FRC (FLD (f_rn)), GET_H_FRC (FLD (f_rm)));
-    SET_H_FRC (FLD (f_rn), opval);
-    written |= (1 << 7);
-    TRACE_RESULT (current_cpu, abuf, "fsdn", 'f', opval);
-  }
-}
-
-  abuf->written = written;
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_FTRC_COMPACT) : /* ftrc $fsdn, fpul */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    SF opval = ((GET_H_PRBIT ()) ? (sh64_ftrcdl (current_cpu, GET_H_DR (FLD (f_rn)))) : (sh64_ftrcsl (current_cpu, GET_H_FRC (FLD (f_rn)))));
-    CPU (h_fr[((UINT) 32)]) = opval;
-    TRACE_RESULT (current_cpu, abuf, "fpul", 'f', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_FTRV_COMPACT) : /* ftrv xmtrx, $fvn */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_fipr_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-{
-  QI tmp_n;
-  SF tmp_res;
-  tmp_n = FLD (f_vn);
-  tmp_res = sh64_fmuls (current_cpu, GET_H_XF (((UINT) 0)), GET_H_FRC (tmp_n));
-  tmp_res = sh64_fadds (current_cpu, tmp_res, sh64_fmuls (current_cpu, GET_H_XF (((UINT) 4)), GET_H_FRC (ADDQI (tmp_n, 1))));
-  tmp_res = sh64_fadds (current_cpu, tmp_res, sh64_fmuls (current_cpu, GET_H_XF (((UINT) 8)), GET_H_FRC (ADDQI (tmp_n, 2))));
-  tmp_res = sh64_fadds (current_cpu, tmp_res, sh64_fmuls (current_cpu, GET_H_XF (((UINT) 12)), GET_H_FRC (ADDQI (tmp_n, 3))));
-  {
-    SF opval = tmp_res;
-    SET_H_FRC (tmp_n, opval);
-    TRACE_RESULT (current_cpu, abuf, "frc-n", 'f', opval);
-  }
-  tmp_res = sh64_fmuls (current_cpu, GET_H_XF (((UINT) 1)), GET_H_FRC (tmp_n));
-  tmp_res = sh64_fadds (current_cpu, tmp_res, sh64_fmuls (current_cpu, GET_H_XF (((UINT) 5)), GET_H_FRC (ADDQI (tmp_n, 1))));
-  tmp_res = sh64_fadds (current_cpu, tmp_res, sh64_fmuls (current_cpu, GET_H_XF (((UINT) 9)), GET_H_FRC (ADDQI (tmp_n, 2))));
-  tmp_res = sh64_fadds (current_cpu, tmp_res, sh64_fmuls (current_cpu, GET_H_XF (((UINT) 13)), GET_H_FRC (ADDQI (tmp_n, 3))));
-  {
-    SF opval = tmp_res;
-    SET_H_FRC (ADDQI (tmp_n, 1), opval);
-    TRACE_RESULT (current_cpu, abuf, "frc-add--DFLT-n-1", 'f', opval);
-  }
-  tmp_res = sh64_fmuls (current_cpu, GET_H_XF (((UINT) 2)), GET_H_FRC (tmp_n));
-  tmp_res = sh64_fadds (current_cpu, tmp_res, sh64_fmuls (current_cpu, GET_H_XF (((UINT) 6)), GET_H_FRC (ADDQI (tmp_n, 1))));
-  tmp_res = sh64_fadds (current_cpu, tmp_res, sh64_fmuls (current_cpu, GET_H_XF (((UINT) 10)), GET_H_FRC (ADDQI (tmp_n, 2))));
-  tmp_res = sh64_fadds (current_cpu, tmp_res, sh64_fmuls (current_cpu, GET_H_XF (((UINT) 14)), GET_H_FRC (ADDQI (tmp_n, 3))));
-  {
-    SF opval = tmp_res;
-    SET_H_FRC (ADDQI (tmp_n, 2), opval);
-    TRACE_RESULT (current_cpu, abuf, "frc-add--DFLT-n-2", 'f', opval);
-  }
-  tmp_res = sh64_fmuls (current_cpu, GET_H_XF (((UINT) 3)), GET_H_FRC (tmp_n));
-  tmp_res = sh64_fadds (current_cpu, tmp_res, sh64_fmuls (current_cpu, GET_H_XF (((UINT) 7)), GET_H_FRC (ADDQI (tmp_n, 1))));
-  tmp_res = sh64_fadds (current_cpu, tmp_res, sh64_fmuls (current_cpu, GET_H_XF (((UINT) 11)), GET_H_FRC (ADDQI (tmp_n, 2))));
-  tmp_res = sh64_fadds (current_cpu, tmp_res, sh64_fmuls (current_cpu, GET_H_XF (((UINT) 15)), GET_H_FRC (ADDQI (tmp_n, 3))));
-  {
-    SF opval = tmp_res;
-    SET_H_FRC (ADDQI (tmp_n, 3), opval);
-    TRACE_RESULT (current_cpu, abuf, "frc-add--DFLT-n-3", 'f', opval);
-  }
-}
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_JMP_COMPACT) : /* jmp @$rn */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_BRANCH_INIT
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-{
-  {
-    UDI opval = GET_H_GRC (FLD (f_rn));
-    SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval);
-  }
-}
-
-  SEM_BRANCH_FINI (vpc);
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_JSR_COMPACT) : /* jsr @$rn */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_BRANCH_INIT
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-{
-{
-  {
-    SI opval = ADDDI (pc, 4);
-    SET_H_PR (opval);
-    TRACE_RESULT (current_cpu, abuf, "pr", 'x', opval);
-  }
-  {
-    UDI opval = GET_H_GRC (FLD (f_rn));
-    SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval);
-  }
-}
-}
-
-  SEM_BRANCH_FINI (vpc);
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_LDC_COMPACT) : /* ldc $rn, gbr */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    SI opval = GET_H_GRC (FLD (f_rn));
-    SET_H_GBR (opval);
-    TRACE_RESULT (current_cpu, abuf, "gbr", 'x', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_LDCL_COMPACT) : /* ldc.l @${rn}+, gbr */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-{
-  {
-    SI opval = GETMEMSI (current_cpu, pc, GET_H_GRC (FLD (f_rn)));
-    SET_H_GBR (opval);
-    TRACE_RESULT (current_cpu, abuf, "gbr", 'x', opval);
-  }
-  {
-    SI opval = ADDSI (GET_H_GRC (FLD (f_rn)), 4);
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-}
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_LDS_FPSCR_COMPACT) : /* lds $rn, fpscr */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    SI opval = GET_H_GRC (FLD (f_rn));
-    SET_H_FPCCR (opval);
-    TRACE_RESULT (current_cpu, abuf, "fpscr", 'x', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_LDSL_FPSCR_COMPACT) : /* lds.l @${rn}+, fpscr */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-{
-  {
-    SI opval = GETMEMSI (current_cpu, pc, GET_H_GRC (FLD (f_rn)));
-    SET_H_FPCCR (opval);
-    TRACE_RESULT (current_cpu, abuf, "fpscr", 'x', opval);
-  }
-  {
-    SI opval = ADDSI (GET_H_GRC (FLD (f_rn)), 4);
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-}
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_LDS_FPUL_COMPACT) : /* lds $rn, fpul */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    SF opval = SUBWORDSISF (GET_H_GRC (FLD (f_rn)));
-    CPU (h_fr[((UINT) 32)]) = opval;
-    TRACE_RESULT (current_cpu, abuf, "fpul", 'f', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_LDSL_FPUL_COMPACT) : /* lds.l @${rn}+, fpul */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-{
-  {
-    SF opval = GETMEMSF (current_cpu, pc, GET_H_GRC (FLD (f_rn)));
-    CPU (h_fr[((UINT) 32)]) = opval;
-    TRACE_RESULT (current_cpu, abuf, "fpul", 'f', opval);
-  }
-  {
-    SI opval = ADDSI (GET_H_GRC (FLD (f_rn)), 4);
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-}
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_LDS_MACH_COMPACT) : /* lds $rn, mach */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    SI opval = GET_H_GRC (FLD (f_rn));
-    SET_H_MACH (opval);
-    TRACE_RESULT (current_cpu, abuf, "mach", 'x', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_LDSL_MACH_COMPACT) : /* lds.l @${rn}+, mach */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-{
-  {
-    SI opval = GETMEMSI (current_cpu, pc, GET_H_GRC (FLD (f_rn)));
-    SET_H_MACH (opval);
-    TRACE_RESULT (current_cpu, abuf, "mach", 'x', opval);
-  }
-  {
-    SI opval = ADDSI (GET_H_GRC (FLD (f_rn)), 4);
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-}
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_LDS_MACL_COMPACT) : /* lds $rn, macl */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    SI opval = GET_H_GRC (FLD (f_rn));
-    SET_H_MACL (opval);
-    TRACE_RESULT (current_cpu, abuf, "macl", 'x', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_LDSL_MACL_COMPACT) : /* lds.l @${rn}+, macl */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-{
-  {
-    SI opval = GETMEMSI (current_cpu, pc, GET_H_GRC (FLD (f_rn)));
-    SET_H_MACL (opval);
-    TRACE_RESULT (current_cpu, abuf, "macl", 'x', opval);
-  }
-  {
-    SI opval = ADDSI (GET_H_GRC (FLD (f_rn)), 4);
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-}
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_LDS_PR_COMPACT) : /* lds $rn, pr */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    SI opval = GET_H_GRC (FLD (f_rn));
-    SET_H_PR (opval);
-    TRACE_RESULT (current_cpu, abuf, "pr", 'x', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_LDSL_PR_COMPACT) : /* lds.l @${rn}+, pr */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-{
-  {
-    SI opval = GETMEMSI (current_cpu, pc, GET_H_GRC (FLD (f_rn)));
-    SET_H_PR (opval);
-    TRACE_RESULT (current_cpu, abuf, "pr", 'x', opval);
-  }
-  {
-    SI opval = ADDSI (GET_H_GRC (FLD (f_rn)), 4);
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-}
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_MACL_COMPACT) : /* mac.l @${rm}+, @${rn}+ */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-{
-  DI tmp_tmpry;
-  DI tmp_mac;
-  DI tmp_result;
-  SI tmp_x;
-  SI tmp_y;
-  tmp_x = GETMEMSI (current_cpu, pc, GET_H_GRC (FLD (f_rn)));
-  {
-    SI opval = ADDSI (GET_H_GRC (FLD (f_rn)), 4);
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-if (EQSI (FLD (f_rn), FLD (f_rm))) {
-{
-  {
-    SI opval = ADDSI (GET_H_GRC (FLD (f_rn)), 4);
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-  {
-    SI opval = ADDSI (GET_H_GRC (FLD (f_rm)), 4);
-    SET_H_GRC (FLD (f_rm), opval);
-    written |= (1 << 11);
-    TRACE_RESULT (current_cpu, abuf, "rm", 'x', opval);
-  }
-}
-}
-  tmp_y = GETMEMSI (current_cpu, pc, GET_H_GRC (FLD (f_rm)));
-  {
-    SI opval = ADDSI (GET_H_GRC (FLD (f_rm)), 4);
-    SET_H_GRC (FLD (f_rm), opval);
-    written |= (1 << 11);
-    TRACE_RESULT (current_cpu, abuf, "rm", 'x', opval);
-  }
-  tmp_tmpry = MULDI (ZEXTSIDI (tmp_x), ZEXTSIDI (tmp_y));
-  tmp_mac = ORDI (SLLDI (ZEXTSIDI (GET_H_MACH ()), 32), ZEXTSIDI (GET_H_MACL ()));
-  tmp_result = ADDDI (tmp_mac, tmp_tmpry);
-{
-if (GET_H_SBIT ()) {
-{
-  SI tmp_min;
-  SI tmp_max;
-  tmp_max = SRLDI (INVDI (0), 16);
-  tmp_min = SRLDI (INVDI (0), 15);
-if (GTDI (tmp_result, tmp_max)) {
-  tmp_result = tmp_max;
-} else {
-if (LTDI (tmp_result, tmp_min)) {
-  tmp_result = tmp_min;
-}
-}
-}
-}
-  {
-    SI opval = SUBWORDDISI (tmp_result, 0);
-    SET_H_MACH (opval);
-    TRACE_RESULT (current_cpu, abuf, "mach", 'x', opval);
-  }
-  {
-    SI opval = SUBWORDDISI (tmp_result, 1);
-    SET_H_MACL (opval);
-    TRACE_RESULT (current_cpu, abuf, "macl", 'x', opval);
-  }
-}
-}
-
-  abuf->written = written;
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_MACW_COMPACT) : /* mac.w @${rm}+, @${rn}+ */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-{
-  SI tmp_tmpry;
-  DI tmp_mac;
-  DI tmp_result;
-  HI tmp_x;
-  HI tmp_y;
-  tmp_x = GETMEMHI (current_cpu, pc, GET_H_GRC (FLD (f_rn)));
-  {
-    SI opval = ADDSI (GET_H_GRC (FLD (f_rn)), 2);
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-if (EQSI (FLD (f_rn), FLD (f_rm))) {
-{
-  {
-    SI opval = ADDSI (GET_H_GRC (FLD (f_rn)), 2);
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-  {
-    SI opval = ADDSI (GET_H_GRC (FLD (f_rm)), 2);
-    SET_H_GRC (FLD (f_rm), opval);
-    written |= (1 << 11);
-    TRACE_RESULT (current_cpu, abuf, "rm", 'x', opval);
-  }
-}
-}
-  tmp_y = GETMEMHI (current_cpu, pc, GET_H_GRC (FLD (f_rm)));
-  {
-    SI opval = ADDSI (GET_H_GRC (FLD (f_rm)), 2);
-    SET_H_GRC (FLD (f_rm), opval);
-    written |= (1 << 11);
-    TRACE_RESULT (current_cpu, abuf, "rm", 'x', opval);
-  }
-  tmp_tmpry = MULSI (ZEXTHISI (tmp_x), ZEXTHISI (tmp_y));
-if (GET_H_SBIT ()) {
-{
-if (ADDOFSI (tmp_tmpry, GET_H_MACL (), 0)) {
-  {
-    SI opval = 1;
-    SET_H_MACH (opval);
-    written |= (1 << 9);
-    TRACE_RESULT (current_cpu, abuf, "mach", 'x', opval);
-  }
-}
-  {
-    SI opval = ADDSI (tmp_tmpry, GET_H_MACL ());
-    SET_H_MACL (opval);
-    written |= (1 << 10);
-    TRACE_RESULT (current_cpu, abuf, "macl", 'x', opval);
-  }
-}
-} else {
-{
-  tmp_mac = ORDI (SLLDI (ZEXTSIDI (GET_H_MACH ()), 32), ZEXTSIDI (GET_H_MACL ()));
-  tmp_result = ADDDI (tmp_mac, EXTSIDI (tmp_tmpry));
-  {
-    SI opval = SUBWORDDISI (tmp_result, 0);
-    SET_H_MACH (opval);
-    written |= (1 << 9);
-    TRACE_RESULT (current_cpu, abuf, "mach", 'x', opval);
-  }
-  {
-    SI opval = SUBWORDDISI (tmp_result, 1);
-    SET_H_MACL (opval);
-    written |= (1 << 10);
-    TRACE_RESULT (current_cpu, abuf, "macl", 'x', opval);
-  }
-}
-}
-}
-
-  abuf->written = written;
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_MOV_COMPACT) : /* mov $rm64, $rn64 */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    DI opval = GET_H_GR (FLD (f_rm));
-    SET_H_GR (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn64", 'D', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_MOVI_COMPACT) : /* mov #$imm8, $rn */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_addi_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    SI opval = EXTQIDI (ANDQI (FLD (f_imm8), 255));
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_MOVB1_COMPACT) : /* mov.b $rm, @$rn */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    UQI opval = SUBWORDSIUQI (GET_H_GRC (FLD (f_rm)), 3);
-    SETMEMUQI (current_cpu, pc, GET_H_GRC (FLD (f_rn)), opval);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_MOVB2_COMPACT) : /* mov.b $rm, @-$rn */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-{
-  DI tmp_addr;
-  tmp_addr = SUBSI (GET_H_GRC (FLD (f_rn)), 1);
-  {
-    UQI opval = SUBWORDSIUQI (GET_H_GRC (FLD (f_rm)), 3);
-    SETMEMUQI (current_cpu, pc, tmp_addr, opval);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
-  }
-  {
-    SI opval = tmp_addr;
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-}
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_MOVB3_COMPACT) : /* mov.b $rm, @(r0,$rn) */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    UQI opval = SUBWORDSIUQI (GET_H_GRC (FLD (f_rm)), 3);
-    SETMEMUQI (current_cpu, pc, ADDSI (GET_H_GRC (((UINT) 0)), GET_H_GRC (FLD (f_rn))), opval);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_MOVB4_COMPACT) : /* mov.b r0, @($imm8, gbr) */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_addi_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-{
-  DI tmp_addr;
-  tmp_addr = ADDSI (GET_H_GBR (), FLD (f_imm8));
-  {
-    UQI opval = SUBWORDSIUQI (GET_H_GRC (((UINT) 0)), 3);
-    SETMEMUQI (current_cpu, pc, tmp_addr, opval);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
-  }
-}
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_MOVB5_COMPACT) : /* mov.b r0, @($imm4, $rm) */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movb5_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-{
-  DI tmp_addr;
-  tmp_addr = ADDSI (GET_H_GRC (FLD (f_rm)), FLD (f_imm4));
-  {
-    UQI opval = SUBWORDSIUQI (GET_H_GRC (((UINT) 0)), 3);
-    SETMEMUQI (current_cpu, pc, tmp_addr, opval);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
-  }
-}
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_MOVB6_COMPACT) : /* mov.b @$rm, $rn */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    SI opval = EXTQISI (GETMEMQI (current_cpu, pc, GET_H_GRC (FLD (f_rm))));
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_MOVB7_COMPACT) : /* mov.b @${rm}+, $rn */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-{
-  QI tmp_data;
-  tmp_data = GETMEMQI (current_cpu, pc, GET_H_GRC (FLD (f_rm)));
-if (EQSI (FLD (f_rm), FLD (f_rn))) {
-  {
-    SI opval = EXTQISI (tmp_data);
-    SET_H_GRC (FLD (f_rm), opval);
-    written |= (1 << 4);
-    TRACE_RESULT (current_cpu, abuf, "rm", 'x', opval);
-  }
-} else {
-  {
-    SI opval = ADDSI (GET_H_GRC (FLD (f_rm)), 1);
-    SET_H_GRC (FLD (f_rm), opval);
-    written |= (1 << 4);
-    TRACE_RESULT (current_cpu, abuf, "rm", 'x', opval);
-  }
-}
-  {
-    SI opval = EXTQISI (tmp_data);
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-}
-
-  abuf->written = written;
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_MOVB8_COMPACT) : /* mov.b @(r0, $rm), $rn */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    SI opval = EXTQISI (GETMEMQI (current_cpu, pc, ADDSI (GET_H_GRC (((UINT) 0)), GET_H_GRC (FLD (f_rm)))));
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_MOVB9_COMPACT) : /* mov.b @($imm8, gbr), r0 */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_addi_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    SI opval = EXTQISI (GETMEMQI (current_cpu, pc, ADDSI (GET_H_GBR (), FLD (f_imm8))));
-    SET_H_GRC (((UINT) 0), opval);
-    TRACE_RESULT (current_cpu, abuf, "r0", 'x', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_MOVB10_COMPACT) : /* mov.b @($imm4, $rm), r0 */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movb5_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    SI opval = EXTQISI (GETMEMQI (current_cpu, pc, ADDSI (GET_H_GRC (FLD (f_rm)), FLD (f_imm4))));
-    SET_H_GRC (((UINT) 0), opval);
-    TRACE_RESULT (current_cpu, abuf, "r0", 'x', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_MOVL1_COMPACT) : /* mov.l $rm, @$rn */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    SI opval = GET_H_GRC (FLD (f_rm));
-    SETMEMSI (current_cpu, pc, GET_H_GRC (FLD (f_rn)), opval);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_MOVL2_COMPACT) : /* mov.l $rm, @-$rn */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-{
-  SI tmp_addr;
-  tmp_addr = SUBSI (GET_H_GRC (FLD (f_rn)), 4);
-  {
-    SI opval = GET_H_GRC (FLD (f_rm));
-    SETMEMSI (current_cpu, pc, tmp_addr, opval);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
-  }
-  {
-    SI opval = tmp_addr;
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-}
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_MOVL3_COMPACT) : /* mov.l $rm, @(r0, $rn) */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    SI opval = GET_H_GRC (FLD (f_rm));
-    SETMEMSI (current_cpu, pc, ADDSI (GET_H_GRC (((UINT) 0)), GET_H_GRC (FLD (f_rn))), opval);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_MOVL4_COMPACT) : /* mov.l r0, @($imm8x4, gbr) */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movl10_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    SI opval = GET_H_GRC (((UINT) 0));
-    SETMEMSI (current_cpu, pc, ADDSI (GET_H_GBR (), FLD (f_imm8x4)), opval);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_MOVL5_COMPACT) : /* mov.l $rm, @($imm4x4, $rn) */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    SI opval = GET_H_GRC (FLD (f_rm));
-    SETMEMSI (current_cpu, pc, ADDSI (GET_H_GRC (FLD (f_rn)), FLD (f_imm4x4)), opval);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_MOVL6_COMPACT) : /* mov.l @$rm, $rn */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    SI opval = GETMEMSI (current_cpu, pc, GET_H_GRC (FLD (f_rm)));
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_MOVL7_COMPACT) : /* mov.l @${rm}+, $rn */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-{
-  {
-    SI opval = GETMEMSI (current_cpu, pc, GET_H_GRC (FLD (f_rm)));
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-if (EQSI (FLD (f_rm), FLD (f_rn))) {
-  {
-    SI opval = GET_H_GRC (FLD (f_rn));
-    SET_H_GRC (FLD (f_rm), opval);
-    written |= (1 << 5);
-    TRACE_RESULT (current_cpu, abuf, "rm", 'x', opval);
-  }
-} else {
-  {
-    SI opval = ADDSI (GET_H_GRC (FLD (f_rm)), 4);
-    SET_H_GRC (FLD (f_rm), opval);
-    written |= (1 << 5);
-    TRACE_RESULT (current_cpu, abuf, "rm", 'x', opval);
-  }
-}
-}
-
-  abuf->written = written;
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_MOVL8_COMPACT) : /* mov.l @(r0, $rm), $rn */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    SI opval = GETMEMSI (current_cpu, pc, ADDSI (GET_H_GRC (((UINT) 0)), GET_H_GRC (FLD (f_rm))));
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_MOVL9_COMPACT) : /* mov.l @($imm8x4, gbr), r0 */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movl10_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    SI opval = GETMEMSI (current_cpu, pc, ADDSI (GET_H_GBR (), FLD (f_imm8x4)));
-    SET_H_GRC (((UINT) 0), opval);
-    TRACE_RESULT (current_cpu, abuf, "r0", 'x', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_MOVL10_COMPACT) : /* mov.l @($imm8x4, pc), $rn */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movl10_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    SI opval = GETMEMSI (current_cpu, pc, ADDSI (FLD (f_imm8x4), ANDDI (ADDDI (pc, 4), INVSI (3))));
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_MOVL11_COMPACT) : /* mov.l @($imm4x4, $rm), $rn */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    SI opval = GETMEMSI (current_cpu, pc, ADDSI (GET_H_GRC (FLD (f_rm)), FLD (f_imm4x4)));
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_MOVW1_COMPACT) : /* mov.w $rm, @$rn */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    HI opval = SUBWORDSIHI (GET_H_GRC (FLD (f_rm)), 1);
-    SETMEMHI (current_cpu, pc, GET_H_GRC (FLD (f_rn)), opval);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_MOVW2_COMPACT) : /* mov.w $rm, @-$rn */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-{
-  DI tmp_addr;
-  tmp_addr = SUBSI (GET_H_GRC (FLD (f_rn)), 2);
-  {
-    HI opval = SUBWORDSIHI (GET_H_GRC (FLD (f_rm)), 1);
-    SETMEMHI (current_cpu, pc, tmp_addr, opval);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
-  }
-  {
-    SI opval = tmp_addr;
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-}
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_MOVW3_COMPACT) : /* mov.w $rm, @(r0, $rn) */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    HI opval = SUBWORDSIHI (GET_H_GRC (FLD (f_rm)), 1);
-    SETMEMHI (current_cpu, pc, ADDSI (GET_H_GRC (((UINT) 0)), GET_H_GRC (FLD (f_rn))), opval);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_MOVW4_COMPACT) : /* mov.w r0, @($imm8x2, gbr) */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    HI opval = SUBWORDSIHI (GET_H_GRC (((UINT) 0)), 1);
-    SETMEMHI (current_cpu, pc, ADDSI (GET_H_GBR (), FLD (f_imm8x2)), opval);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_MOVW5_COMPACT) : /* mov.w r0, @($imm4x2, $rn) */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movw5_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    HI opval = SUBWORDSIHI (GET_H_GRC (((UINT) 0)), 1);
-    SETMEMHI (current_cpu, pc, ADDSI (GET_H_GRC (FLD (f_rn)), FLD (f_imm4x2)), opval);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_MOVW6_COMPACT) : /* mov.w @$rm, $rn */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    SI opval = EXTHISI (GETMEMHI (current_cpu, pc, GET_H_GRC (FLD (f_rm))));
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_MOVW7_COMPACT) : /* mov.w @${rm}+, $rn */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-{
-  HI tmp_data;
-  tmp_data = GETMEMHI (current_cpu, pc, GET_H_GRC (FLD (f_rm)));
-if (EQSI (FLD (f_rm), FLD (f_rn))) {
-  {
-    SI opval = EXTHISI (tmp_data);
-    SET_H_GRC (FLD (f_rm), opval);
-    written |= (1 << 4);
-    TRACE_RESULT (current_cpu, abuf, "rm", 'x', opval);
-  }
-} else {
-  {
-    SI opval = ADDSI (GET_H_GRC (FLD (f_rm)), 2);
-    SET_H_GRC (FLD (f_rm), opval);
-    written |= (1 << 4);
-    TRACE_RESULT (current_cpu, abuf, "rm", 'x', opval);
-  }
-}
-  {
-    SI opval = EXTHISI (tmp_data);
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-}
-
-  abuf->written = written;
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_MOVW8_COMPACT) : /* mov.w @(r0, $rm), $rn */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    SI opval = EXTHISI (GETMEMHI (current_cpu, pc, ADDSI (GET_H_GRC (((UINT) 0)), GET_H_GRC (FLD (f_rm)))));
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_MOVW9_COMPACT) : /* mov.w @($imm8x2, gbr), r0 */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    SI opval = EXTHISI (GETMEMHI (current_cpu, pc, ADDSI (GET_H_GBR (), FLD (f_imm8x2))));
-    SET_H_GRC (((UINT) 0), opval);
-    TRACE_RESULT (current_cpu, abuf, "r0", 'x', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_MOVW10_COMPACT) : /* mov.w @($imm8x2, pc), $rn */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    SI opval = EXTHISI (GETMEMHI (current_cpu, pc, ADDDI (ADDDI (pc, 4), FLD (f_imm8x2))));
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_MOVW11_COMPACT) : /* mov.w @($imm4x2, $rm), r0 */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movw11_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    SI opval = EXTHISI (GETMEMHI (current_cpu, pc, ADDSI (GET_H_GRC (FLD (f_rm)), FLD (f_imm4x2))));
-    SET_H_GRC (((UINT) 0), opval);
-    TRACE_RESULT (current_cpu, abuf, "r0", 'x', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_MOVA_COMPACT) : /* mova @($imm8x4, pc), r0 */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movl10_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    SI opval = ADDDI (ANDDI (ADDDI (pc, 4), INVSI (3)), FLD (f_imm8x4));
-    SET_H_GRC (((UINT) 0), opval);
-    TRACE_RESULT (current_cpu, abuf, "r0", 'x', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_MOVCAL_COMPACT) : /* movca.l r0, @$rn */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    SI opval = GET_H_GRC (((UINT) 0));
-    SETMEMSI (current_cpu, pc, GET_H_GRC (FLD (f_rn)), opval);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_MOVT_COMPACT) : /* movt $rn */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    SI opval = ZEXTBISI (GET_H_TBIT ());
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_MULL_COMPACT) : /* mul.l $rm, $rn */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    SI opval = MULSI (GET_H_GRC (FLD (f_rm)), GET_H_GRC (FLD (f_rn)));
-    SET_H_MACL (opval);
-    TRACE_RESULT (current_cpu, abuf, "macl", 'x', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_MULSW_COMPACT) : /* muls.w $rm, $rn */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    SI opval = MULSI (EXTHISI (SUBWORDSIHI (GET_H_GRC (FLD (f_rm)), 1)), EXTHISI (SUBWORDSIHI (GET_H_GRC (FLD (f_rn)), 1)));
-    SET_H_MACL (opval);
-    TRACE_RESULT (current_cpu, abuf, "macl", 'x', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_MULUW_COMPACT) : /* mulu.w $rm, $rn */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    SI opval = MULSI (ZEXTHISI (SUBWORDSIHI (GET_H_GRC (FLD (f_rm)), 1)), ZEXTHISI (SUBWORDSIHI (GET_H_GRC (FLD (f_rn)), 1)));
-    SET_H_MACL (opval);
-    TRACE_RESULT (current_cpu, abuf, "macl", 'x', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_NEG_COMPACT) : /* neg $rm, $rn */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    SI opval = NEGSI (GET_H_GRC (FLD (f_rm)));
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_NEGC_COMPACT) : /* negc $rm, $rn */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-{
-  BI tmp_flag;
-  tmp_flag = SUBCFSI (0, GET_H_GRC (FLD (f_rm)), GET_H_TBIT ());
-  {
-    SI opval = SUBCSI (0, GET_H_GRC (FLD (f_rm)), GET_H_TBIT ());
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-  {
-    BI opval = tmp_flag;
-    SET_H_TBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
-  }
-}
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_NOP_COMPACT) : /* nop */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.fmt_empty.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-((void) 0); /*nop*/
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_NOT_COMPACT) : /* not $rm64, $rn64 */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    DI opval = INVDI (GET_H_GR (FLD (f_rm)));
-    SET_H_GR (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn64", 'D', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_OCBI_COMPACT) : /* ocbi @$rn */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.fmt_empty.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-((void) 0); /*nop*/
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_OCBP_COMPACT) : /* ocbp @$rn */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.fmt_empty.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-((void) 0); /*nop*/
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_OCBWB_COMPACT) : /* ocbwb @$rn */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.fmt_empty.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-((void) 0); /*nop*/
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_OR_COMPACT) : /* or $rm64, $rn64 */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    DI opval = ORDI (GET_H_GR (FLD (f_rm)), GET_H_GR (FLD (f_rn)));
-    SET_H_GR (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn64", 'D', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_ORI_COMPACT) : /* or #$uimm8, r0 */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_addi_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    SI opval = ORSI (GET_H_GRC (((UINT) 0)), ZEXTSIDI (FLD (f_imm8)));
-    SET_H_GRC (((UINT) 0), opval);
-    TRACE_RESULT (current_cpu, abuf, "r0", 'x', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_ORB_COMPACT) : /* or.b #$imm8, @(r0, gbr) */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_addi_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-{
-  DI tmp_addr;
-  UQI tmp_data;
-  tmp_addr = ADDSI (GET_H_GRC (((UINT) 0)), GET_H_GBR ());
-  tmp_data = ORQI (GETMEMUQI (current_cpu, pc, tmp_addr), FLD (f_imm8));
-  {
-    UQI opval = tmp_data;
-    SETMEMUQI (current_cpu, pc, tmp_addr, opval);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
-  }
-}
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_PREF_COMPACT) : /* pref @$rn */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.fmt_empty.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-((void) 0); /*nop*/
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_ROTCL_COMPACT) : /* rotcl $rn */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-{
-  BI tmp_temp;
-  tmp_temp = SRLSI (GET_H_GRC (FLD (f_rn)), 31);
-  {
-    SI opval = ORSI (SLLSI (GET_H_GRC (FLD (f_rn)), 1), GET_H_TBIT ());
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-  {
-    BI opval = ((tmp_temp) ? (1) : (0));
-    SET_H_TBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
-  }
-}
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_ROTCR_COMPACT) : /* rotcr $rn */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-{
-  BI tmp_lsbit;
-  SI tmp_temp;
-  tmp_lsbit = ((EQSI (ANDSI (GET_H_GRC (FLD (f_rn)), 1), 0)) ? (0) : (1));
-  tmp_temp = GET_H_TBIT ();
-  {
-    SI opval = ORSI (SRLSI (GET_H_GRC (FLD (f_rn)), 1), SLLSI (tmp_temp, 31));
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-  {
-    BI opval = ((tmp_lsbit) ? (1) : (0));
-    SET_H_TBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
-  }
-}
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_ROTL_COMPACT) : /* rotl $rn */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-{
-  BI tmp_temp;
-  tmp_temp = SRLSI (GET_H_GRC (FLD (f_rn)), 31);
-  {
-    SI opval = ORSI (SLLSI (GET_H_GRC (FLD (f_rn)), 1), tmp_temp);
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-  {
-    BI opval = ((tmp_temp) ? (1) : (0));
-    SET_H_TBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
-  }
-}
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_ROTR_COMPACT) : /* rotr $rn */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-{
-  BI tmp_lsbit;
-  SI tmp_temp;
-  tmp_lsbit = ((EQSI (ANDSI (GET_H_GRC (FLD (f_rn)), 1), 0)) ? (0) : (1));
-  tmp_temp = tmp_lsbit;
-  {
-    SI opval = ORSI (SRLSI (GET_H_GRC (FLD (f_rn)), 1), SLLSI (tmp_temp, 31));
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-  {
-    BI opval = ((tmp_lsbit) ? (1) : (0));
-    SET_H_TBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
-  }
-}
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_RTS_COMPACT) : /* rts */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.fmt_empty.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_BRANCH_INIT
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-{
-  {
-    UDI opval = GET_H_PR ();
-    SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval);
-  }
-}
-
-  SEM_BRANCH_FINI (vpc);
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_SETS_COMPACT) : /* sets */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.fmt_empty.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    BI opval = 1;
-    SET_H_SBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "sbit", 'x', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_SETT_COMPACT) : /* sett */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.fmt_empty.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    BI opval = 1;
-    SET_H_TBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_SHAD_COMPACT) : /* shad $rm, $rn */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-{
-  QI tmp_shamt;
-  tmp_shamt = ANDQI (GET_H_GRC (FLD (f_rm)), 31);
-if (GESI (GET_H_GRC (FLD (f_rm)), 0)) {
-  {
-    SI opval = SLLSI (GET_H_GRC (FLD (f_rn)), tmp_shamt);
-    SET_H_GRC (FLD (f_rn), opval);
-    written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-} else {
-if (NEQI (tmp_shamt, 0)) {
-  {
-    SI opval = SRASI (GET_H_GRC (FLD (f_rn)), SUBSI (32, tmp_shamt));
-    SET_H_GRC (FLD (f_rn), opval);
-    written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-} else {
-if (LTSI (GET_H_GRC (FLD (f_rn)), 0)) {
-  {
-    SI opval = NEGSI (1);
-    SET_H_GRC (FLD (f_rn), opval);
-    written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-} else {
-  {
-    SI opval = 0;
-    SET_H_GRC (FLD (f_rn), opval);
-    written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-}
-}
-}
-}
-
-  abuf->written = written;
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_SHAL_COMPACT) : /* shal $rn */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-{
-  BI tmp_t;
-  tmp_t = SRLSI (GET_H_GRC (FLD (f_rn)), 31);
-  {
-    SI opval = SLLSI (GET_H_GRC (FLD (f_rn)), 1);
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-  {
-    BI opval = ((tmp_t) ? (1) : (0));
-    SET_H_TBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
-  }
-}
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_SHAR_COMPACT) : /* shar $rn */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-{
-  BI tmp_t;
-  tmp_t = ANDSI (GET_H_GRC (FLD (f_rn)), 1);
-  {
-    SI opval = SRASI (GET_H_GRC (FLD (f_rn)), 1);
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-  {
-    BI opval = ((tmp_t) ? (1) : (0));
-    SET_H_TBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
-  }
-}
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_SHLD_COMPACT) : /* shld $rm, $rn */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-{
-  QI tmp_shamt;
-  tmp_shamt = ANDQI (GET_H_GRC (FLD (f_rm)), 31);
-if (GESI (GET_H_GRC (FLD (f_rm)), 0)) {
-  {
-    SI opval = SLLSI (GET_H_GRC (FLD (f_rn)), tmp_shamt);
-    SET_H_GRC (FLD (f_rn), opval);
-    written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-} else {
-if (NEQI (tmp_shamt, 0)) {
-  {
-    SI opval = SRLSI (GET_H_GRC (FLD (f_rn)), SUBSI (32, tmp_shamt));
-    SET_H_GRC (FLD (f_rn), opval);
-    written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-} else {
-  {
-    SI opval = 0;
-    SET_H_GRC (FLD (f_rn), opval);
-    written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-}
-}
-}
-
-  abuf->written = written;
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_SHLL_COMPACT) : /* shll $rn */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-{
-  BI tmp_t;
-  tmp_t = SRLSI (GET_H_GRC (FLD (f_rn)), 31);
-  {
-    SI opval = SLLSI (GET_H_GRC (FLD (f_rn)), 1);
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-  {
-    BI opval = ((tmp_t) ? (1) : (0));
-    SET_H_TBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
-  }
-}
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_SHLL2_COMPACT) : /* shll2 $rn */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    SI opval = SLLSI (GET_H_GRC (FLD (f_rn)), 2);
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_SHLL8_COMPACT) : /* shll8 $rn */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    SI opval = SLLSI (GET_H_GRC (FLD (f_rn)), 8);
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_SHLL16_COMPACT) : /* shll16 $rn */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    SI opval = SLLSI (GET_H_GRC (FLD (f_rn)), 16);
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_SHLR_COMPACT) : /* shlr $rn */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-{
-  BI tmp_t;
-  tmp_t = ANDSI (GET_H_GRC (FLD (f_rn)), 1);
-  {
-    SI opval = SRLSI (GET_H_GRC (FLD (f_rn)), 1);
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-  {
-    BI opval = ((tmp_t) ? (1) : (0));
-    SET_H_TBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
-  }
-}
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_SHLR2_COMPACT) : /* shlr2 $rn */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    SI opval = SRLSI (GET_H_GRC (FLD (f_rn)), 2);
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_SHLR8_COMPACT) : /* shlr8 $rn */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    SI opval = SRLSI (GET_H_GRC (FLD (f_rn)), 8);
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_SHLR16_COMPACT) : /* shlr16 $rn */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    SI opval = SRLSI (GET_H_GRC (FLD (f_rn)), 16);
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_STC_GBR_COMPACT) : /* stc gbr, $rn */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    SI opval = GET_H_GBR ();
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_STCL_GBR_COMPACT) : /* stc.l gbr, @-$rn */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-{
-  DI tmp_addr;
-  tmp_addr = SUBSI (GET_H_GRC (FLD (f_rn)), 4);
-  {
-    SI opval = GET_H_GBR ();
-    SETMEMSI (current_cpu, pc, tmp_addr, opval);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
-  }
-  {
-    SI opval = tmp_addr;
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-}
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_STS_FPSCR_COMPACT) : /* sts fpscr, $rn */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    SI opval = GET_H_FPCCR ();
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_STSL_FPSCR_COMPACT) : /* sts.l fpscr, @-$rn */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-{
-  DI tmp_addr;
-  tmp_addr = SUBSI (GET_H_GRC (FLD (f_rn)), 4);
-  {
-    SI opval = GET_H_FPCCR ();
-    SETMEMSI (current_cpu, pc, tmp_addr, opval);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
-  }
-  {
-    SI opval = tmp_addr;
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-}
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_STS_FPUL_COMPACT) : /* sts fpul, $rn */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    SI opval = SUBWORDSFSI (CPU (h_fr[((UINT) 32)]));
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_STSL_FPUL_COMPACT) : /* sts.l fpul, @-$rn */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-{
-  DI tmp_addr;
-  tmp_addr = SUBSI (GET_H_GRC (FLD (f_rn)), 4);
-  {
-    SF opval = CPU (h_fr[((UINT) 32)]);
-    SETMEMSF (current_cpu, pc, tmp_addr, opval);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'f', opval);
-  }
-  {
-    SI opval = tmp_addr;
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-}
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_STS_MACH_COMPACT) : /* sts mach, $rn */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    SI opval = GET_H_MACH ();
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_STSL_MACH_COMPACT) : /* sts.l mach, @-$rn */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-{
-  DI tmp_addr;
-  tmp_addr = SUBSI (GET_H_GRC (FLD (f_rn)), 4);
-  {
-    SI opval = GET_H_MACH ();
-    SETMEMSI (current_cpu, pc, tmp_addr, opval);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
-  }
-  {
-    SI opval = tmp_addr;
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-}
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_STS_MACL_COMPACT) : /* sts macl, $rn */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    SI opval = GET_H_MACL ();
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_STSL_MACL_COMPACT) : /* sts.l macl, @-$rn */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-{
-  DI tmp_addr;
-  tmp_addr = SUBSI (GET_H_GRC (FLD (f_rn)), 4);
-  {
-    SI opval = GET_H_MACL ();
-    SETMEMSI (current_cpu, pc, tmp_addr, opval);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
-  }
-  {
-    SI opval = tmp_addr;
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-}
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_STS_PR_COMPACT) : /* sts pr, $rn */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    SI opval = GET_H_PR ();
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_STSL_PR_COMPACT) : /* sts.l pr, @-$rn */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-{
-  DI tmp_addr;
-  tmp_addr = SUBSI (GET_H_GRC (FLD (f_rn)), 4);
-  {
-    SI opval = GET_H_PR ();
-    SETMEMSI (current_cpu, pc, tmp_addr, opval);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
-  }
-  {
-    SI opval = tmp_addr;
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-}
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_SUB_COMPACT) : /* sub $rm, $rn */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    SI opval = SUBSI (GET_H_GRC (FLD (f_rn)), GET_H_GRC (FLD (f_rm)));
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_SUBC_COMPACT) : /* subc $rm, $rn */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-{
-  BI tmp_flag;
-  tmp_flag = SUBCFSI (GET_H_GRC (FLD (f_rn)), GET_H_GRC (FLD (f_rm)), GET_H_TBIT ());
-  {
-    SI opval = SUBCSI (GET_H_GRC (FLD (f_rn)), GET_H_GRC (FLD (f_rm)), GET_H_TBIT ());
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-  {
-    BI opval = tmp_flag;
-    SET_H_TBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
-  }
-}
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_SUBV_COMPACT) : /* subv $rm, $rn */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-{
-  BI tmp_t;
-  tmp_t = SUBOFSI (GET_H_GRC (FLD (f_rn)), GET_H_GRC (FLD (f_rm)), 0);
-  {
-    SI opval = SUBSI (GET_H_GRC (FLD (f_rn)), GET_H_GRC (FLD (f_rm)));
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-  {
-    BI opval = ((tmp_t) ? (1) : (0));
-    SET_H_TBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
-  }
-}
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_SWAPB_COMPACT) : /* swap.b $rm, $rn */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-{
-  UHI tmp_top_half;
-  UQI tmp_byte1;
-  UQI tmp_byte0;
-  tmp_top_half = SUBWORDSIHI (GET_H_GRC (FLD (f_rm)), 0);
-  tmp_byte1 = SUBWORDSIQI (GET_H_GRC (FLD (f_rm)), 2);
-  tmp_byte0 = SUBWORDSIQI (GET_H_GRC (FLD (f_rm)), 3);
-  {
-    SI opval = ORSI (SLLSI (tmp_top_half, 16), ORSI (SLLSI (tmp_byte0, 8), tmp_byte1));
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-}
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_SWAPW_COMPACT) : /* swap.w $rm, $rn */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    SI opval = ORSI (SRLSI (GET_H_GRC (FLD (f_rm)), 16), SLLSI (GET_H_GRC (FLD (f_rm)), 16));
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_TASB_COMPACT) : /* tas.b @$rn */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-{
-  UQI tmp_byte;
-  tmp_byte = GETMEMUQI (current_cpu, pc, GET_H_GRC (FLD (f_rn)));
-  {
-    BI opval = ((EQQI (tmp_byte, 0)) ? (1) : (0));
-    SET_H_TBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
-  }
-  tmp_byte = ORQI (tmp_byte, 128);
-  {
-    UQI opval = tmp_byte;
-    SETMEMUQI (current_cpu, pc, GET_H_GRC (FLD (f_rn)), opval);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
-  }
-}
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_TRAPA_COMPACT) : /* trapa #$uimm8 */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_addi_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-sh64_compact_trapa (current_cpu, FLD (f_imm8), pc);
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_TST_COMPACT) : /* tst $rm, $rn */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    BI opval = ((EQSI (ANDSI (GET_H_GRC (FLD (f_rm)), GET_H_GRC (FLD (f_rn))), 0)) ? (1) : (0));
-    SET_H_TBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_TSTI_COMPACT) : /* tst #$uimm8, r0 */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_addi_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    BI opval = ((EQSI (ANDSI (GET_H_GRC (((UINT) 0)), ZEXTSISI (FLD (f_imm8))), 0)) ? (1) : (0));
-    SET_H_TBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_TSTB_COMPACT) : /* tst.b #$imm8, @(r0, gbr) */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_addi_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-{
-  DI tmp_addr;
-  tmp_addr = ADDSI (GET_H_GRC (((UINT) 0)), GET_H_GBR ());
-  {
-    BI opval = ((EQQI (ANDQI (GETMEMUQI (current_cpu, pc, tmp_addr), FLD (f_imm8)), 0)) ? (1) : (0));
-    SET_H_TBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
-  }
-}
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_XOR_COMPACT) : /* xor $rm64, $rn64 */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    DI opval = XORDI (GET_H_GR (FLD (f_rn)), GET_H_GR (FLD (f_rm)));
-    SET_H_GR (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn64", 'D', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_XORI_COMPACT) : /* xor #$uimm8, r0 */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_addi_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    DI opval = XORDI (GET_H_GR (((UINT) 0)), ZEXTSIDI (FLD (f_imm8)));
-    SET_H_GR (((UINT) 0), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr-0", 'D', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_XORB_COMPACT) : /* xor.b #$imm8, @(r0, gbr) */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_addi_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-{
-  DI tmp_addr;
-  UQI tmp_data;
-  tmp_addr = ADDSI (GET_H_GRC (((UINT) 0)), GET_H_GBR ());
-  tmp_data = XORQI (GETMEMUQI (current_cpu, pc, tmp_addr), FLD (f_imm8));
-  {
-    UQI opval = tmp_data;
-    SETMEMUQI (current_cpu, pc, tmp_addr, opval);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
-  }
-}
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_XTRCT_COMPACT) : /* xtrct $rm, $rn */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    SI opval = ORSI (SLLSI (GET_H_GRC (FLD (f_rm)), 16), SRLSI (GET_H_GRC (FLD (f_rn)), 16));
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-
-    }
-  ENDSWITCH (sem) /* End of semantic switch.  */
-
-  /* At this point `vpc' contains the next insn to execute.  */
-}
-
-#undef DEFINE_SWITCH
-#endif /* DEFINE_SWITCH */
diff --git a/sim/sh64/sem-compact.c b/sim/sh64/sem-compact.c
deleted file mode 100644
index fae6877772a..00000000000
--- a/sim/sh64/sem-compact.c
+++ /dev/null
@@ -1,5290 +0,0 @@
-/* Simulator instruction semantics for sh64.
-
-THIS FILE IS MACHINE GENERATED WITH CGEN.
-
-Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
-
-This file is part of the GNU Simulators.
-
-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, 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 WANT_CPU sh64
-#define WANT_CPU_SH64
-
-#include "sim-main.h"
-#include "cgen-mem.h"
-#include "cgen-ops.h"
-
-#undef GET_ATTR
-#if defined (__STDC__) || defined (ALMOST_STDC) || defined (HAVE_STRINGIZE)
-#define GET_ATTR(cpu, num, attr) CGEN_ATTR_VALUE (NULL, abuf->idesc->attrs, CGEN_INSN_##attr)
-#else
-#define GET_ATTR(cpu, num, attr) CGEN_ATTR_VALUE (NULL, abuf->idesc->attrs, CGEN_INSN_/**/attr)
-#endif
-
-/* This is used so that we can compile two copies of the semantic code,
-   one with full feature support and one without that runs fast(er).
-   FAST_P, when desired, is defined on the command line, -DFAST_P=1.  */
-#if FAST_P
-#define SEM_FN_NAME(cpu,fn) XCONCAT3 (cpu,_semf_,fn)
-#undef TRACE_RESULT
-#define TRACE_RESULT(cpu, abuf, name, type, val)
-#else
-#define SEM_FN_NAME(cpu,fn) XCONCAT3 (cpu,_sem_,fn)
-#endif
-
-/* x-invalid: --invalid-- */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,x_invalid) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.fmt_empty.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 0);
-
-  {
-    /* Update the recorded pc in the cpu state struct.
-       Only necessary for WITH_SCACHE case, but to avoid the
-       conditional compilation ....  */
-    SET_H_PC (pc);
-    /* Virtual insns have zero size.  Overwrite vpc with address of next insn
-       using the default-insn-bitsize spec.  When executing insns in parallel
-       we may want to queue the fault and continue execution.  */
-    vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-    vpc = sim_engine_invalid_insn (current_cpu, pc, vpc);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* x-after: --after-- */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,x_after) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.fmt_empty.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 0);
-
-  {
-#if WITH_SCACHE_PBB_SH64_COMPACT
-    sh64_compact_pbb_after (current_cpu, sem_arg);
-#endif
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* x-before: --before-- */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,x_before) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.fmt_empty.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 0);
-
-  {
-#if WITH_SCACHE_PBB_SH64_COMPACT
-    sh64_compact_pbb_before (current_cpu, sem_arg);
-#endif
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* x-cti-chain: --cti-chain-- */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,x_cti_chain) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.fmt_empty.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 0);
-
-  {
-#if WITH_SCACHE_PBB_SH64_COMPACT
-#ifdef DEFINE_SWITCH
-    vpc = sh64_compact_pbb_cti_chain (current_cpu, sem_arg,
-			       pbb_br_type, pbb_br_npc);
-    BREAK (sem);
-#else
-    /* FIXME: Allow provision of explicit ifmt spec in insn spec.  */
-    vpc = sh64_compact_pbb_cti_chain (current_cpu, sem_arg,
-			       CPU_PBB_BR_TYPE (current_cpu),
-			       CPU_PBB_BR_NPC (current_cpu));
-#endif
-#endif
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* x-chain: --chain-- */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,x_chain) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.fmt_empty.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 0);
-
-  {
-#if WITH_SCACHE_PBB_SH64_COMPACT
-    vpc = sh64_compact_pbb_chain (current_cpu, sem_arg);
-#ifdef DEFINE_SWITCH
-    BREAK (sem);
-#endif
-#endif
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* x-begin: --begin-- */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,x_begin) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.fmt_empty.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 0);
-
-  {
-#if WITH_SCACHE_PBB_SH64_COMPACT
-#if defined DEFINE_SWITCH || defined FAST_P
-    /* In the switch case FAST_P is a constant, allowing several optimizations
-       in any called inline functions.  */
-    vpc = sh64_compact_pbb_begin (current_cpu, FAST_P);
-#else
-#if 0 /* cgen engine can't handle dynamic fast/full switching yet.  */
-    vpc = sh64_compact_pbb_begin (current_cpu, STATE_RUN_FAST_P (CPU_STATE (current_cpu)));
-#else
-    vpc = sh64_compact_pbb_begin (current_cpu, 0);
-#endif
-#endif
-#endif
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* add-compact: add $rm, $rn */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,add_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    SI opval = ADDSI (GET_H_GRC (FLD (f_rn)), GET_H_GRC (FLD (f_rm)));
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* addi-compact: add #$imm8, $rn */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,addi_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_addi_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    SI opval = ADDSI (GET_H_GRC (FLD (f_rn)), EXTQISI (ANDQI (FLD (f_imm8), 255)));
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* addc-compact: addc $rm, $rn */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,addc_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-{
-  BI tmp_flag;
-  tmp_flag = ADDCFSI (GET_H_GRC (FLD (f_rn)), GET_H_GRC (FLD (f_rm)), GET_H_TBIT ());
-  {
-    SI opval = ADDCSI (GET_H_GRC (FLD (f_rn)), GET_H_GRC (FLD (f_rm)), GET_H_TBIT ());
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-  {
-    BI opval = tmp_flag;
-    SET_H_TBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
-  }
-}
-
-  return vpc;
-#undef FLD
-}
-
-/* addv-compact: addv $rm, $rn */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,addv_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-{
-  BI tmp_t;
-  tmp_t = ADDOFSI (GET_H_GRC (FLD (f_rn)), GET_H_GRC (FLD (f_rm)), 0);
-  {
-    SI opval = ADDSI (GET_H_GRC (FLD (f_rn)), GET_H_GRC (FLD (f_rm)));
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-  {
-    BI opval = tmp_t;
-    SET_H_TBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
-  }
-}
-
-  return vpc;
-#undef FLD
-}
-
-/* and-compact: and $rm64, $rn64 */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,and_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    DI opval = ANDDI (GET_H_GR (FLD (f_rm)), GET_H_GR (FLD (f_rn)));
-    SET_H_GR (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn64", 'D', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* andi-compact: and #$uimm8, r0 */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,andi_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_addi_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    SI opval = ANDSI (GET_H_GRC (((UINT) 0)), ZEXTSIDI (FLD (f_imm8)));
-    SET_H_GRC (((UINT) 0), opval);
-    TRACE_RESULT (current_cpu, abuf, "r0", 'x', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* andb-compact: and.b #$imm8, @(r0, gbr) */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,andb_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_addi_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-{
-  DI tmp_addr;
-  UQI tmp_data;
-  tmp_addr = ADDSI (GET_H_GRC (((UINT) 0)), GET_H_GBR ());
-  tmp_data = ANDQI (GETMEMUQI (current_cpu, pc, tmp_addr), FLD (f_imm8));
-  {
-    UQI opval = tmp_data;
-    SETMEMUQI (current_cpu, pc, tmp_addr, opval);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
-  }
-}
-
-  return vpc;
-#undef FLD
-}
-
-/* bf-compact: bf $disp8 */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,bf_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_bf_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_BRANCH_INIT
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-if (NOTBI (GET_H_TBIT ())) {
-  {
-    UDI opval = FLD (i_disp8);
-    SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc);
-    written |= (1 << 2);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval);
-  }
-}
-
-  abuf->written = written;
-  SEM_BRANCH_FINI (vpc);
-  return vpc;
-#undef FLD
-}
-
-/* bfs-compact: bf/s $disp8 */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,bfs_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_bf_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_BRANCH_INIT
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-if (NOTBI (GET_H_TBIT ())) {
-{
-  {
-    UDI opval = FLD (i_disp8);
-    SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc);
-    written |= (1 << 2);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval);
-  }
-}
-}
-
-  abuf->written = written;
-  SEM_BRANCH_FINI (vpc);
-  return vpc;
-#undef FLD
-}
-
-/* bra-compact: bra $disp12 */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,bra_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_bra_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_BRANCH_INIT
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-{
-  {
-    UDI opval = FLD (i_disp12);
-    SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval);
-  }
-}
-
-  SEM_BRANCH_FINI (vpc);
-  return vpc;
-#undef FLD
-}
-
-/* braf-compact: braf $rn */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,braf_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_BRANCH_INIT
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-{
-  {
-    UDI opval = ADDDI (EXTSIDI (GET_H_GRC (FLD (f_rn))), ADDDI (pc, 4));
-    SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval);
-  }
-}
-
-  SEM_BRANCH_FINI (vpc);
-  return vpc;
-#undef FLD
-}
-
-/* brk-compact: brk */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,brk_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.fmt_empty.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-sh64_break (current_cpu, pc);
-
-  return vpc;
-#undef FLD
-}
-
-/* bsr-compact: bsr $disp12 */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,bsr_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_bra_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_BRANCH_INIT
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-{
-{
-  {
-    SI opval = ADDDI (pc, 4);
-    SET_H_PR (opval);
-    TRACE_RESULT (current_cpu, abuf, "pr", 'x', opval);
-  }
-  {
-    UDI opval = FLD (i_disp12);
-    SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval);
-  }
-}
-}
-
-  SEM_BRANCH_FINI (vpc);
-  return vpc;
-#undef FLD
-}
-
-/* bsrf-compact: bsrf $rn */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,bsrf_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_BRANCH_INIT
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-{
-{
-  {
-    SI opval = ADDDI (pc, 4);
-    SET_H_PR (opval);
-    TRACE_RESULT (current_cpu, abuf, "pr", 'x', opval);
-  }
-  {
-    UDI opval = ADDDI (EXTSIDI (GET_H_GRC (FLD (f_rn))), ADDDI (pc, 4));
-    SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval);
-  }
-}
-}
-
-  SEM_BRANCH_FINI (vpc);
-  return vpc;
-#undef FLD
-}
-
-/* bt-compact: bt $disp8 */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,bt_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_bf_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_BRANCH_INIT
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-if (GET_H_TBIT ()) {
-  {
-    UDI opval = FLD (i_disp8);
-    SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc);
-    written |= (1 << 2);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval);
-  }
-}
-
-  abuf->written = written;
-  SEM_BRANCH_FINI (vpc);
-  return vpc;
-#undef FLD
-}
-
-/* bts-compact: bt/s $disp8 */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,bts_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_bf_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_BRANCH_INIT
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-if (GET_H_TBIT ()) {
-{
-  {
-    UDI opval = FLD (i_disp8);
-    SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc);
-    written |= (1 << 2);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval);
-  }
-}
-}
-
-  abuf->written = written;
-  SEM_BRANCH_FINI (vpc);
-  return vpc;
-#undef FLD
-}
-
-/* clrmac-compact: clrmac */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,clrmac_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.fmt_empty.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-{
-  {
-    SI opval = 0;
-    SET_H_MACL (opval);
-    TRACE_RESULT (current_cpu, abuf, "macl", 'x', opval);
-  }
-  {
-    SI opval = 0;
-    SET_H_MACH (opval);
-    TRACE_RESULT (current_cpu, abuf, "mach", 'x', opval);
-  }
-}
-
-  return vpc;
-#undef FLD
-}
-
-/* clrs-compact: clrs */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,clrs_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.fmt_empty.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    BI opval = 0;
-    SET_H_SBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "sbit", 'x', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* clrt-compact: clrt */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,clrt_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.fmt_empty.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    BI opval = 0;
-    SET_H_TBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* cmpeq-compact: cmp/eq $rm, $rn */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,cmpeq_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    BI opval = EQSI (GET_H_GRC (FLD (f_rm)), GET_H_GRC (FLD (f_rn)));
-    SET_H_TBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* cmpeqi-compact: cmp/eq #$imm8, r0 */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,cmpeqi_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_addi_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    BI opval = EQSI (GET_H_GRC (((UINT) 0)), EXTQISI (ANDQI (FLD (f_imm8), 255)));
-    SET_H_TBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* cmpge-compact: cmp/ge $rm, $rn */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,cmpge_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    BI opval = GESI (GET_H_GRC (FLD (f_rn)), GET_H_GRC (FLD (f_rm)));
-    SET_H_TBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* cmpgt-compact: cmp/gt $rm, $rn */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,cmpgt_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    BI opval = GTSI (GET_H_GRC (FLD (f_rn)), GET_H_GRC (FLD (f_rm)));
-    SET_H_TBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* cmphi-compact: cmp/hi $rm, $rn */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,cmphi_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    BI opval = GTUSI (GET_H_GRC (FLD (f_rn)), GET_H_GRC (FLD (f_rm)));
-    SET_H_TBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* cmphs-compact: cmp/hs $rm, $rn */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,cmphs_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    BI opval = GEUSI (GET_H_GRC (FLD (f_rn)), GET_H_GRC (FLD (f_rm)));
-    SET_H_TBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* cmppl-compact: cmp/pl $rn */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,cmppl_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    BI opval = GTSI (GET_H_GRC (FLD (f_rn)), 0);
-    SET_H_TBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* cmppz-compact: cmp/pz $rn */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,cmppz_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    BI opval = GESI (GET_H_GRC (FLD (f_rn)), 0);
-    SET_H_TBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* cmpstr-compact: cmp/str $rm, $rn */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,cmpstr_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-{
-  BI tmp_t;
-  SI tmp_temp;
-  tmp_temp = XORSI (GET_H_GRC (FLD (f_rm)), GET_H_GRC (FLD (f_rn)));
-  tmp_t = EQSI (ANDSI (tmp_temp, 0xff000000), 0);
-  tmp_t = ORBI (EQSI (ANDSI (tmp_temp, 16711680), 0), tmp_t);
-  tmp_t = ORBI (EQSI (ANDSI (tmp_temp, 65280), 0), tmp_t);
-  tmp_t = ORBI (EQSI (ANDSI (tmp_temp, 255), 0), tmp_t);
-  {
-    BI opval = ((GTUBI (tmp_t, 0)) ? (1) : (0));
-    SET_H_TBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
-  }
-}
-
-  return vpc;
-#undef FLD
-}
-
-/* div0s-compact: div0s $rm, $rn */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,div0s_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-{
-  {
-    BI opval = SRLSI (GET_H_GRC (FLD (f_rn)), 31);
-    SET_H_QBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "qbit", 'x', opval);
-  }
-  {
-    BI opval = SRLSI (GET_H_GRC (FLD (f_rm)), 31);
-    SET_H_MBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "mbit", 'x', opval);
-  }
-  {
-    BI opval = ((EQSI (SRLSI (GET_H_GRC (FLD (f_rm)), 31), SRLSI (GET_H_GRC (FLD (f_rn)), 31))) ? (0) : (1));
-    SET_H_TBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
-  }
-}
-
-  return vpc;
-#undef FLD
-}
-
-/* div0u-compact: div0u */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,div0u_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.fmt_empty.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-{
-  {
-    BI opval = 0;
-    SET_H_TBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
-  }
-  {
-    BI opval = 0;
-    SET_H_QBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "qbit", 'x', opval);
-  }
-  {
-    BI opval = 0;
-    SET_H_MBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "mbit", 'x', opval);
-  }
-}
-
-  return vpc;
-#undef FLD
-}
-
-/* div1-compact: div1 $rm, $rn */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,div1_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-{
-  BI tmp_oldq;
-  SI tmp_tmp0;
-  UQI tmp_tmp1;
-  tmp_oldq = GET_H_QBIT ();
-  {
-    BI opval = SRLSI (GET_H_GRC (FLD (f_rn)), 31);
-    SET_H_QBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "qbit", 'x', opval);
-  }
-  {
-    SI opval = ORSI (SLLSI (GET_H_GRC (FLD (f_rn)), 1), ZEXTBISI (GET_H_TBIT ()));
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-if (NOTBI (tmp_oldq)) {
-if (NOTBI (GET_H_MBIT ())) {
-{
-  tmp_tmp0 = GET_H_GRC (FLD (f_rn));
-  {
-    SI opval = SUBSI (GET_H_GRC (FLD (f_rn)), GET_H_GRC (FLD (f_rm)));
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-  tmp_tmp1 = GTUSI (GET_H_GRC (FLD (f_rn)), tmp_tmp0);
-if (NOTBI (GET_H_QBIT ())) {
-  {
-    BI opval = ((tmp_tmp1) ? (1) : (0));
-    SET_H_QBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "qbit", 'x', opval);
-  }
-} else {
-  {
-    BI opval = ((EQQI (tmp_tmp1, 0)) ? (1) : (0));
-    SET_H_QBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "qbit", 'x', opval);
-  }
-}
-}
-} else {
-{
-  tmp_tmp0 = GET_H_GRC (FLD (f_rn));
-  {
-    SI opval = ADDSI (GET_H_GRC (FLD (f_rn)), GET_H_GRC (FLD (f_rm)));
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-  tmp_tmp1 = LTUSI (GET_H_GRC (FLD (f_rn)), tmp_tmp0);
-if (NOTBI (GET_H_QBIT ())) {
-  {
-    BI opval = ((EQQI (tmp_tmp1, 0)) ? (1) : (0));
-    SET_H_QBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "qbit", 'x', opval);
-  }
-} else {
-  {
-    BI opval = ((tmp_tmp1) ? (1) : (0));
-    SET_H_QBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "qbit", 'x', opval);
-  }
-}
-}
-}
-} else {
-if (NOTBI (GET_H_MBIT ())) {
-{
-  tmp_tmp0 = GET_H_GRC (FLD (f_rn));
-  {
-    SI opval = ADDSI (GET_H_GRC (FLD (f_rm)), GET_H_GRC (FLD (f_rn)));
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-  tmp_tmp1 = LTUSI (GET_H_GRC (FLD (f_rn)), tmp_tmp0);
-if (NOTBI (GET_H_QBIT ())) {
-  {
-    BI opval = ((tmp_tmp1) ? (1) : (0));
-    SET_H_QBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "qbit", 'x', opval);
-  }
-} else {
-  {
-    BI opval = ((EQQI (tmp_tmp1, 0)) ? (1) : (0));
-    SET_H_QBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "qbit", 'x', opval);
-  }
-}
-}
-} else {
-{
-  tmp_tmp0 = GET_H_GRC (FLD (f_rn));
-  {
-    SI opval = SUBSI (GET_H_GRC (FLD (f_rn)), GET_H_GRC (FLD (f_rm)));
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-  tmp_tmp1 = GTUSI (GET_H_GRC (FLD (f_rn)), tmp_tmp0);
-if (NOTBI (GET_H_QBIT ())) {
-  {
-    BI opval = ((EQQI (tmp_tmp1, 0)) ? (1) : (0));
-    SET_H_QBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "qbit", 'x', opval);
-  }
-} else {
-  {
-    BI opval = ((tmp_tmp1) ? (1) : (0));
-    SET_H_QBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "qbit", 'x', opval);
-  }
-}
-}
-}
-}
-  {
-    BI opval = ((EQBI (GET_H_QBIT (), GET_H_MBIT ())) ? (1) : (0));
-    SET_H_TBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
-  }
-}
-
-  return vpc;
-#undef FLD
-}
-
-/* dmulsl-compact: dmuls.l $rm, $rn */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,dmulsl_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-{
-  DI tmp_result;
-  tmp_result = MULDI (EXTSIDI (GET_H_GRC (FLD (f_rm))), EXTSIDI (GET_H_GRC (FLD (f_rn))));
-  {
-    SI opval = SUBWORDDISI (tmp_result, 0);
-    SET_H_MACH (opval);
-    TRACE_RESULT (current_cpu, abuf, "mach", 'x', opval);
-  }
-  {
-    SI opval = SUBWORDDISI (tmp_result, 1);
-    SET_H_MACL (opval);
-    TRACE_RESULT (current_cpu, abuf, "macl", 'x', opval);
-  }
-}
-
-  return vpc;
-#undef FLD
-}
-
-/* dmulul-compact: dmulu.l $rm, $rn */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,dmulul_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-{
-  DI tmp_result;
-  tmp_result = MULDI (ZEXTSIDI (GET_H_GRC (FLD (f_rm))), ZEXTSIDI (GET_H_GRC (FLD (f_rn))));
-  {
-    SI opval = SUBWORDDISI (tmp_result, 0);
-    SET_H_MACH (opval);
-    TRACE_RESULT (current_cpu, abuf, "mach", 'x', opval);
-  }
-  {
-    SI opval = SUBWORDDISI (tmp_result, 1);
-    SET_H_MACL (opval);
-    TRACE_RESULT (current_cpu, abuf, "macl", 'x', opval);
-  }
-}
-
-  return vpc;
-#undef FLD
-}
-
-/* dt-compact: dt $rn */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,dt_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-{
-  {
-    SI opval = SUBSI (GET_H_GRC (FLD (f_rn)), 1);
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-  {
-    BI opval = EQSI (GET_H_GRC (FLD (f_rn)), 0);
-    SET_H_TBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
-  }
-}
-
-  return vpc;
-#undef FLD
-}
-
-/* extsb-compact: exts.b $rm, $rn */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,extsb_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    SI opval = EXTQISI (SUBWORDSIQI (GET_H_GRC (FLD (f_rm)), 3));
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* extsw-compact: exts.w $rm, $rn */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,extsw_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    SI opval = EXTHISI (SUBWORDSIHI (GET_H_GRC (FLD (f_rm)), 1));
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* extub-compact: extu.b $rm, $rn */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,extub_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    SI opval = ZEXTQISI (SUBWORDSIQI (GET_H_GRC (FLD (f_rm)), 3));
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* extuw-compact: extu.w $rm, $rn */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,extuw_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    SI opval = ZEXTHISI (SUBWORDSIHI (GET_H_GRC (FLD (f_rm)), 1));
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* fabs-compact: fabs $fsdn */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,fabs_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-if (GET_H_PRBIT ()) {
-  {
-    DF opval = sh64_fabsd (current_cpu, GET_H_DR (FLD (f_rn)));
-    SET_H_DR (FLD (f_rn), opval);
-    written |= (1 << 5);
-    TRACE_RESULT (current_cpu, abuf, "dr-index-of--DFLT-fsdn", 'f', opval);
-  }
-} else {
-  {
-    SF opval = sh64_fabss (current_cpu, GET_H_FRC (FLD (f_rn)));
-    SET_H_FRC (FLD (f_rn), opval);
-    written |= (1 << 4);
-    TRACE_RESULT (current_cpu, abuf, "fsdn", 'f', opval);
-  }
-}
-
-  abuf->written = written;
-  return vpc;
-#undef FLD
-}
-
-/* fadd-compact: fadd $fsdm, $fsdn */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,fadd_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-if (GET_H_PRBIT ()) {
-  {
-    DF opval = sh64_faddd (current_cpu, GET_H_DR (FLD (f_rm)), GET_H_DR (FLD (f_rn)));
-    SET_H_DR (FLD (f_rn), opval);
-    written |= (1 << 8);
-    TRACE_RESULT (current_cpu, abuf, "dr-index-of--DFLT-fsdn", 'f', opval);
-  }
-} else {
-  {
-    SF opval = sh64_fadds (current_cpu, GET_H_FRC (FLD (f_rm)), GET_H_FRC (FLD (f_rn)));
-    SET_H_FRC (FLD (f_rn), opval);
-    written |= (1 << 7);
-    TRACE_RESULT (current_cpu, abuf, "fsdn", 'f', opval);
-  }
-}
-
-  abuf->written = written;
-  return vpc;
-#undef FLD
-}
-
-/* fcmpeq-compact: fcmp/eq $fsdm, $fsdn */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,fcmpeq_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-if (GET_H_PRBIT ()) {
-  {
-    BI opval = sh64_fcmpeqd (current_cpu, GET_H_DR (FLD (f_rm)), GET_H_DR (FLD (f_rn)));
-    SET_H_TBIT (opval);
-    written |= (1 << 7);
-    TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
-  }
-} else {
-  {
-    BI opval = sh64_fcmpeqs (current_cpu, GET_H_FRC (FLD (f_rm)), GET_H_FRC (FLD (f_rn)));
-    SET_H_TBIT (opval);
-    written |= (1 << 7);
-    TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
-  }
-}
-
-  abuf->written = written;
-  return vpc;
-#undef FLD
-}
-
-/* fcmpgt-compact: fcmp/gt $fsdm, $fsdn */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,fcmpgt_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-if (GET_H_PRBIT ()) {
-  {
-    BI opval = sh64_fcmpgtd (current_cpu, GET_H_DR (FLD (f_rn)), GET_H_DR (FLD (f_rm)));
-    SET_H_TBIT (opval);
-    written |= (1 << 7);
-    TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
-  }
-} else {
-  {
-    BI opval = sh64_fcmpgts (current_cpu, GET_H_FRC (FLD (f_rn)), GET_H_FRC (FLD (f_rm)));
-    SET_H_TBIT (opval);
-    written |= (1 << 7);
-    TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
-  }
-}
-
-  abuf->written = written;
-  return vpc;
-#undef FLD
-}
-
-/* fcnvds-compact: fcnvds $drn, fpul */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,fcnvds_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_fcnvds_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    SF opval = sh64_fcnvds (current_cpu, GET_H_DRC (FLD (f_dn)));
-    CPU (h_fr[((UINT) 32)]) = opval;
-    TRACE_RESULT (current_cpu, abuf, "fpul", 'f', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* fcnvsd-compact: fcnvsd fpul, $drn */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,fcnvsd_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_fcnvds_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    DF opval = sh64_fcnvsd (current_cpu, CPU (h_fr[((UINT) 32)]));
-    SET_H_DRC (FLD (f_dn), opval);
-    TRACE_RESULT (current_cpu, abuf, "drn", 'f', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* fdiv-compact: fdiv $fsdm, $fsdn */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,fdiv_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-if (GET_H_PRBIT ()) {
-  {
-    DF opval = sh64_fdivd (current_cpu, GET_H_DR (FLD (f_rn)), GET_H_DR (FLD (f_rm)));
-    SET_H_DR (FLD (f_rn), opval);
-    written |= (1 << 8);
-    TRACE_RESULT (current_cpu, abuf, "dr-index-of--DFLT-fsdn", 'f', opval);
-  }
-} else {
-  {
-    SF opval = sh64_fdivs (current_cpu, GET_H_FRC (FLD (f_rn)), GET_H_FRC (FLD (f_rm)));
-    SET_H_FRC (FLD (f_rn), opval);
-    written |= (1 << 7);
-    TRACE_RESULT (current_cpu, abuf, "fsdn", 'f', opval);
-  }
-}
-
-  abuf->written = written;
-  return vpc;
-#undef FLD
-}
-
-/* fipr-compact: fipr $fvm, $fvn */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,fipr_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_fipr_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-{
-  QI tmp_m;
-  QI tmp_n;
-  SF tmp_res;
-  tmp_m = FLD (f_vm);
-  tmp_n = FLD (f_vn);
-  tmp_res = sh64_fmuls (current_cpu, GET_H_FVC (FLD (f_vm)), GET_H_FVC (FLD (f_vn)));
-  tmp_res = sh64_fadds (current_cpu, tmp_res, sh64_fmuls (current_cpu, GET_H_FRC (ADDQI (tmp_m, 1)), GET_H_FRC (ADDQI (tmp_n, 1))));
-  tmp_res = sh64_fadds (current_cpu, tmp_res, sh64_fmuls (current_cpu, GET_H_FRC (ADDQI (tmp_m, 2)), GET_H_FRC (ADDQI (tmp_n, 2))));
-  tmp_res = sh64_fadds (current_cpu, tmp_res, sh64_fmuls (current_cpu, GET_H_FRC (ADDQI (tmp_m, 3)), GET_H_FRC (ADDQI (tmp_n, 3))));
-  {
-    SF opval = tmp_res;
-    SET_H_FRC (ADDQI (tmp_n, 3), opval);
-    TRACE_RESULT (current_cpu, abuf, "frc-add--DFLT-n-3", 'f', opval);
-  }
-}
-
-  return vpc;
-#undef FLD
-}
-
-/* flds-compact: flds $frn */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,flds_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    SF opval = GET_H_FRC (FLD (f_rn));
-    CPU (h_fr[((UINT) 32)]) = opval;
-    TRACE_RESULT (current_cpu, abuf, "fpul", 'f', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* fldi0-compact: fldi0 $frn */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,fldi0_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    SF opval = sh64_fldi0 (current_cpu);
-    SET_H_FRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "frn", 'f', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* fldi1-compact: fldi1 $frn */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,fldi1_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    SF opval = sh64_fldi1 (current_cpu);
-    SET_H_FRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "frn", 'f', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* float-compact: float fpul, $fsdn */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,float_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-if (GET_H_PRBIT ()) {
-  {
-    DF opval = sh64_floatld (current_cpu, CPU (h_fr[((UINT) 32)]));
-    SET_H_DR (FLD (f_rn), opval);
-    written |= (1 << 4);
-    TRACE_RESULT (current_cpu, abuf, "dr-index-of--DFLT-fsdn", 'f', opval);
-  }
-} else {
-  {
-    SF opval = sh64_floatls (current_cpu, CPU (h_fr[((UINT) 32)]));
-    SET_H_FRC (FLD (f_rn), opval);
-    written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "fsdn", 'f', opval);
-  }
-}
-
-  abuf->written = written;
-  return vpc;
-#undef FLD
-}
-
-/* fmac-compact: fmac fr0, $frm, $frn */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,fmac_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    SF opval = sh64_fmacs (current_cpu, GET_H_FRC (((UINT) 0)), GET_H_FRC (FLD (f_rm)), GET_H_FRC (FLD (f_rn)));
-    SET_H_FRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "frn", 'f', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* fmov1-compact: fmov $frm, $frn */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,fmov1_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-if (NOTBI (GET_H_SZBIT ())) {
-  {
-    SF opval = GET_H_FRC (FLD (f_rm));
-    SET_H_FRC (FLD (f_rn), opval);
-    written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "frn", 'f', opval);
-  }
-} else {
-if (EQSI (ANDSI (FLD (f_rm), 1), 1)) {
-if (EQSI (ANDSI (FLD (f_rn), 1), 1)) {
-  {
-    DF opval = GET_H_XD (((FLD (f_rm)) & (INVQI (1))));
-    SET_H_XD (((FLD (f_rn)) & (INVQI (1))), opval);
-    written |= (1 << 8);
-    TRACE_RESULT (current_cpu, abuf, "xd-and--DFLT-index-of--DFLT-frn-inv--QI-1", 'f', opval);
-  }
-} else {
-  {
-    DF opval = GET_H_XD (((FLD (f_rm)) & (INVQI (1))));
-    SET_H_DR (FLD (f_rn), opval);
-    written |= (1 << 7);
-    TRACE_RESULT (current_cpu, abuf, "dr-index-of--DFLT-frn", 'f', opval);
-  }
-}
-} else {
-if (EQSI (ANDSI (FLD (f_rn), 1), 1)) {
-  {
-    DF opval = GET_H_DR (FLD (f_rm));
-    SET_H_XD (((FLD (f_rn)) & (INVQI (1))), opval);
-    written |= (1 << 8);
-    TRACE_RESULT (current_cpu, abuf, "xd-and--DFLT-index-of--DFLT-frn-inv--QI-1", 'f', opval);
-  }
-} else {
-  {
-    DF opval = GET_H_DR (FLD (f_rm));
-    SET_H_DR (FLD (f_rn), opval);
-    written |= (1 << 7);
-    TRACE_RESULT (current_cpu, abuf, "dr-index-of--DFLT-frn", 'f', opval);
-  }
-}
-}
-}
-
-  abuf->written = written;
-  return vpc;
-#undef FLD
-}
-
-/* fmov2-compact: fmov @$rm, $frn */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,fmov2_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-if (NOTBI (GET_H_SZBIT ())) {
-  {
-    SF opval = GETMEMSF (current_cpu, pc, GET_H_GRC (FLD (f_rm)));
-    SET_H_FRC (FLD (f_rn), opval);
-    written |= (1 << 5);
-    TRACE_RESULT (current_cpu, abuf, "frn", 'f', opval);
-  }
-} else {
-if (EQSI (ANDSI (FLD (f_rn), 1), 1)) {
-  {
-    DF opval = GETMEMDF (current_cpu, pc, GET_H_GRC (FLD (f_rm)));
-    SET_H_XD (((FLD (f_rn)) & (INVQI (1))), opval);
-    written |= (1 << 7);
-    TRACE_RESULT (current_cpu, abuf, "xd-and--DFLT-index-of--DFLT-frn-inv--QI-1", 'f', opval);
-  }
-} else {
-  {
-    DF opval = GETMEMDF (current_cpu, pc, GET_H_GRC (FLD (f_rm)));
-    SET_H_DR (FLD (f_rn), opval);
-    written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "dr-index-of--DFLT-frn", 'f', opval);
-  }
-}
-}
-
-  abuf->written = written;
-  return vpc;
-#undef FLD
-}
-
-/* fmov3-compact: fmov @${rm}+, frn */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,fmov3_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-if (NOTBI (GET_H_SZBIT ())) {
-{
-  {
-    SF opval = GETMEMSF (current_cpu, pc, GET_H_GRC (FLD (f_rm)));
-    SET_H_FRC (FLD (f_rn), opval);
-    written |= (1 << 5);
-    TRACE_RESULT (current_cpu, abuf, "frn", 'f', opval);
-  }
-  {
-    SI opval = ADDSI (GET_H_GRC (FLD (f_rm)), 4);
-    SET_H_GRC (FLD (f_rm), opval);
-    written |= (1 << 8);
-    TRACE_RESULT (current_cpu, abuf, "rm", 'x', opval);
-  }
-}
-} else {
-{
-if (EQSI (ANDSI (FLD (f_rn), 1), 1)) {
-  {
-    DF opval = GETMEMDF (current_cpu, pc, GET_H_GRC (FLD (f_rm)));
-    SET_H_XD (((FLD (f_rn)) & (INVQI (1))), opval);
-    written |= (1 << 7);
-    TRACE_RESULT (current_cpu, abuf, "xd-and--DFLT-index-of--DFLT-frn-inv--QI-1", 'f', opval);
-  }
-} else {
-  {
-    DF opval = GETMEMDF (current_cpu, pc, GET_H_GRC (FLD (f_rm)));
-    SET_H_DR (FLD (f_rn), opval);
-    written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "dr-index-of--DFLT-frn", 'f', opval);
-  }
-}
-  {
-    SI opval = ADDSI (GET_H_GRC (FLD (f_rm)), 8);
-    SET_H_GRC (FLD (f_rm), opval);
-    written |= (1 << 8);
-    TRACE_RESULT (current_cpu, abuf, "rm", 'x', opval);
-  }
-}
-}
-
-  abuf->written = written;
-  return vpc;
-#undef FLD
-}
-
-/* fmov4-compact: fmov @(r0, $rm), $frn */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,fmov4_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-if (NOTBI (GET_H_SZBIT ())) {
-  {
-    SF opval = GETMEMSF (current_cpu, pc, ADDSI (GET_H_GRC (((UINT) 0)), GET_H_GRC (FLD (f_rm))));
-    SET_H_FRC (FLD (f_rn), opval);
-    written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "frn", 'f', opval);
-  }
-} else {
-if (EQSI (ANDSI (FLD (f_rn), 1), 1)) {
-  {
-    DF opval = GETMEMDF (current_cpu, pc, ADDSI (GET_H_GRC (((UINT) 0)), GET_H_GRC (FLD (f_rm))));
-    SET_H_XD (((FLD (f_rn)) & (INVQI (1))), opval);
-    written |= (1 << 8);
-    TRACE_RESULT (current_cpu, abuf, "xd-and--DFLT-index-of--DFLT-frn-inv--QI-1", 'f', opval);
-  }
-} else {
-  {
-    DF opval = GETMEMDF (current_cpu, pc, ADDSI (GET_H_GRC (((UINT) 0)), GET_H_GRC (FLD (f_rm))));
-    SET_H_DR (FLD (f_rn), opval);
-    written |= (1 << 7);
-    TRACE_RESULT (current_cpu, abuf, "dr-index-of--DFLT-frn", 'f', opval);
-  }
-}
-}
-
-  abuf->written = written;
-  return vpc;
-#undef FLD
-}
-
-/* fmov5-compact: fmov $frm, @$rn */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,fmov5_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-if (NOTBI (GET_H_SZBIT ())) {
-  {
-    SF opval = GET_H_FRC (FLD (f_rm));
-    SETMEMSF (current_cpu, pc, GET_H_GRC (FLD (f_rn)), opval);
-    written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'f', opval);
-  }
-} else {
-if (EQSI (ANDSI (FLD (f_rm), 1), 1)) {
-  {
-    DF opval = GET_H_XD (((FLD (f_rm)) & (INVQI (1))));
-    SETMEMDF (current_cpu, pc, GET_H_GRC (FLD (f_rn)), opval);
-    written |= (1 << 7);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'f', opval);
-  }
-} else {
-  {
-    DF opval = GET_H_DR (FLD (f_rm));
-    SETMEMDF (current_cpu, pc, GET_H_GRC (FLD (f_rn)), opval);
-    written |= (1 << 7);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'f', opval);
-  }
-}
-}
-
-  abuf->written = written;
-  return vpc;
-#undef FLD
-}
-
-/* fmov6-compact: fmov $frm, @-$rn */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,fmov6_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-if (NOTBI (GET_H_SZBIT ())) {
-{
-  {
-    SI opval = SUBSI (GET_H_GRC (FLD (f_rn)), 4);
-    SET_H_GRC (FLD (f_rn), opval);
-    written |= (1 << 8);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-  {
-    SF opval = GET_H_FRC (FLD (f_rm));
-    SETMEMSF (current_cpu, pc, GET_H_GRC (FLD (f_rn)), opval);
-    written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'f', opval);
-  }
-}
-} else {
-{
-  {
-    SI opval = SUBSI (GET_H_GRC (FLD (f_rn)), 8);
-    SET_H_GRC (FLD (f_rn), opval);
-    written |= (1 << 8);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-if (EQSI (ANDSI (FLD (f_rm), 1), 1)) {
-  {
-    DF opval = GET_H_XD (((FLD (f_rm)) & (INVQI (1))));
-    SETMEMDF (current_cpu, pc, GET_H_GRC (FLD (f_rn)), opval);
-    written |= (1 << 7);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'f', opval);
-  }
-} else {
-  {
-    DF opval = GET_H_DR (FLD (f_rm));
-    SETMEMDF (current_cpu, pc, GET_H_GRC (FLD (f_rn)), opval);
-    written |= (1 << 7);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'f', opval);
-  }
-}
-}
-}
-
-  abuf->written = written;
-  return vpc;
-#undef FLD
-}
-
-/* fmov7-compact: fmov $frm, @(r0, $rn) */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,fmov7_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-if (NOTBI (GET_H_SZBIT ())) {
-  {
-    SF opval = GET_H_FRC (FLD (f_rm));
-    SETMEMSF (current_cpu, pc, ADDSI (GET_H_GRC (((UINT) 0)), GET_H_GRC (FLD (f_rn))), opval);
-    written |= (1 << 7);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'f', opval);
-  }
-} else {
-if (EQSI (ANDSI (FLD (f_rm), 1), 1)) {
-  {
-    DF opval = GET_H_XD (((FLD (f_rm)) & (INVQI (1))));
-    SETMEMDF (current_cpu, pc, ADDSI (GET_H_GRC (((UINT) 0)), GET_H_GRC (FLD (f_rn))), opval);
-    written |= (1 << 8);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'f', opval);
-  }
-} else {
-  {
-    DF opval = GET_H_DR (FLD (f_rm));
-    SETMEMDF (current_cpu, pc, ADDSI (GET_H_GRC (((UINT) 0)), GET_H_GRC (FLD (f_rn))), opval);
-    written |= (1 << 8);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'f', opval);
-  }
-}
-}
-
-  abuf->written = written;
-  return vpc;
-#undef FLD
-}
-
-/* fmul-compact: fmul $fsdm, $fsdn */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,fmul_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-if (GET_H_PRBIT ()) {
-  {
-    DF opval = sh64_fmuld (current_cpu, GET_H_DR (FLD (f_rm)), GET_H_DR (FLD (f_rn)));
-    SET_H_DR (FLD (f_rn), opval);
-    written |= (1 << 8);
-    TRACE_RESULT (current_cpu, abuf, "dr-index-of--DFLT-fsdn", 'f', opval);
-  }
-} else {
-  {
-    SF opval = sh64_fmuls (current_cpu, GET_H_FRC (FLD (f_rm)), GET_H_FRC (FLD (f_rn)));
-    SET_H_FRC (FLD (f_rn), opval);
-    written |= (1 << 7);
-    TRACE_RESULT (current_cpu, abuf, "fsdn", 'f', opval);
-  }
-}
-
-  abuf->written = written;
-  return vpc;
-#undef FLD
-}
-
-/* fneg-compact: fneg $fsdn */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,fneg_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-if (GET_H_PRBIT ()) {
-  {
-    DF opval = sh64_fnegd (current_cpu, GET_H_DR (FLD (f_rn)));
-    SET_H_DR (FLD (f_rn), opval);
-    written |= (1 << 5);
-    TRACE_RESULT (current_cpu, abuf, "dr-index-of--DFLT-fsdn", 'f', opval);
-  }
-} else {
-  {
-    SF opval = sh64_fnegs (current_cpu, GET_H_FRC (FLD (f_rn)));
-    SET_H_FRC (FLD (f_rn), opval);
-    written |= (1 << 4);
-    TRACE_RESULT (current_cpu, abuf, "fsdn", 'f', opval);
-  }
-}
-
-  abuf->written = written;
-  return vpc;
-#undef FLD
-}
-
-/* frchg-compact: frchg */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,frchg_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.fmt_empty.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    BI opval = NOTBI (GET_H_FRBIT ());
-    SET_H_FRBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "frbit", 'x', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* fschg-compact: fschg */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,fschg_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.fmt_empty.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    BI opval = NOTBI (GET_H_SZBIT ());
-    SET_H_SZBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "szbit", 'x', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* fsqrt-compact: fsqrt $fsdn */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,fsqrt_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-if (GET_H_PRBIT ()) {
-  {
-    DF opval = sh64_fsqrtd (current_cpu, GET_H_DR (FLD (f_rn)));
-    SET_H_DR (FLD (f_rn), opval);
-    written |= (1 << 5);
-    TRACE_RESULT (current_cpu, abuf, "dr-index-of--DFLT-fsdn", 'f', opval);
-  }
-} else {
-  {
-    SF opval = sh64_fsqrts (current_cpu, GET_H_FRC (FLD (f_rn)));
-    SET_H_FRC (FLD (f_rn), opval);
-    written |= (1 << 4);
-    TRACE_RESULT (current_cpu, abuf, "fsdn", 'f', opval);
-  }
-}
-
-  abuf->written = written;
-  return vpc;
-#undef FLD
-}
-
-/* fsts-compact: fsts fpul, $frn */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,fsts_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    SF opval = CPU (h_fr[((UINT) 32)]);
-    SET_H_FRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "frn", 'f', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* fsub-compact: fsub $fsdm, $fsdn */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,fsub_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-if (GET_H_PRBIT ()) {
-  {
-    DF opval = sh64_fsubd (current_cpu, GET_H_DR (FLD (f_rn)), GET_H_DR (FLD (f_rm)));
-    SET_H_DR (FLD (f_rn), opval);
-    written |= (1 << 8);
-    TRACE_RESULT (current_cpu, abuf, "dr-index-of--DFLT-fsdn", 'f', opval);
-  }
-} else {
-  {
-    SF opval = sh64_fsubs (current_cpu, GET_H_FRC (FLD (f_rn)), GET_H_FRC (FLD (f_rm)));
-    SET_H_FRC (FLD (f_rn), opval);
-    written |= (1 << 7);
-    TRACE_RESULT (current_cpu, abuf, "fsdn", 'f', opval);
-  }
-}
-
-  abuf->written = written;
-  return vpc;
-#undef FLD
-}
-
-/* ftrc-compact: ftrc $fsdn, fpul */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,ftrc_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    SF opval = ((GET_H_PRBIT ()) ? (sh64_ftrcdl (current_cpu, GET_H_DR (FLD (f_rn)))) : (sh64_ftrcsl (current_cpu, GET_H_FRC (FLD (f_rn)))));
-    CPU (h_fr[((UINT) 32)]) = opval;
-    TRACE_RESULT (current_cpu, abuf, "fpul", 'f', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* ftrv-compact: ftrv xmtrx, $fvn */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,ftrv_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_fipr_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-{
-  QI tmp_n;
-  SF tmp_res;
-  tmp_n = FLD (f_vn);
-  tmp_res = sh64_fmuls (current_cpu, GET_H_XF (((UINT) 0)), GET_H_FRC (tmp_n));
-  tmp_res = sh64_fadds (current_cpu, tmp_res, sh64_fmuls (current_cpu, GET_H_XF (((UINT) 4)), GET_H_FRC (ADDQI (tmp_n, 1))));
-  tmp_res = sh64_fadds (current_cpu, tmp_res, sh64_fmuls (current_cpu, GET_H_XF (((UINT) 8)), GET_H_FRC (ADDQI (tmp_n, 2))));
-  tmp_res = sh64_fadds (current_cpu, tmp_res, sh64_fmuls (current_cpu, GET_H_XF (((UINT) 12)), GET_H_FRC (ADDQI (tmp_n, 3))));
-  {
-    SF opval = tmp_res;
-    SET_H_FRC (tmp_n, opval);
-    TRACE_RESULT (current_cpu, abuf, "frc-n", 'f', opval);
-  }
-  tmp_res = sh64_fmuls (current_cpu, GET_H_XF (((UINT) 1)), GET_H_FRC (tmp_n));
-  tmp_res = sh64_fadds (current_cpu, tmp_res, sh64_fmuls (current_cpu, GET_H_XF (((UINT) 5)), GET_H_FRC (ADDQI (tmp_n, 1))));
-  tmp_res = sh64_fadds (current_cpu, tmp_res, sh64_fmuls (current_cpu, GET_H_XF (((UINT) 9)), GET_H_FRC (ADDQI (tmp_n, 2))));
-  tmp_res = sh64_fadds (current_cpu, tmp_res, sh64_fmuls (current_cpu, GET_H_XF (((UINT) 13)), GET_H_FRC (ADDQI (tmp_n, 3))));
-  {
-    SF opval = tmp_res;
-    SET_H_FRC (ADDQI (tmp_n, 1), opval);
-    TRACE_RESULT (current_cpu, abuf, "frc-add--DFLT-n-1", 'f', opval);
-  }
-  tmp_res = sh64_fmuls (current_cpu, GET_H_XF (((UINT) 2)), GET_H_FRC (tmp_n));
-  tmp_res = sh64_fadds (current_cpu, tmp_res, sh64_fmuls (current_cpu, GET_H_XF (((UINT) 6)), GET_H_FRC (ADDQI (tmp_n, 1))));
-  tmp_res = sh64_fadds (current_cpu, tmp_res, sh64_fmuls (current_cpu, GET_H_XF (((UINT) 10)), GET_H_FRC (ADDQI (tmp_n, 2))));
-  tmp_res = sh64_fadds (current_cpu, tmp_res, sh64_fmuls (current_cpu, GET_H_XF (((UINT) 14)), GET_H_FRC (ADDQI (tmp_n, 3))));
-  {
-    SF opval = tmp_res;
-    SET_H_FRC (ADDQI (tmp_n, 2), opval);
-    TRACE_RESULT (current_cpu, abuf, "frc-add--DFLT-n-2", 'f', opval);
-  }
-  tmp_res = sh64_fmuls (current_cpu, GET_H_XF (((UINT) 3)), GET_H_FRC (tmp_n));
-  tmp_res = sh64_fadds (current_cpu, tmp_res, sh64_fmuls (current_cpu, GET_H_XF (((UINT) 7)), GET_H_FRC (ADDQI (tmp_n, 1))));
-  tmp_res = sh64_fadds (current_cpu, tmp_res, sh64_fmuls (current_cpu, GET_H_XF (((UINT) 11)), GET_H_FRC (ADDQI (tmp_n, 2))));
-  tmp_res = sh64_fadds (current_cpu, tmp_res, sh64_fmuls (current_cpu, GET_H_XF (((UINT) 15)), GET_H_FRC (ADDQI (tmp_n, 3))));
-  {
-    SF opval = tmp_res;
-    SET_H_FRC (ADDQI (tmp_n, 3), opval);
-    TRACE_RESULT (current_cpu, abuf, "frc-add--DFLT-n-3", 'f', opval);
-  }
-}
-
-  return vpc;
-#undef FLD
-}
-
-/* jmp-compact: jmp @$rn */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,jmp_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_BRANCH_INIT
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-{
-  {
-    UDI opval = GET_H_GRC (FLD (f_rn));
-    SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval);
-  }
-}
-
-  SEM_BRANCH_FINI (vpc);
-  return vpc;
-#undef FLD
-}
-
-/* jsr-compact: jsr @$rn */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,jsr_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_BRANCH_INIT
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-{
-{
-  {
-    SI opval = ADDDI (pc, 4);
-    SET_H_PR (opval);
-    TRACE_RESULT (current_cpu, abuf, "pr", 'x', opval);
-  }
-  {
-    UDI opval = GET_H_GRC (FLD (f_rn));
-    SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval);
-  }
-}
-}
-
-  SEM_BRANCH_FINI (vpc);
-  return vpc;
-#undef FLD
-}
-
-/* ldc-compact: ldc $rn, gbr */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,ldc_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    SI opval = GET_H_GRC (FLD (f_rn));
-    SET_H_GBR (opval);
-    TRACE_RESULT (current_cpu, abuf, "gbr", 'x', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* ldcl-compact: ldc.l @${rn}+, gbr */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,ldcl_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-{
-  {
-    SI opval = GETMEMSI (current_cpu, pc, GET_H_GRC (FLD (f_rn)));
-    SET_H_GBR (opval);
-    TRACE_RESULT (current_cpu, abuf, "gbr", 'x', opval);
-  }
-  {
-    SI opval = ADDSI (GET_H_GRC (FLD (f_rn)), 4);
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-}
-
-  return vpc;
-#undef FLD
-}
-
-/* lds-fpscr-compact: lds $rn, fpscr */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,lds_fpscr_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    SI opval = GET_H_GRC (FLD (f_rn));
-    SET_H_FPCCR (opval);
-    TRACE_RESULT (current_cpu, abuf, "fpscr", 'x', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* ldsl-fpscr-compact: lds.l @${rn}+, fpscr */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,ldsl_fpscr_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-{
-  {
-    SI opval = GETMEMSI (current_cpu, pc, GET_H_GRC (FLD (f_rn)));
-    SET_H_FPCCR (opval);
-    TRACE_RESULT (current_cpu, abuf, "fpscr", 'x', opval);
-  }
-  {
-    SI opval = ADDSI (GET_H_GRC (FLD (f_rn)), 4);
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-}
-
-  return vpc;
-#undef FLD
-}
-
-/* lds-fpul-compact: lds $rn, fpul */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,lds_fpul_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    SF opval = SUBWORDSISF (GET_H_GRC (FLD (f_rn)));
-    CPU (h_fr[((UINT) 32)]) = opval;
-    TRACE_RESULT (current_cpu, abuf, "fpul", 'f', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* ldsl-fpul-compact: lds.l @${rn}+, fpul */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,ldsl_fpul_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-{
-  {
-    SF opval = GETMEMSF (current_cpu, pc, GET_H_GRC (FLD (f_rn)));
-    CPU (h_fr[((UINT) 32)]) = opval;
-    TRACE_RESULT (current_cpu, abuf, "fpul", 'f', opval);
-  }
-  {
-    SI opval = ADDSI (GET_H_GRC (FLD (f_rn)), 4);
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-}
-
-  return vpc;
-#undef FLD
-}
-
-/* lds-mach-compact: lds $rn, mach */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,lds_mach_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    SI opval = GET_H_GRC (FLD (f_rn));
-    SET_H_MACH (opval);
-    TRACE_RESULT (current_cpu, abuf, "mach", 'x', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* ldsl-mach-compact: lds.l @${rn}+, mach */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,ldsl_mach_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-{
-  {
-    SI opval = GETMEMSI (current_cpu, pc, GET_H_GRC (FLD (f_rn)));
-    SET_H_MACH (opval);
-    TRACE_RESULT (current_cpu, abuf, "mach", 'x', opval);
-  }
-  {
-    SI opval = ADDSI (GET_H_GRC (FLD (f_rn)), 4);
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-}
-
-  return vpc;
-#undef FLD
-}
-
-/* lds-macl-compact: lds $rn, macl */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,lds_macl_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    SI opval = GET_H_GRC (FLD (f_rn));
-    SET_H_MACL (opval);
-    TRACE_RESULT (current_cpu, abuf, "macl", 'x', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* ldsl-macl-compact: lds.l @${rn}+, macl */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,ldsl_macl_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-{
-  {
-    SI opval = GETMEMSI (current_cpu, pc, GET_H_GRC (FLD (f_rn)));
-    SET_H_MACL (opval);
-    TRACE_RESULT (current_cpu, abuf, "macl", 'x', opval);
-  }
-  {
-    SI opval = ADDSI (GET_H_GRC (FLD (f_rn)), 4);
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-}
-
-  return vpc;
-#undef FLD
-}
-
-/* lds-pr-compact: lds $rn, pr */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,lds_pr_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    SI opval = GET_H_GRC (FLD (f_rn));
-    SET_H_PR (opval);
-    TRACE_RESULT (current_cpu, abuf, "pr", 'x', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* ldsl-pr-compact: lds.l @${rn}+, pr */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,ldsl_pr_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-{
-  {
-    SI opval = GETMEMSI (current_cpu, pc, GET_H_GRC (FLD (f_rn)));
-    SET_H_PR (opval);
-    TRACE_RESULT (current_cpu, abuf, "pr", 'x', opval);
-  }
-  {
-    SI opval = ADDSI (GET_H_GRC (FLD (f_rn)), 4);
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-}
-
-  return vpc;
-#undef FLD
-}
-
-/* macl-compact: mac.l @${rm}+, @${rn}+ */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,macl_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-{
-  DI tmp_tmpry;
-  DI tmp_mac;
-  DI tmp_result;
-  SI tmp_x;
-  SI tmp_y;
-  tmp_x = GETMEMSI (current_cpu, pc, GET_H_GRC (FLD (f_rn)));
-  {
-    SI opval = ADDSI (GET_H_GRC (FLD (f_rn)), 4);
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-if (EQSI (FLD (f_rn), FLD (f_rm))) {
-{
-  {
-    SI opval = ADDSI (GET_H_GRC (FLD (f_rn)), 4);
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-  {
-    SI opval = ADDSI (GET_H_GRC (FLD (f_rm)), 4);
-    SET_H_GRC (FLD (f_rm), opval);
-    written |= (1 << 11);
-    TRACE_RESULT (current_cpu, abuf, "rm", 'x', opval);
-  }
-}
-}
-  tmp_y = GETMEMSI (current_cpu, pc, GET_H_GRC (FLD (f_rm)));
-  {
-    SI opval = ADDSI (GET_H_GRC (FLD (f_rm)), 4);
-    SET_H_GRC (FLD (f_rm), opval);
-    written |= (1 << 11);
-    TRACE_RESULT (current_cpu, abuf, "rm", 'x', opval);
-  }
-  tmp_tmpry = MULDI (ZEXTSIDI (tmp_x), ZEXTSIDI (tmp_y));
-  tmp_mac = ORDI (SLLDI (ZEXTSIDI (GET_H_MACH ()), 32), ZEXTSIDI (GET_H_MACL ()));
-  tmp_result = ADDDI (tmp_mac, tmp_tmpry);
-{
-if (GET_H_SBIT ()) {
-{
-  SI tmp_min;
-  SI tmp_max;
-  tmp_max = SRLDI (INVDI (0), 16);
-  tmp_min = SRLDI (INVDI (0), 15);
-if (GTDI (tmp_result, tmp_max)) {
-  tmp_result = tmp_max;
-} else {
-if (LTDI (tmp_result, tmp_min)) {
-  tmp_result = tmp_min;
-}
-}
-}
-}
-  {
-    SI opval = SUBWORDDISI (tmp_result, 0);
-    SET_H_MACH (opval);
-    TRACE_RESULT (current_cpu, abuf, "mach", 'x', opval);
-  }
-  {
-    SI opval = SUBWORDDISI (tmp_result, 1);
-    SET_H_MACL (opval);
-    TRACE_RESULT (current_cpu, abuf, "macl", 'x', opval);
-  }
-}
-}
-
-  abuf->written = written;
-  return vpc;
-#undef FLD
-}
-
-/* macw-compact: mac.w @${rm}+, @${rn}+ */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,macw_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-{
-  SI tmp_tmpry;
-  DI tmp_mac;
-  DI tmp_result;
-  HI tmp_x;
-  HI tmp_y;
-  tmp_x = GETMEMHI (current_cpu, pc, GET_H_GRC (FLD (f_rn)));
-  {
-    SI opval = ADDSI (GET_H_GRC (FLD (f_rn)), 2);
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-if (EQSI (FLD (f_rn), FLD (f_rm))) {
-{
-  {
-    SI opval = ADDSI (GET_H_GRC (FLD (f_rn)), 2);
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-  {
-    SI opval = ADDSI (GET_H_GRC (FLD (f_rm)), 2);
-    SET_H_GRC (FLD (f_rm), opval);
-    written |= (1 << 11);
-    TRACE_RESULT (current_cpu, abuf, "rm", 'x', opval);
-  }
-}
-}
-  tmp_y = GETMEMHI (current_cpu, pc, GET_H_GRC (FLD (f_rm)));
-  {
-    SI opval = ADDSI (GET_H_GRC (FLD (f_rm)), 2);
-    SET_H_GRC (FLD (f_rm), opval);
-    written |= (1 << 11);
-    TRACE_RESULT (current_cpu, abuf, "rm", 'x', opval);
-  }
-  tmp_tmpry = MULSI (ZEXTHISI (tmp_x), ZEXTHISI (tmp_y));
-if (GET_H_SBIT ()) {
-{
-if (ADDOFSI (tmp_tmpry, GET_H_MACL (), 0)) {
-  {
-    SI opval = 1;
-    SET_H_MACH (opval);
-    written |= (1 << 9);
-    TRACE_RESULT (current_cpu, abuf, "mach", 'x', opval);
-  }
-}
-  {
-    SI opval = ADDSI (tmp_tmpry, GET_H_MACL ());
-    SET_H_MACL (opval);
-    written |= (1 << 10);
-    TRACE_RESULT (current_cpu, abuf, "macl", 'x', opval);
-  }
-}
-} else {
-{
-  tmp_mac = ORDI (SLLDI (ZEXTSIDI (GET_H_MACH ()), 32), ZEXTSIDI (GET_H_MACL ()));
-  tmp_result = ADDDI (tmp_mac, EXTSIDI (tmp_tmpry));
-  {
-    SI opval = SUBWORDDISI (tmp_result, 0);
-    SET_H_MACH (opval);
-    written |= (1 << 9);
-    TRACE_RESULT (current_cpu, abuf, "mach", 'x', opval);
-  }
-  {
-    SI opval = SUBWORDDISI (tmp_result, 1);
-    SET_H_MACL (opval);
-    written |= (1 << 10);
-    TRACE_RESULT (current_cpu, abuf, "macl", 'x', opval);
-  }
-}
-}
-}
-
-  abuf->written = written;
-  return vpc;
-#undef FLD
-}
-
-/* mov-compact: mov $rm64, $rn64 */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,mov_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    DI opval = GET_H_GR (FLD (f_rm));
-    SET_H_GR (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn64", 'D', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* movi-compact: mov #$imm8, $rn */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,movi_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_addi_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    SI opval = EXTQIDI (ANDQI (FLD (f_imm8), 255));
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* movb1-compact: mov.b $rm, @$rn */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,movb1_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    UQI opval = SUBWORDSIUQI (GET_H_GRC (FLD (f_rm)), 3);
-    SETMEMUQI (current_cpu, pc, GET_H_GRC (FLD (f_rn)), opval);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* movb2-compact: mov.b $rm, @-$rn */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,movb2_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-{
-  DI tmp_addr;
-  tmp_addr = SUBSI (GET_H_GRC (FLD (f_rn)), 1);
-  {
-    UQI opval = SUBWORDSIUQI (GET_H_GRC (FLD (f_rm)), 3);
-    SETMEMUQI (current_cpu, pc, tmp_addr, opval);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
-  }
-  {
-    SI opval = tmp_addr;
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-}
-
-  return vpc;
-#undef FLD
-}
-
-/* movb3-compact: mov.b $rm, @(r0,$rn) */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,movb3_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    UQI opval = SUBWORDSIUQI (GET_H_GRC (FLD (f_rm)), 3);
-    SETMEMUQI (current_cpu, pc, ADDSI (GET_H_GRC (((UINT) 0)), GET_H_GRC (FLD (f_rn))), opval);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* movb4-compact: mov.b r0, @($imm8, gbr) */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,movb4_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_addi_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-{
-  DI tmp_addr;
-  tmp_addr = ADDSI (GET_H_GBR (), FLD (f_imm8));
-  {
-    UQI opval = SUBWORDSIUQI (GET_H_GRC (((UINT) 0)), 3);
-    SETMEMUQI (current_cpu, pc, tmp_addr, opval);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
-  }
-}
-
-  return vpc;
-#undef FLD
-}
-
-/* movb5-compact: mov.b r0, @($imm4, $rm) */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,movb5_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movb5_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-{
-  DI tmp_addr;
-  tmp_addr = ADDSI (GET_H_GRC (FLD (f_rm)), FLD (f_imm4));
-  {
-    UQI opval = SUBWORDSIUQI (GET_H_GRC (((UINT) 0)), 3);
-    SETMEMUQI (current_cpu, pc, tmp_addr, opval);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
-  }
-}
-
-  return vpc;
-#undef FLD
-}
-
-/* movb6-compact: mov.b @$rm, $rn */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,movb6_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    SI opval = EXTQISI (GETMEMQI (current_cpu, pc, GET_H_GRC (FLD (f_rm))));
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* movb7-compact: mov.b @${rm}+, $rn */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,movb7_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-{
-  QI tmp_data;
-  tmp_data = GETMEMQI (current_cpu, pc, GET_H_GRC (FLD (f_rm)));
-if (EQSI (FLD (f_rm), FLD (f_rn))) {
-  {
-    SI opval = EXTQISI (tmp_data);
-    SET_H_GRC (FLD (f_rm), opval);
-    written |= (1 << 4);
-    TRACE_RESULT (current_cpu, abuf, "rm", 'x', opval);
-  }
-} else {
-  {
-    SI opval = ADDSI (GET_H_GRC (FLD (f_rm)), 1);
-    SET_H_GRC (FLD (f_rm), opval);
-    written |= (1 << 4);
-    TRACE_RESULT (current_cpu, abuf, "rm", 'x', opval);
-  }
-}
-  {
-    SI opval = EXTQISI (tmp_data);
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-}
-
-  abuf->written = written;
-  return vpc;
-#undef FLD
-}
-
-/* movb8-compact: mov.b @(r0, $rm), $rn */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,movb8_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    SI opval = EXTQISI (GETMEMQI (current_cpu, pc, ADDSI (GET_H_GRC (((UINT) 0)), GET_H_GRC (FLD (f_rm)))));
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* movb9-compact: mov.b @($imm8, gbr), r0 */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,movb9_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_addi_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    SI opval = EXTQISI (GETMEMQI (current_cpu, pc, ADDSI (GET_H_GBR (), FLD (f_imm8))));
-    SET_H_GRC (((UINT) 0), opval);
-    TRACE_RESULT (current_cpu, abuf, "r0", 'x', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* movb10-compact: mov.b @($imm4, $rm), r0 */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,movb10_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movb5_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    SI opval = EXTQISI (GETMEMQI (current_cpu, pc, ADDSI (GET_H_GRC (FLD (f_rm)), FLD (f_imm4))));
-    SET_H_GRC (((UINT) 0), opval);
-    TRACE_RESULT (current_cpu, abuf, "r0", 'x', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* movl1-compact: mov.l $rm, @$rn */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,movl1_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    SI opval = GET_H_GRC (FLD (f_rm));
-    SETMEMSI (current_cpu, pc, GET_H_GRC (FLD (f_rn)), opval);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* movl2-compact: mov.l $rm, @-$rn */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,movl2_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-{
-  SI tmp_addr;
-  tmp_addr = SUBSI (GET_H_GRC (FLD (f_rn)), 4);
-  {
-    SI opval = GET_H_GRC (FLD (f_rm));
-    SETMEMSI (current_cpu, pc, tmp_addr, opval);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
-  }
-  {
-    SI opval = tmp_addr;
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-}
-
-  return vpc;
-#undef FLD
-}
-
-/* movl3-compact: mov.l $rm, @(r0, $rn) */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,movl3_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    SI opval = GET_H_GRC (FLD (f_rm));
-    SETMEMSI (current_cpu, pc, ADDSI (GET_H_GRC (((UINT) 0)), GET_H_GRC (FLD (f_rn))), opval);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* movl4-compact: mov.l r0, @($imm8x4, gbr) */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,movl4_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movl10_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    SI opval = GET_H_GRC (((UINT) 0));
-    SETMEMSI (current_cpu, pc, ADDSI (GET_H_GBR (), FLD (f_imm8x4)), opval);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* movl5-compact: mov.l $rm, @($imm4x4, $rn) */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,movl5_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    SI opval = GET_H_GRC (FLD (f_rm));
-    SETMEMSI (current_cpu, pc, ADDSI (GET_H_GRC (FLD (f_rn)), FLD (f_imm4x4)), opval);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* movl6-compact: mov.l @$rm, $rn */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,movl6_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    SI opval = GETMEMSI (current_cpu, pc, GET_H_GRC (FLD (f_rm)));
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* movl7-compact: mov.l @${rm}+, $rn */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,movl7_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-{
-  {
-    SI opval = GETMEMSI (current_cpu, pc, GET_H_GRC (FLD (f_rm)));
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-if (EQSI (FLD (f_rm), FLD (f_rn))) {
-  {
-    SI opval = GET_H_GRC (FLD (f_rn));
-    SET_H_GRC (FLD (f_rm), opval);
-    written |= (1 << 5);
-    TRACE_RESULT (current_cpu, abuf, "rm", 'x', opval);
-  }
-} else {
-  {
-    SI opval = ADDSI (GET_H_GRC (FLD (f_rm)), 4);
-    SET_H_GRC (FLD (f_rm), opval);
-    written |= (1 << 5);
-    TRACE_RESULT (current_cpu, abuf, "rm", 'x', opval);
-  }
-}
-}
-
-  abuf->written = written;
-  return vpc;
-#undef FLD
-}
-
-/* movl8-compact: mov.l @(r0, $rm), $rn */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,movl8_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    SI opval = GETMEMSI (current_cpu, pc, ADDSI (GET_H_GRC (((UINT) 0)), GET_H_GRC (FLD (f_rm))));
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* movl9-compact: mov.l @($imm8x4, gbr), r0 */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,movl9_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movl10_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    SI opval = GETMEMSI (current_cpu, pc, ADDSI (GET_H_GBR (), FLD (f_imm8x4)));
-    SET_H_GRC (((UINT) 0), opval);
-    TRACE_RESULT (current_cpu, abuf, "r0", 'x', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* movl10-compact: mov.l @($imm8x4, pc), $rn */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,movl10_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movl10_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    SI opval = GETMEMSI (current_cpu, pc, ADDSI (FLD (f_imm8x4), ANDDI (ADDDI (pc, 4), INVSI (3))));
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* movl11-compact: mov.l @($imm4x4, $rm), $rn */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,movl11_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    SI opval = GETMEMSI (current_cpu, pc, ADDSI (GET_H_GRC (FLD (f_rm)), FLD (f_imm4x4)));
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* movw1-compact: mov.w $rm, @$rn */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,movw1_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    HI opval = SUBWORDSIHI (GET_H_GRC (FLD (f_rm)), 1);
-    SETMEMHI (current_cpu, pc, GET_H_GRC (FLD (f_rn)), opval);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* movw2-compact: mov.w $rm, @-$rn */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,movw2_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-{
-  DI tmp_addr;
-  tmp_addr = SUBSI (GET_H_GRC (FLD (f_rn)), 2);
-  {
-    HI opval = SUBWORDSIHI (GET_H_GRC (FLD (f_rm)), 1);
-    SETMEMHI (current_cpu, pc, tmp_addr, opval);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
-  }
-  {
-    SI opval = tmp_addr;
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-}
-
-  return vpc;
-#undef FLD
-}
-
-/* movw3-compact: mov.w $rm, @(r0, $rn) */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,movw3_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    HI opval = SUBWORDSIHI (GET_H_GRC (FLD (f_rm)), 1);
-    SETMEMHI (current_cpu, pc, ADDSI (GET_H_GRC (((UINT) 0)), GET_H_GRC (FLD (f_rn))), opval);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* movw4-compact: mov.w r0, @($imm8x2, gbr) */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,movw4_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    HI opval = SUBWORDSIHI (GET_H_GRC (((UINT) 0)), 1);
-    SETMEMHI (current_cpu, pc, ADDSI (GET_H_GBR (), FLD (f_imm8x2)), opval);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* movw5-compact: mov.w r0, @($imm4x2, $rn) */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,movw5_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movw5_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    HI opval = SUBWORDSIHI (GET_H_GRC (((UINT) 0)), 1);
-    SETMEMHI (current_cpu, pc, ADDSI (GET_H_GRC (FLD (f_rn)), FLD (f_imm4x2)), opval);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* movw6-compact: mov.w @$rm, $rn */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,movw6_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    SI opval = EXTHISI (GETMEMHI (current_cpu, pc, GET_H_GRC (FLD (f_rm))));
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* movw7-compact: mov.w @${rm}+, $rn */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,movw7_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-{
-  HI tmp_data;
-  tmp_data = GETMEMHI (current_cpu, pc, GET_H_GRC (FLD (f_rm)));
-if (EQSI (FLD (f_rm), FLD (f_rn))) {
-  {
-    SI opval = EXTHISI (tmp_data);
-    SET_H_GRC (FLD (f_rm), opval);
-    written |= (1 << 4);
-    TRACE_RESULT (current_cpu, abuf, "rm", 'x', opval);
-  }
-} else {
-  {
-    SI opval = ADDSI (GET_H_GRC (FLD (f_rm)), 2);
-    SET_H_GRC (FLD (f_rm), opval);
-    written |= (1 << 4);
-    TRACE_RESULT (current_cpu, abuf, "rm", 'x', opval);
-  }
-}
-  {
-    SI opval = EXTHISI (tmp_data);
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-}
-
-  abuf->written = written;
-  return vpc;
-#undef FLD
-}
-
-/* movw8-compact: mov.w @(r0, $rm), $rn */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,movw8_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    SI opval = EXTHISI (GETMEMHI (current_cpu, pc, ADDSI (GET_H_GRC (((UINT) 0)), GET_H_GRC (FLD (f_rm)))));
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* movw9-compact: mov.w @($imm8x2, gbr), r0 */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,movw9_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    SI opval = EXTHISI (GETMEMHI (current_cpu, pc, ADDSI (GET_H_GBR (), FLD (f_imm8x2))));
-    SET_H_GRC (((UINT) 0), opval);
-    TRACE_RESULT (current_cpu, abuf, "r0", 'x', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* movw10-compact: mov.w @($imm8x2, pc), $rn */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,movw10_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    SI opval = EXTHISI (GETMEMHI (current_cpu, pc, ADDDI (ADDDI (pc, 4), FLD (f_imm8x2))));
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* movw11-compact: mov.w @($imm4x2, $rm), r0 */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,movw11_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movw11_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    SI opval = EXTHISI (GETMEMHI (current_cpu, pc, ADDSI (GET_H_GRC (FLD (f_rm)), FLD (f_imm4x2))));
-    SET_H_GRC (((UINT) 0), opval);
-    TRACE_RESULT (current_cpu, abuf, "r0", 'x', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* mova-compact: mova @($imm8x4, pc), r0 */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,mova_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movl10_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    SI opval = ADDDI (ANDDI (ADDDI (pc, 4), INVSI (3)), FLD (f_imm8x4));
-    SET_H_GRC (((UINT) 0), opval);
-    TRACE_RESULT (current_cpu, abuf, "r0", 'x', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* movcal-compact: movca.l r0, @$rn */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,movcal_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    SI opval = GET_H_GRC (((UINT) 0));
-    SETMEMSI (current_cpu, pc, GET_H_GRC (FLD (f_rn)), opval);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* movt-compact: movt $rn */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,movt_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    SI opval = ZEXTBISI (GET_H_TBIT ());
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* mull-compact: mul.l $rm, $rn */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,mull_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    SI opval = MULSI (GET_H_GRC (FLD (f_rm)), GET_H_GRC (FLD (f_rn)));
-    SET_H_MACL (opval);
-    TRACE_RESULT (current_cpu, abuf, "macl", 'x', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* mulsw-compact: muls.w $rm, $rn */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,mulsw_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    SI opval = MULSI (EXTHISI (SUBWORDSIHI (GET_H_GRC (FLD (f_rm)), 1)), EXTHISI (SUBWORDSIHI (GET_H_GRC (FLD (f_rn)), 1)));
-    SET_H_MACL (opval);
-    TRACE_RESULT (current_cpu, abuf, "macl", 'x', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* muluw-compact: mulu.w $rm, $rn */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,muluw_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    SI opval = MULSI (ZEXTHISI (SUBWORDSIHI (GET_H_GRC (FLD (f_rm)), 1)), ZEXTHISI (SUBWORDSIHI (GET_H_GRC (FLD (f_rn)), 1)));
-    SET_H_MACL (opval);
-    TRACE_RESULT (current_cpu, abuf, "macl", 'x', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* neg-compact: neg $rm, $rn */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,neg_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    SI opval = NEGSI (GET_H_GRC (FLD (f_rm)));
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* negc-compact: negc $rm, $rn */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,negc_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-{
-  BI tmp_flag;
-  tmp_flag = SUBCFSI (0, GET_H_GRC (FLD (f_rm)), GET_H_TBIT ());
-  {
-    SI opval = SUBCSI (0, GET_H_GRC (FLD (f_rm)), GET_H_TBIT ());
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-  {
-    BI opval = tmp_flag;
-    SET_H_TBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
-  }
-}
-
-  return vpc;
-#undef FLD
-}
-
-/* nop-compact: nop */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,nop_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.fmt_empty.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-((void) 0); /*nop*/
-
-  return vpc;
-#undef FLD
-}
-
-/* not-compact: not $rm64, $rn64 */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,not_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    DI opval = INVDI (GET_H_GR (FLD (f_rm)));
-    SET_H_GR (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn64", 'D', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* ocbi-compact: ocbi @$rn */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,ocbi_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.fmt_empty.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-((void) 0); /*nop*/
-
-  return vpc;
-#undef FLD
-}
-
-/* ocbp-compact: ocbp @$rn */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,ocbp_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.fmt_empty.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-((void) 0); /*nop*/
-
-  return vpc;
-#undef FLD
-}
-
-/* ocbwb-compact: ocbwb @$rn */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,ocbwb_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.fmt_empty.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-((void) 0); /*nop*/
-
-  return vpc;
-#undef FLD
-}
-
-/* or-compact: or $rm64, $rn64 */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,or_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    DI opval = ORDI (GET_H_GR (FLD (f_rm)), GET_H_GR (FLD (f_rn)));
-    SET_H_GR (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn64", 'D', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* ori-compact: or #$uimm8, r0 */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,ori_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_addi_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    SI opval = ORSI (GET_H_GRC (((UINT) 0)), ZEXTSIDI (FLD (f_imm8)));
-    SET_H_GRC (((UINT) 0), opval);
-    TRACE_RESULT (current_cpu, abuf, "r0", 'x', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* orb-compact: or.b #$imm8, @(r0, gbr) */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,orb_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_addi_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-{
-  DI tmp_addr;
-  UQI tmp_data;
-  tmp_addr = ADDSI (GET_H_GRC (((UINT) 0)), GET_H_GBR ());
-  tmp_data = ORQI (GETMEMUQI (current_cpu, pc, tmp_addr), FLD (f_imm8));
-  {
-    UQI opval = tmp_data;
-    SETMEMUQI (current_cpu, pc, tmp_addr, opval);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
-  }
-}
-
-  return vpc;
-#undef FLD
-}
-
-/* pref-compact: pref @$rn */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,pref_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.fmt_empty.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-((void) 0); /*nop*/
-
-  return vpc;
-#undef FLD
-}
-
-/* rotcl-compact: rotcl $rn */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,rotcl_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-{
-  BI tmp_temp;
-  tmp_temp = SRLSI (GET_H_GRC (FLD (f_rn)), 31);
-  {
-    SI opval = ORSI (SLLSI (GET_H_GRC (FLD (f_rn)), 1), GET_H_TBIT ());
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-  {
-    BI opval = ((tmp_temp) ? (1) : (0));
-    SET_H_TBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
-  }
-}
-
-  return vpc;
-#undef FLD
-}
-
-/* rotcr-compact: rotcr $rn */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,rotcr_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-{
-  BI tmp_lsbit;
-  SI tmp_temp;
-  tmp_lsbit = ((EQSI (ANDSI (GET_H_GRC (FLD (f_rn)), 1), 0)) ? (0) : (1));
-  tmp_temp = GET_H_TBIT ();
-  {
-    SI opval = ORSI (SRLSI (GET_H_GRC (FLD (f_rn)), 1), SLLSI (tmp_temp, 31));
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-  {
-    BI opval = ((tmp_lsbit) ? (1) : (0));
-    SET_H_TBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
-  }
-}
-
-  return vpc;
-#undef FLD
-}
-
-/* rotl-compact: rotl $rn */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,rotl_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-{
-  BI tmp_temp;
-  tmp_temp = SRLSI (GET_H_GRC (FLD (f_rn)), 31);
-  {
-    SI opval = ORSI (SLLSI (GET_H_GRC (FLD (f_rn)), 1), tmp_temp);
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-  {
-    BI opval = ((tmp_temp) ? (1) : (0));
-    SET_H_TBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
-  }
-}
-
-  return vpc;
-#undef FLD
-}
-
-/* rotr-compact: rotr $rn */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,rotr_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-{
-  BI tmp_lsbit;
-  SI tmp_temp;
-  tmp_lsbit = ((EQSI (ANDSI (GET_H_GRC (FLD (f_rn)), 1), 0)) ? (0) : (1));
-  tmp_temp = tmp_lsbit;
-  {
-    SI opval = ORSI (SRLSI (GET_H_GRC (FLD (f_rn)), 1), SLLSI (tmp_temp, 31));
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-  {
-    BI opval = ((tmp_lsbit) ? (1) : (0));
-    SET_H_TBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
-  }
-}
-
-  return vpc;
-#undef FLD
-}
-
-/* rts-compact: rts */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,rts_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.fmt_empty.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_BRANCH_INIT
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-{
-  {
-    UDI opval = GET_H_PR ();
-    SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval);
-  }
-}
-
-  SEM_BRANCH_FINI (vpc);
-  return vpc;
-#undef FLD
-}
-
-/* sets-compact: sets */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,sets_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.fmt_empty.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    BI opval = 1;
-    SET_H_SBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "sbit", 'x', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* sett-compact: sett */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,sett_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.fmt_empty.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    BI opval = 1;
-    SET_H_TBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* shad-compact: shad $rm, $rn */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,shad_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-{
-  QI tmp_shamt;
-  tmp_shamt = ANDQI (GET_H_GRC (FLD (f_rm)), 31);
-if (GESI (GET_H_GRC (FLD (f_rm)), 0)) {
-  {
-    SI opval = SLLSI (GET_H_GRC (FLD (f_rn)), tmp_shamt);
-    SET_H_GRC (FLD (f_rn), opval);
-    written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-} else {
-if (NEQI (tmp_shamt, 0)) {
-  {
-    SI opval = SRASI (GET_H_GRC (FLD (f_rn)), SUBSI (32, tmp_shamt));
-    SET_H_GRC (FLD (f_rn), opval);
-    written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-} else {
-if (LTSI (GET_H_GRC (FLD (f_rn)), 0)) {
-  {
-    SI opval = NEGSI (1);
-    SET_H_GRC (FLD (f_rn), opval);
-    written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-} else {
-  {
-    SI opval = 0;
-    SET_H_GRC (FLD (f_rn), opval);
-    written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-}
-}
-}
-}
-
-  abuf->written = written;
-  return vpc;
-#undef FLD
-}
-
-/* shal-compact: shal $rn */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,shal_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-{
-  BI tmp_t;
-  tmp_t = SRLSI (GET_H_GRC (FLD (f_rn)), 31);
-  {
-    SI opval = SLLSI (GET_H_GRC (FLD (f_rn)), 1);
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-  {
-    BI opval = ((tmp_t) ? (1) : (0));
-    SET_H_TBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
-  }
-}
-
-  return vpc;
-#undef FLD
-}
-
-/* shar-compact: shar $rn */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,shar_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-{
-  BI tmp_t;
-  tmp_t = ANDSI (GET_H_GRC (FLD (f_rn)), 1);
-  {
-    SI opval = SRASI (GET_H_GRC (FLD (f_rn)), 1);
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-  {
-    BI opval = ((tmp_t) ? (1) : (0));
-    SET_H_TBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
-  }
-}
-
-  return vpc;
-#undef FLD
-}
-
-/* shld-compact: shld $rm, $rn */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,shld_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-{
-  QI tmp_shamt;
-  tmp_shamt = ANDQI (GET_H_GRC (FLD (f_rm)), 31);
-if (GESI (GET_H_GRC (FLD (f_rm)), 0)) {
-  {
-    SI opval = SLLSI (GET_H_GRC (FLD (f_rn)), tmp_shamt);
-    SET_H_GRC (FLD (f_rn), opval);
-    written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-} else {
-if (NEQI (tmp_shamt, 0)) {
-  {
-    SI opval = SRLSI (GET_H_GRC (FLD (f_rn)), SUBSI (32, tmp_shamt));
-    SET_H_GRC (FLD (f_rn), opval);
-    written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-} else {
-  {
-    SI opval = 0;
-    SET_H_GRC (FLD (f_rn), opval);
-    written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-}
-}
-}
-
-  abuf->written = written;
-  return vpc;
-#undef FLD
-}
-
-/* shll-compact: shll $rn */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,shll_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-{
-  BI tmp_t;
-  tmp_t = SRLSI (GET_H_GRC (FLD (f_rn)), 31);
-  {
-    SI opval = SLLSI (GET_H_GRC (FLD (f_rn)), 1);
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-  {
-    BI opval = ((tmp_t) ? (1) : (0));
-    SET_H_TBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
-  }
-}
-
-  return vpc;
-#undef FLD
-}
-
-/* shll2-compact: shll2 $rn */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,shll2_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    SI opval = SLLSI (GET_H_GRC (FLD (f_rn)), 2);
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* shll8-compact: shll8 $rn */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,shll8_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    SI opval = SLLSI (GET_H_GRC (FLD (f_rn)), 8);
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* shll16-compact: shll16 $rn */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,shll16_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    SI opval = SLLSI (GET_H_GRC (FLD (f_rn)), 16);
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* shlr-compact: shlr $rn */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,shlr_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-{
-  BI tmp_t;
-  tmp_t = ANDSI (GET_H_GRC (FLD (f_rn)), 1);
-  {
-    SI opval = SRLSI (GET_H_GRC (FLD (f_rn)), 1);
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-  {
-    BI opval = ((tmp_t) ? (1) : (0));
-    SET_H_TBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
-  }
-}
-
-  return vpc;
-#undef FLD
-}
-
-/* shlr2-compact: shlr2 $rn */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,shlr2_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    SI opval = SRLSI (GET_H_GRC (FLD (f_rn)), 2);
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* shlr8-compact: shlr8 $rn */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,shlr8_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    SI opval = SRLSI (GET_H_GRC (FLD (f_rn)), 8);
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* shlr16-compact: shlr16 $rn */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,shlr16_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    SI opval = SRLSI (GET_H_GRC (FLD (f_rn)), 16);
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* stc-gbr-compact: stc gbr, $rn */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,stc_gbr_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    SI opval = GET_H_GBR ();
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* stcl-gbr-compact: stc.l gbr, @-$rn */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,stcl_gbr_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-{
-  DI tmp_addr;
-  tmp_addr = SUBSI (GET_H_GRC (FLD (f_rn)), 4);
-  {
-    SI opval = GET_H_GBR ();
-    SETMEMSI (current_cpu, pc, tmp_addr, opval);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
-  }
-  {
-    SI opval = tmp_addr;
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-}
-
-  return vpc;
-#undef FLD
-}
-
-/* sts-fpscr-compact: sts fpscr, $rn */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,sts_fpscr_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    SI opval = GET_H_FPCCR ();
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* stsl-fpscr-compact: sts.l fpscr, @-$rn */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,stsl_fpscr_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-{
-  DI tmp_addr;
-  tmp_addr = SUBSI (GET_H_GRC (FLD (f_rn)), 4);
-  {
-    SI opval = GET_H_FPCCR ();
-    SETMEMSI (current_cpu, pc, tmp_addr, opval);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
-  }
-  {
-    SI opval = tmp_addr;
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-}
-
-  return vpc;
-#undef FLD
-}
-
-/* sts-fpul-compact: sts fpul, $rn */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,sts_fpul_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    SI opval = SUBWORDSFSI (CPU (h_fr[((UINT) 32)]));
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* stsl-fpul-compact: sts.l fpul, @-$rn */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,stsl_fpul_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-{
-  DI tmp_addr;
-  tmp_addr = SUBSI (GET_H_GRC (FLD (f_rn)), 4);
-  {
-    SF opval = CPU (h_fr[((UINT) 32)]);
-    SETMEMSF (current_cpu, pc, tmp_addr, opval);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'f', opval);
-  }
-  {
-    SI opval = tmp_addr;
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-}
-
-  return vpc;
-#undef FLD
-}
-
-/* sts-mach-compact: sts mach, $rn */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,sts_mach_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    SI opval = GET_H_MACH ();
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* stsl-mach-compact: sts.l mach, @-$rn */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,stsl_mach_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-{
-  DI tmp_addr;
-  tmp_addr = SUBSI (GET_H_GRC (FLD (f_rn)), 4);
-  {
-    SI opval = GET_H_MACH ();
-    SETMEMSI (current_cpu, pc, tmp_addr, opval);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
-  }
-  {
-    SI opval = tmp_addr;
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-}
-
-  return vpc;
-#undef FLD
-}
-
-/* sts-macl-compact: sts macl, $rn */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,sts_macl_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    SI opval = GET_H_MACL ();
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* stsl-macl-compact: sts.l macl, @-$rn */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,stsl_macl_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-{
-  DI tmp_addr;
-  tmp_addr = SUBSI (GET_H_GRC (FLD (f_rn)), 4);
-  {
-    SI opval = GET_H_MACL ();
-    SETMEMSI (current_cpu, pc, tmp_addr, opval);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
-  }
-  {
-    SI opval = tmp_addr;
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-}
-
-  return vpc;
-#undef FLD
-}
-
-/* sts-pr-compact: sts pr, $rn */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,sts_pr_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    SI opval = GET_H_PR ();
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* stsl-pr-compact: sts.l pr, @-$rn */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,stsl_pr_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-{
-  DI tmp_addr;
-  tmp_addr = SUBSI (GET_H_GRC (FLD (f_rn)), 4);
-  {
-    SI opval = GET_H_PR ();
-    SETMEMSI (current_cpu, pc, tmp_addr, opval);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
-  }
-  {
-    SI opval = tmp_addr;
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-}
-
-  return vpc;
-#undef FLD
-}
-
-/* sub-compact: sub $rm, $rn */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,sub_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    SI opval = SUBSI (GET_H_GRC (FLD (f_rn)), GET_H_GRC (FLD (f_rm)));
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* subc-compact: subc $rm, $rn */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,subc_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-{
-  BI tmp_flag;
-  tmp_flag = SUBCFSI (GET_H_GRC (FLD (f_rn)), GET_H_GRC (FLD (f_rm)), GET_H_TBIT ());
-  {
-    SI opval = SUBCSI (GET_H_GRC (FLD (f_rn)), GET_H_GRC (FLD (f_rm)), GET_H_TBIT ());
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-  {
-    BI opval = tmp_flag;
-    SET_H_TBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
-  }
-}
-
-  return vpc;
-#undef FLD
-}
-
-/* subv-compact: subv $rm, $rn */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,subv_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-{
-  BI tmp_t;
-  tmp_t = SUBOFSI (GET_H_GRC (FLD (f_rn)), GET_H_GRC (FLD (f_rm)), 0);
-  {
-    SI opval = SUBSI (GET_H_GRC (FLD (f_rn)), GET_H_GRC (FLD (f_rm)));
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-  {
-    BI opval = ((tmp_t) ? (1) : (0));
-    SET_H_TBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
-  }
-}
-
-  return vpc;
-#undef FLD
-}
-
-/* swapb-compact: swap.b $rm, $rn */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,swapb_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-{
-  UHI tmp_top_half;
-  UQI tmp_byte1;
-  UQI tmp_byte0;
-  tmp_top_half = SUBWORDSIHI (GET_H_GRC (FLD (f_rm)), 0);
-  tmp_byte1 = SUBWORDSIQI (GET_H_GRC (FLD (f_rm)), 2);
-  tmp_byte0 = SUBWORDSIQI (GET_H_GRC (FLD (f_rm)), 3);
-  {
-    SI opval = ORSI (SLLSI (tmp_top_half, 16), ORSI (SLLSI (tmp_byte0, 8), tmp_byte1));
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-}
-
-  return vpc;
-#undef FLD
-}
-
-/* swapw-compact: swap.w $rm, $rn */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,swapw_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    SI opval = ORSI (SRLSI (GET_H_GRC (FLD (f_rm)), 16), SLLSI (GET_H_GRC (FLD (f_rm)), 16));
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* tasb-compact: tas.b @$rn */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,tasb_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movw10_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-{
-  UQI tmp_byte;
-  tmp_byte = GETMEMUQI (current_cpu, pc, GET_H_GRC (FLD (f_rn)));
-  {
-    BI opval = ((EQQI (tmp_byte, 0)) ? (1) : (0));
-    SET_H_TBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
-  }
-  tmp_byte = ORQI (tmp_byte, 128);
-  {
-    UQI opval = tmp_byte;
-    SETMEMUQI (current_cpu, pc, GET_H_GRC (FLD (f_rn)), opval);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
-  }
-}
-
-  return vpc;
-#undef FLD
-}
-
-/* trapa-compact: trapa #$uimm8 */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,trapa_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_addi_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-sh64_compact_trapa (current_cpu, FLD (f_imm8), pc);
-
-  return vpc;
-#undef FLD
-}
-
-/* tst-compact: tst $rm, $rn */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,tst_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    BI opval = ((EQSI (ANDSI (GET_H_GRC (FLD (f_rm)), GET_H_GRC (FLD (f_rn))), 0)) ? (1) : (0));
-    SET_H_TBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* tsti-compact: tst #$uimm8, r0 */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,tsti_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_addi_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    BI opval = ((EQSI (ANDSI (GET_H_GRC (((UINT) 0)), ZEXTSISI (FLD (f_imm8))), 0)) ? (1) : (0));
-    SET_H_TBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* tstb-compact: tst.b #$imm8, @(r0, gbr) */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,tstb_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_addi_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-{
-  DI tmp_addr;
-  tmp_addr = ADDSI (GET_H_GRC (((UINT) 0)), GET_H_GBR ());
-  {
-    BI opval = ((EQQI (ANDQI (GETMEMUQI (current_cpu, pc, tmp_addr), FLD (f_imm8)), 0)) ? (1) : (0));
-    SET_H_TBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
-  }
-}
-
-  return vpc;
-#undef FLD
-}
-
-/* xor-compact: xor $rm64, $rn64 */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,xor_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    DI opval = XORDI (GET_H_GR (FLD (f_rn)), GET_H_GR (FLD (f_rm)));
-    SET_H_GR (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn64", 'D', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* xori-compact: xor #$uimm8, r0 */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,xori_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_addi_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    DI opval = XORDI (GET_H_GR (((UINT) 0)), ZEXTSIDI (FLD (f_imm8)));
-    SET_H_GR (((UINT) 0), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr-0", 'D', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* xorb-compact: xor.b #$imm8, @(r0, gbr) */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,xorb_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_addi_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-{
-  DI tmp_addr;
-  UQI tmp_data;
-  tmp_addr = ADDSI (GET_H_GRC (((UINT) 0)), GET_H_GBR ());
-  tmp_data = XORQI (GETMEMUQI (current_cpu, pc, tmp_addr), FLD (f_imm8));
-  {
-    UQI opval = tmp_data;
-    SETMEMUQI (current_cpu, pc, tmp_addr, opval);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
-  }
-}
-
-  return vpc;
-#undef FLD
-}
-
-/* xtrct-compact: xtrct $rm, $rn */
-
-static SEM_PC
-SEM_FN_NAME (sh64_compact,xtrct_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movl5_compact.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
-
-  {
-    SI opval = ORSI (SLLSI (GET_H_GRC (FLD (f_rm)), 16), SRLSI (GET_H_GRC (FLD (f_rn)), 16));
-    SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "rn", 'x', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* Table of all semantic fns.  */
-
-static const struct sem_fn_desc sem_fns[] = {
-  { SH64_COMPACT_INSN_X_INVALID, SEM_FN_NAME (sh64_compact,x_invalid) },
-  { SH64_COMPACT_INSN_X_AFTER, SEM_FN_NAME (sh64_compact,x_after) },
-  { SH64_COMPACT_INSN_X_BEFORE, SEM_FN_NAME (sh64_compact,x_before) },
-  { SH64_COMPACT_INSN_X_CTI_CHAIN, SEM_FN_NAME (sh64_compact,x_cti_chain) },
-  { SH64_COMPACT_INSN_X_CHAIN, SEM_FN_NAME (sh64_compact,x_chain) },
-  { SH64_COMPACT_INSN_X_BEGIN, SEM_FN_NAME (sh64_compact,x_begin) },
-  { SH64_COMPACT_INSN_ADD_COMPACT, SEM_FN_NAME (sh64_compact,add_compact) },
-  { SH64_COMPACT_INSN_ADDI_COMPACT, SEM_FN_NAME (sh64_compact,addi_compact) },
-  { SH64_COMPACT_INSN_ADDC_COMPACT, SEM_FN_NAME (sh64_compact,addc_compact) },
-  { SH64_COMPACT_INSN_ADDV_COMPACT, SEM_FN_NAME (sh64_compact,addv_compact) },
-  { SH64_COMPACT_INSN_AND_COMPACT, SEM_FN_NAME (sh64_compact,and_compact) },
-  { SH64_COMPACT_INSN_ANDI_COMPACT, SEM_FN_NAME (sh64_compact,andi_compact) },
-  { SH64_COMPACT_INSN_ANDB_COMPACT, SEM_FN_NAME (sh64_compact,andb_compact) },
-  { SH64_COMPACT_INSN_BF_COMPACT, SEM_FN_NAME (sh64_compact,bf_compact) },
-  { SH64_COMPACT_INSN_BFS_COMPACT, SEM_FN_NAME (sh64_compact,bfs_compact) },
-  { SH64_COMPACT_INSN_BRA_COMPACT, SEM_FN_NAME (sh64_compact,bra_compact) },
-  { SH64_COMPACT_INSN_BRAF_COMPACT, SEM_FN_NAME (sh64_compact,braf_compact) },
-  { SH64_COMPACT_INSN_BRK_COMPACT, SEM_FN_NAME (sh64_compact,brk_compact) },
-  { SH64_COMPACT_INSN_BSR_COMPACT, SEM_FN_NAME (sh64_compact,bsr_compact) },
-  { SH64_COMPACT_INSN_BSRF_COMPACT, SEM_FN_NAME (sh64_compact,bsrf_compact) },
-  { SH64_COMPACT_INSN_BT_COMPACT, SEM_FN_NAME (sh64_compact,bt_compact) },
-  { SH64_COMPACT_INSN_BTS_COMPACT, SEM_FN_NAME (sh64_compact,bts_compact) },
-  { SH64_COMPACT_INSN_CLRMAC_COMPACT, SEM_FN_NAME (sh64_compact,clrmac_compact) },
-  { SH64_COMPACT_INSN_CLRS_COMPACT, SEM_FN_NAME (sh64_compact,clrs_compact) },
-  { SH64_COMPACT_INSN_CLRT_COMPACT, SEM_FN_NAME (sh64_compact,clrt_compact) },
-  { SH64_COMPACT_INSN_CMPEQ_COMPACT, SEM_FN_NAME (sh64_compact,cmpeq_compact) },
-  { SH64_COMPACT_INSN_CMPEQI_COMPACT, SEM_FN_NAME (sh64_compact,cmpeqi_compact) },
-  { SH64_COMPACT_INSN_CMPGE_COMPACT, SEM_FN_NAME (sh64_compact,cmpge_compact) },
-  { SH64_COMPACT_INSN_CMPGT_COMPACT, SEM_FN_NAME (sh64_compact,cmpgt_compact) },
-  { SH64_COMPACT_INSN_CMPHI_COMPACT, SEM_FN_NAME (sh64_compact,cmphi_compact) },
-  { SH64_COMPACT_INSN_CMPHS_COMPACT, SEM_FN_NAME (sh64_compact,cmphs_compact) },
-  { SH64_COMPACT_INSN_CMPPL_COMPACT, SEM_FN_NAME (sh64_compact,cmppl_compact) },
-  { SH64_COMPACT_INSN_CMPPZ_COMPACT, SEM_FN_NAME (sh64_compact,cmppz_compact) },
-  { SH64_COMPACT_INSN_CMPSTR_COMPACT, SEM_FN_NAME (sh64_compact,cmpstr_compact) },
-  { SH64_COMPACT_INSN_DIV0S_COMPACT, SEM_FN_NAME (sh64_compact,div0s_compact) },
-  { SH64_COMPACT_INSN_DIV0U_COMPACT, SEM_FN_NAME (sh64_compact,div0u_compact) },
-  { SH64_COMPACT_INSN_DIV1_COMPACT, SEM_FN_NAME (sh64_compact,div1_compact) },
-  { SH64_COMPACT_INSN_DMULSL_COMPACT, SEM_FN_NAME (sh64_compact,dmulsl_compact) },
-  { SH64_COMPACT_INSN_DMULUL_COMPACT, SEM_FN_NAME (sh64_compact,dmulul_compact) },
-  { SH64_COMPACT_INSN_DT_COMPACT, SEM_FN_NAME (sh64_compact,dt_compact) },
-  { SH64_COMPACT_INSN_EXTSB_COMPACT, SEM_FN_NAME (sh64_compact,extsb_compact) },
-  { SH64_COMPACT_INSN_EXTSW_COMPACT, SEM_FN_NAME (sh64_compact,extsw_compact) },
-  { SH64_COMPACT_INSN_EXTUB_COMPACT, SEM_FN_NAME (sh64_compact,extub_compact) },
-  { SH64_COMPACT_INSN_EXTUW_COMPACT, SEM_FN_NAME (sh64_compact,extuw_compact) },
-  { SH64_COMPACT_INSN_FABS_COMPACT, SEM_FN_NAME (sh64_compact,fabs_compact) },
-  { SH64_COMPACT_INSN_FADD_COMPACT, SEM_FN_NAME (sh64_compact,fadd_compact) },
-  { SH64_COMPACT_INSN_FCMPEQ_COMPACT, SEM_FN_NAME (sh64_compact,fcmpeq_compact) },
-  { SH64_COMPACT_INSN_FCMPGT_COMPACT, SEM_FN_NAME (sh64_compact,fcmpgt_compact) },
-  { SH64_COMPACT_INSN_FCNVDS_COMPACT, SEM_FN_NAME (sh64_compact,fcnvds_compact) },
-  { SH64_COMPACT_INSN_FCNVSD_COMPACT, SEM_FN_NAME (sh64_compact,fcnvsd_compact) },
-  { SH64_COMPACT_INSN_FDIV_COMPACT, SEM_FN_NAME (sh64_compact,fdiv_compact) },
-  { SH64_COMPACT_INSN_FIPR_COMPACT, SEM_FN_NAME (sh64_compact,fipr_compact) },
-  { SH64_COMPACT_INSN_FLDS_COMPACT, SEM_FN_NAME (sh64_compact,flds_compact) },
-  { SH64_COMPACT_INSN_FLDI0_COMPACT, SEM_FN_NAME (sh64_compact,fldi0_compact) },
-  { SH64_COMPACT_INSN_FLDI1_COMPACT, SEM_FN_NAME (sh64_compact,fldi1_compact) },
-  { SH64_COMPACT_INSN_FLOAT_COMPACT, SEM_FN_NAME (sh64_compact,float_compact) },
-  { SH64_COMPACT_INSN_FMAC_COMPACT, SEM_FN_NAME (sh64_compact,fmac_compact) },
-  { SH64_COMPACT_INSN_FMOV1_COMPACT, SEM_FN_NAME (sh64_compact,fmov1_compact) },
-  { SH64_COMPACT_INSN_FMOV2_COMPACT, SEM_FN_NAME (sh64_compact,fmov2_compact) },
-  { SH64_COMPACT_INSN_FMOV3_COMPACT, SEM_FN_NAME (sh64_compact,fmov3_compact) },
-  { SH64_COMPACT_INSN_FMOV4_COMPACT, SEM_FN_NAME (sh64_compact,fmov4_compact) },
-  { SH64_COMPACT_INSN_FMOV5_COMPACT, SEM_FN_NAME (sh64_compact,fmov5_compact) },
-  { SH64_COMPACT_INSN_FMOV6_COMPACT, SEM_FN_NAME (sh64_compact,fmov6_compact) },
-  { SH64_COMPACT_INSN_FMOV7_COMPACT, SEM_FN_NAME (sh64_compact,fmov7_compact) },
-  { SH64_COMPACT_INSN_FMUL_COMPACT, SEM_FN_NAME (sh64_compact,fmul_compact) },
-  { SH64_COMPACT_INSN_FNEG_COMPACT, SEM_FN_NAME (sh64_compact,fneg_compact) },
-  { SH64_COMPACT_INSN_FRCHG_COMPACT, SEM_FN_NAME (sh64_compact,frchg_compact) },
-  { SH64_COMPACT_INSN_FSCHG_COMPACT, SEM_FN_NAME (sh64_compact,fschg_compact) },
-  { SH64_COMPACT_INSN_FSQRT_COMPACT, SEM_FN_NAME (sh64_compact,fsqrt_compact) },
-  { SH64_COMPACT_INSN_FSTS_COMPACT, SEM_FN_NAME (sh64_compact,fsts_compact) },
-  { SH64_COMPACT_INSN_FSUB_COMPACT, SEM_FN_NAME (sh64_compact,fsub_compact) },
-  { SH64_COMPACT_INSN_FTRC_COMPACT, SEM_FN_NAME (sh64_compact,ftrc_compact) },
-  { SH64_COMPACT_INSN_FTRV_COMPACT, SEM_FN_NAME (sh64_compact,ftrv_compact) },
-  { SH64_COMPACT_INSN_JMP_COMPACT, SEM_FN_NAME (sh64_compact,jmp_compact) },
-  { SH64_COMPACT_INSN_JSR_COMPACT, SEM_FN_NAME (sh64_compact,jsr_compact) },
-  { SH64_COMPACT_INSN_LDC_COMPACT, SEM_FN_NAME (sh64_compact,ldc_compact) },
-  { SH64_COMPACT_INSN_LDCL_COMPACT, SEM_FN_NAME (sh64_compact,ldcl_compact) },
-  { SH64_COMPACT_INSN_LDS_FPSCR_COMPACT, SEM_FN_NAME (sh64_compact,lds_fpscr_compact) },
-  { SH64_COMPACT_INSN_LDSL_FPSCR_COMPACT, SEM_FN_NAME (sh64_compact,ldsl_fpscr_compact) },
-  { SH64_COMPACT_INSN_LDS_FPUL_COMPACT, SEM_FN_NAME (sh64_compact,lds_fpul_compact) },
-  { SH64_COMPACT_INSN_LDSL_FPUL_COMPACT, SEM_FN_NAME (sh64_compact,ldsl_fpul_compact) },
-  { SH64_COMPACT_INSN_LDS_MACH_COMPACT, SEM_FN_NAME (sh64_compact,lds_mach_compact) },
-  { SH64_COMPACT_INSN_LDSL_MACH_COMPACT, SEM_FN_NAME (sh64_compact,ldsl_mach_compact) },
-  { SH64_COMPACT_INSN_LDS_MACL_COMPACT, SEM_FN_NAME (sh64_compact,lds_macl_compact) },
-  { SH64_COMPACT_INSN_LDSL_MACL_COMPACT, SEM_FN_NAME (sh64_compact,ldsl_macl_compact) },
-  { SH64_COMPACT_INSN_LDS_PR_COMPACT, SEM_FN_NAME (sh64_compact,lds_pr_compact) },
-  { SH64_COMPACT_INSN_LDSL_PR_COMPACT, SEM_FN_NAME (sh64_compact,ldsl_pr_compact) },
-  { SH64_COMPACT_INSN_MACL_COMPACT, SEM_FN_NAME (sh64_compact,macl_compact) },
-  { SH64_COMPACT_INSN_MACW_COMPACT, SEM_FN_NAME (sh64_compact,macw_compact) },
-  { SH64_COMPACT_INSN_MOV_COMPACT, SEM_FN_NAME (sh64_compact,mov_compact) },
-  { SH64_COMPACT_INSN_MOVI_COMPACT, SEM_FN_NAME (sh64_compact,movi_compact) },
-  { SH64_COMPACT_INSN_MOVB1_COMPACT, SEM_FN_NAME (sh64_compact,movb1_compact) },
-  { SH64_COMPACT_INSN_MOVB2_COMPACT, SEM_FN_NAME (sh64_compact,movb2_compact) },
-  { SH64_COMPACT_INSN_MOVB3_COMPACT, SEM_FN_NAME (sh64_compact,movb3_compact) },
-  { SH64_COMPACT_INSN_MOVB4_COMPACT, SEM_FN_NAME (sh64_compact,movb4_compact) },
-  { SH64_COMPACT_INSN_MOVB5_COMPACT, SEM_FN_NAME (sh64_compact,movb5_compact) },
-  { SH64_COMPACT_INSN_MOVB6_COMPACT, SEM_FN_NAME (sh64_compact,movb6_compact) },
-  { SH64_COMPACT_INSN_MOVB7_COMPACT, SEM_FN_NAME (sh64_compact,movb7_compact) },
-  { SH64_COMPACT_INSN_MOVB8_COMPACT, SEM_FN_NAME (sh64_compact,movb8_compact) },
-  { SH64_COMPACT_INSN_MOVB9_COMPACT, SEM_FN_NAME (sh64_compact,movb9_compact) },
-  { SH64_COMPACT_INSN_MOVB10_COMPACT, SEM_FN_NAME (sh64_compact,movb10_compact) },
-  { SH64_COMPACT_INSN_MOVL1_COMPACT, SEM_FN_NAME (sh64_compact,movl1_compact) },
-  { SH64_COMPACT_INSN_MOVL2_COMPACT, SEM_FN_NAME (sh64_compact,movl2_compact) },
-  { SH64_COMPACT_INSN_MOVL3_COMPACT, SEM_FN_NAME (sh64_compact,movl3_compact) },
-  { SH64_COMPACT_INSN_MOVL4_COMPACT, SEM_FN_NAME (sh64_compact,movl4_compact) },
-  { SH64_COMPACT_INSN_MOVL5_COMPACT, SEM_FN_NAME (sh64_compact,movl5_compact) },
-  { SH64_COMPACT_INSN_MOVL6_COMPACT, SEM_FN_NAME (sh64_compact,movl6_compact) },
-  { SH64_COMPACT_INSN_MOVL7_COMPACT, SEM_FN_NAME (sh64_compact,movl7_compact) },
-  { SH64_COMPACT_INSN_MOVL8_COMPACT, SEM_FN_NAME (sh64_compact,movl8_compact) },
-  { SH64_COMPACT_INSN_MOVL9_COMPACT, SEM_FN_NAME (sh64_compact,movl9_compact) },
-  { SH64_COMPACT_INSN_MOVL10_COMPACT, SEM_FN_NAME (sh64_compact,movl10_compact) },
-  { SH64_COMPACT_INSN_MOVL11_COMPACT, SEM_FN_NAME (sh64_compact,movl11_compact) },
-  { SH64_COMPACT_INSN_MOVW1_COMPACT, SEM_FN_NAME (sh64_compact,movw1_compact) },
-  { SH64_COMPACT_INSN_MOVW2_COMPACT, SEM_FN_NAME (sh64_compact,movw2_compact) },
-  { SH64_COMPACT_INSN_MOVW3_COMPACT, SEM_FN_NAME (sh64_compact,movw3_compact) },
-  { SH64_COMPACT_INSN_MOVW4_COMPACT, SEM_FN_NAME (sh64_compact,movw4_compact) },
-  { SH64_COMPACT_INSN_MOVW5_COMPACT, SEM_FN_NAME (sh64_compact,movw5_compact) },
-  { SH64_COMPACT_INSN_MOVW6_COMPACT, SEM_FN_NAME (sh64_compact,movw6_compact) },
-  { SH64_COMPACT_INSN_MOVW7_COMPACT, SEM_FN_NAME (sh64_compact,movw7_compact) },
-  { SH64_COMPACT_INSN_MOVW8_COMPACT, SEM_FN_NAME (sh64_compact,movw8_compact) },
-  { SH64_COMPACT_INSN_MOVW9_COMPACT, SEM_FN_NAME (sh64_compact,movw9_compact) },
-  { SH64_COMPACT_INSN_MOVW10_COMPACT, SEM_FN_NAME (sh64_compact,movw10_compact) },
-  { SH64_COMPACT_INSN_MOVW11_COMPACT, SEM_FN_NAME (sh64_compact,movw11_compact) },
-  { SH64_COMPACT_INSN_MOVA_COMPACT, SEM_FN_NAME (sh64_compact,mova_compact) },
-  { SH64_COMPACT_INSN_MOVCAL_COMPACT, SEM_FN_NAME (sh64_compact,movcal_compact) },
-  { SH64_COMPACT_INSN_MOVT_COMPACT, SEM_FN_NAME (sh64_compact,movt_compact) },
-  { SH64_COMPACT_INSN_MULL_COMPACT, SEM_FN_NAME (sh64_compact,mull_compact) },
-  { SH64_COMPACT_INSN_MULSW_COMPACT, SEM_FN_NAME (sh64_compact,mulsw_compact) },
-  { SH64_COMPACT_INSN_MULUW_COMPACT, SEM_FN_NAME (sh64_compact,muluw_compact) },
-  { SH64_COMPACT_INSN_NEG_COMPACT, SEM_FN_NAME (sh64_compact,neg_compact) },
-  { SH64_COMPACT_INSN_NEGC_COMPACT, SEM_FN_NAME (sh64_compact,negc_compact) },
-  { SH64_COMPACT_INSN_NOP_COMPACT, SEM_FN_NAME (sh64_compact,nop_compact) },
-  { SH64_COMPACT_INSN_NOT_COMPACT, SEM_FN_NAME (sh64_compact,not_compact) },
-  { SH64_COMPACT_INSN_OCBI_COMPACT, SEM_FN_NAME (sh64_compact,ocbi_compact) },
-  { SH64_COMPACT_INSN_OCBP_COMPACT, SEM_FN_NAME (sh64_compact,ocbp_compact) },
-  { SH64_COMPACT_INSN_OCBWB_COMPACT, SEM_FN_NAME (sh64_compact,ocbwb_compact) },
-  { SH64_COMPACT_INSN_OR_COMPACT, SEM_FN_NAME (sh64_compact,or_compact) },
-  { SH64_COMPACT_INSN_ORI_COMPACT, SEM_FN_NAME (sh64_compact,ori_compact) },
-  { SH64_COMPACT_INSN_ORB_COMPACT, SEM_FN_NAME (sh64_compact,orb_compact) },
-  { SH64_COMPACT_INSN_PREF_COMPACT, SEM_FN_NAME (sh64_compact,pref_compact) },
-  { SH64_COMPACT_INSN_ROTCL_COMPACT, SEM_FN_NAME (sh64_compact,rotcl_compact) },
-  { SH64_COMPACT_INSN_ROTCR_COMPACT, SEM_FN_NAME (sh64_compact,rotcr_compact) },
-  { SH64_COMPACT_INSN_ROTL_COMPACT, SEM_FN_NAME (sh64_compact,rotl_compact) },
-  { SH64_COMPACT_INSN_ROTR_COMPACT, SEM_FN_NAME (sh64_compact,rotr_compact) },
-  { SH64_COMPACT_INSN_RTS_COMPACT, SEM_FN_NAME (sh64_compact,rts_compact) },
-  { SH64_COMPACT_INSN_SETS_COMPACT, SEM_FN_NAME (sh64_compact,sets_compact) },
-  { SH64_COMPACT_INSN_SETT_COMPACT, SEM_FN_NAME (sh64_compact,sett_compact) },
-  { SH64_COMPACT_INSN_SHAD_COMPACT, SEM_FN_NAME (sh64_compact,shad_compact) },
-  { SH64_COMPACT_INSN_SHAL_COMPACT, SEM_FN_NAME (sh64_compact,shal_compact) },
-  { SH64_COMPACT_INSN_SHAR_COMPACT, SEM_FN_NAME (sh64_compact,shar_compact) },
-  { SH64_COMPACT_INSN_SHLD_COMPACT, SEM_FN_NAME (sh64_compact,shld_compact) },
-  { SH64_COMPACT_INSN_SHLL_COMPACT, SEM_FN_NAME (sh64_compact,shll_compact) },
-  { SH64_COMPACT_INSN_SHLL2_COMPACT, SEM_FN_NAME (sh64_compact,shll2_compact) },
-  { SH64_COMPACT_INSN_SHLL8_COMPACT, SEM_FN_NAME (sh64_compact,shll8_compact) },
-  { SH64_COMPACT_INSN_SHLL16_COMPACT, SEM_FN_NAME (sh64_compact,shll16_compact) },
-  { SH64_COMPACT_INSN_SHLR_COMPACT, SEM_FN_NAME (sh64_compact,shlr_compact) },
-  { SH64_COMPACT_INSN_SHLR2_COMPACT, SEM_FN_NAME (sh64_compact,shlr2_compact) },
-  { SH64_COMPACT_INSN_SHLR8_COMPACT, SEM_FN_NAME (sh64_compact,shlr8_compact) },
-  { SH64_COMPACT_INSN_SHLR16_COMPACT, SEM_FN_NAME (sh64_compact,shlr16_compact) },
-  { SH64_COMPACT_INSN_STC_GBR_COMPACT, SEM_FN_NAME (sh64_compact,stc_gbr_compact) },
-  { SH64_COMPACT_INSN_STCL_GBR_COMPACT, SEM_FN_NAME (sh64_compact,stcl_gbr_compact) },
-  { SH64_COMPACT_INSN_STS_FPSCR_COMPACT, SEM_FN_NAME (sh64_compact,sts_fpscr_compact) },
-  { SH64_COMPACT_INSN_STSL_FPSCR_COMPACT, SEM_FN_NAME (sh64_compact,stsl_fpscr_compact) },
-  { SH64_COMPACT_INSN_STS_FPUL_COMPACT, SEM_FN_NAME (sh64_compact,sts_fpul_compact) },
-  { SH64_COMPACT_INSN_STSL_FPUL_COMPACT, SEM_FN_NAME (sh64_compact,stsl_fpul_compact) },
-  { SH64_COMPACT_INSN_STS_MACH_COMPACT, SEM_FN_NAME (sh64_compact,sts_mach_compact) },
-  { SH64_COMPACT_INSN_STSL_MACH_COMPACT, SEM_FN_NAME (sh64_compact,stsl_mach_compact) },
-  { SH64_COMPACT_INSN_STS_MACL_COMPACT, SEM_FN_NAME (sh64_compact,sts_macl_compact) },
-  { SH64_COMPACT_INSN_STSL_MACL_COMPACT, SEM_FN_NAME (sh64_compact,stsl_macl_compact) },
-  { SH64_COMPACT_INSN_STS_PR_COMPACT, SEM_FN_NAME (sh64_compact,sts_pr_compact) },
-  { SH64_COMPACT_INSN_STSL_PR_COMPACT, SEM_FN_NAME (sh64_compact,stsl_pr_compact) },
-  { SH64_COMPACT_INSN_SUB_COMPACT, SEM_FN_NAME (sh64_compact,sub_compact) },
-  { SH64_COMPACT_INSN_SUBC_COMPACT, SEM_FN_NAME (sh64_compact,subc_compact) },
-  { SH64_COMPACT_INSN_SUBV_COMPACT, SEM_FN_NAME (sh64_compact,subv_compact) },
-  { SH64_COMPACT_INSN_SWAPB_COMPACT, SEM_FN_NAME (sh64_compact,swapb_compact) },
-  { SH64_COMPACT_INSN_SWAPW_COMPACT, SEM_FN_NAME (sh64_compact,swapw_compact) },
-  { SH64_COMPACT_INSN_TASB_COMPACT, SEM_FN_NAME (sh64_compact,tasb_compact) },
-  { SH64_COMPACT_INSN_TRAPA_COMPACT, SEM_FN_NAME (sh64_compact,trapa_compact) },
-  { SH64_COMPACT_INSN_TST_COMPACT, SEM_FN_NAME (sh64_compact,tst_compact) },
-  { SH64_COMPACT_INSN_TSTI_COMPACT, SEM_FN_NAME (sh64_compact,tsti_compact) },
-  { SH64_COMPACT_INSN_TSTB_COMPACT, SEM_FN_NAME (sh64_compact,tstb_compact) },
-  { SH64_COMPACT_INSN_XOR_COMPACT, SEM_FN_NAME (sh64_compact,xor_compact) },
-  { SH64_COMPACT_INSN_XORI_COMPACT, SEM_FN_NAME (sh64_compact,xori_compact) },
-  { SH64_COMPACT_INSN_XORB_COMPACT, SEM_FN_NAME (sh64_compact,xorb_compact) },
-  { SH64_COMPACT_INSN_XTRCT_COMPACT, SEM_FN_NAME (sh64_compact,xtrct_compact) },
-  { 0, 0 }
-};
-
-/* Add the semantic fns to IDESC_TABLE.  */
-
-void
-SEM_FN_NAME (sh64_compact,init_idesc_table) (SIM_CPU *current_cpu)
-{
-  IDESC *idesc_table = CPU_IDESC (current_cpu);
-  const struct sem_fn_desc *sf;
-  int mach_num = MACH_NUM (CPU_MACH (current_cpu));
-
-  for (sf = &sem_fns[0]; sf->fn != 0; ++sf)
-    {
-      const CGEN_INSN *insn = idesc_table[sf->index].idata;
-      int valid_p = (CGEN_INSN_VIRTUAL_P (insn)
-		     || CGEN_INSN_MACH_HAS_P (insn, mach_num));
-#if FAST_P
-      if (valid_p)
-	idesc_table[sf->index].sem_fast = sf->fn;
-      else
-	idesc_table[sf->index].sem_fast = SEM_FN_NAME (sh64_compact,x_invalid);
-#else
-      if (valid_p)
-	idesc_table[sf->index].sem_full = sf->fn;
-      else
-	idesc_table[sf->index].sem_full = SEM_FN_NAME (sh64_compact,x_invalid);
-#endif
-    }
-}
-
diff --git a/sim/sh64/sem-media-switch.c b/sim/sh64/sem-media-switch.c
deleted file mode 100644
index 075738ae0ef..00000000000
--- a/sim/sh64/sem-media-switch.c
+++ /dev/null
@@ -1,5558 +0,0 @@
-/* Simulator instruction semantics for sh64.
-
-THIS FILE IS MACHINE GENERATED WITH CGEN.
-
-Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
-
-This file is part of the GNU simulators.
-
-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, 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.
-
-*/
-
-#ifdef DEFINE_LABELS
-
-  /* The labels have the case they have because the enum of insn types
-     is all uppercase and in the non-stdc case the insn symbol is built
-     into the enum name.  */
-
-  static struct {
-    int index;
-    void *label;
-  } labels[] = {
-    { SH64_MEDIA_INSN_X_INVALID, && case_sem_INSN_X_INVALID },
-    { SH64_MEDIA_INSN_X_AFTER, && case_sem_INSN_X_AFTER },
-    { SH64_MEDIA_INSN_X_BEFORE, && case_sem_INSN_X_BEFORE },
-    { SH64_MEDIA_INSN_X_CTI_CHAIN, && case_sem_INSN_X_CTI_CHAIN },
-    { SH64_MEDIA_INSN_X_CHAIN, && case_sem_INSN_X_CHAIN },
-    { SH64_MEDIA_INSN_X_BEGIN, && case_sem_INSN_X_BEGIN },
-    { SH64_MEDIA_INSN_ADD, && case_sem_INSN_ADD },
-    { SH64_MEDIA_INSN_ADDL, && case_sem_INSN_ADDL },
-    { SH64_MEDIA_INSN_ADDI, && case_sem_INSN_ADDI },
-    { SH64_MEDIA_INSN_ADDIL, && case_sem_INSN_ADDIL },
-    { SH64_MEDIA_INSN_ADDZL, && case_sem_INSN_ADDZL },
-    { SH64_MEDIA_INSN_ALLOCO, && case_sem_INSN_ALLOCO },
-    { SH64_MEDIA_INSN_AND, && case_sem_INSN_AND },
-    { SH64_MEDIA_INSN_ANDC, && case_sem_INSN_ANDC },
-    { SH64_MEDIA_INSN_ANDI, && case_sem_INSN_ANDI },
-    { SH64_MEDIA_INSN_BEQ, && case_sem_INSN_BEQ },
-    { SH64_MEDIA_INSN_BEQI, && case_sem_INSN_BEQI },
-    { SH64_MEDIA_INSN_BGE, && case_sem_INSN_BGE },
-    { SH64_MEDIA_INSN_BGEU, && case_sem_INSN_BGEU },
-    { SH64_MEDIA_INSN_BGT, && case_sem_INSN_BGT },
-    { SH64_MEDIA_INSN_BGTU, && case_sem_INSN_BGTU },
-    { SH64_MEDIA_INSN_BLINK, && case_sem_INSN_BLINK },
-    { SH64_MEDIA_INSN_BNE, && case_sem_INSN_BNE },
-    { SH64_MEDIA_INSN_BNEI, && case_sem_INSN_BNEI },
-    { SH64_MEDIA_INSN_BRK, && case_sem_INSN_BRK },
-    { SH64_MEDIA_INSN_BYTEREV, && case_sem_INSN_BYTEREV },
-    { SH64_MEDIA_INSN_CMPEQ, && case_sem_INSN_CMPEQ },
-    { SH64_MEDIA_INSN_CMPGT, && case_sem_INSN_CMPGT },
-    { SH64_MEDIA_INSN_CMPGTU, && case_sem_INSN_CMPGTU },
-    { SH64_MEDIA_INSN_CMVEQ, && case_sem_INSN_CMVEQ },
-    { SH64_MEDIA_INSN_CMVNE, && case_sem_INSN_CMVNE },
-    { SH64_MEDIA_INSN_FABSD, && case_sem_INSN_FABSD },
-    { SH64_MEDIA_INSN_FABSS, && case_sem_INSN_FABSS },
-    { SH64_MEDIA_INSN_FADDD, && case_sem_INSN_FADDD },
-    { SH64_MEDIA_INSN_FADDS, && case_sem_INSN_FADDS },
-    { SH64_MEDIA_INSN_FCMPEQD, && case_sem_INSN_FCMPEQD },
-    { SH64_MEDIA_INSN_FCMPEQS, && case_sem_INSN_FCMPEQS },
-    { SH64_MEDIA_INSN_FCMPGED, && case_sem_INSN_FCMPGED },
-    { SH64_MEDIA_INSN_FCMPGES, && case_sem_INSN_FCMPGES },
-    { SH64_MEDIA_INSN_FCMPGTD, && case_sem_INSN_FCMPGTD },
-    { SH64_MEDIA_INSN_FCMPGTS, && case_sem_INSN_FCMPGTS },
-    { SH64_MEDIA_INSN_FCMPUND, && case_sem_INSN_FCMPUND },
-    { SH64_MEDIA_INSN_FCMPUNS, && case_sem_INSN_FCMPUNS },
-    { SH64_MEDIA_INSN_FCNVDS, && case_sem_INSN_FCNVDS },
-    { SH64_MEDIA_INSN_FCNVSD, && case_sem_INSN_FCNVSD },
-    { SH64_MEDIA_INSN_FDIVD, && case_sem_INSN_FDIVD },
-    { SH64_MEDIA_INSN_FDIVS, && case_sem_INSN_FDIVS },
-    { SH64_MEDIA_INSN_FGETSCR, && case_sem_INSN_FGETSCR },
-    { SH64_MEDIA_INSN_FIPRS, && case_sem_INSN_FIPRS },
-    { SH64_MEDIA_INSN_FLDD, && case_sem_INSN_FLDD },
-    { SH64_MEDIA_INSN_FLDP, && case_sem_INSN_FLDP },
-    { SH64_MEDIA_INSN_FLDS, && case_sem_INSN_FLDS },
-    { SH64_MEDIA_INSN_FLDXD, && case_sem_INSN_FLDXD },
-    { SH64_MEDIA_INSN_FLDXP, && case_sem_INSN_FLDXP },
-    { SH64_MEDIA_INSN_FLDXS, && case_sem_INSN_FLDXS },
-    { SH64_MEDIA_INSN_FLOATLD, && case_sem_INSN_FLOATLD },
-    { SH64_MEDIA_INSN_FLOATLS, && case_sem_INSN_FLOATLS },
-    { SH64_MEDIA_INSN_FLOATQD, && case_sem_INSN_FLOATQD },
-    { SH64_MEDIA_INSN_FLOATQS, && case_sem_INSN_FLOATQS },
-    { SH64_MEDIA_INSN_FMACS, && case_sem_INSN_FMACS },
-    { SH64_MEDIA_INSN_FMOVD, && case_sem_INSN_FMOVD },
-    { SH64_MEDIA_INSN_FMOVDQ, && case_sem_INSN_FMOVDQ },
-    { SH64_MEDIA_INSN_FMOVLS, && case_sem_INSN_FMOVLS },
-    { SH64_MEDIA_INSN_FMOVQD, && case_sem_INSN_FMOVQD },
-    { SH64_MEDIA_INSN_FMOVS, && case_sem_INSN_FMOVS },
-    { SH64_MEDIA_INSN_FMOVSL, && case_sem_INSN_FMOVSL },
-    { SH64_MEDIA_INSN_FMULD, && case_sem_INSN_FMULD },
-    { SH64_MEDIA_INSN_FMULS, && case_sem_INSN_FMULS },
-    { SH64_MEDIA_INSN_FNEGD, && case_sem_INSN_FNEGD },
-    { SH64_MEDIA_INSN_FNEGS, && case_sem_INSN_FNEGS },
-    { SH64_MEDIA_INSN_FPUTSCR, && case_sem_INSN_FPUTSCR },
-    { SH64_MEDIA_INSN_FSQRTD, && case_sem_INSN_FSQRTD },
-    { SH64_MEDIA_INSN_FSQRTS, && case_sem_INSN_FSQRTS },
-    { SH64_MEDIA_INSN_FSTD, && case_sem_INSN_FSTD },
-    { SH64_MEDIA_INSN_FSTP, && case_sem_INSN_FSTP },
-    { SH64_MEDIA_INSN_FSTS, && case_sem_INSN_FSTS },
-    { SH64_MEDIA_INSN_FSTXD, && case_sem_INSN_FSTXD },
-    { SH64_MEDIA_INSN_FSTXP, && case_sem_INSN_FSTXP },
-    { SH64_MEDIA_INSN_FSTXS, && case_sem_INSN_FSTXS },
-    { SH64_MEDIA_INSN_FSUBD, && case_sem_INSN_FSUBD },
-    { SH64_MEDIA_INSN_FSUBS, && case_sem_INSN_FSUBS },
-    { SH64_MEDIA_INSN_FTRCDL, && case_sem_INSN_FTRCDL },
-    { SH64_MEDIA_INSN_FTRCSL, && case_sem_INSN_FTRCSL },
-    { SH64_MEDIA_INSN_FTRCDQ, && case_sem_INSN_FTRCDQ },
-    { SH64_MEDIA_INSN_FTRCSQ, && case_sem_INSN_FTRCSQ },
-    { SH64_MEDIA_INSN_FTRVS, && case_sem_INSN_FTRVS },
-    { SH64_MEDIA_INSN_GETCFG, && case_sem_INSN_GETCFG },
-    { SH64_MEDIA_INSN_GETCON, && case_sem_INSN_GETCON },
-    { SH64_MEDIA_INSN_GETTR, && case_sem_INSN_GETTR },
-    { SH64_MEDIA_INSN_ICBI, && case_sem_INSN_ICBI },
-    { SH64_MEDIA_INSN_LDB, && case_sem_INSN_LDB },
-    { SH64_MEDIA_INSN_LDL, && case_sem_INSN_LDL },
-    { SH64_MEDIA_INSN_LDQ, && case_sem_INSN_LDQ },
-    { SH64_MEDIA_INSN_LDUB, && case_sem_INSN_LDUB },
-    { SH64_MEDIA_INSN_LDUW, && case_sem_INSN_LDUW },
-    { SH64_MEDIA_INSN_LDW, && case_sem_INSN_LDW },
-    { SH64_MEDIA_INSN_LDHIL, && case_sem_INSN_LDHIL },
-    { SH64_MEDIA_INSN_LDHIQ, && case_sem_INSN_LDHIQ },
-    { SH64_MEDIA_INSN_LDLOL, && case_sem_INSN_LDLOL },
-    { SH64_MEDIA_INSN_LDLOQ, && case_sem_INSN_LDLOQ },
-    { SH64_MEDIA_INSN_LDXB, && case_sem_INSN_LDXB },
-    { SH64_MEDIA_INSN_LDXL, && case_sem_INSN_LDXL },
-    { SH64_MEDIA_INSN_LDXQ, && case_sem_INSN_LDXQ },
-    { SH64_MEDIA_INSN_LDXUB, && case_sem_INSN_LDXUB },
-    { SH64_MEDIA_INSN_LDXUW, && case_sem_INSN_LDXUW },
-    { SH64_MEDIA_INSN_LDXW, && case_sem_INSN_LDXW },
-    { SH64_MEDIA_INSN_MABSL, && case_sem_INSN_MABSL },
-    { SH64_MEDIA_INSN_MABSW, && case_sem_INSN_MABSW },
-    { SH64_MEDIA_INSN_MADDL, && case_sem_INSN_MADDL },
-    { SH64_MEDIA_INSN_MADDW, && case_sem_INSN_MADDW },
-    { SH64_MEDIA_INSN_MADDSL, && case_sem_INSN_MADDSL },
-    { SH64_MEDIA_INSN_MADDSUB, && case_sem_INSN_MADDSUB },
-    { SH64_MEDIA_INSN_MADDSW, && case_sem_INSN_MADDSW },
-    { SH64_MEDIA_INSN_MCMPEQB, && case_sem_INSN_MCMPEQB },
-    { SH64_MEDIA_INSN_MCMPEQL, && case_sem_INSN_MCMPEQL },
-    { SH64_MEDIA_INSN_MCMPEQW, && case_sem_INSN_MCMPEQW },
-    { SH64_MEDIA_INSN_MCMPGTL, && case_sem_INSN_MCMPGTL },
-    { SH64_MEDIA_INSN_MCMPGTUB, && case_sem_INSN_MCMPGTUB },
-    { SH64_MEDIA_INSN_MCMPGTW, && case_sem_INSN_MCMPGTW },
-    { SH64_MEDIA_INSN_MCMV, && case_sem_INSN_MCMV },
-    { SH64_MEDIA_INSN_MCNVSLW, && case_sem_INSN_MCNVSLW },
-    { SH64_MEDIA_INSN_MCNVSWB, && case_sem_INSN_MCNVSWB },
-    { SH64_MEDIA_INSN_MCNVSWUB, && case_sem_INSN_MCNVSWUB },
-    { SH64_MEDIA_INSN_MEXTR1, && case_sem_INSN_MEXTR1 },
-    { SH64_MEDIA_INSN_MEXTR2, && case_sem_INSN_MEXTR2 },
-    { SH64_MEDIA_INSN_MEXTR3, && case_sem_INSN_MEXTR3 },
-    { SH64_MEDIA_INSN_MEXTR4, && case_sem_INSN_MEXTR4 },
-    { SH64_MEDIA_INSN_MEXTR5, && case_sem_INSN_MEXTR5 },
-    { SH64_MEDIA_INSN_MEXTR6, && case_sem_INSN_MEXTR6 },
-    { SH64_MEDIA_INSN_MEXTR7, && case_sem_INSN_MEXTR7 },
-    { SH64_MEDIA_INSN_MMACFXWL, && case_sem_INSN_MMACFXWL },
-    { SH64_MEDIA_INSN_MMACNFX_WL, && case_sem_INSN_MMACNFX_WL },
-    { SH64_MEDIA_INSN_MMULL, && case_sem_INSN_MMULL },
-    { SH64_MEDIA_INSN_MMULW, && case_sem_INSN_MMULW },
-    { SH64_MEDIA_INSN_MMULFXL, && case_sem_INSN_MMULFXL },
-    { SH64_MEDIA_INSN_MMULFXW, && case_sem_INSN_MMULFXW },
-    { SH64_MEDIA_INSN_MMULFXRPW, && case_sem_INSN_MMULFXRPW },
-    { SH64_MEDIA_INSN_MMULHIWL, && case_sem_INSN_MMULHIWL },
-    { SH64_MEDIA_INSN_MMULLOWL, && case_sem_INSN_MMULLOWL },
-    { SH64_MEDIA_INSN_MMULSUMWQ, && case_sem_INSN_MMULSUMWQ },
-    { SH64_MEDIA_INSN_MOVI, && case_sem_INSN_MOVI },
-    { SH64_MEDIA_INSN_MPERMW, && case_sem_INSN_MPERMW },
-    { SH64_MEDIA_INSN_MSADUBQ, && case_sem_INSN_MSADUBQ },
-    { SH64_MEDIA_INSN_MSHALDSL, && case_sem_INSN_MSHALDSL },
-    { SH64_MEDIA_INSN_MSHALDSW, && case_sem_INSN_MSHALDSW },
-    { SH64_MEDIA_INSN_MSHARDL, && case_sem_INSN_MSHARDL },
-    { SH64_MEDIA_INSN_MSHARDW, && case_sem_INSN_MSHARDW },
-    { SH64_MEDIA_INSN_MSHARDSQ, && case_sem_INSN_MSHARDSQ },
-    { SH64_MEDIA_INSN_MSHFHIB, && case_sem_INSN_MSHFHIB },
-    { SH64_MEDIA_INSN_MSHFHIL, && case_sem_INSN_MSHFHIL },
-    { SH64_MEDIA_INSN_MSHFHIW, && case_sem_INSN_MSHFHIW },
-    { SH64_MEDIA_INSN_MSHFLOB, && case_sem_INSN_MSHFLOB },
-    { SH64_MEDIA_INSN_MSHFLOL, && case_sem_INSN_MSHFLOL },
-    { SH64_MEDIA_INSN_MSHFLOW, && case_sem_INSN_MSHFLOW },
-    { SH64_MEDIA_INSN_MSHLLDL, && case_sem_INSN_MSHLLDL },
-    { SH64_MEDIA_INSN_MSHLLDW, && case_sem_INSN_MSHLLDW },
-    { SH64_MEDIA_INSN_MSHLRDL, && case_sem_INSN_MSHLRDL },
-    { SH64_MEDIA_INSN_MSHLRDW, && case_sem_INSN_MSHLRDW },
-    { SH64_MEDIA_INSN_MSUBL, && case_sem_INSN_MSUBL },
-    { SH64_MEDIA_INSN_MSUBW, && case_sem_INSN_MSUBW },
-    { SH64_MEDIA_INSN_MSUBSL, && case_sem_INSN_MSUBSL },
-    { SH64_MEDIA_INSN_MSUBSUB, && case_sem_INSN_MSUBSUB },
-    { SH64_MEDIA_INSN_MSUBSW, && case_sem_INSN_MSUBSW },
-    { SH64_MEDIA_INSN_MULSL, && case_sem_INSN_MULSL },
-    { SH64_MEDIA_INSN_MULUL, && case_sem_INSN_MULUL },
-    { SH64_MEDIA_INSN_NOP, && case_sem_INSN_NOP },
-    { SH64_MEDIA_INSN_NSB, && case_sem_INSN_NSB },
-    { SH64_MEDIA_INSN_OCBI, && case_sem_INSN_OCBI },
-    { SH64_MEDIA_INSN_OCBP, && case_sem_INSN_OCBP },
-    { SH64_MEDIA_INSN_OCBWB, && case_sem_INSN_OCBWB },
-    { SH64_MEDIA_INSN_OR, && case_sem_INSN_OR },
-    { SH64_MEDIA_INSN_ORI, && case_sem_INSN_ORI },
-    { SH64_MEDIA_INSN_PREFI, && case_sem_INSN_PREFI },
-    { SH64_MEDIA_INSN_PTA, && case_sem_INSN_PTA },
-    { SH64_MEDIA_INSN_PTABS, && case_sem_INSN_PTABS },
-    { SH64_MEDIA_INSN_PTB, && case_sem_INSN_PTB },
-    { SH64_MEDIA_INSN_PTREL, && case_sem_INSN_PTREL },
-    { SH64_MEDIA_INSN_PUTCFG, && case_sem_INSN_PUTCFG },
-    { SH64_MEDIA_INSN_PUTCON, && case_sem_INSN_PUTCON },
-    { SH64_MEDIA_INSN_RTE, && case_sem_INSN_RTE },
-    { SH64_MEDIA_INSN_SHARD, && case_sem_INSN_SHARD },
-    { SH64_MEDIA_INSN_SHARDL, && case_sem_INSN_SHARDL },
-    { SH64_MEDIA_INSN_SHARI, && case_sem_INSN_SHARI },
-    { SH64_MEDIA_INSN_SHARIL, && case_sem_INSN_SHARIL },
-    { SH64_MEDIA_INSN_SHLLD, && case_sem_INSN_SHLLD },
-    { SH64_MEDIA_INSN_SHLLDL, && case_sem_INSN_SHLLDL },
-    { SH64_MEDIA_INSN_SHLLI, && case_sem_INSN_SHLLI },
-    { SH64_MEDIA_INSN_SHLLIL, && case_sem_INSN_SHLLIL },
-    { SH64_MEDIA_INSN_SHLRD, && case_sem_INSN_SHLRD },
-    { SH64_MEDIA_INSN_SHLRDL, && case_sem_INSN_SHLRDL },
-    { SH64_MEDIA_INSN_SHLRI, && case_sem_INSN_SHLRI },
-    { SH64_MEDIA_INSN_SHLRIL, && case_sem_INSN_SHLRIL },
-    { SH64_MEDIA_INSN_SHORI, && case_sem_INSN_SHORI },
-    { SH64_MEDIA_INSN_SLEEP, && case_sem_INSN_SLEEP },
-    { SH64_MEDIA_INSN_STB, && case_sem_INSN_STB },
-    { SH64_MEDIA_INSN_STL, && case_sem_INSN_STL },
-    { SH64_MEDIA_INSN_STQ, && case_sem_INSN_STQ },
-    { SH64_MEDIA_INSN_STW, && case_sem_INSN_STW },
-    { SH64_MEDIA_INSN_STHIL, && case_sem_INSN_STHIL },
-    { SH64_MEDIA_INSN_STHIQ, && case_sem_INSN_STHIQ },
-    { SH64_MEDIA_INSN_STLOL, && case_sem_INSN_STLOL },
-    { SH64_MEDIA_INSN_STLOQ, && case_sem_INSN_STLOQ },
-    { SH64_MEDIA_INSN_STXB, && case_sem_INSN_STXB },
-    { SH64_MEDIA_INSN_STXL, && case_sem_INSN_STXL },
-    { SH64_MEDIA_INSN_STXQ, && case_sem_INSN_STXQ },
-    { SH64_MEDIA_INSN_STXW, && case_sem_INSN_STXW },
-    { SH64_MEDIA_INSN_SUB, && case_sem_INSN_SUB },
-    { SH64_MEDIA_INSN_SUBL, && case_sem_INSN_SUBL },
-    { SH64_MEDIA_INSN_SWAPQ, && case_sem_INSN_SWAPQ },
-    { SH64_MEDIA_INSN_SYNCI, && case_sem_INSN_SYNCI },
-    { SH64_MEDIA_INSN_SYNCO, && case_sem_INSN_SYNCO },
-    { SH64_MEDIA_INSN_TRAPA, && case_sem_INSN_TRAPA },
-    { SH64_MEDIA_INSN_XOR, && case_sem_INSN_XOR },
-    { SH64_MEDIA_INSN_XORI, && case_sem_INSN_XORI },
-    { 0, 0 }
-  };
-  int i;
-
-  for (i = 0; labels[i].label != 0; ++i)
-    {
-#if FAST_P
-      CPU_IDESC (current_cpu) [labels[i].index].sem_fast_lab = labels[i].label;
-#else
-      CPU_IDESC (current_cpu) [labels[i].index].sem_full_lab = labels[i].label;
-#endif
-    }
-
-#undef DEFINE_LABELS
-#endif /* DEFINE_LABELS */
-
-#ifdef DEFINE_SWITCH
-
-/* If hyper-fast [well not unnecessarily slow] execution is selected, turn
-   off frills like tracing and profiling.  */
-/* FIXME: A better way would be to have TRACE_RESULT check for something
-   that can cause it to be optimized out.  Another way would be to emit
-   special handlers into the instruction "stream".  */
-
-#if FAST_P
-#undef TRACE_RESULT
-#define TRACE_RESULT(cpu, abuf, name, type, val)
-#endif
-
-#undef GET_ATTR
-#if defined (__STDC__) || defined (ALMOST_STDC) || defined (HAVE_STRINGIZE)
-#define GET_ATTR(cpu, num, attr) CGEN_ATTR_VALUE (NULL, abuf->idesc->attrs, CGEN_INSN_##attr)
-#else
-#define GET_ATTR(cpu, num, attr) CGEN_ATTR_VALUE (NULL, abuf->idesc->attrs, CGEN_INSN_/**/attr)
-#endif
-
-{
-
-#if WITH_SCACHE_PBB
-
-/* Branch to next handler without going around main loop.  */
-#define NEXT(vpc) goto * SEM_ARGBUF (vpc) -> semantic.sem_case
-SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case)
-
-#else /* ! WITH_SCACHE_PBB */
-
-#define NEXT(vpc) BREAK (sem)
-#ifdef __GNUC__
-#if FAST_P
-  SWITCH (sem, SEM_ARGBUF (sc) -> idesc->sem_fast_lab)
-#else
-  SWITCH (sem, SEM_ARGBUF (sc) -> idesc->sem_full_lab)
-#endif
-#else
-  SWITCH (sem, SEM_ARGBUF (sc) -> idesc->num)
-#endif
-
-#endif /* ! WITH_SCACHE_PBB */
-
-    {
-
-  CASE (sem, INSN_X_INVALID) : /* --invalid-- */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.fmt_empty.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 0);
-
-  {
-    /* Update the recorded pc in the cpu state struct.
-       Only necessary for WITH_SCACHE case, but to avoid the
-       conditional compilation ....  */
-    SET_H_PC (pc);
-    /* Virtual insns have zero size.  Overwrite vpc with address of next insn
-       using the default-insn-bitsize spec.  When executing insns in parallel
-       we may want to queue the fault and continue execution.  */
-    vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-    vpc = sim_engine_invalid_insn (current_cpu, pc, vpc);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_X_AFTER) : /* --after-- */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.fmt_empty.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 0);
-
-  {
-#if WITH_SCACHE_PBB_SH64_MEDIA
-    sh64_media_pbb_after (current_cpu, sem_arg);
-#endif
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_X_BEFORE) : /* --before-- */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.fmt_empty.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 0);
-
-  {
-#if WITH_SCACHE_PBB_SH64_MEDIA
-    sh64_media_pbb_before (current_cpu, sem_arg);
-#endif
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_X_CTI_CHAIN) : /* --cti-chain-- */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.fmt_empty.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 0);
-
-  {
-#if WITH_SCACHE_PBB_SH64_MEDIA
-#ifdef DEFINE_SWITCH
-    vpc = sh64_media_pbb_cti_chain (current_cpu, sem_arg,
-			       pbb_br_type, pbb_br_npc);
-    BREAK (sem);
-#else
-    /* FIXME: Allow provision of explicit ifmt spec in insn spec.  */
-    vpc = sh64_media_pbb_cti_chain (current_cpu, sem_arg,
-			       CPU_PBB_BR_TYPE (current_cpu),
-			       CPU_PBB_BR_NPC (current_cpu));
-#endif
-#endif
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_X_CHAIN) : /* --chain-- */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.fmt_empty.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 0);
-
-  {
-#if WITH_SCACHE_PBB_SH64_MEDIA
-    vpc = sh64_media_pbb_chain (current_cpu, sem_arg);
-#ifdef DEFINE_SWITCH
-    BREAK (sem);
-#endif
-#endif
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_X_BEGIN) : /* --begin-- */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.fmt_empty.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 0);
-
-  {
-#if WITH_SCACHE_PBB_SH64_MEDIA
-#if defined DEFINE_SWITCH || defined FAST_P
-    /* In the switch case FAST_P is a constant, allowing several optimizations
-       in any called inline functions.  */
-    vpc = sh64_media_pbb_begin (current_cpu, FAST_P);
-#else
-#if 0 /* cgen engine can't handle dynamic fast/full switching yet.  */
-    vpc = sh64_media_pbb_begin (current_cpu, STATE_RUN_FAST_P (CPU_STATE (current_cpu)));
-#else
-    vpc = sh64_media_pbb_begin (current_cpu, 0);
-#endif
-#endif
-#endif
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_ADD) : /* add $rm, $rn, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_add.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = ADDDI (GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right)));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_ADDL) : /* add.l $rm, $rn, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_add.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = ADDSI (SUBWORDDISI (GET_H_GR (FLD (f_left)), 1), SUBWORDDISI (GET_H_GR (FLD (f_right)), 1));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_ADDI) : /* addi $rm, $disp10, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_addi.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = ADDDI (GET_H_GR (FLD (f_left)), EXTSIDI (FLD (f_disp10)));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_ADDIL) : /* addi.l $rm, $disp10, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_addi.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = EXTSIDI (ADDSI (EXTSISI (FLD (f_disp10)), SUBWORDDISI (GET_H_GR (FLD (f_left)), 1)));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_ADDZL) : /* addz.l $rm, $rn, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_add.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = ZEXTSIDI (ADDSI (SUBWORDDISI (GET_H_GR (FLD (f_left)), 1), SUBWORDDISI (GET_H_GR (FLD (f_right)), 1)));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_ALLOCO) : /* alloco $rm, $disp6x32 */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.fmt_empty.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-((void) 0); /*nop*/
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_AND) : /* and $rm, $rn, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_add.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = ANDDI (GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right)));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_ANDC) : /* andc $rm, $rn, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_add.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = ANDDI (GET_H_GR (FLD (f_left)), INVDI (GET_H_GR (FLD (f_right))));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_ANDI) : /* andi $rm, $disp10, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_addi.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = ANDDI (GET_H_GR (FLD (f_left)), EXTSIDI (FLD (f_disp10)));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_BEQ) : /* beq$likely $rm, $rn, $tra */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_beq.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_BRANCH_INIT
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-if (EQDI (GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right)))) {
-  {
-    UDI opval = CPU (h_tr[FLD (f_tra)]);
-    SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc);
-    written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval);
-  }
-}
-
-  abuf->written = written;
-  SEM_BRANCH_FINI (vpc);
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_BEQI) : /* beqi$likely $rm, $imm6, $tra */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_beqi.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_BRANCH_INIT
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-if (EQDI (GET_H_GR (FLD (f_left)), EXTSIDI (FLD (f_imm6)))) {
-  {
-    UDI opval = CPU (h_tr[FLD (f_tra)]);
-    SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc);
-    written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval);
-  }
-}
-
-  abuf->written = written;
-  SEM_BRANCH_FINI (vpc);
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_BGE) : /* bge$likely $rm, $rn, $tra */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_beq.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_BRANCH_INIT
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-if (GEDI (GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right)))) {
-  {
-    UDI opval = CPU (h_tr[FLD (f_tra)]);
-    SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc);
-    written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval);
-  }
-}
-
-  abuf->written = written;
-  SEM_BRANCH_FINI (vpc);
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_BGEU) : /* bgeu$likely $rm, $rn, $tra */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_beq.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_BRANCH_INIT
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-if (GEUDI (GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right)))) {
-  {
-    UDI opval = CPU (h_tr[FLD (f_tra)]);
-    SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc);
-    written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval);
-  }
-}
-
-  abuf->written = written;
-  SEM_BRANCH_FINI (vpc);
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_BGT) : /* bgt$likely $rm, $rn, $tra */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_beq.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_BRANCH_INIT
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-if (GTDI (GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right)))) {
-  {
-    UDI opval = CPU (h_tr[FLD (f_tra)]);
-    SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc);
-    written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval);
-  }
-}
-
-  abuf->written = written;
-  SEM_BRANCH_FINI (vpc);
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_BGTU) : /* bgtu$likely $rm, $rn, $tra */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_beq.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_BRANCH_INIT
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-if (GTUDI (GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right)))) {
-  {
-    UDI opval = CPU (h_tr[FLD (f_tra)]);
-    SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc);
-    written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval);
-  }
-}
-
-  abuf->written = written;
-  SEM_BRANCH_FINI (vpc);
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_BLINK) : /* blink $trb, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_blink.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_BRANCH_INIT
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  {
-    DI opval = ORDI (ADDDI (pc, 4), 1);
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-  {
-    UDI opval = CPU (h_tr[FLD (f_trb)]);
-    SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval);
-  }
-}
-
-  SEM_BRANCH_FINI (vpc);
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_BNE) : /* bne$likely $rm, $rn, $tra */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_beq.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_BRANCH_INIT
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-if (NEDI (GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right)))) {
-  {
-    UDI opval = CPU (h_tr[FLD (f_tra)]);
-    SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc);
-    written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval);
-  }
-}
-
-  abuf->written = written;
-  SEM_BRANCH_FINI (vpc);
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_BNEI) : /* bnei$likely $rm, $imm6, $tra */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_beqi.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_BRANCH_INIT
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-if (NEDI (GET_H_GR (FLD (f_left)), EXTSIDI (FLD (f_imm6)))) {
-  {
-    UDI opval = CPU (h_tr[FLD (f_tra)]);
-    SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc);
-    written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval);
-  }
-}
-
-  abuf->written = written;
-  SEM_BRANCH_FINI (vpc);
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_BRK) : /* brk */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.fmt_empty.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-sh64_break (current_cpu, pc);
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_BYTEREV) : /* byterev $rm, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_xori.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  DI tmp_source;
-  DI tmp_result;
-  tmp_source = GET_H_GR (FLD (f_left));
-  tmp_result = 0;
-{
-  tmp_result = ORDI (SLLDI (tmp_result, 8), ANDDI (tmp_source, 255));
-  tmp_source = SRLDI (tmp_source, 8);
-}
-{
-  tmp_result = ORDI (SLLDI (tmp_result, 8), ANDDI (tmp_source, 255));
-  tmp_source = SRLDI (tmp_source, 8);
-}
-{
-  tmp_result = ORDI (SLLDI (tmp_result, 8), ANDDI (tmp_source, 255));
-  tmp_source = SRLDI (tmp_source, 8);
-}
-{
-  tmp_result = ORDI (SLLDI (tmp_result, 8), ANDDI (tmp_source, 255));
-  tmp_source = SRLDI (tmp_source, 8);
-}
-{
-  tmp_result = ORDI (SLLDI (tmp_result, 8), ANDDI (tmp_source, 255));
-  tmp_source = SRLDI (tmp_source, 8);
-}
-{
-  tmp_result = ORDI (SLLDI (tmp_result, 8), ANDDI (tmp_source, 255));
-  tmp_source = SRLDI (tmp_source, 8);
-}
-{
-  tmp_result = ORDI (SLLDI (tmp_result, 8), ANDDI (tmp_source, 255));
-  tmp_source = SRLDI (tmp_source, 8);
-}
-{
-  tmp_result = ORDI (SLLDI (tmp_result, 8), ANDDI (tmp_source, 255));
-  tmp_source = SRLDI (tmp_source, 8);
-}
-  {
-    DI opval = tmp_result;
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_CMPEQ) : /* cmpeq $rm, $rn, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_add.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = ((EQDI (GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right)))) ? (1) : (0));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_CMPGT) : /* cmpgt $rm, $rn, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_add.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = ((GTDI (GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right)))) ? (1) : (0));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_CMPGTU) : /* cmpgtu $rm,$rn, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_add.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = ((GTUDI (GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right)))) ? (1) : (0));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_CMVEQ) : /* cmveq $rm, $rn, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_add.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-if (EQDI (GET_H_GR (FLD (f_left)), 0)) {
-  {
-    DI opval = GET_H_GR (FLD (f_right));
-    SET_H_GR (FLD (f_dest), opval);
-    written |= (1 << 2);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-
-  abuf->written = written;
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_CMVNE) : /* cmvne $rm, $rn, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_add.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-if (NEDI (GET_H_GR (FLD (f_left)), 0)) {
-  {
-    DI opval = GET_H_GR (FLD (f_right));
-    SET_H_GR (FLD (f_dest), opval);
-    written |= (1 << 2);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-
-  abuf->written = written;
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_FABSD) : /* fabs.d $drgh, $drf */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_fabsd.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DF opval = sh64_fabsd (current_cpu, GET_H_DR (FLD (f_left_right)));
-    SET_H_DR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "dr", 'f', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_FABSS) : /* fabs.s $frgh, $frf */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_fabsd.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    SF opval = sh64_fabss (current_cpu, CPU (h_fr[FLD (f_left_right)]));
-    CPU (h_fr[FLD (f_dest)]) = opval;
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_FADDD) : /* fadd.d $drg, $drh, $drf */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_add.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DF opval = sh64_faddd (current_cpu, GET_H_DR (FLD (f_left)), GET_H_DR (FLD (f_right)));
-    SET_H_DR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "dr", 'f', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_FADDS) : /* fadd.s $frg, $frh, $frf */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_add.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    SF opval = sh64_fadds (current_cpu, CPU (h_fr[FLD (f_left)]), CPU (h_fr[FLD (f_right)]));
-    CPU (h_fr[FLD (f_dest)]) = opval;
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_FCMPEQD) : /* fcmpeq.d $drg, $drh, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_add.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = ZEXTBIDI (sh64_fcmpeqd (current_cpu, GET_H_DR (FLD (f_left)), GET_H_DR (FLD (f_right))));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_FCMPEQS) : /* fcmpeq.s $frg, $frh, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_add.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = ZEXTBIDI (sh64_fcmpeqs (current_cpu, CPU (h_fr[FLD (f_left)]), CPU (h_fr[FLD (f_right)])));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_FCMPGED) : /* fcmpge.d $drg, $drh, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_add.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = ZEXTBIDI (sh64_fcmpged (current_cpu, GET_H_DR (FLD (f_left)), GET_H_DR (FLD (f_right))));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_FCMPGES) : /* fcmpge.s $frg, $frh, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_add.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = ZEXTBIDI (sh64_fcmpges (current_cpu, CPU (h_fr[FLD (f_left)]), CPU (h_fr[FLD (f_right)])));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_FCMPGTD) : /* fcmpgt.d $drg, $drh, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_add.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = ZEXTBIDI (sh64_fcmpgtd (current_cpu, GET_H_DR (FLD (f_left)), GET_H_DR (FLD (f_right))));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_FCMPGTS) : /* fcmpgt.s $frg, $frh, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_add.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = ZEXTBIDI (sh64_fcmpgts (current_cpu, CPU (h_fr[FLD (f_left)]), CPU (h_fr[FLD (f_right)])));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_FCMPUND) : /* fcmpun.d $drg, $drh, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_add.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = ZEXTBIDI (sh64_fcmpund (current_cpu, GET_H_DR (FLD (f_left)), GET_H_DR (FLD (f_right))));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_FCMPUNS) : /* fcmpun.s $frg, $frh, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_add.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = ZEXTBIDI (sh64_fcmpuns (current_cpu, CPU (h_fr[FLD (f_left)]), CPU (h_fr[FLD (f_right)])));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_FCNVDS) : /* fcnv.ds $drgh, $frf */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_fabsd.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    SF opval = sh64_fcnvds (current_cpu, GET_H_DR (FLD (f_left_right)));
-    CPU (h_fr[FLD (f_dest)]) = opval;
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_FCNVSD) : /* fcnv.sd $frgh, $drf */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_fabsd.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DF opval = sh64_fcnvsd (current_cpu, CPU (h_fr[FLD (f_left_right)]));
-    SET_H_DR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "dr", 'f', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_FDIVD) : /* fdiv.d $drg, $drh, $drf */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_add.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DF opval = sh64_fdivd (current_cpu, GET_H_DR (FLD (f_left)), GET_H_DR (FLD (f_right)));
-    SET_H_DR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "dr", 'f', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_FDIVS) : /* fdiv.s $frg, $frh, $frf */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_add.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    SF opval = sh64_fdivs (current_cpu, CPU (h_fr[FLD (f_left)]), CPU (h_fr[FLD (f_right)]));
-    CPU (h_fr[FLD (f_dest)]) = opval;
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_FGETSCR) : /* fgetscr $frf */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.fmt_empty.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-((void) 0); /*nop*/
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_FIPRS) : /* fipr.s $fvg, $fvh, $frf */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_add.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  UQI tmp_g;
-  UQI tmp_h;
-  SF tmp_temp;
-  tmp_g = FLD (f_left);
-  tmp_h = FLD (f_right);
-  tmp_temp = sh64_fmuls (current_cpu, CPU (h_fr[tmp_g]), CPU (h_fr[tmp_h]));
-  tmp_temp = sh64_fadds (current_cpu, tmp_temp, sh64_fmuls (current_cpu, CPU (h_fr[ADDQI (tmp_g, 1)]), CPU (h_fr[ADDQI (tmp_h, 1)])));
-  tmp_temp = sh64_fadds (current_cpu, tmp_temp, sh64_fmuls (current_cpu, CPU (h_fr[ADDQI (tmp_g, 2)]), CPU (h_fr[ADDQI (tmp_h, 2)])));
-  tmp_temp = sh64_fadds (current_cpu, tmp_temp, sh64_fmuls (current_cpu, CPU (h_fr[ADDQI (tmp_g, 3)]), CPU (h_fr[ADDQI (tmp_h, 3)])));
-  {
-    SF opval = tmp_temp;
-    CPU (h_fr[FLD (f_dest)]) = opval;
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
-  }
-}
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_FLDD) : /* fld.d $rm, $disp10x8, $drf */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_fldd.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DF opval = GETMEMDF (current_cpu, pc, ADDDI (GET_H_GR (FLD (f_left)), FLD (f_disp10x8)));
-    SET_H_DR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "dr", 'f', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_FLDP) : /* fld.p $rm, $disp10x8, $fpf */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_fldd.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  QI tmp_f;
-  tmp_f = FLD (f_dest);
-  {
-    SF opval = GETMEMSF (current_cpu, pc, ADDDI (GET_H_GR (FLD (f_left)), FLD (f_disp10x8)));
-    CPU (h_fr[tmp_f]) = opval;
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
-  }
-  {
-    SF opval = GETMEMSF (current_cpu, pc, ADDDI (GET_H_GR (FLD (f_left)), ADDSI (FLD (f_disp10x8), 4)));
-    CPU (h_fr[ADDQI (tmp_f, 1)]) = opval;
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
-  }
-}
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_FLDS) : /* fld.s $rm, $disp10x4, $frf */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_flds.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    SF opval = GETMEMSF (current_cpu, pc, ADDDI (GET_H_GR (FLD (f_left)), FLD (f_disp10x4)));
-    CPU (h_fr[FLD (f_dest)]) = opval;
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_FLDXD) : /* fldx.d $rm, $rn, $drf */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_add.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DF opval = GETMEMDF (current_cpu, pc, ADDDI (GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right))));
-    SET_H_DR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "dr", 'f', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_FLDXP) : /* fldx.p $rm, $rn, $fpf */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_add.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  QI tmp_f;
-  tmp_f = FLD (f_dest);
-  {
-    SF opval = GETMEMSF (current_cpu, pc, ADDDI (GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right))));
-    CPU (h_fr[tmp_f]) = opval;
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
-  }
-  {
-    SF opval = GETMEMSF (current_cpu, pc, ADDDI (GET_H_GR (FLD (f_left)), ADDDI (GET_H_GR (FLD (f_right)), 4)));
-    CPU (h_fr[ADDQI (tmp_f, 1)]) = opval;
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
-  }
-}
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_FLDXS) : /* fldx.s $rm, $rn, $frf */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_add.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    SF opval = GETMEMSF (current_cpu, pc, ADDDI (GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right))));
-    CPU (h_fr[FLD (f_dest)]) = opval;
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_FLOATLD) : /* float.ld $frgh, $drf */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_fabsd.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DF opval = sh64_floatld (current_cpu, CPU (h_fr[FLD (f_left_right)]));
-    SET_H_DR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "dr", 'f', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_FLOATLS) : /* float.ls $frgh, $frf */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_fabsd.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    SF opval = sh64_floatls (current_cpu, CPU (h_fr[FLD (f_left_right)]));
-    CPU (h_fr[FLD (f_dest)]) = opval;
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_FLOATQD) : /* float.qd $drgh, $drf */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_fabsd.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DF opval = sh64_floatqd (current_cpu, GET_H_DR (FLD (f_left_right)));
-    SET_H_DR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "dr", 'f', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_FLOATQS) : /* float.qs $drgh, $frf */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_fabsd.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    SF opval = sh64_floatqs (current_cpu, GET_H_DR (FLD (f_left_right)));
-    CPU (h_fr[FLD (f_dest)]) = opval;
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_FMACS) : /* fmac.s $frg, $frh, $frf */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_add.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    SF opval = sh64_fadds (current_cpu, CPU (h_fr[FLD (f_dest)]), sh64_fmuls (current_cpu, CPU (h_fr[FLD (f_left)]), CPU (h_fr[FLD (f_right)])));
-    CPU (h_fr[FLD (f_dest)]) = opval;
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_FMOVD) : /* fmov.d $drgh, $drf */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_fabsd.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DF opval = GET_H_DR (FLD (f_left_right));
-    SET_H_DR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "dr", 'f', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_FMOVDQ) : /* fmov.dq $drgh, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_fabsd.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = SUBWORDDFDI (GET_H_DR (FLD (f_left_right)));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_FMOVLS) : /* fmov.ls $rm, $frf */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_xori.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    SF opval = SUBWORDSISF (SUBWORDDISI (GET_H_GR (FLD (f_left)), 1));
-    CPU (h_fr[FLD (f_dest)]) = opval;
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_FMOVQD) : /* fmov.qd $rm, $drf */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_xori.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DF opval = SUBWORDDIDF (GET_H_GR (FLD (f_left)));
-    SET_H_DR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "dr", 'f', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_FMOVS) : /* fmov.s $frgh, $frf */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_fabsd.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    SF opval = CPU (h_fr[FLD (f_left_right)]);
-    CPU (h_fr[FLD (f_dest)]) = opval;
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_FMOVSL) : /* fmov.sl $frgh, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_fabsd.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = EXTSIDI (SUBWORDSFSI (CPU (h_fr[FLD (f_left_right)])));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_FMULD) : /* fmul.d $drg, $drh, $drf */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_add.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DF opval = sh64_fmuld (current_cpu, GET_H_DR (FLD (f_left)), GET_H_DR (FLD (f_right)));
-    SET_H_DR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "dr", 'f', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_FMULS) : /* fmul.s $frg, $frh, $frf */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_add.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    SF opval = sh64_fmuls (current_cpu, CPU (h_fr[FLD (f_left)]), CPU (h_fr[FLD (f_right)]));
-    CPU (h_fr[FLD (f_dest)]) = opval;
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_FNEGD) : /* fneg.d $drgh, $drf */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_fabsd.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DF opval = sh64_fnegd (current_cpu, GET_H_DR (FLD (f_left_right)));
-    SET_H_DR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "dr", 'f', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_FNEGS) : /* fneg.s $frgh, $frf */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_fabsd.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    SF opval = sh64_fnegs (current_cpu, CPU (h_fr[FLD (f_left_right)]));
-    CPU (h_fr[FLD (f_dest)]) = opval;
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_FPUTSCR) : /* fputscr $frgh */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.fmt_empty.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-((void) 0); /*nop*/
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_FSQRTD) : /* fsqrt.d $drgh, $drf */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_fabsd.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DF opval = sh64_fsqrtd (current_cpu, GET_H_DR (FLD (f_left_right)));
-    SET_H_DR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "dr", 'f', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_FSQRTS) : /* fsqrt.s $frgh, $frf */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_fabsd.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    SF opval = sh64_fsqrts (current_cpu, CPU (h_fr[FLD (f_left_right)]));
-    CPU (h_fr[FLD (f_dest)]) = opval;
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_FSTD) : /* fst.d $rm, $disp10x8, $drf */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_fldd.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DF opval = GET_H_DR (FLD (f_dest));
-    SETMEMDF (current_cpu, pc, ADDDI (GET_H_GR (FLD (f_left)), FLD (f_disp10x8)), opval);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'f', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_FSTP) : /* fst.p $rm, $disp10x8, $fpf */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_fldd.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  QI tmp_f;
-  tmp_f = FLD (f_dest);
-  {
-    SF opval = CPU (h_fr[tmp_f]);
-    SETMEMSF (current_cpu, pc, ADDDI (GET_H_GR (FLD (f_left)), FLD (f_disp10x8)), opval);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'f', opval);
-  }
-  {
-    SF opval = CPU (h_fr[ADDQI (tmp_f, 1)]);
-    SETMEMSF (current_cpu, pc, ADDDI (GET_H_GR (FLD (f_left)), ADDSI (FLD (f_disp10x8), 4)), opval);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'f', opval);
-  }
-}
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_FSTS) : /* fst.s $rm, $disp10x4, $frf */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_flds.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    SF opval = CPU (h_fr[FLD (f_dest)]);
-    SETMEMSF (current_cpu, pc, ADDDI (GET_H_GR (FLD (f_left)), FLD (f_disp10x4)), opval);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'f', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_FSTXD) : /* fstx.d $rm, $rn, $drf */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_add.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DF opval = GET_H_DR (FLD (f_dest));
-    SETMEMDF (current_cpu, pc, ADDDI (GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right))), opval);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'f', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_FSTXP) : /* fstx.p $rm, $rn, $fpf */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_add.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  QI tmp_f;
-  tmp_f = FLD (f_dest);
-  {
-    SF opval = CPU (h_fr[tmp_f]);
-    SETMEMSF (current_cpu, pc, ADDDI (GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right))), opval);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'f', opval);
-  }
-  {
-    SF opval = CPU (h_fr[ADDQI (tmp_f, 1)]);
-    SETMEMSF (current_cpu, pc, ADDDI (GET_H_GR (FLD (f_left)), ADDDI (GET_H_GR (FLD (f_right)), 4)), opval);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'f', opval);
-  }
-}
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_FSTXS) : /* fstx.s $rm, $rn, $frf */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_add.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    SF opval = CPU (h_fr[FLD (f_dest)]);
-    SETMEMSF (current_cpu, pc, ADDDI (GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right))), opval);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'f', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_FSUBD) : /* fsub.d $drg, $drh, $drf */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_add.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DF opval = sh64_fsubd (current_cpu, GET_H_DR (FLD (f_left)), GET_H_DR (FLD (f_right)));
-    SET_H_DR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "dr", 'f', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_FSUBS) : /* fsub.s $frg, $frh, $frf */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_add.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    SF opval = sh64_fsubs (current_cpu, CPU (h_fr[FLD (f_left)]), CPU (h_fr[FLD (f_right)]));
-    CPU (h_fr[FLD (f_dest)]) = opval;
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_FTRCDL) : /* ftrc.dl $drgh, $frf */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_fabsd.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    SF opval = sh64_ftrcdl (current_cpu, GET_H_DR (FLD (f_left_right)));
-    CPU (h_fr[FLD (f_dest)]) = opval;
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_FTRCSL) : /* ftrc.sl $frgh, $frf */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_fabsd.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    SF opval = sh64_ftrcsl (current_cpu, CPU (h_fr[FLD (f_left_right)]));
-    CPU (h_fr[FLD (f_dest)]) = opval;
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_FTRCDQ) : /* ftrc.dq $drgh, $drf */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_fabsd.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DF opval = sh64_ftrcdq (current_cpu, GET_H_DR (FLD (f_left_right)));
-    SET_H_DR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "dr", 'f', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_FTRCSQ) : /* ftrc.sq $frgh, $drf */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_fabsd.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DF opval = sh64_ftrcsq (current_cpu, CPU (h_fr[FLD (f_left_right)]));
-    SET_H_DR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "dr", 'f', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_FTRVS) : /* ftrv.s $mtrxg, $fvh, $fvf */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_add.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-sh64_ftrvs (current_cpu, FLD (f_left), FLD (f_right), FLD (f_dest));
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_GETCFG) : /* getcfg $rm, $disp6, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.fmt_empty.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-((void) 0); /*nop*/
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_GETCON) : /* getcon $crk, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_xori.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = GET_H_CR (FLD (f_left));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_GETTR) : /* gettr $trb, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_blink.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = CPU (h_tr[FLD (f_trb)]);
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_ICBI) : /* icbi $rm, $disp6x32 */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.fmt_empty.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-((void) 0); /*nop*/
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_LDB) : /* ld.b $rm, $disp10, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_addi.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = EXTQIDI (GETMEMQI (current_cpu, pc, ADDDI (GET_H_GR (FLD (f_left)), EXTSIDI (FLD (f_disp10)))));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_LDL) : /* ld.l $rm, $disp10x4, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_flds.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = EXTSIDI (GETMEMSI (current_cpu, pc, ADDDI (GET_H_GR (FLD (f_left)), EXTSIDI (FLD (f_disp10x4)))));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_LDQ) : /* ld.q $rm, $disp10x8, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_fldd.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = GETMEMDI (current_cpu, pc, ADDDI (GET_H_GR (FLD (f_left)), EXTSIDI (FLD (f_disp10x8))));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_LDUB) : /* ld.ub $rm, $disp10, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_addi.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = ZEXTQIDI (GETMEMQI (current_cpu, pc, ADDDI (GET_H_GR (FLD (f_left)), EXTSIDI (FLD (f_disp10)))));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_LDUW) : /* ld.uw $rm, $disp10x2, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_lduw.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = ZEXTHIDI (GETMEMHI (current_cpu, pc, ADDDI (GET_H_GR (FLD (f_left)), EXTSIDI (FLD (f_disp10x2)))));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_LDW) : /* ld.w $rm, $disp10x2, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_lduw.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = EXTHIDI (GETMEMHI (current_cpu, pc, ADDDI (GET_H_GR (FLD (f_left)), EXTSIDI (FLD (f_disp10x2)))));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_LDHIL) : /* ldhi.l $rm, $disp6, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_ldhil.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  DI tmp_addr;
-  QI tmp_bytecount;
-  SI tmp_val;
-  tmp_addr = ADDDI (GET_H_GR (FLD (f_left)), FLD (f_disp6));
-  tmp_bytecount = ADDDI (ANDDI (tmp_addr, 3), 1);
-  tmp_val = 0;
-if (ANDQI (tmp_bytecount, 4)) {
-  {
-    DI opval = EXTSIDI (GETMEMSI (current_cpu, pc, ANDDI (tmp_addr, -4)));
-    SET_H_GR (FLD (f_dest), opval);
-    written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-} else {
-if (GET_H_ENDIAN ()) {
-{
-if (ANDQI (tmp_bytecount, 2)) {
-  tmp_val = ADDSI (SLLSI (tmp_val, 16), ZEXTHIDI (GETMEMHI (current_cpu, pc, ANDDI (tmp_addr, -4))));
-}
-if (ANDQI (tmp_bytecount, 1)) {
-  tmp_val = ADDSI (SLLSI (tmp_val, 8), ZEXTQIDI (GETMEMQI (current_cpu, pc, tmp_addr)));
-}
-  {
-    DI opval = EXTSIDI (tmp_val);
-    SET_H_GR (FLD (f_dest), opval);
-    written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-} else {
-{
-if (ANDQI (tmp_bytecount, 1)) {
-  tmp_val = ADDSI (SLLSI (tmp_val, 8), ZEXTQIDI (GETMEMQI (current_cpu, pc, tmp_addr)));
-}
-if (ANDQI (tmp_bytecount, 2)) {
-  tmp_val = ADDSI (SLLSI (tmp_val, 16), ZEXTHIDI (GETMEMHI (current_cpu, pc, ANDDI (tmp_addr, -4))));
-}
-  {
-    DI opval = EXTSIDI (SLLSI (tmp_val, SUBSI (32, MULSI (8, tmp_bytecount))));
-    SET_H_GR (FLD (f_dest), opval);
-    written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-}
-}
-}
-
-  abuf->written = written;
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_LDHIQ) : /* ldhi.q $rm, $disp6, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_ldhil.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  DI tmp_addr;
-  QI tmp_bytecount;
-  DI tmp_val;
-  tmp_addr = ADDDI (GET_H_GR (FLD (f_left)), FLD (f_disp6));
-  tmp_bytecount = ADDDI (ANDDI (tmp_addr, 7), 1);
-  tmp_val = 0;
-if (ANDQI (tmp_bytecount, 8)) {
-  {
-    DI opval = GETMEMDI (current_cpu, pc, ANDDI (tmp_addr, -8));
-    SET_H_GR (FLD (f_dest), opval);
-    written |= (1 << 7);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-} else {
-if (GET_H_ENDIAN ()) {
-{
-if (ANDQI (tmp_bytecount, 4)) {
-  tmp_val = ADDDI (SLLDI (tmp_val, 32), ZEXTSIDI (GETMEMSI (current_cpu, pc, ANDDI (tmp_addr, -8))));
-}
-if (ANDQI (tmp_bytecount, 2)) {
-  tmp_val = ADDDI (SLLDI (tmp_val, 16), ZEXTHIDI (GETMEMHI (current_cpu, pc, ANDDI (tmp_addr, -4))));
-}
-if (ANDQI (tmp_bytecount, 1)) {
-  tmp_val = ADDDI (SLLDI (tmp_val, 8), ZEXTQIDI (GETMEMQI (current_cpu, pc, tmp_addr)));
-}
-  {
-    DI opval = tmp_val;
-    SET_H_GR (FLD (f_dest), opval);
-    written |= (1 << 7);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-} else {
-{
-if (ANDQI (tmp_bytecount, 1)) {
-  tmp_val = ADDDI (SLLDI (tmp_val, 8), ZEXTQIDI (GETMEMQI (current_cpu, pc, tmp_addr)));
-}
-if (ANDQI (tmp_bytecount, 2)) {
-  tmp_val = ADDDI (SLLDI (tmp_val, 16), ZEXTHIDI (GETMEMHI (current_cpu, pc, ANDDI (tmp_addr, -4))));
-}
-if (ANDQI (tmp_bytecount, 4)) {
-  tmp_val = ADDDI (SLLDI (tmp_val, 32), ZEXTSIDI (GETMEMSI (current_cpu, pc, ANDDI (tmp_addr, -8))));
-}
-  {
-    DI opval = SLLDI (tmp_val, SUBSI (64, MULSI (8, tmp_bytecount)));
-    SET_H_GR (FLD (f_dest), opval);
-    written |= (1 << 7);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-}
-}
-}
-
-  abuf->written = written;
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_LDLOL) : /* ldlo.l $rm, $disp6, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_ldhil.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  DI tmp_addr;
-  QI tmp_bytecount;
-  SI tmp_val;
-  tmp_addr = ADDDI (GET_H_GR (FLD (f_left)), FLD (f_disp6));
-  tmp_bytecount = SUBSI (4, ANDDI (tmp_addr, 3));
-  tmp_val = 0;
-if (ANDQI (tmp_bytecount, 4)) {
-  {
-    DI opval = EXTSIDI (GETMEMSI (current_cpu, pc, tmp_addr));
-    SET_H_GR (FLD (f_dest), opval);
-    written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-} else {
-if (GET_H_ENDIAN ()) {
-{
-if (ANDQI (tmp_bytecount, 1)) {
-  tmp_val = ADDSI (SLLSI (tmp_val, 8), ZEXTQIDI (GETMEMQI (current_cpu, pc, tmp_addr)));
-}
-if (ANDQI (tmp_bytecount, 2)) {
-  tmp_val = ADDSI (SLLSI (tmp_val, 16), ZEXTHIDI (GETMEMHI (current_cpu, pc, ANDDI (ADDDI (tmp_addr, 1), -2))));
-}
-  {
-    DI opval = EXTSIDI (SLLSI (tmp_val, SUBSI (32, MULSI (8, tmp_bytecount))));
-    SET_H_GR (FLD (f_dest), opval);
-    written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-} else {
-{
-if (ANDQI (tmp_bytecount, 2)) {
-  tmp_val = ADDSI (SLLSI (tmp_val, 16), ZEXTHIDI (GETMEMHI (current_cpu, pc, ANDDI (ADDDI (tmp_addr, 1), -2))));
-}
-if (ANDQI (tmp_bytecount, 1)) {
-  tmp_val = ADDSI (SLLSI (tmp_val, 8), ZEXTQIDI (GETMEMQI (current_cpu, pc, tmp_addr)));
-}
-  {
-    DI opval = EXTSIDI (tmp_val);
-    SET_H_GR (FLD (f_dest), opval);
-    written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-}
-}
-}
-
-  abuf->written = written;
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_LDLOQ) : /* ldlo.q $rm, $disp6, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_ldhil.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  DI tmp_addr;
-  QI tmp_bytecount;
-  DI tmp_val;
-  tmp_addr = ADDDI (GET_H_GR (FLD (f_left)), FLD (f_disp6));
-  tmp_bytecount = SUBSI (8, ANDDI (tmp_addr, 7));
-  tmp_val = 0;
-if (ANDQI (tmp_bytecount, 8)) {
-  {
-    DI opval = GETMEMDI (current_cpu, pc, tmp_addr);
-    SET_H_GR (FLD (f_dest), opval);
-    written |= (1 << 7);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-} else {
-if (GET_H_ENDIAN ()) {
-{
-if (ANDQI (tmp_bytecount, 1)) {
-  tmp_val = ADDDI (SLLDI (tmp_val, 8), ZEXTQIDI (GETMEMQI (current_cpu, pc, tmp_addr)));
-}
-if (ANDQI (tmp_bytecount, 2)) {
-  tmp_val = ADDDI (SLLDI (tmp_val, 16), ZEXTHIDI (GETMEMHI (current_cpu, pc, ANDDI (ADDDI (tmp_addr, 1), -2))));
-}
-if (ANDQI (tmp_bytecount, 4)) {
-  tmp_val = ADDDI (SLLDI (tmp_val, 32), ZEXTSIDI (GETMEMSI (current_cpu, pc, ANDDI (ADDDI (tmp_addr, 3), -4))));
-}
-  {
-    DI opval = SLLDI (tmp_val, SUBSI (64, MULSI (8, tmp_bytecount)));
-    SET_H_GR (FLD (f_dest), opval);
-    written |= (1 << 7);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-} else {
-{
-if (ANDQI (tmp_bytecount, 4)) {
-  tmp_val = ADDDI (SLLDI (tmp_val, 32), ZEXTSIDI (GETMEMSI (current_cpu, pc, ANDDI (ADDDI (tmp_addr, 3), -4))));
-}
-if (ANDQI (tmp_bytecount, 2)) {
-  tmp_val = ADDDI (SLLDI (tmp_val, 16), ZEXTHIDI (GETMEMHI (current_cpu, pc, ANDDI (ADDDI (tmp_addr, 1), -2))));
-}
-if (ANDQI (tmp_bytecount, 1)) {
-  tmp_val = ADDDI (SLLDI (tmp_val, 8), ZEXTQIDI (GETMEMQI (current_cpu, pc, tmp_addr)));
-}
-  {
-    DI opval = tmp_val;
-    SET_H_GR (FLD (f_dest), opval);
-    written |= (1 << 7);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-}
-}
-}
-
-  abuf->written = written;
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_LDXB) : /* ldx.b $rm, $rn, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_add.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = EXTQIDI (GETMEMQI (current_cpu, pc, ADDDI (GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right)))));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_LDXL) : /* ldx.l $rm, $rn, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_add.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = EXTSIDI (GETMEMSI (current_cpu, pc, ADDDI (GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right)))));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_LDXQ) : /* ldx.q $rm, $rn, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_add.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = GETMEMDI (current_cpu, pc, ADDDI (GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right))));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_LDXUB) : /* ldx.ub $rm, $rn, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_add.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = ZEXTQIDI (GETMEMUQI (current_cpu, pc, ADDDI (GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right)))));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_LDXUW) : /* ldx.uw $rm, $rn, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_add.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = ZEXTHIDI (GETMEMUHI (current_cpu, pc, ADDDI (GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right)))));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_LDXW) : /* ldx.w $rm, $rn, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_add.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = EXTHIDI (GETMEMHI (current_cpu, pc, ADDDI (GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right)))));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_MABSL) : /* mabs.l $rm, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_xori.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  SI tmp_result1;
-  SI tmp_result0;
-  tmp_result0 = ABSSI (SUBWORDDISI (GET_H_GR (FLD (f_left)), 1));
-  tmp_result1 = ABSSI (SUBWORDDISI (GET_H_GR (FLD (f_left)), 0));
-  {
-    DI opval = ORDI (SLLDI (ZEXTSIDI (tmp_result1), 32), ZEXTSIDI (tmp_result0));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_MABSW) : /* mabs.w $rm, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_xori.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  HI tmp_result3;
-  HI tmp_result2;
-  HI tmp_result1;
-  HI tmp_result0;
-  tmp_result0 = ABSHI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 3));
-  tmp_result1 = ABSHI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 2));
-  tmp_result2 = ABSHI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 1));
-  tmp_result3 = ABSHI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 0));
-  {
-    DI opval = ORDI (SLLDI (ZEXTHIDI (tmp_result3), 48), ORDI (SLLDI (ZEXTHIDI (tmp_result2), 32), ORDI (SLLDI (ZEXTHIDI (tmp_result1), 16), ZEXTHIDI (tmp_result0))));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_MADDL) : /* madd.l $rm, $rn, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_add.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  SI tmp_result1;
-  SI tmp_result0;
-  tmp_result0 = ADDSI (SUBWORDDISI (GET_H_GR (FLD (f_left)), 1), SUBWORDDISI (GET_H_GR (FLD (f_right)), 1));
-  tmp_result1 = ADDSI (SUBWORDDISI (GET_H_GR (FLD (f_left)), 0), SUBWORDDISI (GET_H_GR (FLD (f_right)), 0));
-  {
-    DI opval = ORDI (SLLDI (ZEXTSIDI (tmp_result1), 32), ZEXTSIDI (tmp_result0));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_MADDW) : /* madd.w $rm, $rn, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_add.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  HI tmp_result3;
-  HI tmp_result2;
-  HI tmp_result1;
-  HI tmp_result0;
-  tmp_result0 = ADDHI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 3), SUBWORDDIHI (GET_H_GR (FLD (f_right)), 3));
-  tmp_result1 = ADDHI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 2), SUBWORDDIHI (GET_H_GR (FLD (f_right)), 2));
-  tmp_result2 = ADDHI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 1), SUBWORDDIHI (GET_H_GR (FLD (f_right)), 1));
-  tmp_result3 = ADDHI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 0), SUBWORDDIHI (GET_H_GR (FLD (f_right)), 0));
-  {
-    DI opval = ORDI (SLLDI (ZEXTHIDI (tmp_result3), 48), ORDI (SLLDI (ZEXTHIDI (tmp_result2), 32), ORDI (SLLDI (ZEXTHIDI (tmp_result1), 16), ZEXTHIDI (tmp_result0))));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_MADDSL) : /* madds.l $rm, $rn, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_add.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  SI tmp_result1;
-  SI tmp_result0;
-  tmp_result0 = ((LTDI (ADDDI (EXTSIDI (SUBWORDDISI (GET_H_GR (FLD (f_left)), 1)), EXTSIDI (SUBWORDDISI (GET_H_GR (FLD (f_right)), 1))), NEGDI (SLLDI (1, SUBSI (32, 1))))) ? (NEGSI (SLLSI (1, SUBSI (32, 1)))) : (((LTDI (ADDDI (EXTSIDI (SUBWORDDISI (GET_H_GR (FLD (f_left)), 1)), EXTSIDI (SUBWORDDISI (GET_H_GR (FLD (f_right)), 1))), SLLDI (1, SUBSI (32, 1)))) ? (ADDDI (EXTSIDI (SUBWORDDISI (GET_H_GR (FLD (f_left)), 1)), EXTSIDI (SUBWORDDISI (GET_H_GR (FLD (f_right)), 1)))) : (SUBSI (SLLSI (1, SUBSI (32, 1)), 1)))));
-  tmp_result1 = ((LTDI (ADDDI (EXTSIDI (SUBWORDDISI (GET_H_GR (FLD (f_left)), 0)), EXTSIDI (SUBWORDDISI (GET_H_GR (FLD (f_right)), 0))), NEGDI (SLLDI (1, SUBSI (32, 1))))) ? (NEGSI (SLLSI (1, SUBSI (32, 1)))) : (((LTDI (ADDDI (EXTSIDI (SUBWORDDISI (GET_H_GR (FLD (f_left)), 0)), EXTSIDI (SUBWORDDISI (GET_H_GR (FLD (f_right)), 0))), SLLDI (1, SUBSI (32, 1)))) ? (ADDDI (EXTSIDI (SUBWORDDISI (GET_H_GR (FLD (f_left)), 0)), EXTSIDI (SUBWORDDISI (GET_H_GR (FLD (f_right)), 0)))) : (SUBSI (SLLSI (1, SUBSI (32, 1)), 1)))));
-  {
-    DI opval = ORDI (SLLDI (ZEXTSIDI (tmp_result1), 32), ZEXTSIDI (tmp_result0));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_MADDSUB) : /* madds.ub $rm, $rn, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_add.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  QI tmp_result7;
-  QI tmp_result6;
-  QI tmp_result5;
-  QI tmp_result4;
-  QI tmp_result3;
-  QI tmp_result2;
-  QI tmp_result1;
-  QI tmp_result0;
-  tmp_result0 = ((LTDI (ADDDI (ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 7)), ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 7))), MAKEDI (0, 0))) ? (0) : (((LTDI (ADDDI (ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 7)), ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 7))), SLLDI (1, 8))) ? (ADDDI (ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 7)), ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 7)))) : (SUBQI (SLLQI (1, 8), 1)))));
-  tmp_result1 = ((LTDI (ADDDI (ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 6)), ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 6))), MAKEDI (0, 0))) ? (0) : (((LTDI (ADDDI (ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 6)), ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 6))), SLLDI (1, 8))) ? (ADDDI (ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 6)), ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 6)))) : (SUBQI (SLLQI (1, 8), 1)))));
-  tmp_result2 = ((LTDI (ADDDI (ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 5)), ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 5))), MAKEDI (0, 0))) ? (0) : (((LTDI (ADDDI (ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 5)), ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 5))), SLLDI (1, 8))) ? (ADDDI (ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 5)), ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 5)))) : (SUBQI (SLLQI (1, 8), 1)))));
-  tmp_result3 = ((LTDI (ADDDI (ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 4)), ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 4))), MAKEDI (0, 0))) ? (0) : (((LTDI (ADDDI (ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 4)), ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 4))), SLLDI (1, 8))) ? (ADDDI (ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 4)), ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 4)))) : (SUBQI (SLLQI (1, 8), 1)))));
-  tmp_result4 = ((LTDI (ADDDI (ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 3)), ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 3))), MAKEDI (0, 0))) ? (0) : (((LTDI (ADDDI (ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 3)), ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 3))), SLLDI (1, 8))) ? (ADDDI (ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 3)), ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 3)))) : (SUBQI (SLLQI (1, 8), 1)))));
-  tmp_result5 = ((LTDI (ADDDI (ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 2)), ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 2))), MAKEDI (0, 0))) ? (0) : (((LTDI (ADDDI (ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 2)), ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 2))), SLLDI (1, 8))) ? (ADDDI (ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 2)), ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 2)))) : (SUBQI (SLLQI (1, 8), 1)))));
-  tmp_result6 = ((LTDI (ADDDI (ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 1)), ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 1))), MAKEDI (0, 0))) ? (0) : (((LTDI (ADDDI (ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 1)), ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 1))), SLLDI (1, 8))) ? (ADDDI (ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 1)), ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 1)))) : (SUBQI (SLLQI (1, 8), 1)))));
-  tmp_result7 = ((LTDI (ADDDI (ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 0)), ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 0))), MAKEDI (0, 0))) ? (0) : (((LTDI (ADDDI (ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 0)), ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 0))), SLLDI (1, 8))) ? (ADDDI (ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 0)), ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 0)))) : (SUBQI (SLLQI (1, 8), 1)))));
-  {
-    DI opval = ORDI (SLLDI (ZEXTQIDI (tmp_result7), 56), ORDI (SLLDI (ZEXTQIDI (tmp_result6), 48), ORDI (SLLDI (ZEXTQIDI (tmp_result5), 40), ORDI (SLLDI (ZEXTQIDI (tmp_result4), 32), ORDI (SLLDI (ZEXTQIDI (tmp_result3), 24), ORDI (SLLDI (ZEXTQIDI (tmp_result2), 16), ORDI (SLLDI (ZEXTQIDI (tmp_result1), 8), ZEXTQIDI (tmp_result0))))))));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_MADDSW) : /* madds.w $rm, $rn, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_add.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  HI tmp_result3;
-  HI tmp_result2;
-  HI tmp_result1;
-  HI tmp_result0;
-  tmp_result0 = ((LTDI (ADDDI (EXTHIDI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 3)), EXTHIDI (SUBWORDDIHI (GET_H_GR (FLD (f_right)), 3))), NEGDI (SLLDI (1, SUBSI (16, 1))))) ? (NEGHI (SLLHI (1, SUBSI (16, 1)))) : (((LTDI (ADDDI (EXTHIDI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 3)), EXTHIDI (SUBWORDDIHI (GET_H_GR (FLD (f_right)), 3))), SLLDI (1, SUBSI (16, 1)))) ? (ADDDI (EXTHIDI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 3)), EXTHIDI (SUBWORDDIHI (GET_H_GR (FLD (f_right)), 3)))) : (SUBHI (SLLHI (1, SUBSI (16, 1)), 1)))));
-  tmp_result1 = ((LTDI (ADDDI (EXTHIDI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 2)), EXTHIDI (SUBWORDDIHI (GET_H_GR (FLD (f_right)), 2))), NEGDI (SLLDI (1, SUBSI (16, 1))))) ? (NEGHI (SLLHI (1, SUBSI (16, 1)))) : (((LTDI (ADDDI (EXTHIDI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 2)), EXTHIDI (SUBWORDDIHI (GET_H_GR (FLD (f_right)), 2))), SLLDI (1, SUBSI (16, 1)))) ? (ADDDI (EXTHIDI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 2)), EXTHIDI (SUBWORDDIHI (GET_H_GR (FLD (f_right)), 2)))) : (SUBHI (SLLHI (1, SUBSI (16, 1)), 1)))));
-  tmp_result2 = ((LTDI (ADDDI (EXTHIDI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 1)), EXTHIDI (SUBWORDDIHI (GET_H_GR (FLD (f_right)), 1))), NEGDI (SLLDI (1, SUBSI (16, 1))))) ? (NEGHI (SLLHI (1, SUBSI (16, 1)))) : (((LTDI (ADDDI (EXTHIDI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 1)), EXTHIDI (SUBWORDDIHI (GET_H_GR (FLD (f_right)), 1))), SLLDI (1, SUBSI (16, 1)))) ? (ADDDI (EXTHIDI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 1)), EXTHIDI (SUBWORDDIHI (GET_H_GR (FLD (f_right)), 1)))) : (SUBHI (SLLHI (1, SUBSI (16, 1)), 1)))));
-  tmp_result3 = ((LTDI (ADDDI (EXTHIDI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 0)), EXTHIDI (SUBWORDDIHI (GET_H_GR (FLD (f_right)), 0))), NEGDI (SLLDI (1, SUBSI (16, 1))))) ? (NEGHI (SLLHI (1, SUBSI (16, 1)))) : (((LTDI (ADDDI (EXTHIDI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 0)), EXTHIDI (SUBWORDDIHI (GET_H_GR (FLD (f_right)), 0))), SLLDI (1, SUBSI (16, 1)))) ? (ADDDI (EXTHIDI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 0)), EXTHIDI (SUBWORDDIHI (GET_H_GR (FLD (f_right)), 0)))) : (SUBHI (SLLHI (1, SUBSI (16, 1)), 1)))));
-  {
-    DI opval = ORDI (SLLDI (ZEXTHIDI (tmp_result3), 48), ORDI (SLLDI (ZEXTHIDI (tmp_result2), 32), ORDI (SLLDI (ZEXTHIDI (tmp_result1), 16), ZEXTHIDI (tmp_result0))));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_MCMPEQB) : /* mcmpeq.b $rm, $rn, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_add.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  QI tmp_result7;
-  QI tmp_result6;
-  QI tmp_result5;
-  QI tmp_result4;
-  QI tmp_result3;
-  QI tmp_result2;
-  QI tmp_result1;
-  QI tmp_result0;
-  tmp_result0 = ((EQQI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 7), SUBWORDDIQI (GET_H_GR (FLD (f_right)), 7))) ? (INVQI (0)) : (0));
-  tmp_result1 = ((EQQI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 6), SUBWORDDIQI (GET_H_GR (FLD (f_right)), 6))) ? (INVQI (0)) : (0));
-  tmp_result2 = ((EQQI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 5), SUBWORDDIQI (GET_H_GR (FLD (f_right)), 5))) ? (INVQI (0)) : (0));
-  tmp_result3 = ((EQQI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 4), SUBWORDDIQI (GET_H_GR (FLD (f_right)), 4))) ? (INVQI (0)) : (0));
-  tmp_result4 = ((EQQI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 3), SUBWORDDIQI (GET_H_GR (FLD (f_right)), 3))) ? (INVQI (0)) : (0));
-  tmp_result5 = ((EQQI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 2), SUBWORDDIQI (GET_H_GR (FLD (f_right)), 2))) ? (INVQI (0)) : (0));
-  tmp_result6 = ((EQQI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 1), SUBWORDDIQI (GET_H_GR (FLD (f_right)), 1))) ? (INVQI (0)) : (0));
-  tmp_result7 = ((EQQI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 0), SUBWORDDIQI (GET_H_GR (FLD (f_right)), 0))) ? (INVQI (0)) : (0));
-  {
-    DI opval = ORDI (SLLDI (ZEXTQIDI (tmp_result7), 56), ORDI (SLLDI (ZEXTQIDI (tmp_result6), 48), ORDI (SLLDI (ZEXTQIDI (tmp_result5), 40), ORDI (SLLDI (ZEXTQIDI (tmp_result4), 32), ORDI (SLLDI (ZEXTQIDI (tmp_result3), 24), ORDI (SLLDI (ZEXTQIDI (tmp_result2), 16), ORDI (SLLDI (ZEXTQIDI (tmp_result1), 8), ZEXTQIDI (tmp_result0))))))));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_MCMPEQL) : /* mcmpeq.l $rm, $rn, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_add.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  SI tmp_result1;
-  SI tmp_result0;
-  tmp_result0 = ((EQSI (SUBWORDDISI (GET_H_GR (FLD (f_left)), 1), SUBWORDDISI (GET_H_GR (FLD (f_right)), 1))) ? (INVSI (0)) : (0));
-  tmp_result1 = ((EQSI (SUBWORDDISI (GET_H_GR (FLD (f_left)), 0), SUBWORDDISI (GET_H_GR (FLD (f_right)), 0))) ? (INVSI (0)) : (0));
-  {
-    DI opval = ORDI (SLLDI (ZEXTSIDI (tmp_result1), 32), ZEXTSIDI (tmp_result0));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_MCMPEQW) : /* mcmpeq.w $rm, $rn, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_add.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  HI tmp_result3;
-  HI tmp_result2;
-  HI tmp_result1;
-  HI tmp_result0;
-  tmp_result0 = ((EQHI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 3), SUBWORDDIHI (GET_H_GR (FLD (f_right)), 3))) ? (INVHI (0)) : (0));
-  tmp_result1 = ((EQHI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 2), SUBWORDDIHI (GET_H_GR (FLD (f_right)), 2))) ? (INVHI (0)) : (0));
-  tmp_result2 = ((EQHI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 1), SUBWORDDIHI (GET_H_GR (FLD (f_right)), 1))) ? (INVHI (0)) : (0));
-  tmp_result3 = ((EQHI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 0), SUBWORDDIHI (GET_H_GR (FLD (f_right)), 0))) ? (INVHI (0)) : (0));
-  {
-    DI opval = ORDI (SLLDI (ZEXTHIDI (tmp_result3), 48), ORDI (SLLDI (ZEXTHIDI (tmp_result2), 32), ORDI (SLLDI (ZEXTHIDI (tmp_result1), 16), ZEXTHIDI (tmp_result0))));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_MCMPGTL) : /* mcmpgt.l $rm, $rn, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_add.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  SI tmp_result1;
-  SI tmp_result0;
-  tmp_result0 = ((GTSI (SUBWORDDISI (GET_H_GR (FLD (f_left)), 1), SUBWORDDISI (GET_H_GR (FLD (f_right)), 1))) ? (INVSI (0)) : (0));
-  tmp_result1 = ((GTSI (SUBWORDDISI (GET_H_GR (FLD (f_left)), 0), SUBWORDDISI (GET_H_GR (FLD (f_right)), 0))) ? (INVSI (0)) : (0));
-  {
-    DI opval = ORDI (SLLDI (ZEXTSIDI (tmp_result1), 32), ZEXTSIDI (tmp_result0));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_MCMPGTUB) : /* mcmpgt.ub $rm, $rn, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_add.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  QI tmp_result7;
-  QI tmp_result6;
-  QI tmp_result5;
-  QI tmp_result4;
-  QI tmp_result3;
-  QI tmp_result2;
-  QI tmp_result1;
-  QI tmp_result0;
-  tmp_result0 = ((GTUQI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 7), SUBWORDDIQI (GET_H_GR (FLD (f_right)), 7))) ? (INVQI (0)) : (0));
-  tmp_result1 = ((GTUQI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 6), SUBWORDDIQI (GET_H_GR (FLD (f_right)), 6))) ? (INVQI (0)) : (0));
-  tmp_result2 = ((GTUQI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 5), SUBWORDDIQI (GET_H_GR (FLD (f_right)), 5))) ? (INVQI (0)) : (0));
-  tmp_result3 = ((GTUQI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 4), SUBWORDDIQI (GET_H_GR (FLD (f_right)), 4))) ? (INVQI (0)) : (0));
-  tmp_result4 = ((GTUQI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 3), SUBWORDDIQI (GET_H_GR (FLD (f_right)), 3))) ? (INVQI (0)) : (0));
-  tmp_result5 = ((GTUQI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 2), SUBWORDDIQI (GET_H_GR (FLD (f_right)), 2))) ? (INVQI (0)) : (0));
-  tmp_result6 = ((GTUQI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 1), SUBWORDDIQI (GET_H_GR (FLD (f_right)), 1))) ? (INVQI (0)) : (0));
-  tmp_result7 = ((GTUQI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 0), SUBWORDDIQI (GET_H_GR (FLD (f_right)), 0))) ? (INVQI (0)) : (0));
-  {
-    DI opval = ORDI (SLLDI (ZEXTQIDI (tmp_result7), 56), ORDI (SLLDI (ZEXTQIDI (tmp_result6), 48), ORDI (SLLDI (ZEXTQIDI (tmp_result5), 40), ORDI (SLLDI (ZEXTQIDI (tmp_result4), 32), ORDI (SLLDI (ZEXTQIDI (tmp_result3), 24), ORDI (SLLDI (ZEXTQIDI (tmp_result2), 16), ORDI (SLLDI (ZEXTQIDI (tmp_result1), 8), ZEXTQIDI (tmp_result0))))))));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_MCMPGTW) : /* mcmpgt.w $rm, $rn, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_add.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  HI tmp_result3;
-  HI tmp_result2;
-  HI tmp_result1;
-  HI tmp_result0;
-  tmp_result0 = ((GTHI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 3), SUBWORDDIHI (GET_H_GR (FLD (f_right)), 3))) ? (INVHI (0)) : (0));
-  tmp_result1 = ((GTHI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 2), SUBWORDDIHI (GET_H_GR (FLD (f_right)), 2))) ? (INVHI (0)) : (0));
-  tmp_result2 = ((GTHI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 1), SUBWORDDIHI (GET_H_GR (FLD (f_right)), 1))) ? (INVHI (0)) : (0));
-  tmp_result3 = ((GTHI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 0), SUBWORDDIHI (GET_H_GR (FLD (f_right)), 0))) ? (INVHI (0)) : (0));
-  {
-    DI opval = ORDI (SLLDI (ZEXTHIDI (tmp_result3), 48), ORDI (SLLDI (ZEXTHIDI (tmp_result2), 32), ORDI (SLLDI (ZEXTHIDI (tmp_result1), 16), ZEXTHIDI (tmp_result0))));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_MCMV) : /* mcmv $rm, $rn, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_add.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = ORDI (ANDDI (GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right))), ANDDI (GET_H_GR (FLD (f_dest)), INVDI (GET_H_GR (FLD (f_right)))));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_MCNVSLW) : /* mcnvs.lw $rm, $rn, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_add.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  HI tmp_result3;
-  HI tmp_result2;
-  HI tmp_result1;
-  HI tmp_result0;
-  tmp_result0 = ((LTSI (SUBWORDDISI (GET_H_GR (FLD (f_left)), 1), NEGDI (SLLDI (1, SUBSI (16, 1))))) ? (NEGHI (SLLHI (1, SUBSI (16, 1)))) : (((LTSI (SUBWORDDISI (GET_H_GR (FLD (f_left)), 1), SLLDI (1, SUBSI (16, 1)))) ? (SUBWORDDISI (GET_H_GR (FLD (f_left)), 1)) : (SUBHI (SLLHI (1, SUBSI (16, 1)), 1)))));
-  tmp_result1 = ((LTSI (SUBWORDDISI (GET_H_GR (FLD (f_left)), 0), NEGDI (SLLDI (1, SUBSI (16, 1))))) ? (NEGHI (SLLHI (1, SUBSI (16, 1)))) : (((LTSI (SUBWORDDISI (GET_H_GR (FLD (f_left)), 0), SLLDI (1, SUBSI (16, 1)))) ? (SUBWORDDISI (GET_H_GR (FLD (f_left)), 0)) : (SUBHI (SLLHI (1, SUBSI (16, 1)), 1)))));
-  tmp_result2 = ((LTSI (SUBWORDDISI (GET_H_GR (FLD (f_right)), 1), NEGDI (SLLDI (1, SUBSI (16, 1))))) ? (NEGHI (SLLHI (1, SUBSI (16, 1)))) : (((LTSI (SUBWORDDISI (GET_H_GR (FLD (f_right)), 1), SLLDI (1, SUBSI (16, 1)))) ? (SUBWORDDISI (GET_H_GR (FLD (f_right)), 1)) : (SUBHI (SLLHI (1, SUBSI (16, 1)), 1)))));
-  tmp_result3 = ((LTSI (SUBWORDDISI (GET_H_GR (FLD (f_right)), 0), NEGDI (SLLDI (1, SUBSI (16, 1))))) ? (NEGHI (SLLHI (1, SUBSI (16, 1)))) : (((LTSI (SUBWORDDISI (GET_H_GR (FLD (f_right)), 0), SLLDI (1, SUBSI (16, 1)))) ? (SUBWORDDISI (GET_H_GR (FLD (f_right)), 0)) : (SUBHI (SLLHI (1, SUBSI (16, 1)), 1)))));
-  {
-    DI opval = ORDI (SLLDI (ZEXTHIDI (tmp_result3), 48), ORDI (SLLDI (ZEXTHIDI (tmp_result2), 32), ORDI (SLLDI (ZEXTHIDI (tmp_result1), 16), ZEXTHIDI (tmp_result0))));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_MCNVSWB) : /* mcnvs.wb $rm, $rn, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_add.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  QI tmp_result7;
-  QI tmp_result6;
-  QI tmp_result5;
-  QI tmp_result4;
-  QI tmp_result3;
-  QI tmp_result2;
-  QI tmp_result1;
-  QI tmp_result0;
-  tmp_result0 = ((LTHI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 3), NEGDI (SLLDI (1, SUBSI (8, 1))))) ? (NEGQI (SLLQI (1, SUBSI (8, 1)))) : (((LTHI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 3), SLLDI (1, SUBSI (8, 1)))) ? (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 3)) : (SUBQI (SLLQI (1, SUBSI (8, 1)), 1)))));
-  tmp_result1 = ((LTHI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 2), NEGDI (SLLDI (1, SUBSI (8, 1))))) ? (NEGQI (SLLQI (1, SUBSI (8, 1)))) : (((LTHI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 2), SLLDI (1, SUBSI (8, 1)))) ? (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 2)) : (SUBQI (SLLQI (1, SUBSI (8, 1)), 1)))));
-  tmp_result2 = ((LTHI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 1), NEGDI (SLLDI (1, SUBSI (8, 1))))) ? (NEGQI (SLLQI (1, SUBSI (8, 1)))) : (((LTHI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 1), SLLDI (1, SUBSI (8, 1)))) ? (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 1)) : (SUBQI (SLLQI (1, SUBSI (8, 1)), 1)))));
-  tmp_result3 = ((LTHI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 0), NEGDI (SLLDI (1, SUBSI (8, 1))))) ? (NEGQI (SLLQI (1, SUBSI (8, 1)))) : (((LTHI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 0), SLLDI (1, SUBSI (8, 1)))) ? (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 0)) : (SUBQI (SLLQI (1, SUBSI (8, 1)), 1)))));
-  tmp_result4 = ((LTHI (SUBWORDDIHI (GET_H_GR (FLD (f_right)), 3), NEGDI (SLLDI (1, SUBSI (8, 1))))) ? (NEGQI (SLLQI (1, SUBSI (8, 1)))) : (((LTHI (SUBWORDDIHI (GET_H_GR (FLD (f_right)), 3), SLLDI (1, SUBSI (8, 1)))) ? (SUBWORDDIHI (GET_H_GR (FLD (f_right)), 3)) : (SUBQI (SLLQI (1, SUBSI (8, 1)), 1)))));
-  tmp_result5 = ((LTHI (SUBWORDDIHI (GET_H_GR (FLD (f_right)), 2), NEGDI (SLLDI (1, SUBSI (8, 1))))) ? (NEGQI (SLLQI (1, SUBSI (8, 1)))) : (((LTHI (SUBWORDDIHI (GET_H_GR (FLD (f_right)), 2), SLLDI (1, SUBSI (8, 1)))) ? (SUBWORDDIHI (GET_H_GR (FLD (f_right)), 2)) : (SUBQI (SLLQI (1, SUBSI (8, 1)), 1)))));
-  tmp_result6 = ((LTHI (SUBWORDDIHI (GET_H_GR (FLD (f_right)), 1), NEGDI (SLLDI (1, SUBSI (8, 1))))) ? (NEGQI (SLLQI (1, SUBSI (8, 1)))) : (((LTHI (SUBWORDDIHI (GET_H_GR (FLD (f_right)), 1), SLLDI (1, SUBSI (8, 1)))) ? (SUBWORDDIHI (GET_H_GR (FLD (f_right)), 1)) : (SUBQI (SLLQI (1, SUBSI (8, 1)), 1)))));
-  tmp_result7 = ((LTHI (SUBWORDDIHI (GET_H_GR (FLD (f_right)), 0), NEGDI (SLLDI (1, SUBSI (8, 1))))) ? (NEGQI (SLLQI (1, SUBSI (8, 1)))) : (((LTHI (SUBWORDDIHI (GET_H_GR (FLD (f_right)), 0), SLLDI (1, SUBSI (8, 1)))) ? (SUBWORDDIHI (GET_H_GR (FLD (f_right)), 0)) : (SUBQI (SLLQI (1, SUBSI (8, 1)), 1)))));
-  {
-    DI opval = ORDI (SLLDI (ZEXTQIDI (tmp_result7), 56), ORDI (SLLDI (ZEXTQIDI (tmp_result6), 48), ORDI (SLLDI (ZEXTQIDI (tmp_result5), 40), ORDI (SLLDI (ZEXTQIDI (tmp_result4), 32), ORDI (SLLDI (ZEXTQIDI (tmp_result3), 24), ORDI (SLLDI (ZEXTQIDI (tmp_result2), 16), ORDI (SLLDI (ZEXTQIDI (tmp_result1), 8), ZEXTQIDI (tmp_result0))))))));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_MCNVSWUB) : /* mcnvs.wub $rm, $rn, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_add.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  QI tmp_result7;
-  QI tmp_result6;
-  QI tmp_result5;
-  QI tmp_result4;
-  QI tmp_result3;
-  QI tmp_result2;
-  QI tmp_result1;
-  QI tmp_result0;
-  tmp_result0 = ((LTHI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 3), MAKEDI (0, 0))) ? (0) : (((LTHI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 3), SLLDI (1, 8))) ? (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 3)) : (SUBQI (SLLQI (1, 8), 1)))));
-  tmp_result1 = ((LTHI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 2), MAKEDI (0, 0))) ? (0) : (((LTHI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 2), SLLDI (1, 8))) ? (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 2)) : (SUBQI (SLLQI (1, 8), 1)))));
-  tmp_result2 = ((LTHI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 1), MAKEDI (0, 0))) ? (0) : (((LTHI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 1), SLLDI (1, 8))) ? (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 1)) : (SUBQI (SLLQI (1, 8), 1)))));
-  tmp_result3 = ((LTHI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 0), MAKEDI (0, 0))) ? (0) : (((LTHI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 0), SLLDI (1, 8))) ? (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 0)) : (SUBQI (SLLQI (1, 8), 1)))));
-  tmp_result4 = ((LTHI (SUBWORDDIHI (GET_H_GR (FLD (f_right)), 3), MAKEDI (0, 0))) ? (0) : (((LTHI (SUBWORDDIHI (GET_H_GR (FLD (f_right)), 3), SLLDI (1, 8))) ? (SUBWORDDIHI (GET_H_GR (FLD (f_right)), 3)) : (SUBQI (SLLQI (1, 8), 1)))));
-  tmp_result5 = ((LTHI (SUBWORDDIHI (GET_H_GR (FLD (f_right)), 2), MAKEDI (0, 0))) ? (0) : (((LTHI (SUBWORDDIHI (GET_H_GR (FLD (f_right)), 2), SLLDI (1, 8))) ? (SUBWORDDIHI (GET_H_GR (FLD (f_right)), 2)) : (SUBQI (SLLQI (1, 8), 1)))));
-  tmp_result6 = ((LTHI (SUBWORDDIHI (GET_H_GR (FLD (f_right)), 1), MAKEDI (0, 0))) ? (0) : (((LTHI (SUBWORDDIHI (GET_H_GR (FLD (f_right)), 1), SLLDI (1, 8))) ? (SUBWORDDIHI (GET_H_GR (FLD (f_right)), 1)) : (SUBQI (SLLQI (1, 8), 1)))));
-  tmp_result7 = ((LTHI (SUBWORDDIHI (GET_H_GR (FLD (f_right)), 0), MAKEDI (0, 0))) ? (0) : (((LTHI (SUBWORDDIHI (GET_H_GR (FLD (f_right)), 0), SLLDI (1, 8))) ? (SUBWORDDIHI (GET_H_GR (FLD (f_right)), 0)) : (SUBQI (SLLQI (1, 8), 1)))));
-  {
-    DI opval = ORDI (SLLDI (ZEXTQIDI (tmp_result7), 56), ORDI (SLLDI (ZEXTQIDI (tmp_result6), 48), ORDI (SLLDI (ZEXTQIDI (tmp_result5), 40), ORDI (SLLDI (ZEXTQIDI (tmp_result4), 32), ORDI (SLLDI (ZEXTQIDI (tmp_result3), 24), ORDI (SLLDI (ZEXTQIDI (tmp_result2), 16), ORDI (SLLDI (ZEXTQIDI (tmp_result1), 8), ZEXTQIDI (tmp_result0))))))));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_MEXTR1) : /* mextr1 $rm, $rn, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_add.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  QI tmp_count;
-  DI tmp_mask;
-  DI tmp_rhs;
-  tmp_count = MULQI (8, 1);
-  tmp_mask = SLLDI (INVSI (0), tmp_count);
-  tmp_rhs = SRLDI (ANDDI (GET_H_GR (FLD (f_left)), tmp_mask), tmp_count);
-  tmp_count = MULQI (8, SUBQI (8, 1));
-  tmp_mask = SRLDI (INVSI (0), tmp_count);
-  {
-    DI opval = ORDI (tmp_rhs, SLLDI (ANDDI (GET_H_GR (FLD (f_right)), tmp_mask), tmp_count));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_MEXTR2) : /* mextr2 $rm, $rn, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_add.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  QI tmp_count;
-  DI tmp_mask;
-  DI tmp_rhs;
-  tmp_count = MULQI (8, 2);
-  tmp_mask = SLLDI (INVSI (0), tmp_count);
-  tmp_rhs = SRLDI (ANDDI (GET_H_GR (FLD (f_left)), tmp_mask), tmp_count);
-  tmp_count = MULQI (8, SUBQI (8, 2));
-  tmp_mask = SRLDI (INVSI (0), tmp_count);
-  {
-    DI opval = ORDI (tmp_rhs, SLLDI (ANDDI (GET_H_GR (FLD (f_right)), tmp_mask), tmp_count));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_MEXTR3) : /* mextr3 $rm, $rn, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_add.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  QI tmp_count;
-  DI tmp_mask;
-  DI tmp_rhs;
-  tmp_count = MULQI (8, 3);
-  tmp_mask = SLLDI (INVSI (0), tmp_count);
-  tmp_rhs = SRLDI (ANDDI (GET_H_GR (FLD (f_left)), tmp_mask), tmp_count);
-  tmp_count = MULQI (8, SUBQI (8, 3));
-  tmp_mask = SRLDI (INVSI (0), tmp_count);
-  {
-    DI opval = ORDI (tmp_rhs, SLLDI (ANDDI (GET_H_GR (FLD (f_right)), tmp_mask), tmp_count));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_MEXTR4) : /* mextr4 $rm, $rn, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_add.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  QI tmp_count;
-  DI tmp_mask;
-  DI tmp_rhs;
-  tmp_count = MULQI (8, 4);
-  tmp_mask = SLLDI (INVSI (0), tmp_count);
-  tmp_rhs = SRLDI (ANDDI (GET_H_GR (FLD (f_left)), tmp_mask), tmp_count);
-  tmp_count = MULQI (8, SUBQI (8, 4));
-  tmp_mask = SRLDI (INVSI (0), tmp_count);
-  {
-    DI opval = ORDI (tmp_rhs, SLLDI (ANDDI (GET_H_GR (FLD (f_right)), tmp_mask), tmp_count));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_MEXTR5) : /* mextr5 $rm, $rn, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_add.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  QI tmp_count;
-  DI tmp_mask;
-  DI tmp_rhs;
-  tmp_count = MULQI (8, 5);
-  tmp_mask = SLLDI (INVSI (0), tmp_count);
-  tmp_rhs = SRLDI (ANDDI (GET_H_GR (FLD (f_left)), tmp_mask), tmp_count);
-  tmp_count = MULQI (8, SUBQI (8, 5));
-  tmp_mask = SRLDI (INVSI (0), tmp_count);
-  {
-    DI opval = ORDI (tmp_rhs, SLLDI (ANDDI (GET_H_GR (FLD (f_right)), tmp_mask), tmp_count));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_MEXTR6) : /* mextr6 $rm, $rn, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_add.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  QI tmp_count;
-  DI tmp_mask;
-  DI tmp_rhs;
-  tmp_count = MULQI (8, 6);
-  tmp_mask = SLLDI (INVSI (0), tmp_count);
-  tmp_rhs = SRLDI (ANDDI (GET_H_GR (FLD (f_left)), tmp_mask), tmp_count);
-  tmp_count = MULQI (8, SUBQI (8, 6));
-  tmp_mask = SRLDI (INVSI (0), tmp_count);
-  {
-    DI opval = ORDI (tmp_rhs, SLLDI (ANDDI (GET_H_GR (FLD (f_right)), tmp_mask), tmp_count));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_MEXTR7) : /* mextr7 $rm, $rn, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_add.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  QI tmp_count;
-  DI tmp_mask;
-  DI tmp_rhs;
-  tmp_count = MULQI (8, 7);
-  tmp_mask = SLLDI (INVSI (0), tmp_count);
-  tmp_rhs = SRLDI (ANDDI (GET_H_GR (FLD (f_left)), tmp_mask), tmp_count);
-  tmp_count = MULQI (8, SUBQI (8, 7));
-  tmp_mask = SRLDI (INVSI (0), tmp_count);
-  {
-    DI opval = ORDI (tmp_rhs, SLLDI (ANDDI (GET_H_GR (FLD (f_right)), tmp_mask), tmp_count));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_MMACFXWL) : /* mmacfx.wl $rm, $rn, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_add.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  SI tmp_temp;
-  SI tmp_result1;
-  SI tmp_result0;
-  tmp_result0 = SUBWORDDISI (GET_H_GR (FLD (f_dest)), 1);
-  tmp_result1 = SUBWORDDISI (GET_H_GR (FLD (f_dest)), 0);
-  tmp_temp = MULSI (ZEXTHISI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 3)), ZEXTHISI (SUBWORDDIHI (GET_H_GR (FLD (f_right)), 3)));
-  tmp_temp = ((LTDI (SLLDI (tmp_temp, 1), NEGDI (SLLDI (1, SUBSI (32, 1))))) ? (NEGSI (SLLSI (1, SUBSI (32, 1)))) : (((LTDI (SLLDI (tmp_temp, 1), SLLDI (1, SUBSI (32, 1)))) ? (SLLDI (tmp_temp, 1)) : (SUBSI (SLLSI (1, SUBSI (32, 1)), 1)))));
-  tmp_result0 = ((LTDI (ADDDI (EXTSIDI (tmp_result0), EXTSIDI (tmp_temp)), NEGDI (SLLDI (1, SUBSI (32, 1))))) ? (NEGSI (SLLSI (1, SUBSI (32, 1)))) : (((LTDI (ADDDI (EXTSIDI (tmp_result0), EXTSIDI (tmp_temp)), SLLDI (1, SUBSI (32, 1)))) ? (ADDDI (EXTSIDI (tmp_result0), EXTSIDI (tmp_temp))) : (SUBSI (SLLSI (1, SUBSI (32, 1)), 1)))));
-  tmp_temp = MULSI (ZEXTHISI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 2)), ZEXTHISI (SUBWORDDIHI (GET_H_GR (FLD (f_right)), 2)));
-  tmp_temp = ((LTDI (SLLDI (tmp_temp, 1), NEGDI (SLLDI (1, SUBSI (32, 1))))) ? (NEGSI (SLLSI (1, SUBSI (32, 1)))) : (((LTDI (SLLDI (tmp_temp, 1), SLLDI (1, SUBSI (32, 1)))) ? (SLLDI (tmp_temp, 1)) : (SUBSI (SLLSI (1, SUBSI (32, 1)), 1)))));
-  tmp_result1 = ((LTDI (ADDDI (EXTSIDI (tmp_result1), EXTSIDI (tmp_temp)), NEGDI (SLLDI (1, SUBSI (32, 1))))) ? (NEGSI (SLLSI (1, SUBSI (32, 1)))) : (((LTDI (ADDDI (EXTSIDI (tmp_result1), EXTSIDI (tmp_temp)), SLLDI (1, SUBSI (32, 1)))) ? (ADDDI (EXTSIDI (tmp_result1), EXTSIDI (tmp_temp))) : (SUBSI (SLLSI (1, SUBSI (32, 1)), 1)))));
-  {
-    DI opval = ORDI (SLLDI (ZEXTSIDI (tmp_result1), 32), ZEXTSIDI (tmp_result0));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_MMACNFX_WL) : /* mmacnfx.wl $rm, $rn, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_add.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  SI tmp_temp;
-  SI tmp_result1;
-  SI tmp_result0;
-  tmp_result0 = SUBWORDDISI (GET_H_GR (FLD (f_dest)), 1);
-  tmp_result1 = SUBWORDDISI (GET_H_GR (FLD (f_dest)), 0);
-  tmp_temp = MULSI (ZEXTHISI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 3)), ZEXTHISI (SUBWORDDIHI (GET_H_GR (FLD (f_right)), 3)));
-  tmp_temp = ((LTDI (SLLDI (tmp_temp, 1), NEGDI (SLLDI (1, SUBSI (32, 1))))) ? (NEGSI (SLLSI (1, SUBSI (32, 1)))) : (((LTDI (SLLDI (tmp_temp, 1), SLLDI (1, SUBSI (32, 1)))) ? (SLLDI (tmp_temp, 1)) : (SUBSI (SLLSI (1, SUBSI (32, 1)), 1)))));
-  tmp_result0 = ((LTDI (SUBDI (EXTSIDI (tmp_result0), EXTSIDI (tmp_temp)), NEGDI (SLLDI (1, SUBSI (32, 1))))) ? (NEGSI (SLLSI (1, SUBSI (32, 1)))) : (((LTDI (SUBDI (EXTSIDI (tmp_result0), EXTSIDI (tmp_temp)), SLLDI (1, SUBSI (32, 1)))) ? (SUBDI (EXTSIDI (tmp_result0), EXTSIDI (tmp_temp))) : (SUBSI (SLLSI (1, SUBSI (32, 1)), 1)))));
-  tmp_temp = MULSI (ZEXTHISI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 2)), ZEXTHISI (SUBWORDDIHI (GET_H_GR (FLD (f_right)), 2)));
-  tmp_temp = ((LTDI (SLLDI (tmp_temp, 1), NEGDI (SLLDI (1, SUBSI (32, 1))))) ? (NEGSI (SLLSI (1, SUBSI (32, 1)))) : (((LTDI (SLLDI (tmp_temp, 1), SLLDI (1, SUBSI (32, 1)))) ? (SLLDI (tmp_temp, 1)) : (SUBSI (SLLSI (1, SUBSI (32, 1)), 1)))));
-  tmp_result1 = ((LTDI (SUBDI (EXTSIDI (tmp_result1), EXTSIDI (tmp_temp)), NEGDI (SLLDI (1, SUBSI (32, 1))))) ? (NEGSI (SLLSI (1, SUBSI (32, 1)))) : (((LTDI (SUBDI (EXTSIDI (tmp_result1), EXTSIDI (tmp_temp)), SLLDI (1, SUBSI (32, 1)))) ? (SUBDI (EXTSIDI (tmp_result1), EXTSIDI (tmp_temp))) : (SUBSI (SLLSI (1, SUBSI (32, 1)), 1)))));
-  {
-    DI opval = ORDI (SLLDI (ZEXTSIDI (tmp_result1), 32), ZEXTSIDI (tmp_result0));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_MMULL) : /* mmul.l $rm, $rn, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_add.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  SI tmp_result1;
-  SI tmp_result0;
-  tmp_result0 = MULSI (SUBWORDDISI (GET_H_GR (FLD (f_left)), 1), SUBWORDDISI (GET_H_GR (FLD (f_right)), 1));
-  tmp_result1 = MULSI (SUBWORDDISI (GET_H_GR (FLD (f_left)), 0), SUBWORDDISI (GET_H_GR (FLD (f_right)), 0));
-  {
-    DI opval = ORDI (SLLDI (ZEXTSIDI (tmp_result1), 32), ZEXTSIDI (tmp_result0));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_MMULW) : /* mmul.w $rm, $rn, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_add.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  HI tmp_result3;
-  HI tmp_result2;
-  HI tmp_result1;
-  HI tmp_result0;
-  tmp_result0 = MULHI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 3), SUBWORDDIHI (GET_H_GR (FLD (f_right)), 3));
-  tmp_result1 = MULHI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 2), SUBWORDDIHI (GET_H_GR (FLD (f_right)), 2));
-  tmp_result2 = MULHI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 1), SUBWORDDIHI (GET_H_GR (FLD (f_right)), 1));
-  tmp_result3 = MULHI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 0), SUBWORDDIHI (GET_H_GR (FLD (f_right)), 0));
-  {
-    DI opval = ORDI (SLLDI (ZEXTHIDI (tmp_result3), 48), ORDI (SLLDI (ZEXTHIDI (tmp_result2), 32), ORDI (SLLDI (ZEXTHIDI (tmp_result1), 16), ZEXTHIDI (tmp_result0))));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_MMULFXL) : /* mmulfx.l $rm, $rn, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_add.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  DI tmp_temp;
-  SI tmp_result0;
-  SI tmp_result1;
-  tmp_temp = MULDI (ZEXTSIDI (SUBWORDDISI (GET_H_GR (FLD (f_left)), 1)), ZEXTSIDI (SUBWORDDISI (GET_H_GR (FLD (f_right)), 1)));
-  tmp_result0 = ((LTDI (SRADI (tmp_temp, 31), NEGDI (SLLDI (1, SUBSI (32, 1))))) ? (NEGSI (SLLSI (1, SUBSI (32, 1)))) : (((LTDI (SRADI (tmp_temp, 31), SLLDI (1, SUBSI (32, 1)))) ? (SRADI (tmp_temp, 31)) : (SUBSI (SLLSI (1, SUBSI (32, 1)), 1)))));
-  tmp_temp = MULDI (ZEXTSIDI (SUBWORDDISI (GET_H_GR (FLD (f_left)), 0)), ZEXTSIDI (SUBWORDDISI (GET_H_GR (FLD (f_right)), 0)));
-  tmp_result1 = ((LTDI (SRADI (tmp_temp, 31), NEGDI (SLLDI (1, SUBSI (32, 1))))) ? (NEGSI (SLLSI (1, SUBSI (32, 1)))) : (((LTDI (SRADI (tmp_temp, 31), SLLDI (1, SUBSI (32, 1)))) ? (SRADI (tmp_temp, 31)) : (SUBSI (SLLSI (1, SUBSI (32, 1)), 1)))));
-  {
-    DI opval = ORDI (SLLDI (ZEXTSIDI (tmp_result1), 32), ZEXTSIDI (tmp_result0));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_MMULFXW) : /* mmulfx.w $rm, $rn, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_add.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  SI tmp_temp;
-  HI tmp_result0;
-  HI tmp_result1;
-  HI tmp_result2;
-  HI tmp_result3;
-  tmp_temp = MULSI (ZEXTHISI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 3)), ZEXTHISI (SUBWORDDIHI (GET_H_GR (FLD (f_right)), 3)));
-  tmp_result0 = ((LTSI (SRASI (tmp_temp, 15), NEGDI (SLLDI (1, SUBSI (16, 1))))) ? (NEGHI (SLLHI (1, SUBSI (16, 1)))) : (((LTSI (SRASI (tmp_temp, 15), SLLDI (1, SUBSI (16, 1)))) ? (SRASI (tmp_temp, 15)) : (SUBHI (SLLHI (1, SUBSI (16, 1)), 1)))));
-  tmp_temp = MULSI (ZEXTHISI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 2)), ZEXTHISI (SUBWORDDIHI (GET_H_GR (FLD (f_right)), 2)));
-  tmp_result1 = ((LTSI (SRASI (tmp_temp, 15), NEGDI (SLLDI (1, SUBSI (16, 1))))) ? (NEGHI (SLLHI (1, SUBSI (16, 1)))) : (((LTSI (SRASI (tmp_temp, 15), SLLDI (1, SUBSI (16, 1)))) ? (SRASI (tmp_temp, 15)) : (SUBHI (SLLHI (1, SUBSI (16, 1)), 1)))));
-  tmp_temp = MULSI (ZEXTHISI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 1)), ZEXTHISI (SUBWORDDIHI (GET_H_GR (FLD (f_right)), 1)));
-  tmp_result2 = ((LTSI (SRASI (tmp_temp, 15), NEGDI (SLLDI (1, SUBSI (16, 1))))) ? (NEGHI (SLLHI (1, SUBSI (16, 1)))) : (((LTSI (SRASI (tmp_temp, 15), SLLDI (1, SUBSI (16, 1)))) ? (SRASI (tmp_temp, 15)) : (SUBHI (SLLHI (1, SUBSI (16, 1)), 1)))));
-  tmp_temp = MULSI (ZEXTHISI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 0)), ZEXTHISI (SUBWORDDIHI (GET_H_GR (FLD (f_right)), 0)));
-  tmp_result3 = ((LTSI (SRASI (tmp_temp, 15), NEGDI (SLLDI (1, SUBSI (16, 1))))) ? (NEGHI (SLLHI (1, SUBSI (16, 1)))) : (((LTSI (SRASI (tmp_temp, 15), SLLDI (1, SUBSI (16, 1)))) ? (SRASI (tmp_temp, 15)) : (SUBHI (SLLHI (1, SUBSI (16, 1)), 1)))));
-  {
-    DI opval = ORDI (SLLDI (ZEXTHIDI (tmp_result3), 48), ORDI (SLLDI (ZEXTHIDI (tmp_result2), 32), ORDI (SLLDI (ZEXTHIDI (tmp_result1), 16), ZEXTHIDI (tmp_result0))));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_MMULFXRPW) : /* mmulfxrp.w $rm, $rn, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_add.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  SI tmp_temp;
-  HI tmp_result0;
-  HI tmp_result1;
-  HI tmp_result2;
-  HI tmp_result3;
-  HI tmp_c;
-  tmp_c = SLLSI (1, 14);
-  tmp_temp = MULSI (ZEXTHISI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 3)), ZEXTHISI (SUBWORDDIHI (GET_H_GR (FLD (f_right)), 3)));
-  tmp_result0 = ((LTSI (SRASI (ADDSI (tmp_temp, tmp_c), 15), NEGDI (SLLDI (1, SUBSI (16, 1))))) ? (NEGHI (SLLHI (1, SUBSI (16, 1)))) : (((LTSI (SRASI (ADDSI (tmp_temp, tmp_c), 15), SLLDI (1, SUBSI (16, 1)))) ? (SRASI (ADDSI (tmp_temp, tmp_c), 15)) : (SUBHI (SLLHI (1, SUBSI (16, 1)), 1)))));
-  tmp_temp = MULSI (ZEXTHISI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 2)), ZEXTHISI (SUBWORDDIHI (GET_H_GR (FLD (f_right)), 2)));
-  tmp_result1 = ((LTSI (SRASI (ADDSI (tmp_temp, tmp_c), 15), NEGDI (SLLDI (1, SUBSI (16, 1))))) ? (NEGHI (SLLHI (1, SUBSI (16, 1)))) : (((LTSI (SRASI (ADDSI (tmp_temp, tmp_c), 15), SLLDI (1, SUBSI (16, 1)))) ? (SRASI (ADDSI (tmp_temp, tmp_c), 15)) : (SUBHI (SLLHI (1, SUBSI (16, 1)), 1)))));
-  tmp_temp = MULSI (ZEXTHISI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 1)), ZEXTHISI (SUBWORDDIHI (GET_H_GR (FLD (f_right)), 1)));
-  tmp_result2 = ((LTSI (SRASI (ADDSI (tmp_temp, tmp_c), 15), NEGDI (SLLDI (1, SUBSI (16, 1))))) ? (NEGHI (SLLHI (1, SUBSI (16, 1)))) : (((LTSI (SRASI (ADDSI (tmp_temp, tmp_c), 15), SLLDI (1, SUBSI (16, 1)))) ? (SRASI (ADDSI (tmp_temp, tmp_c), 15)) : (SUBHI (SLLHI (1, SUBSI (16, 1)), 1)))));
-  tmp_temp = MULSI (ZEXTHISI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 0)), ZEXTHISI (SUBWORDDIHI (GET_H_GR (FLD (f_right)), 0)));
-  tmp_result3 = ((LTSI (SRASI (ADDSI (tmp_temp, tmp_c), 15), NEGDI (SLLDI (1, SUBSI (16, 1))))) ? (NEGHI (SLLHI (1, SUBSI (16, 1)))) : (((LTSI (SRASI (ADDSI (tmp_temp, tmp_c), 15), SLLDI (1, SUBSI (16, 1)))) ? (SRASI (ADDSI (tmp_temp, tmp_c), 15)) : (SUBHI (SLLHI (1, SUBSI (16, 1)), 1)))));
-  {
-    DI opval = ORDI (SLLDI (ZEXTHIDI (tmp_result3), 48), ORDI (SLLDI (ZEXTHIDI (tmp_result2), 32), ORDI (SLLDI (ZEXTHIDI (tmp_result1), 16), ZEXTHIDI (tmp_result0))));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_MMULHIWL) : /* mmulhi.wl $rm, $rn, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_add.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  SI tmp_result1;
-  SI tmp_result0;
-  tmp_result0 = MULSI (ZEXTHISI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 1)), ZEXTHISI (SUBWORDDIHI (GET_H_GR (FLD (f_right)), 1)));
-  tmp_result1 = MULSI (ZEXTHISI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 0)), ZEXTHISI (SUBWORDDIHI (GET_H_GR (FLD (f_right)), 0)));
-  {
-    DI opval = ORDI (SLLDI (ZEXTSIDI (tmp_result1), 32), ZEXTSIDI (tmp_result0));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_MMULLOWL) : /* mmullo.wl $rm, $rn, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_add.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  SI tmp_result1;
-  SI tmp_result0;
-  tmp_result0 = MULSI (ZEXTHISI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 3)), ZEXTHISI (SUBWORDDIHI (GET_H_GR (FLD (f_right)), 3)));
-  tmp_result1 = MULSI (ZEXTHISI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 2)), ZEXTHISI (SUBWORDDIHI (GET_H_GR (FLD (f_right)), 2)));
-  {
-    DI opval = ORDI (SLLDI (ZEXTSIDI (tmp_result1), 32), ZEXTSIDI (tmp_result0));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_MMULSUMWQ) : /* mmulsum.wq $rm, $rn, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_add.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  DI tmp_acc;
-  tmp_acc = MULSI (ZEXTHISI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 0)), ZEXTHISI (SUBWORDDIHI (GET_H_GR (FLD (f_right)), 0)));
-  tmp_acc = ADDDI (tmp_acc, MULSI (ZEXTHISI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 1)), ZEXTHISI (SUBWORDDIHI (GET_H_GR (FLD (f_right)), 1))));
-  tmp_acc = ADDDI (tmp_acc, MULSI (ZEXTHISI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 2)), ZEXTHISI (SUBWORDDIHI (GET_H_GR (FLD (f_right)), 2))));
-  tmp_acc = ADDDI (tmp_acc, MULSI (ZEXTHISI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 3)), ZEXTHISI (SUBWORDDIHI (GET_H_GR (FLD (f_right)), 3))));
-  {
-    DI opval = ADDDI (GET_H_GR (FLD (f_dest)), tmp_acc);
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_MOVI) : /* movi $imm16, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_movi.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = EXTSIDI (FLD (f_imm16));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_MPERMW) : /* mperm.w $rm, $rn, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_add.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  QI tmp_control;
-  HI tmp_result3;
-  HI tmp_result2;
-  HI tmp_result1;
-  HI tmp_result0;
-  tmp_control = ANDQI (GET_H_GR (FLD (f_right)), 255);
-  tmp_result0 = SUBWORDDIHI (GET_H_GR (FLD (f_left)), SUBSI (3, ANDQI (tmp_control, 3)));
-  tmp_result1 = SUBWORDDIHI (GET_H_GR (FLD (f_left)), SUBSI (3, ANDQI (SRLQI (tmp_control, 2), 3)));
-  tmp_result2 = SUBWORDDIHI (GET_H_GR (FLD (f_left)), SUBSI (3, ANDQI (SRLQI (tmp_control, 4), 3)));
-  tmp_result3 = SUBWORDDIHI (GET_H_GR (FLD (f_left)), SUBSI (3, ANDQI (SRLQI (tmp_control, 6), 3)));
-  {
-    DI opval = ORDI (SLLDI (ZEXTHIDI (tmp_result3), 48), ORDI (SLLDI (ZEXTHIDI (tmp_result2), 32), ORDI (SLLDI (ZEXTHIDI (tmp_result1), 16), ZEXTHIDI (tmp_result0))));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_MSADUBQ) : /* msad.ubq $rm, $rn, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_add.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  DI tmp_acc;
-  tmp_acc = ABSDI (SUBQI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 0), SUBWORDDIQI (GET_H_GR (FLD (f_right)), 0)));
-  tmp_acc = ADDDI (tmp_acc, ABSQI (SUBQI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 1), SUBWORDDIQI (GET_H_GR (FLD (f_right)), 1))));
-  tmp_acc = ADDDI (tmp_acc, ABSQI (SUBQI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 2), SUBWORDDIQI (GET_H_GR (FLD (f_right)), 2))));
-  tmp_acc = ADDDI (tmp_acc, ABSQI (SUBQI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 3), SUBWORDDIQI (GET_H_GR (FLD (f_right)), 3))));
-  tmp_acc = ADDDI (tmp_acc, ABSQI (SUBQI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 4), SUBWORDDIQI (GET_H_GR (FLD (f_right)), 4))));
-  tmp_acc = ADDDI (tmp_acc, ABSQI (SUBQI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 5), SUBWORDDIQI (GET_H_GR (FLD (f_right)), 5))));
-  tmp_acc = ADDDI (tmp_acc, ABSQI (SUBQI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 6), SUBWORDDIQI (GET_H_GR (FLD (f_right)), 6))));
-  tmp_acc = ADDDI (tmp_acc, ABSQI (SUBQI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 7), SUBWORDDIQI (GET_H_GR (FLD (f_right)), 7))));
-  {
-    DI opval = ADDDI (GET_H_GR (FLD (f_dest)), tmp_acc);
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_MSHALDSL) : /* mshalds.l $rm, $rn, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_add.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  SI tmp_result1;
-  SI tmp_result0;
-  tmp_result0 = ((LTDI (SLLDI (SUBWORDDISI (GET_H_GR (FLD (f_left)), 1), ANDDI (GET_H_GR (FLD (f_right)), 31)), NEGDI (SLLDI (1, SUBSI (32, 1))))) ? (NEGSI (SLLSI (1, SUBSI (32, 1)))) : (((LTDI (SLLDI (SUBWORDDISI (GET_H_GR (FLD (f_left)), 1), ANDDI (GET_H_GR (FLD (f_right)), 31)), SLLDI (1, SUBSI (32, 1)))) ? (SLLDI (SUBWORDDISI (GET_H_GR (FLD (f_left)), 1), ANDDI (GET_H_GR (FLD (f_right)), 31))) : (SUBSI (SLLSI (1, SUBSI (32, 1)), 1)))));
-  tmp_result1 = ((LTDI (SLLDI (SUBWORDDISI (GET_H_GR (FLD (f_left)), 0), ANDDI (GET_H_GR (FLD (f_right)), 31)), NEGDI (SLLDI (1, SUBSI (32, 1))))) ? (NEGSI (SLLSI (1, SUBSI (32, 1)))) : (((LTDI (SLLDI (SUBWORDDISI (GET_H_GR (FLD (f_left)), 0), ANDDI (GET_H_GR (FLD (f_right)), 31)), SLLDI (1, SUBSI (32, 1)))) ? (SLLDI (SUBWORDDISI (GET_H_GR (FLD (f_left)), 0), ANDDI (GET_H_GR (FLD (f_right)), 31))) : (SUBSI (SLLSI (1, SUBSI (32, 1)), 1)))));
-  {
-    DI opval = ORDI (SLLDI (ZEXTSIDI (tmp_result1), 32), ZEXTSIDI (tmp_result0));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_MSHALDSW) : /* mshalds.w $rm, $rn, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_add.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  HI tmp_result3;
-  HI tmp_result2;
-  HI tmp_result1;
-  HI tmp_result0;
-  tmp_result0 = ((LTDI (SLLDI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 3), ANDDI (GET_H_GR (FLD (f_right)), 15)), NEGDI (SLLDI (1, SUBSI (16, 1))))) ? (NEGHI (SLLHI (1, SUBSI (16, 1)))) : (((LTDI (SLLDI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 3), ANDDI (GET_H_GR (FLD (f_right)), 15)), SLLDI (1, SUBSI (16, 1)))) ? (SLLDI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 3), ANDDI (GET_H_GR (FLD (f_right)), 15))) : (SUBHI (SLLHI (1, SUBSI (16, 1)), 1)))));
-  tmp_result1 = ((LTDI (SLLDI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 2), ANDDI (GET_H_GR (FLD (f_right)), 15)), NEGDI (SLLDI (1, SUBSI (16, 1))))) ? (NEGHI (SLLHI (1, SUBSI (16, 1)))) : (((LTDI (SLLDI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 2), ANDDI (GET_H_GR (FLD (f_right)), 15)), SLLDI (1, SUBSI (16, 1)))) ? (SLLDI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 2), ANDDI (GET_H_GR (FLD (f_right)), 15))) : (SUBHI (SLLHI (1, SUBSI (16, 1)), 1)))));
-  tmp_result2 = ((LTDI (SLLDI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 1), ANDDI (GET_H_GR (FLD (f_right)), 15)), NEGDI (SLLDI (1, SUBSI (16, 1))))) ? (NEGHI (SLLHI (1, SUBSI (16, 1)))) : (((LTDI (SLLDI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 1), ANDDI (GET_H_GR (FLD (f_right)), 15)), SLLDI (1, SUBSI (16, 1)))) ? (SLLDI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 1), ANDDI (GET_H_GR (FLD (f_right)), 15))) : (SUBHI (SLLHI (1, SUBSI (16, 1)), 1)))));
-  tmp_result3 = ((LTDI (SLLDI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 0), ANDDI (GET_H_GR (FLD (f_right)), 15)), NEGDI (SLLDI (1, SUBSI (16, 1))))) ? (NEGHI (SLLHI (1, SUBSI (16, 1)))) : (((LTDI (SLLDI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 0), ANDDI (GET_H_GR (FLD (f_right)), 15)), SLLDI (1, SUBSI (16, 1)))) ? (SLLDI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 0), ANDDI (GET_H_GR (FLD (f_right)), 15))) : (SUBHI (SLLHI (1, SUBSI (16, 1)), 1)))));
-  {
-    DI opval = ORDI (SLLDI (ZEXTHIDI (tmp_result3), 48), ORDI (SLLDI (ZEXTHIDI (tmp_result2), 32), ORDI (SLLDI (ZEXTHIDI (tmp_result1), 16), ZEXTHIDI (tmp_result0))));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_MSHARDL) : /* mshard.l $rm, $rn, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_add.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  SI tmp_result1;
-  SI tmp_result0;
-  tmp_result0 = SRASI (SUBWORDDISI (GET_H_GR (FLD (f_left)), 1), ANDDI (GET_H_GR (FLD (f_right)), 31));
-  tmp_result1 = SRASI (SUBWORDDISI (GET_H_GR (FLD (f_left)), 0), ANDDI (GET_H_GR (FLD (f_right)), 31));
-  {
-    DI opval = ORDI (SLLDI (ZEXTSIDI (tmp_result1), 32), ZEXTSIDI (tmp_result0));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_MSHARDW) : /* mshard.w $rm, $rn, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_add.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  HI tmp_result3;
-  HI tmp_result2;
-  HI tmp_result1;
-  HI tmp_result0;
-  tmp_result0 = SRAHI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 3), ANDDI (GET_H_GR (FLD (f_right)), 15));
-  tmp_result1 = SRAHI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 2), ANDDI (GET_H_GR (FLD (f_right)), 15));
-  tmp_result2 = SRAHI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 1), ANDDI (GET_H_GR (FLD (f_right)), 15));
-  tmp_result3 = SRAHI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 0), ANDDI (GET_H_GR (FLD (f_right)), 15));
-  {
-    DI opval = ORDI (SLLDI (ZEXTHIDI (tmp_result3), 48), ORDI (SLLDI (ZEXTHIDI (tmp_result2), 32), ORDI (SLLDI (ZEXTHIDI (tmp_result1), 16), ZEXTHIDI (tmp_result0))));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_MSHARDSQ) : /* mshards.q $rm, $rn, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_add.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = ((LTDI (SRADI (GET_H_GR (FLD (f_left)), ANDDI (GET_H_GR (FLD (f_right)), 63)), NEGDI (SLLDI (1, SUBSI (16, 1))))) ? (NEGDI (SLLDI (1, SUBSI (16, 1)))) : (((LTDI (SRADI (GET_H_GR (FLD (f_left)), ANDDI (GET_H_GR (FLD (f_right)), 63)), SLLDI (1, SUBSI (16, 1)))) ? (SRADI (GET_H_GR (FLD (f_left)), ANDDI (GET_H_GR (FLD (f_right)), 63))) : (SUBDI (SLLDI (1, SUBSI (16, 1)), 1)))));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_MSHFHIB) : /* mshfhi.b $rm, $rn, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_add.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  QI tmp_result7;
-  QI tmp_result6;
-  QI tmp_result5;
-  QI tmp_result4;
-  QI tmp_result3;
-  QI tmp_result2;
-  QI tmp_result1;
-  QI tmp_result0;
-  tmp_result0 = SUBWORDDIQI (GET_H_GR (FLD (f_left)), 3);
-  tmp_result1 = SUBWORDDIQI (GET_H_GR (FLD (f_right)), 3);
-  tmp_result2 = SUBWORDDIQI (GET_H_GR (FLD (f_left)), 2);
-  tmp_result3 = SUBWORDDIQI (GET_H_GR (FLD (f_right)), 2);
-  tmp_result4 = SUBWORDDIQI (GET_H_GR (FLD (f_left)), 1);
-  tmp_result5 = SUBWORDDIQI (GET_H_GR (FLD (f_right)), 1);
-  tmp_result6 = SUBWORDDIQI (GET_H_GR (FLD (f_left)), 0);
-  tmp_result7 = SUBWORDDIQI (GET_H_GR (FLD (f_right)), 0);
-  {
-    DI opval = ORDI (SLLDI (ZEXTQIDI (tmp_result7), 56), ORDI (SLLDI (ZEXTQIDI (tmp_result6), 48), ORDI (SLLDI (ZEXTQIDI (tmp_result5), 40), ORDI (SLLDI (ZEXTQIDI (tmp_result4), 32), ORDI (SLLDI (ZEXTQIDI (tmp_result3), 24), ORDI (SLLDI (ZEXTQIDI (tmp_result2), 16), ORDI (SLLDI (ZEXTQIDI (tmp_result1), 8), ZEXTQIDI (tmp_result0))))))));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_MSHFHIL) : /* mshfhi.l $rm, $rn, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_add.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  SI tmp_result1;
-  SI tmp_result0;
-  tmp_result0 = SUBWORDDISI (GET_H_GR (FLD (f_left)), 0);
-  tmp_result1 = SUBWORDDISI (GET_H_GR (FLD (f_right)), 0);
-  {
-    DI opval = ORDI (SLLDI (ZEXTSIDI (tmp_result1), 32), ZEXTSIDI (tmp_result0));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_MSHFHIW) : /* mshfhi.w $rm, $rn, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_add.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  HI tmp_result3;
-  HI tmp_result2;
-  HI tmp_result1;
-  HI tmp_result0;
-  tmp_result0 = SUBWORDDIHI (GET_H_GR (FLD (f_left)), 1);
-  tmp_result1 = SUBWORDDIHI (GET_H_GR (FLD (f_right)), 1);
-  tmp_result2 = SUBWORDDIHI (GET_H_GR (FLD (f_left)), 0);
-  tmp_result3 = SUBWORDDIHI (GET_H_GR (FLD (f_right)), 0);
-  {
-    DI opval = ORDI (SLLDI (ZEXTHIDI (tmp_result3), 48), ORDI (SLLDI (ZEXTHIDI (tmp_result2), 32), ORDI (SLLDI (ZEXTHIDI (tmp_result1), 16), ZEXTHIDI (tmp_result0))));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_MSHFLOB) : /* mshflo.b $rm, $rn, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_add.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  QI tmp_result7;
-  QI tmp_result6;
-  QI tmp_result5;
-  QI tmp_result4;
-  QI tmp_result3;
-  QI tmp_result2;
-  QI tmp_result1;
-  QI tmp_result0;
-  tmp_result0 = SUBWORDDIQI (GET_H_GR (FLD (f_left)), 7);
-  tmp_result1 = SUBWORDDIQI (GET_H_GR (FLD (f_right)), 7);
-  tmp_result2 = SUBWORDDIQI (GET_H_GR (FLD (f_left)), 6);
-  tmp_result3 = SUBWORDDIQI (GET_H_GR (FLD (f_right)), 6);
-  tmp_result4 = SUBWORDDIQI (GET_H_GR (FLD (f_left)), 5);
-  tmp_result5 = SUBWORDDIQI (GET_H_GR (FLD (f_right)), 5);
-  tmp_result6 = SUBWORDDIQI (GET_H_GR (FLD (f_left)), 4);
-  tmp_result7 = SUBWORDDIQI (GET_H_GR (FLD (f_right)), 4);
-  {
-    DI opval = ORDI (SLLDI (ZEXTQIDI (tmp_result7), 56), ORDI (SLLDI (ZEXTQIDI (tmp_result6), 48), ORDI (SLLDI (ZEXTQIDI (tmp_result5), 40), ORDI (SLLDI (ZEXTQIDI (tmp_result4), 32), ORDI (SLLDI (ZEXTQIDI (tmp_result3), 24), ORDI (SLLDI (ZEXTQIDI (tmp_result2), 16), ORDI (SLLDI (ZEXTQIDI (tmp_result1), 8), ZEXTQIDI (tmp_result0))))))));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_MSHFLOL) : /* mshflo.l $rm, $rn, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_add.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  SI tmp_result1;
-  SI tmp_result0;
-  tmp_result0 = SUBWORDDISI (GET_H_GR (FLD (f_left)), 1);
-  tmp_result1 = SUBWORDDISI (GET_H_GR (FLD (f_right)), 1);
-  {
-    DI opval = ORDI (SLLDI (ZEXTSIDI (tmp_result1), 32), ZEXTSIDI (tmp_result0));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_MSHFLOW) : /* mshflo.w $rm, $rn, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_add.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  HI tmp_result3;
-  HI tmp_result2;
-  HI tmp_result1;
-  HI tmp_result0;
-  tmp_result0 = SUBWORDDIHI (GET_H_GR (FLD (f_left)), 3);
-  tmp_result1 = SUBWORDDIHI (GET_H_GR (FLD (f_right)), 3);
-  tmp_result2 = SUBWORDDIHI (GET_H_GR (FLD (f_left)), 2);
-  tmp_result3 = SUBWORDDIHI (GET_H_GR (FLD (f_right)), 2);
-  {
-    DI opval = ORDI (SLLDI (ZEXTHIDI (tmp_result3), 48), ORDI (SLLDI (ZEXTHIDI (tmp_result2), 32), ORDI (SLLDI (ZEXTHIDI (tmp_result1), 16), ZEXTHIDI (tmp_result0))));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_MSHLLDL) : /* mshlld.l $rm, $rn, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_add.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  SI tmp_result1;
-  SI tmp_result0;
-  tmp_result0 = SLLSI (SUBWORDDISI (GET_H_GR (FLD (f_left)), 1), ANDDI (GET_H_GR (FLD (f_right)), 31));
-  tmp_result1 = SLLSI (SUBWORDDISI (GET_H_GR (FLD (f_left)), 0), ANDDI (GET_H_GR (FLD (f_right)), 31));
-  {
-    DI opval = ORDI (SLLDI (ZEXTSIDI (tmp_result1), 32), ZEXTSIDI (tmp_result0));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_MSHLLDW) : /* mshlld.w $rm, $rn, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_add.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  HI tmp_result3;
-  HI tmp_result2;
-  HI tmp_result1;
-  HI tmp_result0;
-  tmp_result0 = SLLHI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 3), ANDDI (GET_H_GR (FLD (f_right)), 15));
-  tmp_result1 = SLLHI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 2), ANDDI (GET_H_GR (FLD (f_right)), 15));
-  tmp_result2 = SLLHI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 1), ANDDI (GET_H_GR (FLD (f_right)), 15));
-  tmp_result3 = SLLHI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 0), ANDDI (GET_H_GR (FLD (f_right)), 15));
-  {
-    DI opval = ORDI (SLLDI (ZEXTHIDI (tmp_result3), 48), ORDI (SLLDI (ZEXTHIDI (tmp_result2), 32), ORDI (SLLDI (ZEXTHIDI (tmp_result1), 16), ZEXTHIDI (tmp_result0))));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_MSHLRDL) : /* mshlrd.l $rm, $rn, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_add.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  SI tmp_result1;
-  SI tmp_result0;
-  tmp_result0 = SRLSI (SUBWORDDISI (GET_H_GR (FLD (f_left)), 1), ANDDI (GET_H_GR (FLD (f_right)), 31));
-  tmp_result1 = SRLSI (SUBWORDDISI (GET_H_GR (FLD (f_left)), 0), ANDDI (GET_H_GR (FLD (f_right)), 31));
-  {
-    DI opval = ORDI (SLLDI (ZEXTSIDI (tmp_result1), 32), ZEXTSIDI (tmp_result0));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_MSHLRDW) : /* mshlrd.w $rm, $rn, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_add.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  HI tmp_result3;
-  HI tmp_result2;
-  HI tmp_result1;
-  HI tmp_result0;
-  tmp_result0 = SRLHI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 3), ANDDI (GET_H_GR (FLD (f_right)), 15));
-  tmp_result1 = SRLHI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 2), ANDDI (GET_H_GR (FLD (f_right)), 15));
-  tmp_result2 = SRLHI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 1), ANDDI (GET_H_GR (FLD (f_right)), 15));
-  tmp_result3 = SRLHI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 0), ANDDI (GET_H_GR (FLD (f_right)), 15));
-  {
-    DI opval = ORDI (SLLDI (ZEXTHIDI (tmp_result3), 48), ORDI (SLLDI (ZEXTHIDI (tmp_result2), 32), ORDI (SLLDI (ZEXTHIDI (tmp_result1), 16), ZEXTHIDI (tmp_result0))));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_MSUBL) : /* msub.l $rm, $rn, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_add.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  SI tmp_result1;
-  SI tmp_result0;
-  tmp_result0 = SUBSI (SUBWORDDISI (GET_H_GR (FLD (f_left)), 1), SUBWORDDISI (GET_H_GR (FLD (f_right)), 1));
-  tmp_result1 = SUBSI (SUBWORDDISI (GET_H_GR (FLD (f_left)), 0), SUBWORDDISI (GET_H_GR (FLD (f_right)), 0));
-  {
-    DI opval = ORDI (SLLDI (ZEXTSIDI (tmp_result1), 32), ZEXTSIDI (tmp_result0));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_MSUBW) : /* msub.w $rm, $rn, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_add.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  HI tmp_result3;
-  HI tmp_result2;
-  HI tmp_result1;
-  HI tmp_result0;
-  tmp_result0 = SUBHI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 3), SUBWORDDIHI (GET_H_GR (FLD (f_right)), 3));
-  tmp_result1 = SUBHI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 2), SUBWORDDIHI (GET_H_GR (FLD (f_right)), 2));
-  tmp_result2 = SUBHI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 1), SUBWORDDIHI (GET_H_GR (FLD (f_right)), 1));
-  tmp_result3 = SUBHI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 0), SUBWORDDIHI (GET_H_GR (FLD (f_right)), 0));
-  {
-    DI opval = ORDI (SLLDI (ZEXTHIDI (tmp_result3), 48), ORDI (SLLDI (ZEXTHIDI (tmp_result2), 32), ORDI (SLLDI (ZEXTHIDI (tmp_result1), 16), ZEXTHIDI (tmp_result0))));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_MSUBSL) : /* msubs.l $rm, $rn, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_add.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  SI tmp_result1;
-  SI tmp_result0;
-  tmp_result0 = ((LTDI (SUBDI (EXTSIDI (SUBWORDDISI (GET_H_GR (FLD (f_left)), 1)), EXTSIDI (SUBWORDDISI (GET_H_GR (FLD (f_right)), 1))), NEGDI (SLLDI (1, SUBSI (32, 1))))) ? (NEGSI (SLLSI (1, SUBSI (32, 1)))) : (((LTDI (SUBDI (EXTSIDI (SUBWORDDISI (GET_H_GR (FLD (f_left)), 1)), EXTSIDI (SUBWORDDISI (GET_H_GR (FLD (f_right)), 1))), SLLDI (1, SUBSI (32, 1)))) ? (SUBDI (EXTSIDI (SUBWORDDISI (GET_H_GR (FLD (f_left)), 1)), EXTSIDI (SUBWORDDISI (GET_H_GR (FLD (f_right)), 1)))) : (SUBSI (SLLSI (1, SUBSI (32, 1)), 1)))));
-  tmp_result1 = ((LTDI (SUBDI (EXTSIDI (SUBWORDDISI (GET_H_GR (FLD (f_left)), 0)), EXTSIDI (SUBWORDDISI (GET_H_GR (FLD (f_right)), 0))), NEGDI (SLLDI (1, SUBSI (32, 1))))) ? (NEGSI (SLLSI (1, SUBSI (32, 1)))) : (((LTDI (SUBDI (EXTSIDI (SUBWORDDISI (GET_H_GR (FLD (f_left)), 0)), EXTSIDI (SUBWORDDISI (GET_H_GR (FLD (f_right)), 0))), SLLDI (1, SUBSI (32, 1)))) ? (SUBDI (EXTSIDI (SUBWORDDISI (GET_H_GR (FLD (f_left)), 0)), EXTSIDI (SUBWORDDISI (GET_H_GR (FLD (f_right)), 0)))) : (SUBSI (SLLSI (1, SUBSI (32, 1)), 1)))));
-  {
-    DI opval = ORDI (SLLDI (ZEXTSIDI (tmp_result1), 32), ZEXTSIDI (tmp_result0));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_MSUBSUB) : /* msubs.ub $rm, $rn, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_add.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  QI tmp_result7;
-  QI tmp_result6;
-  QI tmp_result5;
-  QI tmp_result4;
-  QI tmp_result3;
-  QI tmp_result2;
-  QI tmp_result1;
-  QI tmp_result0;
-  tmp_result0 = ((LTDI (SUBDI (ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 7)), ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 7))), MAKEDI (0, 0))) ? (0) : (((LTDI (SUBDI (ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 7)), ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 7))), SLLDI (1, 8))) ? (SUBDI (ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 7)), ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 7)))) : (SUBQI (SLLQI (1, 8), 1)))));
-  tmp_result1 = ((LTDI (SUBDI (ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 6)), ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 6))), MAKEDI (0, 0))) ? (0) : (((LTDI (SUBDI (ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 6)), ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 6))), SLLDI (1, 8))) ? (SUBDI (ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 6)), ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 6)))) : (SUBQI (SLLQI (1, 8), 1)))));
-  tmp_result2 = ((LTDI (SUBDI (ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 5)), ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 5))), MAKEDI (0, 0))) ? (0) : (((LTDI (SUBDI (ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 5)), ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 5))), SLLDI (1, 8))) ? (SUBDI (ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 5)), ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 5)))) : (SUBQI (SLLQI (1, 8), 1)))));
-  tmp_result3 = ((LTDI (SUBDI (ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 4)), ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 4))), MAKEDI (0, 0))) ? (0) : (((LTDI (SUBDI (ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 4)), ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 4))), SLLDI (1, 8))) ? (SUBDI (ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 4)), ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 4)))) : (SUBQI (SLLQI (1, 8), 1)))));
-  tmp_result4 = ((LTDI (SUBDI (ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 3)), ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 3))), MAKEDI (0, 0))) ? (0) : (((LTDI (SUBDI (ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 3)), ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 3))), SLLDI (1, 8))) ? (SUBDI (ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 3)), ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 3)))) : (SUBQI (SLLQI (1, 8), 1)))));
-  tmp_result5 = ((LTDI (SUBDI (ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 2)), ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 2))), MAKEDI (0, 0))) ? (0) : (((LTDI (SUBDI (ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 2)), ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 2))), SLLDI (1, 8))) ? (SUBDI (ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 2)), ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 2)))) : (SUBQI (SLLQI (1, 8), 1)))));
-  tmp_result6 = ((LTDI (SUBDI (ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 1)), ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 1))), MAKEDI (0, 0))) ? (0) : (((LTDI (SUBDI (ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 1)), ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 1))), SLLDI (1, 8))) ? (SUBDI (ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 1)), ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 1)))) : (SUBQI (SLLQI (1, 8), 1)))));
-  tmp_result7 = ((LTDI (SUBDI (ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 0)), ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 0))), MAKEDI (0, 0))) ? (0) : (((LTDI (SUBDI (ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 0)), ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 0))), SLLDI (1, 8))) ? (SUBDI (ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 0)), ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 0)))) : (SUBQI (SLLQI (1, 8), 1)))));
-  {
-    DI opval = ORDI (SLLDI (ZEXTQIDI (tmp_result7), 56), ORDI (SLLDI (ZEXTQIDI (tmp_result6), 48), ORDI (SLLDI (ZEXTQIDI (tmp_result5), 40), ORDI (SLLDI (ZEXTQIDI (tmp_result4), 32), ORDI (SLLDI (ZEXTQIDI (tmp_result3), 24), ORDI (SLLDI (ZEXTQIDI (tmp_result2), 16), ORDI (SLLDI (ZEXTQIDI (tmp_result1), 8), ZEXTQIDI (tmp_result0))))))));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_MSUBSW) : /* msubs.w $rm, $rn, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_add.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  QI tmp_result7;
-  QI tmp_result6;
-  QI tmp_result5;
-  QI tmp_result4;
-  QI tmp_result3;
-  QI tmp_result2;
-  QI tmp_result1;
-  QI tmp_result0;
-  tmp_result0 = ((LTDI (SUBDI (EXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 7)), EXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 7))), NEGDI (SLLDI (1, SUBSI (16, 1))))) ? (NEGHI (SLLHI (1, SUBSI (16, 1)))) : (((LTDI (SUBDI (EXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 7)), EXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 7))), SLLDI (1, SUBSI (16, 1)))) ? (SUBDI (EXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 7)), EXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 7)))) : (SUBHI (SLLHI (1, SUBSI (16, 1)), 1)))));
-  tmp_result1 = ((LTDI (SUBDI (EXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 6)), EXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 6))), NEGDI (SLLDI (1, SUBSI (16, 1))))) ? (NEGHI (SLLHI (1, SUBSI (16, 1)))) : (((LTDI (SUBDI (EXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 6)), EXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 6))), SLLDI (1, SUBSI (16, 1)))) ? (SUBDI (EXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 6)), EXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 6)))) : (SUBHI (SLLHI (1, SUBSI (16, 1)), 1)))));
-  tmp_result2 = ((LTDI (SUBDI (EXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 5)), EXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 5))), NEGDI (SLLDI (1, SUBSI (16, 1))))) ? (NEGHI (SLLHI (1, SUBSI (16, 1)))) : (((LTDI (SUBDI (EXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 5)), EXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 5))), SLLDI (1, SUBSI (16, 1)))) ? (SUBDI (EXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 5)), EXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 5)))) : (SUBHI (SLLHI (1, SUBSI (16, 1)), 1)))));
-  tmp_result3 = ((LTDI (SUBDI (EXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 4)), EXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 4))), NEGDI (SLLDI (1, SUBSI (16, 1))))) ? (NEGHI (SLLHI (1, SUBSI (16, 1)))) : (((LTDI (SUBDI (EXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 4)), EXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 4))), SLLDI (1, SUBSI (16, 1)))) ? (SUBDI (EXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 4)), EXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 4)))) : (SUBHI (SLLHI (1, SUBSI (16, 1)), 1)))));
-  tmp_result4 = ((LTDI (SUBDI (EXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 3)), EXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 3))), NEGDI (SLLDI (1, SUBSI (16, 1))))) ? (NEGHI (SLLHI (1, SUBSI (16, 1)))) : (((LTDI (SUBDI (EXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 3)), EXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 3))), SLLDI (1, SUBSI (16, 1)))) ? (SUBDI (EXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 3)), EXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 3)))) : (SUBHI (SLLHI (1, SUBSI (16, 1)), 1)))));
-  tmp_result5 = ((LTDI (SUBDI (EXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 2)), EXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 2))), NEGDI (SLLDI (1, SUBSI (16, 1))))) ? (NEGHI (SLLHI (1, SUBSI (16, 1)))) : (((LTDI (SUBDI (EXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 2)), EXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 2))), SLLDI (1, SUBSI (16, 1)))) ? (SUBDI (EXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 2)), EXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 2)))) : (SUBHI (SLLHI (1, SUBSI (16, 1)), 1)))));
-  tmp_result6 = ((LTDI (SUBDI (EXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 1)), EXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 1))), NEGDI (SLLDI (1, SUBSI (16, 1))))) ? (NEGHI (SLLHI (1, SUBSI (16, 1)))) : (((LTDI (SUBDI (EXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 1)), EXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 1))), SLLDI (1, SUBSI (16, 1)))) ? (SUBDI (EXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 1)), EXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 1)))) : (SUBHI (SLLHI (1, SUBSI (16, 1)), 1)))));
-  tmp_result7 = ((LTDI (SUBDI (EXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 0)), EXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 0))), NEGDI (SLLDI (1, SUBSI (16, 1))))) ? (NEGHI (SLLHI (1, SUBSI (16, 1)))) : (((LTDI (SUBDI (EXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 0)), EXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 0))), SLLDI (1, SUBSI (16, 1)))) ? (SUBDI (EXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 0)), EXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 0)))) : (SUBHI (SLLHI (1, SUBSI (16, 1)), 1)))));
-  {
-    DI opval = ORDI (SLLDI (ZEXTQIDI (tmp_result7), 56), ORDI (SLLDI (ZEXTQIDI (tmp_result6), 48), ORDI (SLLDI (ZEXTQIDI (tmp_result5), 40), ORDI (SLLDI (ZEXTQIDI (tmp_result4), 32), ORDI (SLLDI (ZEXTQIDI (tmp_result3), 24), ORDI (SLLDI (ZEXTQIDI (tmp_result2), 16), ORDI (SLLDI (ZEXTQIDI (tmp_result1), 8), ZEXTQIDI (tmp_result0))))))));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_MULSL) : /* muls.l $rm, $rn, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_add.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = MULDI (EXTSIDI (SUBWORDDISI (GET_H_GR (FLD (f_left)), 1)), EXTSIDI (SUBWORDDISI (GET_H_GR (FLD (f_right)), 1)));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_MULUL) : /* mulu.l $rm, $rn, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_add.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = MULDI (ZEXTSIDI (SUBWORDDISI (GET_H_GR (FLD (f_left)), 1)), ZEXTSIDI (SUBWORDDISI (GET_H_GR (FLD (f_right)), 1)));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_NOP) : /* nop */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.fmt_empty.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-((void) 0); /*nop*/
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_NSB) : /* nsb $rm, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_xori.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = sh64_nsb (current_cpu, GET_H_GR (FLD (f_left)));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_OCBI) : /* ocbi $rm, $disp6x32 */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.fmt_empty.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-((void) 0); /*nop*/
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_OCBP) : /* ocbp $rm, $disp6x32 */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.fmt_empty.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-((void) 0); /*nop*/
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_OCBWB) : /* ocbwb $rm, $disp6x32 */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.fmt_empty.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-((void) 0); /*nop*/
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_OR) : /* or $rm, $rn, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_add.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = ORDI (GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right)));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_ORI) : /* ori $rm, $imm10, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_ori.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = ORDI (GET_H_GR (FLD (f_left)), EXTSIDI (FLD (f_imm10)));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_PREFI) : /* prefi $rm, $disp6x32 */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.fmt_empty.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-((void) 0); /*nop*/
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_PTA) : /* pta$likely $disp16, $tra */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_pta.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = ADDSI (FLD (f_disp16), 1);
-    CPU (h_tr[FLD (f_tra)]) = opval;
-    TRACE_RESULT (current_cpu, abuf, "tr", 'D', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_PTABS) : /* ptabs$likely $rn, $tra */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_beq.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = GET_H_GR (FLD (f_right));
-    CPU (h_tr[FLD (f_tra)]) = opval;
-    TRACE_RESULT (current_cpu, abuf, "tr", 'D', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_PTB) : /* ptb$likely $disp16, $tra */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_pta.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = FLD (f_disp16);
-    CPU (h_tr[FLD (f_tra)]) = opval;
-    TRACE_RESULT (current_cpu, abuf, "tr", 'D', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_PTREL) : /* ptrel$likely $rn, $tra */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_beq.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = ADDDI (pc, GET_H_GR (FLD (f_right)));
-    CPU (h_tr[FLD (f_tra)]) = opval;
-    TRACE_RESULT (current_cpu, abuf, "tr", 'D', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_PUTCFG) : /* putcfg $rm, $disp6, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.fmt_empty.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-((void) 0); /*nop*/
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_PUTCON) : /* putcon $rm, $crj */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_xori.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = GET_H_GR (FLD (f_left));
-    SET_H_CR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "cr", 'D', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_RTE) : /* rte */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.fmt_empty.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-((void) 0); /*nop*/
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_SHARD) : /* shard $rm, $rn, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_add.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = SRADI (GET_H_GR (FLD (f_left)), ANDDI (GET_H_GR (FLD (f_right)), 63));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_SHARDL) : /* shard.l $rm, $rn, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_add.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = EXTSIDI (SRASI (SUBWORDDISI (GET_H_GR (FLD (f_left)), 1), ANDDI (GET_H_GR (FLD (f_right)), 63)));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_SHARI) : /* shari $rm, $uimm6, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_shari.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = SRADI (GET_H_GR (FLD (f_left)), FLD (f_uimm6));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_SHARIL) : /* shari.l $rm, $uimm6, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_shari.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = EXTSIDI (SRASI (SUBWORDDISI (GET_H_GR (FLD (f_left)), 1), ANDSI (FLD (f_uimm6), 63)));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_SHLLD) : /* shlld $rm, $rn, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_add.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = SLLDI (GET_H_GR (FLD (f_left)), ANDDI (GET_H_GR (FLD (f_right)), 63));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_SHLLDL) : /* shlld.l $rm, $rn, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_add.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = EXTSIDI (SLLSI (SUBWORDDISI (GET_H_GR (FLD (f_left)), 1), ANDDI (GET_H_GR (FLD (f_right)), 63)));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_SHLLI) : /* shlli $rm, $uimm6, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_shari.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = SLLDI (GET_H_GR (FLD (f_left)), FLD (f_uimm6));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_SHLLIL) : /* shlli.l $rm, $uimm6, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_shari.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = EXTSIDI (SLLSI (SUBWORDDISI (GET_H_GR (FLD (f_left)), 1), ANDSI (FLD (f_uimm6), 63)));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_SHLRD) : /* shlrd $rm, $rn, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_add.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = SRLDI (GET_H_GR (FLD (f_left)), ANDDI (GET_H_GR (FLD (f_right)), 63));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_SHLRDL) : /* shlrd.l $rm, $rn, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_add.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = EXTSIDI (SRLSI (SUBWORDDISI (GET_H_GR (FLD (f_left)), 1), ANDDI (GET_H_GR (FLD (f_right)), 63)));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_SHLRI) : /* shlri $rm, $uimm6, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_shari.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = SRLDI (GET_H_GR (FLD (f_left)), FLD (f_uimm6));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_SHLRIL) : /* shlri.l $rm, $uimm6, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_shari.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = EXTSIDI (SRLSI (SUBWORDDISI (GET_H_GR (FLD (f_left)), 1), ANDSI (FLD (f_uimm6), 63)));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_SHORI) : /* shori $uimm16, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_shori.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = ORDI (SLLDI (GET_H_GR (FLD (f_dest)), 16), ZEXTSIDI (FLD (f_uimm16)));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_SLEEP) : /* sleep */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.fmt_empty.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-((void) 0); /*nop*/
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_STB) : /* st.b $rm, $disp10, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_addi.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    UQI opval = ANDQI (GET_H_GR (FLD (f_dest)), 255);
-    SETMEMUQI (current_cpu, pc, ADDDI (GET_H_GR (FLD (f_left)), EXTSIDI (FLD (f_disp10))), opval);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_STL) : /* st.l $rm, $disp10x4, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_flds.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    SI opval = ANDSI (GET_H_GR (FLD (f_dest)), 0xffffffff);
-    SETMEMSI (current_cpu, pc, ADDDI (GET_H_GR (FLD (f_left)), EXTSIDI (FLD (f_disp10x4))), opval);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_STQ) : /* st.q $rm, $disp10x8, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_fldd.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = GET_H_GR (FLD (f_dest));
-    SETMEMDI (current_cpu, pc, ADDDI (GET_H_GR (FLD (f_left)), EXTSIDI (FLD (f_disp10x8))), opval);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'D', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_STW) : /* st.w $rm, $disp10x2, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_lduw.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    HI opval = ANDHI (GET_H_GR (FLD (f_dest)), 65535);
-    SETMEMHI (current_cpu, pc, ADDDI (GET_H_GR (FLD (f_left)), EXTSIDI (FLD (f_disp10x2))), opval);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_STHIL) : /* sthi.l $rm, $disp6, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_ldhil.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  DI tmp_addr;
-  QI tmp_bytecount;
-  DI tmp_val;
-  tmp_addr = ADDDI (GET_H_GR (FLD (f_left)), FLD (f_disp6));
-  tmp_bytecount = ADDDI (ANDDI (tmp_addr, 3), 1);
-if (ANDQI (tmp_bytecount, 4)) {
-  {
-    SI opval = GET_H_GR (FLD (f_dest));
-    SETMEMSI (current_cpu, pc, ANDDI (tmp_addr, -4), opval);
-    written |= (1 << 5);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
-  }
-} else {
-if (GET_H_ENDIAN ()) {
-{
-  tmp_val = GET_H_GR (FLD (f_dest));
-if (ANDQI (tmp_bytecount, 1)) {
-{
-  {
-    UQI opval = ANDQI (tmp_val, 255);
-    SETMEMUQI (current_cpu, pc, tmp_addr, opval);
-    written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
-  }
-  tmp_val = SRLDI (tmp_val, 8);
-}
-}
-if (ANDQI (tmp_bytecount, 2)) {
-{
-  {
-    HI opval = ANDHI (tmp_val, 65535);
-    SETMEMHI (current_cpu, pc, ANDDI (tmp_addr, -4), opval);
-    written |= (1 << 4);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
-  }
-  tmp_val = SRLDI (tmp_val, 16);
-}
-}
-}
-} else {
-{
-  tmp_val = SRLDI (GET_H_GR (FLD (f_dest)), SUBSI (32, MULSI (8, tmp_bytecount)));
-if (ANDQI (tmp_bytecount, 2)) {
-{
-  {
-    HI opval = ANDHI (tmp_val, 65535);
-    SETMEMHI (current_cpu, pc, ANDDI (tmp_addr, -4), opval);
-    written |= (1 << 4);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
-  }
-  tmp_val = SRLDI (tmp_val, 16);
-}
-}
-if (ANDQI (tmp_bytecount, 1)) {
-{
-  {
-    UQI opval = ANDQI (tmp_val, 255);
-    SETMEMUQI (current_cpu, pc, tmp_addr, opval);
-    written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
-  }
-  tmp_val = SRLDI (tmp_val, 8);
-}
-}
-}
-}
-}
-}
-
-  abuf->written = written;
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_STHIQ) : /* sthi.q $rm, $disp6, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_ldhil.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  DI tmp_addr;
-  QI tmp_bytecount;
-  DI tmp_val;
-  tmp_addr = ADDDI (GET_H_GR (FLD (f_left)), FLD (f_disp6));
-  tmp_bytecount = ADDDI (ANDDI (tmp_addr, 7), 1);
-if (ANDQI (tmp_bytecount, 8)) {
-  {
-    DI opval = GET_H_GR (FLD (f_dest));
-    SETMEMDI (current_cpu, pc, ANDDI (tmp_addr, -8), opval);
-    written |= (1 << 4);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'D', opval);
-  }
-} else {
-if (GET_H_ENDIAN ()) {
-{
-  tmp_val = GET_H_GR (FLD (f_dest));
-if (ANDQI (tmp_bytecount, 1)) {
-{
-  {
-    UQI opval = ANDQI (tmp_val, 255);
-    SETMEMUQI (current_cpu, pc, tmp_addr, opval);
-    written |= (1 << 7);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
-  }
-  tmp_val = SRLDI (tmp_val, 8);
-}
-}
-if (ANDQI (tmp_bytecount, 2)) {
-{
-  {
-    HI opval = ANDHI (tmp_val, 65535);
-    SETMEMHI (current_cpu, pc, ANDDI (tmp_addr, -4), opval);
-    written |= (1 << 5);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
-  }
-  tmp_val = SRLDI (tmp_val, 16);
-}
-}
-if (ANDQI (tmp_bytecount, 4)) {
-{
-  {
-    SI opval = ANDSI (tmp_val, 0xffffffff);
-    SETMEMSI (current_cpu, pc, ANDDI (tmp_addr, -8), opval);
-    written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
-  }
-  tmp_val = SRLDI (tmp_val, 32);
-}
-}
-}
-} else {
-{
-  tmp_val = SRLDI (GET_H_GR (FLD (f_dest)), SUBSI (64, MULSI (8, tmp_bytecount)));
-if (ANDQI (tmp_bytecount, 4)) {
-{
-  {
-    SI opval = ANDSI (tmp_val, 0xffffffff);
-    SETMEMSI (current_cpu, pc, ANDDI (tmp_addr, -8), opval);
-    written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
-  }
-  tmp_val = SRLDI (tmp_val, 32);
-}
-}
-if (ANDQI (tmp_bytecount, 2)) {
-{
-  {
-    HI opval = ANDHI (tmp_val, 65535);
-    SETMEMHI (current_cpu, pc, ANDDI (tmp_addr, -4), opval);
-    written |= (1 << 5);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
-  }
-  tmp_val = SRLDI (tmp_val, 16);
-}
-}
-if (ANDQI (tmp_bytecount, 1)) {
-{
-  {
-    UQI opval = ANDQI (tmp_val, 255);
-    SETMEMUQI (current_cpu, pc, tmp_addr, opval);
-    written |= (1 << 7);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
-  }
-  tmp_val = SRLDI (tmp_val, 8);
-}
-}
-}
-}
-}
-}
-
-  abuf->written = written;
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_STLOL) : /* stlo.l $rm, $disp6, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_ldhil.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  DI tmp_addr;
-  QI tmp_bytecount;
-  DI tmp_val;
-  tmp_addr = ADDDI (GET_H_GR (FLD (f_left)), FLD (f_disp6));
-  tmp_bytecount = SUBSI (4, ANDDI (tmp_addr, 3));
-if (ANDQI (tmp_bytecount, 4)) {
-  {
-    USI opval = GET_H_GR (FLD (f_dest));
-    SETMEMUSI (current_cpu, pc, tmp_addr, opval);
-    written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
-  }
-} else {
-if (GET_H_ENDIAN ()) {
-{
-  tmp_val = SRLDI (GET_H_GR (FLD (f_dest)), SUBSI (32, MULSI (8, tmp_bytecount)));
-if (ANDQI (tmp_bytecount, 2)) {
-{
-  {
-    UHI opval = ANDHI (tmp_val, 65535);
-    SETMEMUHI (current_cpu, pc, ANDDI (ADDDI (tmp_addr, 1), -2), opval);
-    written |= (1 << 4);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
-  }
-  tmp_val = SRLDI (tmp_val, 16);
-}
-}
-if (ANDQI (tmp_bytecount, 1)) {
-{
-  {
-    UQI opval = ANDQI (tmp_val, 255);
-    SETMEMUQI (current_cpu, pc, tmp_addr, opval);
-    written |= (1 << 5);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
-  }
-  tmp_val = SRLDI (tmp_val, 8);
-}
-}
-}
-} else {
-{
-  tmp_val = GET_H_GR (FLD (f_dest));
-if (ANDQI (tmp_bytecount, 1)) {
-{
-  {
-    UQI opval = ANDQI (tmp_val, 255);
-    SETMEMUQI (current_cpu, pc, tmp_addr, opval);
-    written |= (1 << 5);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
-  }
-  tmp_val = SRLDI (tmp_val, 8);
-}
-}
-if (ANDQI (tmp_bytecount, 2)) {
-{
-  {
-    UHI opval = ANDHI (tmp_val, 65535);
-    SETMEMUHI (current_cpu, pc, ANDDI (ADDDI (tmp_addr, 1), -2), opval);
-    written |= (1 << 4);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
-  }
-  tmp_val = SRLDI (tmp_val, 16);
-}
-}
-}
-}
-}
-}
-
-  abuf->written = written;
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_STLOQ) : /* stlo.q $rm, $disp6, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_ldhil.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  DI tmp_addr;
-  QI tmp_bytecount;
-  DI tmp_val;
-  tmp_addr = ADDDI (GET_H_GR (FLD (f_left)), FLD (f_disp6));
-  tmp_bytecount = SUBSI (8, ANDDI (tmp_addr, 7));
-if (ANDQI (tmp_bytecount, 8)) {
-  {
-    UDI opval = GET_H_GR (FLD (f_dest));
-    SETMEMUDI (current_cpu, pc, tmp_addr, opval);
-    written |= (1 << 4);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'D', opval);
-  }
-} else {
-if (GET_H_ENDIAN ()) {
-{
-  tmp_val = SRLDI (GET_H_GR (FLD (f_dest)), SUBSI (64, MULSI (8, tmp_bytecount)));
-if (ANDQI (tmp_bytecount, 4)) {
-{
-  {
-    USI opval = ANDSI (tmp_val, 0xffffffff);
-    SETMEMUSI (current_cpu, pc, ANDDI (ADDDI (tmp_addr, 3), -4), opval);
-    written |= (1 << 7);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
-  }
-  tmp_val = SRLDI (tmp_val, 32);
-}
-}
-if (ANDQI (tmp_bytecount, 2)) {
-{
-  {
-    UHI opval = ANDHI (tmp_val, 65535);
-    SETMEMUHI (current_cpu, pc, ANDDI (ADDDI (tmp_addr, 1), -2), opval);
-    written |= (1 << 5);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
-  }
-  tmp_val = SRLDI (tmp_val, 16);
-}
-}
-if (ANDQI (tmp_bytecount, 1)) {
-{
-  {
-    UQI opval = ANDQI (tmp_val, 255);
-    SETMEMUQI (current_cpu, pc, tmp_addr, opval);
-    written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
-  }
-  tmp_val = SRLDI (tmp_val, 8);
-}
-}
-}
-} else {
-{
-  tmp_val = GET_H_GR (FLD (f_dest));
-if (ANDQI (tmp_bytecount, 1)) {
-{
-  {
-    UQI opval = ANDQI (tmp_val, 255);
-    SETMEMUQI (current_cpu, pc, tmp_addr, opval);
-    written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
-  }
-  tmp_val = SRLDI (tmp_val, 8);
-}
-}
-if (ANDQI (tmp_bytecount, 2)) {
-{
-  {
-    UHI opval = ANDHI (tmp_val, 65535);
-    SETMEMUHI (current_cpu, pc, ANDDI (ADDDI (tmp_addr, 1), -2), opval);
-    written |= (1 << 5);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
-  }
-  tmp_val = SRLDI (tmp_val, 16);
-}
-}
-if (ANDQI (tmp_bytecount, 4)) {
-{
-  {
-    USI opval = ANDSI (tmp_val, 0xffffffff);
-    SETMEMUSI (current_cpu, pc, ANDDI (ADDDI (tmp_addr, 3), -4), opval);
-    written |= (1 << 7);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
-  }
-  tmp_val = SRLDI (tmp_val, 32);
-}
-}
-}
-}
-}
-}
-
-  abuf->written = written;
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_STXB) : /* stx.b $rm, $rn, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_add.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    UQI opval = SUBWORDDIQI (GET_H_GR (FLD (f_dest)), 7);
-    SETMEMUQI (current_cpu, pc, ADDDI (GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right))), opval);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_STXL) : /* stx.l $rm, $rn, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_add.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    SI opval = SUBWORDDISI (GET_H_GR (FLD (f_dest)), 1);
-    SETMEMSI (current_cpu, pc, ADDDI (GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right))), opval);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_STXQ) : /* stx.q $rm, $rn, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_add.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = GET_H_GR (FLD (f_dest));
-    SETMEMDI (current_cpu, pc, ADDDI (GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right))), opval);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'D', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_STXW) : /* stx.w $rm, $rn, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_add.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    HI opval = SUBWORDDIHI (GET_H_GR (FLD (f_dest)), 3);
-    SETMEMHI (current_cpu, pc, ADDDI (GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right))), opval);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_SUB) : /* sub $rm, $rn, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_add.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = SUBDI (GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right)));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_SUBL) : /* sub.l $rm, $rn, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_add.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = EXTSIDI (SUBSI (SUBWORDDISI (GET_H_GR (FLD (f_left)), 1), SUBWORDDISI (GET_H_GR (FLD (f_right)), 1)));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_SWAPQ) : /* swap.q $rm, $rn, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_add.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  DI tmp_addr;
-  DI tmp_temp;
-  tmp_addr = ADDDI (GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right)));
-  tmp_temp = GETMEMDI (current_cpu, pc, tmp_addr);
-  {
-    DI opval = GET_H_GR (FLD (f_dest));
-    SETMEMDI (current_cpu, pc, tmp_addr, opval);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'D', opval);
-  }
-  {
-    DI opval = tmp_temp;
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_SYNCI) : /* synci */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.fmt_empty.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-((void) 0); /*nop*/
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_SYNCO) : /* synco */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.fmt_empty.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-((void) 0); /*nop*/
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_TRAPA) : /* trapa $rm */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_xori.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-sh64_trapa (current_cpu, GET_H_GR (FLD (f_left)), pc);
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_XOR) : /* xor $rm, $rn, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_add.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = XORDI (GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right)));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-  CASE (sem, INSN_XORI) : /* xori $rm, $imm6, $rd */
-{
-  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.sfmt_xori.f
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = XORDI (GET_H_GR (FLD (f_left)), EXTSIDI (FLD (f_imm6)));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-
-#undef FLD
-}
-  NEXT (vpc);
-
-
-    }
-  ENDSWITCH (sem) /* End of semantic switch.  */
-
-  /* At this point `vpc' contains the next insn to execute.  */
-}
-
-#undef DEFINE_SWITCH
-#endif /* DEFINE_SWITCH */
diff --git a/sim/sh64/sem-media.c b/sim/sh64/sem-media.c
deleted file mode 100644
index aee11ccf174..00000000000
--- a/sim/sh64/sem-media.c
+++ /dev/null
@@ -1,5965 +0,0 @@
-/* Simulator instruction semantics for sh64.
-
-THIS FILE IS MACHINE GENERATED WITH CGEN.
-
-Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
-
-This file is part of the GNU simulators.
-
-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, 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 WANT_CPU sh64
-#define WANT_CPU_SH64
-
-#include "sim-main.h"
-#include "cgen-mem.h"
-#include "cgen-ops.h"
-
-#undef GET_ATTR
-#if defined (__STDC__) || defined (ALMOST_STDC) || defined (HAVE_STRINGIZE)
-#define GET_ATTR(cpu, num, attr) CGEN_ATTR_VALUE (NULL, abuf->idesc->attrs, CGEN_INSN_##attr)
-#else
-#define GET_ATTR(cpu, num, attr) CGEN_ATTR_VALUE (NULL, abuf->idesc->attrs, CGEN_INSN_/**/attr)
-#endif
-
-/* This is used so that we can compile two copies of the semantic code,
-   one with full feature support and one without that runs fast(er).
-   FAST_P, when desired, is defined on the command line, -DFAST_P=1.  */
-#if FAST_P
-#define SEM_FN_NAME(cpu,fn) XCONCAT3 (cpu,_semf_,fn)
-#undef TRACE_RESULT
-#define TRACE_RESULT(cpu, abuf, name, type, val)
-#else
-#define SEM_FN_NAME(cpu,fn) XCONCAT3 (cpu,_sem_,fn)
-#endif
-
-/* x-invalid: --invalid-- */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,x_invalid) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.fmt_empty.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 0);
-
-  {
-    /* Update the recorded pc in the cpu state struct.
-       Only necessary for WITH_SCACHE case, but to avoid the
-       conditional compilation ....  */
-    SET_H_PC (pc);
-    /* Virtual insns have zero size.  Overwrite vpc with address of next insn
-       using the default-insn-bitsize spec.  When executing insns in parallel
-       we may want to queue the fault and continue execution.  */
-    vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-    vpc = sim_engine_invalid_insn (current_cpu, pc, vpc);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* x-after: --after-- */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,x_after) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.fmt_empty.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 0);
-
-  {
-#if WITH_SCACHE_PBB_SH64_MEDIA
-    sh64_media_pbb_after (current_cpu, sem_arg);
-#endif
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* x-before: --before-- */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,x_before) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.fmt_empty.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 0);
-
-  {
-#if WITH_SCACHE_PBB_SH64_MEDIA
-    sh64_media_pbb_before (current_cpu, sem_arg);
-#endif
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* x-cti-chain: --cti-chain-- */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,x_cti_chain) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.fmt_empty.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 0);
-
-  {
-#if WITH_SCACHE_PBB_SH64_MEDIA
-#ifdef DEFINE_SWITCH
-    vpc = sh64_media_pbb_cti_chain (current_cpu, sem_arg,
-			       pbb_br_type, pbb_br_npc);
-    BREAK (sem);
-#else
-    /* FIXME: Allow provision of explicit ifmt spec in insn spec.  */
-    vpc = sh64_media_pbb_cti_chain (current_cpu, sem_arg,
-			       CPU_PBB_BR_TYPE (current_cpu),
-			       CPU_PBB_BR_NPC (current_cpu));
-#endif
-#endif
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* x-chain: --chain-- */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,x_chain) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.fmt_empty.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 0);
-
-  {
-#if WITH_SCACHE_PBB_SH64_MEDIA
-    vpc = sh64_media_pbb_chain (current_cpu, sem_arg);
-#ifdef DEFINE_SWITCH
-    BREAK (sem);
-#endif
-#endif
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* x-begin: --begin-- */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,x_begin) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.fmt_empty.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 0);
-
-  {
-#if WITH_SCACHE_PBB_SH64_MEDIA
-#if defined DEFINE_SWITCH || defined FAST_P
-    /* In the switch case FAST_P is a constant, allowing several optimizations
-       in any called inline functions.  */
-    vpc = sh64_media_pbb_begin (current_cpu, FAST_P);
-#else
-#if 0 /* cgen engine can't handle dynamic fast/full switching yet.  */
-    vpc = sh64_media_pbb_begin (current_cpu, STATE_RUN_FAST_P (CPU_STATE (current_cpu)));
-#else
-    vpc = sh64_media_pbb_begin (current_cpu, 0);
-#endif
-#endif
-#endif
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* add: add $rm, $rn, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,add) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_add.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = ADDDI (GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right)));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* addl: add.l $rm, $rn, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,addl) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_add.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = ADDSI (SUBWORDDISI (GET_H_GR (FLD (f_left)), 1), SUBWORDDISI (GET_H_GR (FLD (f_right)), 1));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* addi: addi $rm, $disp10, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,addi) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_addi.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = ADDDI (GET_H_GR (FLD (f_left)), EXTSIDI (FLD (f_disp10)));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* addil: addi.l $rm, $disp10, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,addil) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_addi.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = EXTSIDI (ADDSI (EXTSISI (FLD (f_disp10)), SUBWORDDISI (GET_H_GR (FLD (f_left)), 1)));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* addzl: addz.l $rm, $rn, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,addzl) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_add.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = ZEXTSIDI (ADDSI (SUBWORDDISI (GET_H_GR (FLD (f_left)), 1), SUBWORDDISI (GET_H_GR (FLD (f_right)), 1)));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* alloco: alloco $rm, $disp6x32 */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,alloco) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.fmt_empty.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-((void) 0); /*nop*/
-
-  return vpc;
-#undef FLD
-}
-
-/* and: and $rm, $rn, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,and) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_add.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = ANDDI (GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right)));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* andc: andc $rm, $rn, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,andc) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_add.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = ANDDI (GET_H_GR (FLD (f_left)), INVDI (GET_H_GR (FLD (f_right))));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* andi: andi $rm, $disp10, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,andi) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_addi.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = ANDDI (GET_H_GR (FLD (f_left)), EXTSIDI (FLD (f_disp10)));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* beq: beq$likely $rm, $rn, $tra */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,beq) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_beq.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_BRANCH_INIT
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-if (EQDI (GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right)))) {
-  {
-    UDI opval = CPU (h_tr[FLD (f_tra)]);
-    SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc);
-    written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval);
-  }
-}
-
-  abuf->written = written;
-  SEM_BRANCH_FINI (vpc);
-  return vpc;
-#undef FLD
-}
-
-/* beqi: beqi$likely $rm, $imm6, $tra */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,beqi) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_beqi.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_BRANCH_INIT
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-if (EQDI (GET_H_GR (FLD (f_left)), EXTSIDI (FLD (f_imm6)))) {
-  {
-    UDI opval = CPU (h_tr[FLD (f_tra)]);
-    SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc);
-    written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval);
-  }
-}
-
-  abuf->written = written;
-  SEM_BRANCH_FINI (vpc);
-  return vpc;
-#undef FLD
-}
-
-/* bge: bge$likely $rm, $rn, $tra */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,bge) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_beq.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_BRANCH_INIT
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-if (GEDI (GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right)))) {
-  {
-    UDI opval = CPU (h_tr[FLD (f_tra)]);
-    SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc);
-    written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval);
-  }
-}
-
-  abuf->written = written;
-  SEM_BRANCH_FINI (vpc);
-  return vpc;
-#undef FLD
-}
-
-/* bgeu: bgeu$likely $rm, $rn, $tra */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,bgeu) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_beq.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_BRANCH_INIT
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-if (GEUDI (GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right)))) {
-  {
-    UDI opval = CPU (h_tr[FLD (f_tra)]);
-    SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc);
-    written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval);
-  }
-}
-
-  abuf->written = written;
-  SEM_BRANCH_FINI (vpc);
-  return vpc;
-#undef FLD
-}
-
-/* bgt: bgt$likely $rm, $rn, $tra */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,bgt) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_beq.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_BRANCH_INIT
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-if (GTDI (GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right)))) {
-  {
-    UDI opval = CPU (h_tr[FLD (f_tra)]);
-    SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc);
-    written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval);
-  }
-}
-
-  abuf->written = written;
-  SEM_BRANCH_FINI (vpc);
-  return vpc;
-#undef FLD
-}
-
-/* bgtu: bgtu$likely $rm, $rn, $tra */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,bgtu) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_beq.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_BRANCH_INIT
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-if (GTUDI (GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right)))) {
-  {
-    UDI opval = CPU (h_tr[FLD (f_tra)]);
-    SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc);
-    written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval);
-  }
-}
-
-  abuf->written = written;
-  SEM_BRANCH_FINI (vpc);
-  return vpc;
-#undef FLD
-}
-
-/* blink: blink $trb, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,blink) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_blink.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_BRANCH_INIT
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  {
-    DI opval = ORDI (ADDDI (pc, 4), 1);
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-  {
-    UDI opval = CPU (h_tr[FLD (f_trb)]);
-    SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval);
-  }
-}
-
-  SEM_BRANCH_FINI (vpc);
-  return vpc;
-#undef FLD
-}
-
-/* bne: bne$likely $rm, $rn, $tra */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,bne) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_beq.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_BRANCH_INIT
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-if (NEDI (GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right)))) {
-  {
-    UDI opval = CPU (h_tr[FLD (f_tra)]);
-    SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc);
-    written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval);
-  }
-}
-
-  abuf->written = written;
-  SEM_BRANCH_FINI (vpc);
-  return vpc;
-#undef FLD
-}
-
-/* bnei: bnei$likely $rm, $imm6, $tra */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,bnei) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_beqi.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_BRANCH_INIT
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-if (NEDI (GET_H_GR (FLD (f_left)), EXTSIDI (FLD (f_imm6)))) {
-  {
-    UDI opval = CPU (h_tr[FLD (f_tra)]);
-    SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc);
-    written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval);
-  }
-}
-
-  abuf->written = written;
-  SEM_BRANCH_FINI (vpc);
-  return vpc;
-#undef FLD
-}
-
-/* brk: brk */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,brk) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.fmt_empty.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-sh64_break (current_cpu, pc);
-
-  return vpc;
-#undef FLD
-}
-
-/* byterev: byterev $rm, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,byterev) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_xori.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  DI tmp_source;
-  DI tmp_result;
-  tmp_source = GET_H_GR (FLD (f_left));
-  tmp_result = 0;
-{
-  tmp_result = ORDI (SLLDI (tmp_result, 8), ANDDI (tmp_source, 255));
-  tmp_source = SRLDI (tmp_source, 8);
-}
-{
-  tmp_result = ORDI (SLLDI (tmp_result, 8), ANDDI (tmp_source, 255));
-  tmp_source = SRLDI (tmp_source, 8);
-}
-{
-  tmp_result = ORDI (SLLDI (tmp_result, 8), ANDDI (tmp_source, 255));
-  tmp_source = SRLDI (tmp_source, 8);
-}
-{
-  tmp_result = ORDI (SLLDI (tmp_result, 8), ANDDI (tmp_source, 255));
-  tmp_source = SRLDI (tmp_source, 8);
-}
-{
-  tmp_result = ORDI (SLLDI (tmp_result, 8), ANDDI (tmp_source, 255));
-  tmp_source = SRLDI (tmp_source, 8);
-}
-{
-  tmp_result = ORDI (SLLDI (tmp_result, 8), ANDDI (tmp_source, 255));
-  tmp_source = SRLDI (tmp_source, 8);
-}
-{
-  tmp_result = ORDI (SLLDI (tmp_result, 8), ANDDI (tmp_source, 255));
-  tmp_source = SRLDI (tmp_source, 8);
-}
-{
-  tmp_result = ORDI (SLLDI (tmp_result, 8), ANDDI (tmp_source, 255));
-  tmp_source = SRLDI (tmp_source, 8);
-}
-  {
-    DI opval = tmp_result;
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-
-  return vpc;
-#undef FLD
-}
-
-/* cmpeq: cmpeq $rm, $rn, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,cmpeq) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_add.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = ((EQDI (GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right)))) ? (1) : (0));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* cmpgt: cmpgt $rm, $rn, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,cmpgt) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_add.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = ((GTDI (GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right)))) ? (1) : (0));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* cmpgtu: cmpgtu $rm,$rn, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,cmpgtu) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_add.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = ((GTUDI (GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right)))) ? (1) : (0));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* cmveq: cmveq $rm, $rn, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,cmveq) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_add.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-if (EQDI (GET_H_GR (FLD (f_left)), 0)) {
-  {
-    DI opval = GET_H_GR (FLD (f_right));
-    SET_H_GR (FLD (f_dest), opval);
-    written |= (1 << 2);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-
-  abuf->written = written;
-  return vpc;
-#undef FLD
-}
-
-/* cmvne: cmvne $rm, $rn, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,cmvne) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_add.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-if (NEDI (GET_H_GR (FLD (f_left)), 0)) {
-  {
-    DI opval = GET_H_GR (FLD (f_right));
-    SET_H_GR (FLD (f_dest), opval);
-    written |= (1 << 2);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-
-  abuf->written = written;
-  return vpc;
-#undef FLD
-}
-
-/* fabsd: fabs.d $drgh, $drf */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,fabsd) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_fabsd.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DF opval = sh64_fabsd (current_cpu, GET_H_DR (FLD (f_left_right)));
-    SET_H_DR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "dr", 'f', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* fabss: fabs.s $frgh, $frf */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,fabss) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_fabsd.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    SF opval = sh64_fabss (current_cpu, CPU (h_fr[FLD (f_left_right)]));
-    CPU (h_fr[FLD (f_dest)]) = opval;
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* faddd: fadd.d $drg, $drh, $drf */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,faddd) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_add.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DF opval = sh64_faddd (current_cpu, GET_H_DR (FLD (f_left)), GET_H_DR (FLD (f_right)));
-    SET_H_DR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "dr", 'f', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* fadds: fadd.s $frg, $frh, $frf */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,fadds) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_add.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    SF opval = sh64_fadds (current_cpu, CPU (h_fr[FLD (f_left)]), CPU (h_fr[FLD (f_right)]));
-    CPU (h_fr[FLD (f_dest)]) = opval;
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* fcmpeqd: fcmpeq.d $drg, $drh, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,fcmpeqd) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_add.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = ZEXTBIDI (sh64_fcmpeqd (current_cpu, GET_H_DR (FLD (f_left)), GET_H_DR (FLD (f_right))));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* fcmpeqs: fcmpeq.s $frg, $frh, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,fcmpeqs) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_add.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = ZEXTBIDI (sh64_fcmpeqs (current_cpu, CPU (h_fr[FLD (f_left)]), CPU (h_fr[FLD (f_right)])));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* fcmpged: fcmpge.d $drg, $drh, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,fcmpged) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_add.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = ZEXTBIDI (sh64_fcmpged (current_cpu, GET_H_DR (FLD (f_left)), GET_H_DR (FLD (f_right))));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* fcmpges: fcmpge.s $frg, $frh, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,fcmpges) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_add.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = ZEXTBIDI (sh64_fcmpges (current_cpu, CPU (h_fr[FLD (f_left)]), CPU (h_fr[FLD (f_right)])));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* fcmpgtd: fcmpgt.d $drg, $drh, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,fcmpgtd) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_add.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = ZEXTBIDI (sh64_fcmpgtd (current_cpu, GET_H_DR (FLD (f_left)), GET_H_DR (FLD (f_right))));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* fcmpgts: fcmpgt.s $frg, $frh, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,fcmpgts) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_add.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = ZEXTBIDI (sh64_fcmpgts (current_cpu, CPU (h_fr[FLD (f_left)]), CPU (h_fr[FLD (f_right)])));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* fcmpund: fcmpun.d $drg, $drh, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,fcmpund) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_add.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = ZEXTBIDI (sh64_fcmpund (current_cpu, GET_H_DR (FLD (f_left)), GET_H_DR (FLD (f_right))));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* fcmpuns: fcmpun.s $frg, $frh, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,fcmpuns) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_add.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = ZEXTBIDI (sh64_fcmpuns (current_cpu, CPU (h_fr[FLD (f_left)]), CPU (h_fr[FLD (f_right)])));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* fcnvds: fcnv.ds $drgh, $frf */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,fcnvds) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_fabsd.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    SF opval = sh64_fcnvds (current_cpu, GET_H_DR (FLD (f_left_right)));
-    CPU (h_fr[FLD (f_dest)]) = opval;
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* fcnvsd: fcnv.sd $frgh, $drf */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,fcnvsd) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_fabsd.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DF opval = sh64_fcnvsd (current_cpu, CPU (h_fr[FLD (f_left_right)]));
-    SET_H_DR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "dr", 'f', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* fdivd: fdiv.d $drg, $drh, $drf */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,fdivd) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_add.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DF opval = sh64_fdivd (current_cpu, GET_H_DR (FLD (f_left)), GET_H_DR (FLD (f_right)));
-    SET_H_DR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "dr", 'f', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* fdivs: fdiv.s $frg, $frh, $frf */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,fdivs) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_add.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    SF opval = sh64_fdivs (current_cpu, CPU (h_fr[FLD (f_left)]), CPU (h_fr[FLD (f_right)]));
-    CPU (h_fr[FLD (f_dest)]) = opval;
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* fgetscr: fgetscr $frf */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,fgetscr) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.fmt_empty.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-((void) 0); /*nop*/
-
-  return vpc;
-#undef FLD
-}
-
-/* fiprs: fipr.s $fvg, $fvh, $frf */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,fiprs) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_add.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  UQI tmp_g;
-  UQI tmp_h;
-  SF tmp_temp;
-  tmp_g = FLD (f_left);
-  tmp_h = FLD (f_right);
-  tmp_temp = sh64_fmuls (current_cpu, CPU (h_fr[tmp_g]), CPU (h_fr[tmp_h]));
-  tmp_temp = sh64_fadds (current_cpu, tmp_temp, sh64_fmuls (current_cpu, CPU (h_fr[ADDQI (tmp_g, 1)]), CPU (h_fr[ADDQI (tmp_h, 1)])));
-  tmp_temp = sh64_fadds (current_cpu, tmp_temp, sh64_fmuls (current_cpu, CPU (h_fr[ADDQI (tmp_g, 2)]), CPU (h_fr[ADDQI (tmp_h, 2)])));
-  tmp_temp = sh64_fadds (current_cpu, tmp_temp, sh64_fmuls (current_cpu, CPU (h_fr[ADDQI (tmp_g, 3)]), CPU (h_fr[ADDQI (tmp_h, 3)])));
-  {
-    SF opval = tmp_temp;
-    CPU (h_fr[FLD (f_dest)]) = opval;
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
-  }
-}
-
-  return vpc;
-#undef FLD
-}
-
-/* fldd: fld.d $rm, $disp10x8, $drf */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,fldd) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_fldd.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DF opval = GETMEMDF (current_cpu, pc, ADDDI (GET_H_GR (FLD (f_left)), FLD (f_disp10x8)));
-    SET_H_DR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "dr", 'f', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* fldp: fld.p $rm, $disp10x8, $fpf */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,fldp) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_fldd.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  QI tmp_f;
-  tmp_f = FLD (f_dest);
-  {
-    SF opval = GETMEMSF (current_cpu, pc, ADDDI (GET_H_GR (FLD (f_left)), FLD (f_disp10x8)));
-    CPU (h_fr[tmp_f]) = opval;
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
-  }
-  {
-    SF opval = GETMEMSF (current_cpu, pc, ADDDI (GET_H_GR (FLD (f_left)), ADDSI (FLD (f_disp10x8), 4)));
-    CPU (h_fr[ADDQI (tmp_f, 1)]) = opval;
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
-  }
-}
-
-  return vpc;
-#undef FLD
-}
-
-/* flds: fld.s $rm, $disp10x4, $frf */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,flds) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_flds.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    SF opval = GETMEMSF (current_cpu, pc, ADDDI (GET_H_GR (FLD (f_left)), FLD (f_disp10x4)));
-    CPU (h_fr[FLD (f_dest)]) = opval;
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* fldxd: fldx.d $rm, $rn, $drf */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,fldxd) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_add.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DF opval = GETMEMDF (current_cpu, pc, ADDDI (GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right))));
-    SET_H_DR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "dr", 'f', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* fldxp: fldx.p $rm, $rn, $fpf */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,fldxp) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_add.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  QI tmp_f;
-  tmp_f = FLD (f_dest);
-  {
-    SF opval = GETMEMSF (current_cpu, pc, ADDDI (GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right))));
-    CPU (h_fr[tmp_f]) = opval;
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
-  }
-  {
-    SF opval = GETMEMSF (current_cpu, pc, ADDDI (GET_H_GR (FLD (f_left)), ADDDI (GET_H_GR (FLD (f_right)), 4)));
-    CPU (h_fr[ADDQI (tmp_f, 1)]) = opval;
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
-  }
-}
-
-  return vpc;
-#undef FLD
-}
-
-/* fldxs: fldx.s $rm, $rn, $frf */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,fldxs) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_add.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    SF opval = GETMEMSF (current_cpu, pc, ADDDI (GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right))));
-    CPU (h_fr[FLD (f_dest)]) = opval;
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* floatld: float.ld $frgh, $drf */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,floatld) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_fabsd.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DF opval = sh64_floatld (current_cpu, CPU (h_fr[FLD (f_left_right)]));
-    SET_H_DR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "dr", 'f', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* floatls: float.ls $frgh, $frf */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,floatls) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_fabsd.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    SF opval = sh64_floatls (current_cpu, CPU (h_fr[FLD (f_left_right)]));
-    CPU (h_fr[FLD (f_dest)]) = opval;
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* floatqd: float.qd $drgh, $drf */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,floatqd) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_fabsd.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DF opval = sh64_floatqd (current_cpu, GET_H_DR (FLD (f_left_right)));
-    SET_H_DR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "dr", 'f', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* floatqs: float.qs $drgh, $frf */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,floatqs) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_fabsd.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    SF opval = sh64_floatqs (current_cpu, GET_H_DR (FLD (f_left_right)));
-    CPU (h_fr[FLD (f_dest)]) = opval;
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* fmacs: fmac.s $frg, $frh, $frf */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,fmacs) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_add.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    SF opval = sh64_fadds (current_cpu, CPU (h_fr[FLD (f_dest)]), sh64_fmuls (current_cpu, CPU (h_fr[FLD (f_left)]), CPU (h_fr[FLD (f_right)])));
-    CPU (h_fr[FLD (f_dest)]) = opval;
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* fmovd: fmov.d $drgh, $drf */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,fmovd) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_fabsd.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DF opval = GET_H_DR (FLD (f_left_right));
-    SET_H_DR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "dr", 'f', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* fmovdq: fmov.dq $drgh, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,fmovdq) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_fabsd.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = SUBWORDDFDI (GET_H_DR (FLD (f_left_right)));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* fmovls: fmov.ls $rm, $frf */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,fmovls) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_xori.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    SF opval = SUBWORDSISF (SUBWORDDISI (GET_H_GR (FLD (f_left)), 1));
-    CPU (h_fr[FLD (f_dest)]) = opval;
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* fmovqd: fmov.qd $rm, $drf */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,fmovqd) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_xori.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DF opval = SUBWORDDIDF (GET_H_GR (FLD (f_left)));
-    SET_H_DR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "dr", 'f', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* fmovs: fmov.s $frgh, $frf */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,fmovs) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_fabsd.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    SF opval = CPU (h_fr[FLD (f_left_right)]);
-    CPU (h_fr[FLD (f_dest)]) = opval;
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* fmovsl: fmov.sl $frgh, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,fmovsl) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_fabsd.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = EXTSIDI (SUBWORDSFSI (CPU (h_fr[FLD (f_left_right)])));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* fmuld: fmul.d $drg, $drh, $drf */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,fmuld) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_add.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DF opval = sh64_fmuld (current_cpu, GET_H_DR (FLD (f_left)), GET_H_DR (FLD (f_right)));
-    SET_H_DR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "dr", 'f', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* fmuls: fmul.s $frg, $frh, $frf */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,fmuls) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_add.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    SF opval = sh64_fmuls (current_cpu, CPU (h_fr[FLD (f_left)]), CPU (h_fr[FLD (f_right)]));
-    CPU (h_fr[FLD (f_dest)]) = opval;
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* fnegd: fneg.d $drgh, $drf */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,fnegd) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_fabsd.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DF opval = sh64_fnegd (current_cpu, GET_H_DR (FLD (f_left_right)));
-    SET_H_DR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "dr", 'f', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* fnegs: fneg.s $frgh, $frf */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,fnegs) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_fabsd.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    SF opval = sh64_fnegs (current_cpu, CPU (h_fr[FLD (f_left_right)]));
-    CPU (h_fr[FLD (f_dest)]) = opval;
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* fputscr: fputscr $frgh */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,fputscr) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.fmt_empty.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-((void) 0); /*nop*/
-
-  return vpc;
-#undef FLD
-}
-
-/* fsqrtd: fsqrt.d $drgh, $drf */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,fsqrtd) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_fabsd.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DF opval = sh64_fsqrtd (current_cpu, GET_H_DR (FLD (f_left_right)));
-    SET_H_DR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "dr", 'f', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* fsqrts: fsqrt.s $frgh, $frf */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,fsqrts) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_fabsd.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    SF opval = sh64_fsqrts (current_cpu, CPU (h_fr[FLD (f_left_right)]));
-    CPU (h_fr[FLD (f_dest)]) = opval;
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* fstd: fst.d $rm, $disp10x8, $drf */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,fstd) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_fldd.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DF opval = GET_H_DR (FLD (f_dest));
-    SETMEMDF (current_cpu, pc, ADDDI (GET_H_GR (FLD (f_left)), FLD (f_disp10x8)), opval);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'f', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* fstp: fst.p $rm, $disp10x8, $fpf */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,fstp) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_fldd.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  QI tmp_f;
-  tmp_f = FLD (f_dest);
-  {
-    SF opval = CPU (h_fr[tmp_f]);
-    SETMEMSF (current_cpu, pc, ADDDI (GET_H_GR (FLD (f_left)), FLD (f_disp10x8)), opval);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'f', opval);
-  }
-  {
-    SF opval = CPU (h_fr[ADDQI (tmp_f, 1)]);
-    SETMEMSF (current_cpu, pc, ADDDI (GET_H_GR (FLD (f_left)), ADDSI (FLD (f_disp10x8), 4)), opval);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'f', opval);
-  }
-}
-
-  return vpc;
-#undef FLD
-}
-
-/* fsts: fst.s $rm, $disp10x4, $frf */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,fsts) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_flds.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    SF opval = CPU (h_fr[FLD (f_dest)]);
-    SETMEMSF (current_cpu, pc, ADDDI (GET_H_GR (FLD (f_left)), FLD (f_disp10x4)), opval);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'f', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* fstxd: fstx.d $rm, $rn, $drf */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,fstxd) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_add.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DF opval = GET_H_DR (FLD (f_dest));
-    SETMEMDF (current_cpu, pc, ADDDI (GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right))), opval);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'f', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* fstxp: fstx.p $rm, $rn, $fpf */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,fstxp) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_add.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  QI tmp_f;
-  tmp_f = FLD (f_dest);
-  {
-    SF opval = CPU (h_fr[tmp_f]);
-    SETMEMSF (current_cpu, pc, ADDDI (GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right))), opval);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'f', opval);
-  }
-  {
-    SF opval = CPU (h_fr[ADDQI (tmp_f, 1)]);
-    SETMEMSF (current_cpu, pc, ADDDI (GET_H_GR (FLD (f_left)), ADDDI (GET_H_GR (FLD (f_right)), 4)), opval);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'f', opval);
-  }
-}
-
-  return vpc;
-#undef FLD
-}
-
-/* fstxs: fstx.s $rm, $rn, $frf */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,fstxs) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_add.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    SF opval = CPU (h_fr[FLD (f_dest)]);
-    SETMEMSF (current_cpu, pc, ADDDI (GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right))), opval);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'f', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* fsubd: fsub.d $drg, $drh, $drf */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,fsubd) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_add.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DF opval = sh64_fsubd (current_cpu, GET_H_DR (FLD (f_left)), GET_H_DR (FLD (f_right)));
-    SET_H_DR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "dr", 'f', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* fsubs: fsub.s $frg, $frh, $frf */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,fsubs) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_add.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    SF opval = sh64_fsubs (current_cpu, CPU (h_fr[FLD (f_left)]), CPU (h_fr[FLD (f_right)]));
-    CPU (h_fr[FLD (f_dest)]) = opval;
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* ftrcdl: ftrc.dl $drgh, $frf */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,ftrcdl) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_fabsd.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    SF opval = sh64_ftrcdl (current_cpu, GET_H_DR (FLD (f_left_right)));
-    CPU (h_fr[FLD (f_dest)]) = opval;
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* ftrcsl: ftrc.sl $frgh, $frf */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,ftrcsl) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_fabsd.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    SF opval = sh64_ftrcsl (current_cpu, CPU (h_fr[FLD (f_left_right)]));
-    CPU (h_fr[FLD (f_dest)]) = opval;
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* ftrcdq: ftrc.dq $drgh, $drf */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,ftrcdq) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_fabsd.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DF opval = sh64_ftrcdq (current_cpu, GET_H_DR (FLD (f_left_right)));
-    SET_H_DR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "dr", 'f', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* ftrcsq: ftrc.sq $frgh, $drf */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,ftrcsq) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_fabsd.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DF opval = sh64_ftrcsq (current_cpu, CPU (h_fr[FLD (f_left_right)]));
-    SET_H_DR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "dr", 'f', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* ftrvs: ftrv.s $mtrxg, $fvh, $fvf */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,ftrvs) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_add.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-sh64_ftrvs (current_cpu, FLD (f_left), FLD (f_right), FLD (f_dest));
-
-  return vpc;
-#undef FLD
-}
-
-/* getcfg: getcfg $rm, $disp6, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,getcfg) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.fmt_empty.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-((void) 0); /*nop*/
-
-  return vpc;
-#undef FLD
-}
-
-/* getcon: getcon $crk, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,getcon) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_xori.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = GET_H_CR (FLD (f_left));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* gettr: gettr $trb, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,gettr) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_blink.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = CPU (h_tr[FLD (f_trb)]);
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* icbi: icbi $rm, $disp6x32 */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,icbi) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.fmt_empty.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-((void) 0); /*nop*/
-
-  return vpc;
-#undef FLD
-}
-
-/* ldb: ld.b $rm, $disp10, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,ldb) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_addi.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = EXTQIDI (GETMEMQI (current_cpu, pc, ADDDI (GET_H_GR (FLD (f_left)), EXTSIDI (FLD (f_disp10)))));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* ldl: ld.l $rm, $disp10x4, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,ldl) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_flds.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = EXTSIDI (GETMEMSI (current_cpu, pc, ADDDI (GET_H_GR (FLD (f_left)), EXTSIDI (FLD (f_disp10x4)))));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* ldq: ld.q $rm, $disp10x8, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,ldq) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_fldd.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = GETMEMDI (current_cpu, pc, ADDDI (GET_H_GR (FLD (f_left)), EXTSIDI (FLD (f_disp10x8))));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* ldub: ld.ub $rm, $disp10, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,ldub) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_addi.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = ZEXTQIDI (GETMEMQI (current_cpu, pc, ADDDI (GET_H_GR (FLD (f_left)), EXTSIDI (FLD (f_disp10)))));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* lduw: ld.uw $rm, $disp10x2, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,lduw) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_lduw.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = ZEXTHIDI (GETMEMHI (current_cpu, pc, ADDDI (GET_H_GR (FLD (f_left)), EXTSIDI (FLD (f_disp10x2)))));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* ldw: ld.w $rm, $disp10x2, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,ldw) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_lduw.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = EXTHIDI (GETMEMHI (current_cpu, pc, ADDDI (GET_H_GR (FLD (f_left)), EXTSIDI (FLD (f_disp10x2)))));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* ldhil: ldhi.l $rm, $disp6, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,ldhil) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_ldhil.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  DI tmp_addr;
-  QI tmp_bytecount;
-  SI tmp_val;
-  tmp_addr = ADDDI (GET_H_GR (FLD (f_left)), FLD (f_disp6));
-  tmp_bytecount = ADDDI (ANDDI (tmp_addr, 3), 1);
-  tmp_val = 0;
-if (ANDQI (tmp_bytecount, 4)) {
-  {
-    DI opval = EXTSIDI (GETMEMSI (current_cpu, pc, ANDDI (tmp_addr, -4)));
-    SET_H_GR (FLD (f_dest), opval);
-    written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-} else {
-if (GET_H_ENDIAN ()) {
-{
-if (ANDQI (tmp_bytecount, 2)) {
-  tmp_val = ADDSI (SLLSI (tmp_val, 16), ZEXTHIDI (GETMEMHI (current_cpu, pc, ANDDI (tmp_addr, -4))));
-}
-if (ANDQI (tmp_bytecount, 1)) {
-  tmp_val = ADDSI (SLLSI (tmp_val, 8), ZEXTQIDI (GETMEMQI (current_cpu, pc, tmp_addr)));
-}
-  {
-    DI opval = EXTSIDI (tmp_val);
-    SET_H_GR (FLD (f_dest), opval);
-    written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-} else {
-{
-if (ANDQI (tmp_bytecount, 1)) {
-  tmp_val = ADDSI (SLLSI (tmp_val, 8), ZEXTQIDI (GETMEMQI (current_cpu, pc, tmp_addr)));
-}
-if (ANDQI (tmp_bytecount, 2)) {
-  tmp_val = ADDSI (SLLSI (tmp_val, 16), ZEXTHIDI (GETMEMHI (current_cpu, pc, ANDDI (tmp_addr, -4))));
-}
-  {
-    DI opval = EXTSIDI (SLLSI (tmp_val, SUBSI (32, MULSI (8, tmp_bytecount))));
-    SET_H_GR (FLD (f_dest), opval);
-    written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-}
-}
-}
-
-  abuf->written = written;
-  return vpc;
-#undef FLD
-}
-
-/* ldhiq: ldhi.q $rm, $disp6, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,ldhiq) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_ldhil.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  DI tmp_addr;
-  QI tmp_bytecount;
-  DI tmp_val;
-  tmp_addr = ADDDI (GET_H_GR (FLD (f_left)), FLD (f_disp6));
-  tmp_bytecount = ADDDI (ANDDI (tmp_addr, 7), 1);
-  tmp_val = 0;
-if (ANDQI (tmp_bytecount, 8)) {
-  {
-    DI opval = GETMEMDI (current_cpu, pc, ANDDI (tmp_addr, -8));
-    SET_H_GR (FLD (f_dest), opval);
-    written |= (1 << 7);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-} else {
-if (GET_H_ENDIAN ()) {
-{
-if (ANDQI (tmp_bytecount, 4)) {
-  tmp_val = ADDDI (SLLDI (tmp_val, 32), ZEXTSIDI (GETMEMSI (current_cpu, pc, ANDDI (tmp_addr, -8))));
-}
-if (ANDQI (tmp_bytecount, 2)) {
-  tmp_val = ADDDI (SLLDI (tmp_val, 16), ZEXTHIDI (GETMEMHI (current_cpu, pc, ANDDI (tmp_addr, -4))));
-}
-if (ANDQI (tmp_bytecount, 1)) {
-  tmp_val = ADDDI (SLLDI (tmp_val, 8), ZEXTQIDI (GETMEMQI (current_cpu, pc, tmp_addr)));
-}
-  {
-    DI opval = tmp_val;
-    SET_H_GR (FLD (f_dest), opval);
-    written |= (1 << 7);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-} else {
-{
-if (ANDQI (tmp_bytecount, 1)) {
-  tmp_val = ADDDI (SLLDI (tmp_val, 8), ZEXTQIDI (GETMEMQI (current_cpu, pc, tmp_addr)));
-}
-if (ANDQI (tmp_bytecount, 2)) {
-  tmp_val = ADDDI (SLLDI (tmp_val, 16), ZEXTHIDI (GETMEMHI (current_cpu, pc, ANDDI (tmp_addr, -4))));
-}
-if (ANDQI (tmp_bytecount, 4)) {
-  tmp_val = ADDDI (SLLDI (tmp_val, 32), ZEXTSIDI (GETMEMSI (current_cpu, pc, ANDDI (tmp_addr, -8))));
-}
-  {
-    DI opval = SLLDI (tmp_val, SUBSI (64, MULSI (8, tmp_bytecount)));
-    SET_H_GR (FLD (f_dest), opval);
-    written |= (1 << 7);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-}
-}
-}
-
-  abuf->written = written;
-  return vpc;
-#undef FLD
-}
-
-/* ldlol: ldlo.l $rm, $disp6, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,ldlol) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_ldhil.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  DI tmp_addr;
-  QI tmp_bytecount;
-  SI tmp_val;
-  tmp_addr = ADDDI (GET_H_GR (FLD (f_left)), FLD (f_disp6));
-  tmp_bytecount = SUBSI (4, ANDDI (tmp_addr, 3));
-  tmp_val = 0;
-if (ANDQI (tmp_bytecount, 4)) {
-  {
-    DI opval = EXTSIDI (GETMEMSI (current_cpu, pc, tmp_addr));
-    SET_H_GR (FLD (f_dest), opval);
-    written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-} else {
-if (GET_H_ENDIAN ()) {
-{
-if (ANDQI (tmp_bytecount, 1)) {
-  tmp_val = ADDSI (SLLSI (tmp_val, 8), ZEXTQIDI (GETMEMQI (current_cpu, pc, tmp_addr)));
-}
-if (ANDQI (tmp_bytecount, 2)) {
-  tmp_val = ADDSI (SLLSI (tmp_val, 16), ZEXTHIDI (GETMEMHI (current_cpu, pc, ANDDI (ADDDI (tmp_addr, 1), -2))));
-}
-  {
-    DI opval = EXTSIDI (SLLSI (tmp_val, SUBSI (32, MULSI (8, tmp_bytecount))));
-    SET_H_GR (FLD (f_dest), opval);
-    written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-} else {
-{
-if (ANDQI (tmp_bytecount, 2)) {
-  tmp_val = ADDSI (SLLSI (tmp_val, 16), ZEXTHIDI (GETMEMHI (current_cpu, pc, ANDDI (ADDDI (tmp_addr, 1), -2))));
-}
-if (ANDQI (tmp_bytecount, 1)) {
-  tmp_val = ADDSI (SLLSI (tmp_val, 8), ZEXTQIDI (GETMEMQI (current_cpu, pc, tmp_addr)));
-}
-  {
-    DI opval = EXTSIDI (tmp_val);
-    SET_H_GR (FLD (f_dest), opval);
-    written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-}
-}
-}
-
-  abuf->written = written;
-  return vpc;
-#undef FLD
-}
-
-/* ldloq: ldlo.q $rm, $disp6, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,ldloq) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_ldhil.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  DI tmp_addr;
-  QI tmp_bytecount;
-  DI tmp_val;
-  tmp_addr = ADDDI (GET_H_GR (FLD (f_left)), FLD (f_disp6));
-  tmp_bytecount = SUBSI (8, ANDDI (tmp_addr, 7));
-  tmp_val = 0;
-if (ANDQI (tmp_bytecount, 8)) {
-  {
-    DI opval = GETMEMDI (current_cpu, pc, tmp_addr);
-    SET_H_GR (FLD (f_dest), opval);
-    written |= (1 << 7);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-} else {
-if (GET_H_ENDIAN ()) {
-{
-if (ANDQI (tmp_bytecount, 1)) {
-  tmp_val = ADDDI (SLLDI (tmp_val, 8), ZEXTQIDI (GETMEMQI (current_cpu, pc, tmp_addr)));
-}
-if (ANDQI (tmp_bytecount, 2)) {
-  tmp_val = ADDDI (SLLDI (tmp_val, 16), ZEXTHIDI (GETMEMHI (current_cpu, pc, ANDDI (ADDDI (tmp_addr, 1), -2))));
-}
-if (ANDQI (tmp_bytecount, 4)) {
-  tmp_val = ADDDI (SLLDI (tmp_val, 32), ZEXTSIDI (GETMEMSI (current_cpu, pc, ANDDI (ADDDI (tmp_addr, 3), -4))));
-}
-  {
-    DI opval = SLLDI (tmp_val, SUBSI (64, MULSI (8, tmp_bytecount)));
-    SET_H_GR (FLD (f_dest), opval);
-    written |= (1 << 7);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-} else {
-{
-if (ANDQI (tmp_bytecount, 4)) {
-  tmp_val = ADDDI (SLLDI (tmp_val, 32), ZEXTSIDI (GETMEMSI (current_cpu, pc, ANDDI (ADDDI (tmp_addr, 3), -4))));
-}
-if (ANDQI (tmp_bytecount, 2)) {
-  tmp_val = ADDDI (SLLDI (tmp_val, 16), ZEXTHIDI (GETMEMHI (current_cpu, pc, ANDDI (ADDDI (tmp_addr, 1), -2))));
-}
-if (ANDQI (tmp_bytecount, 1)) {
-  tmp_val = ADDDI (SLLDI (tmp_val, 8), ZEXTQIDI (GETMEMQI (current_cpu, pc, tmp_addr)));
-}
-  {
-    DI opval = tmp_val;
-    SET_H_GR (FLD (f_dest), opval);
-    written |= (1 << 7);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-}
-}
-}
-
-  abuf->written = written;
-  return vpc;
-#undef FLD
-}
-
-/* ldxb: ldx.b $rm, $rn, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,ldxb) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_add.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = EXTQIDI (GETMEMQI (current_cpu, pc, ADDDI (GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right)))));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* ldxl: ldx.l $rm, $rn, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,ldxl) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_add.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = EXTSIDI (GETMEMSI (current_cpu, pc, ADDDI (GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right)))));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* ldxq: ldx.q $rm, $rn, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,ldxq) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_add.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = GETMEMDI (current_cpu, pc, ADDDI (GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right))));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* ldxub: ldx.ub $rm, $rn, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,ldxub) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_add.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = ZEXTQIDI (GETMEMUQI (current_cpu, pc, ADDDI (GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right)))));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* ldxuw: ldx.uw $rm, $rn, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,ldxuw) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_add.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = ZEXTHIDI (GETMEMUHI (current_cpu, pc, ADDDI (GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right)))));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* ldxw: ldx.w $rm, $rn, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,ldxw) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_add.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = EXTHIDI (GETMEMHI (current_cpu, pc, ADDDI (GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right)))));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* mabsl: mabs.l $rm, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,mabsl) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_xori.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  SI tmp_result1;
-  SI tmp_result0;
-  tmp_result0 = ABSSI (SUBWORDDISI (GET_H_GR (FLD (f_left)), 1));
-  tmp_result1 = ABSSI (SUBWORDDISI (GET_H_GR (FLD (f_left)), 0));
-  {
-    DI opval = ORDI (SLLDI (ZEXTSIDI (tmp_result1), 32), ZEXTSIDI (tmp_result0));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-
-  return vpc;
-#undef FLD
-}
-
-/* mabsw: mabs.w $rm, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,mabsw) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_xori.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  HI tmp_result3;
-  HI tmp_result2;
-  HI tmp_result1;
-  HI tmp_result0;
-  tmp_result0 = ABSHI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 3));
-  tmp_result1 = ABSHI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 2));
-  tmp_result2 = ABSHI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 1));
-  tmp_result3 = ABSHI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 0));
-  {
-    DI opval = ORDI (SLLDI (ZEXTHIDI (tmp_result3), 48), ORDI (SLLDI (ZEXTHIDI (tmp_result2), 32), ORDI (SLLDI (ZEXTHIDI (tmp_result1), 16), ZEXTHIDI (tmp_result0))));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-
-  return vpc;
-#undef FLD
-}
-
-/* maddl: madd.l $rm, $rn, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,maddl) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_add.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  SI tmp_result1;
-  SI tmp_result0;
-  tmp_result0 = ADDSI (SUBWORDDISI (GET_H_GR (FLD (f_left)), 1), SUBWORDDISI (GET_H_GR (FLD (f_right)), 1));
-  tmp_result1 = ADDSI (SUBWORDDISI (GET_H_GR (FLD (f_left)), 0), SUBWORDDISI (GET_H_GR (FLD (f_right)), 0));
-  {
-    DI opval = ORDI (SLLDI (ZEXTSIDI (tmp_result1), 32), ZEXTSIDI (tmp_result0));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-
-  return vpc;
-#undef FLD
-}
-
-/* maddw: madd.w $rm, $rn, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,maddw) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_add.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  HI tmp_result3;
-  HI tmp_result2;
-  HI tmp_result1;
-  HI tmp_result0;
-  tmp_result0 = ADDHI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 3), SUBWORDDIHI (GET_H_GR (FLD (f_right)), 3));
-  tmp_result1 = ADDHI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 2), SUBWORDDIHI (GET_H_GR (FLD (f_right)), 2));
-  tmp_result2 = ADDHI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 1), SUBWORDDIHI (GET_H_GR (FLD (f_right)), 1));
-  tmp_result3 = ADDHI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 0), SUBWORDDIHI (GET_H_GR (FLD (f_right)), 0));
-  {
-    DI opval = ORDI (SLLDI (ZEXTHIDI (tmp_result3), 48), ORDI (SLLDI (ZEXTHIDI (tmp_result2), 32), ORDI (SLLDI (ZEXTHIDI (tmp_result1), 16), ZEXTHIDI (tmp_result0))));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-
-  return vpc;
-#undef FLD
-}
-
-/* maddsl: madds.l $rm, $rn, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,maddsl) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_add.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  SI tmp_result1;
-  SI tmp_result0;
-  tmp_result0 = ((LTDI (ADDDI (EXTSIDI (SUBWORDDISI (GET_H_GR (FLD (f_left)), 1)), EXTSIDI (SUBWORDDISI (GET_H_GR (FLD (f_right)), 1))), NEGDI (SLLDI (1, SUBSI (32, 1))))) ? (NEGSI (SLLSI (1, SUBSI (32, 1)))) : (((LTDI (ADDDI (EXTSIDI (SUBWORDDISI (GET_H_GR (FLD (f_left)), 1)), EXTSIDI (SUBWORDDISI (GET_H_GR (FLD (f_right)), 1))), SLLDI (1, SUBSI (32, 1)))) ? (ADDDI (EXTSIDI (SUBWORDDISI (GET_H_GR (FLD (f_left)), 1)), EXTSIDI (SUBWORDDISI (GET_H_GR (FLD (f_right)), 1)))) : (SUBSI (SLLSI (1, SUBSI (32, 1)), 1)))));
-  tmp_result1 = ((LTDI (ADDDI (EXTSIDI (SUBWORDDISI (GET_H_GR (FLD (f_left)), 0)), EXTSIDI (SUBWORDDISI (GET_H_GR (FLD (f_right)), 0))), NEGDI (SLLDI (1, SUBSI (32, 1))))) ? (NEGSI (SLLSI (1, SUBSI (32, 1)))) : (((LTDI (ADDDI (EXTSIDI (SUBWORDDISI (GET_H_GR (FLD (f_left)), 0)), EXTSIDI (SUBWORDDISI (GET_H_GR (FLD (f_right)), 0))), SLLDI (1, SUBSI (32, 1)))) ? (ADDDI (EXTSIDI (SUBWORDDISI (GET_H_GR (FLD (f_left)), 0)), EXTSIDI (SUBWORDDISI (GET_H_GR (FLD (f_right)), 0)))) : (SUBSI (SLLSI (1, SUBSI (32, 1)), 1)))));
-  {
-    DI opval = ORDI (SLLDI (ZEXTSIDI (tmp_result1), 32), ZEXTSIDI (tmp_result0));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-
-  return vpc;
-#undef FLD
-}
-
-/* maddsub: madds.ub $rm, $rn, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,maddsub) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_add.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  QI tmp_result7;
-  QI tmp_result6;
-  QI tmp_result5;
-  QI tmp_result4;
-  QI tmp_result3;
-  QI tmp_result2;
-  QI tmp_result1;
-  QI tmp_result0;
-  tmp_result0 = ((LTDI (ADDDI (ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 7)), ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 7))), MAKEDI (0, 0))) ? (0) : (((LTDI (ADDDI (ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 7)), ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 7))), SLLDI (1, 8))) ? (ADDDI (ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 7)), ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 7)))) : (SUBQI (SLLQI (1, 8), 1)))));
-  tmp_result1 = ((LTDI (ADDDI (ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 6)), ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 6))), MAKEDI (0, 0))) ? (0) : (((LTDI (ADDDI (ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 6)), ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 6))), SLLDI (1, 8))) ? (ADDDI (ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 6)), ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 6)))) : (SUBQI (SLLQI (1, 8), 1)))));
-  tmp_result2 = ((LTDI (ADDDI (ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 5)), ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 5))), MAKEDI (0, 0))) ? (0) : (((LTDI (ADDDI (ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 5)), ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 5))), SLLDI (1, 8))) ? (ADDDI (ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 5)), ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 5)))) : (SUBQI (SLLQI (1, 8), 1)))));
-  tmp_result3 = ((LTDI (ADDDI (ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 4)), ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 4))), MAKEDI (0, 0))) ? (0) : (((LTDI (ADDDI (ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 4)), ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 4))), SLLDI (1, 8))) ? (ADDDI (ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 4)), ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 4)))) : (SUBQI (SLLQI (1, 8), 1)))));
-  tmp_result4 = ((LTDI (ADDDI (ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 3)), ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 3))), MAKEDI (0, 0))) ? (0) : (((LTDI (ADDDI (ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 3)), ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 3))), SLLDI (1, 8))) ? (ADDDI (ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 3)), ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 3)))) : (SUBQI (SLLQI (1, 8), 1)))));
-  tmp_result5 = ((LTDI (ADDDI (ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 2)), ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 2))), MAKEDI (0, 0))) ? (0) : (((LTDI (ADDDI (ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 2)), ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 2))), SLLDI (1, 8))) ? (ADDDI (ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 2)), ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 2)))) : (SUBQI (SLLQI (1, 8), 1)))));
-  tmp_result6 = ((LTDI (ADDDI (ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 1)), ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 1))), MAKEDI (0, 0))) ? (0) : (((LTDI (ADDDI (ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 1)), ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 1))), SLLDI (1, 8))) ? (ADDDI (ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 1)), ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 1)))) : (SUBQI (SLLQI (1, 8), 1)))));
-  tmp_result7 = ((LTDI (ADDDI (ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 0)), ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 0))), MAKEDI (0, 0))) ? (0) : (((LTDI (ADDDI (ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 0)), ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 0))), SLLDI (1, 8))) ? (ADDDI (ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 0)), ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 0)))) : (SUBQI (SLLQI (1, 8), 1)))));
-  {
-    DI opval = ORDI (SLLDI (ZEXTQIDI (tmp_result7), 56), ORDI (SLLDI (ZEXTQIDI (tmp_result6), 48), ORDI (SLLDI (ZEXTQIDI (tmp_result5), 40), ORDI (SLLDI (ZEXTQIDI (tmp_result4), 32), ORDI (SLLDI (ZEXTQIDI (tmp_result3), 24), ORDI (SLLDI (ZEXTQIDI (tmp_result2), 16), ORDI (SLLDI (ZEXTQIDI (tmp_result1), 8), ZEXTQIDI (tmp_result0))))))));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-
-  return vpc;
-#undef FLD
-}
-
-/* maddsw: madds.w $rm, $rn, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,maddsw) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_add.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  HI tmp_result3;
-  HI tmp_result2;
-  HI tmp_result1;
-  HI tmp_result0;
-  tmp_result0 = ((LTDI (ADDDI (EXTHIDI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 3)), EXTHIDI (SUBWORDDIHI (GET_H_GR (FLD (f_right)), 3))), NEGDI (SLLDI (1, SUBSI (16, 1))))) ? (NEGHI (SLLHI (1, SUBSI (16, 1)))) : (((LTDI (ADDDI (EXTHIDI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 3)), EXTHIDI (SUBWORDDIHI (GET_H_GR (FLD (f_right)), 3))), SLLDI (1, SUBSI (16, 1)))) ? (ADDDI (EXTHIDI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 3)), EXTHIDI (SUBWORDDIHI (GET_H_GR (FLD (f_right)), 3)))) : (SUBHI (SLLHI (1, SUBSI (16, 1)), 1)))));
-  tmp_result1 = ((LTDI (ADDDI (EXTHIDI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 2)), EXTHIDI (SUBWORDDIHI (GET_H_GR (FLD (f_right)), 2))), NEGDI (SLLDI (1, SUBSI (16, 1))))) ? (NEGHI (SLLHI (1, SUBSI (16, 1)))) : (((LTDI (ADDDI (EXTHIDI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 2)), EXTHIDI (SUBWORDDIHI (GET_H_GR (FLD (f_right)), 2))), SLLDI (1, SUBSI (16, 1)))) ? (ADDDI (EXTHIDI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 2)), EXTHIDI (SUBWORDDIHI (GET_H_GR (FLD (f_right)), 2)))) : (SUBHI (SLLHI (1, SUBSI (16, 1)), 1)))));
-  tmp_result2 = ((LTDI (ADDDI (EXTHIDI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 1)), EXTHIDI (SUBWORDDIHI (GET_H_GR (FLD (f_right)), 1))), NEGDI (SLLDI (1, SUBSI (16, 1))))) ? (NEGHI (SLLHI (1, SUBSI (16, 1)))) : (((LTDI (ADDDI (EXTHIDI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 1)), EXTHIDI (SUBWORDDIHI (GET_H_GR (FLD (f_right)), 1))), SLLDI (1, SUBSI (16, 1)))) ? (ADDDI (EXTHIDI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 1)), EXTHIDI (SUBWORDDIHI (GET_H_GR (FLD (f_right)), 1)))) : (SUBHI (SLLHI (1, SUBSI (16, 1)), 1)))));
-  tmp_result3 = ((LTDI (ADDDI (EXTHIDI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 0)), EXTHIDI (SUBWORDDIHI (GET_H_GR (FLD (f_right)), 0))), NEGDI (SLLDI (1, SUBSI (16, 1))))) ? (NEGHI (SLLHI (1, SUBSI (16, 1)))) : (((LTDI (ADDDI (EXTHIDI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 0)), EXTHIDI (SUBWORDDIHI (GET_H_GR (FLD (f_right)), 0))), SLLDI (1, SUBSI (16, 1)))) ? (ADDDI (EXTHIDI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 0)), EXTHIDI (SUBWORDDIHI (GET_H_GR (FLD (f_right)), 0)))) : (SUBHI (SLLHI (1, SUBSI (16, 1)), 1)))));
-  {
-    DI opval = ORDI (SLLDI (ZEXTHIDI (tmp_result3), 48), ORDI (SLLDI (ZEXTHIDI (tmp_result2), 32), ORDI (SLLDI (ZEXTHIDI (tmp_result1), 16), ZEXTHIDI (tmp_result0))));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-
-  return vpc;
-#undef FLD
-}
-
-/* mcmpeqb: mcmpeq.b $rm, $rn, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,mcmpeqb) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_add.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  QI tmp_result7;
-  QI tmp_result6;
-  QI tmp_result5;
-  QI tmp_result4;
-  QI tmp_result3;
-  QI tmp_result2;
-  QI tmp_result1;
-  QI tmp_result0;
-  tmp_result0 = ((EQQI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 7), SUBWORDDIQI (GET_H_GR (FLD (f_right)), 7))) ? (INVQI (0)) : (0));
-  tmp_result1 = ((EQQI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 6), SUBWORDDIQI (GET_H_GR (FLD (f_right)), 6))) ? (INVQI (0)) : (0));
-  tmp_result2 = ((EQQI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 5), SUBWORDDIQI (GET_H_GR (FLD (f_right)), 5))) ? (INVQI (0)) : (0));
-  tmp_result3 = ((EQQI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 4), SUBWORDDIQI (GET_H_GR (FLD (f_right)), 4))) ? (INVQI (0)) : (0));
-  tmp_result4 = ((EQQI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 3), SUBWORDDIQI (GET_H_GR (FLD (f_right)), 3))) ? (INVQI (0)) : (0));
-  tmp_result5 = ((EQQI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 2), SUBWORDDIQI (GET_H_GR (FLD (f_right)), 2))) ? (INVQI (0)) : (0));
-  tmp_result6 = ((EQQI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 1), SUBWORDDIQI (GET_H_GR (FLD (f_right)), 1))) ? (INVQI (0)) : (0));
-  tmp_result7 = ((EQQI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 0), SUBWORDDIQI (GET_H_GR (FLD (f_right)), 0))) ? (INVQI (0)) : (0));
-  {
-    DI opval = ORDI (SLLDI (ZEXTQIDI (tmp_result7), 56), ORDI (SLLDI (ZEXTQIDI (tmp_result6), 48), ORDI (SLLDI (ZEXTQIDI (tmp_result5), 40), ORDI (SLLDI (ZEXTQIDI (tmp_result4), 32), ORDI (SLLDI (ZEXTQIDI (tmp_result3), 24), ORDI (SLLDI (ZEXTQIDI (tmp_result2), 16), ORDI (SLLDI (ZEXTQIDI (tmp_result1), 8), ZEXTQIDI (tmp_result0))))))));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-
-  return vpc;
-#undef FLD
-}
-
-/* mcmpeql: mcmpeq.l $rm, $rn, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,mcmpeql) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_add.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  SI tmp_result1;
-  SI tmp_result0;
-  tmp_result0 = ((EQSI (SUBWORDDISI (GET_H_GR (FLD (f_left)), 1), SUBWORDDISI (GET_H_GR (FLD (f_right)), 1))) ? (INVSI (0)) : (0));
-  tmp_result1 = ((EQSI (SUBWORDDISI (GET_H_GR (FLD (f_left)), 0), SUBWORDDISI (GET_H_GR (FLD (f_right)), 0))) ? (INVSI (0)) : (0));
-  {
-    DI opval = ORDI (SLLDI (ZEXTSIDI (tmp_result1), 32), ZEXTSIDI (tmp_result0));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-
-  return vpc;
-#undef FLD
-}
-
-/* mcmpeqw: mcmpeq.w $rm, $rn, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,mcmpeqw) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_add.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  HI tmp_result3;
-  HI tmp_result2;
-  HI tmp_result1;
-  HI tmp_result0;
-  tmp_result0 = ((EQHI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 3), SUBWORDDIHI (GET_H_GR (FLD (f_right)), 3))) ? (INVHI (0)) : (0));
-  tmp_result1 = ((EQHI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 2), SUBWORDDIHI (GET_H_GR (FLD (f_right)), 2))) ? (INVHI (0)) : (0));
-  tmp_result2 = ((EQHI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 1), SUBWORDDIHI (GET_H_GR (FLD (f_right)), 1))) ? (INVHI (0)) : (0));
-  tmp_result3 = ((EQHI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 0), SUBWORDDIHI (GET_H_GR (FLD (f_right)), 0))) ? (INVHI (0)) : (0));
-  {
-    DI opval = ORDI (SLLDI (ZEXTHIDI (tmp_result3), 48), ORDI (SLLDI (ZEXTHIDI (tmp_result2), 32), ORDI (SLLDI (ZEXTHIDI (tmp_result1), 16), ZEXTHIDI (tmp_result0))));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-
-  return vpc;
-#undef FLD
-}
-
-/* mcmpgtl: mcmpgt.l $rm, $rn, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,mcmpgtl) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_add.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  SI tmp_result1;
-  SI tmp_result0;
-  tmp_result0 = ((GTSI (SUBWORDDISI (GET_H_GR (FLD (f_left)), 1), SUBWORDDISI (GET_H_GR (FLD (f_right)), 1))) ? (INVSI (0)) : (0));
-  tmp_result1 = ((GTSI (SUBWORDDISI (GET_H_GR (FLD (f_left)), 0), SUBWORDDISI (GET_H_GR (FLD (f_right)), 0))) ? (INVSI (0)) : (0));
-  {
-    DI opval = ORDI (SLLDI (ZEXTSIDI (tmp_result1), 32), ZEXTSIDI (tmp_result0));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-
-  return vpc;
-#undef FLD
-}
-
-/* mcmpgtub: mcmpgt.ub $rm, $rn, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,mcmpgtub) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_add.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  QI tmp_result7;
-  QI tmp_result6;
-  QI tmp_result5;
-  QI tmp_result4;
-  QI tmp_result3;
-  QI tmp_result2;
-  QI tmp_result1;
-  QI tmp_result0;
-  tmp_result0 = ((GTUQI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 7), SUBWORDDIQI (GET_H_GR (FLD (f_right)), 7))) ? (INVQI (0)) : (0));
-  tmp_result1 = ((GTUQI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 6), SUBWORDDIQI (GET_H_GR (FLD (f_right)), 6))) ? (INVQI (0)) : (0));
-  tmp_result2 = ((GTUQI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 5), SUBWORDDIQI (GET_H_GR (FLD (f_right)), 5))) ? (INVQI (0)) : (0));
-  tmp_result3 = ((GTUQI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 4), SUBWORDDIQI (GET_H_GR (FLD (f_right)), 4))) ? (INVQI (0)) : (0));
-  tmp_result4 = ((GTUQI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 3), SUBWORDDIQI (GET_H_GR (FLD (f_right)), 3))) ? (INVQI (0)) : (0));
-  tmp_result5 = ((GTUQI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 2), SUBWORDDIQI (GET_H_GR (FLD (f_right)), 2))) ? (INVQI (0)) : (0));
-  tmp_result6 = ((GTUQI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 1), SUBWORDDIQI (GET_H_GR (FLD (f_right)), 1))) ? (INVQI (0)) : (0));
-  tmp_result7 = ((GTUQI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 0), SUBWORDDIQI (GET_H_GR (FLD (f_right)), 0))) ? (INVQI (0)) : (0));
-  {
-    DI opval = ORDI (SLLDI (ZEXTQIDI (tmp_result7), 56), ORDI (SLLDI (ZEXTQIDI (tmp_result6), 48), ORDI (SLLDI (ZEXTQIDI (tmp_result5), 40), ORDI (SLLDI (ZEXTQIDI (tmp_result4), 32), ORDI (SLLDI (ZEXTQIDI (tmp_result3), 24), ORDI (SLLDI (ZEXTQIDI (tmp_result2), 16), ORDI (SLLDI (ZEXTQIDI (tmp_result1), 8), ZEXTQIDI (tmp_result0))))))));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-
-  return vpc;
-#undef FLD
-}
-
-/* mcmpgtw: mcmpgt.w $rm, $rn, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,mcmpgtw) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_add.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  HI tmp_result3;
-  HI tmp_result2;
-  HI tmp_result1;
-  HI tmp_result0;
-  tmp_result0 = ((GTHI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 3), SUBWORDDIHI (GET_H_GR (FLD (f_right)), 3))) ? (INVHI (0)) : (0));
-  tmp_result1 = ((GTHI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 2), SUBWORDDIHI (GET_H_GR (FLD (f_right)), 2))) ? (INVHI (0)) : (0));
-  tmp_result2 = ((GTHI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 1), SUBWORDDIHI (GET_H_GR (FLD (f_right)), 1))) ? (INVHI (0)) : (0));
-  tmp_result3 = ((GTHI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 0), SUBWORDDIHI (GET_H_GR (FLD (f_right)), 0))) ? (INVHI (0)) : (0));
-  {
-    DI opval = ORDI (SLLDI (ZEXTHIDI (tmp_result3), 48), ORDI (SLLDI (ZEXTHIDI (tmp_result2), 32), ORDI (SLLDI (ZEXTHIDI (tmp_result1), 16), ZEXTHIDI (tmp_result0))));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-
-  return vpc;
-#undef FLD
-}
-
-/* mcmv: mcmv $rm, $rn, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,mcmv) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_add.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = ORDI (ANDDI (GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right))), ANDDI (GET_H_GR (FLD (f_dest)), INVDI (GET_H_GR (FLD (f_right)))));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* mcnvslw: mcnvs.lw $rm, $rn, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,mcnvslw) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_add.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  HI tmp_result3;
-  HI tmp_result2;
-  HI tmp_result1;
-  HI tmp_result0;
-  tmp_result0 = ((LTSI (SUBWORDDISI (GET_H_GR (FLD (f_left)), 1), NEGDI (SLLDI (1, SUBSI (16, 1))))) ? (NEGHI (SLLHI (1, SUBSI (16, 1)))) : (((LTSI (SUBWORDDISI (GET_H_GR (FLD (f_left)), 1), SLLDI (1, SUBSI (16, 1)))) ? (SUBWORDDISI (GET_H_GR (FLD (f_left)), 1)) : (SUBHI (SLLHI (1, SUBSI (16, 1)), 1)))));
-  tmp_result1 = ((LTSI (SUBWORDDISI (GET_H_GR (FLD (f_left)), 0), NEGDI (SLLDI (1, SUBSI (16, 1))))) ? (NEGHI (SLLHI (1, SUBSI (16, 1)))) : (((LTSI (SUBWORDDISI (GET_H_GR (FLD (f_left)), 0), SLLDI (1, SUBSI (16, 1)))) ? (SUBWORDDISI (GET_H_GR (FLD (f_left)), 0)) : (SUBHI (SLLHI (1, SUBSI (16, 1)), 1)))));
-  tmp_result2 = ((LTSI (SUBWORDDISI (GET_H_GR (FLD (f_right)), 1), NEGDI (SLLDI (1, SUBSI (16, 1))))) ? (NEGHI (SLLHI (1, SUBSI (16, 1)))) : (((LTSI (SUBWORDDISI (GET_H_GR (FLD (f_right)), 1), SLLDI (1, SUBSI (16, 1)))) ? (SUBWORDDISI (GET_H_GR (FLD (f_right)), 1)) : (SUBHI (SLLHI (1, SUBSI (16, 1)), 1)))));
-  tmp_result3 = ((LTSI (SUBWORDDISI (GET_H_GR (FLD (f_right)), 0), NEGDI (SLLDI (1, SUBSI (16, 1))))) ? (NEGHI (SLLHI (1, SUBSI (16, 1)))) : (((LTSI (SUBWORDDISI (GET_H_GR (FLD (f_right)), 0), SLLDI (1, SUBSI (16, 1)))) ? (SUBWORDDISI (GET_H_GR (FLD (f_right)), 0)) : (SUBHI (SLLHI (1, SUBSI (16, 1)), 1)))));
-  {
-    DI opval = ORDI (SLLDI (ZEXTHIDI (tmp_result3), 48), ORDI (SLLDI (ZEXTHIDI (tmp_result2), 32), ORDI (SLLDI (ZEXTHIDI (tmp_result1), 16), ZEXTHIDI (tmp_result0))));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-
-  return vpc;
-#undef FLD
-}
-
-/* mcnvswb: mcnvs.wb $rm, $rn, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,mcnvswb) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_add.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  QI tmp_result7;
-  QI tmp_result6;
-  QI tmp_result5;
-  QI tmp_result4;
-  QI tmp_result3;
-  QI tmp_result2;
-  QI tmp_result1;
-  QI tmp_result0;
-  tmp_result0 = ((LTHI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 3), NEGDI (SLLDI (1, SUBSI (8, 1))))) ? (NEGQI (SLLQI (1, SUBSI (8, 1)))) : (((LTHI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 3), SLLDI (1, SUBSI (8, 1)))) ? (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 3)) : (SUBQI (SLLQI (1, SUBSI (8, 1)), 1)))));
-  tmp_result1 = ((LTHI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 2), NEGDI (SLLDI (1, SUBSI (8, 1))))) ? (NEGQI (SLLQI (1, SUBSI (8, 1)))) : (((LTHI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 2), SLLDI (1, SUBSI (8, 1)))) ? (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 2)) : (SUBQI (SLLQI (1, SUBSI (8, 1)), 1)))));
-  tmp_result2 = ((LTHI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 1), NEGDI (SLLDI (1, SUBSI (8, 1))))) ? (NEGQI (SLLQI (1, SUBSI (8, 1)))) : (((LTHI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 1), SLLDI (1, SUBSI (8, 1)))) ? (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 1)) : (SUBQI (SLLQI (1, SUBSI (8, 1)), 1)))));
-  tmp_result3 = ((LTHI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 0), NEGDI (SLLDI (1, SUBSI (8, 1))))) ? (NEGQI (SLLQI (1, SUBSI (8, 1)))) : (((LTHI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 0), SLLDI (1, SUBSI (8, 1)))) ? (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 0)) : (SUBQI (SLLQI (1, SUBSI (8, 1)), 1)))));
-  tmp_result4 = ((LTHI (SUBWORDDIHI (GET_H_GR (FLD (f_right)), 3), NEGDI (SLLDI (1, SUBSI (8, 1))))) ? (NEGQI (SLLQI (1, SUBSI (8, 1)))) : (((LTHI (SUBWORDDIHI (GET_H_GR (FLD (f_right)), 3), SLLDI (1, SUBSI (8, 1)))) ? (SUBWORDDIHI (GET_H_GR (FLD (f_right)), 3)) : (SUBQI (SLLQI (1, SUBSI (8, 1)), 1)))));
-  tmp_result5 = ((LTHI (SUBWORDDIHI (GET_H_GR (FLD (f_right)), 2), NEGDI (SLLDI (1, SUBSI (8, 1))))) ? (NEGQI (SLLQI (1, SUBSI (8, 1)))) : (((LTHI (SUBWORDDIHI (GET_H_GR (FLD (f_right)), 2), SLLDI (1, SUBSI (8, 1)))) ? (SUBWORDDIHI (GET_H_GR (FLD (f_right)), 2)) : (SUBQI (SLLQI (1, SUBSI (8, 1)), 1)))));
-  tmp_result6 = ((LTHI (SUBWORDDIHI (GET_H_GR (FLD (f_right)), 1), NEGDI (SLLDI (1, SUBSI (8, 1))))) ? (NEGQI (SLLQI (1, SUBSI (8, 1)))) : (((LTHI (SUBWORDDIHI (GET_H_GR (FLD (f_right)), 1), SLLDI (1, SUBSI (8, 1)))) ? (SUBWORDDIHI (GET_H_GR (FLD (f_right)), 1)) : (SUBQI (SLLQI (1, SUBSI (8, 1)), 1)))));
-  tmp_result7 = ((LTHI (SUBWORDDIHI (GET_H_GR (FLD (f_right)), 0), NEGDI (SLLDI (1, SUBSI (8, 1))))) ? (NEGQI (SLLQI (1, SUBSI (8, 1)))) : (((LTHI (SUBWORDDIHI (GET_H_GR (FLD (f_right)), 0), SLLDI (1, SUBSI (8, 1)))) ? (SUBWORDDIHI (GET_H_GR (FLD (f_right)), 0)) : (SUBQI (SLLQI (1, SUBSI (8, 1)), 1)))));
-  {
-    DI opval = ORDI (SLLDI (ZEXTQIDI (tmp_result7), 56), ORDI (SLLDI (ZEXTQIDI (tmp_result6), 48), ORDI (SLLDI (ZEXTQIDI (tmp_result5), 40), ORDI (SLLDI (ZEXTQIDI (tmp_result4), 32), ORDI (SLLDI (ZEXTQIDI (tmp_result3), 24), ORDI (SLLDI (ZEXTQIDI (tmp_result2), 16), ORDI (SLLDI (ZEXTQIDI (tmp_result1), 8), ZEXTQIDI (tmp_result0))))))));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-
-  return vpc;
-#undef FLD
-}
-
-/* mcnvswub: mcnvs.wub $rm, $rn, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,mcnvswub) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_add.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  QI tmp_result7;
-  QI tmp_result6;
-  QI tmp_result5;
-  QI tmp_result4;
-  QI tmp_result3;
-  QI tmp_result2;
-  QI tmp_result1;
-  QI tmp_result0;
-  tmp_result0 = ((LTHI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 3), MAKEDI (0, 0))) ? (0) : (((LTHI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 3), SLLDI (1, 8))) ? (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 3)) : (SUBQI (SLLQI (1, 8), 1)))));
-  tmp_result1 = ((LTHI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 2), MAKEDI (0, 0))) ? (0) : (((LTHI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 2), SLLDI (1, 8))) ? (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 2)) : (SUBQI (SLLQI (1, 8), 1)))));
-  tmp_result2 = ((LTHI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 1), MAKEDI (0, 0))) ? (0) : (((LTHI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 1), SLLDI (1, 8))) ? (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 1)) : (SUBQI (SLLQI (1, 8), 1)))));
-  tmp_result3 = ((LTHI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 0), MAKEDI (0, 0))) ? (0) : (((LTHI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 0), SLLDI (1, 8))) ? (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 0)) : (SUBQI (SLLQI (1, 8), 1)))));
-  tmp_result4 = ((LTHI (SUBWORDDIHI (GET_H_GR (FLD (f_right)), 3), MAKEDI (0, 0))) ? (0) : (((LTHI (SUBWORDDIHI (GET_H_GR (FLD (f_right)), 3), SLLDI (1, 8))) ? (SUBWORDDIHI (GET_H_GR (FLD (f_right)), 3)) : (SUBQI (SLLQI (1, 8), 1)))));
-  tmp_result5 = ((LTHI (SUBWORDDIHI (GET_H_GR (FLD (f_right)), 2), MAKEDI (0, 0))) ? (0) : (((LTHI (SUBWORDDIHI (GET_H_GR (FLD (f_right)), 2), SLLDI (1, 8))) ? (SUBWORDDIHI (GET_H_GR (FLD (f_right)), 2)) : (SUBQI (SLLQI (1, 8), 1)))));
-  tmp_result6 = ((LTHI (SUBWORDDIHI (GET_H_GR (FLD (f_right)), 1), MAKEDI (0, 0))) ? (0) : (((LTHI (SUBWORDDIHI (GET_H_GR (FLD (f_right)), 1), SLLDI (1, 8))) ? (SUBWORDDIHI (GET_H_GR (FLD (f_right)), 1)) : (SUBQI (SLLQI (1, 8), 1)))));
-  tmp_result7 = ((LTHI (SUBWORDDIHI (GET_H_GR (FLD (f_right)), 0), MAKEDI (0, 0))) ? (0) : (((LTHI (SUBWORDDIHI (GET_H_GR (FLD (f_right)), 0), SLLDI (1, 8))) ? (SUBWORDDIHI (GET_H_GR (FLD (f_right)), 0)) : (SUBQI (SLLQI (1, 8), 1)))));
-  {
-    DI opval = ORDI (SLLDI (ZEXTQIDI (tmp_result7), 56), ORDI (SLLDI (ZEXTQIDI (tmp_result6), 48), ORDI (SLLDI (ZEXTQIDI (tmp_result5), 40), ORDI (SLLDI (ZEXTQIDI (tmp_result4), 32), ORDI (SLLDI (ZEXTQIDI (tmp_result3), 24), ORDI (SLLDI (ZEXTQIDI (tmp_result2), 16), ORDI (SLLDI (ZEXTQIDI (tmp_result1), 8), ZEXTQIDI (tmp_result0))))))));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-
-  return vpc;
-#undef FLD
-}
-
-/* mextr1: mextr1 $rm, $rn, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,mextr1) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_add.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  QI tmp_count;
-  DI tmp_mask;
-  DI tmp_rhs;
-  tmp_count = MULQI (8, 1);
-  tmp_mask = SLLDI (INVSI (0), tmp_count);
-  tmp_rhs = SRLDI (ANDDI (GET_H_GR (FLD (f_left)), tmp_mask), tmp_count);
-  tmp_count = MULQI (8, SUBQI (8, 1));
-  tmp_mask = SRLDI (INVSI (0), tmp_count);
-  {
-    DI opval = ORDI (tmp_rhs, SLLDI (ANDDI (GET_H_GR (FLD (f_right)), tmp_mask), tmp_count));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-
-  return vpc;
-#undef FLD
-}
-
-/* mextr2: mextr2 $rm, $rn, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,mextr2) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_add.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  QI tmp_count;
-  DI tmp_mask;
-  DI tmp_rhs;
-  tmp_count = MULQI (8, 2);
-  tmp_mask = SLLDI (INVSI (0), tmp_count);
-  tmp_rhs = SRLDI (ANDDI (GET_H_GR (FLD (f_left)), tmp_mask), tmp_count);
-  tmp_count = MULQI (8, SUBQI (8, 2));
-  tmp_mask = SRLDI (INVSI (0), tmp_count);
-  {
-    DI opval = ORDI (tmp_rhs, SLLDI (ANDDI (GET_H_GR (FLD (f_right)), tmp_mask), tmp_count));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-
-  return vpc;
-#undef FLD
-}
-
-/* mextr3: mextr3 $rm, $rn, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,mextr3) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_add.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  QI tmp_count;
-  DI tmp_mask;
-  DI tmp_rhs;
-  tmp_count = MULQI (8, 3);
-  tmp_mask = SLLDI (INVSI (0), tmp_count);
-  tmp_rhs = SRLDI (ANDDI (GET_H_GR (FLD (f_left)), tmp_mask), tmp_count);
-  tmp_count = MULQI (8, SUBQI (8, 3));
-  tmp_mask = SRLDI (INVSI (0), tmp_count);
-  {
-    DI opval = ORDI (tmp_rhs, SLLDI (ANDDI (GET_H_GR (FLD (f_right)), tmp_mask), tmp_count));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-
-  return vpc;
-#undef FLD
-}
-
-/* mextr4: mextr4 $rm, $rn, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,mextr4) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_add.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  QI tmp_count;
-  DI tmp_mask;
-  DI tmp_rhs;
-  tmp_count = MULQI (8, 4);
-  tmp_mask = SLLDI (INVSI (0), tmp_count);
-  tmp_rhs = SRLDI (ANDDI (GET_H_GR (FLD (f_left)), tmp_mask), tmp_count);
-  tmp_count = MULQI (8, SUBQI (8, 4));
-  tmp_mask = SRLDI (INVSI (0), tmp_count);
-  {
-    DI opval = ORDI (tmp_rhs, SLLDI (ANDDI (GET_H_GR (FLD (f_right)), tmp_mask), tmp_count));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-
-  return vpc;
-#undef FLD
-}
-
-/* mextr5: mextr5 $rm, $rn, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,mextr5) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_add.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  QI tmp_count;
-  DI tmp_mask;
-  DI tmp_rhs;
-  tmp_count = MULQI (8, 5);
-  tmp_mask = SLLDI (INVSI (0), tmp_count);
-  tmp_rhs = SRLDI (ANDDI (GET_H_GR (FLD (f_left)), tmp_mask), tmp_count);
-  tmp_count = MULQI (8, SUBQI (8, 5));
-  tmp_mask = SRLDI (INVSI (0), tmp_count);
-  {
-    DI opval = ORDI (tmp_rhs, SLLDI (ANDDI (GET_H_GR (FLD (f_right)), tmp_mask), tmp_count));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-
-  return vpc;
-#undef FLD
-}
-
-/* mextr6: mextr6 $rm, $rn, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,mextr6) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_add.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  QI tmp_count;
-  DI tmp_mask;
-  DI tmp_rhs;
-  tmp_count = MULQI (8, 6);
-  tmp_mask = SLLDI (INVSI (0), tmp_count);
-  tmp_rhs = SRLDI (ANDDI (GET_H_GR (FLD (f_left)), tmp_mask), tmp_count);
-  tmp_count = MULQI (8, SUBQI (8, 6));
-  tmp_mask = SRLDI (INVSI (0), tmp_count);
-  {
-    DI opval = ORDI (tmp_rhs, SLLDI (ANDDI (GET_H_GR (FLD (f_right)), tmp_mask), tmp_count));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-
-  return vpc;
-#undef FLD
-}
-
-/* mextr7: mextr7 $rm, $rn, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,mextr7) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_add.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  QI tmp_count;
-  DI tmp_mask;
-  DI tmp_rhs;
-  tmp_count = MULQI (8, 7);
-  tmp_mask = SLLDI (INVSI (0), tmp_count);
-  tmp_rhs = SRLDI (ANDDI (GET_H_GR (FLD (f_left)), tmp_mask), tmp_count);
-  tmp_count = MULQI (8, SUBQI (8, 7));
-  tmp_mask = SRLDI (INVSI (0), tmp_count);
-  {
-    DI opval = ORDI (tmp_rhs, SLLDI (ANDDI (GET_H_GR (FLD (f_right)), tmp_mask), tmp_count));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-
-  return vpc;
-#undef FLD
-}
-
-/* mmacfxwl: mmacfx.wl $rm, $rn, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,mmacfxwl) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_add.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  SI tmp_temp;
-  SI tmp_result1;
-  SI tmp_result0;
-  tmp_result0 = SUBWORDDISI (GET_H_GR (FLD (f_dest)), 1);
-  tmp_result1 = SUBWORDDISI (GET_H_GR (FLD (f_dest)), 0);
-  tmp_temp = MULSI (ZEXTHISI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 3)), ZEXTHISI (SUBWORDDIHI (GET_H_GR (FLD (f_right)), 3)));
-  tmp_temp = ((LTDI (SLLDI (tmp_temp, 1), NEGDI (SLLDI (1, SUBSI (32, 1))))) ? (NEGSI (SLLSI (1, SUBSI (32, 1)))) : (((LTDI (SLLDI (tmp_temp, 1), SLLDI (1, SUBSI (32, 1)))) ? (SLLDI (tmp_temp, 1)) : (SUBSI (SLLSI (1, SUBSI (32, 1)), 1)))));
-  tmp_result0 = ((LTDI (ADDDI (EXTSIDI (tmp_result0), EXTSIDI (tmp_temp)), NEGDI (SLLDI (1, SUBSI (32, 1))))) ? (NEGSI (SLLSI (1, SUBSI (32, 1)))) : (((LTDI (ADDDI (EXTSIDI (tmp_result0), EXTSIDI (tmp_temp)), SLLDI (1, SUBSI (32, 1)))) ? (ADDDI (EXTSIDI (tmp_result0), EXTSIDI (tmp_temp))) : (SUBSI (SLLSI (1, SUBSI (32, 1)), 1)))));
-  tmp_temp = MULSI (ZEXTHISI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 2)), ZEXTHISI (SUBWORDDIHI (GET_H_GR (FLD (f_right)), 2)));
-  tmp_temp = ((LTDI (SLLDI (tmp_temp, 1), NEGDI (SLLDI (1, SUBSI (32, 1))))) ? (NEGSI (SLLSI (1, SUBSI (32, 1)))) : (((LTDI (SLLDI (tmp_temp, 1), SLLDI (1, SUBSI (32, 1)))) ? (SLLDI (tmp_temp, 1)) : (SUBSI (SLLSI (1, SUBSI (32, 1)), 1)))));
-  tmp_result1 = ((LTDI (ADDDI (EXTSIDI (tmp_result1), EXTSIDI (tmp_temp)), NEGDI (SLLDI (1, SUBSI (32, 1))))) ? (NEGSI (SLLSI (1, SUBSI (32, 1)))) : (((LTDI (ADDDI (EXTSIDI (tmp_result1), EXTSIDI (tmp_temp)), SLLDI (1, SUBSI (32, 1)))) ? (ADDDI (EXTSIDI (tmp_result1), EXTSIDI (tmp_temp))) : (SUBSI (SLLSI (1, SUBSI (32, 1)), 1)))));
-  {
-    DI opval = ORDI (SLLDI (ZEXTSIDI (tmp_result1), 32), ZEXTSIDI (tmp_result0));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-
-  return vpc;
-#undef FLD
-}
-
-/* mmacnfx.wl: mmacnfx.wl $rm, $rn, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,mmacnfx_wl) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_add.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  SI tmp_temp;
-  SI tmp_result1;
-  SI tmp_result0;
-  tmp_result0 = SUBWORDDISI (GET_H_GR (FLD (f_dest)), 1);
-  tmp_result1 = SUBWORDDISI (GET_H_GR (FLD (f_dest)), 0);
-  tmp_temp = MULSI (ZEXTHISI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 3)), ZEXTHISI (SUBWORDDIHI (GET_H_GR (FLD (f_right)), 3)));
-  tmp_temp = ((LTDI (SLLDI (tmp_temp, 1), NEGDI (SLLDI (1, SUBSI (32, 1))))) ? (NEGSI (SLLSI (1, SUBSI (32, 1)))) : (((LTDI (SLLDI (tmp_temp, 1), SLLDI (1, SUBSI (32, 1)))) ? (SLLDI (tmp_temp, 1)) : (SUBSI (SLLSI (1, SUBSI (32, 1)), 1)))));
-  tmp_result0 = ((LTDI (SUBDI (EXTSIDI (tmp_result0), EXTSIDI (tmp_temp)), NEGDI (SLLDI (1, SUBSI (32, 1))))) ? (NEGSI (SLLSI (1, SUBSI (32, 1)))) : (((LTDI (SUBDI (EXTSIDI (tmp_result0), EXTSIDI (tmp_temp)), SLLDI (1, SUBSI (32, 1)))) ? (SUBDI (EXTSIDI (tmp_result0), EXTSIDI (tmp_temp))) : (SUBSI (SLLSI (1, SUBSI (32, 1)), 1)))));
-  tmp_temp = MULSI (ZEXTHISI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 2)), ZEXTHISI (SUBWORDDIHI (GET_H_GR (FLD (f_right)), 2)));
-  tmp_temp = ((LTDI (SLLDI (tmp_temp, 1), NEGDI (SLLDI (1, SUBSI (32, 1))))) ? (NEGSI (SLLSI (1, SUBSI (32, 1)))) : (((LTDI (SLLDI (tmp_temp, 1), SLLDI (1, SUBSI (32, 1)))) ? (SLLDI (tmp_temp, 1)) : (SUBSI (SLLSI (1, SUBSI (32, 1)), 1)))));
-  tmp_result1 = ((LTDI (SUBDI (EXTSIDI (tmp_result1), EXTSIDI (tmp_temp)), NEGDI (SLLDI (1, SUBSI (32, 1))))) ? (NEGSI (SLLSI (1, SUBSI (32, 1)))) : (((LTDI (SUBDI (EXTSIDI (tmp_result1), EXTSIDI (tmp_temp)), SLLDI (1, SUBSI (32, 1)))) ? (SUBDI (EXTSIDI (tmp_result1), EXTSIDI (tmp_temp))) : (SUBSI (SLLSI (1, SUBSI (32, 1)), 1)))));
-  {
-    DI opval = ORDI (SLLDI (ZEXTSIDI (tmp_result1), 32), ZEXTSIDI (tmp_result0));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-
-  return vpc;
-#undef FLD
-}
-
-/* mmull: mmul.l $rm, $rn, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,mmull) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_add.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  SI tmp_result1;
-  SI tmp_result0;
-  tmp_result0 = MULSI (SUBWORDDISI (GET_H_GR (FLD (f_left)), 1), SUBWORDDISI (GET_H_GR (FLD (f_right)), 1));
-  tmp_result1 = MULSI (SUBWORDDISI (GET_H_GR (FLD (f_left)), 0), SUBWORDDISI (GET_H_GR (FLD (f_right)), 0));
-  {
-    DI opval = ORDI (SLLDI (ZEXTSIDI (tmp_result1), 32), ZEXTSIDI (tmp_result0));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-
-  return vpc;
-#undef FLD
-}
-
-/* mmulw: mmul.w $rm, $rn, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,mmulw) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_add.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  HI tmp_result3;
-  HI tmp_result2;
-  HI tmp_result1;
-  HI tmp_result0;
-  tmp_result0 = MULHI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 3), SUBWORDDIHI (GET_H_GR (FLD (f_right)), 3));
-  tmp_result1 = MULHI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 2), SUBWORDDIHI (GET_H_GR (FLD (f_right)), 2));
-  tmp_result2 = MULHI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 1), SUBWORDDIHI (GET_H_GR (FLD (f_right)), 1));
-  tmp_result3 = MULHI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 0), SUBWORDDIHI (GET_H_GR (FLD (f_right)), 0));
-  {
-    DI opval = ORDI (SLLDI (ZEXTHIDI (tmp_result3), 48), ORDI (SLLDI (ZEXTHIDI (tmp_result2), 32), ORDI (SLLDI (ZEXTHIDI (tmp_result1), 16), ZEXTHIDI (tmp_result0))));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-
-  return vpc;
-#undef FLD
-}
-
-/* mmulfxl: mmulfx.l $rm, $rn, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,mmulfxl) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_add.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  DI tmp_temp;
-  SI tmp_result0;
-  SI tmp_result1;
-  tmp_temp = MULDI (ZEXTSIDI (SUBWORDDISI (GET_H_GR (FLD (f_left)), 1)), ZEXTSIDI (SUBWORDDISI (GET_H_GR (FLD (f_right)), 1)));
-  tmp_result0 = ((LTDI (SRADI (tmp_temp, 31), NEGDI (SLLDI (1, SUBSI (32, 1))))) ? (NEGSI (SLLSI (1, SUBSI (32, 1)))) : (((LTDI (SRADI (tmp_temp, 31), SLLDI (1, SUBSI (32, 1)))) ? (SRADI (tmp_temp, 31)) : (SUBSI (SLLSI (1, SUBSI (32, 1)), 1)))));
-  tmp_temp = MULDI (ZEXTSIDI (SUBWORDDISI (GET_H_GR (FLD (f_left)), 0)), ZEXTSIDI (SUBWORDDISI (GET_H_GR (FLD (f_right)), 0)));
-  tmp_result1 = ((LTDI (SRADI (tmp_temp, 31), NEGDI (SLLDI (1, SUBSI (32, 1))))) ? (NEGSI (SLLSI (1, SUBSI (32, 1)))) : (((LTDI (SRADI (tmp_temp, 31), SLLDI (1, SUBSI (32, 1)))) ? (SRADI (tmp_temp, 31)) : (SUBSI (SLLSI (1, SUBSI (32, 1)), 1)))));
-  {
-    DI opval = ORDI (SLLDI (ZEXTSIDI (tmp_result1), 32), ZEXTSIDI (tmp_result0));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-
-  return vpc;
-#undef FLD
-}
-
-/* mmulfxw: mmulfx.w $rm, $rn, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,mmulfxw) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_add.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  SI tmp_temp;
-  HI tmp_result0;
-  HI tmp_result1;
-  HI tmp_result2;
-  HI tmp_result3;
-  tmp_temp = MULSI (ZEXTHISI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 3)), ZEXTHISI (SUBWORDDIHI (GET_H_GR (FLD (f_right)), 3)));
-  tmp_result0 = ((LTSI (SRASI (tmp_temp, 15), NEGDI (SLLDI (1, SUBSI (16, 1))))) ? (NEGHI (SLLHI (1, SUBSI (16, 1)))) : (((LTSI (SRASI (tmp_temp, 15), SLLDI (1, SUBSI (16, 1)))) ? (SRASI (tmp_temp, 15)) : (SUBHI (SLLHI (1, SUBSI (16, 1)), 1)))));
-  tmp_temp = MULSI (ZEXTHISI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 2)), ZEXTHISI (SUBWORDDIHI (GET_H_GR (FLD (f_right)), 2)));
-  tmp_result1 = ((LTSI (SRASI (tmp_temp, 15), NEGDI (SLLDI (1, SUBSI (16, 1))))) ? (NEGHI (SLLHI (1, SUBSI (16, 1)))) : (((LTSI (SRASI (tmp_temp, 15), SLLDI (1, SUBSI (16, 1)))) ? (SRASI (tmp_temp, 15)) : (SUBHI (SLLHI (1, SUBSI (16, 1)), 1)))));
-  tmp_temp = MULSI (ZEXTHISI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 1)), ZEXTHISI (SUBWORDDIHI (GET_H_GR (FLD (f_right)), 1)));
-  tmp_result2 = ((LTSI (SRASI (tmp_temp, 15), NEGDI (SLLDI (1, SUBSI (16, 1))))) ? (NEGHI (SLLHI (1, SUBSI (16, 1)))) : (((LTSI (SRASI (tmp_temp, 15), SLLDI (1, SUBSI (16, 1)))) ? (SRASI (tmp_temp, 15)) : (SUBHI (SLLHI (1, SUBSI (16, 1)), 1)))));
-  tmp_temp = MULSI (ZEXTHISI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 0)), ZEXTHISI (SUBWORDDIHI (GET_H_GR (FLD (f_right)), 0)));
-  tmp_result3 = ((LTSI (SRASI (tmp_temp, 15), NEGDI (SLLDI (1, SUBSI (16, 1))))) ? (NEGHI (SLLHI (1, SUBSI (16, 1)))) : (((LTSI (SRASI (tmp_temp, 15), SLLDI (1, SUBSI (16, 1)))) ? (SRASI (tmp_temp, 15)) : (SUBHI (SLLHI (1, SUBSI (16, 1)), 1)))));
-  {
-    DI opval = ORDI (SLLDI (ZEXTHIDI (tmp_result3), 48), ORDI (SLLDI (ZEXTHIDI (tmp_result2), 32), ORDI (SLLDI (ZEXTHIDI (tmp_result1), 16), ZEXTHIDI (tmp_result0))));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-
-  return vpc;
-#undef FLD
-}
-
-/* mmulfxrpw: mmulfxrp.w $rm, $rn, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,mmulfxrpw) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_add.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  SI tmp_temp;
-  HI tmp_result0;
-  HI tmp_result1;
-  HI tmp_result2;
-  HI tmp_result3;
-  HI tmp_c;
-  tmp_c = SLLSI (1, 14);
-  tmp_temp = MULSI (ZEXTHISI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 3)), ZEXTHISI (SUBWORDDIHI (GET_H_GR (FLD (f_right)), 3)));
-  tmp_result0 = ((LTSI (SRASI (ADDSI (tmp_temp, tmp_c), 15), NEGDI (SLLDI (1, SUBSI (16, 1))))) ? (NEGHI (SLLHI (1, SUBSI (16, 1)))) : (((LTSI (SRASI (ADDSI (tmp_temp, tmp_c), 15), SLLDI (1, SUBSI (16, 1)))) ? (SRASI (ADDSI (tmp_temp, tmp_c), 15)) : (SUBHI (SLLHI (1, SUBSI (16, 1)), 1)))));
-  tmp_temp = MULSI (ZEXTHISI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 2)), ZEXTHISI (SUBWORDDIHI (GET_H_GR (FLD (f_right)), 2)));
-  tmp_result1 = ((LTSI (SRASI (ADDSI (tmp_temp, tmp_c), 15), NEGDI (SLLDI (1, SUBSI (16, 1))))) ? (NEGHI (SLLHI (1, SUBSI (16, 1)))) : (((LTSI (SRASI (ADDSI (tmp_temp, tmp_c), 15), SLLDI (1, SUBSI (16, 1)))) ? (SRASI (ADDSI (tmp_temp, tmp_c), 15)) : (SUBHI (SLLHI (1, SUBSI (16, 1)), 1)))));
-  tmp_temp = MULSI (ZEXTHISI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 1)), ZEXTHISI (SUBWORDDIHI (GET_H_GR (FLD (f_right)), 1)));
-  tmp_result2 = ((LTSI (SRASI (ADDSI (tmp_temp, tmp_c), 15), NEGDI (SLLDI (1, SUBSI (16, 1))))) ? (NEGHI (SLLHI (1, SUBSI (16, 1)))) : (((LTSI (SRASI (ADDSI (tmp_temp, tmp_c), 15), SLLDI (1, SUBSI (16, 1)))) ? (SRASI (ADDSI (tmp_temp, tmp_c), 15)) : (SUBHI (SLLHI (1, SUBSI (16, 1)), 1)))));
-  tmp_temp = MULSI (ZEXTHISI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 0)), ZEXTHISI (SUBWORDDIHI (GET_H_GR (FLD (f_right)), 0)));
-  tmp_result3 = ((LTSI (SRASI (ADDSI (tmp_temp, tmp_c), 15), NEGDI (SLLDI (1, SUBSI (16, 1))))) ? (NEGHI (SLLHI (1, SUBSI (16, 1)))) : (((LTSI (SRASI (ADDSI (tmp_temp, tmp_c), 15), SLLDI (1, SUBSI (16, 1)))) ? (SRASI (ADDSI (tmp_temp, tmp_c), 15)) : (SUBHI (SLLHI (1, SUBSI (16, 1)), 1)))));
-  {
-    DI opval = ORDI (SLLDI (ZEXTHIDI (tmp_result3), 48), ORDI (SLLDI (ZEXTHIDI (tmp_result2), 32), ORDI (SLLDI (ZEXTHIDI (tmp_result1), 16), ZEXTHIDI (tmp_result0))));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-
-  return vpc;
-#undef FLD
-}
-
-/* mmulhiwl: mmulhi.wl $rm, $rn, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,mmulhiwl) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_add.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  SI tmp_result1;
-  SI tmp_result0;
-  tmp_result0 = MULSI (ZEXTHISI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 1)), ZEXTHISI (SUBWORDDIHI (GET_H_GR (FLD (f_right)), 1)));
-  tmp_result1 = MULSI (ZEXTHISI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 0)), ZEXTHISI (SUBWORDDIHI (GET_H_GR (FLD (f_right)), 0)));
-  {
-    DI opval = ORDI (SLLDI (ZEXTSIDI (tmp_result1), 32), ZEXTSIDI (tmp_result0));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-
-  return vpc;
-#undef FLD
-}
-
-/* mmullowl: mmullo.wl $rm, $rn, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,mmullowl) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_add.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  SI tmp_result1;
-  SI tmp_result0;
-  tmp_result0 = MULSI (ZEXTHISI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 3)), ZEXTHISI (SUBWORDDIHI (GET_H_GR (FLD (f_right)), 3)));
-  tmp_result1 = MULSI (ZEXTHISI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 2)), ZEXTHISI (SUBWORDDIHI (GET_H_GR (FLD (f_right)), 2)));
-  {
-    DI opval = ORDI (SLLDI (ZEXTSIDI (tmp_result1), 32), ZEXTSIDI (tmp_result0));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-
-  return vpc;
-#undef FLD
-}
-
-/* mmulsumwq: mmulsum.wq $rm, $rn, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,mmulsumwq) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_add.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  DI tmp_acc;
-  tmp_acc = MULSI (ZEXTHISI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 0)), ZEXTHISI (SUBWORDDIHI (GET_H_GR (FLD (f_right)), 0)));
-  tmp_acc = ADDDI (tmp_acc, MULSI (ZEXTHISI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 1)), ZEXTHISI (SUBWORDDIHI (GET_H_GR (FLD (f_right)), 1))));
-  tmp_acc = ADDDI (tmp_acc, MULSI (ZEXTHISI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 2)), ZEXTHISI (SUBWORDDIHI (GET_H_GR (FLD (f_right)), 2))));
-  tmp_acc = ADDDI (tmp_acc, MULSI (ZEXTHISI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 3)), ZEXTHISI (SUBWORDDIHI (GET_H_GR (FLD (f_right)), 3))));
-  {
-    DI opval = ADDDI (GET_H_GR (FLD (f_dest)), tmp_acc);
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-
-  return vpc;
-#undef FLD
-}
-
-/* movi: movi $imm16, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,movi) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_movi.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = EXTSIDI (FLD (f_imm16));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* mpermw: mperm.w $rm, $rn, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,mpermw) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_add.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  QI tmp_control;
-  HI tmp_result3;
-  HI tmp_result2;
-  HI tmp_result1;
-  HI tmp_result0;
-  tmp_control = ANDQI (GET_H_GR (FLD (f_right)), 255);
-  tmp_result0 = SUBWORDDIHI (GET_H_GR (FLD (f_left)), SUBSI (3, ANDQI (tmp_control, 3)));
-  tmp_result1 = SUBWORDDIHI (GET_H_GR (FLD (f_left)), SUBSI (3, ANDQI (SRLQI (tmp_control, 2), 3)));
-  tmp_result2 = SUBWORDDIHI (GET_H_GR (FLD (f_left)), SUBSI (3, ANDQI (SRLQI (tmp_control, 4), 3)));
-  tmp_result3 = SUBWORDDIHI (GET_H_GR (FLD (f_left)), SUBSI (3, ANDQI (SRLQI (tmp_control, 6), 3)));
-  {
-    DI opval = ORDI (SLLDI (ZEXTHIDI (tmp_result3), 48), ORDI (SLLDI (ZEXTHIDI (tmp_result2), 32), ORDI (SLLDI (ZEXTHIDI (tmp_result1), 16), ZEXTHIDI (tmp_result0))));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-
-  return vpc;
-#undef FLD
-}
-
-/* msadubq: msad.ubq $rm, $rn, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,msadubq) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_add.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  DI tmp_acc;
-  tmp_acc = ABSDI (SUBQI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 0), SUBWORDDIQI (GET_H_GR (FLD (f_right)), 0)));
-  tmp_acc = ADDDI (tmp_acc, ABSQI (SUBQI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 1), SUBWORDDIQI (GET_H_GR (FLD (f_right)), 1))));
-  tmp_acc = ADDDI (tmp_acc, ABSQI (SUBQI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 2), SUBWORDDIQI (GET_H_GR (FLD (f_right)), 2))));
-  tmp_acc = ADDDI (tmp_acc, ABSQI (SUBQI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 3), SUBWORDDIQI (GET_H_GR (FLD (f_right)), 3))));
-  tmp_acc = ADDDI (tmp_acc, ABSQI (SUBQI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 4), SUBWORDDIQI (GET_H_GR (FLD (f_right)), 4))));
-  tmp_acc = ADDDI (tmp_acc, ABSQI (SUBQI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 5), SUBWORDDIQI (GET_H_GR (FLD (f_right)), 5))));
-  tmp_acc = ADDDI (tmp_acc, ABSQI (SUBQI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 6), SUBWORDDIQI (GET_H_GR (FLD (f_right)), 6))));
-  tmp_acc = ADDDI (tmp_acc, ABSQI (SUBQI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 7), SUBWORDDIQI (GET_H_GR (FLD (f_right)), 7))));
-  {
-    DI opval = ADDDI (GET_H_GR (FLD (f_dest)), tmp_acc);
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-
-  return vpc;
-#undef FLD
-}
-
-/* mshaldsl: mshalds.l $rm, $rn, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,mshaldsl) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_add.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  SI tmp_result1;
-  SI tmp_result0;
-  tmp_result0 = ((LTDI (SLLDI (SUBWORDDISI (GET_H_GR (FLD (f_left)), 1), ANDDI (GET_H_GR (FLD (f_right)), 31)), NEGDI (SLLDI (1, SUBSI (32, 1))))) ? (NEGSI (SLLSI (1, SUBSI (32, 1)))) : (((LTDI (SLLDI (SUBWORDDISI (GET_H_GR (FLD (f_left)), 1), ANDDI (GET_H_GR (FLD (f_right)), 31)), SLLDI (1, SUBSI (32, 1)))) ? (SLLDI (SUBWORDDISI (GET_H_GR (FLD (f_left)), 1), ANDDI (GET_H_GR (FLD (f_right)), 31))) : (SUBSI (SLLSI (1, SUBSI (32, 1)), 1)))));
-  tmp_result1 = ((LTDI (SLLDI (SUBWORDDISI (GET_H_GR (FLD (f_left)), 0), ANDDI (GET_H_GR (FLD (f_right)), 31)), NEGDI (SLLDI (1, SUBSI (32, 1))))) ? (NEGSI (SLLSI (1, SUBSI (32, 1)))) : (((LTDI (SLLDI (SUBWORDDISI (GET_H_GR (FLD (f_left)), 0), ANDDI (GET_H_GR (FLD (f_right)), 31)), SLLDI (1, SUBSI (32, 1)))) ? (SLLDI (SUBWORDDISI (GET_H_GR (FLD (f_left)), 0), ANDDI (GET_H_GR (FLD (f_right)), 31))) : (SUBSI (SLLSI (1, SUBSI (32, 1)), 1)))));
-  {
-    DI opval = ORDI (SLLDI (ZEXTSIDI (tmp_result1), 32), ZEXTSIDI (tmp_result0));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-
-  return vpc;
-#undef FLD
-}
-
-/* mshaldsw: mshalds.w $rm, $rn, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,mshaldsw) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_add.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  HI tmp_result3;
-  HI tmp_result2;
-  HI tmp_result1;
-  HI tmp_result0;
-  tmp_result0 = ((LTDI (SLLDI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 3), ANDDI (GET_H_GR (FLD (f_right)), 15)), NEGDI (SLLDI (1, SUBSI (16, 1))))) ? (NEGHI (SLLHI (1, SUBSI (16, 1)))) : (((LTDI (SLLDI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 3), ANDDI (GET_H_GR (FLD (f_right)), 15)), SLLDI (1, SUBSI (16, 1)))) ? (SLLDI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 3), ANDDI (GET_H_GR (FLD (f_right)), 15))) : (SUBHI (SLLHI (1, SUBSI (16, 1)), 1)))));
-  tmp_result1 = ((LTDI (SLLDI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 2), ANDDI (GET_H_GR (FLD (f_right)), 15)), NEGDI (SLLDI (1, SUBSI (16, 1))))) ? (NEGHI (SLLHI (1, SUBSI (16, 1)))) : (((LTDI (SLLDI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 2), ANDDI (GET_H_GR (FLD (f_right)), 15)), SLLDI (1, SUBSI (16, 1)))) ? (SLLDI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 2), ANDDI (GET_H_GR (FLD (f_right)), 15))) : (SUBHI (SLLHI (1, SUBSI (16, 1)), 1)))));
-  tmp_result2 = ((LTDI (SLLDI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 1), ANDDI (GET_H_GR (FLD (f_right)), 15)), NEGDI (SLLDI (1, SUBSI (16, 1))))) ? (NEGHI (SLLHI (1, SUBSI (16, 1)))) : (((LTDI (SLLDI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 1), ANDDI (GET_H_GR (FLD (f_right)), 15)), SLLDI (1, SUBSI (16, 1)))) ? (SLLDI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 1), ANDDI (GET_H_GR (FLD (f_right)), 15))) : (SUBHI (SLLHI (1, SUBSI (16, 1)), 1)))));
-  tmp_result3 = ((LTDI (SLLDI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 0), ANDDI (GET_H_GR (FLD (f_right)), 15)), NEGDI (SLLDI (1, SUBSI (16, 1))))) ? (NEGHI (SLLHI (1, SUBSI (16, 1)))) : (((LTDI (SLLDI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 0), ANDDI (GET_H_GR (FLD (f_right)), 15)), SLLDI (1, SUBSI (16, 1)))) ? (SLLDI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 0), ANDDI (GET_H_GR (FLD (f_right)), 15))) : (SUBHI (SLLHI (1, SUBSI (16, 1)), 1)))));
-  {
-    DI opval = ORDI (SLLDI (ZEXTHIDI (tmp_result3), 48), ORDI (SLLDI (ZEXTHIDI (tmp_result2), 32), ORDI (SLLDI (ZEXTHIDI (tmp_result1), 16), ZEXTHIDI (tmp_result0))));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-
-  return vpc;
-#undef FLD
-}
-
-/* mshardl: mshard.l $rm, $rn, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,mshardl) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_add.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  SI tmp_result1;
-  SI tmp_result0;
-  tmp_result0 = SRASI (SUBWORDDISI (GET_H_GR (FLD (f_left)), 1), ANDDI (GET_H_GR (FLD (f_right)), 31));
-  tmp_result1 = SRASI (SUBWORDDISI (GET_H_GR (FLD (f_left)), 0), ANDDI (GET_H_GR (FLD (f_right)), 31));
-  {
-    DI opval = ORDI (SLLDI (ZEXTSIDI (tmp_result1), 32), ZEXTSIDI (tmp_result0));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-
-  return vpc;
-#undef FLD
-}
-
-/* mshardw: mshard.w $rm, $rn, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,mshardw) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_add.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  HI tmp_result3;
-  HI tmp_result2;
-  HI tmp_result1;
-  HI tmp_result0;
-  tmp_result0 = SRAHI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 3), ANDDI (GET_H_GR (FLD (f_right)), 15));
-  tmp_result1 = SRAHI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 2), ANDDI (GET_H_GR (FLD (f_right)), 15));
-  tmp_result2 = SRAHI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 1), ANDDI (GET_H_GR (FLD (f_right)), 15));
-  tmp_result3 = SRAHI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 0), ANDDI (GET_H_GR (FLD (f_right)), 15));
-  {
-    DI opval = ORDI (SLLDI (ZEXTHIDI (tmp_result3), 48), ORDI (SLLDI (ZEXTHIDI (tmp_result2), 32), ORDI (SLLDI (ZEXTHIDI (tmp_result1), 16), ZEXTHIDI (tmp_result0))));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-
-  return vpc;
-#undef FLD
-}
-
-/* mshardsq: mshards.q $rm, $rn, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,mshardsq) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_add.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = ((LTDI (SRADI (GET_H_GR (FLD (f_left)), ANDDI (GET_H_GR (FLD (f_right)), 63)), NEGDI (SLLDI (1, SUBSI (16, 1))))) ? (NEGDI (SLLDI (1, SUBSI (16, 1)))) : (((LTDI (SRADI (GET_H_GR (FLD (f_left)), ANDDI (GET_H_GR (FLD (f_right)), 63)), SLLDI (1, SUBSI (16, 1)))) ? (SRADI (GET_H_GR (FLD (f_left)), ANDDI (GET_H_GR (FLD (f_right)), 63))) : (SUBDI (SLLDI (1, SUBSI (16, 1)), 1)))));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* mshfhib: mshfhi.b $rm, $rn, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,mshfhib) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_add.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  QI tmp_result7;
-  QI tmp_result6;
-  QI tmp_result5;
-  QI tmp_result4;
-  QI tmp_result3;
-  QI tmp_result2;
-  QI tmp_result1;
-  QI tmp_result0;
-  tmp_result0 = SUBWORDDIQI (GET_H_GR (FLD (f_left)), 3);
-  tmp_result1 = SUBWORDDIQI (GET_H_GR (FLD (f_right)), 3);
-  tmp_result2 = SUBWORDDIQI (GET_H_GR (FLD (f_left)), 2);
-  tmp_result3 = SUBWORDDIQI (GET_H_GR (FLD (f_right)), 2);
-  tmp_result4 = SUBWORDDIQI (GET_H_GR (FLD (f_left)), 1);
-  tmp_result5 = SUBWORDDIQI (GET_H_GR (FLD (f_right)), 1);
-  tmp_result6 = SUBWORDDIQI (GET_H_GR (FLD (f_left)), 0);
-  tmp_result7 = SUBWORDDIQI (GET_H_GR (FLD (f_right)), 0);
-  {
-    DI opval = ORDI (SLLDI (ZEXTQIDI (tmp_result7), 56), ORDI (SLLDI (ZEXTQIDI (tmp_result6), 48), ORDI (SLLDI (ZEXTQIDI (tmp_result5), 40), ORDI (SLLDI (ZEXTQIDI (tmp_result4), 32), ORDI (SLLDI (ZEXTQIDI (tmp_result3), 24), ORDI (SLLDI (ZEXTQIDI (tmp_result2), 16), ORDI (SLLDI (ZEXTQIDI (tmp_result1), 8), ZEXTQIDI (tmp_result0))))))));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-
-  return vpc;
-#undef FLD
-}
-
-/* mshfhil: mshfhi.l $rm, $rn, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,mshfhil) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_add.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  SI tmp_result1;
-  SI tmp_result0;
-  tmp_result0 = SUBWORDDISI (GET_H_GR (FLD (f_left)), 0);
-  tmp_result1 = SUBWORDDISI (GET_H_GR (FLD (f_right)), 0);
-  {
-    DI opval = ORDI (SLLDI (ZEXTSIDI (tmp_result1), 32), ZEXTSIDI (tmp_result0));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-
-  return vpc;
-#undef FLD
-}
-
-/* mshfhiw: mshfhi.w $rm, $rn, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,mshfhiw) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_add.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  HI tmp_result3;
-  HI tmp_result2;
-  HI tmp_result1;
-  HI tmp_result0;
-  tmp_result0 = SUBWORDDIHI (GET_H_GR (FLD (f_left)), 1);
-  tmp_result1 = SUBWORDDIHI (GET_H_GR (FLD (f_right)), 1);
-  tmp_result2 = SUBWORDDIHI (GET_H_GR (FLD (f_left)), 0);
-  tmp_result3 = SUBWORDDIHI (GET_H_GR (FLD (f_right)), 0);
-  {
-    DI opval = ORDI (SLLDI (ZEXTHIDI (tmp_result3), 48), ORDI (SLLDI (ZEXTHIDI (tmp_result2), 32), ORDI (SLLDI (ZEXTHIDI (tmp_result1), 16), ZEXTHIDI (tmp_result0))));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-
-  return vpc;
-#undef FLD
-}
-
-/* mshflob: mshflo.b $rm, $rn, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,mshflob) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_add.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  QI tmp_result7;
-  QI tmp_result6;
-  QI tmp_result5;
-  QI tmp_result4;
-  QI tmp_result3;
-  QI tmp_result2;
-  QI tmp_result1;
-  QI tmp_result0;
-  tmp_result0 = SUBWORDDIQI (GET_H_GR (FLD (f_left)), 7);
-  tmp_result1 = SUBWORDDIQI (GET_H_GR (FLD (f_right)), 7);
-  tmp_result2 = SUBWORDDIQI (GET_H_GR (FLD (f_left)), 6);
-  tmp_result3 = SUBWORDDIQI (GET_H_GR (FLD (f_right)), 6);
-  tmp_result4 = SUBWORDDIQI (GET_H_GR (FLD (f_left)), 5);
-  tmp_result5 = SUBWORDDIQI (GET_H_GR (FLD (f_right)), 5);
-  tmp_result6 = SUBWORDDIQI (GET_H_GR (FLD (f_left)), 4);
-  tmp_result7 = SUBWORDDIQI (GET_H_GR (FLD (f_right)), 4);
-  {
-    DI opval = ORDI (SLLDI (ZEXTQIDI (tmp_result7), 56), ORDI (SLLDI (ZEXTQIDI (tmp_result6), 48), ORDI (SLLDI (ZEXTQIDI (tmp_result5), 40), ORDI (SLLDI (ZEXTQIDI (tmp_result4), 32), ORDI (SLLDI (ZEXTQIDI (tmp_result3), 24), ORDI (SLLDI (ZEXTQIDI (tmp_result2), 16), ORDI (SLLDI (ZEXTQIDI (tmp_result1), 8), ZEXTQIDI (tmp_result0))))))));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-
-  return vpc;
-#undef FLD
-}
-
-/* mshflol: mshflo.l $rm, $rn, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,mshflol) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_add.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  SI tmp_result1;
-  SI tmp_result0;
-  tmp_result0 = SUBWORDDISI (GET_H_GR (FLD (f_left)), 1);
-  tmp_result1 = SUBWORDDISI (GET_H_GR (FLD (f_right)), 1);
-  {
-    DI opval = ORDI (SLLDI (ZEXTSIDI (tmp_result1), 32), ZEXTSIDI (tmp_result0));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-
-  return vpc;
-#undef FLD
-}
-
-/* mshflow: mshflo.w $rm, $rn, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,mshflow) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_add.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  HI tmp_result3;
-  HI tmp_result2;
-  HI tmp_result1;
-  HI tmp_result0;
-  tmp_result0 = SUBWORDDIHI (GET_H_GR (FLD (f_left)), 3);
-  tmp_result1 = SUBWORDDIHI (GET_H_GR (FLD (f_right)), 3);
-  tmp_result2 = SUBWORDDIHI (GET_H_GR (FLD (f_left)), 2);
-  tmp_result3 = SUBWORDDIHI (GET_H_GR (FLD (f_right)), 2);
-  {
-    DI opval = ORDI (SLLDI (ZEXTHIDI (tmp_result3), 48), ORDI (SLLDI (ZEXTHIDI (tmp_result2), 32), ORDI (SLLDI (ZEXTHIDI (tmp_result1), 16), ZEXTHIDI (tmp_result0))));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-
-  return vpc;
-#undef FLD
-}
-
-/* mshlldl: mshlld.l $rm, $rn, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,mshlldl) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_add.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  SI tmp_result1;
-  SI tmp_result0;
-  tmp_result0 = SLLSI (SUBWORDDISI (GET_H_GR (FLD (f_left)), 1), ANDDI (GET_H_GR (FLD (f_right)), 31));
-  tmp_result1 = SLLSI (SUBWORDDISI (GET_H_GR (FLD (f_left)), 0), ANDDI (GET_H_GR (FLD (f_right)), 31));
-  {
-    DI opval = ORDI (SLLDI (ZEXTSIDI (tmp_result1), 32), ZEXTSIDI (tmp_result0));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-
-  return vpc;
-#undef FLD
-}
-
-/* mshlldw: mshlld.w $rm, $rn, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,mshlldw) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_add.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  HI tmp_result3;
-  HI tmp_result2;
-  HI tmp_result1;
-  HI tmp_result0;
-  tmp_result0 = SLLHI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 3), ANDDI (GET_H_GR (FLD (f_right)), 15));
-  tmp_result1 = SLLHI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 2), ANDDI (GET_H_GR (FLD (f_right)), 15));
-  tmp_result2 = SLLHI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 1), ANDDI (GET_H_GR (FLD (f_right)), 15));
-  tmp_result3 = SLLHI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 0), ANDDI (GET_H_GR (FLD (f_right)), 15));
-  {
-    DI opval = ORDI (SLLDI (ZEXTHIDI (tmp_result3), 48), ORDI (SLLDI (ZEXTHIDI (tmp_result2), 32), ORDI (SLLDI (ZEXTHIDI (tmp_result1), 16), ZEXTHIDI (tmp_result0))));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-
-  return vpc;
-#undef FLD
-}
-
-/* mshlrdl: mshlrd.l $rm, $rn, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,mshlrdl) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_add.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  SI tmp_result1;
-  SI tmp_result0;
-  tmp_result0 = SRLSI (SUBWORDDISI (GET_H_GR (FLD (f_left)), 1), ANDDI (GET_H_GR (FLD (f_right)), 31));
-  tmp_result1 = SRLSI (SUBWORDDISI (GET_H_GR (FLD (f_left)), 0), ANDDI (GET_H_GR (FLD (f_right)), 31));
-  {
-    DI opval = ORDI (SLLDI (ZEXTSIDI (tmp_result1), 32), ZEXTSIDI (tmp_result0));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-
-  return vpc;
-#undef FLD
-}
-
-/* mshlrdw: mshlrd.w $rm, $rn, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,mshlrdw) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_add.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  HI tmp_result3;
-  HI tmp_result2;
-  HI tmp_result1;
-  HI tmp_result0;
-  tmp_result0 = SRLHI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 3), ANDDI (GET_H_GR (FLD (f_right)), 15));
-  tmp_result1 = SRLHI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 2), ANDDI (GET_H_GR (FLD (f_right)), 15));
-  tmp_result2 = SRLHI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 1), ANDDI (GET_H_GR (FLD (f_right)), 15));
-  tmp_result3 = SRLHI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 0), ANDDI (GET_H_GR (FLD (f_right)), 15));
-  {
-    DI opval = ORDI (SLLDI (ZEXTHIDI (tmp_result3), 48), ORDI (SLLDI (ZEXTHIDI (tmp_result2), 32), ORDI (SLLDI (ZEXTHIDI (tmp_result1), 16), ZEXTHIDI (tmp_result0))));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-
-  return vpc;
-#undef FLD
-}
-
-/* msubl: msub.l $rm, $rn, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,msubl) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_add.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  SI tmp_result1;
-  SI tmp_result0;
-  tmp_result0 = SUBSI (SUBWORDDISI (GET_H_GR (FLD (f_left)), 1), SUBWORDDISI (GET_H_GR (FLD (f_right)), 1));
-  tmp_result1 = SUBSI (SUBWORDDISI (GET_H_GR (FLD (f_left)), 0), SUBWORDDISI (GET_H_GR (FLD (f_right)), 0));
-  {
-    DI opval = ORDI (SLLDI (ZEXTSIDI (tmp_result1), 32), ZEXTSIDI (tmp_result0));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-
-  return vpc;
-#undef FLD
-}
-
-/* msubw: msub.w $rm, $rn, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,msubw) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_add.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  HI tmp_result3;
-  HI tmp_result2;
-  HI tmp_result1;
-  HI tmp_result0;
-  tmp_result0 = SUBHI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 3), SUBWORDDIHI (GET_H_GR (FLD (f_right)), 3));
-  tmp_result1 = SUBHI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 2), SUBWORDDIHI (GET_H_GR (FLD (f_right)), 2));
-  tmp_result2 = SUBHI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 1), SUBWORDDIHI (GET_H_GR (FLD (f_right)), 1));
-  tmp_result3 = SUBHI (SUBWORDDIHI (GET_H_GR (FLD (f_left)), 0), SUBWORDDIHI (GET_H_GR (FLD (f_right)), 0));
-  {
-    DI opval = ORDI (SLLDI (ZEXTHIDI (tmp_result3), 48), ORDI (SLLDI (ZEXTHIDI (tmp_result2), 32), ORDI (SLLDI (ZEXTHIDI (tmp_result1), 16), ZEXTHIDI (tmp_result0))));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-
-  return vpc;
-#undef FLD
-}
-
-/* msubsl: msubs.l $rm, $rn, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,msubsl) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_add.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  SI tmp_result1;
-  SI tmp_result0;
-  tmp_result0 = ((LTDI (SUBDI (EXTSIDI (SUBWORDDISI (GET_H_GR (FLD (f_left)), 1)), EXTSIDI (SUBWORDDISI (GET_H_GR (FLD (f_right)), 1))), NEGDI (SLLDI (1, SUBSI (32, 1))))) ? (NEGSI (SLLSI (1, SUBSI (32, 1)))) : (((LTDI (SUBDI (EXTSIDI (SUBWORDDISI (GET_H_GR (FLD (f_left)), 1)), EXTSIDI (SUBWORDDISI (GET_H_GR (FLD (f_right)), 1))), SLLDI (1, SUBSI (32, 1)))) ? (SUBDI (EXTSIDI (SUBWORDDISI (GET_H_GR (FLD (f_left)), 1)), EXTSIDI (SUBWORDDISI (GET_H_GR (FLD (f_right)), 1)))) : (SUBSI (SLLSI (1, SUBSI (32, 1)), 1)))));
-  tmp_result1 = ((LTDI (SUBDI (EXTSIDI (SUBWORDDISI (GET_H_GR (FLD (f_left)), 0)), EXTSIDI (SUBWORDDISI (GET_H_GR (FLD (f_right)), 0))), NEGDI (SLLDI (1, SUBSI (32, 1))))) ? (NEGSI (SLLSI (1, SUBSI (32, 1)))) : (((LTDI (SUBDI (EXTSIDI (SUBWORDDISI (GET_H_GR (FLD (f_left)), 0)), EXTSIDI (SUBWORDDISI (GET_H_GR (FLD (f_right)), 0))), SLLDI (1, SUBSI (32, 1)))) ? (SUBDI (EXTSIDI (SUBWORDDISI (GET_H_GR (FLD (f_left)), 0)), EXTSIDI (SUBWORDDISI (GET_H_GR (FLD (f_right)), 0)))) : (SUBSI (SLLSI (1, SUBSI (32, 1)), 1)))));
-  {
-    DI opval = ORDI (SLLDI (ZEXTSIDI (tmp_result1), 32), ZEXTSIDI (tmp_result0));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-
-  return vpc;
-#undef FLD
-}
-
-/* msubsub: msubs.ub $rm, $rn, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,msubsub) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_add.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  QI tmp_result7;
-  QI tmp_result6;
-  QI tmp_result5;
-  QI tmp_result4;
-  QI tmp_result3;
-  QI tmp_result2;
-  QI tmp_result1;
-  QI tmp_result0;
-  tmp_result0 = ((LTDI (SUBDI (ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 7)), ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 7))), MAKEDI (0, 0))) ? (0) : (((LTDI (SUBDI (ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 7)), ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 7))), SLLDI (1, 8))) ? (SUBDI (ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 7)), ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 7)))) : (SUBQI (SLLQI (1, 8), 1)))));
-  tmp_result1 = ((LTDI (SUBDI (ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 6)), ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 6))), MAKEDI (0, 0))) ? (0) : (((LTDI (SUBDI (ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 6)), ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 6))), SLLDI (1, 8))) ? (SUBDI (ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 6)), ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 6)))) : (SUBQI (SLLQI (1, 8), 1)))));
-  tmp_result2 = ((LTDI (SUBDI (ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 5)), ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 5))), MAKEDI (0, 0))) ? (0) : (((LTDI (SUBDI (ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 5)), ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 5))), SLLDI (1, 8))) ? (SUBDI (ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 5)), ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 5)))) : (SUBQI (SLLQI (1, 8), 1)))));
-  tmp_result3 = ((LTDI (SUBDI (ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 4)), ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 4))), MAKEDI (0, 0))) ? (0) : (((LTDI (SUBDI (ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 4)), ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 4))), SLLDI (1, 8))) ? (SUBDI (ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 4)), ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 4)))) : (SUBQI (SLLQI (1, 8), 1)))));
-  tmp_result4 = ((LTDI (SUBDI (ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 3)), ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 3))), MAKEDI (0, 0))) ? (0) : (((LTDI (SUBDI (ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 3)), ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 3))), SLLDI (1, 8))) ? (SUBDI (ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 3)), ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 3)))) : (SUBQI (SLLQI (1, 8), 1)))));
-  tmp_result5 = ((LTDI (SUBDI (ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 2)), ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 2))), MAKEDI (0, 0))) ? (0) : (((LTDI (SUBDI (ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 2)), ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 2))), SLLDI (1, 8))) ? (SUBDI (ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 2)), ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 2)))) : (SUBQI (SLLQI (1, 8), 1)))));
-  tmp_result6 = ((LTDI (SUBDI (ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 1)), ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 1))), MAKEDI (0, 0))) ? (0) : (((LTDI (SUBDI (ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 1)), ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 1))), SLLDI (1, 8))) ? (SUBDI (ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 1)), ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 1)))) : (SUBQI (SLLQI (1, 8), 1)))));
-  tmp_result7 = ((LTDI (SUBDI (ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 0)), ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 0))), MAKEDI (0, 0))) ? (0) : (((LTDI (SUBDI (ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 0)), ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 0))), SLLDI (1, 8))) ? (SUBDI (ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 0)), ZEXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 0)))) : (SUBQI (SLLQI (1, 8), 1)))));
-  {
-    DI opval = ORDI (SLLDI (ZEXTQIDI (tmp_result7), 56), ORDI (SLLDI (ZEXTQIDI (tmp_result6), 48), ORDI (SLLDI (ZEXTQIDI (tmp_result5), 40), ORDI (SLLDI (ZEXTQIDI (tmp_result4), 32), ORDI (SLLDI (ZEXTQIDI (tmp_result3), 24), ORDI (SLLDI (ZEXTQIDI (tmp_result2), 16), ORDI (SLLDI (ZEXTQIDI (tmp_result1), 8), ZEXTQIDI (tmp_result0))))))));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-
-  return vpc;
-#undef FLD
-}
-
-/* msubsw: msubs.w $rm, $rn, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,msubsw) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_add.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  QI tmp_result7;
-  QI tmp_result6;
-  QI tmp_result5;
-  QI tmp_result4;
-  QI tmp_result3;
-  QI tmp_result2;
-  QI tmp_result1;
-  QI tmp_result0;
-  tmp_result0 = ((LTDI (SUBDI (EXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 7)), EXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 7))), NEGDI (SLLDI (1, SUBSI (16, 1))))) ? (NEGHI (SLLHI (1, SUBSI (16, 1)))) : (((LTDI (SUBDI (EXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 7)), EXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 7))), SLLDI (1, SUBSI (16, 1)))) ? (SUBDI (EXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 7)), EXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 7)))) : (SUBHI (SLLHI (1, SUBSI (16, 1)), 1)))));
-  tmp_result1 = ((LTDI (SUBDI (EXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 6)), EXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 6))), NEGDI (SLLDI (1, SUBSI (16, 1))))) ? (NEGHI (SLLHI (1, SUBSI (16, 1)))) : (((LTDI (SUBDI (EXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 6)), EXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 6))), SLLDI (1, SUBSI (16, 1)))) ? (SUBDI (EXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 6)), EXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 6)))) : (SUBHI (SLLHI (1, SUBSI (16, 1)), 1)))));
-  tmp_result2 = ((LTDI (SUBDI (EXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 5)), EXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 5))), NEGDI (SLLDI (1, SUBSI (16, 1))))) ? (NEGHI (SLLHI (1, SUBSI (16, 1)))) : (((LTDI (SUBDI (EXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 5)), EXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 5))), SLLDI (1, SUBSI (16, 1)))) ? (SUBDI (EXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 5)), EXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 5)))) : (SUBHI (SLLHI (1, SUBSI (16, 1)), 1)))));
-  tmp_result3 = ((LTDI (SUBDI (EXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 4)), EXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 4))), NEGDI (SLLDI (1, SUBSI (16, 1))))) ? (NEGHI (SLLHI (1, SUBSI (16, 1)))) : (((LTDI (SUBDI (EXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 4)), EXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 4))), SLLDI (1, SUBSI (16, 1)))) ? (SUBDI (EXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 4)), EXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 4)))) : (SUBHI (SLLHI (1, SUBSI (16, 1)), 1)))));
-  tmp_result4 = ((LTDI (SUBDI (EXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 3)), EXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 3))), NEGDI (SLLDI (1, SUBSI (16, 1))))) ? (NEGHI (SLLHI (1, SUBSI (16, 1)))) : (((LTDI (SUBDI (EXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 3)), EXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 3))), SLLDI (1, SUBSI (16, 1)))) ? (SUBDI (EXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 3)), EXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 3)))) : (SUBHI (SLLHI (1, SUBSI (16, 1)), 1)))));
-  tmp_result5 = ((LTDI (SUBDI (EXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 2)), EXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 2))), NEGDI (SLLDI (1, SUBSI (16, 1))))) ? (NEGHI (SLLHI (1, SUBSI (16, 1)))) : (((LTDI (SUBDI (EXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 2)), EXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 2))), SLLDI (1, SUBSI (16, 1)))) ? (SUBDI (EXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 2)), EXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 2)))) : (SUBHI (SLLHI (1, SUBSI (16, 1)), 1)))));
-  tmp_result6 = ((LTDI (SUBDI (EXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 1)), EXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 1))), NEGDI (SLLDI (1, SUBSI (16, 1))))) ? (NEGHI (SLLHI (1, SUBSI (16, 1)))) : (((LTDI (SUBDI (EXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 1)), EXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 1))), SLLDI (1, SUBSI (16, 1)))) ? (SUBDI (EXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 1)), EXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 1)))) : (SUBHI (SLLHI (1, SUBSI (16, 1)), 1)))));
-  tmp_result7 = ((LTDI (SUBDI (EXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 0)), EXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 0))), NEGDI (SLLDI (1, SUBSI (16, 1))))) ? (NEGHI (SLLHI (1, SUBSI (16, 1)))) : (((LTDI (SUBDI (EXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 0)), EXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 0))), SLLDI (1, SUBSI (16, 1)))) ? (SUBDI (EXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_left)), 0)), EXTQIDI (SUBWORDDIQI (GET_H_GR (FLD (f_right)), 0)))) : (SUBHI (SLLHI (1, SUBSI (16, 1)), 1)))));
-  {
-    DI opval = ORDI (SLLDI (ZEXTQIDI (tmp_result7), 56), ORDI (SLLDI (ZEXTQIDI (tmp_result6), 48), ORDI (SLLDI (ZEXTQIDI (tmp_result5), 40), ORDI (SLLDI (ZEXTQIDI (tmp_result4), 32), ORDI (SLLDI (ZEXTQIDI (tmp_result3), 24), ORDI (SLLDI (ZEXTQIDI (tmp_result2), 16), ORDI (SLLDI (ZEXTQIDI (tmp_result1), 8), ZEXTQIDI (tmp_result0))))))));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-
-  return vpc;
-#undef FLD
-}
-
-/* mulsl: muls.l $rm, $rn, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,mulsl) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_add.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = MULDI (EXTSIDI (SUBWORDDISI (GET_H_GR (FLD (f_left)), 1)), EXTSIDI (SUBWORDDISI (GET_H_GR (FLD (f_right)), 1)));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* mulul: mulu.l $rm, $rn, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,mulul) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_add.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = MULDI (ZEXTSIDI (SUBWORDDISI (GET_H_GR (FLD (f_left)), 1)), ZEXTSIDI (SUBWORDDISI (GET_H_GR (FLD (f_right)), 1)));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* nop: nop */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,nop) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.fmt_empty.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-((void) 0); /*nop*/
-
-  return vpc;
-#undef FLD
-}
-
-/* nsb: nsb $rm, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,nsb) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_xori.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = sh64_nsb (current_cpu, GET_H_GR (FLD (f_left)));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* ocbi: ocbi $rm, $disp6x32 */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,ocbi) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.fmt_empty.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-((void) 0); /*nop*/
-
-  return vpc;
-#undef FLD
-}
-
-/* ocbp: ocbp $rm, $disp6x32 */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,ocbp) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.fmt_empty.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-((void) 0); /*nop*/
-
-  return vpc;
-#undef FLD
-}
-
-/* ocbwb: ocbwb $rm, $disp6x32 */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,ocbwb) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.fmt_empty.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-((void) 0); /*nop*/
-
-  return vpc;
-#undef FLD
-}
-
-/* or: or $rm, $rn, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,or) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_add.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = ORDI (GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right)));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* ori: ori $rm, $imm10, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,ori) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_ori.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = ORDI (GET_H_GR (FLD (f_left)), EXTSIDI (FLD (f_imm10)));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* prefi: prefi $rm, $disp6x32 */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,prefi) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.fmt_empty.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-((void) 0); /*nop*/
-
-  return vpc;
-#undef FLD
-}
-
-/* pta: pta$likely $disp16, $tra */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,pta) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_pta.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = ADDSI (FLD (f_disp16), 1);
-    CPU (h_tr[FLD (f_tra)]) = opval;
-    TRACE_RESULT (current_cpu, abuf, "tr", 'D', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* ptabs: ptabs$likely $rn, $tra */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,ptabs) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_beq.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = GET_H_GR (FLD (f_right));
-    CPU (h_tr[FLD (f_tra)]) = opval;
-    TRACE_RESULT (current_cpu, abuf, "tr", 'D', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* ptb: ptb$likely $disp16, $tra */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,ptb) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_pta.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = FLD (f_disp16);
-    CPU (h_tr[FLD (f_tra)]) = opval;
-    TRACE_RESULT (current_cpu, abuf, "tr", 'D', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* ptrel: ptrel$likely $rn, $tra */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,ptrel) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_beq.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = ADDDI (pc, GET_H_GR (FLD (f_right)));
-    CPU (h_tr[FLD (f_tra)]) = opval;
-    TRACE_RESULT (current_cpu, abuf, "tr", 'D', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* putcfg: putcfg $rm, $disp6, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,putcfg) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.fmt_empty.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-((void) 0); /*nop*/
-
-  return vpc;
-#undef FLD
-}
-
-/* putcon: putcon $rm, $crj */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,putcon) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_xori.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = GET_H_GR (FLD (f_left));
-    SET_H_CR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "cr", 'D', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* rte: rte */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,rte) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.fmt_empty.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-((void) 0); /*nop*/
-
-  return vpc;
-#undef FLD
-}
-
-/* shard: shard $rm, $rn, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,shard) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_add.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = SRADI (GET_H_GR (FLD (f_left)), ANDDI (GET_H_GR (FLD (f_right)), 63));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* shardl: shard.l $rm, $rn, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,shardl) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_add.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = EXTSIDI (SRASI (SUBWORDDISI (GET_H_GR (FLD (f_left)), 1), ANDDI (GET_H_GR (FLD (f_right)), 63)));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* shari: shari $rm, $uimm6, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,shari) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_shari.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = SRADI (GET_H_GR (FLD (f_left)), FLD (f_uimm6));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* sharil: shari.l $rm, $uimm6, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,sharil) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_shari.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = EXTSIDI (SRASI (SUBWORDDISI (GET_H_GR (FLD (f_left)), 1), ANDSI (FLD (f_uimm6), 63)));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* shlld: shlld $rm, $rn, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,shlld) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_add.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = SLLDI (GET_H_GR (FLD (f_left)), ANDDI (GET_H_GR (FLD (f_right)), 63));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* shlldl: shlld.l $rm, $rn, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,shlldl) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_add.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = EXTSIDI (SLLSI (SUBWORDDISI (GET_H_GR (FLD (f_left)), 1), ANDDI (GET_H_GR (FLD (f_right)), 63)));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* shlli: shlli $rm, $uimm6, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,shlli) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_shari.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = SLLDI (GET_H_GR (FLD (f_left)), FLD (f_uimm6));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* shllil: shlli.l $rm, $uimm6, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,shllil) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_shari.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = EXTSIDI (SLLSI (SUBWORDDISI (GET_H_GR (FLD (f_left)), 1), ANDSI (FLD (f_uimm6), 63)));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* shlrd: shlrd $rm, $rn, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,shlrd) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_add.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = SRLDI (GET_H_GR (FLD (f_left)), ANDDI (GET_H_GR (FLD (f_right)), 63));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* shlrdl: shlrd.l $rm, $rn, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,shlrdl) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_add.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = EXTSIDI (SRLSI (SUBWORDDISI (GET_H_GR (FLD (f_left)), 1), ANDDI (GET_H_GR (FLD (f_right)), 63)));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* shlri: shlri $rm, $uimm6, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,shlri) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_shari.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = SRLDI (GET_H_GR (FLD (f_left)), FLD (f_uimm6));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* shlril: shlri.l $rm, $uimm6, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,shlril) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_shari.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = EXTSIDI (SRLSI (SUBWORDDISI (GET_H_GR (FLD (f_left)), 1), ANDSI (FLD (f_uimm6), 63)));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* shori: shori $uimm16, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,shori) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_shori.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = ORDI (SLLDI (GET_H_GR (FLD (f_dest)), 16), ZEXTSIDI (FLD (f_uimm16)));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* sleep: sleep */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,sleep) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.fmt_empty.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-((void) 0); /*nop*/
-
-  return vpc;
-#undef FLD
-}
-
-/* stb: st.b $rm, $disp10, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,stb) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_addi.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    UQI opval = ANDQI (GET_H_GR (FLD (f_dest)), 255);
-    SETMEMUQI (current_cpu, pc, ADDDI (GET_H_GR (FLD (f_left)), EXTSIDI (FLD (f_disp10))), opval);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* stl: st.l $rm, $disp10x4, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,stl) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_flds.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    SI opval = ANDSI (GET_H_GR (FLD (f_dest)), 0xffffffff);
-    SETMEMSI (current_cpu, pc, ADDDI (GET_H_GR (FLD (f_left)), EXTSIDI (FLD (f_disp10x4))), opval);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* stq: st.q $rm, $disp10x8, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,stq) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_fldd.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = GET_H_GR (FLD (f_dest));
-    SETMEMDI (current_cpu, pc, ADDDI (GET_H_GR (FLD (f_left)), EXTSIDI (FLD (f_disp10x8))), opval);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'D', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* stw: st.w $rm, $disp10x2, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,stw) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_lduw.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    HI opval = ANDHI (GET_H_GR (FLD (f_dest)), 65535);
-    SETMEMHI (current_cpu, pc, ADDDI (GET_H_GR (FLD (f_left)), EXTSIDI (FLD (f_disp10x2))), opval);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* sthil: sthi.l $rm, $disp6, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,sthil) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_ldhil.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  DI tmp_addr;
-  QI tmp_bytecount;
-  DI tmp_val;
-  tmp_addr = ADDDI (GET_H_GR (FLD (f_left)), FLD (f_disp6));
-  tmp_bytecount = ADDDI (ANDDI (tmp_addr, 3), 1);
-if (ANDQI (tmp_bytecount, 4)) {
-  {
-    SI opval = GET_H_GR (FLD (f_dest));
-    SETMEMSI (current_cpu, pc, ANDDI (tmp_addr, -4), opval);
-    written |= (1 << 5);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
-  }
-} else {
-if (GET_H_ENDIAN ()) {
-{
-  tmp_val = GET_H_GR (FLD (f_dest));
-if (ANDQI (tmp_bytecount, 1)) {
-{
-  {
-    UQI opval = ANDQI (tmp_val, 255);
-    SETMEMUQI (current_cpu, pc, tmp_addr, opval);
-    written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
-  }
-  tmp_val = SRLDI (tmp_val, 8);
-}
-}
-if (ANDQI (tmp_bytecount, 2)) {
-{
-  {
-    HI opval = ANDHI (tmp_val, 65535);
-    SETMEMHI (current_cpu, pc, ANDDI (tmp_addr, -4), opval);
-    written |= (1 << 4);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
-  }
-  tmp_val = SRLDI (tmp_val, 16);
-}
-}
-}
-} else {
-{
-  tmp_val = SRLDI (GET_H_GR (FLD (f_dest)), SUBSI (32, MULSI (8, tmp_bytecount)));
-if (ANDQI (tmp_bytecount, 2)) {
-{
-  {
-    HI opval = ANDHI (tmp_val, 65535);
-    SETMEMHI (current_cpu, pc, ANDDI (tmp_addr, -4), opval);
-    written |= (1 << 4);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
-  }
-  tmp_val = SRLDI (tmp_val, 16);
-}
-}
-if (ANDQI (tmp_bytecount, 1)) {
-{
-  {
-    UQI opval = ANDQI (tmp_val, 255);
-    SETMEMUQI (current_cpu, pc, tmp_addr, opval);
-    written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
-  }
-  tmp_val = SRLDI (tmp_val, 8);
-}
-}
-}
-}
-}
-}
-
-  abuf->written = written;
-  return vpc;
-#undef FLD
-}
-
-/* sthiq: sthi.q $rm, $disp6, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,sthiq) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_ldhil.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  DI tmp_addr;
-  QI tmp_bytecount;
-  DI tmp_val;
-  tmp_addr = ADDDI (GET_H_GR (FLD (f_left)), FLD (f_disp6));
-  tmp_bytecount = ADDDI (ANDDI (tmp_addr, 7), 1);
-if (ANDQI (tmp_bytecount, 8)) {
-  {
-    DI opval = GET_H_GR (FLD (f_dest));
-    SETMEMDI (current_cpu, pc, ANDDI (tmp_addr, -8), opval);
-    written |= (1 << 4);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'D', opval);
-  }
-} else {
-if (GET_H_ENDIAN ()) {
-{
-  tmp_val = GET_H_GR (FLD (f_dest));
-if (ANDQI (tmp_bytecount, 1)) {
-{
-  {
-    UQI opval = ANDQI (tmp_val, 255);
-    SETMEMUQI (current_cpu, pc, tmp_addr, opval);
-    written |= (1 << 7);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
-  }
-  tmp_val = SRLDI (tmp_val, 8);
-}
-}
-if (ANDQI (tmp_bytecount, 2)) {
-{
-  {
-    HI opval = ANDHI (tmp_val, 65535);
-    SETMEMHI (current_cpu, pc, ANDDI (tmp_addr, -4), opval);
-    written |= (1 << 5);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
-  }
-  tmp_val = SRLDI (tmp_val, 16);
-}
-}
-if (ANDQI (tmp_bytecount, 4)) {
-{
-  {
-    SI opval = ANDSI (tmp_val, 0xffffffff);
-    SETMEMSI (current_cpu, pc, ANDDI (tmp_addr, -8), opval);
-    written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
-  }
-  tmp_val = SRLDI (tmp_val, 32);
-}
-}
-}
-} else {
-{
-  tmp_val = SRLDI (GET_H_GR (FLD (f_dest)), SUBSI (64, MULSI (8, tmp_bytecount)));
-if (ANDQI (tmp_bytecount, 4)) {
-{
-  {
-    SI opval = ANDSI (tmp_val, 0xffffffff);
-    SETMEMSI (current_cpu, pc, ANDDI (tmp_addr, -8), opval);
-    written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
-  }
-  tmp_val = SRLDI (tmp_val, 32);
-}
-}
-if (ANDQI (tmp_bytecount, 2)) {
-{
-  {
-    HI opval = ANDHI (tmp_val, 65535);
-    SETMEMHI (current_cpu, pc, ANDDI (tmp_addr, -4), opval);
-    written |= (1 << 5);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
-  }
-  tmp_val = SRLDI (tmp_val, 16);
-}
-}
-if (ANDQI (tmp_bytecount, 1)) {
-{
-  {
-    UQI opval = ANDQI (tmp_val, 255);
-    SETMEMUQI (current_cpu, pc, tmp_addr, opval);
-    written |= (1 << 7);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
-  }
-  tmp_val = SRLDI (tmp_val, 8);
-}
-}
-}
-}
-}
-}
-
-  abuf->written = written;
-  return vpc;
-#undef FLD
-}
-
-/* stlol: stlo.l $rm, $disp6, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,stlol) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_ldhil.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  DI tmp_addr;
-  QI tmp_bytecount;
-  DI tmp_val;
-  tmp_addr = ADDDI (GET_H_GR (FLD (f_left)), FLD (f_disp6));
-  tmp_bytecount = SUBSI (4, ANDDI (tmp_addr, 3));
-if (ANDQI (tmp_bytecount, 4)) {
-  {
-    USI opval = GET_H_GR (FLD (f_dest));
-    SETMEMUSI (current_cpu, pc, tmp_addr, opval);
-    written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
-  }
-} else {
-if (GET_H_ENDIAN ()) {
-{
-  tmp_val = SRLDI (GET_H_GR (FLD (f_dest)), SUBSI (32, MULSI (8, tmp_bytecount)));
-if (ANDQI (tmp_bytecount, 2)) {
-{
-  {
-    UHI opval = ANDHI (tmp_val, 65535);
-    SETMEMUHI (current_cpu, pc, ANDDI (ADDDI (tmp_addr, 1), -2), opval);
-    written |= (1 << 4);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
-  }
-  tmp_val = SRLDI (tmp_val, 16);
-}
-}
-if (ANDQI (tmp_bytecount, 1)) {
-{
-  {
-    UQI opval = ANDQI (tmp_val, 255);
-    SETMEMUQI (current_cpu, pc, tmp_addr, opval);
-    written |= (1 << 5);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
-  }
-  tmp_val = SRLDI (tmp_val, 8);
-}
-}
-}
-} else {
-{
-  tmp_val = GET_H_GR (FLD (f_dest));
-if (ANDQI (tmp_bytecount, 1)) {
-{
-  {
-    UQI opval = ANDQI (tmp_val, 255);
-    SETMEMUQI (current_cpu, pc, tmp_addr, opval);
-    written |= (1 << 5);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
-  }
-  tmp_val = SRLDI (tmp_val, 8);
-}
-}
-if (ANDQI (tmp_bytecount, 2)) {
-{
-  {
-    UHI opval = ANDHI (tmp_val, 65535);
-    SETMEMUHI (current_cpu, pc, ANDDI (ADDDI (tmp_addr, 1), -2), opval);
-    written |= (1 << 4);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
-  }
-  tmp_val = SRLDI (tmp_val, 16);
-}
-}
-}
-}
-}
-}
-
-  abuf->written = written;
-  return vpc;
-#undef FLD
-}
-
-/* stloq: stlo.q $rm, $disp6, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,stloq) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_ldhil.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  DI tmp_addr;
-  QI tmp_bytecount;
-  DI tmp_val;
-  tmp_addr = ADDDI (GET_H_GR (FLD (f_left)), FLD (f_disp6));
-  tmp_bytecount = SUBSI (8, ANDDI (tmp_addr, 7));
-if (ANDQI (tmp_bytecount, 8)) {
-  {
-    UDI opval = GET_H_GR (FLD (f_dest));
-    SETMEMUDI (current_cpu, pc, tmp_addr, opval);
-    written |= (1 << 4);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'D', opval);
-  }
-} else {
-if (GET_H_ENDIAN ()) {
-{
-  tmp_val = SRLDI (GET_H_GR (FLD (f_dest)), SUBSI (64, MULSI (8, tmp_bytecount)));
-if (ANDQI (tmp_bytecount, 4)) {
-{
-  {
-    USI opval = ANDSI (tmp_val, 0xffffffff);
-    SETMEMUSI (current_cpu, pc, ANDDI (ADDDI (tmp_addr, 3), -4), opval);
-    written |= (1 << 7);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
-  }
-  tmp_val = SRLDI (tmp_val, 32);
-}
-}
-if (ANDQI (tmp_bytecount, 2)) {
-{
-  {
-    UHI opval = ANDHI (tmp_val, 65535);
-    SETMEMUHI (current_cpu, pc, ANDDI (ADDDI (tmp_addr, 1), -2), opval);
-    written |= (1 << 5);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
-  }
-  tmp_val = SRLDI (tmp_val, 16);
-}
-}
-if (ANDQI (tmp_bytecount, 1)) {
-{
-  {
-    UQI opval = ANDQI (tmp_val, 255);
-    SETMEMUQI (current_cpu, pc, tmp_addr, opval);
-    written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
-  }
-  tmp_val = SRLDI (tmp_val, 8);
-}
-}
-}
-} else {
-{
-  tmp_val = GET_H_GR (FLD (f_dest));
-if (ANDQI (tmp_bytecount, 1)) {
-{
-  {
-    UQI opval = ANDQI (tmp_val, 255);
-    SETMEMUQI (current_cpu, pc, tmp_addr, opval);
-    written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
-  }
-  tmp_val = SRLDI (tmp_val, 8);
-}
-}
-if (ANDQI (tmp_bytecount, 2)) {
-{
-  {
-    UHI opval = ANDHI (tmp_val, 65535);
-    SETMEMUHI (current_cpu, pc, ANDDI (ADDDI (tmp_addr, 1), -2), opval);
-    written |= (1 << 5);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
-  }
-  tmp_val = SRLDI (tmp_val, 16);
-}
-}
-if (ANDQI (tmp_bytecount, 4)) {
-{
-  {
-    USI opval = ANDSI (tmp_val, 0xffffffff);
-    SETMEMUSI (current_cpu, pc, ANDDI (ADDDI (tmp_addr, 3), -4), opval);
-    written |= (1 << 7);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
-  }
-  tmp_val = SRLDI (tmp_val, 32);
-}
-}
-}
-}
-}
-}
-
-  abuf->written = written;
-  return vpc;
-#undef FLD
-}
-
-/* stxb: stx.b $rm, $rn, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,stxb) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_add.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    UQI opval = SUBWORDDIQI (GET_H_GR (FLD (f_dest)), 7);
-    SETMEMUQI (current_cpu, pc, ADDDI (GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right))), opval);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* stxl: stx.l $rm, $rn, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,stxl) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_add.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    SI opval = SUBWORDDISI (GET_H_GR (FLD (f_dest)), 1);
-    SETMEMSI (current_cpu, pc, ADDDI (GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right))), opval);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* stxq: stx.q $rm, $rn, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,stxq) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_add.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = GET_H_GR (FLD (f_dest));
-    SETMEMDI (current_cpu, pc, ADDDI (GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right))), opval);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'D', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* stxw: stx.w $rm, $rn, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,stxw) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_add.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    HI opval = SUBWORDDIHI (GET_H_GR (FLD (f_dest)), 3);
-    SETMEMHI (current_cpu, pc, ADDDI (GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right))), opval);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* sub: sub $rm, $rn, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,sub) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_add.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = SUBDI (GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right)));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* subl: sub.l $rm, $rn, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,subl) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_add.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = EXTSIDI (SUBSI (SUBWORDDISI (GET_H_GR (FLD (f_left)), 1), SUBWORDDISI (GET_H_GR (FLD (f_right)), 1)));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* swapq: swap.q $rm, $rn, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,swapq) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_add.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  DI tmp_addr;
-  DI tmp_temp;
-  tmp_addr = ADDDI (GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right)));
-  tmp_temp = GETMEMDI (current_cpu, pc, tmp_addr);
-  {
-    DI opval = GET_H_GR (FLD (f_dest));
-    SETMEMDI (current_cpu, pc, tmp_addr, opval);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'D', opval);
-  }
-  {
-    DI opval = tmp_temp;
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-}
-
-  return vpc;
-#undef FLD
-}
-
-/* synci: synci */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,synci) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.fmt_empty.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-((void) 0); /*nop*/
-
-  return vpc;
-#undef FLD
-}
-
-/* synco: synco */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,synco) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.fmt_empty.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-((void) 0); /*nop*/
-
-  return vpc;
-#undef FLD
-}
-
-/* trapa: trapa $rm */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,trapa) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_xori.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-sh64_trapa (current_cpu, GET_H_GR (FLD (f_left)), pc);
-
-  return vpc;
-#undef FLD
-}
-
-/* xor: xor $rm, $rn, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,xor) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_add.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = XORDI (GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right)));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* xori: xori $rm, $imm6, $rd */
-
-static SEM_PC
-SEM_FN_NAME (sh64_media,xori) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_xori.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-  {
-    DI opval = XORDI (GET_H_GR (FLD (f_left)), EXTSIDI (FLD (f_imm6)));
-    SET_H_GR (FLD (f_dest), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
-  }
-
-  return vpc;
-#undef FLD
-}
-
-/* Table of all semantic fns.  */
-
-static const struct sem_fn_desc sem_fns[] = {
-  { SH64_MEDIA_INSN_X_INVALID, SEM_FN_NAME (sh64_media,x_invalid) },
-  { SH64_MEDIA_INSN_X_AFTER, SEM_FN_NAME (sh64_media,x_after) },
-  { SH64_MEDIA_INSN_X_BEFORE, SEM_FN_NAME (sh64_media,x_before) },
-  { SH64_MEDIA_INSN_X_CTI_CHAIN, SEM_FN_NAME (sh64_media,x_cti_chain) },
-  { SH64_MEDIA_INSN_X_CHAIN, SEM_FN_NAME (sh64_media,x_chain) },
-  { SH64_MEDIA_INSN_X_BEGIN, SEM_FN_NAME (sh64_media,x_begin) },
-  { SH64_MEDIA_INSN_ADD, SEM_FN_NAME (sh64_media,add) },
-  { SH64_MEDIA_INSN_ADDL, SEM_FN_NAME (sh64_media,addl) },
-  { SH64_MEDIA_INSN_ADDI, SEM_FN_NAME (sh64_media,addi) },
-  { SH64_MEDIA_INSN_ADDIL, SEM_FN_NAME (sh64_media,addil) },
-  { SH64_MEDIA_INSN_ADDZL, SEM_FN_NAME (sh64_media,addzl) },
-  { SH64_MEDIA_INSN_ALLOCO, SEM_FN_NAME (sh64_media,alloco) },
-  { SH64_MEDIA_INSN_AND, SEM_FN_NAME (sh64_media,and) },
-  { SH64_MEDIA_INSN_ANDC, SEM_FN_NAME (sh64_media,andc) },
-  { SH64_MEDIA_INSN_ANDI, SEM_FN_NAME (sh64_media,andi) },
-  { SH64_MEDIA_INSN_BEQ, SEM_FN_NAME (sh64_media,beq) },
-  { SH64_MEDIA_INSN_BEQI, SEM_FN_NAME (sh64_media,beqi) },
-  { SH64_MEDIA_INSN_BGE, SEM_FN_NAME (sh64_media,bge) },
-  { SH64_MEDIA_INSN_BGEU, SEM_FN_NAME (sh64_media,bgeu) },
-  { SH64_MEDIA_INSN_BGT, SEM_FN_NAME (sh64_media,bgt) },
-  { SH64_MEDIA_INSN_BGTU, SEM_FN_NAME (sh64_media,bgtu) },
-  { SH64_MEDIA_INSN_BLINK, SEM_FN_NAME (sh64_media,blink) },
-  { SH64_MEDIA_INSN_BNE, SEM_FN_NAME (sh64_media,bne) },
-  { SH64_MEDIA_INSN_BNEI, SEM_FN_NAME (sh64_media,bnei) },
-  { SH64_MEDIA_INSN_BRK, SEM_FN_NAME (sh64_media,brk) },
-  { SH64_MEDIA_INSN_BYTEREV, SEM_FN_NAME (sh64_media,byterev) },
-  { SH64_MEDIA_INSN_CMPEQ, SEM_FN_NAME (sh64_media,cmpeq) },
-  { SH64_MEDIA_INSN_CMPGT, SEM_FN_NAME (sh64_media,cmpgt) },
-  { SH64_MEDIA_INSN_CMPGTU, SEM_FN_NAME (sh64_media,cmpgtu) },
-  { SH64_MEDIA_INSN_CMVEQ, SEM_FN_NAME (sh64_media,cmveq) },
-  { SH64_MEDIA_INSN_CMVNE, SEM_FN_NAME (sh64_media,cmvne) },
-  { SH64_MEDIA_INSN_FABSD, SEM_FN_NAME (sh64_media,fabsd) },
-  { SH64_MEDIA_INSN_FABSS, SEM_FN_NAME (sh64_media,fabss) },
-  { SH64_MEDIA_INSN_FADDD, SEM_FN_NAME (sh64_media,faddd) },
-  { SH64_MEDIA_INSN_FADDS, SEM_FN_NAME (sh64_media,fadds) },
-  { SH64_MEDIA_INSN_FCMPEQD, SEM_FN_NAME (sh64_media,fcmpeqd) },
-  { SH64_MEDIA_INSN_FCMPEQS, SEM_FN_NAME (sh64_media,fcmpeqs) },
-  { SH64_MEDIA_INSN_FCMPGED, SEM_FN_NAME (sh64_media,fcmpged) },
-  { SH64_MEDIA_INSN_FCMPGES, SEM_FN_NAME (sh64_media,fcmpges) },
-  { SH64_MEDIA_INSN_FCMPGTD, SEM_FN_NAME (sh64_media,fcmpgtd) },
-  { SH64_MEDIA_INSN_FCMPGTS, SEM_FN_NAME (sh64_media,fcmpgts) },
-  { SH64_MEDIA_INSN_FCMPUND, SEM_FN_NAME (sh64_media,fcmpund) },
-  { SH64_MEDIA_INSN_FCMPUNS, SEM_FN_NAME (sh64_media,fcmpuns) },
-  { SH64_MEDIA_INSN_FCNVDS, SEM_FN_NAME (sh64_media,fcnvds) },
-  { SH64_MEDIA_INSN_FCNVSD, SEM_FN_NAME (sh64_media,fcnvsd) },
-  { SH64_MEDIA_INSN_FDIVD, SEM_FN_NAME (sh64_media,fdivd) },
-  { SH64_MEDIA_INSN_FDIVS, SEM_FN_NAME (sh64_media,fdivs) },
-  { SH64_MEDIA_INSN_FGETSCR, SEM_FN_NAME (sh64_media,fgetscr) },
-  { SH64_MEDIA_INSN_FIPRS, SEM_FN_NAME (sh64_media,fiprs) },
-  { SH64_MEDIA_INSN_FLDD, SEM_FN_NAME (sh64_media,fldd) },
-  { SH64_MEDIA_INSN_FLDP, SEM_FN_NAME (sh64_media,fldp) },
-  { SH64_MEDIA_INSN_FLDS, SEM_FN_NAME (sh64_media,flds) },
-  { SH64_MEDIA_INSN_FLDXD, SEM_FN_NAME (sh64_media,fldxd) },
-  { SH64_MEDIA_INSN_FLDXP, SEM_FN_NAME (sh64_media,fldxp) },
-  { SH64_MEDIA_INSN_FLDXS, SEM_FN_NAME (sh64_media,fldxs) },
-  { SH64_MEDIA_INSN_FLOATLD, SEM_FN_NAME (sh64_media,floatld) },
-  { SH64_MEDIA_INSN_FLOATLS, SEM_FN_NAME (sh64_media,floatls) },
-  { SH64_MEDIA_INSN_FLOATQD, SEM_FN_NAME (sh64_media,floatqd) },
-  { SH64_MEDIA_INSN_FLOATQS, SEM_FN_NAME (sh64_media,floatqs) },
-  { SH64_MEDIA_INSN_FMACS, SEM_FN_NAME (sh64_media,fmacs) },
-  { SH64_MEDIA_INSN_FMOVD, SEM_FN_NAME (sh64_media,fmovd) },
-  { SH64_MEDIA_INSN_FMOVDQ, SEM_FN_NAME (sh64_media,fmovdq) },
-  { SH64_MEDIA_INSN_FMOVLS, SEM_FN_NAME (sh64_media,fmovls) },
-  { SH64_MEDIA_INSN_FMOVQD, SEM_FN_NAME (sh64_media,fmovqd) },
-  { SH64_MEDIA_INSN_FMOVS, SEM_FN_NAME (sh64_media,fmovs) },
-  { SH64_MEDIA_INSN_FMOVSL, SEM_FN_NAME (sh64_media,fmovsl) },
-  { SH64_MEDIA_INSN_FMULD, SEM_FN_NAME (sh64_media,fmuld) },
-  { SH64_MEDIA_INSN_FMULS, SEM_FN_NAME (sh64_media,fmuls) },
-  { SH64_MEDIA_INSN_FNEGD, SEM_FN_NAME (sh64_media,fnegd) },
-  { SH64_MEDIA_INSN_FNEGS, SEM_FN_NAME (sh64_media,fnegs) },
-  { SH64_MEDIA_INSN_FPUTSCR, SEM_FN_NAME (sh64_media,fputscr) },
-  { SH64_MEDIA_INSN_FSQRTD, SEM_FN_NAME (sh64_media,fsqrtd) },
-  { SH64_MEDIA_INSN_FSQRTS, SEM_FN_NAME (sh64_media,fsqrts) },
-  { SH64_MEDIA_INSN_FSTD, SEM_FN_NAME (sh64_media,fstd) },
-  { SH64_MEDIA_INSN_FSTP, SEM_FN_NAME (sh64_media,fstp) },
-  { SH64_MEDIA_INSN_FSTS, SEM_FN_NAME (sh64_media,fsts) },
-  { SH64_MEDIA_INSN_FSTXD, SEM_FN_NAME (sh64_media,fstxd) },
-  { SH64_MEDIA_INSN_FSTXP, SEM_FN_NAME (sh64_media,fstxp) },
-  { SH64_MEDIA_INSN_FSTXS, SEM_FN_NAME (sh64_media,fstxs) },
-  { SH64_MEDIA_INSN_FSUBD, SEM_FN_NAME (sh64_media,fsubd) },
-  { SH64_MEDIA_INSN_FSUBS, SEM_FN_NAME (sh64_media,fsubs) },
-  { SH64_MEDIA_INSN_FTRCDL, SEM_FN_NAME (sh64_media,ftrcdl) },
-  { SH64_MEDIA_INSN_FTRCSL, SEM_FN_NAME (sh64_media,ftrcsl) },
-  { SH64_MEDIA_INSN_FTRCDQ, SEM_FN_NAME (sh64_media,ftrcdq) },
-  { SH64_MEDIA_INSN_FTRCSQ, SEM_FN_NAME (sh64_media,ftrcsq) },
-  { SH64_MEDIA_INSN_FTRVS, SEM_FN_NAME (sh64_media,ftrvs) },
-  { SH64_MEDIA_INSN_GETCFG, SEM_FN_NAME (sh64_media,getcfg) },
-  { SH64_MEDIA_INSN_GETCON, SEM_FN_NAME (sh64_media,getcon) },
-  { SH64_MEDIA_INSN_GETTR, SEM_FN_NAME (sh64_media,gettr) },
-  { SH64_MEDIA_INSN_ICBI, SEM_FN_NAME (sh64_media,icbi) },
-  { SH64_MEDIA_INSN_LDB, SEM_FN_NAME (sh64_media,ldb) },
-  { SH64_MEDIA_INSN_LDL, SEM_FN_NAME (sh64_media,ldl) },
-  { SH64_MEDIA_INSN_LDQ, SEM_FN_NAME (sh64_media,ldq) },
-  { SH64_MEDIA_INSN_LDUB, SEM_FN_NAME (sh64_media,ldub) },
-  { SH64_MEDIA_INSN_LDUW, SEM_FN_NAME (sh64_media,lduw) },
-  { SH64_MEDIA_INSN_LDW, SEM_FN_NAME (sh64_media,ldw) },
-  { SH64_MEDIA_INSN_LDHIL, SEM_FN_NAME (sh64_media,ldhil) },
-  { SH64_MEDIA_INSN_LDHIQ, SEM_FN_NAME (sh64_media,ldhiq) },
-  { SH64_MEDIA_INSN_LDLOL, SEM_FN_NAME (sh64_media,ldlol) },
-  { SH64_MEDIA_INSN_LDLOQ, SEM_FN_NAME (sh64_media,ldloq) },
-  { SH64_MEDIA_INSN_LDXB, SEM_FN_NAME (sh64_media,ldxb) },
-  { SH64_MEDIA_INSN_LDXL, SEM_FN_NAME (sh64_media,ldxl) },
-  { SH64_MEDIA_INSN_LDXQ, SEM_FN_NAME (sh64_media,ldxq) },
-  { SH64_MEDIA_INSN_LDXUB, SEM_FN_NAME (sh64_media,ldxub) },
-  { SH64_MEDIA_INSN_LDXUW, SEM_FN_NAME (sh64_media,ldxuw) },
-  { SH64_MEDIA_INSN_LDXW, SEM_FN_NAME (sh64_media,ldxw) },
-  { SH64_MEDIA_INSN_MABSL, SEM_FN_NAME (sh64_media,mabsl) },
-  { SH64_MEDIA_INSN_MABSW, SEM_FN_NAME (sh64_media,mabsw) },
-  { SH64_MEDIA_INSN_MADDL, SEM_FN_NAME (sh64_media,maddl) },
-  { SH64_MEDIA_INSN_MADDW, SEM_FN_NAME (sh64_media,maddw) },
-  { SH64_MEDIA_INSN_MADDSL, SEM_FN_NAME (sh64_media,maddsl) },
-  { SH64_MEDIA_INSN_MADDSUB, SEM_FN_NAME (sh64_media,maddsub) },
-  { SH64_MEDIA_INSN_MADDSW, SEM_FN_NAME (sh64_media,maddsw) },
-  { SH64_MEDIA_INSN_MCMPEQB, SEM_FN_NAME (sh64_media,mcmpeqb) },
-  { SH64_MEDIA_INSN_MCMPEQL, SEM_FN_NAME (sh64_media,mcmpeql) },
-  { SH64_MEDIA_INSN_MCMPEQW, SEM_FN_NAME (sh64_media,mcmpeqw) },
-  { SH64_MEDIA_INSN_MCMPGTL, SEM_FN_NAME (sh64_media,mcmpgtl) },
-  { SH64_MEDIA_INSN_MCMPGTUB, SEM_FN_NAME (sh64_media,mcmpgtub) },
-  { SH64_MEDIA_INSN_MCMPGTW, SEM_FN_NAME (sh64_media,mcmpgtw) },
-  { SH64_MEDIA_INSN_MCMV, SEM_FN_NAME (sh64_media,mcmv) },
-  { SH64_MEDIA_INSN_MCNVSLW, SEM_FN_NAME (sh64_media,mcnvslw) },
-  { SH64_MEDIA_INSN_MCNVSWB, SEM_FN_NAME (sh64_media,mcnvswb) },
-  { SH64_MEDIA_INSN_MCNVSWUB, SEM_FN_NAME (sh64_media,mcnvswub) },
-  { SH64_MEDIA_INSN_MEXTR1, SEM_FN_NAME (sh64_media,mextr1) },
-  { SH64_MEDIA_INSN_MEXTR2, SEM_FN_NAME (sh64_media,mextr2) },
-  { SH64_MEDIA_INSN_MEXTR3, SEM_FN_NAME (sh64_media,mextr3) },
-  { SH64_MEDIA_INSN_MEXTR4, SEM_FN_NAME (sh64_media,mextr4) },
-  { SH64_MEDIA_INSN_MEXTR5, SEM_FN_NAME (sh64_media,mextr5) },
-  { SH64_MEDIA_INSN_MEXTR6, SEM_FN_NAME (sh64_media,mextr6) },
-  { SH64_MEDIA_INSN_MEXTR7, SEM_FN_NAME (sh64_media,mextr7) },
-  { SH64_MEDIA_INSN_MMACFXWL, SEM_FN_NAME (sh64_media,mmacfxwl) },
-  { SH64_MEDIA_INSN_MMACNFX_WL, SEM_FN_NAME (sh64_media,mmacnfx_wl) },
-  { SH64_MEDIA_INSN_MMULL, SEM_FN_NAME (sh64_media,mmull) },
-  { SH64_MEDIA_INSN_MMULW, SEM_FN_NAME (sh64_media,mmulw) },
-  { SH64_MEDIA_INSN_MMULFXL, SEM_FN_NAME (sh64_media,mmulfxl) },
-  { SH64_MEDIA_INSN_MMULFXW, SEM_FN_NAME (sh64_media,mmulfxw) },
-  { SH64_MEDIA_INSN_MMULFXRPW, SEM_FN_NAME (sh64_media,mmulfxrpw) },
-  { SH64_MEDIA_INSN_MMULHIWL, SEM_FN_NAME (sh64_media,mmulhiwl) },
-  { SH64_MEDIA_INSN_MMULLOWL, SEM_FN_NAME (sh64_media,mmullowl) },
-  { SH64_MEDIA_INSN_MMULSUMWQ, SEM_FN_NAME (sh64_media,mmulsumwq) },
-  { SH64_MEDIA_INSN_MOVI, SEM_FN_NAME (sh64_media,movi) },
-  { SH64_MEDIA_INSN_MPERMW, SEM_FN_NAME (sh64_media,mpermw) },
-  { SH64_MEDIA_INSN_MSADUBQ, SEM_FN_NAME (sh64_media,msadubq) },
-  { SH64_MEDIA_INSN_MSHALDSL, SEM_FN_NAME (sh64_media,mshaldsl) },
-  { SH64_MEDIA_INSN_MSHALDSW, SEM_FN_NAME (sh64_media,mshaldsw) },
-  { SH64_MEDIA_INSN_MSHARDL, SEM_FN_NAME (sh64_media,mshardl) },
-  { SH64_MEDIA_INSN_MSHARDW, SEM_FN_NAME (sh64_media,mshardw) },
-  { SH64_MEDIA_INSN_MSHARDSQ, SEM_FN_NAME (sh64_media,mshardsq) },
-  { SH64_MEDIA_INSN_MSHFHIB, SEM_FN_NAME (sh64_media,mshfhib) },
-  { SH64_MEDIA_INSN_MSHFHIL, SEM_FN_NAME (sh64_media,mshfhil) },
-  { SH64_MEDIA_INSN_MSHFHIW, SEM_FN_NAME (sh64_media,mshfhiw) },
-  { SH64_MEDIA_INSN_MSHFLOB, SEM_FN_NAME (sh64_media,mshflob) },
-  { SH64_MEDIA_INSN_MSHFLOL, SEM_FN_NAME (sh64_media,mshflol) },
-  { SH64_MEDIA_INSN_MSHFLOW, SEM_FN_NAME (sh64_media,mshflow) },
-  { SH64_MEDIA_INSN_MSHLLDL, SEM_FN_NAME (sh64_media,mshlldl) },
-  { SH64_MEDIA_INSN_MSHLLDW, SEM_FN_NAME (sh64_media,mshlldw) },
-  { SH64_MEDIA_INSN_MSHLRDL, SEM_FN_NAME (sh64_media,mshlrdl) },
-  { SH64_MEDIA_INSN_MSHLRDW, SEM_FN_NAME (sh64_media,mshlrdw) },
-  { SH64_MEDIA_INSN_MSUBL, SEM_FN_NAME (sh64_media,msubl) },
-  { SH64_MEDIA_INSN_MSUBW, SEM_FN_NAME (sh64_media,msubw) },
-  { SH64_MEDIA_INSN_MSUBSL, SEM_FN_NAME (sh64_media,msubsl) },
-  { SH64_MEDIA_INSN_MSUBSUB, SEM_FN_NAME (sh64_media,msubsub) },
-  { SH64_MEDIA_INSN_MSUBSW, SEM_FN_NAME (sh64_media,msubsw) },
-  { SH64_MEDIA_INSN_MULSL, SEM_FN_NAME (sh64_media,mulsl) },
-  { SH64_MEDIA_INSN_MULUL, SEM_FN_NAME (sh64_media,mulul) },
-  { SH64_MEDIA_INSN_NOP, SEM_FN_NAME (sh64_media,nop) },
-  { SH64_MEDIA_INSN_NSB, SEM_FN_NAME (sh64_media,nsb) },
-  { SH64_MEDIA_INSN_OCBI, SEM_FN_NAME (sh64_media,ocbi) },
-  { SH64_MEDIA_INSN_OCBP, SEM_FN_NAME (sh64_media,ocbp) },
-  { SH64_MEDIA_INSN_OCBWB, SEM_FN_NAME (sh64_media,ocbwb) },
-  { SH64_MEDIA_INSN_OR, SEM_FN_NAME (sh64_media,or) },
-  { SH64_MEDIA_INSN_ORI, SEM_FN_NAME (sh64_media,ori) },
-  { SH64_MEDIA_INSN_PREFI, SEM_FN_NAME (sh64_media,prefi) },
-  { SH64_MEDIA_INSN_PTA, SEM_FN_NAME (sh64_media,pta) },
-  { SH64_MEDIA_INSN_PTABS, SEM_FN_NAME (sh64_media,ptabs) },
-  { SH64_MEDIA_INSN_PTB, SEM_FN_NAME (sh64_media,ptb) },
-  { SH64_MEDIA_INSN_PTREL, SEM_FN_NAME (sh64_media,ptrel) },
-  { SH64_MEDIA_INSN_PUTCFG, SEM_FN_NAME (sh64_media,putcfg) },
-  { SH64_MEDIA_INSN_PUTCON, SEM_FN_NAME (sh64_media,putcon) },
-  { SH64_MEDIA_INSN_RTE, SEM_FN_NAME (sh64_media,rte) },
-  { SH64_MEDIA_INSN_SHARD, SEM_FN_NAME (sh64_media,shard) },
-  { SH64_MEDIA_INSN_SHARDL, SEM_FN_NAME (sh64_media,shardl) },
-  { SH64_MEDIA_INSN_SHARI, SEM_FN_NAME (sh64_media,shari) },
-  { SH64_MEDIA_INSN_SHARIL, SEM_FN_NAME (sh64_media,sharil) },
-  { SH64_MEDIA_INSN_SHLLD, SEM_FN_NAME (sh64_media,shlld) },
-  { SH64_MEDIA_INSN_SHLLDL, SEM_FN_NAME (sh64_media,shlldl) },
-  { SH64_MEDIA_INSN_SHLLI, SEM_FN_NAME (sh64_media,shlli) },
-  { SH64_MEDIA_INSN_SHLLIL, SEM_FN_NAME (sh64_media,shllil) },
-  { SH64_MEDIA_INSN_SHLRD, SEM_FN_NAME (sh64_media,shlrd) },
-  { SH64_MEDIA_INSN_SHLRDL, SEM_FN_NAME (sh64_media,shlrdl) },
-  { SH64_MEDIA_INSN_SHLRI, SEM_FN_NAME (sh64_media,shlri) },
-  { SH64_MEDIA_INSN_SHLRIL, SEM_FN_NAME (sh64_media,shlril) },
-  { SH64_MEDIA_INSN_SHORI, SEM_FN_NAME (sh64_media,shori) },
-  { SH64_MEDIA_INSN_SLEEP, SEM_FN_NAME (sh64_media,sleep) },
-  { SH64_MEDIA_INSN_STB, SEM_FN_NAME (sh64_media,stb) },
-  { SH64_MEDIA_INSN_STL, SEM_FN_NAME (sh64_media,stl) },
-  { SH64_MEDIA_INSN_STQ, SEM_FN_NAME (sh64_media,stq) },
-  { SH64_MEDIA_INSN_STW, SEM_FN_NAME (sh64_media,stw) },
-  { SH64_MEDIA_INSN_STHIL, SEM_FN_NAME (sh64_media,sthil) },
-  { SH64_MEDIA_INSN_STHIQ, SEM_FN_NAME (sh64_media,sthiq) },
-  { SH64_MEDIA_INSN_STLOL, SEM_FN_NAME (sh64_media,stlol) },
-  { SH64_MEDIA_INSN_STLOQ, SEM_FN_NAME (sh64_media,stloq) },
-  { SH64_MEDIA_INSN_STXB, SEM_FN_NAME (sh64_media,stxb) },
-  { SH64_MEDIA_INSN_STXL, SEM_FN_NAME (sh64_media,stxl) },
-  { SH64_MEDIA_INSN_STXQ, SEM_FN_NAME (sh64_media,stxq) },
-  { SH64_MEDIA_INSN_STXW, SEM_FN_NAME (sh64_media,stxw) },
-  { SH64_MEDIA_INSN_SUB, SEM_FN_NAME (sh64_media,sub) },
-  { SH64_MEDIA_INSN_SUBL, SEM_FN_NAME (sh64_media,subl) },
-  { SH64_MEDIA_INSN_SWAPQ, SEM_FN_NAME (sh64_media,swapq) },
-  { SH64_MEDIA_INSN_SYNCI, SEM_FN_NAME (sh64_media,synci) },
-  { SH64_MEDIA_INSN_SYNCO, SEM_FN_NAME (sh64_media,synco) },
-  { SH64_MEDIA_INSN_TRAPA, SEM_FN_NAME (sh64_media,trapa) },
-  { SH64_MEDIA_INSN_XOR, SEM_FN_NAME (sh64_media,xor) },
-  { SH64_MEDIA_INSN_XORI, SEM_FN_NAME (sh64_media,xori) },
-  { 0, 0 }
-};
-
-/* Add the semantic fns to IDESC_TABLE.  */
-
-void
-SEM_FN_NAME (sh64_media,init_idesc_table) (SIM_CPU *current_cpu)
-{
-  IDESC *idesc_table = CPU_IDESC (current_cpu);
-  const struct sem_fn_desc *sf;
-  int mach_num = MACH_NUM (CPU_MACH (current_cpu));
-
-  for (sf = &sem_fns[0]; sf->fn != 0; ++sf)
-    {
-      const CGEN_INSN *insn = idesc_table[sf->index].idata;
-      int valid_p = (CGEN_INSN_VIRTUAL_P (insn)
-		     || CGEN_INSN_MACH_HAS_P (insn, mach_num));
-#if FAST_P
-      if (valid_p)
-	idesc_table[sf->index].sem_fast = sf->fn;
-      else
-	idesc_table[sf->index].sem_fast = SEM_FN_NAME (sh64_media,x_invalid);
-#else
-      if (valid_p)
-	idesc_table[sf->index].sem_full = sf->fn;
-      else
-	idesc_table[sf->index].sem_full = SEM_FN_NAME (sh64_media,x_invalid);
-#endif
-    }
-}
-
diff --git a/sim/sh64/sh-desc.c b/sim/sh64/sh-desc.c
deleted file mode 100644
index e95ab8782f5..00000000000
--- a/sim/sh64/sh-desc.c
+++ /dev/null
@@ -1,3287 +0,0 @@
-/* CPU data for sh.
-
-THIS FILE IS MACHINE GENERATED WITH CGEN.
-
-Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
-
-This file is part of the GNU Binutils and/or GDB, the GNU debugger.
-
-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, 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.
-
-*/
-
-#include "sysdep.h"
-#include <ctype.h>
-#include <stdio.h>
-#include <stdarg.h>
-#include "ansidecl.h"
-#include "bfd.h"
-#include "symcat.h"
-#include "sh-desc.h"
-#include "sh-opc.h"
-#include "opintl.h"
-#include "libiberty.h"
-
-/* Attributes.  */
-
-static const CGEN_ATTR_ENTRY bool_attr[] =
-{
-  { "#f", 0 },
-  { "#t", 1 },
-  { 0, 0 }
-};
-
-static const CGEN_ATTR_ENTRY MACH_attr[] =
-{
-  { "base", MACH_BASE },
-  { "sh2", MACH_SH2 },
-  { "sh3", MACH_SH3 },
-  { "sh3e", MACH_SH3E },
-  { "sh4", MACH_SH4 },
-  { "sh5", MACH_SH5 },
-  { "max", MACH_MAX },
-  { 0, 0 }
-};
-
-static const CGEN_ATTR_ENTRY ISA_attr[] =
-{
-  { "compact", ISA_COMPACT },
-  { "media", ISA_MEDIA },
-  { "max", ISA_MAX },
-  { 0, 0 }
-};
-
-const CGEN_ATTR_TABLE sh_cgen_ifield_attr_table[] =
-{
-  { "MACH", & MACH_attr[0], & MACH_attr[0] },
-  { "ISA", & ISA_attr[0], & ISA_attr[0] },
-  { "VIRTUAL", &bool_attr[0], &bool_attr[0] },
-  { "PCREL-ADDR", &bool_attr[0], &bool_attr[0] },
-  { "ABS-ADDR", &bool_attr[0], &bool_attr[0] },
-  { "RESERVED", &bool_attr[0], &bool_attr[0] },
-  { "SIGN-OPT", &bool_attr[0], &bool_attr[0] },
-  { "SIGNED", &bool_attr[0], &bool_attr[0] },
-  { 0, 0, 0 }
-};
-
-const CGEN_ATTR_TABLE sh_cgen_hardware_attr_table[] =
-{
-  { "MACH", & MACH_attr[0], & MACH_attr[0] },
-  { "VIRTUAL", &bool_attr[0], &bool_attr[0] },
-  { "CACHE-ADDR", &bool_attr[0], &bool_attr[0] },
-  { "PC", &bool_attr[0], &bool_attr[0] },
-  { "PROFILE", &bool_attr[0], &bool_attr[0] },
-  { 0, 0, 0 }
-};
-
-const CGEN_ATTR_TABLE sh_cgen_operand_attr_table[] =
-{
-  { "MACH", & MACH_attr[0], & MACH_attr[0] },
-  { "ISA", & ISA_attr[0], & ISA_attr[0] },
-  { "VIRTUAL", &bool_attr[0], &bool_attr[0] },
-  { "PCREL-ADDR", &bool_attr[0], &bool_attr[0] },
-  { "ABS-ADDR", &bool_attr[0], &bool_attr[0] },
-  { "SIGN-OPT", &bool_attr[0], &bool_attr[0] },
-  { "SIGNED", &bool_attr[0], &bool_attr[0] },
-  { "NEGATIVE", &bool_attr[0], &bool_attr[0] },
-  { "RELAX", &bool_attr[0], &bool_attr[0] },
-  { "SEM-ONLY", &bool_attr[0], &bool_attr[0] },
-  { 0, 0, 0 }
-};
-
-const CGEN_ATTR_TABLE sh_cgen_insn_attr_table[] =
-{
-  { "MACH", & MACH_attr[0], & MACH_attr[0] },
-  { "ISA", & ISA_attr[0], & ISA_attr[0] },
-  { "ALIAS", &bool_attr[0], &bool_attr[0] },
-  { "VIRTUAL", &bool_attr[0], &bool_attr[0] },
-  { "UNCOND-CTI", &bool_attr[0], &bool_attr[0] },
-  { "COND-CTI", &bool_attr[0], &bool_attr[0] },
-  { "SKIP-CTI", &bool_attr[0], &bool_attr[0] },
-  { "DELAY-SLOT", &bool_attr[0], &bool_attr[0] },
-  { "RELAXABLE", &bool_attr[0], &bool_attr[0] },
-  { "RELAX", &bool_attr[0], &bool_attr[0] },
-  { "NO-DIS", &bool_attr[0], &bool_attr[0] },
-  { "PBB", &bool_attr[0], &bool_attr[0] },
-  { "ILLSLOT", &bool_attr[0], &bool_attr[0] },
-  { "FP-INSN", &bool_attr[0], &bool_attr[0] },
-  { 0, 0, 0 }
-};
-
-/* Instruction set variants.  */
-
-static const CGEN_ISA sh_cgen_isa_table[] = {
-  { "media", 32, 32, 32, 32 },
-  { "compact", 16, 16, 16, 16 },
-  { 0, 0, 0, 0, 0 }
-};
-
-/* Machine variants.  */
-
-static const CGEN_MACH sh_cgen_mach_table[] = {
-  { "sh2", "sh2", MACH_SH2 },
-  { "sh3", "sh3", MACH_SH3 },
-  { "sh3e", "sh3e", MACH_SH3E },
-  { "sh4", "sh4", MACH_SH4 },
-  { "sh5", "sh5", MACH_SH5 },
-  { 0, 0, 0 }
-};
-
-static CGEN_KEYWORD_ENTRY sh_cgen_opval_frc_names_entries[] =
-{
-  { "fr0", 0, {0, {0}}, 0, 0 },
-  { "fr1", 1, {0, {0}}, 0, 0 },
-  { "fr2", 2, {0, {0}}, 0, 0 },
-  { "fr3", 3, {0, {0}}, 0, 0 },
-  { "fr4", 4, {0, {0}}, 0, 0 },
-  { "fr5", 5, {0, {0}}, 0, 0 },
-  { "fr6", 6, {0, {0}}, 0, 0 },
-  { "fr7", 7, {0, {0}}, 0, 0 },
-  { "fr8", 8, {0, {0}}, 0, 0 },
-  { "fr9", 9, {0, {0}}, 0, 0 },
-  { "fr10", 10, {0, {0}}, 0, 0 },
-  { "fr11", 11, {0, {0}}, 0, 0 },
-  { "fr12", 12, {0, {0}}, 0, 0 },
-  { "fr13", 13, {0, {0}}, 0, 0 },
-  { "fr14", 14, {0, {0}}, 0, 0 },
-  { "fr15", 15, {0, {0}}, 0, 0 }
-};
-
-CGEN_KEYWORD sh_cgen_opval_frc_names =
-{
-  & sh_cgen_opval_frc_names_entries[0],
-  16,
-  0, 0, 0, 0
-};
-
-static CGEN_KEYWORD_ENTRY sh_cgen_opval_drc_names_entries[] =
-{
-  { "dr0", 0, {0, {0}}, 0, 0 },
-  { "dr2", 2, {0, {0}}, 0, 0 },
-  { "dr4", 4, {0, {0}}, 0, 0 },
-  { "dr6", 6, {0, {0}}, 0, 0 },
-  { "dr8", 8, {0, {0}}, 0, 0 },
-  { "dr10", 10, {0, {0}}, 0, 0 },
-  { "dr12", 12, {0, {0}}, 0, 0 },
-  { "dr14", 14, {0, {0}}, 0, 0 }
-};
-
-CGEN_KEYWORD sh_cgen_opval_drc_names =
-{
-  & sh_cgen_opval_drc_names_entries[0],
-  8,
-  0, 0, 0, 0
-};
-
-static CGEN_KEYWORD_ENTRY sh_cgen_opval_xf_names_entries[] =
-{
-  { "xf0", 0, {0, {0}}, 0, 0 },
-  { "xf1", 1, {0, {0}}, 0, 0 },
-  { "xf2", 2, {0, {0}}, 0, 0 },
-  { "xf3", 3, {0, {0}}, 0, 0 },
-  { "xf4", 4, {0, {0}}, 0, 0 },
-  { "xf5", 5, {0, {0}}, 0, 0 },
-  { "xf6", 6, {0, {0}}, 0, 0 },
-  { "xf7", 7, {0, {0}}, 0, 0 },
-  { "xf8", 8, {0, {0}}, 0, 0 },
-  { "xf9", 9, {0, {0}}, 0, 0 },
-  { "xf10", 10, {0, {0}}, 0, 0 },
-  { "xf11", 11, {0, {0}}, 0, 0 },
-  { "xf12", 12, {0, {0}}, 0, 0 },
-  { "xf13", 13, {0, {0}}, 0, 0 },
-  { "xf14", 14, {0, {0}}, 0, 0 },
-  { "xf15", 15, {0, {0}}, 0, 0 }
-};
-
-CGEN_KEYWORD sh_cgen_opval_xf_names =
-{
-  & sh_cgen_opval_xf_names_entries[0],
-  16,
-  0, 0, 0, 0
-};
-
-static CGEN_KEYWORD_ENTRY sh_cgen_opval_h_gr_entries[] =
-{
-  { "r0", 0, {0, {0}}, 0, 0 },
-  { "r1", 1, {0, {0}}, 0, 0 },
-  { "r2", 2, {0, {0}}, 0, 0 },
-  { "r3", 3, {0, {0}}, 0, 0 },
-  { "r4", 4, {0, {0}}, 0, 0 },
-  { "r5", 5, {0, {0}}, 0, 0 },
-  { "r6", 6, {0, {0}}, 0, 0 },
-  { "r7", 7, {0, {0}}, 0, 0 },
-  { "r8", 8, {0, {0}}, 0, 0 },
-  { "r9", 9, {0, {0}}, 0, 0 },
-  { "r10", 10, {0, {0}}, 0, 0 },
-  { "r11", 11, {0, {0}}, 0, 0 },
-  { "r12", 12, {0, {0}}, 0, 0 },
-  { "r13", 13, {0, {0}}, 0, 0 },
-  { "r14", 14, {0, {0}}, 0, 0 },
-  { "r15", 15, {0, {0}}, 0, 0 },
-  { "r16", 16, {0, {0}}, 0, 0 },
-  { "r17", 17, {0, {0}}, 0, 0 },
-  { "r18", 18, {0, {0}}, 0, 0 },
-  { "r19", 19, {0, {0}}, 0, 0 },
-  { "r20", 20, {0, {0}}, 0, 0 },
-  { "r21", 21, {0, {0}}, 0, 0 },
-  { "r22", 22, {0, {0}}, 0, 0 },
-  { "r23", 23, {0, {0}}, 0, 0 },
-  { "r24", 24, {0, {0}}, 0, 0 },
-  { "r25", 25, {0, {0}}, 0, 0 },
-  { "r26", 26, {0, {0}}, 0, 0 },
-  { "r27", 27, {0, {0}}, 0, 0 },
-  { "r28", 28, {0, {0}}, 0, 0 },
-  { "r29", 29, {0, {0}}, 0, 0 },
-  { "r30", 30, {0, {0}}, 0, 0 },
-  { "r31", 31, {0, {0}}, 0, 0 },
-  { "r32", 32, {0, {0}}, 0, 0 },
-  { "r33", 33, {0, {0}}, 0, 0 },
-  { "r34", 34, {0, {0}}, 0, 0 },
-  { "r35", 35, {0, {0}}, 0, 0 },
-  { "r36", 36, {0, {0}}, 0, 0 },
-  { "r37", 37, {0, {0}}, 0, 0 },
-  { "r38", 38, {0, {0}}, 0, 0 },
-  { "r39", 39, {0, {0}}, 0, 0 },
-  { "r40", 40, {0, {0}}, 0, 0 },
-  { "r41", 41, {0, {0}}, 0, 0 },
-  { "r42", 42, {0, {0}}, 0, 0 },
-  { "r43", 43, {0, {0}}, 0, 0 },
-  { "r44", 44, {0, {0}}, 0, 0 },
-  { "r45", 45, {0, {0}}, 0, 0 },
-  { "r46", 46, {0, {0}}, 0, 0 },
-  { "r47", 47, {0, {0}}, 0, 0 },
-  { "r48", 48, {0, {0}}, 0, 0 },
-  { "r49", 49, {0, {0}}, 0, 0 },
-  { "r50", 50, {0, {0}}, 0, 0 },
-  { "r51", 51, {0, {0}}, 0, 0 },
-  { "r52", 52, {0, {0}}, 0, 0 },
-  { "r53", 53, {0, {0}}, 0, 0 },
-  { "r54", 54, {0, {0}}, 0, 0 },
-  { "r55", 55, {0, {0}}, 0, 0 },
-  { "r56", 56, {0, {0}}, 0, 0 },
-  { "r57", 57, {0, {0}}, 0, 0 },
-  { "r58", 58, {0, {0}}, 0, 0 },
-  { "r59", 59, {0, {0}}, 0, 0 },
-  { "r60", 60, {0, {0}}, 0, 0 },
-  { "r61", 61, {0, {0}}, 0, 0 },
-  { "r62", 62, {0, {0}}, 0, 0 },
-  { "r63", 63, {0, {0}}, 0, 0 }
-};
-
-CGEN_KEYWORD sh_cgen_opval_h_gr =
-{
-  & sh_cgen_opval_h_gr_entries[0],
-  64,
-  0, 0, 0, 0
-};
-
-static CGEN_KEYWORD_ENTRY sh_cgen_opval_h_grc_entries[] =
-{
-  { "r0", 0, {0, {0}}, 0, 0 },
-  { "r1", 1, {0, {0}}, 0, 0 },
-  { "r2", 2, {0, {0}}, 0, 0 },
-  { "r3", 3, {0, {0}}, 0, 0 },
-  { "r4", 4, {0, {0}}, 0, 0 },
-  { "r5", 5, {0, {0}}, 0, 0 },
-  { "r6", 6, {0, {0}}, 0, 0 },
-  { "r7", 7, {0, {0}}, 0, 0 },
-  { "r8", 8, {0, {0}}, 0, 0 },
-  { "r9", 9, {0, {0}}, 0, 0 },
-  { "r10", 10, {0, {0}}, 0, 0 },
-  { "r11", 11, {0, {0}}, 0, 0 },
-  { "r12", 12, {0, {0}}, 0, 0 },
-  { "r13", 13, {0, {0}}, 0, 0 },
-  { "r14", 14, {0, {0}}, 0, 0 },
-  { "r15", 15, {0, {0}}, 0, 0 }
-};
-
-CGEN_KEYWORD sh_cgen_opval_h_grc =
-{
-  & sh_cgen_opval_h_grc_entries[0],
-  16,
-  0, 0, 0, 0
-};
-
-static CGEN_KEYWORD_ENTRY sh_cgen_opval_h_cr_entries[] =
-{
-  { "cr0", 0, {0, {0}}, 0, 0 },
-  { "cr1", 1, {0, {0}}, 0, 0 },
-  { "cr2", 2, {0, {0}}, 0, 0 },
-  { "cr3", 3, {0, {0}}, 0, 0 },
-  { "cr4", 4, {0, {0}}, 0, 0 },
-  { "cr5", 5, {0, {0}}, 0, 0 },
-  { "cr6", 6, {0, {0}}, 0, 0 },
-  { "cr7", 7, {0, {0}}, 0, 0 },
-  { "cr8", 8, {0, {0}}, 0, 0 },
-  { "cr9", 9, {0, {0}}, 0, 0 },
-  { "cr10", 10, {0, {0}}, 0, 0 },
-  { "cr11", 11, {0, {0}}, 0, 0 },
-  { "cr12", 12, {0, {0}}, 0, 0 },
-  { "cr13", 13, {0, {0}}, 0, 0 },
-  { "cr14", 14, {0, {0}}, 0, 0 },
-  { "cr15", 15, {0, {0}}, 0, 0 },
-  { "cr16", 16, {0, {0}}, 0, 0 },
-  { "cr17", 17, {0, {0}}, 0, 0 },
-  { "cr18", 18, {0, {0}}, 0, 0 },
-  { "cr19", 19, {0, {0}}, 0, 0 },
-  { "cr20", 20, {0, {0}}, 0, 0 },
-  { "cr21", 21, {0, {0}}, 0, 0 },
-  { "cr22", 22, {0, {0}}, 0, 0 },
-  { "cr23", 23, {0, {0}}, 0, 0 },
-  { "cr24", 24, {0, {0}}, 0, 0 },
-  { "cr25", 25, {0, {0}}, 0, 0 },
-  { "cr26", 26, {0, {0}}, 0, 0 },
-  { "cr27", 27, {0, {0}}, 0, 0 },
-  { "cr28", 28, {0, {0}}, 0, 0 },
-  { "cr29", 29, {0, {0}}, 0, 0 },
-  { "cr30", 30, {0, {0}}, 0, 0 },
-  { "cr31", 31, {0, {0}}, 0, 0 },
-  { "cr32", 32, {0, {0}}, 0, 0 },
-  { "cr33", 33, {0, {0}}, 0, 0 },
-  { "cr34", 34, {0, {0}}, 0, 0 },
-  { "cr35", 35, {0, {0}}, 0, 0 },
-  { "cr36", 36, {0, {0}}, 0, 0 },
-  { "cr37", 37, {0, {0}}, 0, 0 },
-  { "cr38", 38, {0, {0}}, 0, 0 },
-  { "cr39", 39, {0, {0}}, 0, 0 },
-  { "cr40", 40, {0, {0}}, 0, 0 },
-  { "cr41", 41, {0, {0}}, 0, 0 },
-  { "cr42", 42, {0, {0}}, 0, 0 },
-  { "cr43", 43, {0, {0}}, 0, 0 },
-  { "cr44", 44, {0, {0}}, 0, 0 },
-  { "cr45", 45, {0, {0}}, 0, 0 },
-  { "cr46", 46, {0, {0}}, 0, 0 },
-  { "cr47", 47, {0, {0}}, 0, 0 },
-  { "cr48", 48, {0, {0}}, 0, 0 },
-  { "cr49", 49, {0, {0}}, 0, 0 },
-  { "cr50", 50, {0, {0}}, 0, 0 },
-  { "cr51", 51, {0, {0}}, 0, 0 },
-  { "cr52", 52, {0, {0}}, 0, 0 },
-  { "cr53", 53, {0, {0}}, 0, 0 },
-  { "cr54", 54, {0, {0}}, 0, 0 },
-  { "cr55", 55, {0, {0}}, 0, 0 },
-  { "cr56", 56, {0, {0}}, 0, 0 },
-  { "cr57", 57, {0, {0}}, 0, 0 },
-  { "cr58", 58, {0, {0}}, 0, 0 },
-  { "cr59", 59, {0, {0}}, 0, 0 },
-  { "cr60", 60, {0, {0}}, 0, 0 },
-  { "cr61", 61, {0, {0}}, 0, 0 },
-  { "cr62", 62, {0, {0}}, 0, 0 },
-  { "cr63", 63, {0, {0}}, 0, 0 }
-};
-
-CGEN_KEYWORD sh_cgen_opval_h_cr =
-{
-  & sh_cgen_opval_h_cr_entries[0],
-  64,
-  0, 0, 0, 0
-};
-
-static CGEN_KEYWORD_ENTRY sh_cgen_opval_h_fr_entries[] =
-{
-  { "fr0", 0, {0, {0}}, 0, 0 },
-  { "fr1", 1, {0, {0}}, 0, 0 },
-  { "fr2", 2, {0, {0}}, 0, 0 },
-  { "fr3", 3, {0, {0}}, 0, 0 },
-  { "fr4", 4, {0, {0}}, 0, 0 },
-  { "fr5", 5, {0, {0}}, 0, 0 },
-  { "fr6", 6, {0, {0}}, 0, 0 },
-  { "fr7", 7, {0, {0}}, 0, 0 },
-  { "fr8", 8, {0, {0}}, 0, 0 },
-  { "fr9", 9, {0, {0}}, 0, 0 },
-  { "fr10", 10, {0, {0}}, 0, 0 },
-  { "fr11", 11, {0, {0}}, 0, 0 },
-  { "fr12", 12, {0, {0}}, 0, 0 },
-  { "fr13", 13, {0, {0}}, 0, 0 },
-  { "fr14", 14, {0, {0}}, 0, 0 },
-  { "fr15", 15, {0, {0}}, 0, 0 },
-  { "fr16", 16, {0, {0}}, 0, 0 },
-  { "fr17", 17, {0, {0}}, 0, 0 },
-  { "fr18", 18, {0, {0}}, 0, 0 },
-  { "fr19", 19, {0, {0}}, 0, 0 },
-  { "fr20", 20, {0, {0}}, 0, 0 },
-  { "fr21", 21, {0, {0}}, 0, 0 },
-  { "fr22", 22, {0, {0}}, 0, 0 },
-  { "fr23", 23, {0, {0}}, 0, 0 },
-  { "fr24", 24, {0, {0}}, 0, 0 },
-  { "fr25", 25, {0, {0}}, 0, 0 },
-  { "fr26", 26, {0, {0}}, 0, 0 },
-  { "fr27", 27, {0, {0}}, 0, 0 },
-  { "fr28", 28, {0, {0}}, 0, 0 },
-  { "fr29", 29, {0, {0}}, 0, 0 },
-  { "fr30", 30, {0, {0}}, 0, 0 },
-  { "fr31", 31, {0, {0}}, 0, 0 },
-  { "fr32", 32, {0, {0}}, 0, 0 },
-  { "fr33", 33, {0, {0}}, 0, 0 },
-  { "fr34", 34, {0, {0}}, 0, 0 },
-  { "fr35", 35, {0, {0}}, 0, 0 },
-  { "fr36", 36, {0, {0}}, 0, 0 },
-  { "fr37", 37, {0, {0}}, 0, 0 },
-  { "fr38", 38, {0, {0}}, 0, 0 },
-  { "fr39", 39, {0, {0}}, 0, 0 },
-  { "fr40", 40, {0, {0}}, 0, 0 },
-  { "fr41", 41, {0, {0}}, 0, 0 },
-  { "fr42", 42, {0, {0}}, 0, 0 },
-  { "fr43", 43, {0, {0}}, 0, 0 },
-  { "fr44", 44, {0, {0}}, 0, 0 },
-  { "fr45", 45, {0, {0}}, 0, 0 },
-  { "fr46", 46, {0, {0}}, 0, 0 },
-  { "fr47", 47, {0, {0}}, 0, 0 },
-  { "fr48", 48, {0, {0}}, 0, 0 },
-  { "fr49", 49, {0, {0}}, 0, 0 },
-  { "fr50", 50, {0, {0}}, 0, 0 },
-  { "fr51", 51, {0, {0}}, 0, 0 },
-  { "fr52", 52, {0, {0}}, 0, 0 },
-  { "fr53", 53, {0, {0}}, 0, 0 },
-  { "fr54", 54, {0, {0}}, 0, 0 },
-  { "fr55", 55, {0, {0}}, 0, 0 },
-  { "fr56", 56, {0, {0}}, 0, 0 },
-  { "fr57", 57, {0, {0}}, 0, 0 },
-  { "fr58", 58, {0, {0}}, 0, 0 },
-  { "fr59", 59, {0, {0}}, 0, 0 },
-  { "fr60", 60, {0, {0}}, 0, 0 },
-  { "fr61", 61, {0, {0}}, 0, 0 },
-  { "fr62", 62, {0, {0}}, 0, 0 },
-  { "fr63", 63, {0, {0}}, 0, 0 }
-};
-
-CGEN_KEYWORD sh_cgen_opval_h_fr =
-{
-  & sh_cgen_opval_h_fr_entries[0],
-  64,
-  0, 0, 0, 0
-};
-
-static CGEN_KEYWORD_ENTRY sh_cgen_opval_h_fp_entries[] =
-{
-  { "fp0", 0, {0, {0}}, 0, 0 },
-  { "fp1", 1, {0, {0}}, 0, 0 },
-  { "fp2", 2, {0, {0}}, 0, 0 },
-  { "fp3", 3, {0, {0}}, 0, 0 },
-  { "fp4", 4, {0, {0}}, 0, 0 },
-  { "fp5", 5, {0, {0}}, 0, 0 },
-  { "fp6", 6, {0, {0}}, 0, 0 },
-  { "fp7", 7, {0, {0}}, 0, 0 },
-  { "fp8", 8, {0, {0}}, 0, 0 },
-  { "fp9", 9, {0, {0}}, 0, 0 },
-  { "fp10", 10, {0, {0}}, 0, 0 },
-  { "fp11", 11, {0, {0}}, 0, 0 },
-  { "fp12", 12, {0, {0}}, 0, 0 },
-  { "fp13", 13, {0, {0}}, 0, 0 },
-  { "fp14", 14, {0, {0}}, 0, 0 },
-  { "fp15", 15, {0, {0}}, 0, 0 },
-  { "fp16", 16, {0, {0}}, 0, 0 },
-  { "fp17", 17, {0, {0}}, 0, 0 },
-  { "fp18", 18, {0, {0}}, 0, 0 },
-  { "fp19", 19, {0, {0}}, 0, 0 },
-  { "fp20", 20, {0, {0}}, 0, 0 },
-  { "fp21", 21, {0, {0}}, 0, 0 },
-  { "fp22", 22, {0, {0}}, 0, 0 },
-  { "fp23", 23, {0, {0}}, 0, 0 },
-  { "fp24", 24, {0, {0}}, 0, 0 },
-  { "fp25", 25, {0, {0}}, 0, 0 },
-  { "fp26", 26, {0, {0}}, 0, 0 },
-  { "fp27", 27, {0, {0}}, 0, 0 },
-  { "fp28", 28, {0, {0}}, 0, 0 },
-  { "fp29", 29, {0, {0}}, 0, 0 },
-  { "fp30", 30, {0, {0}}, 0, 0 },
-  { "fp31", 31, {0, {0}}, 0, 0 }
-};
-
-CGEN_KEYWORD sh_cgen_opval_h_fp =
-{
-  & sh_cgen_opval_h_fp_entries[0],
-  32,
-  0, 0, 0, 0
-};
-
-static CGEN_KEYWORD_ENTRY sh_cgen_opval_h_fv_entries[] =
-{
-  { "fv0", 0, {0, {0}}, 0, 0 },
-  { "fv1", 1, {0, {0}}, 0, 0 },
-  { "fv2", 2, {0, {0}}, 0, 0 },
-  { "fv3", 3, {0, {0}}, 0, 0 },
-  { "fv4", 4, {0, {0}}, 0, 0 },
-  { "fv5", 5, {0, {0}}, 0, 0 },
-  { "fv6", 6, {0, {0}}, 0, 0 },
-  { "fv7", 7, {0, {0}}, 0, 0 },
-  { "fv8", 8, {0, {0}}, 0, 0 },
-  { "fv9", 9, {0, {0}}, 0, 0 },
-  { "fv10", 10, {0, {0}}, 0, 0 },
-  { "fv11", 11, {0, {0}}, 0, 0 },
-  { "fv12", 12, {0, {0}}, 0, 0 },
-  { "fv13", 13, {0, {0}}, 0, 0 },
-  { "fv14", 14, {0, {0}}, 0, 0 },
-  { "fv15", 15, {0, {0}}, 0, 0 }
-};
-
-CGEN_KEYWORD sh_cgen_opval_h_fv =
-{
-  & sh_cgen_opval_h_fv_entries[0],
-  16,
-  0, 0, 0, 0
-};
-
-static CGEN_KEYWORD_ENTRY sh_cgen_opval_h_fmtx_entries[] =
-{
-  { "mtrx0", 0, {0, {0}}, 0, 0 },
-  { "mtrx1", 1, {0, {0}}, 0, 0 },
-  { "mtrx2", 2, {0, {0}}, 0, 0 },
-  { "mtrx3", 3, {0, {0}}, 0, 0 }
-};
-
-CGEN_KEYWORD sh_cgen_opval_h_fmtx =
-{
-  & sh_cgen_opval_h_fmtx_entries[0],
-  4,
-  0, 0, 0, 0
-};
-
-static CGEN_KEYWORD_ENTRY sh_cgen_opval_h_dr_entries[] =
-{
-  { "dr0", 0, {0, {0}}, 0, 0 },
-  { "dr1", 1, {0, {0}}, 0, 0 },
-  { "dr2", 2, {0, {0}}, 0, 0 },
-  { "dr3", 3, {0, {0}}, 0, 0 },
-  { "dr4", 4, {0, {0}}, 0, 0 },
-  { "dr5", 5, {0, {0}}, 0, 0 },
-  { "dr6", 6, {0, {0}}, 0, 0 },
-  { "dr7", 7, {0, {0}}, 0, 0 },
-  { "dr8", 8, {0, {0}}, 0, 0 },
-  { "dr9", 9, {0, {0}}, 0, 0 },
-  { "dr10", 10, {0, {0}}, 0, 0 },
-  { "dr11", 11, {0, {0}}, 0, 0 },
-  { "dr12", 12, {0, {0}}, 0, 0 },
-  { "dr13", 13, {0, {0}}, 0, 0 },
-  { "dr14", 14, {0, {0}}, 0, 0 },
-  { "dr15", 15, {0, {0}}, 0, 0 },
-  { "dr16", 16, {0, {0}}, 0, 0 },
-  { "dr17", 17, {0, {0}}, 0, 0 },
-  { "dr18", 18, {0, {0}}, 0, 0 },
-  { "dr19", 19, {0, {0}}, 0, 0 },
-  { "dr20", 20, {0, {0}}, 0, 0 },
-  { "dr21", 21, {0, {0}}, 0, 0 },
-  { "dr22", 22, {0, {0}}, 0, 0 },
-  { "dr23", 23, {0, {0}}, 0, 0 },
-  { "dr24", 24, {0, {0}}, 0, 0 },
-  { "dr25", 25, {0, {0}}, 0, 0 },
-  { "dr26", 26, {0, {0}}, 0, 0 },
-  { "dr27", 27, {0, {0}}, 0, 0 },
-  { "dr28", 28, {0, {0}}, 0, 0 },
-  { "dr29", 29, {0, {0}}, 0, 0 },
-  { "dr30", 30, {0, {0}}, 0, 0 },
-  { "dr31", 31, {0, {0}}, 0, 0 },
-  { "dr32", 32, {0, {0}}, 0, 0 },
-  { "dr33", 33, {0, {0}}, 0, 0 },
-  { "dr34", 34, {0, {0}}, 0, 0 },
-  { "dr35", 35, {0, {0}}, 0, 0 },
-  { "dr36", 36, {0, {0}}, 0, 0 },
-  { "dr37", 37, {0, {0}}, 0, 0 },
-  { "dr38", 38, {0, {0}}, 0, 0 },
-  { "dr39", 39, {0, {0}}, 0, 0 },
-  { "dr40", 40, {0, {0}}, 0, 0 },
-  { "dr41", 41, {0, {0}}, 0, 0 },
-  { "dr42", 42, {0, {0}}, 0, 0 },
-  { "dr43", 43, {0, {0}}, 0, 0 },
-  { "dr44", 44, {0, {0}}, 0, 0 },
-  { "dr45", 45, {0, {0}}, 0, 0 },
-  { "dr46", 46, {0, {0}}, 0, 0 },
-  { "dr47", 47, {0, {0}}, 0, 0 },
-  { "dr48", 48, {0, {0}}, 0, 0 },
-  { "dr49", 49, {0, {0}}, 0, 0 },
-  { "dr50", 50, {0, {0}}, 0, 0 },
-  { "dr51", 51, {0, {0}}, 0, 0 },
-  { "dr52", 52, {0, {0}}, 0, 0 },
-  { "dr53", 53, {0, {0}}, 0, 0 },
-  { "dr54", 54, {0, {0}}, 0, 0 },
-  { "dr55", 55, {0, {0}}, 0, 0 },
-  { "dr56", 56, {0, {0}}, 0, 0 },
-  { "dr57", 57, {0, {0}}, 0, 0 },
-  { "dr58", 58, {0, {0}}, 0, 0 },
-  { "dr59", 59, {0, {0}}, 0, 0 },
-  { "dr60", 60, {0, {0}}, 0, 0 },
-  { "dr61", 61, {0, {0}}, 0, 0 },
-  { "dr62", 62, {0, {0}}, 0, 0 },
-  { "dr63", 63, {0, {0}}, 0, 0 }
-};
-
-CGEN_KEYWORD sh_cgen_opval_h_dr =
-{
-  & sh_cgen_opval_h_dr_entries[0],
-  64,
-  0, 0, 0, 0
-};
-
-static CGEN_KEYWORD_ENTRY sh_cgen_opval_h_tr_entries[] =
-{
-  { "tr0", 0, {0, {0}}, 0, 0 },
-  { "tr1", 1, {0, {0}}, 0, 0 },
-  { "tr2", 2, {0, {0}}, 0, 0 },
-  { "tr3", 3, {0, {0}}, 0, 0 },
-  { "tr4", 4, {0, {0}}, 0, 0 },
-  { "tr5", 5, {0, {0}}, 0, 0 },
-  { "tr6", 6, {0, {0}}, 0, 0 },
-  { "tr7", 7, {0, {0}}, 0, 0 }
-};
-
-CGEN_KEYWORD sh_cgen_opval_h_tr =
-{
-  & sh_cgen_opval_h_tr_entries[0],
-  8,
-  0, 0, 0, 0
-};
-
-static CGEN_KEYWORD_ENTRY sh_cgen_opval_h_fvc_entries[] =
-{
-  { "fv0", 0, {0, {0}}, 0, 0 },
-  { "fv4", 4, {0, {0}}, 0, 0 },
-  { "fv8", 8, {0, {0}}, 0, 0 },
-  { "fv12", 12, {0, {0}}, 0, 0 }
-};
-
-CGEN_KEYWORD sh_cgen_opval_h_fvc =
-{
-  & sh_cgen_opval_h_fvc_entries[0],
-  4,
-  0, 0, 0, 0
-};
-
-
-/* The hardware table.  */
-
-#if defined (__STDC__) || defined (ALMOST_STDC) || defined (HAVE_STRINGIZE)
-#define A(a) (1 << CGEN_HW_##a)
-#else
-#define A(a) (1 << CGEN_HW_/**/a)
-#endif
-
-const CGEN_HW_ENTRY sh_cgen_hw_table[] =
-{
-  { "h-memory", HW_H_MEMORY, CGEN_ASM_NONE, 0, { 0, { (1<<MACH_BASE) } } },
-  { "h-sint", HW_H_SINT, CGEN_ASM_NONE, 0, { 0, { (1<<MACH_BASE) } } },
-  { "h-uint", HW_H_UINT, CGEN_ASM_NONE, 0, { 0, { (1<<MACH_BASE) } } },
-  { "h-addr", HW_H_ADDR, CGEN_ASM_NONE, 0, { 0, { (1<<MACH_BASE) } } },
-  { "h-iaddr", HW_H_IADDR, CGEN_ASM_NONE, 0, { 0, { (1<<MACH_BASE) } } },
-  { "h-pc", HW_H_PC, CGEN_ASM_NONE, 0, { 0|A(PC), { (1<<MACH_BASE) } } },
-  { "h-gr", HW_H_GR, CGEN_ASM_KEYWORD, (PTR) & sh_cgen_opval_h_gr, { 0, { (1<<MACH_BASE) } } },
-  { "h-grc", HW_H_GRC, CGEN_ASM_KEYWORD, (PTR) & sh_cgen_opval_h_grc, { 0|A(VIRTUAL), { (1<<MACH_BASE) } } },
-  { "h-cr", HW_H_CR, CGEN_ASM_KEYWORD, (PTR) & sh_cgen_opval_h_cr, { 0, { (1<<MACH_BASE) } } },
-  { "h-sr", HW_H_SR, CGEN_ASM_NONE, 0, { 0, { (1<<MACH_BASE) } } },
-  { "h-fpscr", HW_H_FPSCR, CGEN_ASM_NONE, 0, { 0, { (1<<MACH_BASE) } } },
-  { "h-frbit", HW_H_FRBIT, CGEN_ASM_NONE, 0, { 0|A(VIRTUAL), { (1<<MACH_BASE) } } },
-  { "h-szbit", HW_H_SZBIT, CGEN_ASM_NONE, 0, { 0|A(VIRTUAL), { (1<<MACH_BASE) } } },
-  { "h-prbit", HW_H_PRBIT, CGEN_ASM_NONE, 0, { 0|A(VIRTUAL), { (1<<MACH_BASE) } } },
-  { "h-sbit", HW_H_SBIT, CGEN_ASM_NONE, 0, { 0|A(VIRTUAL), { (1<<MACH_BASE) } } },
-  { "h-mbit", HW_H_MBIT, CGEN_ASM_NONE, 0, { 0|A(VIRTUAL), { (1<<MACH_BASE) } } },
-  { "h-qbit", HW_H_QBIT, CGEN_ASM_NONE, 0, { 0|A(VIRTUAL), { (1<<MACH_BASE) } } },
-  { "h-fr", HW_H_FR, CGEN_ASM_KEYWORD, (PTR) & sh_cgen_opval_h_fr, { 0, { (1<<MACH_BASE) } } },
-  { "h-fp", HW_H_FP, CGEN_ASM_KEYWORD, (PTR) & sh_cgen_opval_h_fp, { 0, { (1<<MACH_BASE) } } },
-  { "h-fv", HW_H_FV, CGEN_ASM_KEYWORD, (PTR) & sh_cgen_opval_h_fv, { 0|A(VIRTUAL), { (1<<MACH_BASE) } } },
-  { "h-fmtx", HW_H_FMTX, CGEN_ASM_KEYWORD, (PTR) & sh_cgen_opval_h_fmtx, { 0|A(VIRTUAL), { (1<<MACH_BASE) } } },
-  { "h-dr", HW_H_DR, CGEN_ASM_KEYWORD, (PTR) & sh_cgen_opval_h_dr, { 0|A(VIRTUAL), { (1<<MACH_BASE) } } },
-  { "h-tr", HW_H_TR, CGEN_ASM_KEYWORD, (PTR) & sh_cgen_opval_h_tr, { 0, { (1<<MACH_BASE) } } },
-  { "h-endian", HW_H_ENDIAN, CGEN_ASM_NONE, 0, { 0|A(VIRTUAL), { (1<<MACH_BASE) } } },
-  { "h-ism", HW_H_ISM, CGEN_ASM_NONE, 0, { 0, { (1<<MACH_BASE) } } },
-  { "h-frc", HW_H_FRC, CGEN_ASM_KEYWORD, (PTR) & sh_cgen_opval_frc_names, { 0|A(VIRTUAL), { (1<<MACH_BASE) } } },
-  { "h-drc", HW_H_DRC, CGEN_ASM_KEYWORD, (PTR) & sh_cgen_opval_drc_names, { 0|A(VIRTUAL), { (1<<MACH_BASE) } } },
-  { "h-xf", HW_H_XF, CGEN_ASM_KEYWORD, (PTR) & sh_cgen_opval_xf_names, { 0|A(VIRTUAL), { (1<<MACH_BASE) } } },
-  { "h-xd", HW_H_XD, CGEN_ASM_KEYWORD, (PTR) & sh_cgen_opval_frc_names, { 0|A(VIRTUAL), { (1<<MACH_BASE) } } },
-  { "h-fvc", HW_H_FVC, CGEN_ASM_KEYWORD, (PTR) & sh_cgen_opval_h_fvc, { 0|A(VIRTUAL), { (1<<MACH_BASE) } } },
-  { "h-fpccr", HW_H_FPCCR, CGEN_ASM_NONE, 0, { 0|A(VIRTUAL), { (1<<MACH_BASE) } } },
-  { "h-gbr", HW_H_GBR, CGEN_ASM_NONE, 0, { 0|A(VIRTUAL), { (1<<MACH_BASE) } } },
-  { "h-pr", HW_H_PR, CGEN_ASM_NONE, 0, { 0|A(VIRTUAL), { (1<<MACH_BASE) } } },
-  { "h-macl", HW_H_MACL, CGEN_ASM_NONE, 0, { 0|A(VIRTUAL), { (1<<MACH_BASE) } } },
-  { "h-mach", HW_H_MACH, CGEN_ASM_NONE, 0, { 0|A(VIRTUAL), { (1<<MACH_BASE) } } },
-  { "h-tbit", HW_H_TBIT, CGEN_ASM_NONE, 0, { 0|A(VIRTUAL), { (1<<MACH_BASE) } } },
-  { 0, 0, CGEN_ASM_NONE, 0, {0, {0}} }
-};
-
-#undef A
-
-
-/* The instruction field table.  */
-
-#if defined (__STDC__) || defined (ALMOST_STDC) || defined (HAVE_STRINGIZE)
-#define A(a) (1 << CGEN_IFLD_##a)
-#else
-#define A(a) (1 << CGEN_IFLD_/**/a)
-#endif
-
-const CGEN_IFLD sh_cgen_ifld_table[] =
-{
-  { SH_F_NIL, "f-nil", 0, 0, 0, 0, { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }  },
-  { SH_F_ANYOF, "f-anyof", 0, 0, 0, 0, { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }  },
-  { SH_F_OP4, "f-op4", 0, 16, 15, 4, { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }  },
-  { SH_F_OP8, "f-op8", 0, 16, 15, 8, { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }  },
-  { SH_F_OP16, "f-op16", 0, 16, 15, 16, { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }  },
-  { SH_F_SUB4, "f-sub4", 0, 16, 3, 4, { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }  },
-  { SH_F_SUB8, "f-sub8", 0, 16, 7, 8, { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }  },
-  { SH_F_SUB10, "f-sub10", 0, 16, 9, 10, { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }  },
-  { SH_F_RN, "f-rn", 0, 16, 11, 4, { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }  },
-  { SH_F_RM, "f-rm", 0, 16, 7, 4, { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }  },
-  { SH_F_8_1, "f-8-1", 0, 16, 8, 1, { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }  },
-  { SH_F_DISP8, "f-disp8", 0, 16, 7, 8, { 0|A(PCREL_ADDR), { (1<<MACH_BASE), (1<<ISA_COMPACT) } }  },
-  { SH_F_DISP12, "f-disp12", 0, 16, 11, 12, { 0|A(PCREL_ADDR), { (1<<MACH_BASE), (1<<ISA_COMPACT) } }  },
-  { SH_F_IMM8, "f-imm8", 0, 16, 7, 8, { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }  },
-  { SH_F_IMM4, "f-imm4", 0, 16, 3, 4, { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }  },
-  { SH_F_IMM4X2, "f-imm4x2", 0, 16, 3, 4, { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }  },
-  { SH_F_IMM4X4, "f-imm4x4", 0, 16, 3, 4, { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }  },
-  { SH_F_IMM8X2, "f-imm8x2", 0, 16, 7, 8, { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }  },
-  { SH_F_IMM8X4, "f-imm8x4", 0, 16, 7, 8, { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }  },
-  { SH_F_DN, "f-dn", 0, 16, 11, 3, { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }  },
-  { SH_F_DM, "f-dm", 0, 16, 7, 3, { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }  },
-  { SH_F_VN, "f-vn", 0, 16, 11, 2, { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }  },
-  { SH_F_VM, "f-vm", 0, 16, 9, 2, { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }  },
-  { SH_F_XN, "f-xn", 0, 16, 11, 3, { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }  },
-  { SH_F_XM, "f-xm", 0, 16, 7, 3, { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }  },
-  { SH_F_OP, "f-op", 0, 32, 31, 6, { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }  },
-  { SH_F_EXT, "f-ext", 0, 32, 19, 4, { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }  },
-  { SH_F_RSVD, "f-rsvd", 0, 32, 3, 4, { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }  },
-  { SH_F_LEFT, "f-left", 0, 32, 25, 6, { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }  },
-  { SH_F_RIGHT, "f-right", 0, 32, 15, 6, { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }  },
-  { SH_F_DEST, "f-dest", 0, 32, 9, 6, { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }  },
-  { SH_F_TRA, "f-tra", 0, 32, 6, 3, { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }  },
-  { SH_F_TRB, "f-trb", 0, 32, 22, 3, { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }  },
-  { SH_F_LIKELY, "f-likely", 0, 32, 9, 1, { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }  },
-  { SH_F_25, "f-25", 0, 32, 25, 3, { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }  },
-  { SH_F_8_2, "f-8-2", 0, 32, 8, 2, { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }  },
-  { SH_F_IMM6, "f-imm6", 0, 32, 15, 6, { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }  },
-  { SH_F_IMM10, "f-imm10", 0, 32, 19, 10, { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }  },
-  { SH_F_IMM16, "f-imm16", 0, 32, 25, 16, { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }  },
-  { SH_F_UIMM6, "f-uimm6", 0, 32, 15, 6, { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }  },
-  { SH_F_UIMM16, "f-uimm16", 0, 32, 25, 16, { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }  },
-  { SH_F_DISP6, "f-disp6", 0, 32, 15, 6, { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }  },
-  { SH_F_DISP6X32, "f-disp6x32", 0, 32, 15, 6, { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }  },
-  { SH_F_DISP10, "f-disp10", 0, 32, 19, 10, { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }  },
-  { SH_F_DISP10X8, "f-disp10x8", 0, 32, 19, 10, { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }  },
-  { SH_F_DISP10X4, "f-disp10x4", 0, 32, 19, 10, { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }  },
-  { SH_F_DISP10X2, "f-disp10x2", 0, 32, 19, 10, { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }  },
-  { SH_F_DISP16, "f-disp16", 0, 32, 25, 16, { 0|A(PCREL_ADDR), { (1<<MACH_BASE), (1<<ISA_MEDIA) } }  },
-  { 0, 0, 0, 0, 0, 0, {0, {0}} }
-};
-
-#undef A
-
-
-/* The operand table.  */
-
-#if defined (__STDC__) || defined (ALMOST_STDC) || defined (HAVE_STRINGIZE)
-#define A(a) (1 << CGEN_OPERAND_##a)
-#else
-#define A(a) (1 << CGEN_OPERAND_/**/a)
-#endif
-#if defined (__STDC__) || defined (ALMOST_STDC) || defined (HAVE_STRINGIZE)
-#define OPERAND(op) SH_OPERAND_##op
-#else
-#define OPERAND(op) SH_OPERAND_/**/op
-#endif
-
-const CGEN_OPERAND sh_cgen_operand_table[] =
-{
-/* pc: program counter */
-  { "pc", SH_OPERAND_PC, HW_H_PC, 0, 0,
-    { 0|A(SEM_ONLY), { (1<<MACH_BASE), (1<<ISA_COMPACT) } }  },
-/* endian: Endian mode */
-  { "endian", SH_OPERAND_ENDIAN, HW_H_ENDIAN, 0, 0,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT)|(1<<ISA_MEDIA) } }  },
-/* ism: Instruction set mode */
-  { "ism", SH_OPERAND_ISM, HW_H_ISM, 0, 0,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT)|(1<<ISA_MEDIA) } }  },
-/* rm: Left general purpose register */
-  { "rm", SH_OPERAND_RM, HW_H_GRC, 7, 4,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }  },
-/* rn: Right general purpose register */
-  { "rn", SH_OPERAND_RN, HW_H_GRC, 11, 4,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }  },
-/* r0: Register 0 */
-  { "r0", SH_OPERAND_R0, HW_H_GRC, 0, 0,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }  },
-/* frn: Single precision register */
-  { "frn", SH_OPERAND_FRN, HW_H_FRC, 11, 4,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }  },
-/* frm: Single precision register */
-  { "frm", SH_OPERAND_FRM, HW_H_FRC, 7, 4,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }  },
-/* fvn: Left floating point vector */
-  { "fvn", SH_OPERAND_FVN, HW_H_FVC, 11, 2,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }  },
-/* fvm: Right floating point vector */
-  { "fvm", SH_OPERAND_FVM, HW_H_FVC, 9, 2,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }  },
-/* drn: Left double precision register */
-  { "drn", SH_OPERAND_DRN, HW_H_DRC, 11, 3,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }  },
-/* drm: Right double precision register */
-  { "drm", SH_OPERAND_DRM, HW_H_DRC, 7, 3,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }  },
-/* imm4: Immediate value (4 bits) */
-  { "imm4", SH_OPERAND_IMM4, HW_H_SINT, 3, 4,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }  },
-/* imm8: Immediate value (8 bits) */
-  { "imm8", SH_OPERAND_IMM8, HW_H_SINT, 7, 8,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }  },
-/* uimm8: Immediate value (8 bits unsigned) */
-  { "uimm8", SH_OPERAND_UIMM8, HW_H_UINT, 7, 8,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }  },
-/* imm4x2: Immediate value (4 bits, 2x scale) */
-  { "imm4x2", SH_OPERAND_IMM4X2, HW_H_UINT, 3, 4,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }  },
-/* imm4x4: Immediate value (4 bits, 4x scale) */
-  { "imm4x4", SH_OPERAND_IMM4X4, HW_H_UINT, 3, 4,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }  },
-/* imm8x2: Immediate value (8 bits, 2x scale) */
-  { "imm8x2", SH_OPERAND_IMM8X2, HW_H_UINT, 7, 8,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }  },
-/* imm8x4: Immediate value (8 bits, 4x scale) */
-  { "imm8x4", SH_OPERAND_IMM8X4, HW_H_UINT, 7, 8,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }  },
-/* disp8: Displacement (8 bits) */
-  { "disp8", SH_OPERAND_DISP8, HW_H_IADDR, 7, 8,
-    { 0|A(PCREL_ADDR), { (1<<MACH_BASE), (1<<ISA_COMPACT) } }  },
-/* disp12: Displacement (12 bits) */
-  { "disp12", SH_OPERAND_DISP12, HW_H_IADDR, 11, 12,
-    { 0|A(PCREL_ADDR), { (1<<MACH_BASE), (1<<ISA_COMPACT) } }  },
-/* rm64: Register m (64 bits) */
-  { "rm64", SH_OPERAND_RM64, HW_H_GR, 7, 4,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }  },
-/* rn64: Register n (64 bits) */
-  { "rn64", SH_OPERAND_RN64, HW_H_GR, 11, 4,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }  },
-/* gbr: Global base register */
-  { "gbr", SH_OPERAND_GBR, HW_H_GBR, 0, 0,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }  },
-/* pr: Procedure link register */
-  { "pr", SH_OPERAND_PR, HW_H_PR, 0, 0,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }  },
-/* fpscr: Floating point status/control register */
-  { "fpscr", SH_OPERAND_FPSCR, HW_H_FPCCR, 0, 0,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }  },
-/* tbit: Condition code flag */
-  { "tbit", SH_OPERAND_TBIT, HW_H_TBIT, 0, 0,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }  },
-/* sbit: Multiply-accumulate saturation flag */
-  { "sbit", SH_OPERAND_SBIT, HW_H_SBIT, 0, 0,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }  },
-/* mbit: Divide-step M flag */
-  { "mbit", SH_OPERAND_MBIT, HW_H_MBIT, 0, 0,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }  },
-/* qbit: Divide-step Q flag */
-  { "qbit", SH_OPERAND_QBIT, HW_H_QBIT, 0, 0,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }  },
-/* fpul: Floating point ??? */
-  { "fpul", SH_OPERAND_FPUL, HW_H_FR, 0, 0,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }  },
-/* frbit: Floating point register bank bit */
-  { "frbit", SH_OPERAND_FRBIT, HW_H_FRBIT, 0, 0,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }  },
-/* szbit: Floating point transfer size bit */
-  { "szbit", SH_OPERAND_SZBIT, HW_H_SZBIT, 0, 0,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }  },
-/* prbit: Floating point precision bit */
-  { "prbit", SH_OPERAND_PRBIT, HW_H_PRBIT, 0, 0,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }  },
-/* macl: Multiply-accumulate low register */
-  { "macl", SH_OPERAND_MACL, HW_H_MACL, 0, 0,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }  },
-/* mach: Multiply-accumulate high register */
-  { "mach", SH_OPERAND_MACH, HW_H_MACH, 0, 0,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }  },
-/* fsdm: bar */
-  { "fsdm", SH_OPERAND_FSDM, HW_H_FRC, 7, 4,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }  },
-/* fsdn: bar */
-  { "fsdn", SH_OPERAND_FSDN, HW_H_FRC, 11, 4,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }  },
-/* rm: Left general purpose reg */
-  { "rm", SH_OPERAND_RM, HW_H_GR, 25, 6,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }  },
-/* rn: Right general purpose reg */
-  { "rn", SH_OPERAND_RN, HW_H_GR, 15, 6,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }  },
-/* rd: Destination general purpose reg */
-  { "rd", SH_OPERAND_RD, HW_H_GR, 9, 6,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }  },
-/* frg: Left single precision register */
-  { "frg", SH_OPERAND_FRG, HW_H_FR, 25, 6,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }  },
-/* frh: Right single precision register */
-  { "frh", SH_OPERAND_FRH, HW_H_FR, 15, 6,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }  },
-/* frf: Destination single precision reg */
-  { "frf", SH_OPERAND_FRF, HW_H_FR, 9, 6,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }  },
-/* frgh: Single precision register pair */
-  { "frgh", SH_OPERAND_FRGH, HW_H_FR, 15, 12,
-    { 0|A(VIRTUAL), { (1<<MACH_BASE), (1<<ISA_MEDIA) } }  },
-/* fpf: Pair of single precision registers */
-  { "fpf", SH_OPERAND_FPF, HW_H_FP, 9, 6,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }  },
-/* fvg: Left single precision vector */
-  { "fvg", SH_OPERAND_FVG, HW_H_FV, 25, 6,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }  },
-/* fvh: Right single precision vector */
-  { "fvh", SH_OPERAND_FVH, HW_H_FV, 15, 6,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }  },
-/* fvf: Destination single precision vector */
-  { "fvf", SH_OPERAND_FVF, HW_H_FV, 9, 6,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }  },
-/* mtrxg: Left single precision matrix */
-  { "mtrxg", SH_OPERAND_MTRXG, HW_H_FMTX, 25, 6,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }  },
-/* drg: Left double precision register */
-  { "drg", SH_OPERAND_DRG, HW_H_DR, 25, 6,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }  },
-/* drh: Right double precision register */
-  { "drh", SH_OPERAND_DRH, HW_H_DR, 15, 6,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }  },
-/* drf: Destination double precision reg */
-  { "drf", SH_OPERAND_DRF, HW_H_DR, 9, 6,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }  },
-/* drgh: Double precision register pair */
-  { "drgh", SH_OPERAND_DRGH, HW_H_DR, 15, 12,
-    { 0|A(VIRTUAL), { (1<<MACH_BASE), (1<<ISA_MEDIA) } }  },
-/* fpscr: Floating point status register */
-  { "fpscr", SH_OPERAND_FPSCR, HW_H_FPSCR, 0, 0,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }  },
-/* crj: Control register j */
-  { "crj", SH_OPERAND_CRJ, HW_H_CR, 9, 6,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }  },
-/* crk: Control register k */
-  { "crk", SH_OPERAND_CRK, HW_H_CR, 25, 6,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }  },
-/* tra: Target register a */
-  { "tra", SH_OPERAND_TRA, HW_H_TR, 6, 3,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }  },
-/* trb: Target register b */
-  { "trb", SH_OPERAND_TRB, HW_H_TR, 22, 3,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }  },
-/* disp6: Displacement (6 bits) */
-  { "disp6", SH_OPERAND_DISP6, HW_H_SINT, 15, 6,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }  },
-/* disp6x32: Displacement (6 bits, scale 32) */
-  { "disp6x32", SH_OPERAND_DISP6X32, HW_H_SINT, 15, 6,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }  },
-/* disp10: Displacement (10 bits) */
-  { "disp10", SH_OPERAND_DISP10, HW_H_SINT, 19, 10,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }  },
-/* disp10x2: Displacement (10 bits, scale 2) */
-  { "disp10x2", SH_OPERAND_DISP10X2, HW_H_SINT, 19, 10,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }  },
-/* disp10x4: Displacement (10 bits, scale 4) */
-  { "disp10x4", SH_OPERAND_DISP10X4, HW_H_SINT, 19, 10,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }  },
-/* disp10x8: Displacement (10 bits, scale 8) */
-  { "disp10x8", SH_OPERAND_DISP10X8, HW_H_SINT, 19, 10,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }  },
-/* disp16: Displacement (16 bits) */
-  { "disp16", SH_OPERAND_DISP16, HW_H_SINT, 25, 16,
-    { 0|A(PCREL_ADDR), { (1<<MACH_BASE), (1<<ISA_MEDIA) } }  },
-/* imm6: Immediate (6 bits) */
-  { "imm6", SH_OPERAND_IMM6, HW_H_SINT, 15, 6,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }  },
-/* imm10: Immediate (10 bits) */
-  { "imm10", SH_OPERAND_IMM10, HW_H_SINT, 19, 10,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }  },
-/* imm16: Immediate (16 bits) */
-  { "imm16", SH_OPERAND_IMM16, HW_H_SINT, 25, 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }  },
-/* uimm6: Immediate (6 bits) */
-  { "uimm6", SH_OPERAND_UIMM6, HW_H_UINT, 15, 6,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }  },
-/* uimm16: Unsigned immediate (16 bits) */
-  { "uimm16", SH_OPERAND_UIMM16, HW_H_UINT, 25, 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }  },
-/* likely: Likely branch? */
-  { "likely", SH_OPERAND_LIKELY, HW_H_UINT, 9, 1,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }  },
-  { 0, 0, 0, 0, 0, {0, {0}} }
-};
-
-#undef A
-
-
-/* The instruction table.  */
-
-#define OP(field) CGEN_SYNTAX_MAKE_FIELD (OPERAND (field))
-#if defined (__STDC__) || defined (ALMOST_STDC) || defined (HAVE_STRINGIZE)
-#define A(a) (1 << CGEN_INSN_##a)
-#else
-#define A(a) (1 << CGEN_INSN_/**/a)
-#endif
-
-static const CGEN_IBASE sh_cgen_insn_table[MAX_INSNS] =
-{
-  /* Special null first entry.
-     A `num' value of zero is thus invalid.
-     Also, the special `invalid' insn resides here.  */
-  { 0, 0, 0, 0, {0, {0}} },
-/* add $rm, $rn */
-  {
-    SH_INSN_ADD_COMPACT, "add-compact", "add", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* add #$imm8, $rn */
-  {
-    SH_INSN_ADDI_COMPACT, "addi-compact", "add", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* addc $rm, $rn */
-  {
-    SH_INSN_ADDC_COMPACT, "addc-compact", "addc", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* addv $rm, $rn */
-  {
-    SH_INSN_ADDV_COMPACT, "addv-compact", "addv", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* and $rm64, $rn64 */
-  {
-    SH_INSN_AND_COMPACT, "and-compact", "and", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* and #$uimm8, r0 */
-  {
-    SH_INSN_ANDI_COMPACT, "andi-compact", "and", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* and.b #$imm8, @(r0, gbr) */
-  {
-    SH_INSN_ANDB_COMPACT, "andb-compact", "and.b", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* bf $disp8 */
-  {
-    SH_INSN_BF_COMPACT, "bf-compact", "bf", 16,
-    { 0|A(COND_CTI), { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* bf/s $disp8 */
-  {
-    SH_INSN_BFS_COMPACT, "bfs-compact", "bf/s", 16,
-    { 0|A(COND_CTI)|A(DELAY_SLOT), { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* bra $disp12 */
-  {
-    SH_INSN_BRA_COMPACT, "bra-compact", "bra", 16,
-    { 0|A(UNCOND_CTI)|A(DELAY_SLOT), { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* braf $rn */
-  {
-    SH_INSN_BRAF_COMPACT, "braf-compact", "braf", 16,
-    { 0|A(UNCOND_CTI)|A(DELAY_SLOT), { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* brk */
-  {
-    SH_INSN_BRK_COMPACT, "brk-compact", "brk", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* bsr $disp12 */
-  {
-    SH_INSN_BSR_COMPACT, "bsr-compact", "bsr", 16,
-    { 0|A(UNCOND_CTI)|A(DELAY_SLOT), { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* bsrf $rn */
-  {
-    SH_INSN_BSRF_COMPACT, "bsrf-compact", "bsrf", 16,
-    { 0|A(UNCOND_CTI)|A(DELAY_SLOT), { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* bt $disp8 */
-  {
-    SH_INSN_BT_COMPACT, "bt-compact", "bt", 16,
-    { 0|A(COND_CTI), { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* bt/s $disp8 */
-  {
-    SH_INSN_BTS_COMPACT, "bts-compact", "bt/s", 16,
-    { 0|A(COND_CTI)|A(DELAY_SLOT), { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* clrmac */
-  {
-    SH_INSN_CLRMAC_COMPACT, "clrmac-compact", "clrmac", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* clrs */
-  {
-    SH_INSN_CLRS_COMPACT, "clrs-compact", "clrs", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* clrt */
-  {
-    SH_INSN_CLRT_COMPACT, "clrt-compact", "clrt", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* cmp/eq $rm, $rn */
-  {
-    SH_INSN_CMPEQ_COMPACT, "cmpeq-compact", "cmp/eq", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* cmp/eq #$imm8, r0 */
-  {
-    SH_INSN_CMPEQI_COMPACT, "cmpeqi-compact", "cmp/eq", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* cmp/ge $rm, $rn */
-  {
-    SH_INSN_CMPGE_COMPACT, "cmpge-compact", "cmp/ge", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* cmp/gt $rm, $rn */
-  {
-    SH_INSN_CMPGT_COMPACT, "cmpgt-compact", "cmp/gt", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* cmp/hi $rm, $rn */
-  {
-    SH_INSN_CMPHI_COMPACT, "cmphi-compact", "cmp/hi", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* cmp/hs $rm, $rn */
-  {
-    SH_INSN_CMPHS_COMPACT, "cmphs-compact", "cmp/hs", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* cmp/pl $rn */
-  {
-    SH_INSN_CMPPL_COMPACT, "cmppl-compact", "cmp/pl", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* cmp/pz $rn */
-  {
-    SH_INSN_CMPPZ_COMPACT, "cmppz-compact", "cmp/pz", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* cmp/str $rm, $rn */
-  {
-    SH_INSN_CMPSTR_COMPACT, "cmpstr-compact", "cmp/str", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* div0s $rm, $rn */
-  {
-    SH_INSN_DIV0S_COMPACT, "div0s-compact", "div0s", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* div0u */
-  {
-    SH_INSN_DIV0U_COMPACT, "div0u-compact", "div0u", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* div1 $rm, $rn */
-  {
-    SH_INSN_DIV1_COMPACT, "div1-compact", "div1", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* dmuls.l $rm, $rn */
-  {
-    SH_INSN_DMULSL_COMPACT, "dmulsl-compact", "dmuls.l", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* dmulu.l $rm, $rn */
-  {
-    SH_INSN_DMULUL_COMPACT, "dmulul-compact", "dmulu.l", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* dt $rn */
-  {
-    SH_INSN_DT_COMPACT, "dt-compact", "dt", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* exts.b $rm, $rn */
-  {
-    SH_INSN_EXTSB_COMPACT, "extsb-compact", "exts.b", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* exts.w $rm, $rn */
-  {
-    SH_INSN_EXTSW_COMPACT, "extsw-compact", "exts.w", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* extu.b $rm, $rn */
-  {
-    SH_INSN_EXTUB_COMPACT, "extub-compact", "extu.b", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* extu.w $rm, $rn */
-  {
-    SH_INSN_EXTUW_COMPACT, "extuw-compact", "extu.w", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* fabs $fsdn */
-  {
-    SH_INSN_FABS_COMPACT, "fabs-compact", "fabs", 16,
-    { 0|A(FP_INSN), { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* fadd $fsdm, $fsdn */
-  {
-    SH_INSN_FADD_COMPACT, "fadd-compact", "fadd", 16,
-    { 0|A(FP_INSN), { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* fcmp/eq $fsdm, $fsdn */
-  {
-    SH_INSN_FCMPEQ_COMPACT, "fcmpeq-compact", "fcmp/eq", 16,
-    { 0|A(FP_INSN), { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* fcmp/gt $fsdm, $fsdn */
-  {
-    SH_INSN_FCMPGT_COMPACT, "fcmpgt-compact", "fcmp/gt", 16,
-    { 0|A(FP_INSN), { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* fcnvds $drn, fpul */
-  {
-    SH_INSN_FCNVDS_COMPACT, "fcnvds-compact", "fcnvds", 16,
-    { 0|A(FP_INSN), { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* fcnvsd fpul, $drn */
-  {
-    SH_INSN_FCNVSD_COMPACT, "fcnvsd-compact", "fcnvsd", 16,
-    { 0|A(FP_INSN), { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* fdiv $fsdm, $fsdn */
-  {
-    SH_INSN_FDIV_COMPACT, "fdiv-compact", "fdiv", 16,
-    { 0|A(FP_INSN), { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* fipr $fvm, $fvn */
-  {
-    SH_INSN_FIPR_COMPACT, "fipr-compact", "fipr", 16,
-    { 0|A(FP_INSN), { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* flds $frn */
-  {
-    SH_INSN_FLDS_COMPACT, "flds-compact", "flds", 16,
-    { 0|A(FP_INSN), { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* fldi0 $frn */
-  {
-    SH_INSN_FLDI0_COMPACT, "fldi0-compact", "fldi0", 16,
-    { 0|A(FP_INSN), { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* fldi1 $frn */
-  {
-    SH_INSN_FLDI1_COMPACT, "fldi1-compact", "fldi1", 16,
-    { 0|A(FP_INSN), { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* float fpul, $fsdn */
-  {
-    SH_INSN_FLOAT_COMPACT, "float-compact", "float", 16,
-    { 0|A(FP_INSN), { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* fmac fr0, $frm, $frn */
-  {
-    SH_INSN_FMAC_COMPACT, "fmac-compact", "fmac", 16,
-    { 0|A(FP_INSN), { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* fmov $frm, $frn */
-  {
-    SH_INSN_FMOV1_COMPACT, "fmov1-compact", "fmov", 16,
-    { 0|A(FP_INSN), { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* fmov @$rm, $frn */
-  {
-    SH_INSN_FMOV2_COMPACT, "fmov2-compact", "fmov", 16,
-    { 0|A(FP_INSN), { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* fmov @${rm}+, frn */
-  {
-    SH_INSN_FMOV3_COMPACT, "fmov3-compact", "fmov", 16,
-    { 0|A(FP_INSN), { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* fmov @(r0, $rm), $frn */
-  {
-    SH_INSN_FMOV4_COMPACT, "fmov4-compact", "fmov", 16,
-    { 0|A(FP_INSN), { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* fmov $frm, @$rn */
-  {
-    SH_INSN_FMOV5_COMPACT, "fmov5-compact", "fmov", 16,
-    { 0|A(FP_INSN), { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* fmov $frm, @-$rn */
-  {
-    SH_INSN_FMOV6_COMPACT, "fmov6-compact", "fmov", 16,
-    { 0|A(FP_INSN), { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* fmov $frm, @(r0, $rn) */
-  {
-    SH_INSN_FMOV7_COMPACT, "fmov7-compact", "fmov", 16,
-    { 0|A(FP_INSN), { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* fmul $fsdm, $fsdn */
-  {
-    SH_INSN_FMUL_COMPACT, "fmul-compact", "fmul", 16,
-    { 0|A(FP_INSN), { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* fneg $fsdn */
-  {
-    SH_INSN_FNEG_COMPACT, "fneg-compact", "fneg", 16,
-    { 0|A(FP_INSN), { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* frchg */
-  {
-    SH_INSN_FRCHG_COMPACT, "frchg-compact", "frchg", 16,
-    { 0|A(FP_INSN), { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* fschg */
-  {
-    SH_INSN_FSCHG_COMPACT, "fschg-compact", "fschg", 16,
-    { 0|A(FP_INSN), { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* fsqrt $fsdn */
-  {
-    SH_INSN_FSQRT_COMPACT, "fsqrt-compact", "fsqrt", 16,
-    { 0|A(FP_INSN), { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* fsts fpul, $frn */
-  {
-    SH_INSN_FSTS_COMPACT, "fsts-compact", "fsts", 16,
-    { 0|A(FP_INSN), { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* fsub $fsdm, $fsdn */
-  {
-    SH_INSN_FSUB_COMPACT, "fsub-compact", "fsub", 16,
-    { 0|A(FP_INSN), { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* ftrc $fsdn, fpul */
-  {
-    SH_INSN_FTRC_COMPACT, "ftrc-compact", "ftrc", 16,
-    { 0|A(FP_INSN), { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* ftrv xmtrx, $fvn */
-  {
-    SH_INSN_FTRV_COMPACT, "ftrv-compact", "ftrv", 16,
-    { 0|A(FP_INSN), { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* jmp @$rn */
-  {
-    SH_INSN_JMP_COMPACT, "jmp-compact", "jmp", 16,
-    { 0|A(UNCOND_CTI)|A(DELAY_SLOT), { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* jsr @$rn */
-  {
-    SH_INSN_JSR_COMPACT, "jsr-compact", "jsr", 16,
-    { 0|A(UNCOND_CTI)|A(DELAY_SLOT), { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* ldc $rn, gbr */
-  {
-    SH_INSN_LDC_COMPACT, "ldc-compact", "ldc", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* ldc.l @${rn}+, gbr */
-  {
-    SH_INSN_LDCL_COMPACT, "ldcl-compact", "ldc.l", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* lds $rn, fpscr */
-  {
-    SH_INSN_LDS_FPSCR_COMPACT, "lds-fpscr-compact", "lds", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* lds.l @${rn}+, fpscr */
-  {
-    SH_INSN_LDSL_FPSCR_COMPACT, "ldsl-fpscr-compact", "lds.l", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* lds $rn, fpul */
-  {
-    SH_INSN_LDS_FPUL_COMPACT, "lds-fpul-compact", "lds", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* lds.l @${rn}+, fpul */
-  {
-    SH_INSN_LDSL_FPUL_COMPACT, "ldsl-fpul-compact", "lds.l", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* lds $rn, mach */
-  {
-    SH_INSN_LDS_MACH_COMPACT, "lds-mach-compact", "lds", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* lds.l @${rn}+, mach */
-  {
-    SH_INSN_LDSL_MACH_COMPACT, "ldsl-mach-compact", "lds.l", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* lds $rn, macl */
-  {
-    SH_INSN_LDS_MACL_COMPACT, "lds-macl-compact", "lds", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* lds.l @${rn}+, macl */
-  {
-    SH_INSN_LDSL_MACL_COMPACT, "ldsl-macl-compact", "lds.l", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* lds $rn, pr */
-  {
-    SH_INSN_LDS_PR_COMPACT, "lds-pr-compact", "lds", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* lds.l @${rn}+, pr */
-  {
-    SH_INSN_LDSL_PR_COMPACT, "ldsl-pr-compact", "lds.l", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* mac.l @${rm}+, @${rn}+ */
-  {
-    SH_INSN_MACL_COMPACT, "macl-compact", "mac.l", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* mac.w @${rm}+, @${rn}+ */
-  {
-    SH_INSN_MACW_COMPACT, "macw-compact", "mac.w", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* mov $rm64, $rn64 */
-  {
-    SH_INSN_MOV_COMPACT, "mov-compact", "mov", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* mov #$imm8, $rn */
-  {
-    SH_INSN_MOVI_COMPACT, "movi-compact", "mov", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* mov.b $rm, @$rn */
-  {
-    SH_INSN_MOVB1_COMPACT, "movb1-compact", "mov.b", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* mov.b $rm, @-$rn */
-  {
-    SH_INSN_MOVB2_COMPACT, "movb2-compact", "mov.b", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* mov.b $rm, @(r0,$rn) */
-  {
-    SH_INSN_MOVB3_COMPACT, "movb3-compact", "mov.b", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* mov.b r0, @($imm8, gbr) */
-  {
-    SH_INSN_MOVB4_COMPACT, "movb4-compact", "mov.b", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* mov.b r0, @($imm4, $rm) */
-  {
-    SH_INSN_MOVB5_COMPACT, "movb5-compact", "mov.b", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* mov.b @$rm, $rn */
-  {
-    SH_INSN_MOVB6_COMPACT, "movb6-compact", "mov.b", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* mov.b @${rm}+, $rn */
-  {
-    SH_INSN_MOVB7_COMPACT, "movb7-compact", "mov.b", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* mov.b @(r0, $rm), $rn */
-  {
-    SH_INSN_MOVB8_COMPACT, "movb8-compact", "mov.b", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* mov.b @($imm8, gbr), r0 */
-  {
-    SH_INSN_MOVB9_COMPACT, "movb9-compact", "mov.b", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* mov.b @($imm4, $rm), r0 */
-  {
-    SH_INSN_MOVB10_COMPACT, "movb10-compact", "mov.b", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* mov.l $rm, @$rn */
-  {
-    SH_INSN_MOVL1_COMPACT, "movl1-compact", "mov.l", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* mov.l $rm, @-$rn */
-  {
-    SH_INSN_MOVL2_COMPACT, "movl2-compact", "mov.l", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* mov.l $rm, @(r0, $rn) */
-  {
-    SH_INSN_MOVL3_COMPACT, "movl3-compact", "mov.l", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* mov.l r0, @($imm8x4, gbr) */
-  {
-    SH_INSN_MOVL4_COMPACT, "movl4-compact", "mov.l", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* mov.l $rm, @($imm4x4, $rn) */
-  {
-    SH_INSN_MOVL5_COMPACT, "movl5-compact", "mov.l", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* mov.l @$rm, $rn */
-  {
-    SH_INSN_MOVL6_COMPACT, "movl6-compact", "mov.l", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* mov.l @${rm}+, $rn */
-  {
-    SH_INSN_MOVL7_COMPACT, "movl7-compact", "mov.l", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* mov.l @(r0, $rm), $rn */
-  {
-    SH_INSN_MOVL8_COMPACT, "movl8-compact", "mov.l", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* mov.l @($imm8x4, gbr), r0 */
-  {
-    SH_INSN_MOVL9_COMPACT, "movl9-compact", "mov.l", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* mov.l @($imm8x4, pc), $rn */
-  {
-    SH_INSN_MOVL10_COMPACT, "movl10-compact", "mov.l", 16,
-    { 0|A(ILLSLOT), { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* mov.l @($imm4x4, $rm), $rn */
-  {
-    SH_INSN_MOVL11_COMPACT, "movl11-compact", "mov.l", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* mov.w $rm, @$rn */
-  {
-    SH_INSN_MOVW1_COMPACT, "movw1-compact", "mov.w", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* mov.w $rm, @-$rn */
-  {
-    SH_INSN_MOVW2_COMPACT, "movw2-compact", "mov.w", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* mov.w $rm, @(r0, $rn) */
-  {
-    SH_INSN_MOVW3_COMPACT, "movw3-compact", "mov.w", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* mov.w r0, @($imm8x2, gbr) */
-  {
-    SH_INSN_MOVW4_COMPACT, "movw4-compact", "mov.w", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* mov.w r0, @($imm4x2, $rn) */
-  {
-    SH_INSN_MOVW5_COMPACT, "movw5-compact", "mov.w", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* mov.w @$rm, $rn */
-  {
-    SH_INSN_MOVW6_COMPACT, "movw6-compact", "mov.w", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* mov.w @${rm}+, $rn */
-  {
-    SH_INSN_MOVW7_COMPACT, "movw7-compact", "mov.w", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* mov.w @(r0, $rm), $rn */
-  {
-    SH_INSN_MOVW8_COMPACT, "movw8-compact", "mov.w", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* mov.w @($imm8x2, gbr), r0 */
-  {
-    SH_INSN_MOVW9_COMPACT, "movw9-compact", "mov.w", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* mov.w @($imm8x2, pc), $rn */
-  {
-    SH_INSN_MOVW10_COMPACT, "movw10-compact", "mov.w", 16,
-    { 0|A(ILLSLOT), { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* mov.w @($imm4x2, $rm), r0 */
-  {
-    SH_INSN_MOVW11_COMPACT, "movw11-compact", "mov.w", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* mova @($imm8x4, pc), r0 */
-  {
-    SH_INSN_MOVA_COMPACT, "mova-compact", "mova", 16,
-    { 0|A(ILLSLOT), { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* movca.l r0, @$rn */
-  {
-    SH_INSN_MOVCAL_COMPACT, "movcal-compact", "movca.l", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* movt $rn */
-  {
-    SH_INSN_MOVT_COMPACT, "movt-compact", "movt", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* mul.l $rm, $rn */
-  {
-    SH_INSN_MULL_COMPACT, "mull-compact", "mul.l", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* muls.w $rm, $rn */
-  {
-    SH_INSN_MULSW_COMPACT, "mulsw-compact", "muls.w", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* mulu.w $rm, $rn */
-  {
-    SH_INSN_MULUW_COMPACT, "muluw-compact", "mulu.w", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* neg $rm, $rn */
-  {
-    SH_INSN_NEG_COMPACT, "neg-compact", "neg", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* negc $rm, $rn */
-  {
-    SH_INSN_NEGC_COMPACT, "negc-compact", "negc", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* nop */
-  {
-    SH_INSN_NOP_COMPACT, "nop-compact", "nop", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* not $rm64, $rn64 */
-  {
-    SH_INSN_NOT_COMPACT, "not-compact", "not", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* ocbi @$rn */
-  {
-    SH_INSN_OCBI_COMPACT, "ocbi-compact", "ocbi", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* ocbp @$rn */
-  {
-    SH_INSN_OCBP_COMPACT, "ocbp-compact", "ocbp", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* ocbwb @$rn */
-  {
-    SH_INSN_OCBWB_COMPACT, "ocbwb-compact", "ocbwb", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* or $rm64, $rn64 */
-  {
-    SH_INSN_OR_COMPACT, "or-compact", "or", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* or #$uimm8, r0 */
-  {
-    SH_INSN_ORI_COMPACT, "ori-compact", "or", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* or.b #$imm8, @(r0, gbr) */
-  {
-    SH_INSN_ORB_COMPACT, "orb-compact", "or.b", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* pref @$rn */
-  {
-    SH_INSN_PREF_COMPACT, "pref-compact", "pref", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* rotcl $rn */
-  {
-    SH_INSN_ROTCL_COMPACT, "rotcl-compact", "rotcl", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* rotcr $rn */
-  {
-    SH_INSN_ROTCR_COMPACT, "rotcr-compact", "rotcr", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* rotl $rn */
-  {
-    SH_INSN_ROTL_COMPACT, "rotl-compact", "rotl", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* rotr $rn */
-  {
-    SH_INSN_ROTR_COMPACT, "rotr-compact", "rotr", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* rts */
-  {
-    SH_INSN_RTS_COMPACT, "rts-compact", "rts", 16,
-    { 0|A(UNCOND_CTI)|A(DELAY_SLOT), { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* sets */
-  {
-    SH_INSN_SETS_COMPACT, "sets-compact", "sets", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* sett */
-  {
-    SH_INSN_SETT_COMPACT, "sett-compact", "sett", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* shad $rm, $rn */
-  {
-    SH_INSN_SHAD_COMPACT, "shad-compact", "shad", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* shal $rn */
-  {
-    SH_INSN_SHAL_COMPACT, "shal-compact", "shal", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* shar $rn */
-  {
-    SH_INSN_SHAR_COMPACT, "shar-compact", "shar", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* shld $rm, $rn */
-  {
-    SH_INSN_SHLD_COMPACT, "shld-compact", "shld", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* shll $rn */
-  {
-    SH_INSN_SHLL_COMPACT, "shll-compact", "shll", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* shll2 $rn */
-  {
-    SH_INSN_SHLL2_COMPACT, "shll2-compact", "shll2", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* shll8 $rn */
-  {
-    SH_INSN_SHLL8_COMPACT, "shll8-compact", "shll8", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* shll16 $rn */
-  {
-    SH_INSN_SHLL16_COMPACT, "shll16-compact", "shll16", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* shlr $rn */
-  {
-    SH_INSN_SHLR_COMPACT, "shlr-compact", "shlr", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* shlr2 $rn */
-  {
-    SH_INSN_SHLR2_COMPACT, "shlr2-compact", "shlr2", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* shlr8 $rn */
-  {
-    SH_INSN_SHLR8_COMPACT, "shlr8-compact", "shlr8", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* shlr16 $rn */
-  {
-    SH_INSN_SHLR16_COMPACT, "shlr16-compact", "shlr16", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* stc gbr, $rn */
-  {
-    SH_INSN_STC_GBR_COMPACT, "stc-gbr-compact", "stc", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* stc.l gbr, @-$rn */
-  {
-    SH_INSN_STCL_GBR_COMPACT, "stcl-gbr-compact", "stc.l", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* sts fpscr, $rn */
-  {
-    SH_INSN_STS_FPSCR_COMPACT, "sts-fpscr-compact", "sts", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* sts.l fpscr, @-$rn */
-  {
-    SH_INSN_STSL_FPSCR_COMPACT, "stsl-fpscr-compact", "sts.l", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* sts fpul, $rn */
-  {
-    SH_INSN_STS_FPUL_COMPACT, "sts-fpul-compact", "sts", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* sts.l fpul, @-$rn */
-  {
-    SH_INSN_STSL_FPUL_COMPACT, "stsl-fpul-compact", "sts.l", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* sts mach, $rn */
-  {
-    SH_INSN_STS_MACH_COMPACT, "sts-mach-compact", "sts", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* sts.l mach, @-$rn */
-  {
-    SH_INSN_STSL_MACH_COMPACT, "stsl-mach-compact", "sts.l", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* sts macl, $rn */
-  {
-    SH_INSN_STS_MACL_COMPACT, "sts-macl-compact", "sts", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* sts.l macl, @-$rn */
-  {
-    SH_INSN_STSL_MACL_COMPACT, "stsl-macl-compact", "sts.l", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* sts pr, $rn */
-  {
-    SH_INSN_STS_PR_COMPACT, "sts-pr-compact", "sts", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* sts.l pr, @-$rn */
-  {
-    SH_INSN_STSL_PR_COMPACT, "stsl-pr-compact", "sts.l", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* sub $rm, $rn */
-  {
-    SH_INSN_SUB_COMPACT, "sub-compact", "sub", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* subc $rm, $rn */
-  {
-    SH_INSN_SUBC_COMPACT, "subc-compact", "subc", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* subv $rm, $rn */
-  {
-    SH_INSN_SUBV_COMPACT, "subv-compact", "subv", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* swap.b $rm, $rn */
-  {
-    SH_INSN_SWAPB_COMPACT, "swapb-compact", "swap.b", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* swap.w $rm, $rn */
-  {
-    SH_INSN_SWAPW_COMPACT, "swapw-compact", "swap.w", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* tas.b @$rn */
-  {
-    SH_INSN_TASB_COMPACT, "tasb-compact", "tas.b", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* trapa #$uimm8 */
-  {
-    SH_INSN_TRAPA_COMPACT, "trapa-compact", "trapa", 16,
-    { 0|A(ILLSLOT), { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* tst $rm, $rn */
-  {
-    SH_INSN_TST_COMPACT, "tst-compact", "tst", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* tst #$uimm8, r0 */
-  {
-    SH_INSN_TSTI_COMPACT, "tsti-compact", "tst", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* tst.b #$imm8, @(r0, gbr) */
-  {
-    SH_INSN_TSTB_COMPACT, "tstb-compact", "tst.b", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* xor $rm64, $rn64 */
-  {
-    SH_INSN_XOR_COMPACT, "xor-compact", "xor", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* xor #$uimm8, r0 */
-  {
-    SH_INSN_XORI_COMPACT, "xori-compact", "xor", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* xor.b #$imm8, @(r0, gbr) */
-  {
-    SH_INSN_XORB_COMPACT, "xorb-compact", "xor.b", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* xtrct $rm, $rn */
-  {
-    SH_INSN_XTRCT_COMPACT, "xtrct-compact", "xtrct", 16,
-    { 0, { (1<<MACH_BASE), (1<<ISA_COMPACT) } }
-  },
-/* add $rm, $rn, $rd */
-  {
-    SH_INSN_ADD, "add", "add", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* add.l $rm, $rn, $rd */
-  {
-    SH_INSN_ADDL, "addl", "add.l", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* addi $rm, $disp10, $rd */
-  {
-    SH_INSN_ADDI, "addi", "addi", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* addi.l $rm, $disp10, $rd */
-  {
-    SH_INSN_ADDIL, "addil", "addi.l", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* addz.l $rm, $rn, $rd */
-  {
-    SH_INSN_ADDZL, "addzl", "addz.l", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* alloco $rm, $disp6x32 */
-  {
-    SH_INSN_ALLOCO, "alloco", "alloco", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* and $rm, $rn, $rd */
-  {
-    SH_INSN_AND, "and", "and", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* andc $rm, $rn, $rd */
-  {
-    SH_INSN_ANDC, "andc", "andc", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* andi $rm, $disp10, $rd */
-  {
-    SH_INSN_ANDI, "andi", "andi", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* beq$likely $rm, $rn, $tra */
-  {
-    SH_INSN_BEQ, "beq", "beq", 32,
-    { 0|A(COND_CTI), { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* beqi$likely $rm, $imm6, $tra */
-  {
-    SH_INSN_BEQI, "beqi", "beqi", 32,
-    { 0|A(COND_CTI), { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* bge$likely $rm, $rn, $tra */
-  {
-    SH_INSN_BGE, "bge", "bge", 32,
-    { 0|A(COND_CTI), { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* bgeu$likely $rm, $rn, $tra */
-  {
-    SH_INSN_BGEU, "bgeu", "bgeu", 32,
-    { 0|A(COND_CTI), { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* bgt$likely $rm, $rn, $tra */
-  {
-    SH_INSN_BGT, "bgt", "bgt", 32,
-    { 0|A(COND_CTI), { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* bgtu$likely $rm, $rn, $tra */
-  {
-    SH_INSN_BGTU, "bgtu", "bgtu", 32,
-    { 0|A(COND_CTI), { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* blink $trb, $rd */
-  {
-    SH_INSN_BLINK, "blink", "blink", 32,
-    { 0|A(UNCOND_CTI), { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* bne$likely $rm, $rn, $tra */
-  {
-    SH_INSN_BNE, "bne", "bne", 32,
-    { 0|A(COND_CTI), { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* bnei$likely $rm, $imm6, $tra */
-  {
-    SH_INSN_BNEI, "bnei", "bnei", 32,
-    { 0|A(COND_CTI), { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* brk */
-  {
-    SH_INSN_BRK, "brk", "brk", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* byterev $rm, $rd */
-  {
-    SH_INSN_BYTEREV, "byterev", "byterev", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* cmpeq $rm, $rn, $rd */
-  {
-    SH_INSN_CMPEQ, "cmpeq", "cmpeq", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* cmpgt $rm, $rn, $rd */
-  {
-    SH_INSN_CMPGT, "cmpgt", "cmpgt", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* cmpgtu $rm,$rn, $rd */
-  {
-    SH_INSN_CMPGTU, "cmpgtu", "cmpgtu", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* cmveq $rm, $rn, $rd */
-  {
-    SH_INSN_CMVEQ, "cmveq", "cmveq", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* cmvne $rm, $rn, $rd */
-  {
-    SH_INSN_CMVNE, "cmvne", "cmvne", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* fabs.d $drgh, $drf */
-  {
-    SH_INSN_FABSD, "fabsd", "fabs.d", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* fabs.s $frgh, $frf */
-  {
-    SH_INSN_FABSS, "fabss", "fabs.s", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* fadd.d $drg, $drh, $drf */
-  {
-    SH_INSN_FADDD, "faddd", "fadd.d", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* fadd.s $frg, $frh, $frf */
-  {
-    SH_INSN_FADDS, "fadds", "fadd.s", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* fcmpeq.d $drg, $drh, $rd */
-  {
-    SH_INSN_FCMPEQD, "fcmpeqd", "fcmpeq.d", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* fcmpeq.s $frg, $frh, $rd */
-  {
-    SH_INSN_FCMPEQS, "fcmpeqs", "fcmpeq.s", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* fcmpge.d $drg, $drh, $rd */
-  {
-    SH_INSN_FCMPGED, "fcmpged", "fcmpge.d", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* fcmpge.s $frg, $frh, $rd */
-  {
-    SH_INSN_FCMPGES, "fcmpges", "fcmpge.s", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* fcmpgt.d $drg, $drh, $rd */
-  {
-    SH_INSN_FCMPGTD, "fcmpgtd", "fcmpgt.d", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* fcmpgt.s $frg, $frh, $rd */
-  {
-    SH_INSN_FCMPGTS, "fcmpgts", "fcmpgt.s", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* fcmpun.d $drg, $drh, $rd */
-  {
-    SH_INSN_FCMPUND, "fcmpund", "fcmpun.d", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* fcmpun.s $frg, $frh, $rd */
-  {
-    SH_INSN_FCMPUNS, "fcmpuns", "fcmpun.s", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* fcnv.ds $drgh, $frf */
-  {
-    SH_INSN_FCNVDS, "fcnvds", "fcnv.ds", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* fcnv.sd $frgh, $drf */
-  {
-    SH_INSN_FCNVSD, "fcnvsd", "fcnv.sd", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* fdiv.d $drg, $drh, $drf */
-  {
-    SH_INSN_FDIVD, "fdivd", "fdiv.d", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* fdiv.s $frg, $frh, $frf */
-  {
-    SH_INSN_FDIVS, "fdivs", "fdiv.s", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* fgetscr $frf */
-  {
-    SH_INSN_FGETSCR, "fgetscr", "fgetscr", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* fipr.s $fvg, $fvh, $frf */
-  {
-    SH_INSN_FIPRS, "fiprs", "fipr.s", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* fld.d $rm, $disp10x8, $drf */
-  {
-    SH_INSN_FLDD, "fldd", "fld.d", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* fld.p $rm, $disp10x8, $fpf */
-  {
-    SH_INSN_FLDP, "fldp", "fld.p", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* fld.s $rm, $disp10x4, $frf */
-  {
-    SH_INSN_FLDS, "flds", "fld.s", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* fldx.d $rm, $rn, $drf */
-  {
-    SH_INSN_FLDXD, "fldxd", "fldx.d", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* fldx.p $rm, $rn, $fpf */
-  {
-    SH_INSN_FLDXP, "fldxp", "fldx.p", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* fldx.s $rm, $rn, $frf */
-  {
-    SH_INSN_FLDXS, "fldxs", "fldx.s", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* float.ld $frgh, $drf */
-  {
-    SH_INSN_FLOATLD, "floatld", "float.ld", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* float.ls $frgh, $frf */
-  {
-    SH_INSN_FLOATLS, "floatls", "float.ls", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* float.qd $drgh, $drf */
-  {
-    SH_INSN_FLOATQD, "floatqd", "float.qd", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* float.qs $drgh, $frf */
-  {
-    SH_INSN_FLOATQS, "floatqs", "float.qs", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* fmac.s $frg, $frh, $frf */
-  {
-    SH_INSN_FMACS, "fmacs", "fmac.s", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* fmov.d $drgh, $drf */
-  {
-    SH_INSN_FMOVD, "fmovd", "fmov.d", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* fmov.dq $drgh, $rd */
-  {
-    SH_INSN_FMOVDQ, "fmovdq", "fmov.dq", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* fmov.ls $rm, $frf */
-  {
-    SH_INSN_FMOVLS, "fmovls", "fmov.ls", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* fmov.qd $rm, $drf */
-  {
-    SH_INSN_FMOVQD, "fmovqd", "fmov.qd", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* fmov.s $frgh, $frf */
-  {
-    SH_INSN_FMOVS, "fmovs", "fmov.s", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* fmov.sl $frgh, $rd */
-  {
-    SH_INSN_FMOVSL, "fmovsl", "fmov.sl", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* fmul.d $drg, $drh, $drf */
-  {
-    SH_INSN_FMULD, "fmuld", "fmul.d", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* fmul.s $frg, $frh, $frf */
-  {
-    SH_INSN_FMULS, "fmuls", "fmul.s", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* fneg.d $drgh, $drf */
-  {
-    SH_INSN_FNEGD, "fnegd", "fneg.d", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* fneg.s $frgh, $frf */
-  {
-    SH_INSN_FNEGS, "fnegs", "fneg.s", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* fputscr $frgh */
-  {
-    SH_INSN_FPUTSCR, "fputscr", "fputscr", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* fsqrt.d $drgh, $drf */
-  {
-    SH_INSN_FSQRTD, "fsqrtd", "fsqrt.d", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* fsqrt.s $frgh, $frf */
-  {
-    SH_INSN_FSQRTS, "fsqrts", "fsqrt.s", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* fst.d $rm, $disp10x8, $drf */
-  {
-    SH_INSN_FSTD, "fstd", "fst.d", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* fst.p $rm, $disp10x8, $fpf */
-  {
-    SH_INSN_FSTP, "fstp", "fst.p", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* fst.s $rm, $disp10x4, $frf */
-  {
-    SH_INSN_FSTS, "fsts", "fst.s", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* fstx.d $rm, $rn, $drf */
-  {
-    SH_INSN_FSTXD, "fstxd", "fstx.d", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* fstx.p $rm, $rn, $fpf */
-  {
-    SH_INSN_FSTXP, "fstxp", "fstx.p", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* fstx.s $rm, $rn, $frf */
-  {
-    SH_INSN_FSTXS, "fstxs", "fstx.s", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* fsub.d $drg, $drh, $drf */
-  {
-    SH_INSN_FSUBD, "fsubd", "fsub.d", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* fsub.s $frg, $frh, $frf */
-  {
-    SH_INSN_FSUBS, "fsubs", "fsub.s", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* ftrc.dl $drgh, $frf */
-  {
-    SH_INSN_FTRCDL, "ftrcdl", "ftrc.dl", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* ftrc.sl $frgh, $frf */
-  {
-    SH_INSN_FTRCSL, "ftrcsl", "ftrc.sl", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* ftrc.dq $drgh, $drf */
-  {
-    SH_INSN_FTRCDQ, "ftrcdq", "ftrc.dq", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* ftrc.sq $frgh, $drf */
-  {
-    SH_INSN_FTRCSQ, "ftrcsq", "ftrc.sq", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* ftrv.s $mtrxg, $fvh, $fvf */
-  {
-    SH_INSN_FTRVS, "ftrvs", "ftrv.s", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* getcfg $rm, $disp6, $rd */
-  {
-    SH_INSN_GETCFG, "getcfg", "getcfg", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* getcon $crk, $rd */
-  {
-    SH_INSN_GETCON, "getcon", "getcon", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* gettr $trb, $rd */
-  {
-    SH_INSN_GETTR, "gettr", "gettr", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* icbi $rm, $disp6x32 */
-  {
-    SH_INSN_ICBI, "icbi", "icbi", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* ld.b $rm, $disp10, $rd */
-  {
-    SH_INSN_LDB, "ldb", "ld.b", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* ld.l $rm, $disp10x4, $rd */
-  {
-    SH_INSN_LDL, "ldl", "ld.l", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* ld.q $rm, $disp10x8, $rd */
-  {
-    SH_INSN_LDQ, "ldq", "ld.q", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* ld.ub $rm, $disp10, $rd */
-  {
-    SH_INSN_LDUB, "ldub", "ld.ub", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* ld.uw $rm, $disp10x2, $rd */
-  {
-    SH_INSN_LDUW, "lduw", "ld.uw", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* ld.w $rm, $disp10x2, $rd */
-  {
-    SH_INSN_LDW, "ldw", "ld.w", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* ldhi.l $rm, $disp6, $rd */
-  {
-    SH_INSN_LDHIL, "ldhil", "ldhi.l", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* ldhi.q $rm, $disp6, $rd */
-  {
-    SH_INSN_LDHIQ, "ldhiq", "ldhi.q", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* ldlo.l $rm, $disp6, $rd */
-  {
-    SH_INSN_LDLOL, "ldlol", "ldlo.l", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* ldlo.q $rm, $disp6, $rd */
-  {
-    SH_INSN_LDLOQ, "ldloq", "ldlo.q", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* ldx.b $rm, $rn, $rd */
-  {
-    SH_INSN_LDXB, "ldxb", "ldx.b", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* ldx.l $rm, $rn, $rd */
-  {
-    SH_INSN_LDXL, "ldxl", "ldx.l", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* ldx.q $rm, $rn, $rd */
-  {
-    SH_INSN_LDXQ, "ldxq", "ldx.q", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* ldx.ub $rm, $rn, $rd */
-  {
-    SH_INSN_LDXUB, "ldxub", "ldx.ub", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* ldx.uw $rm, $rn, $rd */
-  {
-    SH_INSN_LDXUW, "ldxuw", "ldx.uw", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* ldx.w $rm, $rn, $rd */
-  {
-    SH_INSN_LDXW, "ldxw", "ldx.w", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* mabs.l $rm, $rd */
-  {
-    SH_INSN_MABSL, "mabsl", "mabs.l", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* mabs.w $rm, $rd */
-  {
-    SH_INSN_MABSW, "mabsw", "mabs.w", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* madd.l $rm, $rn, $rd */
-  {
-    SH_INSN_MADDL, "maddl", "madd.l", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* madd.w $rm, $rn, $rd */
-  {
-    SH_INSN_MADDW, "maddw", "madd.w", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* madds.l $rm, $rn, $rd */
-  {
-    SH_INSN_MADDSL, "maddsl", "madds.l", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* madds.ub $rm, $rn, $rd */
-  {
-    SH_INSN_MADDSUB, "maddsub", "madds.ub", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* madds.w $rm, $rn, $rd */
-  {
-    SH_INSN_MADDSW, "maddsw", "madds.w", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* mcmpeq.b $rm, $rn, $rd */
-  {
-    SH_INSN_MCMPEQB, "mcmpeqb", "mcmpeq.b", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* mcmpeq.l $rm, $rn, $rd */
-  {
-    SH_INSN_MCMPEQL, "mcmpeql", "mcmpeq.l", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* mcmpeq.w $rm, $rn, $rd */
-  {
-    SH_INSN_MCMPEQW, "mcmpeqw", "mcmpeq.w", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* mcmpgt.l $rm, $rn, $rd */
-  {
-    SH_INSN_MCMPGTL, "mcmpgtl", "mcmpgt.l", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* mcmpgt.ub $rm, $rn, $rd */
-  {
-    SH_INSN_MCMPGTUB, "mcmpgtub", "mcmpgt.ub", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* mcmpgt.w $rm, $rn, $rd */
-  {
-    SH_INSN_MCMPGTW, "mcmpgtw", "mcmpgt.w", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* mcmv $rm, $rn, $rd */
-  {
-    SH_INSN_MCMV, "mcmv", "mcmv", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* mcnvs.lw $rm, $rn, $rd */
-  {
-    SH_INSN_MCNVSLW, "mcnvslw", "mcnvs.lw", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* mcnvs.wb $rm, $rn, $rd */
-  {
-    SH_INSN_MCNVSWB, "mcnvswb", "mcnvs.wb", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* mcnvs.wub $rm, $rn, $rd */
-  {
-    SH_INSN_MCNVSWUB, "mcnvswub", "mcnvs.wub", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* mextr1 $rm, $rn, $rd */
-  {
-    SH_INSN_MEXTR1, "mextr1", "mextr1", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* mextr2 $rm, $rn, $rd */
-  {
-    SH_INSN_MEXTR2, "mextr2", "mextr2", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* mextr3 $rm, $rn, $rd */
-  {
-    SH_INSN_MEXTR3, "mextr3", "mextr3", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* mextr4 $rm, $rn, $rd */
-  {
-    SH_INSN_MEXTR4, "mextr4", "mextr4", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* mextr5 $rm, $rn, $rd */
-  {
-    SH_INSN_MEXTR5, "mextr5", "mextr5", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* mextr6 $rm, $rn, $rd */
-  {
-    SH_INSN_MEXTR6, "mextr6", "mextr6", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* mextr7 $rm, $rn, $rd */
-  {
-    SH_INSN_MEXTR7, "mextr7", "mextr7", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* mmacfx.wl $rm, $rn, $rd */
-  {
-    SH_INSN_MMACFXWL, "mmacfxwl", "mmacfx.wl", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* mmacnfx.wl $rm, $rn, $rd */
-  {
-    SH_INSN_MMACNFX_WL, "mmacnfx.wl", "mmacnfx.wl", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* mmul.l $rm, $rn, $rd */
-  {
-    SH_INSN_MMULL, "mmull", "mmul.l", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* mmul.w $rm, $rn, $rd */
-  {
-    SH_INSN_MMULW, "mmulw", "mmul.w", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* mmulfx.l $rm, $rn, $rd */
-  {
-    SH_INSN_MMULFXL, "mmulfxl", "mmulfx.l", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* mmulfx.w $rm, $rn, $rd */
-  {
-    SH_INSN_MMULFXW, "mmulfxw", "mmulfx.w", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* mmulfxrp.w $rm, $rn, $rd */
-  {
-    SH_INSN_MMULFXRPW, "mmulfxrpw", "mmulfxrp.w", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* mmulhi.wl $rm, $rn, $rd */
-  {
-    SH_INSN_MMULHIWL, "mmulhiwl", "mmulhi.wl", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* mmullo.wl $rm, $rn, $rd */
-  {
-    SH_INSN_MMULLOWL, "mmullowl", "mmullo.wl", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* mmulsum.wq $rm, $rn, $rd */
-  {
-    SH_INSN_MMULSUMWQ, "mmulsumwq", "mmulsum.wq", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* movi $imm16, $rd */
-  {
-    SH_INSN_MOVI, "movi", "movi", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* mperm.w $rm, $rn, $rd */
-  {
-    SH_INSN_MPERMW, "mpermw", "mperm.w", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* msad.ubq $rm, $rn, $rd */
-  {
-    SH_INSN_MSADUBQ, "msadubq", "msad.ubq", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* mshalds.l $rm, $rn, $rd */
-  {
-    SH_INSN_MSHALDSL, "mshaldsl", "mshalds.l", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* mshalds.w $rm, $rn, $rd */
-  {
-    SH_INSN_MSHALDSW, "mshaldsw", "mshalds.w", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* mshard.l $rm, $rn, $rd */
-  {
-    SH_INSN_MSHARDL, "mshardl", "mshard.l", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* mshard.w $rm, $rn, $rd */
-  {
-    SH_INSN_MSHARDW, "mshardw", "mshard.w", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* mshards.q $rm, $rn, $rd */
-  {
-    SH_INSN_MSHARDSQ, "mshardsq", "mshards.q", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* mshfhi.b $rm, $rn, $rd */
-  {
-    SH_INSN_MSHFHIB, "mshfhib", "mshfhi.b", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* mshfhi.l $rm, $rn, $rd */
-  {
-    SH_INSN_MSHFHIL, "mshfhil", "mshfhi.l", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* mshfhi.w $rm, $rn, $rd */
-  {
-    SH_INSN_MSHFHIW, "mshfhiw", "mshfhi.w", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* mshflo.b $rm, $rn, $rd */
-  {
-    SH_INSN_MSHFLOB, "mshflob", "mshflo.b", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* mshflo.l $rm, $rn, $rd */
-  {
-    SH_INSN_MSHFLOL, "mshflol", "mshflo.l", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* mshflo.w $rm, $rn, $rd */
-  {
-    SH_INSN_MSHFLOW, "mshflow", "mshflo.w", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* mshlld.l $rm, $rn, $rd */
-  {
-    SH_INSN_MSHLLDL, "mshlldl", "mshlld.l", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* mshlld.w $rm, $rn, $rd */
-  {
-    SH_INSN_MSHLLDW, "mshlldw", "mshlld.w", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* mshlrd.l $rm, $rn, $rd */
-  {
-    SH_INSN_MSHLRDL, "mshlrdl", "mshlrd.l", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* mshlrd.w $rm, $rn, $rd */
-  {
-    SH_INSN_MSHLRDW, "mshlrdw", "mshlrd.w", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* msub.l $rm, $rn, $rd */
-  {
-    SH_INSN_MSUBL, "msubl", "msub.l", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* msub.w $rm, $rn, $rd */
-  {
-    SH_INSN_MSUBW, "msubw", "msub.w", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* msubs.l $rm, $rn, $rd */
-  {
-    SH_INSN_MSUBSL, "msubsl", "msubs.l", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* msubs.ub $rm, $rn, $rd */
-  {
-    SH_INSN_MSUBSUB, "msubsub", "msubs.ub", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* msubs.w $rm, $rn, $rd */
-  {
-    SH_INSN_MSUBSW, "msubsw", "msubs.w", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* muls.l $rm, $rn, $rd */
-  {
-    SH_INSN_MULSL, "mulsl", "muls.l", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* mulu.l $rm, $rn, $rd */
-  {
-    SH_INSN_MULUL, "mulul", "mulu.l", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* nop */
-  {
-    SH_INSN_NOP, "nop", "nop", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* nsb $rm, $rd */
-  {
-    SH_INSN_NSB, "nsb", "nsb", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* ocbi $rm, $disp6x32 */
-  {
-    SH_INSN_OCBI, "ocbi", "ocbi", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* ocbp $rm, $disp6x32 */
-  {
-    SH_INSN_OCBP, "ocbp", "ocbp", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* ocbwb $rm, $disp6x32 */
-  {
-    SH_INSN_OCBWB, "ocbwb", "ocbwb", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* or $rm, $rn, $rd */
-  {
-    SH_INSN_OR, "or", "or", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* ori $rm, $imm10, $rd */
-  {
-    SH_INSN_ORI, "ori", "ori", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* prefi $rm, $disp6x32 */
-  {
-    SH_INSN_PREFI, "prefi", "prefi", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* pta$likely $disp16, $tra */
-  {
-    SH_INSN_PTA, "pta", "pta", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* ptabs$likely $rn, $tra */
-  {
-    SH_INSN_PTABS, "ptabs", "ptabs", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* ptb$likely $disp16, $tra */
-  {
-    SH_INSN_PTB, "ptb", "ptb", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* ptrel$likely $rn, $tra */
-  {
-    SH_INSN_PTREL, "ptrel", "ptrel", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* putcfg $rm, $disp6, $rd */
-  {
-    SH_INSN_PUTCFG, "putcfg", "putcfg", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* putcon $rm, $crj */
-  {
-    SH_INSN_PUTCON, "putcon", "putcon", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* rte */
-  {
-    SH_INSN_RTE, "rte", "rte", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* shard $rm, $rn, $rd */
-  {
-    SH_INSN_SHARD, "shard", "shard", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* shard.l $rm, $rn, $rd */
-  {
-    SH_INSN_SHARDL, "shardl", "shard.l", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* shari $rm, $uimm6, $rd */
-  {
-    SH_INSN_SHARI, "shari", "shari", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* shari.l $rm, $uimm6, $rd */
-  {
-    SH_INSN_SHARIL, "sharil", "shari.l", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* shlld $rm, $rn, $rd */
-  {
-    SH_INSN_SHLLD, "shlld", "shlld", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* shlld.l $rm, $rn, $rd */
-  {
-    SH_INSN_SHLLDL, "shlldl", "shlld.l", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* shlli $rm, $uimm6, $rd */
-  {
-    SH_INSN_SHLLI, "shlli", "shlli", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* shlli.l $rm, $uimm6, $rd */
-  {
-    SH_INSN_SHLLIL, "shllil", "shlli.l", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* shlrd $rm, $rn, $rd */
-  {
-    SH_INSN_SHLRD, "shlrd", "shlrd", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* shlrd.l $rm, $rn, $rd */
-  {
-    SH_INSN_SHLRDL, "shlrdl", "shlrd.l", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* shlri $rm, $uimm6, $rd */
-  {
-    SH_INSN_SHLRI, "shlri", "shlri", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* shlri.l $rm, $uimm6, $rd */
-  {
-    SH_INSN_SHLRIL, "shlril", "shlri.l", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* shori $uimm16, $rd */
-  {
-    SH_INSN_SHORI, "shori", "shori", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* sleep */
-  {
-    SH_INSN_SLEEP, "sleep", "sleep", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* st.b $rm, $disp10, $rd */
-  {
-    SH_INSN_STB, "stb", "st.b", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* st.l $rm, $disp10x4, $rd */
-  {
-    SH_INSN_STL, "stl", "st.l", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* st.q $rm, $disp10x8, $rd */
-  {
-    SH_INSN_STQ, "stq", "st.q", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* st.w $rm, $disp10x2, $rd */
-  {
-    SH_INSN_STW, "stw", "st.w", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* sthi.l $rm, $disp6, $rd */
-  {
-    SH_INSN_STHIL, "sthil", "sthi.l", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* sthi.q $rm, $disp6, $rd */
-  {
-    SH_INSN_STHIQ, "sthiq", "sthi.q", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* stlo.l $rm, $disp6, $rd */
-  {
-    SH_INSN_STLOL, "stlol", "stlo.l", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* stlo.q $rm, $disp6, $rd */
-  {
-    SH_INSN_STLOQ, "stloq", "stlo.q", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* stx.b $rm, $rn, $rd */
-  {
-    SH_INSN_STXB, "stxb", "stx.b", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* stx.l $rm, $rn, $rd */
-  {
-    SH_INSN_STXL, "stxl", "stx.l", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* stx.q $rm, $rn, $rd */
-  {
-    SH_INSN_STXQ, "stxq", "stx.q", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* stx.w $rm, $rn, $rd */
-  {
-    SH_INSN_STXW, "stxw", "stx.w", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* sub $rm, $rn, $rd */
-  {
-    SH_INSN_SUB, "sub", "sub", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* sub.l $rm, $rn, $rd */
-  {
-    SH_INSN_SUBL, "subl", "sub.l", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* swap.q $rm, $rn, $rd */
-  {
-    SH_INSN_SWAPQ, "swapq", "swap.q", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* synci */
-  {
-    SH_INSN_SYNCI, "synci", "synci", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* synco */
-  {
-    SH_INSN_SYNCO, "synco", "synco", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* trapa $rm */
-  {
-    SH_INSN_TRAPA, "trapa", "trapa", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* xor $rm, $rn, $rd */
-  {
-    SH_INSN_XOR, "xor", "xor", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-/* xori $rm, $imm6, $rd */
-  {
-    SH_INSN_XORI, "xori", "xori", 32,
-    { 0, { (1<<MACH_BASE), (1<<ISA_MEDIA) } }
-  },
-};
-
-#undef OP
-#undef A
-
-/* Initialize anything needed to be done once, before any cpu_open call.  */
-
-static void
-init_tables ()
-{
-}
-
-/* Subroutine of sh_cgen_cpu_open to look up a mach via its bfd name.  */
-
-static const CGEN_MACH *
-lookup_mach_via_bfd_name (table, name)
-     const CGEN_MACH *table;
-     const char *name;
-{
-  while (table->name)
-    {
-      if (strcmp (name, table->bfd_name) == 0)
-	return table;
-      ++table;
-    }
-  abort ();
-}
-
-/* Subroutine of sh_cgen_cpu_open to build the hardware table.  */
-
-static void
-build_hw_table (cd)
-     CGEN_CPU_TABLE *cd;
-{
-  int i;
-  int machs = cd->machs;
-  const CGEN_HW_ENTRY *init = & sh_cgen_hw_table[0];
-  /* MAX_HW is only an upper bound on the number of selected entries.
-     However each entry is indexed by it's enum so there can be holes in
-     the table.  */
-  const CGEN_HW_ENTRY **selected =
-    (const CGEN_HW_ENTRY **) xmalloc (MAX_HW * sizeof (CGEN_HW_ENTRY *));
-
-  cd->hw_table.init_entries = init;
-  cd->hw_table.entry_size = sizeof (CGEN_HW_ENTRY);
-  memset (selected, 0, MAX_HW * sizeof (CGEN_HW_ENTRY *));
-  /* ??? For now we just use machs to determine which ones we want.  */
-  for (i = 0; init[i].name != NULL; ++i)
-    if (CGEN_HW_ATTR_VALUE (&init[i], CGEN_HW_MACH)
-	& machs)
-      selected[init[i].type] = &init[i];
-  cd->hw_table.entries = selected;
-  cd->hw_table.num_entries = MAX_HW;
-}
-
-/* Subroutine of sh_cgen_cpu_open to build the hardware table.  */
-
-static void
-build_ifield_table (cd)
-     CGEN_CPU_TABLE *cd;
-{
-  cd->ifld_table = & sh_cgen_ifld_table[0];
-}
-
-/* Subroutine of sh_cgen_cpu_open to build the hardware table.  */
-
-static void
-build_operand_table (cd)
-     CGEN_CPU_TABLE *cd;
-{
-  int i;
-  int machs = cd->machs;
-  const CGEN_OPERAND *init = & sh_cgen_operand_table[0];
-  /* MAX_OPERANDS is only an upper bound on the number of selected entries.
-     However each entry is indexed by it's enum so there can be holes in
-     the table.  */
-  const CGEN_OPERAND **selected =
-    (const CGEN_OPERAND **) xmalloc (MAX_OPERANDS * sizeof (CGEN_OPERAND *));
-
-  cd->operand_table.init_entries = init;
-  cd->operand_table.entry_size = sizeof (CGEN_OPERAND);
-  memset (selected, 0, MAX_OPERANDS * sizeof (CGEN_OPERAND *));
-  /* ??? For now we just use mach to determine which ones we want.  */
-  for (i = 0; init[i].name != NULL; ++i)
-    if (CGEN_OPERAND_ATTR_VALUE (&init[i], CGEN_OPERAND_MACH)
-	& machs)
-      selected[init[i].type] = &init[i];
-  cd->operand_table.entries = selected;
-  cd->operand_table.num_entries = MAX_OPERANDS;
-}
-
-/* Subroutine of sh_cgen_cpu_open to build the hardware table.
-   ??? This could leave out insns not supported by the specified mach/isa,
-   but that would cause errors like "foo only supported by bar" to become
-   "unknown insn", so for now we include all insns and require the app to
-   do the checking later.
-   ??? On the other hand, parsing of such insns may require their hardware or
-   operand elements to be in the table [which they mightn't be].  */
-
-static void
-build_insn_table (cd)
-     CGEN_CPU_TABLE *cd;
-{
-  int i;
-  const CGEN_IBASE *ib = & sh_cgen_insn_table[0];
-  CGEN_INSN *insns = (CGEN_INSN *) xmalloc (MAX_INSNS * sizeof (CGEN_INSN));
-
-  memset (insns, 0, MAX_INSNS * sizeof (CGEN_INSN));
-  for (i = 0; i < MAX_INSNS; ++i)
-    insns[i].base = &ib[i];
-  cd->insn_table.init_entries = insns;
-  cd->insn_table.entry_size = sizeof (CGEN_IBASE);
-  cd->insn_table.num_init_entries = MAX_INSNS;
-}
-
-/* Subroutine of sh_cgen_cpu_open to rebuild the tables.  */
-
-static void
-sh_cgen_rebuild_tables (cd)
-     CGEN_CPU_TABLE *cd;
-{
-  int i,n_isas;
-  unsigned int isas = cd->isas;
-#if 0
-  unsigned int machs = cd->machs;
-#endif
-
-  cd->int_insn_p = CGEN_INT_INSN_P;
-
-  /* Data derived from the isa spec.  */
-#define UNSET (CGEN_SIZE_UNKNOWN + 1)
-  cd->default_insn_bitsize = UNSET;
-  cd->base_insn_bitsize = UNSET;
-  cd->min_insn_bitsize = 65535; /* some ridiculously big number */
-  cd->max_insn_bitsize = 0;
-  for (i = 0; i < MAX_ISAS; ++i)
-    if (((1 << i) & isas) != 0)
-      {
-	const CGEN_ISA *isa = & sh_cgen_isa_table[i];
-
-	/* Default insn sizes of all selected isas must be equal or we set
-	   the result to 0, meaning "unknown".  */
-	if (cd->default_insn_bitsize == UNSET)
-	  cd->default_insn_bitsize = isa->default_insn_bitsize;
-	else if (isa->default_insn_bitsize == cd->default_insn_bitsize)
-	  ; /* this is ok */
-	else
-	  cd->default_insn_bitsize = CGEN_SIZE_UNKNOWN;
-
-	/* Base insn sizes of all selected isas must be equal or we set
-	   the result to 0, meaning "unknown".  */
-	if (cd->base_insn_bitsize == UNSET)
-	  cd->base_insn_bitsize = isa->base_insn_bitsize;
-	else if (isa->base_insn_bitsize == cd->base_insn_bitsize)
-	  ; /* this is ok */
-	else
-	  cd->base_insn_bitsize = CGEN_SIZE_UNKNOWN;
-
-	/* Set min,max insn sizes.  */
-	if (isa->min_insn_bitsize < cd->min_insn_bitsize)
-	  cd->min_insn_bitsize = isa->min_insn_bitsize;
-	if (isa->max_insn_bitsize > cd->max_insn_bitsize)
-	  cd->max_insn_bitsize = isa->max_insn_bitsize;
-
-	++n_isas;
-      }
-
-#if 0 /* Does nothing?? */
-  /* Data derived from the mach spec.  */
-  for (i = 0; i < MAX_MACHS; ++i)
-    if (((1 << i) & machs) != 0)
-      {
-	const CGEN_MACH *mach = & sh_cgen_mach_table[i];
-
-	++n_machs;
-      }
-#endif
-
-  /* Determine which hw elements are used by MACH.  */
-  build_hw_table (cd);
-
-  /* Build the ifield table.  */
-  build_ifield_table (cd);
-
-  /* Determine which operands are used by MACH/ISA.  */
-  build_operand_table (cd);
-
-  /* Build the instruction table.  */
-  build_insn_table (cd);
-}
-
-/* Initialize a cpu table and return a descriptor.
-   It's much like opening a file, and must be the first function called.
-   The arguments are a set of (type/value) pairs, terminated with
-   CGEN_CPU_OPEN_END.
-
-   Currently supported values:
-   CGEN_CPU_OPEN_ISAS:    bitmap of values in enum isa_attr
-   CGEN_CPU_OPEN_MACHS:   bitmap of values in enum mach_attr
-   CGEN_CPU_OPEN_BFDMACH: specify 1 mach using bfd name
-   CGEN_CPU_OPEN_ENDIAN:  specify endian choice
-   CGEN_CPU_OPEN_END:     terminates arguments
-
-   ??? Simultaneous multiple isas might not make sense, but it's not (yet)
-   precluded.
-
-   ??? We only support ISO C stdargs here, not K&R.
-   Laziness, plus experiment to see if anything requires K&R - eventually
-   K&R will no longer be supported - e.g. GDB is currently trying this.  */
-
-CGEN_CPU_DESC
-sh_cgen_cpu_open (enum cgen_cpu_open_arg arg_type, ...)
-{
-  CGEN_CPU_TABLE *cd = (CGEN_CPU_TABLE *) xmalloc (sizeof (CGEN_CPU_TABLE));
-  static int init_p;
-  unsigned int isas = 0;  /* 0 = "unspecified" */
-  unsigned int machs = 0; /* 0 = "unspecified" */
-  enum cgen_endian endian = CGEN_ENDIAN_UNKNOWN;
-  va_list ap;
-
-  if (! init_p)
-    {
-      init_tables ();
-      init_p = 1;
-    }
-
-  memset (cd, 0, sizeof (*cd));
-
-  va_start (ap, arg_type);
-  while (arg_type != CGEN_CPU_OPEN_END)
-    {
-      switch (arg_type)
-	{
-	case CGEN_CPU_OPEN_ISAS :
-	  isas = va_arg (ap, unsigned int);
-	  break;
-	case CGEN_CPU_OPEN_MACHS :
-	  machs = va_arg (ap, unsigned int);
-	  break;
-	case CGEN_CPU_OPEN_BFDMACH :
-	  {
-	    const char *name = va_arg (ap, const char *);
-	    const CGEN_MACH *mach =
-	      lookup_mach_via_bfd_name (sh_cgen_mach_table, name);
-
-	    machs |= mach->num << 1;
-	    break;
-	  }
-	case CGEN_CPU_OPEN_ENDIAN :
-	  endian = va_arg (ap, enum cgen_endian);
-	  break;
-	default :
-	  fprintf (stderr, "sh_cgen_cpu_open: unsupported argument `%d'\n",
-		   arg_type);
-	  abort (); /* ??? return NULL? */
-	}
-      arg_type = va_arg (ap, enum cgen_cpu_open_arg);
-    }
-  va_end (ap);
-
-  /* mach unspecified means "all" */
-  if (machs == 0)
-    machs = (1 << MAX_MACHS) - 1;
-  /* base mach is always selected */
-  machs |= 1;
-  /* isa unspecified means "all" */
-  if (isas == 0)
-    isas = (1 << MAX_ISAS) - 1;
-  if (endian == CGEN_ENDIAN_UNKNOWN)
-    {
-      /* ??? If target has only one, could have a default.  */
-      fprintf (stderr, "sh_cgen_cpu_open: no endianness specified\n");
-      abort ();
-    }
-
-  cd->isas = isas;
-  cd->machs = machs;
-  cd->endian = endian;
-  /* FIXME: for the sparc case we can determine insn-endianness statically.
-     The worry here is where both data and insn endian can be independently
-     chosen, in which case this function will need another argument.
-     Actually, will want to allow for more arguments in the future anyway.  */
-  cd->insn_endian = endian;
-
-  /* Table (re)builder.  */
-  cd->rebuild_tables = sh_cgen_rebuild_tables;
-  sh_cgen_rebuild_tables (cd);
-
-  /* Default to not allowing signed overflow.  */
-  cd->signed_overflow_ok_p = 0;
-  
-  return (CGEN_CPU_DESC) cd;
-}
-
-/* Cover fn to sh_cgen_cpu_open to handle the simple case of 1 isa, 1 mach.
-   MACH_NAME is the bfd name of the mach.  */
-
-CGEN_CPU_DESC
-sh_cgen_cpu_open_1 (mach_name, endian)
-     const char *mach_name;
-     enum cgen_endian endian;
-{
-  return sh_cgen_cpu_open (CGEN_CPU_OPEN_BFDMACH, mach_name,
-			       CGEN_CPU_OPEN_ENDIAN, endian,
-			       CGEN_CPU_OPEN_END);
-}
-
-/* Close a cpu table.
-   ??? This can live in a machine independent file, but there's currently
-   no place to put this file (there's no libcgen).  libopcodes is the wrong
-   place as some simulator ports use this but they don't use libopcodes.  */
-
-void
-sh_cgen_cpu_close (cd)
-     CGEN_CPU_DESC cd;
-{
-  if (cd->insn_table.init_entries)
-    free ((CGEN_INSN *) cd->insn_table.init_entries);
-  if (cd->hw_table.entries)
-    free ((CGEN_HW_ENTRY *) cd->hw_table.entries);
-  free (cd);
-}
-
diff --git a/sim/sh64/sh-desc.h b/sim/sh64/sh-desc.h
deleted file mode 100644
index c233a963b9a..00000000000
--- a/sim/sh64/sh-desc.h
+++ /dev/null
@@ -1,249 +0,0 @@
-/* CPU data header for sh.
-
-THIS FILE IS MACHINE GENERATED WITH CGEN.
-
-Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
-
-This file is part of the GNU Binutils and/or GDB, the GNU debugger.
-
-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, 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.
-
-*/
-
-#ifndef SH_CPU_H
-#define SH_CPU_H
-
-#define CGEN_ARCH sh
-
-/* Given symbol S, return sh_cgen_<S>.  */
-#if defined (__STDC__) || defined (ALMOST_STDC) || defined (HAVE_STRINGIZE)
-#define CGEN_SYM(s) sh##_cgen_##s
-#else
-#define CGEN_SYM(s) sh/**/_cgen_/**/s
-#endif
-
-
-/* Selected cpu families.  */
-#define HAVE_CPU_SH64
-
-#define CGEN_INSN_LSB0_P 1
-
-/* Minimum size of any insn (in bytes).  */
-#define CGEN_MIN_INSN_SIZE 2
-
-/* Maximum size of any insn (in bytes).  */
-#define CGEN_MAX_INSN_SIZE 4
-
-#define CGEN_INT_INSN_P 1
-
-/* Maximum nymber of syntax bytes in an instruction.  */
-#define CGEN_ACTUAL_MAX_SYNTAX_BYTES 22
-
-/* CGEN_MNEMONIC_OPERANDS is defined if mnemonics have operands.
-   e.g. In "b,a foo" the ",a" is an operand.  If mnemonics have operands
-   we can't hash on everything up to the space.  */
-#define CGEN_MNEMONIC_OPERANDS
-
-/* Maximum number of fields in an instruction.  */
-#define CGEN_ACTUAL_MAX_IFMT_OPERANDS 8
-
-/* Enums.  */
-
-/* Enum declaration for .  */
-typedef enum frc_names {
-  H_FRC_FR0, H_FRC_FR1, H_FRC_FR2, H_FRC_FR3
- , H_FRC_FR4, H_FRC_FR5, H_FRC_FR6, H_FRC_FR7
- , H_FRC_FR8, H_FRC_FR9, H_FRC_FR10, H_FRC_FR11
- , H_FRC_FR12, H_FRC_FR13, H_FRC_FR14, H_FRC_FR15
-} FRC_NAMES;
-
-/* Enum declaration for .  */
-typedef enum drc_names {
-  H_DRC_DR0 = 0, H_DRC_DR2 = 2, H_DRC_DR4 = 4, H_DRC_DR6 = 6
- , H_DRC_DR8 = 8, H_DRC_DR10 = 10, H_DRC_DR12 = 12, H_DRC_DR14 = 14
-} DRC_NAMES;
-
-/* Enum declaration for .  */
-typedef enum xf_names {
-  H_XF_XF0, H_XF_XF1, H_XF_XF2, H_XF_XF3
- , H_XF_XF4, H_XF_XF5, H_XF_XF6, H_XF_XF7
- , H_XF_XF8, H_XF_XF9, H_XF_XF10, H_XF_XF11
- , H_XF_XF12, H_XF_XF13, H_XF_XF14, H_XF_XF15
-} XF_NAMES;
-
-/* Attributes.  */
-
-/* Enum declaration for machine type selection.  */
-typedef enum mach_attr {
-  MACH_BASE, MACH_SH2, MACH_SH3, MACH_SH3E
- , MACH_SH4, MACH_SH5, MACH_MAX
-} MACH_ATTR;
-
-/* Enum declaration for instruction set selection.  */
-typedef enum isa_attr {
-  ISA_COMPACT, ISA_MEDIA, ISA_MAX
-} ISA_ATTR;
-
-/* Number of architecture variants.  */
-#define MAX_ISAS  ((int) ISA_MAX)
-#define MAX_MACHS ((int) MACH_MAX)
-
-/* Ifield support.  */
-
-extern const struct cgen_ifld sh_cgen_ifld_table[];
-
-/* Ifield attribute indices.  */
-
-/* Enum declaration for cgen_ifld attrs.  */
-typedef enum cgen_ifld_attr {
-  CGEN_IFLD_VIRTUAL, CGEN_IFLD_PCREL_ADDR, CGEN_IFLD_ABS_ADDR, CGEN_IFLD_RESERVED
- , CGEN_IFLD_SIGN_OPT, CGEN_IFLD_SIGNED, CGEN_IFLD_END_BOOLS, CGEN_IFLD_START_NBOOLS = 31
- , CGEN_IFLD_MACH, CGEN_IFLD_ISA, CGEN_IFLD_END_NBOOLS
-} CGEN_IFLD_ATTR;
-
-/* Number of non-boolean elements in cgen_ifld_attr.  */
-#define CGEN_IFLD_NBOOL_ATTRS (CGEN_IFLD_END_NBOOLS - CGEN_IFLD_START_NBOOLS - 1)
-
-/* Enum declaration for sh ifield types.  */
-typedef enum ifield_type {
-  SH_F_NIL, SH_F_ANYOF, SH_F_OP4, SH_F_OP8
- , SH_F_OP16, SH_F_SUB4, SH_F_SUB8, SH_F_SUB10
- , SH_F_RN, SH_F_RM, SH_F_8_1, SH_F_DISP8
- , SH_F_DISP12, SH_F_IMM8, SH_F_IMM4, SH_F_IMM4X2
- , SH_F_IMM4X4, SH_F_IMM8X2, SH_F_IMM8X4, SH_F_DN
- , SH_F_DM, SH_F_VN, SH_F_VM, SH_F_XN
- , SH_F_XM, SH_F_OP, SH_F_EXT, SH_F_RSVD
- , SH_F_LEFT, SH_F_RIGHT, SH_F_DEST, SH_F_LEFT_RIGHT
- , SH_F_TRA, SH_F_TRB, SH_F_LIKELY, SH_F_25
- , SH_F_8_2, SH_F_IMM6, SH_F_IMM10, SH_F_IMM16
- , SH_F_UIMM6, SH_F_UIMM16, SH_F_DISP6, SH_F_DISP6X32
- , SH_F_DISP10, SH_F_DISP10X8, SH_F_DISP10X4, SH_F_DISP10X2
- , SH_F_DISP16, SH_F_MAX
-} IFIELD_TYPE;
-
-#define MAX_IFLD ((int) SH_F_MAX)
-
-/* Hardware attribute indices.  */
-
-/* Enum declaration for cgen_hw attrs.  */
-typedef enum cgen_hw_attr {
-  CGEN_HW_VIRTUAL, CGEN_HW_CACHE_ADDR, CGEN_HW_PC, CGEN_HW_PROFILE
- , CGEN_HW_END_BOOLS, CGEN_HW_START_NBOOLS = 31, CGEN_HW_MACH, CGEN_HW_END_NBOOLS
-} CGEN_HW_ATTR;
-
-/* Number of non-boolean elements in cgen_hw_attr.  */
-#define CGEN_HW_NBOOL_ATTRS (CGEN_HW_END_NBOOLS - CGEN_HW_START_NBOOLS - 1)
-
-/* Enum declaration for sh hardware types.  */
-typedef enum cgen_hw_type {
-  HW_H_MEMORY, HW_H_SINT, HW_H_UINT, HW_H_ADDR
- , HW_H_IADDR, HW_H_PC, HW_H_GR, HW_H_GRC
- , HW_H_CR, HW_H_SR, HW_H_FPSCR, HW_H_FRBIT
- , HW_H_SZBIT, HW_H_PRBIT, HW_H_SBIT, HW_H_MBIT
- , HW_H_QBIT, HW_H_FR, HW_H_FP, HW_H_FV
- , HW_H_FMTX, HW_H_DR, HW_H_TR, HW_H_ENDIAN
- , HW_H_ISM, HW_H_FRC, HW_H_DRC, HW_H_XF
- , HW_H_XD, HW_H_FVC, HW_H_FPCCR, HW_H_GBR
- , HW_H_PR, HW_H_MACL, HW_H_MACH, HW_H_TBIT
- , HW_MAX
-} CGEN_HW_TYPE;
-
-#define MAX_HW ((int) HW_MAX)
-
-/* Operand attribute indices.  */
-
-/* Enum declaration for cgen_operand attrs.  */
-typedef enum cgen_operand_attr {
-  CGEN_OPERAND_VIRTUAL, CGEN_OPERAND_PCREL_ADDR, CGEN_OPERAND_ABS_ADDR, CGEN_OPERAND_SIGN_OPT
- , CGEN_OPERAND_SIGNED, CGEN_OPERAND_NEGATIVE, CGEN_OPERAND_RELAX, CGEN_OPERAND_SEM_ONLY
- , CGEN_OPERAND_END_BOOLS, CGEN_OPERAND_START_NBOOLS = 31, CGEN_OPERAND_MACH, CGEN_OPERAND_ISA
- , CGEN_OPERAND_END_NBOOLS
-} CGEN_OPERAND_ATTR;
-
-/* Number of non-boolean elements in cgen_operand_attr.  */
-#define CGEN_OPERAND_NBOOL_ATTRS (CGEN_OPERAND_END_NBOOLS - CGEN_OPERAND_START_NBOOLS - 1)
-
-/* Enum declaration for sh operand types.  */
-typedef enum cgen_operand_type {
-  SH_OPERAND_PC, SH_OPERAND_ENDIAN, SH_OPERAND_ISM, SH_OPERAND_RM
- , SH_OPERAND_RN, SH_OPERAND_R0, SH_OPERAND_FRN, SH_OPERAND_FRM
- , SH_OPERAND_FVN, SH_OPERAND_FVM, SH_OPERAND_DRN, SH_OPERAND_DRM
- , SH_OPERAND_IMM4, SH_OPERAND_IMM8, SH_OPERAND_UIMM8, SH_OPERAND_IMM4X2
- , SH_OPERAND_IMM4X4, SH_OPERAND_IMM8X2, SH_OPERAND_IMM8X4, SH_OPERAND_DISP8
- , SH_OPERAND_DISP12, SH_OPERAND_RM64, SH_OPERAND_RN64, SH_OPERAND_GBR
- , SH_OPERAND_PR, SH_OPERAND_FPSCR, SH_OPERAND_TBIT, SH_OPERAND_SBIT
- , SH_OPERAND_MBIT, SH_OPERAND_QBIT, SH_OPERAND_FPUL, SH_OPERAND_FRBIT
- , SH_OPERAND_SZBIT, SH_OPERAND_PRBIT, SH_OPERAND_MACL, SH_OPERAND_MACH
- , SH_OPERAND_FSDM, SH_OPERAND_FSDN, SH_OPERAND_RD, SH_OPERAND_FRG
- , SH_OPERAND_FRH, SH_OPERAND_FRF, SH_OPERAND_FRGH, SH_OPERAND_FPF
- , SH_OPERAND_FVG, SH_OPERAND_FVH, SH_OPERAND_FVF, SH_OPERAND_MTRXG
- , SH_OPERAND_DRG, SH_OPERAND_DRH, SH_OPERAND_DRF, SH_OPERAND_DRGH
- , SH_OPERAND_CRJ, SH_OPERAND_CRK, SH_OPERAND_TRA, SH_OPERAND_TRB
- , SH_OPERAND_DISP6, SH_OPERAND_DISP6X32, SH_OPERAND_DISP10, SH_OPERAND_DISP10X2
- , SH_OPERAND_DISP10X4, SH_OPERAND_DISP10X8, SH_OPERAND_DISP16, SH_OPERAND_IMM6
- , SH_OPERAND_IMM10, SH_OPERAND_IMM16, SH_OPERAND_UIMM6, SH_OPERAND_UIMM16
- , SH_OPERAND_LIKELY, SH_OPERAND_MAX
-} CGEN_OPERAND_TYPE;
-
-/* Number of operands types.  */
-#define MAX_OPERANDS 72
-
-/* Maximum number of operands referenced by any insn.  */
-#define MAX_OPERAND_INSTANCES 8
-
-/* Insn attribute indices.  */
-
-/* Enum declaration for cgen_insn attrs.  */
-typedef enum cgen_insn_attr {
-  CGEN_INSN_ALIAS, CGEN_INSN_VIRTUAL, CGEN_INSN_UNCOND_CTI, CGEN_INSN_COND_CTI
- , CGEN_INSN_SKIP_CTI, CGEN_INSN_DELAY_SLOT, CGEN_INSN_RELAXABLE, CGEN_INSN_RELAX
- , CGEN_INSN_NO_DIS, CGEN_INSN_PBB, CGEN_INSN_ILLSLOT, CGEN_INSN_FP_INSN
- , CGEN_INSN_END_BOOLS, CGEN_INSN_START_NBOOLS = 31, CGEN_INSN_MACH, CGEN_INSN_ISA
- , CGEN_INSN_END_NBOOLS
-} CGEN_INSN_ATTR;
-
-/* Number of non-boolean elements in cgen_insn_attr.  */
-#define CGEN_INSN_NBOOL_ATTRS (CGEN_INSN_END_NBOOLS - CGEN_INSN_START_NBOOLS - 1)
-
-/* cgen.h uses things we just defined.  */
-#include "opcode/cgen.h"
-
-/* Attributes.  */
-extern const CGEN_ATTR_TABLE sh_cgen_hardware_attr_table[];
-extern const CGEN_ATTR_TABLE sh_cgen_ifield_attr_table[];
-extern const CGEN_ATTR_TABLE sh_cgen_operand_attr_table[];
-extern const CGEN_ATTR_TABLE sh_cgen_insn_attr_table[];
-
-/* Hardware decls.  */
-
-extern CGEN_KEYWORD sh_cgen_opval_h_gr;
-extern CGEN_KEYWORD sh_cgen_opval_h_grc;
-extern CGEN_KEYWORD sh_cgen_opval_h_cr;
-extern CGEN_KEYWORD sh_cgen_opval_h_fr;
-extern CGEN_KEYWORD sh_cgen_opval_h_fp;
-extern CGEN_KEYWORD sh_cgen_opval_h_fv;
-extern CGEN_KEYWORD sh_cgen_opval_h_fmtx;
-extern CGEN_KEYWORD sh_cgen_opval_h_dr;
-extern CGEN_KEYWORD sh_cgen_opval_h_tr;
-extern CGEN_KEYWORD sh_cgen_opval_frc_names;
-extern CGEN_KEYWORD sh_cgen_opval_drc_names;
-extern CGEN_KEYWORD sh_cgen_opval_xf_names;
-extern CGEN_KEYWORD sh_cgen_opval_frc_names;
-extern CGEN_KEYWORD sh_cgen_opval_h_fvc;
-
-
-
-
-#endif /* SH_CPU_H */
diff --git a/sim/sh64/sh-opc.h b/sim/sh64/sh-opc.h
deleted file mode 100644
index 3e0b8e25ec5..00000000000
--- a/sim/sh64/sh-opc.h
+++ /dev/null
@@ -1,216 +0,0 @@
-/* Instruction opcode header for sh.
-
-THIS FILE IS MACHINE GENERATED WITH CGEN.
-
-Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
-
-This file is part of the GNU Binutils and/or GDB, the GNU debugger.
-
-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, 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.
-
-*/
-
-#ifndef SH_OPC_H
-#define SH_OPC_H
-
-/* -- opc.h */
-
-/* Allows reason codes to be output when assembler errors occur.  */
-#define CGEN_VERBOSE_ASSEMBLER_ERRORS
-
-/* Override disassembly hashing - there are variable bits in the top
-   byte of these instructions.  */
-#define CGEN_DIS_HASH_SIZE 8
-#define CGEN_DIS_HASH(buf,value) (((* (unsigned char*) (buf)) >> 6) % CGEN_DIS_HASH_SIZE)
-
-/* -- asm.c */
-/* Enum declaration for sh instruction types.  */
-typedef enum cgen_insn_type {
-  SH_INSN_INVALID, SH_INSN_ADD_COMPACT, SH_INSN_ADDI_COMPACT, SH_INSN_ADDC_COMPACT
- , SH_INSN_ADDV_COMPACT, SH_INSN_AND_COMPACT, SH_INSN_ANDI_COMPACT, SH_INSN_ANDB_COMPACT
- , SH_INSN_BF_COMPACT, SH_INSN_BFS_COMPACT, SH_INSN_BRA_COMPACT, SH_INSN_BRAF_COMPACT
- , SH_INSN_BRK_COMPACT, SH_INSN_BSR_COMPACT, SH_INSN_BSRF_COMPACT, SH_INSN_BT_COMPACT
- , SH_INSN_BTS_COMPACT, SH_INSN_CLRMAC_COMPACT, SH_INSN_CLRS_COMPACT, SH_INSN_CLRT_COMPACT
- , SH_INSN_CMPEQ_COMPACT, SH_INSN_CMPEQI_COMPACT, SH_INSN_CMPGE_COMPACT, SH_INSN_CMPGT_COMPACT
- , SH_INSN_CMPHI_COMPACT, SH_INSN_CMPHS_COMPACT, SH_INSN_CMPPL_COMPACT, SH_INSN_CMPPZ_COMPACT
- , SH_INSN_CMPSTR_COMPACT, SH_INSN_DIV0S_COMPACT, SH_INSN_DIV0U_COMPACT, SH_INSN_DIV1_COMPACT
- , SH_INSN_DMULSL_COMPACT, SH_INSN_DMULUL_COMPACT, SH_INSN_DT_COMPACT, SH_INSN_EXTSB_COMPACT
- , SH_INSN_EXTSW_COMPACT, SH_INSN_EXTUB_COMPACT, SH_INSN_EXTUW_COMPACT, SH_INSN_FABS_COMPACT
- , SH_INSN_FADD_COMPACT, SH_INSN_FCMPEQ_COMPACT, SH_INSN_FCMPGT_COMPACT, SH_INSN_FCNVDS_COMPACT
- , SH_INSN_FCNVSD_COMPACT, SH_INSN_FDIV_COMPACT, SH_INSN_FIPR_COMPACT, SH_INSN_FLDS_COMPACT
- , SH_INSN_FLDI0_COMPACT, SH_INSN_FLDI1_COMPACT, SH_INSN_FLOAT_COMPACT, SH_INSN_FMAC_COMPACT
- , SH_INSN_FMOV1_COMPACT, SH_INSN_FMOV2_COMPACT, SH_INSN_FMOV3_COMPACT, SH_INSN_FMOV4_COMPACT
- , SH_INSN_FMOV5_COMPACT, SH_INSN_FMOV6_COMPACT, SH_INSN_FMOV7_COMPACT, SH_INSN_FMUL_COMPACT
- , SH_INSN_FNEG_COMPACT, SH_INSN_FRCHG_COMPACT, SH_INSN_FSCHG_COMPACT, SH_INSN_FSQRT_COMPACT
- , SH_INSN_FSTS_COMPACT, SH_INSN_FSUB_COMPACT, SH_INSN_FTRC_COMPACT, SH_INSN_FTRV_COMPACT
- , SH_INSN_JMP_COMPACT, SH_INSN_JSR_COMPACT, SH_INSN_LDC_COMPACT, SH_INSN_LDCL_COMPACT
- , SH_INSN_LDS_FPSCR_COMPACT, SH_INSN_LDSL_FPSCR_COMPACT, SH_INSN_LDS_FPUL_COMPACT, SH_INSN_LDSL_FPUL_COMPACT
- , SH_INSN_LDS_MACH_COMPACT, SH_INSN_LDSL_MACH_COMPACT, SH_INSN_LDS_MACL_COMPACT, SH_INSN_LDSL_MACL_COMPACT
- , SH_INSN_LDS_PR_COMPACT, SH_INSN_LDSL_PR_COMPACT, SH_INSN_MACL_COMPACT, SH_INSN_MACW_COMPACT
- , SH_INSN_MOV_COMPACT, SH_INSN_MOVI_COMPACT, SH_INSN_MOVB1_COMPACT, SH_INSN_MOVB2_COMPACT
- , SH_INSN_MOVB3_COMPACT, SH_INSN_MOVB4_COMPACT, SH_INSN_MOVB5_COMPACT, SH_INSN_MOVB6_COMPACT
- , SH_INSN_MOVB7_COMPACT, SH_INSN_MOVB8_COMPACT, SH_INSN_MOVB9_COMPACT, SH_INSN_MOVB10_COMPACT
- , SH_INSN_MOVL1_COMPACT, SH_INSN_MOVL2_COMPACT, SH_INSN_MOVL3_COMPACT, SH_INSN_MOVL4_COMPACT
- , SH_INSN_MOVL5_COMPACT, SH_INSN_MOVL6_COMPACT, SH_INSN_MOVL7_COMPACT, SH_INSN_MOVL8_COMPACT
- , SH_INSN_MOVL9_COMPACT, SH_INSN_MOVL10_COMPACT, SH_INSN_MOVL11_COMPACT, SH_INSN_MOVW1_COMPACT
- , SH_INSN_MOVW2_COMPACT, SH_INSN_MOVW3_COMPACT, SH_INSN_MOVW4_COMPACT, SH_INSN_MOVW5_COMPACT
- , SH_INSN_MOVW6_COMPACT, SH_INSN_MOVW7_COMPACT, SH_INSN_MOVW8_COMPACT, SH_INSN_MOVW9_COMPACT
- , SH_INSN_MOVW10_COMPACT, SH_INSN_MOVW11_COMPACT, SH_INSN_MOVA_COMPACT, SH_INSN_MOVCAL_COMPACT
- , SH_INSN_MOVT_COMPACT, SH_INSN_MULL_COMPACT, SH_INSN_MULSW_COMPACT, SH_INSN_MULUW_COMPACT
- , SH_INSN_NEG_COMPACT, SH_INSN_NEGC_COMPACT, SH_INSN_NOP_COMPACT, SH_INSN_NOT_COMPACT
- , SH_INSN_OCBI_COMPACT, SH_INSN_OCBP_COMPACT, SH_INSN_OCBWB_COMPACT, SH_INSN_OR_COMPACT
- , SH_INSN_ORI_COMPACT, SH_INSN_ORB_COMPACT, SH_INSN_PREF_COMPACT, SH_INSN_ROTCL_COMPACT
- , SH_INSN_ROTCR_COMPACT, SH_INSN_ROTL_COMPACT, SH_INSN_ROTR_COMPACT, SH_INSN_RTS_COMPACT
- , SH_INSN_SETS_COMPACT, SH_INSN_SETT_COMPACT, SH_INSN_SHAD_COMPACT, SH_INSN_SHAL_COMPACT
- , SH_INSN_SHAR_COMPACT, SH_INSN_SHLD_COMPACT, SH_INSN_SHLL_COMPACT, SH_INSN_SHLL2_COMPACT
- , SH_INSN_SHLL8_COMPACT, SH_INSN_SHLL16_COMPACT, SH_INSN_SHLR_COMPACT, SH_INSN_SHLR2_COMPACT
- , SH_INSN_SHLR8_COMPACT, SH_INSN_SHLR16_COMPACT, SH_INSN_STC_GBR_COMPACT, SH_INSN_STCL_GBR_COMPACT
- , SH_INSN_STS_FPSCR_COMPACT, SH_INSN_STSL_FPSCR_COMPACT, SH_INSN_STS_FPUL_COMPACT, SH_INSN_STSL_FPUL_COMPACT
- , SH_INSN_STS_MACH_COMPACT, SH_INSN_STSL_MACH_COMPACT, SH_INSN_STS_MACL_COMPACT, SH_INSN_STSL_MACL_COMPACT
- , SH_INSN_STS_PR_COMPACT, SH_INSN_STSL_PR_COMPACT, SH_INSN_SUB_COMPACT, SH_INSN_SUBC_COMPACT
- , SH_INSN_SUBV_COMPACT, SH_INSN_SWAPB_COMPACT, SH_INSN_SWAPW_COMPACT, SH_INSN_TASB_COMPACT
- , SH_INSN_TRAPA_COMPACT, SH_INSN_TST_COMPACT, SH_INSN_TSTI_COMPACT, SH_INSN_TSTB_COMPACT
- , SH_INSN_XOR_COMPACT, SH_INSN_XORI_COMPACT, SH_INSN_XORB_COMPACT, SH_INSN_XTRCT_COMPACT
- , SH_INSN_ADD, SH_INSN_ADDL, SH_INSN_ADDI, SH_INSN_ADDIL
- , SH_INSN_ADDZL, SH_INSN_ALLOCO, SH_INSN_AND, SH_INSN_ANDC
- , SH_INSN_ANDI, SH_INSN_BEQ, SH_INSN_BEQI, SH_INSN_BGE
- , SH_INSN_BGEU, SH_INSN_BGT, SH_INSN_BGTU, SH_INSN_BLINK
- , SH_INSN_BNE, SH_INSN_BNEI, SH_INSN_BRK, SH_INSN_BYTEREV
- , SH_INSN_CMPEQ, SH_INSN_CMPGT, SH_INSN_CMPGTU, SH_INSN_CMVEQ
- , SH_INSN_CMVNE, SH_INSN_FABSD, SH_INSN_FABSS, SH_INSN_FADDD
- , SH_INSN_FADDS, SH_INSN_FCMPEQD, SH_INSN_FCMPEQS, SH_INSN_FCMPGED
- , SH_INSN_FCMPGES, SH_INSN_FCMPGTD, SH_INSN_FCMPGTS, SH_INSN_FCMPUND
- , SH_INSN_FCMPUNS, SH_INSN_FCNVDS, SH_INSN_FCNVSD, SH_INSN_FDIVD
- , SH_INSN_FDIVS, SH_INSN_FGETSCR, SH_INSN_FIPRS, SH_INSN_FLDD
- , SH_INSN_FLDP, SH_INSN_FLDS, SH_INSN_FLDXD, SH_INSN_FLDXP
- , SH_INSN_FLDXS, SH_INSN_FLOATLD, SH_INSN_FLOATLS, SH_INSN_FLOATQD
- , SH_INSN_FLOATQS, SH_INSN_FMACS, SH_INSN_FMOVD, SH_INSN_FMOVDQ
- , SH_INSN_FMOVLS, SH_INSN_FMOVQD, SH_INSN_FMOVS, SH_INSN_FMOVSL
- , SH_INSN_FMULD, SH_INSN_FMULS, SH_INSN_FNEGD, SH_INSN_FNEGS
- , SH_INSN_FPUTSCR, SH_INSN_FSQRTD, SH_INSN_FSQRTS, SH_INSN_FSTD
- , SH_INSN_FSTP, SH_INSN_FSTS, SH_INSN_FSTXD, SH_INSN_FSTXP
- , SH_INSN_FSTXS, SH_INSN_FSUBD, SH_INSN_FSUBS, SH_INSN_FTRCDL
- , SH_INSN_FTRCSL, SH_INSN_FTRCDQ, SH_INSN_FTRCSQ, SH_INSN_FTRVS
- , SH_INSN_GETCFG, SH_INSN_GETCON, SH_INSN_GETTR, SH_INSN_ICBI
- , SH_INSN_LDB, SH_INSN_LDL, SH_INSN_LDQ, SH_INSN_LDUB
- , SH_INSN_LDUW, SH_INSN_LDW, SH_INSN_LDHIL, SH_INSN_LDHIQ
- , SH_INSN_LDLOL, SH_INSN_LDLOQ, SH_INSN_LDXB, SH_INSN_LDXL
- , SH_INSN_LDXQ, SH_INSN_LDXUB, SH_INSN_LDXUW, SH_INSN_LDXW
- , SH_INSN_MABSL, SH_INSN_MABSW, SH_INSN_MADDL, SH_INSN_MADDW
- , SH_INSN_MADDSL, SH_INSN_MADDSUB, SH_INSN_MADDSW, SH_INSN_MCMPEQB
- , SH_INSN_MCMPEQL, SH_INSN_MCMPEQW, SH_INSN_MCMPGTL, SH_INSN_MCMPGTUB
- , SH_INSN_MCMPGTW, SH_INSN_MCMV, SH_INSN_MCNVSLW, SH_INSN_MCNVSWB
- , SH_INSN_MCNVSWUB, SH_INSN_MEXTR1, SH_INSN_MEXTR2, SH_INSN_MEXTR3
- , SH_INSN_MEXTR4, SH_INSN_MEXTR5, SH_INSN_MEXTR6, SH_INSN_MEXTR7
- , SH_INSN_MMACFXWL, SH_INSN_MMACNFX_WL, SH_INSN_MMULL, SH_INSN_MMULW
- , SH_INSN_MMULFXL, SH_INSN_MMULFXW, SH_INSN_MMULFXRPW, SH_INSN_MMULHIWL
- , SH_INSN_MMULLOWL, SH_INSN_MMULSUMWQ, SH_INSN_MOVI, SH_INSN_MPERMW
- , SH_INSN_MSADUBQ, SH_INSN_MSHALDSL, SH_INSN_MSHALDSW, SH_INSN_MSHARDL
- , SH_INSN_MSHARDW, SH_INSN_MSHARDSQ, SH_INSN_MSHFHIB, SH_INSN_MSHFHIL
- , SH_INSN_MSHFHIW, SH_INSN_MSHFLOB, SH_INSN_MSHFLOL, SH_INSN_MSHFLOW
- , SH_INSN_MSHLLDL, SH_INSN_MSHLLDW, SH_INSN_MSHLRDL, SH_INSN_MSHLRDW
- , SH_INSN_MSUBL, SH_INSN_MSUBW, SH_INSN_MSUBSL, SH_INSN_MSUBSUB
- , SH_INSN_MSUBSW, SH_INSN_MULSL, SH_INSN_MULUL, SH_INSN_NOP
- , SH_INSN_NSB, SH_INSN_OCBI, SH_INSN_OCBP, SH_INSN_OCBWB
- , SH_INSN_OR, SH_INSN_ORI, SH_INSN_PREFI, SH_INSN_PTA
- , SH_INSN_PTABS, SH_INSN_PTB, SH_INSN_PTREL, SH_INSN_PUTCFG
- , SH_INSN_PUTCON, SH_INSN_RTE, SH_INSN_SHARD, SH_INSN_SHARDL
- , SH_INSN_SHARI, SH_INSN_SHARIL, SH_INSN_SHLLD, SH_INSN_SHLLDL
- , SH_INSN_SHLLI, SH_INSN_SHLLIL, SH_INSN_SHLRD, SH_INSN_SHLRDL
- , SH_INSN_SHLRI, SH_INSN_SHLRIL, SH_INSN_SHORI, SH_INSN_SLEEP
- , SH_INSN_STB, SH_INSN_STL, SH_INSN_STQ, SH_INSN_STW
- , SH_INSN_STHIL, SH_INSN_STHIQ, SH_INSN_STLOL, SH_INSN_STLOQ
- , SH_INSN_STXB, SH_INSN_STXL, SH_INSN_STXQ, SH_INSN_STXW
- , SH_INSN_SUB, SH_INSN_SUBL, SH_INSN_SWAPQ, SH_INSN_SYNCI
- , SH_INSN_SYNCO, SH_INSN_TRAPA, SH_INSN_XOR, SH_INSN_XORI
- , SH_INSN_MAX
-} CGEN_INSN_TYPE;
-
-/* Index of `invalid' insn place holder.  */
-#define CGEN_INSN_INVALID SH_INSN_INVALID
-
-/* Total number of insns in table.  */
-#define MAX_INSNS ((int) SH_INSN_MAX)
-
-/* This struct records data prior to insertion or after extraction.  */
-struct cgen_fields
-{
-  int length;
-  long f_nil;
-  long f_anyof;
-  long f_op4;
-  long f_op8;
-  long f_op16;
-  long f_sub4;
-  long f_sub8;
-  long f_sub10;
-  long f_rn;
-  long f_rm;
-  long f_8_1;
-  long f_disp8;
-  long f_disp12;
-  long f_imm8;
-  long f_imm4;
-  long f_imm4x2;
-  long f_imm4x4;
-  long f_imm8x2;
-  long f_imm8x4;
-  long f_dn;
-  long f_dm;
-  long f_vn;
-  long f_vm;
-  long f_xn;
-  long f_xm;
-  long f_op;
-  long f_ext;
-  long f_rsvd;
-  long f_left;
-  long f_right;
-  long f_dest;
-  long f_left_right;
-  long f_tra;
-  long f_trb;
-  long f_likely;
-  long f_25;
-  long f_8_2;
-  long f_imm6;
-  long f_imm10;
-  long f_imm16;
-  long f_uimm6;
-  long f_uimm16;
-  long f_disp6;
-  long f_disp6x32;
-  long f_disp10;
-  long f_disp10x8;
-  long f_disp10x4;
-  long f_disp10x2;
-  long f_disp16;
-};
-
-#define CGEN_INIT_PARSE(od) \
-{\
-}
-#define CGEN_INIT_INSERT(od) \
-{\
-}
-#define CGEN_INIT_EXTRACT(od) \
-{\
-}
-#define CGEN_INIT_PRINT(od) \
-{\
-}
-
-
-#endif /* SH_OPC_H */
diff --git a/sim/sh64/sh64-sim.h b/sim/sh64/sh64-sim.h
deleted file mode 100644
index fc3ed7add09..00000000000
--- a/sim/sh64/sh64-sim.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/* collection of junk waiting time to sort out
-   Copyright (C) 2000 Free Software Foundation, Inc.
-   Contributed by Red Hat, Inc.
-
-This file is part of the GNU Simulators.
-
-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, 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.  */
-
-#ifndef SH64_SIM_H
-#define SH64_SIM_H
-
-#define GETTWI GETTSI
-#define SETTWI SETTSI
-
-
-enum {
-  ISM_COMPACT, ISM_MEDIA
-};
-
-/* Hardware/device support.  */
-extern device sh5_devices;
-
-/* FIXME: Temporary, until device support ready.  */
-struct _device { int foo; };
-
-extern IDESC * sh64_idesc_media;
-extern IDESC * sh64_idesc_compact;
-
-/* Function prototypes from sh64.c.  */
-
-BI sh64_endian (SIM_CPU *);
-VOID sh64_break (SIM_CPU *, PCADDR);
-VOID sh64_trapa (SIM_CPU *, DI, PCADDR);
-VOID sh64_compact_trapa (SIM_CPU *, UQI, PCADDR);
-
-SF sh64_fldi0 (SIM_CPU *);
-SF sh64_fldi1 (SIM_CPU *);
-DF sh64_fcnvsd (SIM_CPU *, SF);
-SF sh64_fcnvds (SIM_CPU *, DF);
-
-DF sh64_fabsd (SIM_CPU *, DF);
-SF sh64_fabss (SIM_CPU *, SF);
-DF sh64_faddd (SIM_CPU *, DF, DF);
-SF sh64_fadds (SIM_CPU *, SF, SF);
-DF sh64_fdivd (SIM_CPU *, DF, DF);
-SF sh64_fdivs (SIM_CPU *, SF, SF);
-DF sh64_floatld (SIM_CPU *, SF);
-SF sh64_floatls (SIM_CPU *, SF);
-DF sh64_floatqd (SIM_CPU *, DF);
-SF sh64_floatqs (SIM_CPU *, DF);
-SF sh64_fmacs(SIM_CPU *, SF, SF, SF);
-DF sh64_fmuld (SIM_CPU *, DF, DF);
-SF sh64_fmuls (SIM_CPU *, SF, SF);
-DF sh64_fnegd (SIM_CPU *, DF);
-SF sh64_fnegs (SIM_CPU *, SF);
-DF sh64_fsqrtd (SIM_CPU *, DF);
-SF sh64_fsqrts (SIM_CPU *, SF);
-DF sh64_fsubd (SIM_CPU *, DF, DF);
-SF sh64_fsubs (SIM_CPU *, SF, SF);
-SF sh64_ftrcdl (SIM_CPU *, DF);
-DF sh64_ftrcdq (SIM_CPU *, DF);
-SF sh64_ftrcsl (SIM_CPU *, SF);
-DF sh64_ftrcsq (SIM_CPU *, SF);
-VOID sh64_ftrvs (SIM_CPU *, unsigned, unsigned, unsigned);
-
-BI sh64_fcmpeqs (SIM_CPU *, SF, SF);
-BI sh64_fcmpeqd (SIM_CPU *, DF, DF);
-BI sh64_fcmpges (SIM_CPU *, SF, SF);
-BI sh64_fcmpged (SIM_CPU *, DF, DF);
-BI sh64_fcmpgts (SIM_CPU *, SF, SF);
-BI sh64_fcmpgtd (SIM_CPU *, DF, DF);
-BI sh64_fcmpund (SIM_CPU *, DF, DF);
-BI sh64_fcmpuns (SIM_CPU *, SF, SF);
-
-DI sh64_nsb (SIM_CPU *, DI);
-
-#endif /* SH64_SIM_H */
diff --git a/sim/sh64/sh64.c b/sim/sh64/sh64.c
deleted file mode 100644
index 12ce3f69a66..00000000000
--- a/sim/sh64/sh64.c
+++ /dev/null
@@ -1,1030 +0,0 @@
-/* SH5 simulator support code
-   Copyright (C) 2000, 2001 Free Software Foundation, Inc.
-   Contributed by Red Hat, Inc.
-
-This file is part of the GNU simulators.
-
-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, 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 WANT_CPU
-#define WANT_CPU_SH64
-
-#include "sim-main.h"
-#include "sim-fpu.h"
-#include "cgen-mem.h"
-#include "cgen-ops.h"
-
-#include "gdb/callback.h"
-#include "defs-compact.h"
-
-#include "bfd.h"
-/* From include/gdb/.  */
-#include "gdb/sim-sh.h"
-
-#define SYS_exit        1
-#define	SYS_read	3
-#define SYS_write       4
-#define	SYS_open	5
-#define	SYS_close	6
-#define	SYS_lseek	19
-#define	SYS_time	23
-#define	SYS_argc	172
-#define	SYS_argnlen	173
-#define	SYS_argn	174
-
-IDESC * sh64_idesc_media;
-IDESC * sh64_idesc_compact;
-
-BI
-sh64_endian (SIM_CPU *current_cpu)
-{
-  return (CURRENT_TARGET_BYTE_ORDER == BIG_ENDIAN);
-}
-
-SF
-sh64_fldi0 (SIM_CPU *current_cpu)
-{
-  SF result;
-  sim_fpu_to32 (&result, &sim_fpu_zero);
-  return result;
-}
-
-SF
-sh64_fldi1 (SIM_CPU *current_cpu)
-{
-  SF result;
-  sim_fpu_to32 (&result, &sim_fpu_one);
-  return result;
-}
-
-DF
-sh64_fabsd(SIM_CPU *current_cpu, DF drgh)
-{
-  DF result;
-  sim_fpu f, fres;
-
-  sim_fpu_64to (&f, drgh);
-  sim_fpu_abs (&fres, &f);
-  sim_fpu_to64 (&result, &fres);
-  return result;
-}
-
-SF
-sh64_fabss(SIM_CPU *current_cpu, SF frgh)
-{
-  SF result;
-  sim_fpu f, fres;
-
-  sim_fpu_32to (&f, frgh);
-  sim_fpu_abs (&fres, &f);
-  sim_fpu_to32 (&result, &fres);
-  return result;
-}
-
-DF
-sh64_faddd(SIM_CPU *current_cpu, DF drg, DF drh)
-{
-  DF result;
-  sim_fpu f1, f2, fres;
-
-  sim_fpu_64to (&f1, drg);
-  sim_fpu_64to (&f2, drh);
-  sim_fpu_add (&fres, &f1, &f2);
-  sim_fpu_to64 (&result, &fres);
-  return result;
-}
-
-SF
-sh64_fadds(SIM_CPU *current_cpu, SF frg, SF frh)
-{
-  SF result;
-  sim_fpu f1, f2, fres;
-
-  sim_fpu_32to (&f1, frg);
-  sim_fpu_32to (&f2, frh);
-  sim_fpu_add (&fres, &f1, &f2);
-  sim_fpu_to32 (&result, &fres);
-  return result;
-}
-
-BI
-sh64_fcmpeqd(SIM_CPU *current_cpu, DF drg, DF drh)
-{
-  sim_fpu f1, f2;
-
-  sim_fpu_64to (&f1, drg);
-  sim_fpu_64to (&f2, drh);
-  return sim_fpu_is_eq (&f1, &f2);
-}
-
-BI
-sh64_fcmpeqs(SIM_CPU *current_cpu, SF frg, SF frh)
-{
-  sim_fpu f1, f2;
-
-  sim_fpu_32to (&f1, frg);
-  sim_fpu_32to (&f2, frh);
-  return sim_fpu_is_eq (&f1, &f2);
-}
-
-BI
-sh64_fcmpged(SIM_CPU *current_cpu, DF drg, DF drh)
-{
-  sim_fpu f1, f2;
-
-  sim_fpu_64to (&f1, drg);
-  sim_fpu_64to (&f2, drh);
-  return sim_fpu_is_ge (&f1, &f2);
-}
-
-BI
-sh64_fcmpges(SIM_CPU *current_cpu, SF frg, SF frh)
-{
-  sim_fpu f1, f2;
-
-  sim_fpu_32to (&f1, frg);
-  sim_fpu_32to (&f2, frh);
-  return sim_fpu_is_ge (&f1, &f2);
-}
-
-BI
-sh64_fcmpgtd(SIM_CPU *current_cpu, DF drg, DF drh)
-{
-  sim_fpu f1, f2;
-
-  sim_fpu_64to (&f1, drg);
-  sim_fpu_64to (&f2, drh);
-  return sim_fpu_is_gt (&f1, &f2);
-}
-
-BI
-sh64_fcmpgts(SIM_CPU *current_cpu, SF frg, SF frh)
-{
-  sim_fpu f1, f2;
-
-  sim_fpu_32to (&f1, frg);
-  sim_fpu_32to (&f2, frh);
-  return sim_fpu_is_gt (&f1, &f2);
-}
-
-BI
-sh64_fcmpund(SIM_CPU *current_cpu, DF drg, DF drh)
-{
-  sim_fpu f1, f2;
-
-  sim_fpu_64to (&f1, drg);
-  sim_fpu_64to (&f2, drh);
-  return (sim_fpu_is_nan (&f1) || sim_fpu_is_nan (&f2));
-}
-
-BI
-sh64_fcmpuns(SIM_CPU *current_cpu, SF frg, SF frh)
-{
-  sim_fpu f1, f2;
-
-  sim_fpu_32to (&f1, frg);
-  sim_fpu_32to (&f2, frh); 
-  return (sim_fpu_is_nan (&f1) || sim_fpu_is_nan (&f2));
-}  
-
-SF
-sh64_fcnvds(SIM_CPU *current_cpu, DF drgh)
-{
-  union {
-    unsigned long long ll;
-    double d;
-  } f1;
-
-  union {
-    unsigned long l;
-    float f;
-  } f2;
-
-  f1.ll = drgh;
-  f2.f = (float) f1.d;
-  
-  return (SF) f2.l;
-}
-
-DF
-sh64_fcnvsd(SIM_CPU *current_cpu, SF frgh)
-{
-  DF result;
-  sim_fpu f;
-
-  sim_fpu_32to (&f, frgh);
-  sim_fpu_to64 (&result, &f);
-  return result;
-}
-
-DF
-sh64_fdivd(SIM_CPU *current_cpu, DF drg, DF drh)
-{
-  DF result;
-  sim_fpu f1, f2, fres;
-
-  sim_fpu_64to (&f1, drg);
-  sim_fpu_64to (&f2, drh);
-  sim_fpu_div (&fres, &f1, &f2);
-  sim_fpu_to64 (&result, &fres);
-  return result;
-}
-
-SF
-sh64_fdivs(SIM_CPU *current_cpu, SF frg, SF frh)
-{
-  SF result;
-  sim_fpu f1, f2, fres;
-
-  sim_fpu_32to (&f1, frg);
-  sim_fpu_32to (&f2, frh);
-  sim_fpu_div (&fres, &f1, &f2);
-  sim_fpu_to32 (&result, &fres);
-  return result;
-}
-
-DF
-sh64_floatld(SIM_CPU *current_cpu, SF frgh)
-{
-  DF result;
-  sim_fpu f;
-
-  sim_fpu_i32to (&f, frgh, sim_fpu_round_default); 
-  sim_fpu_to64 (&result, &f);
-  return result;
-}
-
-SF
-sh64_floatls(SIM_CPU *current_cpu, SF frgh)
-{
-  SF result;
-  sim_fpu f;
-
-  sim_fpu_i32to (&f, frgh, sim_fpu_round_default);
-  sim_fpu_to32 (&result, &f);
-  return result;
-}
-
-DF
-sh64_floatqd(SIM_CPU *current_cpu, DF drgh)
-{
-  DF result;
-  sim_fpu f;
-
-  sim_fpu_i64to (&f, drgh, sim_fpu_round_default);
-  sim_fpu_to64 (&result, &f);
-  return result;
-}
-
-SF
-sh64_floatqs(SIM_CPU *current_cpu, DF drgh)
-{
-  SF result;
-  sim_fpu f;
-
-  sim_fpu_i64to (&f, drgh, sim_fpu_round_default);
-  sim_fpu_to32 (&result, &f);
-  return result;
-}
-
-SF
-sh64_fmacs(SIM_CPU *current_cpu, SF fr0, SF frm, SF frn)
-{
-  SF result;
-  sim_fpu m1, m2, a1, fres;
-
-  sim_fpu_32to (&m1, fr0);
-  sim_fpu_32to (&m2, frm);
-  sim_fpu_32to (&a1, frn);
-
-  sim_fpu_mul (&fres, &m1, &m2);
-  sim_fpu_add (&fres, &fres, &a1);
-  
-  sim_fpu_to32 (&result, &fres);
-  return result;
-}
-
-DF
-sh64_fmuld(SIM_CPU *current_cpu, DF drg, DF drh)
-{
-  DF result;
-  sim_fpu f1, f2, fres;
-
-  sim_fpu_64to (&f1, drg);
-  sim_fpu_64to (&f2, drh);
-  sim_fpu_mul (&fres, &f1, &f2);
-  sim_fpu_to64 (&result, &fres);
-  return result;
-}
-
-SF
-sh64_fmuls(SIM_CPU *current_cpu, SF frg, SF frh)
-{
-  SF result;
-  sim_fpu f1, f2, fres;
-
-  sim_fpu_32to (&f1, frg);
-  sim_fpu_32to (&f2, frh);
-  sim_fpu_mul (&fres, &f1, &f2);
-  sim_fpu_to32 (&result, &fres);
-  return result;
-}
-
-DF
-sh64_fnegd(SIM_CPU *current_cpu, DF drgh)
-{
-  DF result;
-  sim_fpu f1, f2;
-
-  sim_fpu_64to (&f1, drgh);
-  sim_fpu_neg (&f2, &f1);
-  sim_fpu_to64 (&result, &f2);
-  return result;
-}
-
-SF
-sh64_fnegs(SIM_CPU *current_cpu, SF frgh)
-{
-  SF result;
-  sim_fpu f, fres;
-
-  sim_fpu_32to (&f, frgh);
-  sim_fpu_neg (&fres, &f);
-  sim_fpu_to32 (&result, &fres);
-  return result;
-}
-
-DF
-sh64_fsqrtd(SIM_CPU *current_cpu, DF drgh)
-{
-  DF result;
-  sim_fpu f, fres;
-
-  sim_fpu_64to (&f, drgh);
-  sim_fpu_sqrt (&fres, &f);
-  sim_fpu_to64 (&result, &fres);
-  return result;
-}
-
-SF
-sh64_fsqrts(SIM_CPU *current_cpu, SF frgh)
-{
-  SF result;
-  sim_fpu f, fres;
-
-  sim_fpu_32to (&f, frgh);
-  sim_fpu_sqrt (&fres, &f);
-  sim_fpu_to32 (&result, &fres);
-  return result;
-}
-
-DF
-sh64_fsubd(SIM_CPU *current_cpu, DF drg, DF drh)
-{
-  DF result;
-  sim_fpu f1, f2, fres;
-
-  sim_fpu_64to (&f1, drg);
-  sim_fpu_64to (&f2, drh);
-  sim_fpu_sub (&fres, &f1, &f2);
-  sim_fpu_to64 (&result, &fres);
-  return result;
-}
-
-SF
-sh64_fsubs(SIM_CPU *current_cpu, SF frg, SF frh)
-{
-  SF result;
-  sim_fpu f1, f2, fres;
-
-  sim_fpu_32to (&f1, frg);
-  sim_fpu_32to (&f2, frh);
-  sim_fpu_sub (&fres, &f1, &f2);
-  sim_fpu_to32 (&result, &fres);
-  return result;
-}
-
-SF
-sh64_ftrcdl(SIM_CPU *current_cpu, DF drgh)
-{
-  SI result;
-  sim_fpu f;
-
-  sim_fpu_64to (&f, drgh);
-  sim_fpu_to32i (&result, &f, sim_fpu_round_zero);
-  return (SF) result;
-}
-
-SF
-sh64_ftrcsl(SIM_CPU *current_cpu, SF frgh)
-{
-  SI result;
-  sim_fpu f;
-
-  sim_fpu_32to (&f, frgh);
-  sim_fpu_to32i (&result, &f, sim_fpu_round_zero);
-  return (SF) result;
-}
-
-DF
-sh64_ftrcdq(SIM_CPU *current_cpu, DF drgh)
-{
-  DI result;
-  sim_fpu f;
-
-  sim_fpu_64to (&f, drgh);
-  sim_fpu_to64i (&result, &f, sim_fpu_round_zero);
-  return (DF) result;
-}
-
-DF
-sh64_ftrcsq(SIM_CPU *current_cpu, SF frgh)
-{
-  DI result;
-  sim_fpu f;
-
-  sim_fpu_32to (&f, frgh);
-  sim_fpu_to64i (&result, &f, sim_fpu_round_zero);
-  return (DF) result;
-}
-
-void
-sh64_ftrvs(SIM_CPU *cpu, unsigned g, unsigned h, unsigned f)
-{
-  int i, j;
-
-  for (i = 0; i < 4; i++)
-    {
-      SF result;
-      sim_fpu sum;
-      sim_fpu_32to (&sum, 0);
-
-      for (j = 0; j < 4; j++)
-	{
-	  sim_fpu f1, f2, temp;
-	  sim_fpu_32to (&f1, sh64_h_fr_get (cpu, (g + i) + (j * 4)));
-	  sim_fpu_32to (&f2, sh64_h_fr_get (cpu, h + j));
-	  sim_fpu_mul (&temp, &f1, &f2);
-	  sim_fpu_add (&sum, &sum, &temp);
-	}
-      sim_fpu_to32 (&result, &sum);
-      sh64_h_fr_set (cpu, f + i, result);
-    }
-}
-
-/* Count the number of arguments.  */
-static int
-count_argc (cpu)
-     SIM_CPU *cpu;
-{
-  int i = 0;
-
-  if (! STATE_PROG_ARGV (CPU_STATE (cpu)))
-    return -1;
-  
-  while (STATE_PROG_ARGV (CPU_STATE (cpu)) [i] != NULL)
-    ++i;
-
-  return i;
-}
-
-/* Read a null terminated string from memory, return in a buffer */
-static char *
-fetch_str (current_cpu, pc, addr)
-     SIM_CPU *current_cpu;
-     PCADDR pc;
-     DI addr;
-{
-  char *buf;
-  int nr = 0;
-  while (sim_core_read_1 (current_cpu,
-			  pc, read_map, addr + nr) != 0)
-    nr++;
-  buf = NZALLOC (char, nr + 1);
-  sim_read (CPU_STATE (current_cpu), addr, buf, nr);
-  return buf;
-}
-
-static void
-trap_handler (SIM_CPU *current_cpu, int shmedia_abi_p, UQI trapnum, PCADDR pc)
-{
-  char ch;
-  switch (trapnum)
-    {
-    case 1:
-      ch = GET_H_GRC (0);
-      sim_io_write_stdout (CPU_STATE (current_cpu), &ch, 1);
-      fflush (stdout);
-      break;
-    case 2:
-      sim_engine_halt (CPU_STATE (current_cpu), current_cpu, NULL, pc, sim_stopped, SIM_SIGTRAP);
-      break;
-    case 34:
-      {
-	int i;
-	int ret_reg = (shmedia_abi_p) ? 2 : 0;
-	char *buf;
-	DI PARM1 = GET_H_GR ((shmedia_abi_p) ? 3 : 5);
-	DI PARM2 = GET_H_GR ((shmedia_abi_p) ? 4 : 6);
-	DI PARM3 = GET_H_GR ((shmedia_abi_p) ? 5 : 7);
-	
-	switch (GET_H_GR ((shmedia_abi_p) ? 2 : 4))
-	  {
-	  case SYS_write:
-	    buf = zalloc (PARM3);
-	    sim_read (CPU_STATE (current_cpu), PARM2, buf, PARM3);
-	    SET_H_GR (ret_reg,
-		      sim_io_write (CPU_STATE (current_cpu),
-				    PARM1, buf, PARM3));
-	    zfree (buf);
-	    break;
-
-	  case SYS_lseek:
-	    SET_H_GR (ret_reg,
-		      sim_io_lseek (CPU_STATE (current_cpu),
-				    PARM1, PARM2, PARM3));
-	    break;
-	    
-	  case SYS_exit:
-	    sim_engine_halt (CPU_STATE (current_cpu), current_cpu,
-			     NULL, pc, sim_exited, PARM1);
-	    break;
-
-	  case SYS_read:
-	    buf = zalloc (PARM3);
-	    SET_H_GR (ret_reg,
-		      sim_io_read (CPU_STATE (current_cpu),
-				   PARM1, buf, PARM3));
-	    sim_write (CPU_STATE (current_cpu), PARM2, buf, PARM3);
-	    zfree (buf);
-	    break;
-	    
-	  case SYS_open:
-	    buf = fetch_str (current_cpu, pc, PARM1);
-	    SET_H_GR (ret_reg,
-		      sim_io_open (CPU_STATE (current_cpu),
-				   buf, PARM2));
-	    zfree (buf);
-	    break;
-
-	  case SYS_close:
-	    SET_H_GR (ret_reg,
-		      sim_io_close (CPU_STATE (current_cpu), PARM1));
-	    break;
-
-	  case SYS_time:
-	    SET_H_GR (ret_reg, time (0));
-	    break;
-
-	  case SYS_argc:
-	    SET_H_GR (ret_reg, count_argc (current_cpu));
-	    break;
-
-	  case SYS_argnlen:
-	    if (PARM1 < count_argc (current_cpu))
-	      SET_H_GR (ret_reg,
-			strlen (STATE_PROG_ARGV (CPU_STATE (current_cpu)) [PARM1]));
-	    else
-	      SET_H_GR (ret_reg, -1);
-	    break;
-
-	  case SYS_argn:
-	    if (PARM1 < count_argc (current_cpu))
-	      {
-		/* Include the NULL byte.  */
-		i = strlen (STATE_PROG_ARGV (CPU_STATE (current_cpu)) [PARM1]) + 1;
-		sim_write (CPU_STATE (current_cpu),
-			   PARM2,
-			   STATE_PROG_ARGV (CPU_STATE (current_cpu)) [PARM1],
-			   i);
-
-		/* Just for good measure.  */
-		SET_H_GR (ret_reg, i);
-		break;
-	      }
-	    else
-	      SET_H_GR (ret_reg, -1);
-	    break;
-
-	  default:
-	    SET_H_GR (ret_reg, -1);
-	  }
-      }
-      break;
-    case 253:
-      puts ("pass");
-      exit (0);
-    case 254:
-      puts ("fail");
-      exit (1);
-    case 0xc3:
-      /* fall through.  */
-    case 255:
-      sim_engine_halt (CPU_STATE (current_cpu), current_cpu, NULL, pc, sim_stopped, SIM_SIGTRAP);
-      break;
-    }
-}
-
-void
-sh64_trapa (SIM_CPU *current_cpu, DI rm, PCADDR pc)
-{
-  trap_handler (current_cpu, 1, (UQI) rm & 0xff, pc);
-}
-
-void
-sh64_compact_trapa (SIM_CPU *current_cpu, UQI trapnum, PCADDR pc)
-{
-  int mach_sh5_p;
-
-  /* If this is an SH5 executable, this is SHcompact code running in
-     the SHmedia ABI.  */
-
-  mach_sh5_p =
-    (bfd_get_mach (STATE_PROG_BFD (CPU_STATE (current_cpu))) == bfd_mach_sh5);
-
-  trap_handler (current_cpu, mach_sh5_p, trapnum, pc);
-}
-
-DI
-sh64_nsb (SIM_CPU *current_cpu, DI rm)
-{
-  int result = 0, count;
-  UDI source = (UDI) rm;
-
-  if ((source >> 63))
-    source = ~source;
-  source <<= 1;
-
-  for (count = 32; count; count >>= 1)
-    {
-      UDI newval = source << count;
-
-      if ((newval >> count) == source)
-	{
-	  result |= count;
-	  source = newval;
-	}
-    }
-  
-  return result;
-}
-
-void
-sh64_break (SIM_CPU *current_cpu, PCADDR pc)
-{
-  SIM_DESC sd = CPU_STATE (current_cpu);
-  sim_engine_halt (sd, current_cpu, NULL, pc, sim_stopped, SIM_SIGTRAP);
-}
-
-void
-set_isa (SIM_CPU *current_cpu, int mode)
-{
-  /* Do nothing.  */
-}
-
-/* The semantic code invokes this for invalid (unrecognized) instructions.  */
-
-SEM_PC
-sim_engine_invalid_insn (SIM_CPU *current_cpu, IADDR cia, SEM_PC vpc)
-{
-  SIM_DESC sd = CPU_STATE (current_cpu);
-  sim_engine_halt (sd, current_cpu, NULL, cia, sim_stopped, SIM_SIGILL);
-
-  return vpc;
-}
-
-
-/* Process an address exception.  */
-
-void
-sh64_core_signal (SIM_DESC sd, SIM_CPU *current_cpu, sim_cia cia,
-                  unsigned int map, int nr_bytes, address_word addr,
-                  transfer_type transfer, sim_core_signals sig)
-{
-  sim_core_signal (sd, current_cpu, cia, map, nr_bytes, addr,
-		   transfer, sig);
-}
-
-
-/* Initialize cycle counting for an insn.
-   FIRST_P is non-zero if this is the first insn in a set of parallel
-   insns.  */
-
-void
-sh64_compact_model_insn_before (SIM_CPU *cpu, int first_p)
-{
-  /* Do nothing.  */
-}
-
-void
-sh64_media_model_insn_before (SIM_CPU *cpu, int first_p)
-{
-  /* Do nothing.  */
-}
-
-/* Record the cycles computed for an insn.
-   LAST_P is non-zero if this is the last insn in a set of parallel insns,
-   and we update the total cycle count.
-   CYCLES is the cycle count of the insn.  */
-
-void
-sh64_compact_model_insn_after(SIM_CPU *cpu, int last_p, int cycles)
-{
-  /* Do nothing.  */
-}
-
-void
-sh64_media_model_insn_after(SIM_CPU *cpu, int last_p, int cycles)
-{
-  /* Do nothing.  */
-}
-
-int
-sh64_fetch_register (SIM_CPU *cpu, int nr, unsigned char *buf, int len)
-{
-  /* Fetch general purpose registers. */
-  if (nr >= SIM_SH64_R0_REGNUM
-      && nr < (SIM_SH64_R0_REGNUM + SIM_SH64_NR_R_REGS)
-      && len == 8)
-    {
-      *((unsigned64*) buf) =
-	H2T_8 (sh64_h_gr_get (cpu, nr - SIM_SH64_R0_REGNUM));
-      return len;
-    }
-
-  /* Fetch PC.  */
-  if (nr == SIM_SH64_PC_REGNUM && len == 8)
-    {
-      *((unsigned64*) buf) = H2T_8 (sh64_h_pc_get (cpu) | sh64_h_ism_get (cpu));
-      return len;
-    }
-
-  /* Fetch status register (SR).  */
-  if (nr == SIM_SH64_SR_REGNUM && len == 8)
-    {
-      *((unsigned64*) buf) = H2T_8 (sh64_h_sr_get (cpu));
-      return len;
-    }
-      
-  /* Fetch saved status register (SSR) and PC (SPC).  */
-  if ((nr == SIM_SH64_SSR_REGNUM || nr == SIM_SH64_SPC_REGNUM)
-      && len == 8)
-    {
-      *((unsigned64*) buf) = 0;
-      return len;
-    }
-
-  /* Fetch target registers.  */
-  if (nr >= SIM_SH64_TR0_REGNUM
-      && nr < (SIM_SH64_TR0_REGNUM + SIM_SH64_NR_TR_REGS)
-      && len == 8)
-    {
-      *((unsigned64*) buf) =
-	H2T_8 (sh64_h_tr_get (cpu, nr - SIM_SH64_TR0_REGNUM));
-      return len;
-    }
-
-  /* Fetch floating point registers.  */
-  if (nr >= SIM_SH64_FR0_REGNUM
-      && nr < (SIM_SH64_FR0_REGNUM + SIM_SH64_NR_FP_REGS)
-      && len == 4)
-    {
-      *((unsigned32*) buf) =
-	H2T_4 (sh64_h_fr_get (cpu, nr - SIM_SH64_FR0_REGNUM));
-      return len;
-    }
-
-  /* We should never get here.  */
-  return 0;
-}
-
-int
-sh64_store_register (SIM_CPU *cpu, int nr, unsigned char *buf, int len)
-{
-  /* Store general purpose registers. */
-  if (nr >= SIM_SH64_R0_REGNUM
-      && nr < (SIM_SH64_R0_REGNUM + SIM_SH64_NR_R_REGS)
-      && len == 8)
-    {
-      sh64_h_gr_set (cpu, nr - SIM_SH64_R0_REGNUM, T2H_8 (*((unsigned64*)buf)));
-      return len;
-    }
-
-  /* Store PC.  */
-  if (nr == SIM_SH64_PC_REGNUM && len == 8)
-    {
-      unsigned64 new_pc = T2H_8 (*((unsigned64*)buf));
-      sh64_h_pc_set (cpu, new_pc);
-      return len;
-    }
-
-  /* Store status register (SR).  */
-  if (nr == SIM_SH64_SR_REGNUM && len == 8)
-    {
-      sh64_h_sr_set (cpu, T2H_8 (*((unsigned64*)buf)));
-      return len;
-    }
-
-  /* Store saved status register (SSR) and PC (SPC).  */
-  if (nr == SIM_SH64_SSR_REGNUM || nr == SIM_SH64_SPC_REGNUM)
-    {
-      /* Do nothing.  */
-      return len;
-    }
-
-  /* Store target registers.  */
-  if (nr >= SIM_SH64_TR0_REGNUM
-      && nr < (SIM_SH64_TR0_REGNUM + SIM_SH64_NR_TR_REGS)
-      && len == 8)
-    {
-      sh64_h_tr_set (cpu, nr - SIM_SH64_TR0_REGNUM, T2H_8 (*((unsigned64*)buf)));
-      return len;
-    }
-
-  /* Store floating point registers.  */
-  if (nr >= SIM_SH64_FR0_REGNUM
-      && nr < (SIM_SH64_FR0_REGNUM + SIM_SH64_NR_FP_REGS)
-      && len == 4)
-    {
-      sh64_h_fr_set (cpu, nr - SIM_SH64_FR0_REGNUM, T2H_4 (*((unsigned32*)buf)));
-      return len;
-    }
-
-  /* We should never get here.  */
-  return 0;
-}
-
-void
-sh64_engine_run_full(SIM_CPU *cpu)
-{
-  if (sh64_h_ism_get (cpu) == ISM_MEDIA)
-    {
-      if (!sh64_idesc_media)
-	{
-	  sh64_media_init_idesc_table (cpu);
-	  sh64_idesc_media = CPU_IDESC (cpu);
-	}
-      else
-	CPU_IDESC (cpu) = sh64_idesc_media;
-      sh64_media_engine_run_full (cpu);
-    }
-  else
-    {
-      if (!sh64_idesc_compact)
-	{
-	  sh64_compact_init_idesc_table (cpu);
-	  sh64_idesc_compact = CPU_IDESC (cpu);
-	}
-      else
-	CPU_IDESC (cpu) = sh64_idesc_compact;
-      sh64_compact_engine_run_full (cpu);
-    }
-}
-
-void
-sh64_engine_run_fast (SIM_CPU *cpu)
-{
-  if (sh64_h_ism_get (cpu) == ISM_MEDIA)
-    {
-      if (!sh64_idesc_media)
-	{
-	  sh64_media_init_idesc_table (cpu);
-	  sh64_idesc_media = CPU_IDESC (cpu);
-	}
-      else
-	CPU_IDESC (cpu) = sh64_idesc_media;
-      sh64_media_engine_run_fast (cpu);
-    }
-  else
-    {
-      if (!sh64_idesc_compact)
-	{
-	  sh64_compact_init_idesc_table (cpu);
-	  sh64_idesc_compact = CPU_IDESC (cpu);
-	}
-      else
-	CPU_IDESC (cpu) = sh64_idesc_compact;
-      sh64_compact_engine_run_fast (cpu);
-    }
-}
-
-static void
-sh64_prepare_run (SIM_CPU *cpu)
-{
-  /* Nothing.  */
-}
-
-static const CGEN_INSN *
-sh64_get_idata (SIM_CPU *cpu, int inum)
-{
-  return CPU_IDESC (cpu) [inum].idata;
-}
-
-static void
-sh64_init_cpu (SIM_CPU *cpu)
-{
-  CPU_REG_FETCH (cpu) = sh64_fetch_register;
-  CPU_REG_STORE (cpu) = sh64_store_register;
-  CPU_PC_FETCH (cpu) = sh64_h_pc_get;
-  CPU_PC_STORE (cpu) = sh64_h_pc_set;
-  CPU_GET_IDATA (cpu) = sh64_get_idata;
-  /* Only used by profiling.  0 disables it. */
-  CPU_MAX_INSNS (cpu) = 0;
-  CPU_INSN_NAME (cpu) = cgen_insn_name;
-  CPU_FULL_ENGINE_FN (cpu) = sh64_engine_run_full;
-#if WITH_FAST
-  CPU_FAST_ENGINE_FN (cpu) = sh64_engine_run_fast;
-#else
-  CPU_FAST_ENGINE_FN (cpu) = sh64_engine_run_full;
-#endif
-}
-
-static void
-shmedia_init_cpu (SIM_CPU *cpu)
-{
-  sh64_init_cpu (cpu);
-}
-
-static void
-shcompact_init_cpu (SIM_CPU *cpu)
-{ 
-  sh64_init_cpu (cpu);
-}
-
-static void
-sh64_model_init()
-{
-  /* Do nothing.  */
-}
-
-static const MODEL sh_models [] =
-{
-  { "sh2",  & sh2_mach,  MODEL_SH5, NULL, sh64_model_init },
-  { "sh3",  & sh3_mach,  MODEL_SH5, NULL, sh64_model_init },
-  { "sh3e", & sh3_mach,  MODEL_SH5, NULL, sh64_model_init },
-  { "sh4",  & sh4_mach,  MODEL_SH5, NULL, sh64_model_init },
-  { "sh5",  & sh5_mach,  MODEL_SH5, NULL, sh64_model_init },
-  { 0 }
-};
-
-static const MACH_IMP_PROPERTIES sh5_imp_properties =
-{
-  sizeof (SIM_CPU),
-#if WITH_SCACHE
-  sizeof (SCACHE)
-#else
-  0
-#endif
-};
-
-const MACH sh2_mach =
-{
-  "sh2", "sh2", MACH_SH5,
-  16, 16, &sh_models[0], &sh5_imp_properties,
-  shcompact_init_cpu,
-  sh64_prepare_run
-};
-
-const MACH sh3_mach =
-{
-  "sh3", "sh3", MACH_SH5,
-  16, 16, &sh_models[1], &sh5_imp_properties,
-  shcompact_init_cpu,
-  sh64_prepare_run
-};
-
-const MACH sh3e_mach =
-{
-  "sh3e", "sh3e", MACH_SH5,
-  16, 16, &sh_models[2], &sh5_imp_properties,
-  shcompact_init_cpu,
-  sh64_prepare_run
-};
-
-const MACH sh4_mach =
-{
-  "sh4", "sh4", MACH_SH5,
-  16, 16, &sh_models[3], &sh5_imp_properties,
-  shcompact_init_cpu,
-  sh64_prepare_run
-};
-
-const MACH sh5_mach =
-{
-  "sh5", "sh5", MACH_SH5,
-  32, 32, &sh_models[4], &sh5_imp_properties,
-  shmedia_init_cpu,
-  sh64_prepare_run
-};
diff --git a/sim/sh64/sim-if.c b/sim/sh64/sim-if.c
deleted file mode 100644
index baef638b153..00000000000
--- a/sim/sh64/sim-if.c
+++ /dev/null
@@ -1,236 +0,0 @@
-/* Main simulator entry points specific to the SH5.
-   Copyright (C) 2000 Free Software Foundation, Inc.
-   Contributed by Cygnus Solutions.
-
-This file is part of the GNU simulators.
-
-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, 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.  */
-
-#include "libiberty.h"
-#include "bfd.h"
-#include "sim-main.h"
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
-#include "sim-options.h"
-#include "dis-asm.h"
-
-static void free_state (SIM_DESC);
-
-/* Since we don't build the cgen-opcode table, we use a wrapper around
-   the existing disassembler from libopcodes. */
-static CGEN_DISASSEMBLER sh64_disassemble_insn;
-
-/* Records simulator descriptor so utilities like sh5_dump_regs can be
-   called from gdb.  */
-SIM_DESC current_state;
-
-/* Cover function of sim_state_free to free the cpu buffers as well.  */
-
-static void
-free_state (SIM_DESC sd)
-{
-  if (STATE_MODULES (sd) != NULL)
-    sim_module_uninstall (sd);
-  sim_cpu_free_all (sd);
-  sim_state_free (sd);
-}
-
-/* Create an instance of the simulator.  */
-
-SIM_DESC
-sim_open (kind, callback, abfd, argv)
-     SIM_OPEN_KIND kind;
-     host_callback *callback;
-     struct _bfd *abfd;
-     char **argv;
-{
-  char c;
-  int i;
-  SIM_DESC sd = sim_state_alloc (kind, callback);
-
-  /* The cpu data is kept in a separately allocated chunk of memory.  */
-  if (sim_cpu_alloc_all (sd, 1, cgen_cpu_max_extra_bytes ()) != SIM_RC_OK)
-    {
-      free_state (sd);
-      return 0;
-    }
-
-#if 0 /* FIXME: pc is in mach-specific struct */
-  /* FIXME: watchpoints code shouldn't need this */
-  {
-    SIM_CPU *current_cpu = STATE_CPU (sd, 0);
-    STATE_WATCHPOINTS (sd)->pc = &(PC);
-    STATE_WATCHPOINTS (sd)->sizeof_pc = sizeof (PC);
-  }
-#endif
-
-  if (sim_pre_argv_init (sd, argv[0]) != SIM_RC_OK)
-    {
-      free_state (sd);
-      return 0;
-    }
-
-#if 0 /* FIXME: 'twould be nice if we could do this */
-  /* These options override any module options.
-     Obviously ambiguity should be avoided, however the caller may wish to
-     augment the meaning of an option.  */
-  if (extra_options != NULL)
-    sim_add_option_table (sd, extra_options);
-#endif
-
-  /* getopt will print the error message so we just have to exit if this fails.
-     FIXME: Hmmm...  in the case of gdb we need getopt to call
-     print_filtered.  */
-  if (sim_parse_args (sd, argv) != SIM_RC_OK)
-    {
-      free_state (sd);
-      return 0;
-    }
-
-  /* Allocate core managed memory if none specified by user.
-     Use address 4 here in case the user wanted address 0 unmapped.  */
-  if (sim_core_read_buffer (sd, NULL, read_map, &c, 4, 1) == 0)
-    sim_do_commandf (sd, "memory region 0,0x%x", SH64_DEFAULT_MEM_SIZE);
-
-  /* Add a small memory region way up in the address space to handle
-     writes to invalidate an instruction cache line.  This is used for
-     trampolines.  Since we don't simulate the cache, this memory just
-     avoids bus errors.  64K ought to do. */
-  sim_do_command (sd," memory region 0xf0000000,0x10000");
-
-  /* check for/establish the reference program image */
-  if (sim_analyze_program (sd,
-			   (STATE_PROG_ARGV (sd) != NULL
-			    ? *STATE_PROG_ARGV (sd)
-			    : NULL),
-			   abfd) != SIM_RC_OK)
-    {
-      free_state (sd);
-      return 0;
-    }
-
-  /* Establish any remaining configuration options.  */
-  if (sim_config (sd) != SIM_RC_OK)
-    {
-      free_state (sd);
-      return 0;
-    }
-
-  if (sim_post_argv_init (sd) != SIM_RC_OK)
-    {
-      free_state (sd);
-      return 0;
-    }
-
-  /* Open a copy of the cpu descriptor table.  */
-  {
-    CGEN_CPU_DESC cd = sh_cgen_cpu_open_1 (STATE_ARCHITECTURE (sd)->printable_name,
-					      CGEN_ENDIAN_BIG);
-
-    for (i = 0; i < MAX_NR_PROCESSORS; ++i)
-      {
-	SIM_CPU *cpu = STATE_CPU (sd, i);
-	CPU_CPU_DESC (cpu) = cd;
-	CPU_DISASSEMBLER (cpu) = sh64_disassemble_insn;
-      }
-  }
-
-  /* Clear idesc table pointers for good measure. */
-  sh64_idesc_media = sh64_idesc_compact = NULL;
-
-  /* Initialize various cgen things not done by common framework.
-     Must be done after sh_cgen_cpu_open.  */
-  cgen_init (sd);
-
-  /* Store in a global so things like sparc32_dump_regs can be invoked
-     from the gdb command line.  */
-  current_state = sd;
-
-  return sd;
-}
-
-void
-sim_close (sd, quitting)
-     SIM_DESC sd;
-     int quitting;
-{
-  sh_cgen_cpu_close (CPU_CPU_DESC (STATE_CPU (sd, 0)));
-  sim_module_uninstall (sd);
-}
-
-SIM_RC
-sim_create_inferior (sd, abfd, argv, envp)
-     SIM_DESC sd;
-     struct _bfd *abfd;
-     char **argv;
-     char **envp;
-{
-  SIM_CPU *current_cpu = STATE_CPU (sd, 0);
-  SIM_ADDR addr;
-
-  if (abfd != NULL)
-    addr = bfd_get_start_address (abfd);
-  else
-    addr = 0;
-  sim_pc_set (current_cpu, addr);
-
-#if 0
-  STATE_ARGV (sd) = sim_copy_argv (argv);
-  STATE_ENVP (sd) = sim_copy_argv (envp);
-#endif
-
-  return SIM_RC_OK;
-}
-
-void
-sim_do_command (sd, cmd)
-     SIM_DESC sd;
-     char *cmd;
-{ 
-  if (sim_args_command (sd, cmd) != SIM_RC_OK)
-    sim_io_eprintf (sd, "Unknown command `%s'\n", cmd);
-}
-
-
-/* Disassemble an instruction.  */
-
-static void
-sh64_disassemble_insn (SIM_CPU *cpu, const CGEN_INSN *insn,
-                       const ARGBUF *abuf, IADDR pc, char *buf)
-{
-  struct disassemble_info disasm_info;
-  SFILE sfile;
-  SIM_DESC sd = CPU_STATE (cpu);
-
-  sfile.buffer = sfile.current = buf;
-  INIT_DISASSEMBLE_INFO (disasm_info, (FILE *) &sfile,
-                         (fprintf_ftype) sim_disasm_sprintf);
-
-  disasm_info.arch = bfd_get_arch (STATE_PROG_BFD (sd));
-  disasm_info.mach = bfd_get_mach (STATE_PROG_BFD (sd));
-  disasm_info.endian =
-    (bfd_big_endian (STATE_PROG_BFD (sd)) ? BFD_ENDIAN_BIG
-     : bfd_little_endian (STATE_PROG_BFD (sd)) ? BFD_ENDIAN_LITTLE
-     : BFD_ENDIAN_UNKNOWN);
-  disasm_info.read_memory_func = sim_disasm_read_memory;
-  disasm_info.memory_error_func = sim_disasm_perror_memory;
-  disasm_info.application_data = (PTR) cpu;
-
-  if (sh64_h_ism_get (cpu) == ISM_MEDIA)
-    print_insn_sh64x_media (pc, &disasm_info);
-  else
-    print_insn_sh (pc, &disasm_info);
-}
diff --git a/sim/sh64/sim-main.h b/sim/sh64/sim-main.h
deleted file mode 100644
index e7cbe99217a..00000000000
--- a/sim/sh64/sim-main.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* Main header for the Hitachi SH64 architecture.  */
-
-#ifndef SIM_MAIN_H
-#define SIM_MAIN_H
-
-#define USING_SIM_BASE_H /* FIXME: quick hack */
-
-struct _sim_cpu; /* FIXME: should be in sim-basics.h */
-typedef struct _sim_cpu SIM_CPU;
-
-/* sim-basics.h includes config.h but cgen-types.h must be included before
-   sim-basics.h and cgen-types.h needs config.h.  */
-#include "config.h"
-
-#include "symcat.h"
-#include "sim-basics.h"
-#include "cgen-types.h"
-#include "sh-desc.h"
-#include "sh-opc.h"
-#include "arch.h"
-
-/* These must be defined before sim-base.h.  */
-typedef UDI sim_cia;
-
-#define CIA_GET(cpu)     CPU_PC_GET (cpu)
-#define CIA_SET(cpu,val) CPU_PC_SET ((cpu), (val) | (sh64_h_ism_get (cpu)))
-
-#include "sim-base.h"
-#include "cgen-sim.h"
-#include "sh64-sim.h"
-
-/* The _sim_cpu struct.  */
-
-struct _sim_cpu {
-  /* sim/common cpu base.  */
-  sim_cpu_base base;
-
-  /* Static parts of cgen.  */
-  CGEN_CPU cgen_cpu;
-
-  /* CPU specific parts go here.
-     Note that in files that don't need to access these pieces WANT_CPU_FOO
-     won't be defined and thus these parts won't appear.  This is ok in the
-     sense that things work.  It is a source of bugs though.
-     One has to of course be careful to not take the size of this
-     struct and no structure members accessed in non-cpu specific files can
-     go after here.  Oh for a better language.  */
-#if defined (WANT_CPU_SH64)
-  SH64_CPU_DATA cpu_data;
-#endif
-};
-
-/* The sim_state struct.  */
-
-struct sim_state {
-  sim_cpu *cpu;
-#define STATE_CPU(sd, n) (/*&*/ (sd)->cpu)
-
-  CGEN_STATE cgen_state;
-
-  sim_state_base base;
-};
-
-/* Misc.  */
-
-/* Catch address exceptions.  */
-extern SIM_CORE_SIGNAL_FN sh64_core_signal;
-#define SIM_CORE_SIGNAL(SD,CPU,CIA,MAP,NR_BYTES,ADDR,TRANSFER,ERROR) \
-sh64_core_signal ((SD), (CPU), (CIA), (MAP), (NR_BYTES), (ADDR), \
-		  (TRANSFER), (ERROR))
-
-/* Default memory size.  */
-#define SH64_DEFAULT_MEM_SIZE 0x800000 /* 8M */
-
-#endif /* SIM_MAIN_H */
diff --git a/sim/sh64/tconfig.in b/sim/sh64/tconfig.in
deleted file mode 100644
index bab3f1ce7ed..00000000000
--- a/sim/sh64/tconfig.in
+++ /dev/null
@@ -1,45 +0,0 @@
-/* SH64 target configuration file.  -*- C -*- */
-
-/* Define this if the simulator can vary the size of memory.
-   See the xxx simulator for an example.
-   This enables the `-m size' option.
-   The memory size is stored in STATE_MEM_SIZE.  */
-/* Not used for SH64 since we use the memory module. TODO -- check this  */
-/* #define SIM_HAVE_MEM_SIZE */
-
-/* See sim-hload.c.  We properly handle LMA. -- TODO: check this */
-#define SIM_HANDLES_LMA 1
-
-/* For MSPR support.  FIXME: revisit.  */
-#define WITH_DEVICES 0
-
-/* FIXME: Revisit.  */
-#ifdef HAVE_DV_SOCKSER
-MODULE_INSTALL_FN dv_sockser_install;
-#define MODULE_LIST dv_sockser_install,
-#endif
-
-#if 0
-/* Enable watchpoints.  */
-#define WITH_WATCHPOINTS 1
-#endif
-
-/* ??? Temporary hack until model support unified.  */
-#define SIM_HAVE_MODEL
-
-/* Define this to enable the intrinsic breakpoint mechanism. */
-/* FIXME: may be able to remove SIM_HAVE_BREAKPOINTS since it essentially
-   duplicates ifdef SIM_BREAKPOINT (right?) */
-#if 1
-#define SIM_HAVE_BREAKPOINTS
-#define SIM_BREAKPOINT { 0, 0, 0, 0xD }
-#define SIM_BREAKPOINT_SIZE 4
-#endif
-
-/* This is a global setting.  Different cpu families can't mix-n-match -scache
-   and -pbb.  However some cpu families may use -simple while others use
-   one of -scache/-pbb. ???? */
-#define WITH_SCACHE_PBB 1
-
-/* Define this if the target cpu is bi-endian and the simulator supports it.  */
-#define SIM_HAVE_BIENDIAN
diff --git a/sim/testsuite/sim/sh64/ChangeLog b/sim/testsuite/sim/sh64/ChangeLog
deleted file mode 100644
index 8bb2f764ae6..00000000000
--- a/sim/testsuite/sim/sh64/ChangeLog
+++ /dev/null
@@ -1,21 +0,0 @@
-2001-01-06  Ben Elliston  <bje@redhat.com>
-
-	* misc/fr-dr.s: New test.
-
-2001-01-03  Ben Elliston  <bje@redhat.com>
-
-	* interwork.exp: Match .s files only.
-
-2000-12-06  Ben Elliston  <bje@redhat.com>
-
-	* interwork.exp: New test case.
-
-2000-11-16  Ben Elliston  <bje@redhat.com>
-
-	* allinsn.exp: Rename from this ..
-	* compact.exp: .. to this.
-	* media.exp: New test case.
-
-2000-11-13  Ben Elliston  <bje@redhat.com>
-
-	* allinsn.exp: New test case.
diff --git a/sim/testsuite/sim/sh64/compact.exp b/sim/testsuite/sim/sh64/compact.exp
deleted file mode 100644
index d3d482acf0f..00000000000
--- a/sim/testsuite/sim/sh64/compact.exp
+++ /dev/null
@@ -1,19 +0,0 @@
-# SHcompact testsuite.
-
-if [istarget sh64-*-*] {
-    # load support procs (none yet)
-    # load_lib cgen.exp
-
-    # all machines
-    set all_machs "sh5"
-
-    # The .cgs suffix is for "cgen .s".
-    foreach src [lsort [glob -nocomplain $srcdir/$subdir/compact/*.cgs]] {
-       # If we're only testing specific files and this isn't one of them,
-       # skip it.
-       if ![runtest_file_p $runtests $src] {
-  	  continue
-	}
-    run_sim_test $src $all_machs
-    }
-}
diff --git a/sim/testsuite/sim/sh64/compact/ChangeLog b/sim/testsuite/sim/sh64/compact/ChangeLog
deleted file mode 100644
index 99aaec1ff02..00000000000
--- a/sim/testsuite/sim/sh64/compact/ChangeLog
+++ /dev/null
@@ -1,26 +0,0 @@
-2002-01-09  Ben Elliston  <bje@redhat.com>
-
-	* macl.cgs: For good measure, clear the S bit at startup.
-
-2001-01-11  Ben Elliston  <bje@redhat.com>
-
-	* fmov.cgs (f13b): Compare R0 with R1, not R2, when testing that
-	the source register was correctly post-incremented.
-
-2000-12-01  Ben Elliston  <bje@redhat.com>
-
-	* *.cgs (ld): Link tests with -m shelf32.
-
-2000-11-24  Ben Elliston  <bje@redhat.com>
-
-	* fmov.cgs: New test case.
-	* ftrv.cgs: Populate the matrix with meaningful values.
-
-2000-11-22  Ben Elliston  <bje@redhat.com>
-
-	* *.cgs (as): Assemble tests with -isa=shcompact.
-
-2000-11-16  Ben Elliston  <bje@redhat.com>
-
-	* *.cgs: New test cases.
-
diff --git a/sim/testsuite/sim/sh64/compact/add.cgs b/sim/testsuite/sim/sh64/compact/add.cgs
deleted file mode 100644
index 105e4849069..00000000000
--- a/sim/testsuite/sim/sh64/compact/add.cgs
+++ /dev/null
@@ -1,55 +0,0 @@
-# sh testcase for add $rm, $rn -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-init:
-	# Initialise some registers with values which help us to verify
-	# that the correct source registers are used by the ADD instruction.
-	mov #0, r0
-	mov #1, r1
-	mov #2, r2
-	mov #3, r3
-	mov #5, r5
-	mov #15, r15
-
-add:	
-	# 0 + 0 = 0.
-	add r0, r0
-	assert r0, #0
-
-	# 0 + 1 = 1.
-	add r0, r1
-	assert r1, #1
-
-	# 1 + 2 = 3.
-	add r1, r2
-	assert r2, #3
-
-	# 3 + 5 = 8.
-	add r3, r5
-	assert r5, #8
-	
-	# 8 + 8 = 16.
-	add r5, r5
-	assert r5, #16
-
-	# 15 + 1 = 16.
-	add r15, r1
-	assert r1, #16
-
-neg:
-	mov #1, r0
-	neg r0, r0
-	mov #2, r1
-	add r0, r1
-	assert r1, #1
-
-okay:	
-	pass
-
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/compact/addc.cgs b/sim/testsuite/sim/sh64/compact/addc.cgs
deleted file mode 100644
index f6e46e1a969..00000000000
--- a/sim/testsuite/sim/sh64/compact/addc.cgs
+++ /dev/null
@@ -1,90 +0,0 @@
-# sh testcase for addc $rm, $rn -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	# Initialise some registers with values which help us to verify
-	# that the correct source registers are used by the ADDC instruction.
-
-	.macro init
-	mov #0, r0
-	mov #1, r1
-	mov #2, r2
-	mov #3, r3
-	mov #5, r5
-	mov #15, r15
-	.endm
-	
-	start
-
-	init
-add:
-	clrt
-	addc r0, r0
-	assert r0, #0
-	clrt
-	addc r0, r1
-	assert r1, #1
-	clrt
-	addc r1, r2
-	assert r2, #3
-	clrt
-	addc r3, r5
-	assert r5, #8
-	clrt
-	addc r5, r5
-	assert r5, #16
-	clrt
-	addc r15, r1
-	assert r1, #16
-
-	init
-addt:
-	sett
-	addc r0, r0
-	assert r0, #1
-	sett
-	addc r0, r1
-	assert r1, #3
-	sett
-	addc r1, r2
-	assert r2, #6
-	sett
-	addc r3, r5
-	assert r5, #9
-	sett
-	addc r5, r5
-	assert r5, #19
-	sett
-	addc r15, r1
-	assert r1, #19
-
-	bra next
-	nop
-
-wrong:
-	fail
-
-next:
-	init
-large:
-	clrt
-	mov #1, r0
-	neg r0, r0
-	mov #2, r1
-	addc r0, r1
-	assert r1, #1
-
-	init
-larget:
-	sett
-	mov #1, r0
-	neg r0, r0
-	mov #2, r1
-	addc r0, r1
-	assert r1, #2
-
-okay:	
-	pass
diff --git a/sim/testsuite/sim/sh64/compact/addi.cgs b/sim/testsuite/sim/sh64/compact/addi.cgs
deleted file mode 100644
index 7c96ddf76d5..00000000000
--- a/sim/testsuite/sim/sh64/compact/addi.cgs
+++ /dev/null
@@ -1,46 +0,0 @@
-# sh testcase for add #$imm8, $rn -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-init:
-	# Initialise some registers with values which help us to verify
-	# that the correct source registers are used by the ADD instruction.
-	mov #0, r0
-	mov #1, r1
-	mov #2, r2
-	mov #3, r3
-	mov #5, r5
-	mov #15, r15
-
-addi:
-	# 0 + 0 = 0.
-	add #0, r0
-	assert r0, #0
-
-	# 0 + 1 = 1.
-	add #0, r1
-	assert r1, #1
-
-	# 2 + 2 = 4.
-	add #2, r2
-	assert r2, #4
-
-	# 120 + 5 = 125.
-	add #120, r5
-	assert r5, #125
-
-large:
-	mov #1, r0
-	neg r0, r0
-	add #2, r0
-	assert r0, #1
-
-okay:	
-	pass
-
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/compact/addv.cgs b/sim/testsuite/sim/sh64/compact/addv.cgs
deleted file mode 100644
index 0267e5dfa00..00000000000
--- a/sim/testsuite/sim/sh64/compact/addv.cgs
+++ /dev/null
@@ -1,48 +0,0 @@
-# sh testcase for addv $rm, $rn -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-zero:
-	mov #0, r0
-	mov #0, r1
-	addv r0, r1
-	# Assert !T and #0.
-	bt wrong
-	assert r1, #0
-
-one:
-	mov #0, r0
-	mov #1, r1
-	addv r0, r1
-	# Assert !T and #1.
-	bt wrong
-	assert r1, #1
-
-large:
-	# Produce MAXINT in R0.
-	mov #0, r0
-	not r0, r0
-	shlr r0
-
-	# Put #3 into R1.
-	mov #3, r1
-
-	# Add them and overflow.
-	addv r0, r1
-
-	# Assert T and overflowed value.
-	bf wrong
-	mov #1, r7
-	rotr r7
-	add #2, r7
-	cmp/eq r1, r7
-	bf wrong
-
-okay:
-	pass
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/compact/and.cgs b/sim/testsuite/sim/sh64/compact/and.cgs
deleted file mode 100644
index e1452752ae0..00000000000
--- a/sim/testsuite/sim/sh64/compact/and.cgs
+++ /dev/null
@@ -1,33 +0,0 @@
-# sh testcase for and $rm64, $rn64 -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-
-	.global and
-and:
-	mov #1, r1
-	mov #7, r2
-	rotr r2
-	rotr r2
-	and r1, r2
-
-	# R1 & R2 = 1.
-	assert r2, #1
-
-another:
-	mov #192, r1
-	mov #0, r2
-	and r1, r2
-
-	# R1 & R2 = 0.
-	assert r2, #0
-
-okay:
-	pass
-
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/compact/andb.cgs b/sim/testsuite/sim/sh64/compact/andb.cgs
deleted file mode 100644
index 77e628598b1..00000000000
--- a/sim/testsuite/sim/sh64/compact/andb.cgs
+++ /dev/null
@@ -1,24 +0,0 @@
-# sh testcase for and.b #$imm8, @(r0, gbr) -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-
-	.global orb
-init:
-	# Init GBR and R0.
-	mov #30, r0
-	ldc r0, gbr	
-	mov #40, r0
-
-orb:
-	and.b #255, @(r0, gbr)
-	and.b #170, @(r0, gbr)
-	and.b #255, @(r0, gbr)
-	and.b #0, @(r0, gbr)
-
-okay:
-	pass
diff --git a/sim/testsuite/sim/sh64/compact/andi.cgs b/sim/testsuite/sim/sh64/compact/andi.cgs
deleted file mode 100644
index 32d71c5b477..00000000000
--- a/sim/testsuite/sim/sh64/compact/andi.cgs
+++ /dev/null
@@ -1,43 +0,0 @@
-# sh testcase for and #$imm8, r0 -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-
-	.global andi
-andi:
-	mov #0, r0
-	or #255, r0
-	and #0, r0
-	assert r0, #0
-
-large:
-	mov #0, r0
-	or #255, r0
-	shll8 r0
-	or #255, r0
-	shll8 r0
-	or #255, r0
-	shll8 r0
-	or #255, r0
-
-mask:
-	and #255, r0
-	mov r0, r1
-	mov #0, r0
-	or #255, r0
-	cmp/eq r0, r1
-	bf wrong
-
-mask0:
-	and #0, r0
-	assert r0, #0
-
-okay:
-	pass
-
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/compact/bf.cgs b/sim/testsuite/sim/sh64/compact/bf.cgs
deleted file mode 100644
index 5c361f94b89..00000000000
--- a/sim/testsuite/sim/sh64/compact/bf.cgs
+++ /dev/null
@@ -1,24 +0,0 @@
-# sh testcase for bf $disp8 -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-
-	.global taken
-taken:
-	clrt
-	bf ntaken
-	fail
-	.global ntaken
-ntaken:
-	sett
-	bf bad
-	pass
-bad:
-	fail
-	fail
-	fail
-	fail
diff --git a/sim/testsuite/sim/sh64/compact/bfs.cgs b/sim/testsuite/sim/sh64/compact/bfs.cgs
deleted file mode 100644
index 3cad5f6fc73..00000000000
--- a/sim/testsuite/sim/sh64/compact/bfs.cgs
+++ /dev/null
@@ -1,28 +0,0 @@
-# sh testcase for bf/s $disp8 -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-
-	.global taken
-taken:
-	clrt
-	bf/s ntaken
-slot1:
-	nop
-	fail
-	.global ntaken
-ntaken:
-	sett
-	bf/s bad
-slot2:
-	nop
-	pass
-bad:
-	fail
-	fail
-	fail
-	fail
diff --git a/sim/testsuite/sim/sh64/compact/bra.cgs b/sim/testsuite/sim/sh64/compact/bra.cgs
deleted file mode 100644
index 77c6da9bdde..00000000000
--- a/sim/testsuite/sim/sh64/compact/bra.cgs
+++ /dev/null
@@ -1,23 +0,0 @@
-# sh testcase for bra $disp12 -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-
-	.global bra
-bra:
-	bra okay
-slot:
-	nop
-bad:
-	fail
-	fail
-	fail
-	.global okay
-okay:
-	pass
-	fail
-
diff --git a/sim/testsuite/sim/sh64/compact/braf.cgs b/sim/testsuite/sim/sh64/compact/braf.cgs
deleted file mode 100644
index e761f6d0a6d..00000000000
--- a/sim/testsuite/sim/sh64/compact/braf.cgs
+++ /dev/null
@@ -1,24 +0,0 @@
-# sh testcase for braf $rn -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-
-	.global braf
-braf:
-	mov #4, r0
-	braf r0
-slot:
-	nop
-bad:
-	fail
-	fail
-okay:
-	pass
-alsobad:
-	fail
-	fail
-	fail
diff --git a/sim/testsuite/sim/sh64/compact/brk.cgs b/sim/testsuite/sim/sh64/compact/brk.cgs
deleted file mode 100644
index 99080724565..00000000000
--- a/sim/testsuite/sim/sh64/compact/brk.cgs
+++ /dev/null
@@ -1,18 +0,0 @@
-# sh testcase for brk -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-	.global brk
-brk:
-	# If we hit the breakpoint, the sim will stop.
-	pass
-
-	# FIXME: breakpoint instruction.
-	# The SH4 assembler doesn't know about "brk".
-	.word 0x003b
-bad:
-	fail
diff --git a/sim/testsuite/sim/sh64/compact/bsr.cgs b/sim/testsuite/sim/sh64/compact/bsr.cgs
deleted file mode 100644
index 75a1a2b275e..00000000000
--- a/sim/testsuite/sim/sh64/compact/bsr.cgs
+++ /dev/null
@@ -1,21 +0,0 @@
-# sh testcase for bsr $disp12 -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-
-	.global bsr
-bsr:
-	bsr okay
-slot:
-	nop
-bad:
-	fail
-	fail
-okay:
-	pass
-alsobad:
-	fail
diff --git a/sim/testsuite/sim/sh64/compact/bsrf.cgs b/sim/testsuite/sim/sh64/compact/bsrf.cgs
deleted file mode 100644
index 9360eaa88b0..00000000000
--- a/sim/testsuite/sim/sh64/compact/bsrf.cgs
+++ /dev/null
@@ -1,22 +0,0 @@
-# sh testcase for bsrf $rn -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-
-bsrf:
-	mov #4, r0
-	bsrf r0
-slot:
-	nop
-bad:
-	fail
-	fail
-okay:
-	pass
-alsobad:
-	fail
-	fail
diff --git a/sim/testsuite/sim/sh64/compact/bt.cgs b/sim/testsuite/sim/sh64/compact/bt.cgs
deleted file mode 100644
index 65b9d61b885..00000000000
--- a/sim/testsuite/sim/sh64/compact/bt.cgs
+++ /dev/null
@@ -1,24 +0,0 @@
-# sh testcase for bt $disp8
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-
-	.global taken
-taken:
-	sett
-	bt ntaken
-	fail
-	.global ntaken
-ntaken:
-	clrt
-	bt bad
-	pass
-bad:
-	fail
-	fail
-	fail
-	fail
diff --git a/sim/testsuite/sim/sh64/compact/bts.cgs b/sim/testsuite/sim/sh64/compact/bts.cgs
deleted file mode 100644
index 3d62e4d822c..00000000000
--- a/sim/testsuite/sim/sh64/compact/bts.cgs
+++ /dev/null
@@ -1,28 +0,0 @@
-# sh testcase for bt/s $disp8 -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-
-	.global taken
-taken:
-	sett
-	bt/s ntaken
-slot1:
-	nop
-	fail
-	.global ntaken
-ntaken:
-	clrt
-	bt/s bad
-slot2:
-	nop
-	pass
-bad:
-	fail
-	fail
-	fail
-	fail
diff --git a/sim/testsuite/sim/sh64/compact/clrmac.cgs b/sim/testsuite/sim/sh64/compact/clrmac.cgs
deleted file mode 100644
index 482dc804d62..00000000000
--- a/sim/testsuite/sim/sh64/compact/clrmac.cgs
+++ /dev/null
@@ -1,13 +0,0 @@
-# sh testcase for clrmac -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-
-	.global clrmac
-clrmac:
-	clrmac
-	pass
diff --git a/sim/testsuite/sim/sh64/compact/clrs.cgs b/sim/testsuite/sim/sh64/compact/clrs.cgs
deleted file mode 100644
index bed5fd5178e..00000000000
--- a/sim/testsuite/sim/sh64/compact/clrs.cgs
+++ /dev/null
@@ -1,14 +0,0 @@
-# sh testcase for clrs -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-
-	.global clrs
-clrs:
-	clrs
-	# Somehow ensure that S is set.
-	pass
diff --git a/sim/testsuite/sim/sh64/compact/clrt.cgs b/sim/testsuite/sim/sh64/compact/clrt.cgs
deleted file mode 100644
index 281c2f4243d..00000000000
--- a/sim/testsuite/sim/sh64/compact/clrt.cgs
+++ /dev/null
@@ -1,16 +0,0 @@
-# sh testcase for clrt -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-
-	.global clrt
-clrt:
-	clrt
-	bt wrong
-	pass
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/compact/cmpeq.cgs b/sim/testsuite/sim/sh64/compact/cmpeq.cgs
deleted file mode 100644
index 3cc744cf7f7..00000000000
--- a/sim/testsuite/sim/sh64/compact/cmpeq.cgs
+++ /dev/null
@@ -1,52 +0,0 @@
-# sh testcase for cmp/eq $rm, $rn -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-
-zeroes:
-	mov #0, r1
-	mov #0, r2
-	cmp/eq r1, r2
-	bf wrong
-
-zero1:
-	mov #0, r1
-	mov #1, r2
-	cmp/eq r1, r2
-	bt wrong
-	
-zero2:
-	mov #0, r2
-	mov #1, r1
-	cmp/eq r2, r1
-	bt wrong
-	
-equal:
-	mov #192, r1
-	mov #192, r2
-	cmp/eq r1, r2
-	bf wrong
-	
-noteq:
-	mov #192, r1
-	mov #193, r2
-	cmp/eq r1, r2
-	bt wrong
-	
-large:
-	mov #1, r1
-	rotr r1
-	mov #1, r2
-	rotr r2
-	cmp/eq r1, r2
-	bf wrong
-	
-okay:
-	pass
-
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/compact/cmpeqi.cgs b/sim/testsuite/sim/sh64/compact/cmpeqi.cgs
deleted file mode 100644
index 79900a0cecc..00000000000
--- a/sim/testsuite/sim/sh64/compact/cmpeqi.cgs
+++ /dev/null
@@ -1,39 +0,0 @@
-# sh testcase for cmp/eq #$imm8, r0 -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-
-zeroes:
-	mov #0, r0
-	cmp/eq #0, r0
-	bf wrong
-	
-zero1:
-	mov #0, r0
-	cmp/eq #1, r0
-	bt wrong
-	
-zero2:
-	mov #1, r0
-	cmp/eq #0, r0
-	bt wrong
-	
-equal:
-	mov #192, r0
-	cmp/eq #192, r0
-	bf wrong
-	
-sign:
-	mov #255, r0
-	cmp/eq #255, r0
-	bf wrong
-	
-okay:
-	pass
-
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/compact/cmpge.cgs b/sim/testsuite/sim/sh64/compact/cmpge.cgs
deleted file mode 100644
index 9d4327e35cc..00000000000
--- a/sim/testsuite/sim/sh64/compact/cmpge.cgs
+++ /dev/null
@@ -1,69 +0,0 @@
-# sh testcase for cmp/ge $rm, $rn -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-
-zero:
-	mov #0, r0
-	mov #0, r1
-	cmp/ge r0, r1
-	bf wrong
-
-onezero:
-	mov #1, r0
-	mov #0, r1
-	cmp/ge r0, r1
-	bt wrong
-
-zeroone:
-	mov #0, r0
-	mov #1, r1
-	cmp/ge r0, r1
-	bf wrong
-
-equal:
-	mov #192, r0
-	mov #192, r1
-	cmp/ge r0, r1
-	bf wrong
-
-eqlarge:
-	mov #1, r0
-	rotr r0
-	add #85, r0
-	mov #1, r1
-	rotr r1
-	add #85, r1
-	cmp/ge r0, r1
-	bf wrong
-
-large2:
-	mov #1, r0
-	rotr r0
-	add #85, r0
-	mov #1, r1
-	rotr r1
-	add #84, r1
-	cmp/ge r0, r1
-	bt wrong
-
-large3:
-	mov #1, r0
-	rotr r0
-	add #84, r0
-	mov #1, r1
-	rotr r1
-	add #85, r1
-	cmp/ge r0, r1
-	bf wrong
-
-okay:
-	pass
-
-wrong:
-	fail
-	
diff --git a/sim/testsuite/sim/sh64/compact/cmpgt.cgs b/sim/testsuite/sim/sh64/compact/cmpgt.cgs
deleted file mode 100644
index 460ca65ae68..00000000000
--- a/sim/testsuite/sim/sh64/compact/cmpgt.cgs
+++ /dev/null
@@ -1,69 +0,0 @@
-# sh testcase for cmp/gt $rm, $rn -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-
-zero:
-	mov #0, r0
-	mov #0, r1
-	cmp/gt r0, r1
-	bt wrong
-
-onezero:
-	mov #1, r0
-	mov #0, r1
-	cmp/gt r0, r1
-	bt wrong
-
-zeroone:
-	mov #0, r0
-	mov #1, r1
-	cmp/gt r0, r1
-	bf wrong
-	
-equal:
-	mov #192, r0
-	mov #192, r1
-	cmp/gt r0, r1
-	bt wrong
-
-eqlarge:
-	mov #1, r0
-	rotr r0
-	add #85, r0
-	mov #1, r1
-	rotr r1
-	add #85, r1
-	cmp/gt r0, r1
-	bt wrong
-	
-large2:
-	mov #1, r0
-	rotr r0
-	add #85, r0
-	mov #1, r1
-	rotr r1
-	add #84, r1
-	cmp/gt r0, r1
-	bt wrong
-
-large3:
-	mov #1, r0
-	rotr r0
-	add #84, r0
-	mov #1, r1
-	rotr r1
-	add #85, r1
-	cmp/gt r0, r1
-	bf wrong
-
-okay:
-	pass
-
-wrong:
-	fail
-	
diff --git a/sim/testsuite/sim/sh64/compact/cmphi.cgs b/sim/testsuite/sim/sh64/compact/cmphi.cgs
deleted file mode 100644
index efbcaa328cd..00000000000
--- a/sim/testsuite/sim/sh64/compact/cmphi.cgs
+++ /dev/null
@@ -1,68 +0,0 @@
-# sh testcase for cmp/hi $rm, $rn -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-
-zero:
-	mov #0, r0
-	mov #0, r0
-	cmp/hi r0, r1
-	bt wrong
-
-equal:
-	mov #1, r0
-	rotr r0
-	add #3, r0
-
-	mov #1, r1
-	rotr r1
-	add #3, r1
-
-	cmp/hi r0, r1
-	bt wrong
-
-gt:
-	mov #10, r0
-	mov #12, r1
-	cmp/hi r0, r1
-	bf wrong
-
-lt:
-	mov #12, r0
-	mov #10, r1
-	cmp/hi r0, r1
-	bt wrong
-
-gtneg:
-	mov #1, r0
-	rotr r0
-	add #1, r0
-
-	mov #1, r1
-	rotr r1
-	add #3, r1
-
-	cmp/hi r0, r1
-	bf wrong
-
-ltneg:
-	mov #1, r0
-	rotr r0
-	add #3, r0
-	
-	mov #1, r1
-	rotr r1
-	add #1, r1
-
-	cmp/hi r0, r1
-	bt wrong
-
-okay:
-	pass
-
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/compact/cmphs.cgs b/sim/testsuite/sim/sh64/compact/cmphs.cgs
deleted file mode 100644
index 957f80c0245..00000000000
--- a/sim/testsuite/sim/sh64/compact/cmphs.cgs
+++ /dev/null
@@ -1,59 +0,0 @@
-# sh testcase for cmp/hs $rm, $rn -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-
-zero:
-	mov #0, r0
-	mov #0, r0
-	cmp/hs r0, r1
-
-equal:
-	mov #1, r0
-	rotr r0
-	add #3, r0
-
-	mov #1, r1
-	rotr r1
-	add #3, r1
-
-	cmp/hs r0, r1
-
-gt:
-	mov #10, r0
-	mov #12, r1
-	cmp/hs r0, r1
-
-lt:
-	mov #12, r0
-	mov #10, r1
-	cmp/hs r0, r1
-
-gtneg:
-	mov #1, r0
-	rotr r0
-	add #1, r0
-
-	mov #1, r1
-	rotr r1
-	add #3, r1
-
-	cmp/hs r0, r1
-
-ltneg:
-	mov #1, r0
-	rotr r0
-	add #3, r0
-	
-	mov #1, r1
-	rotr r1
-	add #1, r1
-
-	cmp/hs r0, r1
-
-okay:
-	pass
diff --git a/sim/testsuite/sim/sh64/compact/cmppl.cgs b/sim/testsuite/sim/sh64/compact/cmppl.cgs
deleted file mode 100644
index 1c11377f34b..00000000000
--- a/sim/testsuite/sim/sh64/compact/cmppl.cgs
+++ /dev/null
@@ -1,37 +0,0 @@
-# sh testcase for cmp/pl $rn -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-
-zero:
-	mov #0, r0
-	cmp/pl r0
-	bt wrong
-
-plus:
-	mov #10, r0
-	cmp/pl r0
-	bf wrong
-
-minus:
-	mov #10, r0
-	neg r0, r0
-	cmp/pl r0
-	bt wrong
-
-large:
-	mov #10, r0
-	shll8 r0
-	add #123, r0
-	cmp/pl r0
-	bf wrong
-
-okay:
-	pass
-
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/compact/cmppz.cgs b/sim/testsuite/sim/sh64/compact/cmppz.cgs
deleted file mode 100644
index 2e0bf48e827..00000000000
--- a/sim/testsuite/sim/sh64/compact/cmppz.cgs
+++ /dev/null
@@ -1,37 +0,0 @@
-# sh testcase for cmp/pz $rn -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-
-zero:
-	mov #0, r0
-	cmp/pz r0
-	bf wrong
-
-plus:
-	mov #10, r0
-	cmp/pz r0
-	bf wrong
-
-minus:
-	mov #10, r0
-	neg r0, r0
-	cmp/pz r0
-	bt wrong
-
-large:
-	mov #10, r0
-	shll8 r0
-	add #123, r0
-	cmp/pz r0
-	bf wrong
-
-okay:
-	pass
-
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/compact/cmpstr.cgs b/sim/testsuite/sim/sh64/compact/cmpstr.cgs
deleted file mode 100644
index 70d90d33c20..00000000000
--- a/sim/testsuite/sim/sh64/compact/cmpstr.cgs
+++ /dev/null
@@ -1,148 +0,0 @@
-# sh testcase for cmp/str $rm, $rn -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-.macro rot8
-	rotr r0
-	rotr r0
-	rotr r0
-	rotr r0
-	rotr r0
-	rotr r0
-	rotr r0
-	rotr r0
-.endm
-
-	start
-
-# Use multiple "wrong" labels because this program is quite long. It's
-# likely that some instructions will be too far away from the branch
-# target to use PC-relative branches.
-	
-match0:
-	# No bytes matching.
-	mov #1, r0
-	neg r0, r0
-	xor #170, r0
-	rot8
-	xor #170, r0
-	rot8
-	xor #170, r0
-	rot8
-	xor #170, r0
-	rot8
-	mov r0, r1
-	mov #1, r0
-	neg r0, r0
-	xor #85, r0
-	rot8
-	xor #85, r0
-	rot8
-	xor #85, r0
-	rot8
-	xor #85, r0
-	rot8
-	cmp/str r0, r1
-	bt wrong0
-
-	bra match1
-	nop
-wrong0:
-	fail
-
-match1:
-	# One byte matching.
-	mov #1, r0
-	neg r0, r0
-	xor #170, r0
-	rot8
-	xor #170, r0
-	rot8
-	xor #170, r0
-	rot8
-	mov r0, r1
-	mov #1, r0
-	neg r0, r0
-	xor #85, r0
-	rot8
-	xor #85, r0
-	rot8
-	xor #85, r0
-	rot8
-	cmp/str r0, r1
-	bf wrong1
-
-	bra match2
-	nop
-wrong1:
-	fail
-
-match2:
-	# Two bytes matching.
-	mov #1, r0
-	neg r0, r0
-	xor #170, r0
-	rot8
-	xor #170, r0
-	rot8
-	mov r0, r1
-	mov #1, r0
-	neg r0, r0
-	xor #85, r0
-	rot8
-	xor #85, r0
-	rot8
-	cmp/str r0, r1
-	bf wrong2
-
-	bra match3
-	nop
-wrong2:
-	fail
-	
-byte0:
-match3:
-	# One byte matching.
-	# This is also the test for byte 0.
-	mov #85, r0
-	mov #85, r1
-	cmp/str r0, r1
-	bf wrong3
-
-byte1:
-	# Match in byte position 1.
-	mov #85, r0
-	shll8 r0
-	mov #85, r1
-	shll8 r1
-	cmp/str r0, r1
-	bf wrong3
-
-byte2:
-	# Match in byte position 2.
-	mov #85, r0
-	shll16 r0
-	mov #85, r1
-	shll16 r1
-	cmp/str r0, r1
-	bf wrong3
-
-byte3:
-	# Match in byte position 3.
-	mov #85, r0
-	shll16 r0
-	shll8 r0
-	mov #85, r1
-	shll16 r1
-	shll8 r1
-	cmp/str r0, r1
-	bf wrong3
-
-okay:
-	pass
-wrong3:
-	fail
-	
diff --git a/sim/testsuite/sim/sh64/compact/div0s.cgs b/sim/testsuite/sim/sh64/compact/div0s.cgs
deleted file mode 100644
index 8cd6422bea8..00000000000
--- a/sim/testsuite/sim/sh64/compact/div0s.cgs
+++ /dev/null
@@ -1,52 +0,0 @@
-# sh testcase for div0s $rm, $rn -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-init:
-	mov #0, r0
-	mov #3, r1
-	mov #4, r2
-	neg r1, r3
-	neg r2, r4
-
-perm1:
-	div0s r0, r0
-	bt wrong
-	div0s r0, r1
-	bt wrong
-	div0s r1, r0
-	bt wrong
-
-perm2:
-	div0s r0, r4
-	bf wrong
-	div0s r4, r0
-	bf wrong
-
-perm3:
-	div0s r1, r2
-	bt wrong
-	div0s r2, r1
-	bt wrong
-
-perm4:
-	div0s r3, r4
-	bt wrong
-	div0s r4, r3
-	bt wrong
-
-perm5:
-	div0s r1, r1
-	bt wrong
-	div0s r3, r3
-	bt wrong
-
-okay:	
-	pass
-
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/compact/div0u.cgs b/sim/testsuite/sim/sh64/compact/div0u.cgs
deleted file mode 100644
index 02f8534d4c4..00000000000
--- a/sim/testsuite/sim/sh64/compact/div0u.cgs
+++ /dev/null
@@ -1,21 +0,0 @@
-# sh testcase for div0u -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-
-	.global div0u
-div0u:
-	div0u
-	# Can't easily test Q and M (other than visually inspecting
-	# the simulator's trace output).
-	bt wrong
-
-okay:	
-	pass
-
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/compact/div1.cgs b/sim/testsuite/sim/sh64/compact/div1.cgs
deleted file mode 100644
index 63a0e81cb12..00000000000
--- a/sim/testsuite/sim/sh64/compact/div1.cgs
+++ /dev/null
@@ -1,52 +0,0 @@
-# sh testcase for div1 $rm, $rn -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-	mov #10, r0
-	mov #2, r1
-	div0s r0,r1
-
-	div1 r0, r1
-	div1 r0, r1
-	div1 r0, r1
-	div1 r0, r1
-	div1 r0, r1
-	div1 r0, r1
-	div1 r0, r1
-	div1 r0, r1
-	div1 r0, r1
-	div1 r0, r1
-	div1 r0, r1
-	div1 r0, r1
-	div1 r0, r1
-	div1 r0, r1
-	div1 r0, r1
-	div1 r0, r1
-	div1 r0, r1
-	div1 r0, r1
-	div1 r0, r1
-	div1 r0, r1
-	div1 r0, r1
-	div1 r0, r1
-	div1 r0, r1
-	div1 r0, r1
-	div1 r0, r1
-	div1 r0, r1
-	div1 r0, r1
-	div1 r0, r1
-	div1 r0, r1
-	div1 r0, r1
-	div1 r0, r1
-	div1 r0, r1
-	div1 r0, r1
-	div1 r0, r1
-	div1 r0, r1
-	div1 r0, r1
-	div1 r0, r1
-	div1 r0, r1
-
-	pass
diff --git a/sim/testsuite/sim/sh64/compact/dmulsl.cgs b/sim/testsuite/sim/sh64/compact/dmulsl.cgs
deleted file mode 100644
index 081ce169955..00000000000
--- a/sim/testsuite/sim/sh64/compact/dmulsl.cgs
+++ /dev/null
@@ -1,115 +0,0 @@
-# sh testcase for dmuls.l $rm, $rn -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-
-	mov #0, r0
-	mov #0, r1
-	dmuls.l r0, r1
-	# check result
-	sts mach, r3
-	sts macl, r4
-	assert r3, #0
-	assert r4, #0
-
-test2:	
-	mov #0, r0
-	mov #5, r1
-	dmuls.l r0, r1
-	# check result
-	sts mach, r3
-	sts macl, r4
-	assert r3, #0
-	assert r4, #0
-
-test3:	
-	mov #5, r0
-	mov #0, r1
-	dmuls.l r0, r1
-	# check result
-	sts mach, r3
-	sts macl, r4
-	assert r3, #0
-	assert r4, #0
-
-test4:	
-	mov #1, r0
-	mov #5, r1
-	dmuls.l r0, r1
-	# check result
-	sts mach, r3
-	sts macl, r4
-	assert r3, #0
-	assert r4, #5
-
-test5:	
-	mov #5, r0
-	mov #1, r1
-	dmuls.l r0, r1
-	# check result
-	sts mach, r3
-	sts macl, r4
-	assert r3, #0
-	assert r4, #5
-
-	bra test6
-	nop
-
-wrong:
-	fail
-
-test6:	
-	mov #2, r0
-	mov #2, r1
-	dmuls.l r0, r1
-	# check result
-	sts mach, r3
-	sts macl, r4
-	assert r3, #0
-	assert r4, #4
-
-test7:	
-	mov #1, r0
-	neg r0, r0
-	mov #2, r1
-	dmuls.l r0, r1
-	# check result
-	sts mach, r3
-	sts macl, r4
-
-	mov #0, r8
-	not r8, r9
-	not r8, r10
-	shll r10
-	cmp/eq r3, r9
-	bf wrong
-	cmp/eq r4, r10
-	bf wrong
-
-test8:	
-	mov #1, r0
-	neg r0, r0
-	mov #1, r1
-	neg r1, r1
-	dmuls.l r0, r1
-	# check result
-	sts mach, r3
-	sts macl, r4
-	assert r3, #0
-	assert r4, #1
-
-test9:	
-	mov #1, r0
-	neg r0, r0
-	shlr r0
-	mov #1, r1
-	neg r1, r1
-	shlr r1
-	dmuls.l r0, r1
-	
-okay:	
-	pass
diff --git a/sim/testsuite/sim/sh64/compact/dmulul.cgs b/sim/testsuite/sim/sh64/compact/dmulul.cgs
deleted file mode 100644
index b34b870269d..00000000000
--- a/sim/testsuite/sim/sh64/compact/dmulul.cgs
+++ /dev/null
@@ -1,53 +0,0 @@
-# sh testcase for dmulu.l $rm, $rn -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-
-	mov #0, r0
-	mov #0, r1
-	dmulu.l r0, r1
-
-	mov #0, r0
-	mov #5, r1
-	dmulu.l r0, r1
-
-	mov #5, r0
-	mov #0, r1
-	dmulu.l r0, r1
-
-	mov #1, r0
-	mov #5, r1
-	dmulu.l r0, r1
-
-	mov #5, r0
-	mov #1, r1
-	dmulu.l r0, r1
-
-	mov #2, r0
-	mov #2, r1
-	dmulu.l r0, r1
-
-	mov #1, r0
-	neg r0, r0
-	mov #2, r1
-	dmulu.l r0, r1
-
-	mov #1, r0
-	neg r0, r0
-	mov #1, r1
-	neg r1, r1
-	dmulu.l r0, r1
-
-	mov #1, r0
-	neg r0, r0
-	shlr r0
-	mov #1, r1
-	neg r1, r1
-	shlr r1
-	dmulu.l r0, r1
-
-	pass
diff --git a/sim/testsuite/sim/sh64/compact/dt.cgs b/sim/testsuite/sim/sh64/compact/dt.cgs
deleted file mode 100644
index 38e91638bd9..00000000000
--- a/sim/testsuite/sim/sh64/compact/dt.cgs
+++ /dev/null
@@ -1,42 +0,0 @@
-# sh testcase for dt $rn -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-
-	.global dt
-dt:
-	mov #3, r0
-	dt r0
-	bt wrong
-	assert r0, #2
-
-	mov #1, r0
-	dt r0
-	bf wrong
-	assert r0, #0
-
-	mov #0, r0
-	dt r0
-	bt wrong
-	mov #0, r7
-	not r7, r7
-	cmp/eq r7, r0
-	bf wrong
-
-	mov #1, r0
-	neg r0, r0
-	dt r0
-	mov #1, r7
-	not r7, r7
-	cmp/eq r7, r0
-	bf wrong
-
-okay:
-	pass
-
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/compact/extsb.cgs b/sim/testsuite/sim/sh64/compact/extsb.cgs
deleted file mode 100644
index 90878020a28..00000000000
--- a/sim/testsuite/sim/sh64/compact/extsb.cgs
+++ /dev/null
@@ -1,29 +0,0 @@
-# sh testcase for exts.b $rm, $rn -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-
-	.global extsb
-extsb:
-	mov #42, r1
-	exts.b r1, r2
-	assert r2, #42
-signed:
-	mov #0, r0
-	or #255, r0
-	exts.b r0, r1
-	mov #0, r7
-	not r7, r7
-	cmp/eq r1, r7
-	bf wrong
-	
-okay:
-	pass
-
-wrong:
-	fail
-	
diff --git a/sim/testsuite/sim/sh64/compact/extsw.cgs b/sim/testsuite/sim/sh64/compact/extsw.cgs
deleted file mode 100644
index d6257747df7..00000000000
--- a/sim/testsuite/sim/sh64/compact/extsw.cgs
+++ /dev/null
@@ -1,32 +0,0 @@
-# sh testcase for exts.w $rm, $rn -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-
-	.global extsw
-extsw:
-	mov #42, r1
-	exts.w r1, r2
-	assert r2, #42
-	
-another:
-	mov #0, r0
-	or #255, r0
-	shll8 r0
-	exts.w r0, r1
-
-	mov #-1, r7
-	shll8 r7
-	cmp/eq r1, r7
-	bf wrong
-	
-okay:
-	pass
-
-wrong:
-	fail
-	
diff --git a/sim/testsuite/sim/sh64/compact/extub.cgs b/sim/testsuite/sim/sh64/compact/extub.cgs
deleted file mode 100644
index 51c14ac4359..00000000000
--- a/sim/testsuite/sim/sh64/compact/extub.cgs
+++ /dev/null
@@ -1,31 +0,0 @@
-# sh testcase for extu.b $rm, $rn -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-
-	.global extub
-extub:
-	mov #42, r1
-	extu.b r1, r2
-	assert r2, #42
-
-another:
-	mov #0, r0
-	or #255, r0
-	extu.b r0, r1
-
-	mov #0, r0
-	or #255, r0
-	cmp/eq r0, r1
-	bf wrong
-
-okay:
-	pass
-
-wrong:
-	fail
-
diff --git a/sim/testsuite/sim/sh64/compact/extuw.cgs b/sim/testsuite/sim/sh64/compact/extuw.cgs
deleted file mode 100644
index 057afe7d949..00000000000
--- a/sim/testsuite/sim/sh64/compact/extuw.cgs
+++ /dev/null
@@ -1,31 +0,0 @@
-# sh testcase for extu.w $rm, $rn -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-
-	.global extuw
-extuw:
-	mov #42, r1
-	extu.w r1, r2
-	assert r2, #42
-	
-another:
-	mov #0, r0
-	or #255, r0
-	shll8 r0
-	extu.w r0, r1
-	mov #0, r0
-	or #255, r0
-	shll8 r0
-	cmp/eq r0, r1
-	bf wrong
-
-okay:
-	pass
-
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/compact/fabs.cgs b/sim/testsuite/sim/sh64/compact/fabs.cgs
deleted file mode 100644
index 6955fa2aa16..00000000000
--- a/sim/testsuite/sim/sh64/compact/fabs.cgs
+++ /dev/null
@@ -1,88 +0,0 @@
-# sh testcase for fabs -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-	_clrpr
-	# fabs(0.0) = 0.0.
-	fldi0 fr0
-	fabs fr0
-	fldi0 fr1
-	fcmp/eq fr0, fr1
-	bf wrong
-
-	# fabs(1.0) = 1.0.
-	fldi1 fr0
-	fabs fr0
-	fldi1 fr1
-	fcmp/eq fr0, fr1
-	bf wrong
-
-	# fabs(-1.0) = 1.0.
-	fldi1 fr0
-	fneg fr0
-	fabs fr0
-	fldi1 fr1
-	fcmp/eq fr0, fr1
-	bf wrong
-
-	bra double
-	nop
-
-wrong:
-	fail
-
-double:
-	# double precision tests.
-	# fabs(0.0) = 0.0.
-	fldi0 fr0
-	_s2d fr0, dr0
-	_setpr
-	fabs dr0
-	_clrpr
-	# check.
-	fldi0 fr2
-	_s2d fr2, dr2
-	_setpr
-	fcmp/eq dr0, dr2
-	bf wrong
-	_clrpr
-
-one:
-	# fabs(1.0) = 1.0.
-	fldi1 fr0
-	_s2d fr0, dr0
-	_setpr
-	fabs dr0
-	_clrpr
-	# check.
-	fldi1 fr2
-	_s2d fr2, dr2
-	_setpr
-	fcmp/eq dr0, dr2
-	bf wrong2
-	_clrpr
-
-minusone:
-	# fabs(-1.0) = 1.0.
-	fldi1 fr0
-	fneg fr0
-	_s2d fr0, dr0
-	_setpr
-	fabs dr0
-	_clrpr
-	# check.
-	fldi1 fr2
-	_s2d fr2, dr2
-	_setpr
-	fcmp/eq dr0, dr2
-	bf wrong2
-	_clrpr
-
-okay:
-	pass
-wrong2:
-	fail
diff --git a/sim/testsuite/sim/sh64/compact/fadd.cgs b/sim/testsuite/sim/sh64/compact/fadd.cgs
deleted file mode 100644
index b00035308f8..00000000000
--- a/sim/testsuite/sim/sh64/compact/fadd.cgs
+++ /dev/null
@@ -1,31 +0,0 @@
-# sh testcase for fadd
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-	_clrpr
-
-	fldi1 fr0
-	fldi1 fr1
-	fadd fr0, fr1
-
-	fldi0 fr0
-	fldi1 fr1
-	fadd fr0, fr1
-
-	fldi1 fr0
-	fldi0 fr1
-	fadd fr0, fr1
-
-	_setpr
-double:
-	fldi1 fr0
-	fldi1 fr1
-	_s2d fr0, dr4
-	_s2d fr1, dr6
-	fadd dr4, dr6
-
-	pass
diff --git a/sim/testsuite/sim/sh64/compact/fcmpeq.cgs b/sim/testsuite/sim/sh64/compact/fcmpeq.cgs
deleted file mode 100644
index 151d5e5647a..00000000000
--- a/sim/testsuite/sim/sh64/compact/fcmpeq.cgs
+++ /dev/null
@@ -1,88 +0,0 @@
-# sh testcase for fcmpeq -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-
-	# 1.0 == 1.0.	
-	fldi1 fr0
-	fldi1 fr1
-	fcmp/eq fr0, fr1
-	bf wrong
-
-	# 0.0 != 1.0.
-	fldi0 fr0
-	fldi1 fr1
-	fcmp/eq fr0, fr1
-	bt wrong
-
-	# 1.0 != 0.0.
-	fldi1 fr0
-	fldi0 fr1
-	fcmp/eq fr0, fr1
-	bt wrong
-
-	# 2.0 != 1.0
-	fldi1 fr0
-	fadd fr0, fr0
-	fldi1 fr1
-	fcmp/eq fr0, fr1
-	bt wrong
-
-	bra double
-	# delay slot
-	nop
-
-wrong:
-	fail
-	
-double:
-	# 1.0 == 1.0
-	fldi1 fr0
-	fldi1 fr2
-	_s2d fr0, dr0
-	_s2d fr2, dr2
-	_setpr
-	fcmp/eq dr0, dr2
-	bf wrong
-	_clrpr
-
-	# 0.0 != 1.0
-	fldi0 fr0
-	fldi1 fr2
-	_s2d fr0, dr0
-	_s2d fr2, dr2
-	_setpr
-	fcmp/eq dr0, dr2
-	bt wrong
-	_clrpr
-
-	# 1.0 != 0.0
-	fldi1 fr0
-	fldi0 fr2
-	_s2d fr0, dr0
-	_s2d fr2, dr2
-	_setpr
-	fcmp/eq dr0, dr2
-	bt wrong2
-	_clrpr
-
-	# 2.0 != 1.0
-	fldi1 fr0
-	fadd fr0, fr0
-	fldi1 fr2
-	_s2d fr0, dr0
-	_s2d fr2, dr2
-	_setpr
-	fcmp/eq dr0, dr2
-	bt wrong2
-	_clrpr
-
-okay:
-	pass
-
-wrong2:
-	fail
diff --git a/sim/testsuite/sim/sh64/compact/fcmpgt.cgs b/sim/testsuite/sim/sh64/compact/fcmpgt.cgs
deleted file mode 100644
index 931ae3e2e6c..00000000000
--- a/sim/testsuite/sim/sh64/compact/fcmpgt.cgs
+++ /dev/null
@@ -1,95 +0,0 @@
-# sh testcase for fcmpgt -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-
-	# 1.0 !> 1.0.
-	fldi1 fr0
-	fldi1 fr1
-	fcmp/gt fr0, fr1
-	bt wrong
-
-	# 0.0 !> 1.0.
-	fldi0 fr0
-	fldi1 fr1
-	fcmp/gt fr0, fr1
-	bf wrong
-
-	# 1.0 > 0.0.
-	fldi1 fr0
-	fldi0 fr1
-	fcmp/gt fr0, fr1
-	bt wrong
-
-	# 2.0 > 1.0
-	fldi1 fr0
-	fadd fr0, fr0
-	fldi1 fr1
-	fcmp/gt fr0, fr1
-	bt wrong
-
-	bra double
-	nop
-
-wrong:
-	fail
-
-double:
-	# double precision tests.
-	# 1.0 !> 1.0.
-	fldi1 fr0
-	fldi1 fr2
-	_s2d fr0, dr0
-	_s2d fr2, dr2
-	_setpr
-	fcmp/gt dr0, dr2
-	bt wrong2
-	_clrpr
-
-	# 0.0 !> 1.0.
-	fldi0 fr0
-	fldi1 fr2
-	_s2d fr0, dr0
-	_s2d fr2, dr2
-	_setpr
-	fcmp/gt dr0, dr2
-	bf wrong2
-	_clrpr
-
-	bra next
-	nop
-
-wrong2:
-	fail
-
-next:
-	# 1.0 > 0.0.
-	fldi1 fr0
-	fldi0 fr2
-	_s2d fr0, dr0
-	_s2d fr2, dr2
-	_setpr
-	fcmp/gt dr0, dr2
-	bt wrong2
-	_clrpr
-
-	# 2.0 > 1.0.
-	fldi1 fr0
-	fadd fr0, fr0
-	fldi1 fr2
-	_s2d fr0, dr0
-	_s2d fr2, dr2
-	_setpr
-	fcmp/gt dr0, dr2
-	bt wrong2
-	_clrpr
-
-okay:
-	pass
-
-wrong3:
-	fail
diff --git a/sim/testsuite/sim/sh64/compact/fcnvds.cgs b/sim/testsuite/sim/sh64/compact/fcnvds.cgs
deleted file mode 100644
index abf9e704ffb..00000000000
--- a/sim/testsuite/sim/sh64/compact/fcnvds.cgs
+++ /dev/null
@@ -1,13 +0,0 @@
-# sh testcase for fcnvds -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-	_setpr
-	fcnvds dr0, fpul
-	_clrpr
-okay:
-	pass
diff --git a/sim/testsuite/sim/sh64/compact/fcnvsd.cgs b/sim/testsuite/sim/sh64/compact/fcnvsd.cgs
deleted file mode 100644
index 699bde55c6e..00000000000
--- a/sim/testsuite/sim/sh64/compact/fcnvsd.cgs
+++ /dev/null
@@ -1,27 +0,0 @@
-# sh testcase for fcnvsd -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-	fldi1 fr0
-	flds fr0, fpul
-	_setpr
-	fcnvsd fpul, dr2
-	_clrpr
-
-	# Convert back.
-	_setpr
-	fcnvds dr2, fpul
-	_clrpr
-	fsts fpul, fr1
-	fcmp/eq fr0, fr1
-	bf wrong
-
-okay:
-	pass
-
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/compact/fdiv.cgs b/sim/testsuite/sim/sh64/compact/fdiv.cgs
deleted file mode 100644
index 06d1e93a014..00000000000
--- a/sim/testsuite/sim/sh64/compact/fdiv.cgs
+++ /dev/null
@@ -1,83 +0,0 @@
-# sh testcase for fdiv -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-	_clrpr
-	
-	# 1.0 / 0.0 should be INF
-	# (and not crash the sim).
-	fldi0 fr0
-	fldi1 fr1
-	fdiv fr0, fr1
-
-	# 0.0 / 1.0 == 0.0.
-	fldi0 fr0
-	fldi1 fr1
-	fdiv fr1, fr0
-	fldi0 fr2
-	fcmp/eq fr0, fr2
-	bf wrong
-
-	# 2.0 / 1.0 == 2.0.
-	fldi1 fr1
-	fldi1 fr2
-	fadd fr2, fr2
-	fdiv fr1, fr2
-	# Load 2.0 into fr3.
-	fldi1 fr3
-	fadd fr3, fr3
-	fcmp/eq fr2, fr3
-	bf wrong
-
-	# (1.0 / 2.0) + (1.0 / 2.0) == 1.0.
-	fldi1 fr1
-	fldi1 fr2
-	fadd fr2, fr2
-	fdiv fr2, fr1
-	# fr1 should contain 0.5.
-	fadd fr1, fr1
-	# Load 1.0 into fr3.
-	fldi1 fr3
-	# Compare fr1 with fr3.
-	fcmp/eq fr1, fr3
-	bf wrong
-
-	bra double
-	nop
-
-wrong:
-	fail
-	
-double:	
-	# double test
-	# (1.0 / 2.0) + (1.0 / 2.0) == 1.0.
-	fldi1 fr1
-	_s2d fr1, dr6
-	fldi1 fr2
-	fadd fr2, fr2
-	_s2d fr2, dr8
-	_setpr
-	fdiv dr8, dr6
-	# dr0 should contain 0.5.
-	# double it, expect 1.0.
-	fadd dr6, dr6
-	_clrpr
-foo:	
-	# Load 1.0 into dr4.
-	fldi1 fr1
-	_s2d fr1, dr10
-	# Compare dr0 with dr10.
-	_setpr
-	fcmp/eq dr6, dr10
-	bf wrong2
-	_clrpr
-	
-okay:
-	pass
-
-wrong2:
-	fail
diff --git a/sim/testsuite/sim/sh64/compact/fipr.cgs b/sim/testsuite/sim/sh64/compact/fipr.cgs
deleted file mode 100644
index 092f0f6c066..00000000000
--- a/sim/testsuite/sim/sh64/compact/fipr.cgs
+++ /dev/null
@@ -1,44 +0,0 @@
-# sh testcase for fipr $fvm, $fvn
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-initv1:
-	fldi1 fr0
-	# Load 2 into fr2.
-	fldi1 fr1
-	fadd fr1, fr1
-	# Load 4 into fr2.
-	fldi1 fr2
-	fadd fr2, fr2
-	fadd fr2, fr2
-	fldi0 fr3
-
-initv2:
-	fldi1 fr8
-	fldi0 fr9
-	fldi1 fr10
-	fldi0 fr11
-
-	fipr fv0, fv8
-
-	# Result will be in fr11.
-	fldi1 fr0
-	fldi1 fr1
-	# Two.
-	fadd fr1, fr0
-	# Four.
-	fadd fr0, fr0
-	# Five.
-	fadd fr1, fr0
-	fcmp/eq fr0, fr11
-	bf wrong
-
-okay:
-	pass
-
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/compact/fldi0.cgs b/sim/testsuite/sim/sh64/compact/fldi0.cgs
deleted file mode 100644
index b0d35e4fb09..00000000000
--- a/sim/testsuite/sim/sh64/compact/fldi0.cgs
+++ /dev/null
@@ -1,17 +0,0 @@
-# sh testcase for fldi0 $frn -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-	fldi0 fr0
-	fldi0 fr2
-	fldi0 fr4
-	fldi0 fr6
-	fldi0 fr8
-	fldi0 fr10
-	fldi0 fr12
-	fldi0 fr14
-	pass
diff --git a/sim/testsuite/sim/sh64/compact/fldi1.cgs b/sim/testsuite/sim/sh64/compact/fldi1.cgs
deleted file mode 100644
index 8bd5c521be2..00000000000
--- a/sim/testsuite/sim/sh64/compact/fldi1.cgs
+++ /dev/null
@@ -1,17 +0,0 @@
-# sh testcase for fldi1 $frn -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-	fldi1 fr1
-	fldi1 fr3
-	fldi1 fr5
-	fldi1 fr7
-	fldi1 fr9
-	fldi1 fr11
-	fldi1 fr13
-	fldi1 fr15
-	pass
diff --git a/sim/testsuite/sim/sh64/compact/flds.cgs b/sim/testsuite/sim/sh64/compact/flds.cgs
deleted file mode 100644
index 797e7cba9ab..00000000000
--- a/sim/testsuite/sim/sh64/compact/flds.cgs
+++ /dev/null
@@ -1,26 +0,0 @@
-# sh testcase for flds -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-
-	fldi0 fr0
-	flds fr0, fpul
-	fsts fpul, fr1
-	fcmp/eq fr0, fr1
-	bf wrong
-	
-	fldi1 fr0
-	flds fr0, fpul
-	fsts fpul, fr1
-	fcmp/eq fr0, fr1
-	bf wrong
-
-okay:
-	pass
-
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/compact/float.cgs b/sim/testsuite/sim/sh64/compact/float.cgs
deleted file mode 100644
index 8532d7fd651..00000000000
--- a/sim/testsuite/sim/sh64/compact/float.cgs
+++ /dev/null
@@ -1,80 +0,0 @@
-# sh testcase for float -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-
-pos:	
-	mov #3, r0
-	lds r0, fpul
-	float fpul, fr7
-
-	# Check the result.
-	fldi1 fr0
-	fldi1 fr1
-	fadd fr0, fr1
-	fadd fr0, fr1
-	fcmp/eq fr1, fr7
-	bf wrong
-
-neg:	
-	mov #3, r0
-	neg r0, r0
-	lds r0, fpul
-	float fpul, fr7
-
-	# Check the result.
-	fldi1 fr0
-	fldi1 fr1
-	fadd fr0, fr1
-	fadd fr0, fr1
-	fneg fr1
-	fcmp/eq fr1, fr7
-	bf wrong
-
-	bra double
-	nop
-
-wrong:
-	fail
-	
-double:
-	mov #3, r0
-	lds r0, fpul
-	_setpr
-	float fpul, dr8
-	_clrpr
-	# check the result.
-	fldi1 fr0
-	fldi1 fr1
-	fadd fr0, fr1
-	fadd fr0, fr1
-	_s2d fr1, dr2
-	fcmp/eq dr2, dr8
-	bf wrong
-
-dneg:
-	mov #3, r0
-	neg r0, r0
-	lds r0, fpul
-	_setpr
-	float fpul, dr8
-	_clrpr
-	# check the result.
-	fldi1 fr0
-	fldi1 fr1
-	fadd fr0, fr1
-	fadd fr0, fr1
-	fneg fr1
-	_s2d fr1, dr2
-	fcmp/eq dr2, dr8
-	bf wrong	
-
-okay:
-	pass
-
-wrong2:
-	fail
diff --git a/sim/testsuite/sim/sh64/compact/fmac.cgs b/sim/testsuite/sim/sh64/compact/fmac.cgs
deleted file mode 100644
index dbf36ab78c8..00000000000
--- a/sim/testsuite/sim/sh64/compact/fmac.cgs
+++ /dev/null
@@ -1,78 +0,0 @@
-# sh testcase for fmac -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-
-	# 0.0 * x + y = y.
-
-	fldi0 fr0
-	fldi1 fr1
-	fldi1 fr2
-	fmac fr0, fr1, fr2
-	# check result.
-	fldi1 fr0
-	fcmp/eq fr0, fr2
-	bf wrong
-
-	# x * y + 0.0 = x * y.
-
-	fldi1 fr0
-	fldi1 fr1
-	fldi0 fr2
-	# double it.
-	fadd fr1, fr2
-	fmac fr0, fr1, fr2
-	# check result.
-	fldi1 fr0
-	fadd fr0, fr0
-	fcmp/eq fr0, fr2
-	bf wrong
-	
-	# x * 0.0 + y = y.
-
-	fldi1 fr0
-	fldi0 fr1
-	fldi1 fr2
-	fadd fr2, fr2
-	fmac fr0, fr1, fr2
-	# check result.
-	fldi1 fr0
-	# double fr0.
-	fadd fr0, fr0
-	fcmp/eq fr0, fr2
-	bf wrong
-
-	# x * 0.0 + 0.0 = 0.0
-
-	fldi1 fr0
-	fadd fr0, fr0
-	fldi0 fr1
-	fldi0 fr2
-	fmac fr0, fr1, fr2
-	# check result.
-	fldi0 fr0
-	fcmp/eq fr0, fr2
-	bf wrong
-
-	# 0.0 * x + 0.0 = 0.0.
-
-	fldi0 fr0
-	fldi1 fr1
-	# double it.
-	fadd fr1, fr1
-	fldi0 fr2
-	fmac fr0, fr1, fr2
-	# check result.
-	fldi0 fr0
-	fcmp/eq fr0, fr2
-	bf wrong
-
-okay:
-	pass
-
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/compact/fmov.cgs b/sim/testsuite/sim/sh64/compact/fmov.cgs
deleted file mode 100644
index f4e1fde3c11..00000000000
--- a/sim/testsuite/sim/sh64/compact/fmov.cgs
+++ /dev/null
@@ -1,273 +0,0 @@
-# sh testcase for all fmov instructions
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	.macro init
-	fldi0 fr0
-	fldi1 fr2
-	.endm
-
-	# Set the SZ (SiZe) bit in the fpscr.
-	.macro _setsz
-	sts fpscr, r7
-	mov #16, r8
-	shll16 r8
-	or r8, r7
-	lds r7, fpscr
-	.endm
-
-	# Clear the SZ bit.
-	.macro _clrsz
-	sts fpscr, r7
-	mov #16, r8
-	shll16 r8
-	not r8, r8
-	and r8, r7
-	lds r7, fpscr
-	.endm
-	start
-
-fmov1:  # Test fr -> fr.
-	init
-	_clrpr
-	_clrsz
-	fmov fr0, fr10
-	# Ensure fr0 and fr10 are now equal.
-	fcmp/eq fr0, fr10
-	bt fmov2
-	fail
-
-fmov2:  # Test dr -> dr.
-	init
-	_setpr
-	_setsz
-	fmov dr0, dr2
-	# Ensure dr0 and dr2 are now equal.
-	fcmp/eq dr0, dr2
-	bt fmov3
-	fail
-
-fmov3:  # Test dr -> xd and xd -> dr.
-	init
-	_setsz
-	fmov dr0, xd0
-	# Ensure dr0 and xd0 are now equal.
-	fmov xd0, dr2
-	fcmp/eq dr0, dr2
-	bt fmov4
-	fail
-
-fmov4:  # Test xd -> xd.
-	init
-	_setsz
-	_setpr
-	fmov dr0, xd0
-	fmov xd0, xd2
-	fmov xd2, dr2
-	# Ensure dr0 and dr2 are now equal.
-	fcmp/eq dr0, dr2
-	bt fmov5
-	fail
-
-fmov5:  # Test fr -> @rn and @rn -> fr.
-	init
-	_clrsz
-	_clrpr
-	mov #40, r0
-	shll8 r0
-	fmov fr0, @r0
-	fmov @r0, fr1
-	fcmp/eq fr0, fr1
-	bt fmov6
-	fail
-
-fmov6:  # Test dr -> @rn and @rn -> dr.
-	init
-	_setsz
-	_setpr
-	mov #40, r0
-	shll8 r0
-	fmov dr0, @r0
-	fmov @r0, dr2
-	fcmp/eq dr0, dr2
-	bt fmov7
-	fail
-
-fmov7:	# Test xd -> @rn and @rn -> xd.
-	init
-	_setsz
-	_setpr
-	mov #40, r0
-	shll8 r0
-	fmov dr0, xd0
-	fmov xd0, @r0
-	fmov @r0, xd2
-	fmov xd2, dr2
-	fcmp/eq dr0, dr2
-	bt fmov8
-	fail
-
-fmov8:	# Test fr -> @-rn.
-	init
-	_clrsz
-	_clrpr
-	mov #40, r0
-	shll8 r0
-	# Preserve.
-	mov r0, r1
-	fmov fr0, @-r0
-	fmov @r0, fr2
-	fcmp/eq fr0, fr2
-	bt f8b
-	fail
-f8b:	# check pre-dec.
-	add #4, r0
-	cmp/eq r0, r1
-	bt fmov9
-	fail
-
-fmov9:	# Test dr -> @-rn.
-	init
-	_setsz
-	_setpr
-	mov #40, r0
-	shll8 r0
-	# Preserve r0.
-	mov r0, r1
-	fmov dr0, @-r0
-	fmov @r0, dr2
-	fcmp/eq dr0, dr2
-	bt f9b
-	fail
-f9b:	# check pre-dec.
-	add #8, r0
-	cmp/eq r0, r1
-	bt fmov10
-	fail
-
-fmov10:	# Test xd -> @-rn.
-	init
-	_setsz
-	_setpr
-	mov #40, r0
-	shll8 r0
-	# Preserve r0.
-	mov r0, r1
-	fmov dr0, xd0
-	fmov xd0, @-r0
-	fmov @r0, xd2
-	fmov xd2, dr2
-	fcmp/eq dr0, dr2
-	bt f10b
-	fail
-f10b:   # check pre-dec.
-	add #8, r0
-	cmp/eq r0, r1
-	bt fmov11
-	fail
-
-fmov11:	# Test @rn+ -> fr.
-	init
-	_clrsz
-	_clrpr
-	mov #40, r0
-	shll8 r0
-	# Preserve r0.
-	mov r0, r1
-	fmov fr0, @r0
-	fmov @r0+, fr2
-	fcmp/eq fr0, fr2
-	bt f11b
-	fail
-f11b:   # check post-inc.
-	add #4, r1
-	cmp/eq r0, r1
-	bt fmov12
-	fail
-
-fmov12:	# Test @rn+ -> dr.
-	init
-	_setsz
-	_setpr
-	mov #40, r0
-	shll8 r0
-	# preserve r0.
-	mov r0, r1
-	fmov dr0, @r0
-	fmov @r0+, dr2
-	fcmp/eq dr0, dr2
-	bt f12b
-	fail
-f12b:   # check post-inc.
-	add #8, r1
-	cmp/eq r0, r1
-	bt fmov13
-	fail
-
-fmov13:	# Test @rn -> xd.
-	init
-	_setsz
-	_setpr
-	mov #40, r0
-	shll8 r0
-	# Preserve r0.
-	mov r0, r1
-	fmov dr0, xd0
-	fmov xd0, @r0
-	fmov @r0+, xd2
-	fmov xd2, dr2
-	fcmp/eq dr0, dr2
-	bt f13b
-	fail
-f13b:
-	add #8, r1
-	cmp/eq r0, r1
-	bt fmov14
-	fail
-
-fmov14:	# Test fr -> @(r0,rn), @(r0, rn) -> fr.
-	init
-	_clrsz
-	_clrpr
-	mov #40, r0
-	shll8 r0
-	mov #0, r1
-	fmov fr0, @(r0, r1)
-	fmov @(r0, r1), fr1
-	fcmp/eq fr0, fr1
-	bt fmov15
-	fail
-
-fmov15:	# Test dr -> @(r0, rn), @(r0, rn) -> dr.
-	init
-	_setsz
-	_setpr
-	mov #40, r0
-	shll8 r0
-	mov #0, r1
-	fmov dr0, @(r0, r1)
-	fmov @(r0, r1), dr2
-	fcmp/eq dr0, dr2
-	bt fmov16
-	fail
-
-fmov16:	# Test xd -> @(r0, rn), @(r0, rn) -> xd.
-	init
-	_setsz
-	_setpr
-	mov #40, r0
-	shll8 r0
-	mov #0, r1
-	fmov dr0, xd0
-	fmov xd0, @(r0, r1)
-	fmov @(r0, r1), xd2
-	fmov xd2, dr2
-	fcmp/eq dr0, dr2
-	bt okay
-	fail
-
-okay:
-	pass
diff --git a/sim/testsuite/sim/sh64/compact/fmul.cgs b/sim/testsuite/sim/sh64/compact/fmul.cgs
deleted file mode 100644
index a1325d6395b..00000000000
--- a/sim/testsuite/sim/sh64/compact/fmul.cgs
+++ /dev/null
@@ -1,121 +0,0 @@
-# sh testcase for fmul -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	.macro init
-	fldi0 fr0
-	fldi1 fr1
-	fldi1 fr2
-	fadd fr2, fr2
-	fldi0 fr7
-	fldi1 fr8
-	.endm
-
-	start
-
-	# 0.0 * 0.0 = 0.0.
-	init
-	fmul fr0, fr0
-	fcmp/eq fr7, fr0
-	bf wrong
-
-	# 0.0 * 1.0 = 0.0.
-	init
-	fmul fr1, fr0
-	fcmp/eq fr7, fr0
-	bf wrong
-
-	# 1.0 * 0.0 = 0.0.
-	init
-	fmul fr0, fr1
-	fcmp/eq fr7, fr1
-	bf wrong
-
-	# 1.0 * 1.0 = 1.0.
-	init
-	fmul fr1, fr1
-	fcmp/eq fr8, fr1
-	bf wrong
-
-	# 2.0 * 1.0 = 2.0.
-	init
-	fmul fr2, fr1
-	fcmp/eq fr2, fr1
-	bf wrong
-
-	bra double
-	nop
-
-wrong:
-	fail
-	
-	.macro dinit
-	fldi0 fr0
-	fldi1 fr2
-	fldi1 fr4
-	fadd fr4, fr4
-	fldi0 fr8
-	fldi1 fr10
-	_s2d fr0, dr0
-	_s2d fr2, dr2
-	_s2d fr4, dr4
-	_s2d fr8, dr8
-	_s2d fr10, dr10
-	.endm
-	
-double:
-	# 0.0 * 0.0 = 0.0.
-	dinit
-	_setpr
-	fmul dr0, dr0
-	fcmp/eq dr8, dr0
-	bf wrong
-	_clrpr
-
-	# 0.0 * 1.0 = 0.0.
-	dinit
-	_setpr
-	fmul dr2, dr0
-	fcmp/eq dr8, dr0
-	bf wrong2
-	_clrpr
-
-	# 1.0 * 0.0 = 0.0.
-	dinit
-	_setpr
-	fmul dr0, dr2
-	fcmp/eq dr8, dr2
-	bf wrong2
-	_clrpr
-
-	bra next
-	nop
-
-wrong2:
-	fail
-
-next:
-	# 1.0 * 1.0 = 1.0.
-	dinit
-	_setpr
-	fmul dr2, dr2
-	fcmp/eq dr10, dr2
-	bf wrong3
-	_clrpr
-
-	# 2.0 * 1.0 = 2.0.
-	dinit
-	_setpr
-	fmul dr4, dr2
-	fcmp/eq dr4, dr2
-	bf wrong3
-	_clrpr
-
-okay:
-	pass
-
-wrong3:	
-	fail
diff --git a/sim/testsuite/sim/sh64/compact/fneg.cgs b/sim/testsuite/sim/sh64/compact/fneg.cgs
deleted file mode 100644
index 71fc901fb6d..00000000000
--- a/sim/testsuite/sim/sh64/compact/fneg.cgs
+++ /dev/null
@@ -1,83 +0,0 @@
-# sh testcase for fneg -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-
-	# neg(0.0) = 0.0.
-	fldi0 fr0
-	fldi0 fr1
-	fneg fr0
-	fcmp/eq fr0, fr1
-	bf wrong
-
-	# neg(1.0) = fsub(0,1)
-	fldi1 fr0
-	fneg fr0
-	fldi0 fr1
-	fldi1 fr2
-	fsub fr2, fr1
-	fcmp/eq fr0, fr1
-	bf wrong
-	
-	# neg(neg(1.0)) = 1.0.
-	fldi1 fr0
-	fldi1 fr1
-	fneg fr0
-	fneg fr0
-	fcmp/eq fr0, fr1
-	bf wrong
-
-	bra double
-	nop
-
-wrong:
-	fail
-
-double:
-	# neg(0.0) = 0.0.
-	fldi0 fr0
-	fldi0 fr2
-	_s2d fr0, dr0
-	_s2d fr2, dr2
-	_setpr
-	fneg dr0
-	fcmp/eq dr0, dr2
-	bf wrong2
-	_clrpr
-
-	# neg(1.0) = fsub(0,1)
-	fldi1 fr0
-	_s2d fr0, dr0
-	_setpr
-	fneg dr0
-	_clrpr
-	fldi0 fr2
-	fldi1 fr3
-	fsub fr3, fr2
-	_s2d fr2, dr2
-	_setpr
-	fcmp/eq fr0, fr2
-	bf wrong2
-	_clrpr
-	
-	# neg(neg(1.0)) = 1.0.
-	fldi1 fr0
-	_s2d fr0, dr0
-	fldi1 fr2
-	_s2d fr2, dr2
-	_setpr
-	fneg dr0
-	fneg dr2
-	fcmp/eq dr0, dr2
-	bf wrong2
-	_clrpr
-		
-okay:
-	pass
-
-wrong2:	
-	fail
diff --git a/sim/testsuite/sim/sh64/compact/frchg.cgs b/sim/testsuite/sim/sh64/compact/frchg.cgs
deleted file mode 100644
index 6f2e743fc37..00000000000
--- a/sim/testsuite/sim/sh64/compact/frchg.cgs
+++ /dev/null
@@ -1,13 +0,0 @@
-# sh testcase for frchg
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-	frchg
-	frchg
-	frchg
-	frchg
-	pass
diff --git a/sim/testsuite/sim/sh64/compact/fschg.cgs b/sim/testsuite/sim/sh64/compact/fschg.cgs
deleted file mode 100644
index 54a1491962b..00000000000
--- a/sim/testsuite/sim/sh64/compact/fschg.cgs
+++ /dev/null
@@ -1,13 +0,0 @@
-# sh testcase for fschg
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-	fschg
-	fschg
-	fschg
-	fschg
-	pass
diff --git a/sim/testsuite/sim/sh64/compact/fsqrt.cgs b/sim/testsuite/sim/sh64/compact/fsqrt.cgs
deleted file mode 100644
index 933e112c903..00000000000
--- a/sim/testsuite/sim/sh64/compact/fsqrt.cgs
+++ /dev/null
@@ -1,93 +0,0 @@
-# sh testcase for fsqrt -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-
-	# sqrt(0.0) = 0.0.
-	fldi0 fr0
-	fsqrt fr0
-	fldi0 fr1
-	fcmp/eq fr0, fr1
-	bf wrong
-
-	# sqrt(1.0) = 1.0.
-	fldi1 fr0
-	fsqrt fr0
-	fldi1 fr1
-	fcmp/eq fr0, fr1
-	bf wrong
-
-	# sqrt(4.0) = 2.0
-	fldi1 fr0
-	# Double it.
-	fadd fr0, fr0
-	# Double it again.
-	fadd fr0, fr0
-	fsqrt fr0
-	fldi1 fr1
-	# Double it.
-	fadd fr1, fr1
-	fcmp/eq fr0, fr1
-	bf wrong
-
-	bra double
-	nop
-
-wrong:
-	fail
-
-double:
-	# sqrt(0.0) = 0.0.
-	fldi0 fr0
-	_s2d fr0, dr0
-	_setpr
-	fsqrt dr0
-	_clrpr
-	fldi0 fr2
-	_s2d fr2, dr2
-	_setpr
-	fcmp/eq dr0, dr2
-	bf wrong2
-	_clrpr
-
-	# sqrt(1.0) = 1.0.
-	fldi1 fr0
-	_s2d fr0, dr0
-	_setpr
-	fsqrt dr0
-	_clrpr
-	fldi1 fr2
-	_s2d fr2, dr2
-	_setpr
-	fcmp/eq fr0, fr2
-	bf wrong2
-	_clrpr
-
-	# sqrt(4.0) = 2.0.
-	fldi1 fr0
-	# Double it.
-	fadd fr0, fr0
-	# Double it again.
-	fadd fr0, fr0
-	_s2d fr0, dr0
-	_setpr
-	fsqrt dr0
-	_clrpr
-	fldi1 fr2
-	# Double it.
-	fadd fr2, fr2
-	_s2d fr2, dr2
-	_setpr
-	fcmp/eq fr0, fr2
-	bf wrong2
-	_clrpr
-
-okay:
-	pass
-
-wrong2:
-	fail
diff --git a/sim/testsuite/sim/sh64/compact/fsts.cgs b/sim/testsuite/sim/sh64/compact/fsts.cgs
deleted file mode 100644
index 518533db094..00000000000
--- a/sim/testsuite/sim/sh64/compact/fsts.cgs
+++ /dev/null
@@ -1,11 +0,0 @@
-# sh testcase for fsts fpul, $frn -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-	fsts fpul, fr0
-	fsts fpul, fr1
-	pass
diff --git a/sim/testsuite/sim/sh64/compact/fsub.cgs b/sim/testsuite/sim/sh64/compact/fsub.cgs
deleted file mode 100644
index 346d01ffcaa..00000000000
--- a/sim/testsuite/sim/sh64/compact/fsub.cgs
+++ /dev/null
@@ -1,120 +0,0 @@
-# sh testcase for fmul -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-	# 0.0 - 0.0 = 0.0.
-	fldi0 fr0
-	fldi0 fr1
-	fsub fr0, fr1
-	fldi0 fr2
-	fcmp/eq fr1, fr2
-	bf wrong
-
-	# 1.0 - 0.0 = 1.0.
-	fldi0 fr0
-	fldi1 fr1
-	fsub fr0, fr1
-	fldi1 fr2
-	fcmp/eq fr1, fr2
-	bf wrong
-
-	# 1.0 - 1.0 = 0.0.
-	fldi1 fr0
-	fldi1 fr1
-	fsub fr0, fr1
-	fldi0 fr2
-	fcmp/eq fr1, fr2
-	bf wrong
-
-	# 0.0 - 1.0 = -1.0.
-	fldi1 fr0
-	fldi0 fr1
-	fsub fr0, fr1
-	fldi1 fr2
-	fneg fr2
-	fcmp/eq fr1, fr2
-	bf wrong
-
-	bra double	
-	nop
-
-wrong:
-	fail
-
-double:
-	# 0.0 - 0.0 = 0.0.
-	fldi0 fr0
-	fldi0 fr2
-	_s2d fr0, dr0
-	_s2d fr2, dr2
-	_setpr
-	fsub dr0, dr2
-	_clrpr
-	fldi0 fr4
-	_s2d fr4, dr4
-	_setpr
-	fcmp/eq dr2, dr4
-	bf wrong
-	_clrpr
-
-onezero:	
-	# 1.0 - 0.0 = 1.0.
-	fldi0 fr0
-	fldi1 fr2
-	_s2d fr0, dr0
-	_s2d fr2, dr2
-	_setpr
-	fsub dr0, dr2
-	_clrpr
-	fldi1 fr4
-	_s2d fr4, dr4
-	_setpr
-	fcmp/eq dr2, dr4
-	bf wrong2
-	_clrpr
-
-oneone:	
-	# 1.0 - 1.0 = 0.0.
-	fldi1 fr0
-	fldi1 fr2
-	_s2d fr0, dr0
-	_s2d fr2, dr2
-	_setpr
-	fsub dr0, dr2
-	_clrpr
-	fldi0 fr4
-	_s2d fr4, dr4
-	_setpr
-	fcmp/eq dr2, dr4
-	bf wrong2
-	_clrpr
-
-	bra zeroone
-	nop
-
-wrong2:
-	fail
-
-zeroone:	
-	# 0.0 - 1.0 = -1.0.
-	fldi1 fr0
-	fldi0 fr2
-	_s2d fr0, dr0
-	_s2d fr2, dr2
-	_setpr
-	fsub dr0, dr2
-	_clrpr
-	fldi1 fr4
-	fneg fr4
-	_s2d fr4, dr4
-	_setpr
-	fcmp/eq dr2, dr4
-	bf wrong2
-	_clrpr
-		
-okay:
-	pass
diff --git a/sim/testsuite/sim/sh64/compact/ftrc.cgs b/sim/testsuite/sim/sh64/compact/ftrc.cgs
deleted file mode 100644
index 6a89744b33e..00000000000
--- a/sim/testsuite/sim/sh64/compact/ftrc.cgs
+++ /dev/null
@@ -1,132 +0,0 @@
-# sh testcase for ftrc -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-
-	# ftrc(0.0) = 0.
-	fldi0 fr0
-	ftrc fr0, fpul
-	# check results.
-	mov #0, r0
-	sts fpul, r1
-	cmp/eq r0, r1
-	bf wrong
-	
-	# ftrc(1.5) = 1.
-	fldi1 fr0
-	fldi1 fr1
-	fldi1 fr2
-	# double it.
-	fadd fr2, fr2
-	# form the fraction.
-	fdiv fr2, fr1
-	fadd fr1, fr0
-	# now we've got 1.5 in fr0.
-	ftrc fr0, fpul
-	# check results.
-	mov #1, r0
-	sts fpul, r1
-	cmp/eq r0, r1
-	bf wrong
-
-	# ftrc(-1.5) = -1.
-	fldi1 fr0
-	fneg fr0
-	fldi1 fr1
-	fldi1 fr2
-	# double it.
-	fadd fr2, fr2
-	# form the fraction.
-	fdiv fr2, fr1
-	fneg fr1
-	# -1 + -0.5 = -1.5.
-	fadd fr1, fr0
-	# now we've got 1.5 in fr0.
-	ftrc fr0, fpul
-	# check results.
-	mov #1, r0
-	neg r0, r0
-	sts fpul, r1
-	cmp/eq r0, r1
-	bf wrong
-
-	bra double
-	nop
-
-wrong:
-	fail
-
-double:
-	# ftrc(0.0) = 0.
-	fldi0 fr0
-	_s2d fr0, dr0
-	_setpr
-	ftrc dr0, fpul
-	_clrpr
-	# check results.
-	mov #0, r0
-	sts fpul, r1
-	cmp/eq r0, r1
-foo:	
-	bf wrong2
-
-	# ftrc(1.5) = 1.
-	fldi1 fr0
-	fldi1 fr2
-	fldi1 fr4
-	# double it.
-	fadd fr4, fr4
-	# form 0.5.
-	fdiv fr4, fr2
-	fadd fr2, fr0
-	# now we've got 1.5 in fr0, so do some single->double
-	# conversions and perform the ftrc.
-	_s2d fr0, dr0
-	_s2d fr2, dr2
-	_s2d fr4, dr4
-	_setpr
-	ftrc dr0, fpul
-	_clrpr
-	
-	# check results.
-	mov #1, r0
-	sts fpul, r1
-	cmp/eq r0, r1
-	bf wrong2
-
-	# ftrc(-1.5) = -1.
-	fldi1 fr0
-	fneg fr0
-	fldi1 fr2
-	fldi1 fr4
-	# double it.
-	fadd fr4, fr4
-	# form the fraction.
-	fdiv fr4, fr2
-	fneg fr2
-	# -1 + -0.5 = -1.5.
-	fadd fr2, fr0
-	# now we've got 1.5 in fr0, so do some single->double
-	# conversions and perform the ftrc.
-	_s2d fr0, dr0
-	_s2d fr2, dr2
-	_s2d fr4, dr4
-	_setpr
-	ftrc dr0, fpul
-	_clrpr
-	
-	# check results.
-	mov #1, r0
-	neg r0, r0
-	sts fpul, r1
-	cmp/eq r0, r1
-	bf wrong2
-
-okay:
-	pass
-wrong2:
-	fail
diff --git a/sim/testsuite/sim/sh64/compact/ftrv.cgs b/sim/testsuite/sim/sh64/compact/ftrv.cgs
deleted file mode 100644
index 9bdf806ba13..00000000000
--- a/sim/testsuite/sim/sh64/compact/ftrv.cgs
+++ /dev/null
@@ -1,74 +0,0 @@
-# sh testcase for ftrv xmtrx, $fvn -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	# set the fr bit in the fpscr
-	.macro _setfr
-	sts fpscr, r7
-	mov #32, r8
-	shll16 r8
-	or r8, r7
-	lds r7, fpscr
-	.endm
-
-	# clear the fr bit
-	.macro _clrfr
-	sts fpscr, r7
-	mov #32, r8
-	shll16 r8
-	not r8, r8
-	and r8, r7
-	lds r7, fpscr
-	.endm
-
-	.macro incr old new
-	fldi1 \new
-	fadd \old, \new
-	.endm
-
-	start
-	_setfr
-popmtrx:
-	# 1.0.
-	fldi1 fr0
-	# 2.0.
-	fldi1 fr1
-	fadd fr1, fr1
-
-	incr fr1, fr2
-	incr fr2, fr3
-	incr fr3, fr4
-	incr fr4, fr5
-	incr fr5, fr6
-	incr fr6, fr7
-	incr fr7, fr8
-	incr fr8, fr9
-	incr fr9, fr10
-	incr fr10, fr11
-	incr fr11, fr12
-	incr fr12, fr13
-	incr fr13, fr14
-	incr fr14, fr15
-
-popvect:
-	# Swtich fp banks.
-	_clrfr
-	fldi1 fr4
-	fldi1 fr5
-	fadd fr5, fr5
-	fldi1 fr6
-	fadd fr5, fr6
-	fldi1 fr7
-	fadd fr6, fr7
-
-ftrv:
-	# fr[4,7] should contain the results:
-	# { 30, 70, 110, 150 }.
-	ftrv xmtrx, fv4
-
-okay:
-	pass
-
diff --git a/sim/testsuite/sim/sh64/compact/jmp.cgs b/sim/testsuite/sim/sh64/compact/jmp.cgs
deleted file mode 100644
index e9e99401545..00000000000
--- a/sim/testsuite/sim/sh64/compact/jmp.cgs
+++ /dev/null
@@ -1,29 +0,0 @@
-# sh testcase for jmp @$rn
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-
-	.global jmp
-jmp:
-	# Load 0x1010 into r0.
-	mov #1, r0
-	shll8 r0
-	shll2 r0
-	shll2 r0
-	add #16, r0
-	jmp @r0
-slot:
-	nop
-bad:
-	fail
-okay:
-	pass
-alsobad:
-	fail
-	fail
-	fail
-
diff --git a/sim/testsuite/sim/sh64/compact/jsr.cgs b/sim/testsuite/sim/sh64/compact/jsr.cgs
deleted file mode 100644
index 5ad7aefc931..00000000000
--- a/sim/testsuite/sim/sh64/compact/jsr.cgs
+++ /dev/null
@@ -1,29 +0,0 @@
-# sh testcase for jsr @$rn -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-
-	.global jsr
-jsr:
-	# Load 0x1010 into r0.
-	mov #1, r0
-	shll8 r0
-	shll2 r0
-	shll2 r0
-	add #16, r0
-	jsr @r0
-slot:	
-	nop
-bad:
-	fail
-okay:
-	pass
-alsobad:
-	fail
-	fail
-	fail
-
diff --git a/sim/testsuite/sim/sh64/compact/ldc-gbr.cgs b/sim/testsuite/sim/sh64/compact/ldc-gbr.cgs
deleted file mode 100644
index b19a3c194fe..00000000000
--- a/sim/testsuite/sim/sh64/compact/ldc-gbr.cgs
+++ /dev/null
@@ -1,22 +0,0 @@
-# sh testcase for ldc $rn, gbr -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-
-	.global ldc
-ldc:
-	mov #40, r0
-	shll8 r0
-	ldc r0, gbr
-	stc gbr, r1
-	cmp/eq r0, r1
-	bf wrong
-
-okay:
-	pass
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/compact/ldcl-gbr.cgs b/sim/testsuite/sim/sh64/compact/ldcl-gbr.cgs
deleted file mode 100644
index 613e58e722c..00000000000
--- a/sim/testsuite/sim/sh64/compact/ldcl-gbr.cgs
+++ /dev/null
@@ -1,28 +0,0 @@
-# sh testcase for ldc.l @${rn}+, gbr -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-
-	.global ldcl
-ldcl:
-	mov #40, r0
-	shll8 r0
-	# Preserve address.
-	mov r0, r1
-	ldc.l @r0+, gbr
-
-	# Add 4 to saved address (r1).
-	# Then compare with r0.
-	add #4, r1
-	cmp/eq r0, r1
-	bf wrong
-
-okay:
-	pass
-
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/compact/lds-fpscr.cgs b/sim/testsuite/sim/sh64/compact/lds-fpscr.cgs
deleted file mode 100644
index 2dce253375d..00000000000
--- a/sim/testsuite/sim/sh64/compact/lds-fpscr.cgs
+++ /dev/null
@@ -1,22 +0,0 @@
-# sh testcase for lds $rn, fpscr -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-
-	.global lds_fpscr
-lds_fpscr:
-	mov #0, r0
-	lds r0, fpscr
-readback:
-	sts fpscr, r1
-	cmp/eq r0, r1
-	bf wrong
-
-okay:
-	pass
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/compact/lds-fpul.cgs b/sim/testsuite/sim/sh64/compact/lds-fpul.cgs
deleted file mode 100644
index 1a80a7032ea..00000000000
--- a/sim/testsuite/sim/sh64/compact/lds-fpul.cgs
+++ /dev/null
@@ -1,17 +0,0 @@
-# sh testcase for lds $rn, fpul -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-
-	.global lds_fpul
-lds_fpul:
-	mov #63, r0
-	shll8 r0
-	add #128, r0
-	shll16 r0
-	lds r0, fpul
-	pass
diff --git a/sim/testsuite/sim/sh64/compact/lds-mach.cgs b/sim/testsuite/sim/sh64/compact/lds-mach.cgs
deleted file mode 100644
index 1ffd6566c9a..00000000000
--- a/sim/testsuite/sim/sh64/compact/lds-mach.cgs
+++ /dev/null
@@ -1,23 +0,0 @@
-# sh testcase for lds $rn, mach
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-
-	.global lds_mach
-lds_mach:
-	mov #41, r0
-	shll8 r0
-	lds r0, mach
-readback:
-	sts mach, r1
-	cmp/eq r0, r1
-	bf wrong
-
-okay:
-	pass
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/compact/lds-macl.cgs b/sim/testsuite/sim/sh64/compact/lds-macl.cgs
deleted file mode 100644
index f09315abbb6..00000000000
--- a/sim/testsuite/sim/sh64/compact/lds-macl.cgs
+++ /dev/null
@@ -1,23 +0,0 @@
-# sh testcase for lds $rn, macl
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-
-	.global lds_macl
-lds_macl:
-	mov #42, r0
-	shll8 r0
-	lds r0, macl
-readback:
-	sts macl, r1
-	cmp/eq r0, r1
-	bf wrong
-
-okay:
-	pass
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/compact/lds-pr.cgs b/sim/testsuite/sim/sh64/compact/lds-pr.cgs
deleted file mode 100644
index 97e3a650767..00000000000
--- a/sim/testsuite/sim/sh64/compact/lds-pr.cgs
+++ /dev/null
@@ -1,23 +0,0 @@
-# sh testcase for lds $rn, pr
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-
-	.global lds_pr
-lds_pr:
-	mov #40, r0
-	shll8 r0
-	lds r0, pr
-readback:
-	sts pr, r1
-	cmp/eq r0, r1
-	bf wrong
-
-okay:
-	pass
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/compact/ldsl-fpscr.cgs b/sim/testsuite/sim/sh64/compact/ldsl-fpscr.cgs
deleted file mode 100644
index 642f15dc527..00000000000
--- a/sim/testsuite/sim/sh64/compact/ldsl-fpscr.cgs
+++ /dev/null
@@ -1,43 +0,0 @@
-# sh testcase for lds.l @${rn}+, fpscr -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-
-	mov #40, r0
-	shll8 r0
-	# save address for later examination.
-	mov r0, r1
-
-	# Build up a distinctive bit pattern.
-	mov #1, r2
-	shll8 r2
-	add #12, r2
-	shll8 r2
-	add #85, r2
-	shll8 r2
-	add #170, r2
-	# Store it in memory.
-	mov.l r2, @r0
-
-	lds.l @r0+, fpscr
-
-check:
-	# Read it back.
-	sts fpscr, r3
-	cmp/eq r2, r3
-	bf wrong
-
-inc:
-	# Test for proper post-increment.
-	add #4, r1
-	cmp/eq r0, r1
-	bf wrong
-
-okay:
-	pass
-wrong:
-	fail	
diff --git a/sim/testsuite/sim/sh64/compact/ldsl-fpul.cgs b/sim/testsuite/sim/sh64/compact/ldsl-fpul.cgs
deleted file mode 100644
index 428a5b71816..00000000000
--- a/sim/testsuite/sim/sh64/compact/ldsl-fpul.cgs
+++ /dev/null
@@ -1,27 +0,0 @@
-# sh testcase for lds.l @${rn}+, fpul -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-
-	.global ldsl_fpul
-ldsl_fpul:
-	mov #40, r0
-	shll8 r0
-	# remember the address.
-	mov r0, r1
-	lds.l @r0+, fpul
-
-	# ensure post increment occurred.
-	add #4, r1
-	cmp/eq r0, r1
-	bf wrong
-
-okay:	
-	pass
-wrong:
-	fail
-	
diff --git a/sim/testsuite/sim/sh64/compact/ldsl-mach.cgs b/sim/testsuite/sim/sh64/compact/ldsl-mach.cgs
deleted file mode 100644
index f5ffdec8dce..00000000000
--- a/sim/testsuite/sim/sh64/compact/ldsl-mach.cgs
+++ /dev/null
@@ -1,26 +0,0 @@
-# sh testcase for lds.l @${rn}+, mach -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-
-	.global ldsl_mach
-ldsl_mach:
-	mov #40, r0
-	shll8 r0
-	# save address for later examination.
-	mov r0, r1
-
-	lds.l @r0+, mach
-
-	add #4, r1
-	cmp/eq r0, r1
-	bf wrong
-
-okay:
-	pass
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/compact/ldsl-macl.cgs b/sim/testsuite/sim/sh64/compact/ldsl-macl.cgs
deleted file mode 100644
index 4e21bf1942f..00000000000
--- a/sim/testsuite/sim/sh64/compact/ldsl-macl.cgs
+++ /dev/null
@@ -1,26 +0,0 @@
-# sh testcase for lds.l @${rn}+, macl -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-
-	.global ldsl_macl
-ldsl_macl:
-	mov #40, r0
-	shll8 r0
-	# save address for later examination.
-	mov r0, r1
-
-	lds.l @r0+, macl
-
-	add #4, r1
-	cmp/eq r0, r1
-	bf wrong
-
-okay:
-	pass
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/compact/ldsl-pr.cgs b/sim/testsuite/sim/sh64/compact/ldsl-pr.cgs
deleted file mode 100644
index eb8ee531bd3..00000000000
--- a/sim/testsuite/sim/sh64/compact/ldsl-pr.cgs
+++ /dev/null
@@ -1,28 +0,0 @@
-# sh testcase for lds.l @${rn}+, pr -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-
-	.global ldsl_pr
-ldsl_pr:
-	mov #40, r0
-	shll8 r0
-	# Preserve address.
-	mov r0, r1
-	lds.l @r0+, pr
-
-	# Add 4 to saved address (r1).
-	# Then compare with r0.
-	add #4, r1
-	cmp/eq r0, r1
-	bf wrong
-
-okay:
-	pass
-
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/compact/macl.cgs b/sim/testsuite/sim/sh64/compact/macl.cgs
deleted file mode 100644
index ef2dfa6e929..00000000000
--- a/sim/testsuite/sim/sh64/compact/macl.cgs
+++ /dev/null
@@ -1,76 +0,0 @@
-# sh testcase for mac.l @${rm}+, @${rn}+
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-	# force S-bit clear
-	clrs
-
-	# Store some magic numbers in memory.
-	mov #40, r1
-	shll8 r1
-	mov #85, r0
-	mov.l r0, @r1
-	# Keep for later.
-	mov r1, r10
-store2:
-	mov #40, r1
-	shll8 r1
-	add #12, r1
-	mov #17, r0
-	mov.l r0, @r1
-	# Keep for later.
-	mov r1, r11
-
-init:
-	# Set up addresses.
-	mov #40, r1
-	shll8 r1
-	mov #40, r2
-	shll8 r2
-	add #12, r2
-
-	# Prime {MACL, MACH} to #1.
-	mov #1, r3
-	dmulu.l r3, r3
-
-test:
-	mac.l @r1+, @r2+
-
-check:
-	# Check result.
-	sts mach, r5
-	assert r5, #0
-
-	mov #5, r0
-	shll8 r0
-	or #166, r0
-	sts macl, r6
-	cmp/eq r6, r0
-	bf wrong
-
-	# Ensure post-increment occurred.
-	add #4, r10
-	cmp/eq r10, r1
-	bf wrong
-
-	add #4, r11
-	cmp/eq r11, r2
-	bf wrong
-
-doubleinc:
-	mov #40, r0
-	shll8 r0
-	mov r0, r1
-	mac.l @r0+, @r0+
-	add #16, r1
-	cmp/eq r0, r1
-	bf wrong
-
-okay:
-	pass
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/compact/macw.cgs b/sim/testsuite/sim/sh64/compact/macw.cgs
deleted file mode 100644
index f5935f7054d..00000000000
--- a/sim/testsuite/sim/sh64/compact/macw.cgs
+++ /dev/null
@@ -1,70 +0,0 @@
-# sh testcase for mac.w @${rm}+, @${rn}+
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-
-	# Store some magic numbers in memory.
-	mov #40, r1
-	shll8 r1
-	mov #85, r0
-	mov.l r0, @r1
-	# Keep for later.
-	mov r1, r10
-store2:
-	mov #40, r1
-	shll8 r1
-	add #12, r1
-	mov #17, r0
-	mov.l r0, @r1
-	# Keep for later.
-	mov r1, r11
-
-init:
-	# Set up addresses.
-	mov #40, r1
-	shll8 r1
-	mov #40, r2
-	shll8 r2
-	add #12, r2
-
-	# Prime {MACL, MACH} to #1.
-	mov #1, r3
-	dmulu.l r3, r3
-
-test:
-	mac.w @r1+, @r2+
-
-check:
-	# Check result.
-	sts mach, r5
-	assert r5, #0
-
-	sts macl, r6
-	assert r6, #1
-
-	# Ensure post-increment occurred.
-	add #2, r10
-	cmp/eq r10, r1
-	bf wrong
-
-	add #2, r11
-	cmp/eq r11, r2
-	bf wrong
-
-doubleinc:
-	mov #40, r0
-	shll8 r0
-	mov r0, r1
-	mac.w @r0+, @r0+
-	add #8, r1
-	cmp/eq r0, r1
-	bf wrong
-	
-okay:
-	pass
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/compact/mov.cgs b/sim/testsuite/sim/sh64/compact/mov.cgs
deleted file mode 100644
index 9442388384e..00000000000
--- a/sim/testsuite/sim/sh64/compact/mov.cgs
+++ /dev/null
@@ -1,40 +0,0 @@
-# sh testcase for mov $rm64, $rn64
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-
-	.global mov
-mov:
-	mov #1, r0
-	rotr r0
-	mov #0, r15
-	mov #10, r0
-
-	mov r0, r1
-	mov r1, r2
-	mov r2, r3
-	mov r3, r4
-	mov r4, r5
-	mov r5, r6
-	mov r6, r7
-	mov r7, r8
-	mov r8, r9
-	mov r9, r10
-	mov r10, r11
-	mov r11, r12
-	mov r12, r13
-	mov r13, r14
-	mov r14, r15
-
-	cmp/eq r0, r15
-	bf wrong
-	
-okay:
-	pass
-
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/compact/mova.cgs b/sim/testsuite/sim/sh64/compact/mova.cgs
deleted file mode 100644
index f555d66e093..00000000000
--- a/sim/testsuite/sim/sh64/compact/mova.cgs
+++ /dev/null
@@ -1,29 +0,0 @@
-# sh testcase for mova @($imm8x4, pc), r0 -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-
-	.global mova
-mova:
-	mova @(40, pc), r0
-	mov #16, r1
-	shll8 r1
-	add #40, r1
-	cmp/eq r0, r1
-	bf wrong
-	mova @(12, pc), r0
-	mov #16, r1
-	shll8 r1
-	add #24, r1
-	cmp/eq r0, r1
-	bf wrong
-
-okay:
-	pass
-
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/compact/movb1.cgs b/sim/testsuite/sim/sh64/compact/movb1.cgs
deleted file mode 100644
index 8278e1bbeaa..00000000000
--- a/sim/testsuite/sim/sh64/compact/movb1.cgs
+++ /dev/null
@@ -1,27 +0,0 @@
-# sh testcase for mov.b $rm, @$rn -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-	mov #55, r1
-	mov #40, r2
-	shll8 r2
-	mov.b r1, @r2
-
-	# Load it back into r3.
-	mov #40, r2
-	shll8 r2
-	mov.b @r2, r3
-
-	# Make sure r1 and r3 match.
-	cmp/eq r1, r3
-	bf wrong
-
-okay:	
-	pass
-
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/compact/movb10.cgs b/sim/testsuite/sim/sh64/compact/movb10.cgs
deleted file mode 100644
index 0ddb736f868..00000000000
--- a/sim/testsuite/sim/sh64/compact/movb10.cgs
+++ /dev/null
@@ -1,25 +0,0 @@
-# sh testcase for mov.b @($imm4, $rm), r0 -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-	mov #30, r1
-	shll8 r1
-	# Store something there first.
-	mov #0, r0
-	or #170, r0
-	mov r0, r7
-	mov.b r0, @(3, r1)
-	# Load it back.
-	mov.b @(3, r1), r0
-	and #255, r0
-	cmp/eq r0, r7
-	bf wrong
-
-okay:
-	pass
-wrong:	
-	fail
diff --git a/sim/testsuite/sim/sh64/compact/movb2.cgs b/sim/testsuite/sim/sh64/compact/movb2.cgs
deleted file mode 100644
index 692c34fb648..00000000000
--- a/sim/testsuite/sim/sh64/compact/movb2.cgs
+++ /dev/null
@@ -1,34 +0,0 @@
-# sh testcase for mov.b $rm, @-$rn -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-	mov #40, r1
-	shll8 r1
-	mov #55, r2
-	
-	# Save ADDR, DATA.
-	mov r1, r7
-	mov r2, r8
-
-	# Do the move.
-	mov.b r2, @-r1
-	
-	# Load the value back into r3.
-	mov.b @r1, r3
-	cmp/eq r2, r3
-	bf wrong
-
-	# Ensure that r1 has been decremented.
-	mov #1, r0
-	sub r0, r7
-	cmp/eq r7, r1
-	bf wrong
-
-okay:
-	pass
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/compact/movb3.cgs b/sim/testsuite/sim/sh64/compact/movb3.cgs
deleted file mode 100644
index 6143562b8c1..00000000000
--- a/sim/testsuite/sim/sh64/compact/movb3.cgs
+++ /dev/null
@@ -1,30 +0,0 @@
-# sh testcase for mov.b $rm, @(r0,$rn) -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-	mov #40, r2
-	shll8 r2
-	mov #3, r1
-	mov #0, r0
-	or #170, r0
-	mov r0, r3
-	mov r2, r0
-	mov.b r3, @(r0, r1)
-
-	# Load the value back into a different register.
-	mov.b @(r0, r1), r4
-	# Check the lowest order byte matches the stored value.
-	mov r4, r0
-	and #255, r0
-	cmp/eq r0, r3
-	bf wrong
-
-okay:	
-	pass
-
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/compact/movb4.cgs b/sim/testsuite/sim/sh64/compact/movb4.cgs
deleted file mode 100644
index d30a7a8641f..00000000000
--- a/sim/testsuite/sim/sh64/compact/movb4.cgs
+++ /dev/null
@@ -1,28 +0,0 @@
-# sh testcase for mov.b r0, @($imm8, gbr) -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-	mov #0, r0
-	or #170, r0
-	mov r0, r3
-	mov #30, r2
-	ldc r2, gbr
-	mov.b r0, @(40, gbr)
-
-	# Load the value back into a different register.
-	mov.b @(40, gbr), r0
-	# Check the lowest order byte matches the stored value.
-	and #255, r0
-	cmp/eq r0, r3
-	bf wrong
-
-okay:	
-	pass
-
-wrong:
-	fail
-	
diff --git a/sim/testsuite/sim/sh64/compact/movb5.cgs b/sim/testsuite/sim/sh64/compact/movb5.cgs
deleted file mode 100644
index 4f6795a8860..00000000000
--- a/sim/testsuite/sim/sh64/compact/movb5.cgs
+++ /dev/null
@@ -1,25 +0,0 @@
-# sh testcase for mov.b r0, @($imm4, rm) -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-	mov #0, r0
-	or #170, r0
-	mov r0, r3
-	mov #30, r2
-	mov.b r0, @(3, r2)
-
-	# Load the value back into a different register.
-	mov.b @(3, r2), r0
-	and #255, r0
-	cmp/eq r3, r0
-	bf wrong
-
-okay:	
-	pass
-wrong:
-	fail
-	
diff --git a/sim/testsuite/sim/sh64/compact/movb6.cgs b/sim/testsuite/sim/sh64/compact/movb6.cgs
deleted file mode 100644
index 9ddebde5ce4..00000000000
--- a/sim/testsuite/sim/sh64/compact/movb6.cgs
+++ /dev/null
@@ -1,26 +0,0 @@
-# sh testcase for mov.b @$rm, $rn -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-	mov #30, r2
-	shll8 r2
-	# Store something first.
-	mov #0, r0
-	or #170, r0
-	mov r0, r7
-	mov.b r7, @r2
-	# Load it back.
-	mov.b @r2, r1
-	mov r1, r0
-	and #255, r0
-	cmp/eq r7, r0
-	bf wrong
-
-okay:
-	pass
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/compact/movb7.cgs b/sim/testsuite/sim/sh64/compact/movb7.cgs
deleted file mode 100644
index f55a223436b..00000000000
--- a/sim/testsuite/sim/sh64/compact/movb7.cgs
+++ /dev/null
@@ -1,35 +0,0 @@
-# sh testcase for mov.b @${rm}+, $rn -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-	mov #30, r1
-	shll8 r1
-	# Store addr.
-	mov r1, r8
-
-	# Store something there first.
-	mov #0, r0
-	or #170, r0
-	mov r0, r7
-	mov.b r7, @r1
-	# Load it back.
-	mov.b @r1+, r2
-	mov r2, r0
-	and #255, r0
-	cmp/eq r7, r0
-	bf wrong
-
-	# Test address for post-incrementing.
-	add #1, r8
-	cmp/eq r8, r1
-	bf wrong
-
-okay:	
-	pass
-wrong:
-	fail
-	
diff --git a/sim/testsuite/sim/sh64/compact/movb8.cgs b/sim/testsuite/sim/sh64/compact/movb8.cgs
deleted file mode 100644
index 883e4b357ed..00000000000
--- a/sim/testsuite/sim/sh64/compact/movb8.cgs
+++ /dev/null
@@ -1,27 +0,0 @@
-# sh testcase for mov.b @(r0, $rm), $rn -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-	mov #30, r0
-	shll8 r0
-	mov #14, r1
-	# Store something there first.
-	mov #0, r0
-	or #170, r0
-	mov r0, r7
-	mov.b r7, @(r0, r1)
-	# Load it back.
-	mov.b @(r0, r1), r2
-	mov r2, r0
-	and #255, r0
-	cmp/eq r0, r7
-	bf wrong
-
-okay:
-	pass
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/compact/movb9.cgs b/sim/testsuite/sim/sh64/compact/movb9.cgs
deleted file mode 100644
index 3ad1b46f2c0..00000000000
--- a/sim/testsuite/sim/sh64/compact/movb9.cgs
+++ /dev/null
@@ -1,27 +0,0 @@
-# sh testcase for mov.b @($imm8, gbr), r0 -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-	mov #30, r0
-	shll8 r0
-	ldc r0, gbr
-	# Store something there first.
-	mov #0, r0
-	or #170, r0
-	mov r0, r7
-	mov.b r0, @(3, gbr)
-	# Load it back.
-	mov.b @(3, gbr), r0
-	and #255, r0
-	cmp/eq r7, r0
-	bf wrong
-
-okay:	
-	pass
-
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/compact/movcal.cgs b/sim/testsuite/sim/sh64/compact/movcal.cgs
deleted file mode 100644
index 7aac57e7f43..00000000000
--- a/sim/testsuite/sim/sh64/compact/movcal.cgs
+++ /dev/null
@@ -1,28 +0,0 @@
-# sh testcase for movca.l r0, @$rn -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-
-	.global movcal
-movcal:
-	mov #1, r0
-	rotr r0
-	add #128, r0
-	mov #40, r1
-	shll8 r1
-	movca.l r0, @r1
-
-	# Load the word back in.
-	mov.l @r1, r3
-	cmp/eq r0, r3
-	bf wrong
-	
-okay:
-	pass
-wrong:
-	fail
-	
diff --git a/sim/testsuite/sim/sh64/compact/movi.cgs b/sim/testsuite/sim/sh64/compact/movi.cgs
deleted file mode 100644
index bc72c1b8e63..00000000000
--- a/sim/testsuite/sim/sh64/compact/movi.cgs
+++ /dev/null
@@ -1,39 +0,0 @@
-# sh testcase for mov #$imm8, $rn -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-
-	.global movi
-movi:
-	mov #0, r0
-	cmp/eq #0, r0
-	bf wrong
-	
-	mov #1, r0
-	cmp/eq #1, r0
-	bf wrong
-	
-	mov #255, r0
-	cmp/eq #255, r0
-	bf wrong
-
-	mov #1, r15
-	mov #1, r0
-	cmp/eq r0, r15
-	bf wrong
-
-	mov #255, r15
-	mov r15, r0
-	cmp/eq r0, r15
-	bf wrong
-
-okay:
-	pass
-
-wrong:
-	fail
-	
diff --git a/sim/testsuite/sim/sh64/compact/movl1.cgs b/sim/testsuite/sim/sh64/compact/movl1.cgs
deleted file mode 100644
index 7d85c380f3e..00000000000
--- a/sim/testsuite/sim/sh64/compact/movl1.cgs
+++ /dev/null
@@ -1,31 +0,0 @@
-# sh testcase for mov.l $rm, @$rn -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-	mov #30, r1
-	shll8 r1
-init:
-	# Build up a distinctive bit pattern.
-	mov #1, r2
-	shll8 r2
-	add #12, r2
-	shll8 r2
-	add #85, r2
-	shll8 r2
-	add #170, r2
-
-	mov.l r2, @r1
-
-	# Load it back.
-	mov.l @r1, r3
-	cmp/eq r2, r3
-	bf wrong
-
-okay:
-	pass
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/compact/movl10.cgs b/sim/testsuite/sim/sh64/compact/movl10.cgs
deleted file mode 100644
index 5e9cf2d2fbd..00000000000
--- a/sim/testsuite/sim/sh64/compact/movl10.cgs
+++ /dev/null
@@ -1,34 +0,0 @@
-# sh testcase for mov.l @($imm8x4, pc), $rn -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-
-init:
-	# Build up a distinctive bit pattern.
-	mov #1, r2
-	shll8 r2
-	add #12, r2
-	shll8 r2
-	add #85, r2
-	shll8 r2
-	add #170, r2
-
-	# Store to memory.
-	mov #16, r1
-	shll8 r1
-	add #32, r1
-	mov.l r2, @r1
-check:
-	# Read it back.
-	mov.l @(12, pc), r0
-	cmp/eq r2, r0
-	bf wrong
-	
-okay:
-	pass
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/compact/movl11.cgs b/sim/testsuite/sim/sh64/compact/movl11.cgs
deleted file mode 100644
index 32c763d8a2e..00000000000
--- a/sim/testsuite/sim/sh64/compact/movl11.cgs
+++ /dev/null
@@ -1,32 +0,0 @@
-# sh testcase for mov.l @($imm4x4, $rm), $rn -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-	mov #30, r0
-	shll8 r0
-	# Build up a distinctive bit pattern.
-	mov #1, r2
-	shll8 r2
-	add #12, r2
-	shll8 r2
-	add #85, r2
-	shll8 r2
-	add #170, r2
-	# Store something first.
-	mov.l r2, @(12, r0)
-
-check:
-	# Read it back.
-	mov.l @(12, r0), r1
-	cmp/eq r2, r1
-	bf wrong
-	
-okay:
-	pass
-wrong:
-	fail
-	
diff --git a/sim/testsuite/sim/sh64/compact/movl2.cgs b/sim/testsuite/sim/sh64/compact/movl2.cgs
deleted file mode 100644
index bb550612cce..00000000000
--- a/sim/testsuite/sim/sh64/compact/movl2.cgs
+++ /dev/null
@@ -1,43 +0,0 @@
-# sh testcase for mov.l $rm, @-$rn -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-
-	mov #30, r1
-	shll8 r1
-	# Save address.
-	mov r1, r7
-
-init:
-	# Build up a distinctive bit pattern.
-	mov #1, r2
-	shll8 r2
-	add #12, r2
-	shll8 r2
-	add #85, r2
-	shll8 r2
-	add #170, r2
-	mov.l r2, @-r1
-
-check:
-	# Compare the value loaded into another reg.
-	mov.l @r1, r3
-	cmp/eq r2, r3
-	bf wrong
-	
-dec:
-	# Ensure address is decremented.
-	mov #4, r6
-	sub r6, r7
-	cmp/eq r1, r7
-	bf wrong
-
-okay:	
-	pass
-
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/compact/movl3.cgs b/sim/testsuite/sim/sh64/compact/movl3.cgs
deleted file mode 100644
index 6205de7558d..00000000000
--- a/sim/testsuite/sim/sh64/compact/movl3.cgs
+++ /dev/null
@@ -1,36 +0,0 @@
-# sh testcase for mov.l $rm, @(r0, $rn)
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-
-setaddr:
-	mov #0, r0
-	mov #30, r1
-	shll8 r1
-
-init:
-	# Build up a distinctive bit pattern.
-	mov #1, r2
-	shll8 r2
-	add #12, r2
-	shll8 r2
-	add #85, r2
-	shll8 r2
-	add #170, r2
-
-	mov.l r2, @(r0, r1)
-
-check:
-	# Load it back.
-	mov.l @(r0, r1), r3
-	cmp/eq r2, r3
-	bf wrong
-
-okay:
-	pass
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/compact/movl4.cgs b/sim/testsuite/sim/sh64/compact/movl4.cgs
deleted file mode 100644
index 44440946365..00000000000
--- a/sim/testsuite/sim/sh64/compact/movl4.cgs
+++ /dev/null
@@ -1,38 +0,0 @@
-# sh testcase for mov.l r0, @($imm8x4, gbr) -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-
-setaddr:
-	mov #30, r1
-	shll8 r1
-	ldc r1, gbr
-
-init:
-	# Build up a distinctive bit pattern.
-	mov #1, r0
-	shll8 r0
-	add #12, r0
-	shll8 r0
-	add #85, r0
-	shll8 r0
-	add #170, r0
-	# Preserve.
-	mov r0, r7
-
-	mov.l r0, @(4, gbr)
-check:
-	# Load it back.
-	mov.l @(4, gbr), r0
-	cmp/eq r0, r7
-	bf wrong
-
-okay:	
-	pass
-wrong:
-	fail
-
diff --git a/sim/testsuite/sim/sh64/compact/movl5.cgs b/sim/testsuite/sim/sh64/compact/movl5.cgs
deleted file mode 100644
index 897ebef2367..00000000000
--- a/sim/testsuite/sim/sh64/compact/movl5.cgs
+++ /dev/null
@@ -1,37 +0,0 @@
-# sh testcase for mov.l $rm, @($imm4x4, $rn) -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-
-setaddr:
-	mov #30, r1
-	shll8 r1
-
-init:
-	# Build up a distinctive bit pattern.
-	mov #1, r0
-	shll8 r0
-	add #12, r0
-	shll8 r0
-	add #85, r0
-	shll8 r0
-	add #170, r0
-	# Preserve.
-	mov r0, r7
-
-	mov.l r0, @(4, r1)
-check:
-	# Load it back.
-	mov.l @(4, r1), r0
-	cmp/eq r7, r0
-	bf wrong
-
-okay:	
-	pass
-
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/compact/movl6.cgs b/sim/testsuite/sim/sh64/compact/movl6.cgs
deleted file mode 100644
index 42f63b2a9ac..00000000000
--- a/sim/testsuite/sim/sh64/compact/movl6.cgs
+++ /dev/null
@@ -1,25 +0,0 @@
-# sh testcase for mov.l @$rm, $rn -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-
-	mov #30, r0
-	shll8 r0
-	# Store something there first.
-	mov #170, r1
-	mov.l r1, @r0
-check:	
-	# Load it back.
-	mov.l @r0, r3
-	cmp/eq r1, r3
-	bf wrong
-
-okay:
-	pass
-wrong:
-	fail
-	
diff --git a/sim/testsuite/sim/sh64/compact/movl7.cgs b/sim/testsuite/sim/sh64/compact/movl7.cgs
deleted file mode 100644
index b6c12fc5515..00000000000
--- a/sim/testsuite/sim/sh64/compact/movl7.cgs
+++ /dev/null
@@ -1,37 +0,0 @@
-# sh testcase for mov.l @$rm+, $rn -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-
-	mov #30, r0
-	shll8 r0
-	# Preserve address.
-	mov r0, r7
-	# Store something first.
-	mov #170, r3
-	mov.l r3, @r0
-	
-	mov.l @r0+, r1
-check:
-	cmp/eq r1, r3
-	bf wrong
-
-	# Ensure address is post-incremented.
-	add #4, r7
-	cmp/eq r7, r0
-	bf wrong
-
-equal:	
-	# Test rm = rn.
-	mov #30, r0
-	shll8 r0
-	mov.l @r0+, r0
-
-okay:	
-	pass
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/compact/movl8.cgs b/sim/testsuite/sim/sh64/compact/movl8.cgs
deleted file mode 100644
index a6cd932d0a2..00000000000
--- a/sim/testsuite/sim/sh64/compact/movl8.cgs
+++ /dev/null
@@ -1,24 +0,0 @@
-# sh testcase for mov.l @(r0, $rm), $rn -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-	mov #0, r0
-	mov #30, r1
-	shll8 r1
-	# Store something there first.
-	mov #170, r3
-	mov.l r3, @(r0, r1)
-check:	
-	# Load it back.
-	mov.l @(r0, r1), r2
-	cmp/eq r2, r3
-	bf wrong
-
-okay:	
-	pass
-wrong:	
-	fail
diff --git a/sim/testsuite/sim/sh64/compact/movl9.cgs b/sim/testsuite/sim/sh64/compact/movl9.cgs
deleted file mode 100644
index 4fa07b069d8..00000000000
--- a/sim/testsuite/sim/sh64/compact/movl9.cgs
+++ /dev/null
@@ -1,24 +0,0 @@
-# sh testcase for mov.l @($imm8x4, gbr), r0 -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-	mov #30, r1
-	shll8 r1
-	ldc r1, gbr
-	# Store something there first.
-	mov #170, r0
-	mov r0, r7
-	mov.l r0, @(12, gbr)
-check:	
-	# Load it back.
-	mov.l @(12, gbr), r0
-	cmp/eq r0, r7
-
-okay:
-	pass
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/compact/movt.cgs b/sim/testsuite/sim/sh64/compact/movt.cgs
deleted file mode 100644
index 45539810beb..00000000000
--- a/sim/testsuite/sim/sh64/compact/movt.cgs
+++ /dev/null
@@ -1,28 +0,0 @@
-# sh testcase for movt $rn -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-
-	.global movt
-init:
-	sett
-	movt r1
-	assert r1, #1
-clear:
-	clrt
-	movt r1
-	assert r1, #0
-set:
-	sett
-	movt r1
-	assert r1, #1
-
-okay:
-	pass
-wrong:
-	fail
-	 
diff --git a/sim/testsuite/sim/sh64/compact/movw1.cgs b/sim/testsuite/sim/sh64/compact/movw1.cgs
deleted file mode 100644
index 5d55a581ffd..00000000000
--- a/sim/testsuite/sim/sh64/compact/movw1.cgs
+++ /dev/null
@@ -1,29 +0,0 @@
-# sh testcase for mov.w $rm, @$rn -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-
-	mov #30, r1
-	shll8 r1
-init:
-	# Build up a distinctive bit pattern.
-	mov #1, r2
-	shll8 r2
-	add #12, r2
-	mov.w r2, @r1
-check:
-	# Read it back.
-	mov.w @r1, r3
-	shll16 r2
-	shll16 r3
-	cmp/eq r2, r3
-	bf wrong
-
-okay:	
-	pass
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/compact/movw10.cgs b/sim/testsuite/sim/sh64/compact/movw10.cgs
deleted file mode 100644
index 5bab9117e9e..00000000000
--- a/sim/testsuite/sim/sh64/compact/movw10.cgs
+++ /dev/null
@@ -1,32 +0,0 @@
-# sh testcase for mov.w @($imm8x2, pc), $rn -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-
-	# Build up a distinctive bit pattern.
-	mov #1, r2
-	shll8 r2
-	add #12, r2
-
-	# Store to memory.
-	mov #16, r1
-	shll8 r1
-	add #32, r1
-	mov.w r2, @r1
-
-check:
-	# Read it back.
-	mov.w @(18, pc), r0
-	shll16 r0
-	shll16 r2
-	cmp/eq r0, r2
-	bf wrong
-
-okay:
-	pass
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/compact/movw11.cgs b/sim/testsuite/sim/sh64/compact/movw11.cgs
deleted file mode 100644
index df739fa783d..00000000000
--- a/sim/testsuite/sim/sh64/compact/movw11.cgs
+++ /dev/null
@@ -1,35 +0,0 @@
-# sh testcase for mov.w @($imm4x2, $rm), r0 -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-	mov #30, r1
-	shll8 r1
-
-	# Build up a distinctive bit pattern.
-	mov #1, r0
-	shll8 r0
-	add #12, r0
-
-	# Preserve r0.
-	mov r0, r3
-
-	# Store something first.
-	mov.w r0, @(12, r1)
-
-check:
-	# Read it back.
-	mov.w @(12, r1), r0
-	shll16 r0
-	shll16 r3
-	cmp/eq r0, r3
-	bf wrong
-
-okay:
-	pass
-wrong:
-	fail
-	
diff --git a/sim/testsuite/sim/sh64/compact/movw2.cgs b/sim/testsuite/sim/sh64/compact/movw2.cgs
deleted file mode 100644
index 27c29dc0292..00000000000
--- a/sim/testsuite/sim/sh64/compact/movw2.cgs
+++ /dev/null
@@ -1,36 +0,0 @@
-# sh testcase for mov.w $rm, @-$rn -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-
-	mov #30, r1
-	shll8 r1
-	# Preserve.
-	mov r1, r7
-init:
-	# Build up a distinctive bit pattern.
-	mov #1, r2
-	shll8 r2
-	add #12, r2
-store:	
-	mov.w r2, @-r1
-check:
-	# Read it back.
-	mov.w @r1, r3
-	shll16 r2
-	shll16 r3
-	cmp/eq r2, r3
-	bf wrong
-dec:
-	add #2, r1
-	cmp/eq r7, r1
-	bf wrong
-
-okay:
-	pass
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/compact/movw3.cgs b/sim/testsuite/sim/sh64/compact/movw3.cgs
deleted file mode 100644
index d7b39c81506..00000000000
--- a/sim/testsuite/sim/sh64/compact/movw3.cgs
+++ /dev/null
@@ -1,31 +0,0 @@
-# sh testcase for mov.w $rm, @(r0, $rn) -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-
-	mov #0, r0
-	mov #30, r1
-	shll8 r1
-init:
-	# Build up a distinctive bit pattern.
-	mov #1, r2
-	shll8 r2
-	add #12, r2
-	mov.w r2, @(r0, r1)
-check:
-	# Read it back.
-	mov.w @(r0, r1), r3
-	shll16 r2
-	shll16 r3
-	cmp/eq r2, r3
-	bf wrong
-
-okay:	
-	pass
-wrong:
-	fail
-	
diff --git a/sim/testsuite/sim/sh64/compact/movw4.cgs b/sim/testsuite/sim/sh64/compact/movw4.cgs
deleted file mode 100644
index 4853b5019bc..00000000000
--- a/sim/testsuite/sim/sh64/compact/movw4.cgs
+++ /dev/null
@@ -1,31 +0,0 @@
-# sh testcase for mov.w r0, @($imm8x2, gbr) -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-
-	mov #30, r0
-	shll8 r0
-	ldc r0, gbr
-
-init:
-	# Build up a distinctive bit pattern.
-	mov #1, r0
-	shll8 r0
-	add #12, r0
-	# Preserve r0.
-	mov r0, r7
-	mov.w r0, @(12, gbr)
-check:
-	mov.w @(12, gbr), r0
-	cmp/eq r0, r7
-	bf wrong
-
-okay:	
-	pass
-wrong:
-	fail
-	
diff --git a/sim/testsuite/sim/sh64/compact/movw5.cgs b/sim/testsuite/sim/sh64/compact/movw5.cgs
deleted file mode 100644
index 9b4f84f6516..00000000000
--- a/sim/testsuite/sim/sh64/compact/movw5.cgs
+++ /dev/null
@@ -1,32 +0,0 @@
-# sh testcase for mov.w r0, @($imm4x2, $rn) -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-	mov #30, r1
-	shll8 r1
-
-init:
-	# Build up a distinctive bit pattern.
-	mov #1, r0
-	shll8 r0
-	add #12, r0
-	# Preserve.
-	mov r0, r7
-move:
-	mov.w r0, @(12, r1)
-check:
-	mov.w @(12, r1), r0
-	shll16 r0
-	shll16 r7
-	cmp/eq r0, r7
-	bf wrong
-
-okay:
-	pass
-wrong:
-	fail
-	
diff --git a/sim/testsuite/sim/sh64/compact/movw6.cgs b/sim/testsuite/sim/sh64/compact/movw6.cgs
deleted file mode 100644
index 758497c13e7..00000000000
--- a/sim/testsuite/sim/sh64/compact/movw6.cgs
+++ /dev/null
@@ -1,30 +0,0 @@
-# sh testcase for mov.w @$rm, $rn -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-	
-	mov #30, r0
-	shll8 r0
-
-	# Store something first.
-	# Build up a distinctive bit pattern.
-	mov #1, r2
-	shll8 r2
-	add #12, r2
-	mov.w r2, @r0
-
-check:
-	# Read it back.
-	mov.w @r0, r1
-	cmp/eq r1, r2
-	bf wrong
-
-okay:
-	pass
-wrong:
-	fail
-	
diff --git a/sim/testsuite/sim/sh64/compact/movw7.cgs b/sim/testsuite/sim/sh64/compact/movw7.cgs
deleted file mode 100644
index 45f5c098e4e..00000000000
--- a/sim/testsuite/sim/sh64/compact/movw7.cgs
+++ /dev/null
@@ -1,36 +0,0 @@
-# sh testcase for mov.w @${rm}+, $rn -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-	mov #30, r0
-	shll8 r0
-	# Preserve address.
-	mov r0, r7
-
-	# Store something first.
-	# Build up a distinctive bit pattern.
-	mov #1, r2
-	shll8 r2
-	add #12, r2
-	mov.w r2, @r0
-check:
-	# Read it back.
-	mov.w @r0+, r3
-	cmp/eq r2, r3
-	bf wrong
-
-inc:	
-	# Ensure address is post-incremented.
-	add #2, r7
-	cmp/eq r0, r7
-	bf wrong
-	
-okay:	
-	pass
-wrong:
-	fail
-	
diff --git a/sim/testsuite/sim/sh64/compact/movw8.cgs b/sim/testsuite/sim/sh64/compact/movw8.cgs
deleted file mode 100644
index 0a7ce3f346c..00000000000
--- a/sim/testsuite/sim/sh64/compact/movw8.cgs
+++ /dev/null
@@ -1,31 +0,0 @@
-# sh testcase for mov.w @(r0, $rm), $rn -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-	mov #30, r0
-	shll8 r0
-	mov #10, r1
-
-	# Store something first.
-	# Build up a distinctive bit pattern.
-	mov #1, r2
-	shll8 r2
-	add #12, r2
-	
-	mov.w r2, @(r0, r1)
-check:
-	# Read it back.
-	mov.w @(r0, r1), r3
-	shll16 r2
-	shll16 r3
-	cmp/eq r2, r3
-	bf wrong
-
-okay:
-	pass
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/compact/movw9.cgs b/sim/testsuite/sim/sh64/compact/movw9.cgs
deleted file mode 100644
index 1872f06afb6..00000000000
--- a/sim/testsuite/sim/sh64/compact/movw9.cgs
+++ /dev/null
@@ -1,33 +0,0 @@
-# sh testcase for mov.w @($imm8x2, gbr), r0 -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-	mov #30, r0
-	shll8 r0
-	ldc r0, gbr
-
-	# Store something first.
-	# Build up a distinctive bit pattern.
-	mov #1, r0
-	shll8 r0
-	add #12, r0
-	# Preserve r0.
-	mov r0, r7
-	mov.w r0, @(12, gbr)
-
-check:	
-	# Load it back.
-	mov.w @(12, gbr), r0
-	shll16 r0
-	shll16 r7
-	cmp/eq r0, r7
-	bf wrong
-
-okay:
-	pass
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/compact/mull.cgs b/sim/testsuite/sim/sh64/compact/mull.cgs
deleted file mode 100644
index 921141aafd6..00000000000
--- a/sim/testsuite/sim/sh64/compact/mull.cgs
+++ /dev/null
@@ -1,64 +0,0 @@
-# sh testcase for mul.l $rm, $rn -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-
-	.global mull
-mull:
-	mov #3, r0
-	mov #5, r1
-	mul.l r0, r1
-
-	# Check the result.
-	sts macl, r3
-	mov #15, r4
-	cmp/eq r3, r4
-	bf wrong
-
-lxs:
-	# Large * small.
-	mov #255, r0
-	mov #0, r1
-	mul.l r0, r1
-
-	# Check the result.
-	sts macl, r3
-	mov #0, r4
-	cmp/eq r3, r4
-	bf wrong
-
-sxl:
-	# Small * large.
-	mov #0, r0
-	mov #255, r1
-	mul.l r0, r1
-
-	# Check the result.
-	sts macl, r3
-	mov #0, r4
-	cmp/eq r3, r4
-	bf wrong
-
-lxl:
-	# Large * large.
-	mov #1, r0
-	neg r0, r0
-	mov #2, r1
-	mul.l r0, r1
-
-	# Check the result.
-	sts macl, r3
-	mov #2, r4
-	neg r4, r4
-	cmp/eq r3, r4
-	bf wrong
-
-okay:
-	pass
-
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/compact/mulsw.cgs b/sim/testsuite/sim/sh64/compact/mulsw.cgs
deleted file mode 100644
index 05c8a3d384c..00000000000
--- a/sim/testsuite/sim/sh64/compact/mulsw.cgs
+++ /dev/null
@@ -1,91 +0,0 @@
-# sh testcase for muls.w $rm, $rn -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-
-	sts mach, r7
-	
-	.global mulsw
-zero:
-	mov #0, r0
-	mov #1, r1
-	muls.w r0, r1
-
-	# Check the result.
-	sts macl, r3
-	mov #0, r4
-	cmp/eq r3, r4
-	bf wrong
-
-sxs:
-	# Small * small.
-	mov #1, r0
-	mov #2, r1
-	muls.w r0, r1
-
-	# Check the result.
-	sts macl, r3
-	mov #2, r4
-	cmp/eq r3, r4
-	bf wrong
-
-sxl:
-	# Small * large.
-	mov #1, r0
-	mov #255, r1
-	shll8 r1
-	muls.w r0, r1
-
-	# Check the result.
-	sts macl, r3
-	mov #0, r4
-	not r4, r4
-	shll8 r4
-	cmp/eq r3, r4
-	bf wrong
-
-lxs:
-	# Large * small.
-	mov #255, r0
-	shll8 r0
-	mov #1, r1
-	muls.w r0, r1
-
-	# Check the result.
-	sts macl, r3
-	mov #0, r4
-	not r4, r4
-	shll8 r4
-	cmp/eq r3, r4
-	bf wrong
-	
-lxl:
-	# Large * large.
-	mov #255, r0
-	shll8 r0
-	mov #255, r1
-	shll8 r1
-	muls.w r0, r1
-
-	# Check the result.
-	sts macl, r3
-	mov #1, r4
-	shll16 r4
-	cmp/eq r3, r4
-	bf wrong
-	
-invariant:	
-	# Ensure MACH is invariant.
-	sts mach, r8
-	cmp/eq r7, r8
-	bf wrong
-	 
-okay:
-	pass
-
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/compact/muluw.cgs b/sim/testsuite/sim/sh64/compact/muluw.cgs
deleted file mode 100644
index fa0a3343332..00000000000
--- a/sim/testsuite/sim/sh64/compact/muluw.cgs
+++ /dev/null
@@ -1,96 +0,0 @@
-# sh testcase for mulu.w $rm, $rn -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-
-	sts mach, r7
-
-	.global mulsw
-zero:
-	mov #0, r0
-	mov #1, r1
-	mulu.w r0, r1
-
-	# Check the result.
-	sts macl, r1
-	mov #0, r0
-	cmp/eq r0, r1
-	bf wrong
-
-sxs:
-	# Small * small.
-	mov #1, r0
-	mov #2, r1
-	mulu.w r0, r1
-
-	# Check the result.
-	sts macl, r1
-	mov #2, r0
-	cmp/eq r0, r1
-	bf wrong
-
-sxl:
-	# Small * large.
-	mov #1, r1
-	mov #0, r0
-	or #255, r0
-	shll8 r0
-	mulu.w r1, r0
-
-	# Check the result.
-	sts macl, r1
-	mov #0, r0
-	or #255, r0
-	shll8 r0
-	cmp/eq r0, r1
-	bf wrong
-
-lxs:
-	# Large * small.
-	mov #0, r0
-	or #255, r0
-	shll8 r0
-	mov #1, r1
-	mulu.w r0, r1
-
-	# Check the result.
-	sts macl, r1
-	mov #0, r0
-	or #255, r0
-	shll8 r0
-	cmp/eq r0, r1
-	bf wrong
-
-lxl:
-	# Large * large.
-	mov #0, r0
-	or #255, r0
-	shll8 r0
-	mov r0, r1
-	mulu.w r0, r1
-
-	# Check the result.
-	sts macl, r1
-	mov #0, r0
-	or #254, r0
-	shll8 r0
-	or #1, r0
-	shll16 r0
-	cmp/eq r0, r1
-	bf wrong
-
-invariant:
-	# Ensure MACH is invariant.
-	sts mach, r8
-	cmp/eq r7, r8
-	bf wrong
-
-okay:
-	pass
-
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/compact/neg.cgs b/sim/testsuite/sim/sh64/compact/neg.cgs
deleted file mode 100644
index b6f98d74060..00000000000
--- a/sim/testsuite/sim/sh64/compact/neg.cgs
+++ /dev/null
@@ -1,55 +0,0 @@
-# sh testcase for neg $rm, $rn -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	.macro signbit sign
-	shlr16 r1
-	shlr8 r1
-	shlr r1
-	shlr r1
-	shlr r1
-	shlr r1
-	shlr r1
-	shlr r1
-	shlr r1
-	assert r1, \sign
-	.endm
-	start
-
-	.global neg
-neg:
-	mov #0, r0
-	neg r0, r1
-	signbit #0
-
-	mov #42, r0
-	neg r0, r1
-	signbit #1
-
-	mov #0, r0
-	or #25, r0
-	neg r0, r1
-	signbit #1
-
-	# neg(0) is 0.
-	mov #0, r0
-	neg r0, r1
-	signbit #0
-
-	# neg(neg(x)) = x.
-	mov #42, r0
-	neg r0, r1
-	signbit #1
-	mov #42, r0
-	neg r0, r2
-	neg r2, r1
-	signbit #0
-
-okay:
-	pass
-
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/compact/negc.cgs b/sim/testsuite/sim/sh64/compact/negc.cgs
deleted file mode 100644
index 1f5547d9bab..00000000000
--- a/sim/testsuite/sim/sh64/compact/negc.cgs
+++ /dev/null
@@ -1,66 +0,0 @@
-# sh testcase for negc $rm, $rn -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	.macro signbit sign
-	mov r1, r2
-	shlr16 r2
-	shlr8 r2
-	shlr r2
-	shlr r2
-	shlr r2
-	shlr r2
-	shlr r2
-	shlr r2
-	shlr r2
-	assert r2, \sign
-	.endm
-	start
-
-	.global negc
-negc:
-	clrt
-	mov #1, r0
-	negc r0, r1
-	signbit #1
-
-negc2:
-	sett
-	mov #1, r0
-	negc r0, r1
-	signbit #1
-
-negc3:
-	clrt
-	mov #0, r0
-	negc r0, r1
-	signbit #0
-
-negc4:
-	sett
-	mov #0, r0
-	negc r0, r1
-	signbit #1
-
-negc5:
-	clrt
-	mov #0, r0
-	or #255, r0
-	negc r0, r1
-	signbit #1
-
-negc6:
-	sett
-	mov #0, r0
-	or #255, r0
-	negc r0, r1
-	signbit #1
-
-okay:
-	pass
-
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/compact/nop.cgs b/sim/testsuite/sim/sh64/compact/nop.cgs
deleted file mode 100644
index 8ce910c5abd..00000000000
--- a/sim/testsuite/sim/sh64/compact/nop.cgs
+++ /dev/null
@@ -1,13 +0,0 @@
-# sh testcase for nop
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-
-	.global nop
-nop:
-	nop
-	pass
diff --git a/sim/testsuite/sim/sh64/compact/not.cgs b/sim/testsuite/sim/sh64/compact/not.cgs
deleted file mode 100644
index 380808ddb57..00000000000
--- a/sim/testsuite/sim/sh64/compact/not.cgs
+++ /dev/null
@@ -1,47 +0,0 @@
-# sh testcase for not $rm64, $rn64 -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-
-	.global not
-not:
-	mov #0, r0
-	or #192, r0
-	not r0, r1
-
-	mov #0, r0
-	or #255, r0
-	shll8 r0
-	or #255, r0
-	shll8 r0
-	or #255, r0
-	shll8 r0
-	or #63, r0
-
-	cmp/eq r0, r1
-	bf wrong
-
-ones:
-	mov #0, r1
-	not r1, r2
-
-	mov #0, r0
-	or #255, r0
-	shll8 r0
-	or #255, r0
-	shll8 r0
-	or #255, r0
-	shll8 r0
-	or #255, r0
-	cmp/eq r0, r2
-	bf wrong
-
-okay:
-	pass
-
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/compact/ocbi.cgs b/sim/testsuite/sim/sh64/compact/ocbi.cgs
deleted file mode 100644
index 12fb2a116c4..00000000000
--- a/sim/testsuite/sim/sh64/compact/ocbi.cgs
+++ /dev/null
@@ -1,14 +0,0 @@
-# sh testcase for ocbi @$rn -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-	.global ocbi
-ocbi:
-	ocbi @r0
-	ocbi @r1
-	ocbi @r15
-	pass
diff --git a/sim/testsuite/sim/sh64/compact/ocbp.cgs b/sim/testsuite/sim/sh64/compact/ocbp.cgs
deleted file mode 100644
index 153aff2eade..00000000000
--- a/sim/testsuite/sim/sh64/compact/ocbp.cgs
+++ /dev/null
@@ -1,15 +0,0 @@
-# sh testcase for ocbp @$rn -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-
-	.global ocbp
-ocbp:
-	ocbp @r0
-	ocbp @r1
-	ocbp @r15
-	pass
diff --git a/sim/testsuite/sim/sh64/compact/ocbwb.cgs b/sim/testsuite/sim/sh64/compact/ocbwb.cgs
deleted file mode 100644
index 6b0a741cbca..00000000000
--- a/sim/testsuite/sim/sh64/compact/ocbwb.cgs
+++ /dev/null
@@ -1,15 +0,0 @@
-# sh testcase for ocbwb @$rn -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-
-	.global ocbwb
-ocbwb:
-	ocbwb @r0
-	ocbwb @r1
-	ocbwb @r15
-	pass
diff --git a/sim/testsuite/sim/sh64/compact/or.cgs b/sim/testsuite/sim/sh64/compact/or.cgs
deleted file mode 100644
index a02eee39aaf..00000000000
--- a/sim/testsuite/sim/sh64/compact/or.cgs
+++ /dev/null
@@ -1,43 +0,0 @@
-# sh testcase for or $rm64, $rn64 -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-
-	.global or
-or:
-	mov #1, r0
-	rotr r0
-	mov #1, r1
-	or r0, r1
-
-	mov #1, r7
-	rotr r7
-	add #1, r7
-	cmp/eq r7, r1
-	bf wrong
-
-	.global or2
-or2:
-	mov #85, r0
-	shll16 r0
-	shll8 r0
-	mov #85, r1
-	shll8 r1
-	or r0, r1
-
-	mov #85, r7
-	shll16 r7
-	add #85 ,r7
-	shll8 r7
-	cmp/eq r1, r7
-	bf wrong
-
-okay:
-	pass
-
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/compact/orb.cgs b/sim/testsuite/sim/sh64/compact/orb.cgs
deleted file mode 100644
index 7e962f6fe69..00000000000
--- a/sim/testsuite/sim/sh64/compact/orb.cgs
+++ /dev/null
@@ -1,24 +0,0 @@
-# sh testcase for or.b #$imm8, @(r0, gbr) -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-
-	.global orb
-init:
-	# Init GBR and R0.
-	mov #30, r0
-	ldc r0, gbr	
-	mov #40, r0
-
-orb:
-	or.b #0, @(r0, gbr)
-	or.b #170, @(r0, gbr)
-	or.b #0, @(r0, gbr)
-	or.b #255, @(r0, gbr)
-
-okay:
-	pass
diff --git a/sim/testsuite/sim/sh64/compact/ori.cgs b/sim/testsuite/sim/sh64/compact/ori.cgs
deleted file mode 100644
index 63a5fb58740..00000000000
--- a/sim/testsuite/sim/sh64/compact/ori.cgs
+++ /dev/null
@@ -1,40 +0,0 @@
-# sh testcase for or #$imm8, r0 -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-
-	.global ori
-ori:
-	mov #1, r0
-	rotr r0
-	or #1, r0
-
-	mov #1, r7
-	rotr r7
-	add #1, r7
-	cmp/eq r0, r7
-	bf wrong
-
-	.global ori2
-ori2:
-	mov #85, r0
-	shll16 r0
-	shll8 r0
-	or #85, r0
-
-	mov #85, r7
-	shll16 r7
-	shll8 r7
-	add #85, r7
-	cmp/eq r0, r7
-	bf wrong
-
-okay:
-	pass
-	
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/compact/pref.cgs b/sim/testsuite/sim/sh64/compact/pref.cgs
deleted file mode 100644
index 065e0932e6c..00000000000
--- a/sim/testsuite/sim/sh64/compact/pref.cgs
+++ /dev/null
@@ -1,15 +0,0 @@
-# sh testcase for pref @$rn
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-
-	.global pref
-pref:
-	pref @r0
-	pref @r1
-	pref @r15
-	pass
diff --git a/sim/testsuite/sim/sh64/compact/rotcl.cgs b/sim/testsuite/sim/sh64/compact/rotcl.cgs
deleted file mode 100644
index 5e1a3b91137..00000000000
--- a/sim/testsuite/sim/sh64/compact/rotcl.cgs
+++ /dev/null
@@ -1,121 +0,0 @@
-# sh testcase for rotcl $rn -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-
-	.global rotcl
-
-rotcl:
-	clrt
-	mov #1, r1
-	rotcl r1
-	assert r1, #2
-	clrt
-	rotcl r1
-	assert r1, #4
-	clrt
-	rotcl r1
-	assert r1, #8
-	clrt
-	rotcl r1
-	assert r1, #16
-	clrt
-	rotcl r1
-	assert r1, #32
-	clrt
-	rotcl r1
-	rotcl r1
-	rotcl r1
-	rotcl r1
-	rotcl r1
-	rotcl r1
-	rotcl r1
-	rotcl r1
-	rotcl r1
-	rotcl r1
-	rotcl r1
-	rotcl r1
-	rotcl r1
-	rotcl r1
-	rotcl r1
-	rotcl r1
-	rotcl r1
-	rotcl r1
-	rotcl r1
-	rotcl r1
-	rotcl r1
-	rotcl r1
-	rotcl r1
-	rotcl r1
-	rotcl r1
-	rotcl r1
-	rotcl r1
-	bf wrong
-	rotcl r1
-	assert r1, #1
-
-	bra trotcl
-	nop
-
-wrong:
-	fail
-
-trotcl:
-	sett
-	mov #1, r1
-	rotcl r1
-	assert r1, #3
-	clrt
-	rotcl r1
-	assert r1, #6
-	clrt
-	rotcl r1
-	assert r1, #12
-	clrt
-	rotcl r1
-	assert r1, #24
-	clrt
-	rotcl r1
-	assert r1, #48
-	clrt
-	rotcl r1
-	rotcl r1
-	rotcl r1
-	rotcl r1
-	rotcl r1
-	rotcl r1
-	rotcl r1
-	rotcl r1
-	rotcl r1
-	rotcl r1
-	rotcl r1
-	rotcl r1
-	rotcl r1
-	rotcl r1
-	rotcl r1
-	rotcl r1
-	rotcl r1
-	rotcl r1
-	rotcl r1
-	rotcl r1
-	rotcl r1
-	rotcl r1
-	rotcl r1
-	rotcl r1
-	rotcl r1
-	rotcl r1
-	rotcl r1
-	rotcl r1
-	bf wrong2
-	assert r1, #1
-	rotcl r1
-	rotcl r1
-
-okay:	
-	pass
-wrong2:
-	fail
diff --git a/sim/testsuite/sim/sh64/compact/rotcr.cgs b/sim/testsuite/sim/sh64/compact/rotcr.cgs
deleted file mode 100644
index b53300ec54f..00000000000
--- a/sim/testsuite/sim/sh64/compact/rotcr.cgs
+++ /dev/null
@@ -1,103 +0,0 @@
-# sh testcase for rotcr $rn -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-
-	.global rotcr
-rotcr:
-	clrt
-	mov #1, r1
-	rotcr r1
-	bf wrong
-	assert r1, #0
-	sett
-	rotcr r1
-	rotcr r1
-	rotcr r1
-	rotcr r1
-	rotcr r1
-	rotcr r1
-	rotcr r1
-	rotcr r1
-	rotcr r1
-	rotcr r1
-	rotcr r1
-	rotcr r1
-	rotcr r1
-	rotcr r1
-	rotcr r1
-	rotcr r1
-	rotcr r1
-	rotcr r1
-	rotcr r1
-	rotcr r1
-	rotcr r1
-	rotcr r1
-	rotcr r1
-	rotcr r1
-	rotcr r1
-	rotcr r1
-	rotcr r1
-	rotcr r1
-	rotcr r1
-	rotcr r1
-	rotcr r1
-	rotcr r1
-	assert r1, #1
-	rotcr r1
-	bf wrong
-
-trotcr:
-	sett
-	mov #1, r1
-	rotcr r1
-	bf wrong
-	sett
-	rotcr r1
-	rotcr r1
-	rotcr r1
-	rotcr r1
-	rotcr r1
-	rotcr r1
-	rotcr r1
-	rotcr r1
-	rotcr r1
-	rotcr r1
-	rotcr r1
-	rotcr r1
-	rotcr r1
-	rotcr r1
-	rotcr r1
-	rotcr r1
-	rotcr r1
-	rotcr r1
-	rotcr r1
-	rotcr r1
-	rotcr r1
-	rotcr r1
-	rotcr r1
-	rotcr r1
-	rotcr r1
-	rotcr r1
-	rotcr r1
-	rotcr r1
-	rotcr r1
-	rotcr r1
-	rotcr r1
-	rotcr r1
-	bf wrong
-	assert r1, #1
-	rotcr r1
-	bf wrong
-	rotcr r1
-
-okay:	
-	pass
-wrong:
-	fail
-	
-
diff --git a/sim/testsuite/sim/sh64/compact/rotl.cgs b/sim/testsuite/sim/sh64/compact/rotl.cgs
deleted file mode 100644
index e292de7e437..00000000000
--- a/sim/testsuite/sim/sh64/compact/rotl.cgs
+++ /dev/null
@@ -1,62 +0,0 @@
-# sh testcase for rotl $rn -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-
-	.global rotl
-rotl:
-	mov #1, r1
-	rotl r1
-	assert r1, #2
-	rotl r1
-	assert r1, #4
-	rotl r1
-	assert r1, #8
-	rotl r1
-	assert r1, #16
-	rotl r1
-	assert r1, #32
-	rotl r1
-	assert r1, #64
-	rotl r1
-	rotl r1
-	rotl r1
-	rotl r1
-	rotl r1
-	rotl r1
-	rotl r1
-	rotl r1
-	rotl r1
-	rotl r1
-	rotl r1
-	rotl r1
-	rotl r1
-	rotl r1
-	rotl r1
-	rotl r1
-	rotl r1
-	rotl r1
-	rotl r1
-	rotl r1
-	rotl r1
-	rotl r1
-	rotl r1
-	rotl r1
-	rotl r1
-	rotl r1
-	bf wrong
-	assert r1, #1
-	rotl r1
-	rotl r1
-	rotl r1
-	assert r1, #8
-
-okay:	
-	pass
-
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/compact/rotr.cgs b/sim/testsuite/sim/sh64/compact/rotr.cgs
deleted file mode 100644
index 7f80f993aea..00000000000
--- a/sim/testsuite/sim/sh64/compact/rotr.cgs
+++ /dev/null
@@ -1,55 +0,0 @@
-# sh testcase for rotr $rn -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-
-	.global rotr
-rotr:
-	mov #1, r1
-	rotr r1
-	bf wrong
-	rotr r1
-	rotr r1
-	rotr r1
-	rotr r1
-	rotr r1
-	rotr r1
-	rotr r1
-	rotr r1
-	rotr r1
-	rotr r1
-	rotr r1
-	rotr r1
-	rotr r1
-	rotr r1
-	rotr r1
-	rotr r1
-	rotr r1
-	rotr r1
-	rotr r1
-	rotr r1
-	rotr r1
-	rotr r1
-	rotr r1
-	rotr r1
-	rotr r1
-	rotr r1
-	rotr r1
-	rotr r1
-	rotr r1
-	rotr r1
-	rotr r1
-	assert r1, #1
-	rotr r1
-	rotr r1
-	rotr r1
-
-okay:	
-	pass
-
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/compact/rts.cgs b/sim/testsuite/sim/sh64/compact/rts.cgs
deleted file mode 100644
index eeb8dce9332..00000000000
--- a/sim/testsuite/sim/sh64/compact/rts.cgs
+++ /dev/null
@@ -1,24 +0,0 @@
-# sh testcase for rts -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-
-	.global rts
-rts:
-	bsr subroutine
-slot:
-	nop
-return:
-	pass
-	fail
-
-subroutine:
-	rts
-rts_slot:
-	nop
-bad:
-	fail
diff --git a/sim/testsuite/sim/sh64/compact/sets.cgs b/sim/testsuite/sim/sh64/compact/sets.cgs
deleted file mode 100644
index f031701d6ee..00000000000
--- a/sim/testsuite/sim/sh64/compact/sets.cgs
+++ /dev/null
@@ -1,13 +0,0 @@
-# sh testcase for sets -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-
-	.global sets
-sets:
-	sets
-	pass
diff --git a/sim/testsuite/sim/sh64/compact/sett.cgs b/sim/testsuite/sim/sh64/compact/sett.cgs
deleted file mode 100644
index 9ae8af536e7..00000000000
--- a/sim/testsuite/sim/sh64/compact/sett.cgs
+++ /dev/null
@@ -1,16 +0,0 @@
-# sh testcase for sett -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-
-	.global sett
-sett:
-	sett
-	bf wrong
-	pass
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/compact/shad.cgs b/sim/testsuite/sim/sh64/compact/shad.cgs
deleted file mode 100644
index 340743d8f1f..00000000000
--- a/sim/testsuite/sim/sh64/compact/shad.cgs
+++ /dev/null
@@ -1,58 +0,0 @@
-# sh testcase for shad $rm, $rn -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-
-	.global null
-null:
-	mov #1, r0
-	mov #0, r1
-	shad r1, r0
-	# no shift is performed.
-	assert r0, #1
-
-	.global gt0
-gt0:
-	mov #4, r0
-	mov #3, r1
-	shad r1, r0
-	# shift left 3 bits.
-	assert r0, #32
-
-	.global lt0
-lt0:
-	mov #32, r0
-	mov #3, r1
-	neg r1, r1
-	shad r1, r0
-	# shift right 3 bits.
-	assert r0, #4
-
-	.global fillpos
-fillpos:
-	mov #1, r0
-	mov #1, r1
-	rotr r1
-	shad r1, r0
-	# check result.
-	assert r0, #0
-
-	.global fillneg
-fillneg:
-	mov #1, r0
-	neg r0, r0
-	mov #1, r1
-	rotr r1
-	shad r1, r0
-	# check result.
-	not r0, r0
-	assert r0, #0
-	
-okay:
-	pass
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/compact/shal.cgs b/sim/testsuite/sim/sh64/compact/shal.cgs
deleted file mode 100644
index dfea947e856..00000000000
--- a/sim/testsuite/sim/sh64/compact/shal.cgs
+++ /dev/null
@@ -1,57 +0,0 @@
-# sh testcase for shal $rn -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-
-	.global shal
-shal:
-	mov #1, r1
-	shal r1
-	assert r1, #2
-	shal r1
-	assert r1, #4
-	shal r1
-	assert r1, #8
-	shal r1
-	assert r1, #16
-	shal r1
-	assert r1, #32
-	shal r1
-	assert r1, #64
-	shal r1
-	shal r1
-	shal r1
-	shal r1
-	shal r1
-	shal r1
-	shal r1
-	shal r1
-	shal r1
-	shal r1
-	shal r1
-	shal r1
-	shal r1
-	shal r1
-	shal r1
-	shal r1
-	shal r1
-	shal r1
-	shal r1
-	shal r1
-	shal r1
-	shal r1
-	shal r1
-	shal r1
-	shal r1
-	shal r1
-	assert r1, #0
-
-okay:	
-	pass
-wrong:
-	fail
-	
diff --git a/sim/testsuite/sim/sh64/compact/shar.cgs b/sim/testsuite/sim/sh64/compact/shar.cgs
deleted file mode 100644
index e3e92fca080..00000000000
--- a/sim/testsuite/sim/sh64/compact/shar.cgs
+++ /dev/null
@@ -1,40 +0,0 @@
-# sh testcase for shar $rn -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-
-	.global shar
-shar:
-	mov #0, r0
-	or #192, r0
-	shar r0
-	bt wrong
-	shar r0
-	bt wrong
-	shar r0
-	bt wrong
-	shar r0
-	bt wrong
-	shar r0
-	bt wrong
-	shar r0
-	bt wrong
-	shar r0
-	bf wrong
-	shar r0
-	bf wrong
-	shar r0
-	bt wrong
-	shar r0
-	bt wrong
-	assert r0, #0
-
-okay:
-	pass
-wrong:
-	fail
-	
diff --git a/sim/testsuite/sim/sh64/compact/shld.cgs b/sim/testsuite/sim/sh64/compact/shld.cgs
deleted file mode 100644
index 32e4100259d..00000000000
--- a/sim/testsuite/sim/sh64/compact/shld.cgs
+++ /dev/null
@@ -1,48 +0,0 @@
-# sh testcase for shld $rm, $rn -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-
-	.global null
-null:
-	mov #1, r0
-	mov #0, r1
-	shld r1, r0
-	# no shift is performed.
-	assert r0, #1
-
-	.global gt0
-gt0:
-	mov #4, r0
-	mov #3, r1
-	shld r1, r0
-	# shift left 3 bits.
-	assert r0, #32
-
-	.global lt0
-lt0:
-	mov #32, r0
-	mov #3, r1
-	neg r1, r1
-	shld r1, r0
-	# shift right 3 bits.
-	assert r0, #4
-
-	.global fill
-fill:
-	mov #1, r0
-	rotr r0
-	mov #1, r1
-	rotr r1
-	shld r1, r0
-	assert r0, #0
-	
-okay:
-	pass
-wrong:
-	fail
-	
diff --git a/sim/testsuite/sim/sh64/compact/shll.cgs b/sim/testsuite/sim/sh64/compact/shll.cgs
deleted file mode 100644
index 882f2c2e1ef..00000000000
--- a/sim/testsuite/sim/sh64/compact/shll.cgs
+++ /dev/null
@@ -1,57 +0,0 @@
-# sh testcase for shll $rn -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-
-	.global shll
-shll:
-	mov #1, r1
-	shll r1
-	shll r1
-	shll r1
-	shll r1
-	shll r1
-	shll r1
-	shll r1
-	shll r1
-	shll r1
-	shll r1
-	shll r1
-	shll r1
-	shll r1
-	shll r1
-	shll r1
-	shll r1
-	shll r1
-	shll r1
-	shll r1
-	shll r1
-	shll r1
-	shll r1
-	shll r1
-	shll r1
-	shll r1
-	shll r1
-	shll r1
-	shll r1
-	shll r1
-	shll r1
-	shll r1
-	shll r1
-	shll r1
-	assert r1, #0
-another:
-	mov #1, r1
-	shll r1
-	shll r1
-	shll r1
-	assert r1, #8
-
-okay:	
-	pass
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/compact/shll16.cgs b/sim/testsuite/sim/sh64/compact/shll16.cgs
deleted file mode 100644
index 0637c3de706..00000000000
--- a/sim/testsuite/sim/sh64/compact/shll16.cgs
+++ /dev/null
@@ -1,44 +0,0 @@
-# sh testcase for shll16 $rn -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-
-	.global shll16
-shll16:
-	mov #108, r1
-	shll16 r1
-	shll16 r1
-	assert r1, #0
-
-another:
-	mov #1, r1
-	shll16 r1
-	mov #1, r7
-	shll r7
-	shll r7
-	shll r7
-	shll r7
-	shll r7
-	shll r7
-	shll r7
-	shll r7
-	shll r7
-	shll r7
-	shll r7
-	shll r7
-	shll r7
-	shll r7
-	shll r7
-	shll r7
-	cmp/eq r1, r7
-	bf wrong
-		
-okay:
-	pass
-
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/compact/shll2.cgs b/sim/testsuite/sim/sh64/compact/shll2.cgs
deleted file mode 100644
index 6e28c664307..00000000000
--- a/sim/testsuite/sim/sh64/compact/shll2.cgs
+++ /dev/null
@@ -1,40 +0,0 @@
-# sh testcase for shll2 $rn -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-
-	.global shll2
-shll2:
-	mov #1, r1
-	shll2 r1
-	shll2 r1
-	shll2 r1
-	shll2 r1
-	shll2 r1
-	shll2 r1
-	shll2 r1
-	shll2 r1
-	shll2 r1
-	shll2 r1
-	shll2 r1
-	shll2 r1
-	shll2 r1
-	shll2 r1
-	shll2 r1
-	shll2 r1
-	assert r1, #0
-
-another:
-	mov #1, r1
-	shll2 r1
-	assert r1, #4
-	
-okay:
-	pass
-
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/compact/shll8.cgs b/sim/testsuite/sim/sh64/compact/shll8.cgs
deleted file mode 100644
index fe455ec753d..00000000000
--- a/sim/testsuite/sim/sh64/compact/shll8.cgs
+++ /dev/null
@@ -1,38 +0,0 @@
-# sh testcase for shll8 $rn -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-
-	.global shll8
-shll8:
-	mov #1, r1
-	shll8 r1
-	shll8 r1
-	shll8 r1
-	shll8 r1
-	assert r1, #0
-
-another:
-	mov #1, r1
-	shll8 r1
-	mov #1, r7
-	shll r7
-	shll r7
-	shll r7
-	shll r7
-	shll r7
-	shll r7
-	shll r7
-	shll r7
-	cmp/eq r1, r7
-	bf wrong
-
-okay:
-	pass
-
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/compact/shlr.cgs b/sim/testsuite/sim/sh64/compact/shlr.cgs
deleted file mode 100644
index 9d86461b959..00000000000
--- a/sim/testsuite/sim/sh64/compact/shlr.cgs
+++ /dev/null
@@ -1,33 +0,0 @@
-# sh testcase for shlr $rn -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-
-	.global shlr
-shlr:
-	mov #0, r0
-	or #192, r0
-	shlr r0
-	shlr r0
-	shlr r0
-	shlr r0
-	shlr r0
-	shlr r0
-	# Make sure a bit is shifted into T.
-	shlr r0
-	bf wrong
-	# Ditto.
-	shlr r0
-	bf wrong
-	shlr r0
-	assert r0, #0
-
-okay:	
-	pass
-
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/compact/shlr16.cgs b/sim/testsuite/sim/sh64/compact/shlr16.cgs
deleted file mode 100644
index 7bfc62788f3..00000000000
--- a/sim/testsuite/sim/sh64/compact/shlr16.cgs
+++ /dev/null
@@ -1,14 +0,0 @@
-# sh testcase for shlr16 $rn
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-
-	.global shrl16
-shrl16:
-	shlr16 r0
-
-	pass
diff --git a/sim/testsuite/sim/sh64/compact/shlr2.cgs b/sim/testsuite/sim/sh64/compact/shlr2.cgs
deleted file mode 100644
index 6f085979443..00000000000
--- a/sim/testsuite/sim/sh64/compact/shlr2.cgs
+++ /dev/null
@@ -1,14 +0,0 @@
-# sh testcase for shlr2 $rn
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-
-	.global shrl2
-shrl2:
-	shlr2 r0
-
-	pass
diff --git a/sim/testsuite/sim/sh64/compact/shlr8.cgs b/sim/testsuite/sim/sh64/compact/shlr8.cgs
deleted file mode 100644
index 82040b581b8..00000000000
--- a/sim/testsuite/sim/sh64/compact/shlr8.cgs
+++ /dev/null
@@ -1,14 +0,0 @@
-# sh testcase for shlr8 $rn
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-
-	.global shrl8
-shrl8:
-	shlr8 r0
-
-	pass
diff --git a/sim/testsuite/sim/sh64/compact/stc-gbr.cgs b/sim/testsuite/sim/sh64/compact/stc-gbr.cgs
deleted file mode 100644
index 1b84008c9d2..00000000000
--- a/sim/testsuite/sim/sh64/compact/stc-gbr.cgs
+++ /dev/null
@@ -1,21 +0,0 @@
-# sh testcase for stc gbr, $rn -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-
-	.global stc_gbr
-stc_gbr:
-	stc gbr, r1
-	mov #42, r1
-	ldc r1, gbr
-	stc gbr, r2
-	cmp/eq r1, r2
-	bf wrong
-okay:
-	pass
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/compact/stcl-gbr.cgs b/sim/testsuite/sim/sh64/compact/stcl-gbr.cgs
deleted file mode 100644
index 3e74cc551de..00000000000
--- a/sim/testsuite/sim/sh64/compact/stcl-gbr.cgs
+++ /dev/null
@@ -1,27 +0,0 @@
-# sh testcase for stc.l gbr, @-$rn -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-
-	.global stcl_gbr
-stcl_gbr:
-	mov #42, r0
-	ldc r0, gbr
-	mov #40, r0
-	shll8 r0
-	# save address
-	mov r0, r1
-	stc.l gbr, @-r0
-
-	add #4, r0
-	cmp/eq r0, r1
-	bf wrong
-
-okay:
-	pass
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/compact/sts-fpscr.cgs b/sim/testsuite/sim/sh64/compact/sts-fpscr.cgs
deleted file mode 100644
index 42724b44fff..00000000000
--- a/sim/testsuite/sim/sh64/compact/sts-fpscr.cgs
+++ /dev/null
@@ -1,23 +0,0 @@
-# sh testcase for sts fpscr, $rn -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-
-	.global sts_fpscr
-sts_fpscr:
-	sts fpscr, r0
-	mov #42, r0
-	lds r0, fpscr
-	sts fpscr, r1
-	cmp/eq r0, r1
-	bf wrong
-
-okay:
-	pass
-wrong:
-	fail
-
diff --git a/sim/testsuite/sim/sh64/compact/sts-fpul.cgs b/sim/testsuite/sim/sh64/compact/sts-fpul.cgs
deleted file mode 100644
index ddbdaf15fb2..00000000000
--- a/sim/testsuite/sim/sh64/compact/sts-fpul.cgs
+++ /dev/null
@@ -1,14 +0,0 @@
-# sh testcase for sts fpul, $rn -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-
-	.global sts_fpul
-sts_fpul:
-	# This is properly exercised by the lds-fpul test case.
-	sts fpul, r1
-	pass
diff --git a/sim/testsuite/sim/sh64/compact/sts-mach.cgs b/sim/testsuite/sim/sh64/compact/sts-mach.cgs
deleted file mode 100644
index 4d34bc17aa8..00000000000
--- a/sim/testsuite/sim/sh64/compact/sts-mach.cgs
+++ /dev/null
@@ -1,22 +0,0 @@
-# sh testcase for sts mach, $rn -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-
-	.global sts_mach
-sts_mach:
-	mov #42, r0
-	lds r0, mach
-	sts mach, r1
-	cmp/eq r0, r1
-	bf wrong
-
-okay:
-	pass
-wrong:
-	fail
-	
diff --git a/sim/testsuite/sim/sh64/compact/sts-macl.cgs b/sim/testsuite/sim/sh64/compact/sts-macl.cgs
deleted file mode 100644
index b805f796e44..00000000000
--- a/sim/testsuite/sim/sh64/compact/sts-macl.cgs
+++ /dev/null
@@ -1,21 +0,0 @@
-# sh testcase for sts macl, $rn -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-
-	.global sts_macl
-sts_macl:
-	mov #42, r0
-	lds r0, macl
-	sts macl, r1
-	cmp/eq r0, r1
-	bf wrong
-
-okay:
-	pass
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/compact/sts-pr.cgs b/sim/testsuite/sim/sh64/compact/sts-pr.cgs
deleted file mode 100644
index 3e4f6ee880a..00000000000
--- a/sim/testsuite/sim/sh64/compact/sts-pr.cgs
+++ /dev/null
@@ -1,22 +0,0 @@
-# sh testcase for sts pr, $rn -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-
-	.global sts_pr
-sts_pr:
-	mov #42, r0
-	lds r0, pr
-	sts pr, r1
-	cmp/eq r0, r1
-	bf wrong
-
-okay:
-	pass
-wrong:
-	fail
-	
diff --git a/sim/testsuite/sim/sh64/compact/stsl-fpscr.cgs b/sim/testsuite/sim/sh64/compact/stsl-fpscr.cgs
deleted file mode 100644
index 032870dc189..00000000000
--- a/sim/testsuite/sim/sh64/compact/stsl-fpscr.cgs
+++ /dev/null
@@ -1,28 +0,0 @@
-# sh testcase for sts.l fpscr, @-$rn -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-
-	.global stsl_fpscr
-stsl_fpscr:
-	mov #40, r0
-	shll8 r0
-	# Preserve r0.
-	mov r0, r7
-	sts.l fpscr, @-r0
-
-check:
-	# Ensure r0 is decremented.
-	add #4, r0
-	cmp/eq r0, r7
-	bf wrong
-
-okay:	
-	pass
-wrong:
-	fail
-	
diff --git a/sim/testsuite/sim/sh64/compact/stsl-fpul.cgs b/sim/testsuite/sim/sh64/compact/stsl-fpul.cgs
deleted file mode 100644
index 89bd9e73849..00000000000
--- a/sim/testsuite/sim/sh64/compact/stsl-fpul.cgs
+++ /dev/null
@@ -1,27 +0,0 @@
-# sh testcase for sts.l fpul, @-$rn -*- Asm -*_
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-
-	.global stsl_fpul
-stsl_fpul:
-	mov #40, r0
-	shll8 r0
-	# Preserve r0.
-	mov r0, r7
-	sts.l fpul, @-r0
-
-dec:
-	# Check for proper pre-decrementing.
-	add #4, r0
-	cmp/eq r0, r7
-	bf wrong
-	
-okay:
-	pass
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/compact/stsl-mach.cgs b/sim/testsuite/sim/sh64/compact/stsl-mach.cgs
deleted file mode 100644
index e15bddece29..00000000000
--- a/sim/testsuite/sim/sh64/compact/stsl-mach.cgs
+++ /dev/null
@@ -1,42 +0,0 @@
-# sh testcase for sts.l mach, @-$rn -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-
-	.global stsl_mach
-stsl_mach:
-	# Build up a distinctive bit pattern.
-	mov #1, r0
-	shll8 r0
-	add #12, r0
-	shll8 r0
-	add #85, r0
-	shll8 r0
-	add #170, r0
-	
-	lds r0, mach
-	mov #40, r2
-	shll8 r2
-	# Preserve r2.
-	mov r2, r7
-	sts.l mach, @-r2
-
-	# check results.
-	mov.l @r2, r3
-	cmp/eq r0, r3
-	bf wrong
-
-	# Ensure decrement occurred.
-	add #4, r2
-	cmp/eq r2, r7
-	bf wrong
-
-okay:
-	pass
-wrong:
-	fail
-	
diff --git a/sim/testsuite/sim/sh64/compact/stsl-macl.cgs b/sim/testsuite/sim/sh64/compact/stsl-macl.cgs
deleted file mode 100644
index 854ef341552..00000000000
--- a/sim/testsuite/sim/sh64/compact/stsl-macl.cgs
+++ /dev/null
@@ -1,42 +0,0 @@
-# sh testcase for sts.l macl, @-$rn -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-
-	.global stsl_macl
-stsl_macl:
-	# Build up a distinctive bit pattern.
-	mov #1, r0
-	shll8 r0
-	add #12, r0
-	shll8 r0
-	add #85, r0
-	shll8 r0
-	add #170, r0
-	
-	lds r0, macl
-	mov #40, r2
-	shll8 r2
-	# Preserve r2.
-	mov r2, r7
-	sts.l macl, @-r2
-
-	# check results.
-	mov.l @r2, r3
-	cmp/eq r0, r3
-	bf wrong
-
-	# Ensure decrement occurred.
-	add #4, r2
-	cmp/eq r2, r7
-	bf wrong
-
-okay:
-	pass
-wrong:
-	fail
-	
diff --git a/sim/testsuite/sim/sh64/compact/stsl-pr.cgs b/sim/testsuite/sim/sh64/compact/stsl-pr.cgs
deleted file mode 100644
index b519c9bb5bd..00000000000
--- a/sim/testsuite/sim/sh64/compact/stsl-pr.cgs
+++ /dev/null
@@ -1,42 +0,0 @@
-# sh testcase for sts.l pr, @-$rn -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-
-	.global stsl_pr
-stsl_pr:
-	# Build up a distinctive bit pattern.
-	mov #1, r0
-	shll8 r0
-	add #12, r0
-	shll8 r0
-	add #85, r0
-	shll8 r0
-	add #170, r0
-	
-	lds r0, pr
-	mov #40, r2
-	shll8 r2
-	# Preserve r2.
-	mov r2, r7
-	sts.l pr, @-r2
-
-	# check results.
-	mov.l @r2, r3
-	cmp/eq r0, r3
-	bf wrong
-
-	# Ensure decrement occurred.
-	add #4, r2
-	cmp/eq r2, r7
-	bf wrong
-
-okay:
-	pass
-wrong:
-	fail
-	
diff --git a/sim/testsuite/sim/sh64/compact/sub.cgs b/sim/testsuite/sim/sh64/compact/sub.cgs
deleted file mode 100644
index 3ba29f872aa..00000000000
--- a/sim/testsuite/sim/sh64/compact/sub.cgs
+++ /dev/null
@@ -1,68 +0,0 @@
-# sh testcase for sub $rm, $rn -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-
-	.global sub1
-sub1:
-	# 0 - x.
-	mov #0, r0
-	mov #3, r1
-	sub r1, r0
-
-	mov #2, r7
-	not r7, r7
-	cmp/eq r7, r0
-	bf wrong
-
-	.global sub2
-sub2:
-	# x - 0.
-	mov #0, r0
-	mov #3, r1
-	sub r0, r1
-	assert r1, #3
-
-	.global sub3
-sub3:
-	# x - y.
-	mov #4, r0
-	mov #3, r1
-	sub r0, r1
-
-	mov #0, r7
-	not r7, r7
-	cmp/eq r7, r1
-	bf wrong
-
-	.global sub4
-sub4:
-	# y - x.
-	mov #4, r0
-	mov #3, r1
-	sub r1, r0
-	assert r0, #1
-	
-	.global sub5
-sub5:
-	# y - y == 0 (where y are in two distinct registers).
-	mov #4, r0
-	mov #4, r1
-	sub r1, r0
-	assert r0, #0
-
-	.global sub6
-sub6:
-	# y - y = 0 (where y is the same register).
-	mov #4, r1
-	sub r1, r1
-	assert r1, #0
-
-okay:
-	pass
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/compact/subc.cgs b/sim/testsuite/sim/sh64/compact/subc.cgs
deleted file mode 100644
index cda1e84ae9d..00000000000
--- a/sim/testsuite/sim/sh64/compact/subc.cgs
+++ /dev/null
@@ -1,109 +0,0 @@
-# sh testcase for subc $rm, $rn -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-zero:
-	mov #0, r0
-	mov #0, r1
-	clrt
-	subc r0, r1
-	assert r1, #0
-
-zerot:
-	mov #0, r0
-	mov #0, r1
-	sett
-	subc r0, r1
-	# Invert all 1's to all 0's for ease of comparison.
-	not r1, r1
-	assert r1, #0
-
-null:
-	mov #0, r0
-	mov #10, r1
-	clrt
-	subc r0, r1
-	assert r1, #10
-
-nullt:
-	mov #0, r0
-	mov #10, r1
-	sett
-	subc r0, r1
-	assert r1, #9
-
-subc:
-	mov #10, r0
-	mov #0, r1
-	clrt
-	subc r0, r1
-	# Again, invert ..
-	not r1, r1
-	assert r1, #9
-
-subct:
-	mov #10, r0
-	mov #0, r1
-	sett
-	subc r0, r1
-	# Again, invert ..
-	not r1, r1
-	assert r1, #10
-
-subc2:
-	mov #10, r0
-	mov #20, r1
-	clrt
-	subc r0, r1
-	assert r1, #10
-
-subc2t:
-	mov #20, r0
-	mov #10, r1
-	sett
-	subc r0, r1
-	# Again, invert ..
-	not r1, r1
-	assert r1, #10
-
-subc3:
-	mov #5, r0
-	mov #5, r1
-	clrt
-	subc r0, r1
-	assert r1, #0
-
-subc3t:
-	mov #5, r0
-	mov #5, r1
-	sett
-	subc r0, r1
-	# Again, invert ..
-	not r1, r1
-	assert r1, #0
-	
-large:
-	mov #2, r0
-	mov #10, r1
-	clrt
-	subc r1, r0
-	# Again, invert ..
-	not r0, r0
-	assert r0, #7
-
-larget:
-	mov #2, r0
-	mov #10, r1
-	sett
-	subc r0, r1
-	assert r1, #7
-
-okay:
-	pass
-
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/compact/subv.cgs b/sim/testsuite/sim/sh64/compact/subv.cgs
deleted file mode 100644
index ceb8c64e7fd..00000000000
--- a/sim/testsuite/sim/sh64/compact/subv.cgs
+++ /dev/null
@@ -1,55 +0,0 @@
-# sh testcase for subv $rm, $rn -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-zero:
-	mov #0, r0
-	mov #0, r1
-	subv r0, r1
-	bt wrong
-	assert r1, #0
-
-one:
-	mov #10, r0
-	mov #0, r1
-	subv r0, r1
-	bt wrong
-	not r1, r1
-	assert r1, #9
-
-large:
-	# Produce MAXINT in R0.
-	mov #0, r0
-	not r0, r0
-	shlr r0
-
-	# Put -3 into R1.
-	mov #3, r1
-	neg r1, r1
-
-	# Subtract them and underflow.
-	subv r0, r1
-	bf wrong
-
-another:
-	# Produce MAXINT in R0.
-	mov #0, r0
-	not r0, r0
-	shlr r0
-	
-	# Put -3 into R1.
-	mov #3, r1
-	neg r1, r1
-	
-	# Subtract them and overflow.
-	subv r1, r0
-	bf wrong
-		
-okay:
-	pass
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/compact/swapb.cgs b/sim/testsuite/sim/sh64/compact/swapb.cgs
deleted file mode 100644
index 22f6f16a2e1..00000000000
--- a/sim/testsuite/sim/sh64/compact/swapb.cgs
+++ /dev/null
@@ -1,44 +0,0 @@
-# sh testcase for swap.b $rm, $rn -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-
-init:
-	# Build up a distinctive bit pattern.
-	mov #1, r0
-	shll8 r0
-	add #12, r0
-	shll8 r0
-	add #85, r0
-	shll8 r0
-	add #70, r0
-
-test:	
-	# Swap the lower two bytes into a different register.
-	swap.b r0, r1
-	mov #1, r7
-	shll8 r7
-	add #12, r7
-	shll8 r7
-	add #70, r7
-	shll8 r7
-	add #85, r7
-	cmp/eq r1, r7
-	bf wrong
-
-swapback:
-	# Swap the lower two bytes into the same registers.
-	# R0 should now equal R1.
-	swap.b r1, r2
-	cmp/eq r0, r2
-	bf wrong
-
-okay:
-	pass
-
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/compact/swapw.cgs b/sim/testsuite/sim/sh64/compact/swapw.cgs
deleted file mode 100644
index fa1ab697f27..00000000000
--- a/sim/testsuite/sim/sh64/compact/swapw.cgs
+++ /dev/null
@@ -1,43 +0,0 @@
-# sh testcase for swap.w $rm, $rn -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-
-	.global swapw
-swapw:
-	# Build up a characteristic bit pattern in R0.
-	mov #85, r0
-	shll16 r0
-	add #3, r0
-	rotr r0
-	rotr r0
-	or #170, r0
-	# Preserve for later.
-	mov r0, r8
-
-test:	
-	swap.w r0, r1
-	mov #64, r0
-	shll8 r0
-	or #170, r0
-	shll8 r0
-	or #192, r0
-	shll8 r0
-	or #21, r0
-	cmp/eq r1, r0
-	bf wrong
-
-swapback:
-	swap.w r1, r2
-	cmp/eq r2, r8
-	bf wrong
-
-okay:
-	pass
-
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/compact/tasb.cgs b/sim/testsuite/sim/sh64/compact/tasb.cgs
deleted file mode 100644
index cb7f61870d2..00000000000
--- a/sim/testsuite/sim/sh64/compact/tasb.cgs
+++ /dev/null
@@ -1,26 +0,0 @@
-# sh testcase for tas.b @$rn -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-
-tasb1:
-	mov #40, r0
-	shll8 r0
-	tas.b @r0
-	bf wrong
-
-tasb2:
-	mov #40, r0
-	shll8 r0
-	tas.b @r0
-	bt wrong
-
-okay:
-	pass
-
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/compact/testutils.inc b/sim/testsuite/sim/sh64/compact/testutils.inc
deleted file mode 100644
index b1ad830578b..00000000000
--- a/sim/testsuite/sim/sh64/compact/testutils.inc
+++ /dev/null
@@ -1,49 +0,0 @@
-# Support macros for the assembly test cases.
-
-	.macro start
-	.text
-	.global start
-start:
-	.endm
-
-	# Perform a single to double precision floating point conversion.
-	.macro _s2d fpr dpr
-	flds \fpr, fpul
-	_setpr
-	fcnvsd fpul, \dpr
-	_clrpr
-	.endm
-
-	# Set the PR (PRecision) bit in the FPSCR.
-	.macro _setpr
-	sts fpscr, r7
-	mov #8, r8
-	shll16 r8
-	or r8, r7
-	lds r7, fpscr
-	.endm
-
-	# Clear the PR bit.
-	.macro _clrpr
-	sts fpscr, r7
-	mov #8, r8
-	shll16 r8
-	not r8, r8
-	and r8, r7
-	lds r7, fpscr
-	.endm
-
-	# nb: this macro clobbers R7. 
-	.macro assert reg value
-	mov \value, r7
-	cmp/eq \reg, r7
-	bf wrong
-	.endm
-
-	.macro pass
-	trapa #253
-	.endm
-
-	.macro fail
-	trapa #254
-	.endm
diff --git a/sim/testsuite/sim/sh64/compact/trapa.cgs b/sim/testsuite/sim/sh64/compact/trapa.cgs
deleted file mode 100644
index 24f8a6b13ba..00000000000
--- a/sim/testsuite/sim/sh64/compact/trapa.cgs
+++ /dev/null
@@ -1,13 +0,0 @@
-# sh testcase for trapa #$imm8 -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-
-	.global trapa
-trapa:
-	# pass is a macro for "trapa #253".
-	trapa #253
diff --git a/sim/testsuite/sim/sh64/compact/tst.cgs b/sim/testsuite/sim/sh64/compact/tst.cgs
deleted file mode 100644
index a72b8a9a743..00000000000
--- a/sim/testsuite/sim/sh64/compact/tst.cgs
+++ /dev/null
@@ -1,62 +0,0 @@
-# sh testcase for tst $rm, $rn
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-
-	.global tst1
-tst1:
-	mov #0, r0
-	mov #0, r1
-	tst r0, r0
-	bf wrong
-
-test2:
-	mov #0, r0
-	mov #1, r1
-	tst r0, r1
-	bf wrong
-
-test3:
-	mov #0, r0
-	mov #1, r1
-	tst r1, r0
-	bf wrong
-
-test4:
-	mov #1, r0
-	mov #1, r1
-	tst r0, r1
-	bt wrong
-
-test5:
-	mov #1, r0
-	rotr r0
-	add #85, r0
-	shll16 r0
-	add #12, r0
-	mov #1, r1
-	rotr r1
-	add #85, r1
-	shll16 r1
-	add #12, r1
-	tst r0, r1
-	bt wrong
-
-test6:
-	mov #1, r0
-	rotr r0
-	add #85, r0
-	shll16 r0
-	add #12, r0
-	mov #1, r1
-	tst r0, r1
-	bf wrong
-
-okay:
-	pass
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/compact/tstb.cgs b/sim/testsuite/sim/sh64/compact/tstb.cgs
deleted file mode 100644
index 1b3829b1d30..00000000000
--- a/sim/testsuite/sim/sh64/compact/tstb.cgs
+++ /dev/null
@@ -1,30 +0,0 @@
-# sh testcase for tst.b #$imm8, @(r0, gbr) -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-
-	.global orb
-init:
-	# Init GBR and R0.
-	mov #30, r0
-	ldc r0, gbr	
-	mov #40, r0
-
-orb:
-	tst.b #0, @(r0, gbr)
-	bf wrong
-	tst.b #170, @(r0, gbr)
-	bf wrong
-	tst.b #0, @(r0, gbr)
-	bf wrong
-	tst.b #255, @(r0, gbr)
-
-okay:
-	pass
-wrong:
-	fail
-	
diff --git a/sim/testsuite/sim/sh64/compact/tsti.cgs b/sim/testsuite/sim/sh64/compact/tsti.cgs
deleted file mode 100644
index e088029b470..00000000000
--- a/sim/testsuite/sim/sh64/compact/tsti.cgs
+++ /dev/null
@@ -1,32 +0,0 @@
-# sh testcase for tst #$imm8, r0 -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-
-	.global tsti
-tsti:
-	mov #0, r0
-	tst #0, r0
-
-tsti2:
-	mov #0, r0
-	tst #1, r0
-
-tsti3:
-	mov #1, r0
-	tst #0, r0
-
-tsti4:
-	mov #1, r0
-	tst #1, r0
-
-tsti5:
-	mov #255, r0
-	tst #255, r0
-
-okay:
-	pass
diff --git a/sim/testsuite/sim/sh64/compact/xor.cgs b/sim/testsuite/sim/sh64/compact/xor.cgs
deleted file mode 100644
index d158aaf3713..00000000000
--- a/sim/testsuite/sim/sh64/compact/xor.cgs
+++ /dev/null
@@ -1,70 +0,0 @@
-# sh testcase for xor $rm64, $rn64 -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-
-	.global xor
-xor:
-	# 0 (+) 1 = 1.
-	mov #0, r0
-	mov #1, r1
-	xor r0, r1
-	assert r1, #1
-
-xor2:
-	# 1 (+) 0 = 0.
-	mov #1, r0
-	mov #0, r1
-	xor r0, r1
-	assert r1, #1
-
-xor3:
-	# 0 (+) 0 = 0.
-	mov #0, r0
-	mov #0, r1
-	xor r0, r1
-	assert r1, #0
-
-xor4:
-	# 0 (+) 0 = 0.
-	mov #0, r0
-	xor r0, r0
-	assert r0, #0
-
-xor5:
-	mov #0, r0
-	or #85, r0
-	shll16 r0
-	or #170, r0
-	mov r0, r1
-	mov #0, r0
-	or #85, r0
-	shll16 r0
-	or #170, r0
-	xor r1, r0
-	assert r0, #0
-
-xor6:
-	mov #0, r0
-	or #85, r0
-	shll16 r0
-	or #170, r0
-	mov r0, r1
-	mov #0, r0
-	or #85, r0
-	shll16 r0
-	or #12, r0
-	xor r0, r1
-	mov #0, r0
-	or #166, r0
-	cmp/eq r0, r1
-	bf wrong
-
-okay:
-	pass
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/compact/xorb.cgs b/sim/testsuite/sim/sh64/compact/xorb.cgs
deleted file mode 100644
index b31464b3c13..00000000000
--- a/sim/testsuite/sim/sh64/compact/xorb.cgs
+++ /dev/null
@@ -1,24 +0,0 @@
-# sh testcase for xor.b #$imm8, @(r0, gbr) -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-
-	.global orb
-init:
-	# Init GBR and R0.
-	mov #30, r0
-	ldc r0, gbr	
-	mov #40, r0
-
-orb:
-	xor.b #0, @(r0, gbr)
-	xor.b #170, @(r0, gbr)
-	xor.b #0, @(r0, gbr)
-	xor.b #255, @(r0, gbr)
-
-okay:
-	pass
diff --git a/sim/testsuite/sim/sh64/compact/xori.cgs b/sim/testsuite/sim/sh64/compact/xori.cgs
deleted file mode 100644
index 732b9ec5c48..00000000000
--- a/sim/testsuite/sim/sh64/compact/xori.cgs
+++ /dev/null
@@ -1,50 +0,0 @@
-# sh testcase for xor #$imm8, r0 -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-
-	.global xori
-xori:
-	# 0 (+) 1 = 1.
-	mov #0, r0
-	xor #1, r0
-	assert r0, #1
-
-xori2:
-	# 1 (+) 0 = 1.
-	mov #1, r0
-	xor #0, r0
-	assert r0, #1
-
-xori3:
-	# 1 (+) 1 = 0.
-	mov #1, r0
-	xor #1, r0
-	assert r0, #0
-
-xori4:
-	# 255 (+) 255 = 0.
-	mov #0, r0
-	or #255, r0
-	xor #255, r0
-	assert r0, #0
-
-xori5:
-	# 0 (+) 255 = 255.
-	mov #0, r0
-	xor #255, r0
-	mov r0, r1
-
-	mov #0, r0
-	or #255, r0
-	cmp/eq r0, r1
-	bf wrong
-
-okay:
-	pass
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/compact/xtrct.cgs b/sim/testsuite/sim/sh64/compact/xtrct.cgs
deleted file mode 100644
index 11dae7cbdec..00000000000
--- a/sim/testsuite/sim/sh64/compact/xtrct.cgs
+++ /dev/null
@@ -1,46 +0,0 @@
-# sh testcase for xtrct $rm, $rn -*- Asm -*-
-# mach: all
-# as: -isa=shcompact
-# ld: -m shelf32
-
-	.include "compact/testutils.inc"
-
-	start
-
-init:
-	mov #170, r0
-	shll8 r0
-	add #1, r0
-	shll8 r0
-	add #66, r0
-	shll8 r0
-	mov r0, r1
-
-	mov #85, r0
-	shll8 r0
-	add #2, r0
-	shll8 r0
-	add #42, r0
-	shll8 r0
-	add #3, r0
-
-copy:
-	mov r0, r3
-	mov r1, r4
-
-xtrct:
-	xtrct r0, r1
-
-check:
-	# Lower r3, upper r4.
-	shll16 r3
-	shlr16 r4
-	or r3, r4
-	cmp/eq r1, r4
-	bf wrong
-	
-okay:
-	pass
-wrong:
-	fail
-	
diff --git a/sim/testsuite/sim/sh64/interwork.exp b/sim/testsuite/sim/sh64/interwork.exp
deleted file mode 100644
index acd19b3c90c..00000000000
--- a/sim/testsuite/sim/sh64/interwork.exp
+++ /dev/null
@@ -1,20 +0,0 @@
-# SH64 interworking testsuite.
-# In particular, test parts of the instruction set that can be used
-# for SHmedia/SHcompact instruction set mode switches.
-
-if [istarget sh64-*-*] {
-    # load support procs (none yet)
-    # load_lib cgen.exp
-
-    # all machines
-    set all_machs "sh5"
-
-    foreach src [lsort [glob -nocomplain $srcdir/$subdir/misc/*.s]] {
-       # If we're only testing specific files and this isn't one of them,
-       # skip it.
-       if ![runtest_file_p $runtests $src] {
-  	  continue
-	}
-    run_sim_test $src $all_machs
-    }
-}
diff --git a/sim/testsuite/sim/sh64/media.exp b/sim/testsuite/sim/sh64/media.exp
deleted file mode 100644
index 1a3d9f4c961..00000000000
--- a/sim/testsuite/sim/sh64/media.exp
+++ /dev/null
@@ -1,19 +0,0 @@
-# SHmedia testsuite.
-
-if [istarget sh64-*-*] {
-    # load support procs (none yet)
-    # load_lib cgen.exp
-
-    # all machines
-    set all_machs "sh5"
-
-    # The .cgs suffix is for "cgen .s".
-    foreach src [lsort [glob -nocomplain $srcdir/$subdir/media/*.cgs]] {
-       # If we're only testing specific files and this isn't one of them,
-       # skip it.
-       if ![runtest_file_p $runtests $src] {
-  	  continue
-	}
-    run_sim_test $src $all_machs
-    }
-}
diff --git a/sim/testsuite/sim/sh64/media/ChangeLog b/sim/testsuite/sim/sh64/media/ChangeLog
deleted file mode 100644
index e435dbe5278..00000000000
--- a/sim/testsuite/sim/sh64/media/ChangeLog
+++ /dev/null
@@ -1,102 +0,0 @@
-2001-01-09  Ben Elliston  <bje@redhat.com>
-
-	* nsb.cgs: Test consecutive bits of zeros as well as ones.
-	* ptb.cgs: Clean up.
-
-2001-01-08  Ben Elliston  <bje@redhat.com>
-
-	* fcmpund.cgs, fcmpuns.cgs: Complete test cases.
-	* fcnvds.cgs, fcnvsd.cgs, fgetscr.cgs, fiprs.cgs: Ditto.
-	* floatld.cgs, floatls.cgs, floatqd.cgs, floatqs.cgs: Ditto.
-	* fmuld.cgs, fmuls.cgs, fputscr.cgs, fstxp.cgs: Ditto.
-	* fsubd.cgs, fsubs.cgs, ftrcdl.cgs, ftrcdq.cgs: Ditto.
-	* ftrcsl.cgs, ftrcsq.cgs, ftrvs.cgs: Ditto.
-	* ldhil.cgs, ldhiq.cgs, ldlol.cgs, ldloq.cgs: Ditto.
-	* mabsl.cgs, mabsw.cgs, maddl.cgs, maddsl.cgs: Ditto.
-	* maddsub.cgs, maddsw.cgs, maddw.cgs: Ditto.
-	* mcmpeqb.cgs, mcmpeql.cgs, mcmpeqw.cgs: Ditto.
-	* mcmpgtl.cgs, mcmpgtub.cgs, mcmpgtw.cgs: Ditto.
-	* mcmv.cgs, mcnvslw.cgs, mcnvswb.cgs, mcnvswub.cgs: Ditto.
-	* mmacfxwl.cgs, mmacnfx-wl.cgs: Ditto.
-	* mmulfxl.cgs, mmulfxrpw.cgs, mmulfxw.cgs: Ditto.
-	* mmulhiwl.cgs, mmull.cgs, mmullowl.cgs: Ditto.
-	* mmulsumwq.cgs, mmulw.cgs, movi.cgs: Ditto.
-	* mpermw.cgs, msadubq.cgs: Ditto.
-	* mshaldsl.cgs, mshaldsw.cgs: Ditto.
-	* mshardl.cgs, mshardsq.cgs, mshardw.cgs: Ditto.
-	* mshfhib.cgs, mshfhil.cgs, mshfhiw.cgs: Ditto.
-	* mshflob.cgs, mshflol.cgs, mshflow.cgs: Ditto.
-	* mshlldl.cgs, mshlldw.cgs, mshlrdl.cgs: Ditto.
-	* mshlrdw.cgs, msubl.cgs, msubsl.cgs: Ditto.
-	* msubsub.cgs, msubsw.cgs, msubw.cgs: Ditto.
-	* mulsl.cgs, mulul.cgs: Ditto.
-	* ptabs.cgs, ptb.cgs, ptrel.cgs: Ditto.
-	* shard.cgs, shardl.cgs, shari.cgs, sharil.cgs: Ditto.
-	* shlld.cgs, shlldl.cgs, shlli.cgs, shllil.cgs: Ditto.
-	* shlrd.cgs, shlrdl.cgs, shlri.cgs, shlril.cgs: Ditto.
-	* sthil.cgs, sthiq.cgs, swapq.cgs, trapa.cgs: Ditto.
-
-	* testutils.inc (pass): Pass correct "syscall" number.
-	(fail): Ditto.
-
-2000-12-13  Ben Elliston  <bje@redhat.com>
-
-	* sub.cgs, subl.cgs: Complete test cases.
-	* ptrel.cgs: Likewise.
-
-	* shori.cgs: Test for zero extension of immediate operand.
-	* fcmpged.cgs, fcmpges.cgs, fldd.cgs: Complete test cases.
-	* fldp.cgs, flds.cgs, fldxd.cgs, fldxp.cgs: Likewise.
-	* fldxs.cgs, fmacs.cgs, fnegd.cgs, fnegs.cgs: Likewise.
-	* fsqrtd.cgs, fsqrts.cgs, fstd.cgs, fstp.cgs: Likewise.
-	* fsts.cgs, fstxd.cgs, fstxs.cgs: Likewise.
-
-2000-12-12  Ben Elliston  <bje@redhat.com>
-
-	* testutils.inc (pass): Use simple syscall mechanism.
-	(fail): Likewise.
-	(_packb, _packw, _packl): New macros for packing slices.
-
-	* stb.cgs, stq.cgs, stxb.cgs, stxq.cgs: Complete test cases.
-	* stl.cgs, stw.cgs, stxl.cgs, stxw.cgs: Likewise.
-	* ldl.cgs, ldq.cgs, ldub.cgs, lduw.cgs, ldw.cgs: Likewise.
-	* ldxb.cgs, ldxl.cgs, ldxq.cgs, ldxub.cgs: Likewise.
-	* ldxuw.cgs, ldxw.cgs, nsb.cgs, trapa.cgs: Likewise.
-
-	* fcmpeqd.cgs, fcmpeqs.cgs, fcmpgtd.cgs: Complete test cases.
-	* fcmpgts.cgs, fdivd.cgs, fdivs.cgs, fmovd.cgs: Likewise.
-	* fmovdq.cgs, fmovqd.cgs, fmovls.cgs, fmovs.cgs: Likewise.
-	* fmovsl.cgs: Likewise.
-
-2000-12-11  Ben Elliston  <bje@redhat.com>
-
-	* fabss.cgs, fabsd.cgs, fadds.cgs, faddd.cgs: Complete test cases.
-	* getcfg.cgs, getcon.cgs, gettr.cgs, icbi.cgs: Likewise.
-	* prefi.cgs, pta.cgs, ptabs.cgs, ptb.cgs: Likewise.
-	* putcon.cgs, putcfg.cgs, rte.cgs: Likewise.
-
-	* add.cgs, addi.cgs, addl.cgs, addil.cgs: Complete test cases.
-	* addl.cgs, addzl.cgs, alloco.cgs, and.cgs, andc.cgs: Likewise.
-	* andi.cgs, beq.cgs, beqi.cgs, bge.cgs, bgeu.cgs: Likewise.
-	* bgt.cgs, bgtu.cgs, blink.cgs, bne.cgs, bnei.cgs: Likewise.
-	* brk.cgs, byterev.cgs, cmpeq.cgs, cmpgt.cgs: Likewise.
-	* cmpgtu.cgs, cmveq.cgs, cmvne.cgs: Likewise.
-
-2000-12-07  Ben Elliston  <bje@redhat.com>
-
-	* mextr1.cgs, mextr2.cgs, mextr3.cgs: Complete test cases.
-	* mextr4.cgs, mextr5.cgs, mextr6.cgs, mextr7.cgs: Likewise.
-
-2000-12-05  Ben Elliston  <bje@redhat.com>
-
-	* nop.cgs, ocbi.cgs, ocbp.cgs, ocbwb.cgs: Complete test cases.
-	* or.cgs, ori.cgs, xor.cgs, xori.cgs: Ditto.
-	* sleep.cgs, synci.cgs, synco.cgs: Ditto.
-
-2000-11-22  Ben Elliston  <bje@redhat.com>
-
-	* *.cgs: Include "media/testutils.inc", not "testutils.inc" as
-	generated test cases do.  Miscellaneous fixes.
-
-	* testutils.inc: New file.
-	* *.cgs: Generate test cases.
diff --git a/sim/testsuite/sim/sh64/media/add.cgs b/sim/testsuite/sim/sh64/media/add.cgs
deleted file mode 100644
index 9778e8fd62c..00000000000
--- a/sim/testsuite/sim/sh64/media/add.cgs
+++ /dev/null
@@ -1,47 +0,0 @@
-# sh testcase for add $rm, $rn, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-	.global add
-init:
-	pta wrong, tr0
-add:
-	movi 10, r0
-	movi 0, r1
-	add r0, r1, r3
-	movi 10, r4
-	bne r3, r4, tr0
-
-add0:
-	movi 1, r63
-	add r63, r63, r1
-	bnei r1, 0, tr0
-
-add2:
-	movi 0, r0
-	movi 10, r1
-	add r0, r1, r3
-	movi 10, r4
-	bne r3, r4, tr0
-
-add3:
-	movi 10, r1
-	add r63, r1, r3
-	movi 10, r4
-	bne r3, r4, tr0
-
-add4:
-	movi 10, r1
-	add r1, r63, r3
-	movi 10, r4
-	bne r3, r4, tr0
-
-okay:
-	pass
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/media/addi.cgs b/sim/testsuite/sim/sh64/media/addi.cgs
deleted file mode 100644
index 3d4b49f5995..00000000000
--- a/sim/testsuite/sim/sh64/media/addi.cgs
+++ /dev/null
@@ -1,37 +0,0 @@
-# sh testcase for addi $rm, $disp10, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-init:
-	pta wrong, tr0
-
-addi1:
-	movi 1, r0
-	addi r0, 10, r0
-	bnei r0, 11, tr0
-
-addi2:
-	movi 10, r0
-	addi r0, 1, r0
-	bnei r0, 11, tr0
-
-addi3:
-	movi 10, r0
-	addi r0, -1, r0
-	bnei r0, 9, tr0
-
-addi4:
-	movi 20, r0
-	addi r0, -2, r0
-	bnei r0, 18, tr0
-
-okay:	
-	pass
-
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/media/addil.cgs b/sim/testsuite/sim/sh64/media/addil.cgs
deleted file mode 100644
index 5c92e2733a6..00000000000
--- a/sim/testsuite/sim/sh64/media/addil.cgs
+++ /dev/null
@@ -1,49 +0,0 @@
-# sh testcase for addi.l $rm, $disp10, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-init:
-	pta wrong, tr0
-
-addil0:
-	movi 1, r63
-	addi.l r63, 0, r1
-	bnei r1, 0, tr0
-
-addil1:
-	movi 10, r0
-	addi.l r0, 0, r3
-	bnei r3, 10, tr0
-
-addil2:
-	movi 0, r0
-	addi.l r0, 10, r2
-	bnei r2, 10, tr0
-
-addil3:
-	addi.l r63, 10, r1
-	bnei r1, 10, tr0
-
-addil4:
-	movi 10, r0
-	addi.l r0, 0, r1
-	bnei r1, 10, tr0
-
-addil5:
-	# Ensure top 32-bits are discarded when adding.
-	movi 10, r0
-	shlli r0, 32, r0
-	addi r0, 10, r0
-	addi.l r0, 10, r2
-	bnei r2, 20, tr0
-	
-okay:	
-	pass
-
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/media/addl.cgs b/sim/testsuite/sim/sh64/media/addl.cgs
deleted file mode 100644
index 7f94b616206..00000000000
--- a/sim/testsuite/sim/sh64/media/addl.cgs
+++ /dev/null
@@ -1,61 +0,0 @@
-# sh testcase for add.l $rm, $rn, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-	.global addl
-init:
-	pta wrong, tr0
-
-addl0:
-	movi 1, r63
-	add.l r63, r63, r1
-	bnei r1, 0, tr0
-
-addl1:
-	movi 10, r0
-	movi 0, r1
-	add.l r0, r1, r3
-	movi 10, r4
-	bne r3, r4, tr0
-
-addl2:
-	movi 0, r0
-	movi 10, r1
-	add.l r0, r1, r2
-	movi 10, r3
-	bne r2, r3, tr0
-
-addl3:
-	movi 10, r0
-	add.l r63, r0, r1
-	movi 10, r2
-	bne r1, r2, tr0
-
-addl4:
-	movi 10, r0
-	add.l r0, r63, r1
-	movi 10, r2
-	bne r1, r2, tr0
-
-addl5:
-	# Ensure top 32-bits are discarded when adding.
-	movi 10, r0
-	shlli r0, 32, r0
-	addi r0, 10, r0
-	movi 10, r1
-	shlli r1, 32, r1
-	addi r1, 10, r1
-	add.l r0, r1, r2
-	movi 20, r3
-	bne r2, r3, tr0
-	
-okay:	
-	pass
-
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/media/addzl.cgs b/sim/testsuite/sim/sh64/media/addzl.cgs
deleted file mode 100644
index b7917d377a6..00000000000
--- a/sim/testsuite/sim/sh64/media/addzl.cgs
+++ /dev/null
@@ -1,39 +0,0 @@
-# sh testcase for addz.l $rm, $rn, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-init:
-	pta wrong, tr0
-
-addzl1:
-	movi 1, r0
-	movi 2, r1
-	addz.l r0, r1, r2
-	bnei r2, 3, tr0
-
-addzl2:
-	movi 1, r0
-	shlli r0, 32, r0
-	addi r0, 2, r0
-	movi 1, r1
-	shlli r1, 32, r1
-	addi r1, 2, r1
-	addz.l r0, r1, r2
-	bnei r2, 4, tr0
-
-addzl3:
-	movi 1, r0
-	shlli r0, 31, r0
-	addi r0, 2, r0
-	movi 2, r1
-	addz.l r0, r1, r2
-	
-okay:
-	pass
-
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/media/alloco.cgs b/sim/testsuite/sim/sh64/media/alloco.cgs
deleted file mode 100644
index 5f27359c3b6..00000000000
--- a/sim/testsuite/sim/sh64/media/alloco.cgs
+++ /dev/null
@@ -1,10 +0,0 @@
-# sh testcase for alloco $rm, $disp6x32 -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-	alloco r0, 32
-	pass
diff --git a/sim/testsuite/sim/sh64/media/and.cgs b/sim/testsuite/sim/sh64/media/and.cgs
deleted file mode 100644
index c2d42339bcf..00000000000
--- a/sim/testsuite/sim/sh64/media/and.cgs
+++ /dev/null
@@ -1,68 +0,0 @@
-# sh testcase for and $rm, $rn, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-init:
-	pta wrong, tr0
-	
-and0:
-	# 0 and 0 is 0.
-	movi 0, r0
-	movi 0, r1
-	and r0, r1, r2
-	bnei r2, 0, tr0
-
-and1:
-	# 0 and 1 is 0.
-	movi 0, r0
-	movi 1, r1
-	and r0, r1, r2
-	bnei r2, 0, tr0
-
-and2:
-	# 1 and 0 is 0.
-	movi 1, r0
-	movi 0, r1
-	and r0, r1, r2
-	bnei r2, 0, tr0
-
-and3:
-	# 1 and 1 is 1.
-	movi 1, r0
-	movi 1, r1
-	and r0, r1, r2
-	bnei r2, 1, tr0
-
-and4:
-	movi 1, r0
-	shlli r0, 63, r0
-	movi 1, r1
-	shlli r1, 63, r1
-	and r0, r1, r2
-	# Check it.
-	movi 1, r3
-	shlli r3, 63, r3
-	bne r2, r3, tr0
-
-and5:
-	movi 1, r0
-	shlli r0, 63, r0
-	movi 1, r1
-	shlli r1, 63, r1
-	ori r1, 1, r1
-	and r0, r1, r2
-	# Check it.
-	movi 1, r3
-	shlli r1, 63, r1
-	bne r1, r2, tr0
-
-okay:
-	pass
-
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/media/andc.cgs b/sim/testsuite/sim/sh64/media/andc.cgs
deleted file mode 100644
index 60b50ace465..00000000000
--- a/sim/testsuite/sim/sh64/media/andc.cgs
+++ /dev/null
@@ -1,50 +0,0 @@
-# sh testcase for andc $rm, $rn, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-init:
-	pta wrong, tr0
-
-andc1:
-	# X . !X = 0.
-	movi 3, r0
-	movi 3, r1
-	andc r0, r1, r2
-	bnei r2, 0, tr0
-
-andc2:
-	# X . 0 = X.
-	movi 3, r0
-	movi 0, r1
-	andc r0, r1, r2
-	bnei r2, 3, tr0
-
-andc3:
-	# wide X . 0 = wide X.
-	movi 0x1020, r0
-	shlli r0, 8, r0
-	ori r0, 0x30, r0
-	shlli r0, 8, r0
-	ori r0, 0x40, r0
-	shlli r0, 8, r0
-	ori r0, 0x50, r0
-	shlli r0, 8, r0
-	ori r0, 0x60, r0
-	shlli r0, 8, r0
-	ori r0, 0x70, r0
-	shlli r0, 8, r0
-	ori r0, 0x80, r0
-	movi 0, r1
-	andc r0, r1, r2
-	bne r0, r2, tr0
-
-okay:	
-	pass
-
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/media/andi.cgs b/sim/testsuite/sim/sh64/media/andi.cgs
deleted file mode 100644
index decfc2fc2ec..00000000000
--- a/sim/testsuite/sim/sh64/media/andi.cgs
+++ /dev/null
@@ -1,46 +0,0 @@
-# sh testcase for andi $rm, $disp10, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-init:
-	pta wrong, tr0
-	
-andi0:
-	# 0 and 0 is 0.
-	movi 0, r0
-	andi r0, 0, r2
-	bnei r2, 0, tr0
-
-and1:
-	# 0 and 1 is 0.
-	movi 0, r0
-	andi r0, 1, r2
-	bnei r2, 0, tr0
-
-and2:
-	# 1 and 0 is 0.
-	movi 1, r0
-	andi r0, 0, r2
-	bnei r2, 0, tr0
-
-and3:
-	# 1 and 1 is 1.
-	movi 1, r0
-	andi r0, 1, r2
-	bnei r2, 1, tr0
-
-and4:
-	movi 15, r0
-	andi r0, 3, r2
-	bnei r2, 3, tr0
-
-okay:
-	pass
-
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/media/beq.cgs b/sim/testsuite/sim/sh64/media/beq.cgs
deleted file mode 100644
index 6f96ffdf00f..00000000000
--- a/sim/testsuite/sim/sh64/media/beq.cgs
+++ /dev/null
@@ -1,52 +0,0 @@
-# sh testcase for beq$likely $rm, $rn, $tra -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-	.global beq
-init:
-	# Load up the branch target registers.
-	pta beq2, tr0
-	pta beq3, tr1
-	pta wrong, tr2
-
-beq1:
-	# Compare r0 with itself.
-	# Always true, so branch likely.
-	movi 1, r0
-	beq/l r0, r0, tr0
-	# We should branch over this.
-	fail
-
-beq2:	
-	# Ensure high order bits are compared, too.
-	movi 1, r0
-	shlli r0, 35, r0
-	addi r0, 10, r0
-	movi 1, r1
-	shlli r1, 35, r1
-	addi r1, 10, r1
-	beq r0, r1, tr1
-	# We should branch over this, too.
-	fail
-
-beq3:
-	movi 1, r0
-	shlli r0, 35, r0
-	addi r0, 10, r0
-	movi 2, r1
-	shlli r1, 35, r1
-	addi r1, 9, r1
-	# Unlikely we'll branch!
-	beq/u r0, r1, tr2
-	# We should proceed to pass here.
-
-okay:
-	pass
-
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/media/beqi.cgs b/sim/testsuite/sim/sh64/media/beqi.cgs
deleted file mode 100644
index c2b4ea8acf5..00000000000
--- a/sim/testsuite/sim/sh64/media/beqi.cgs
+++ /dev/null
@@ -1,40 +0,0 @@
-# sh testcase for beqi$likely $rm, $imm6, $tra -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-	.global beqi
-init:
-	# Load up the branch target registers.
-	pta beqi2, tr0
-	pta beqi3, tr1
-	pta wrong, tr2
-
-beqi1:
-	# Always true, so branch likely.
-	movi 1, r0
-	beqi/l r0, 1, tr0
-	# We should branch over this.
-	fail
-
-beqi2:
-	movi 22, r3
-	beqi r3, 22, tr1
-	# We should branch over this.
-	fail
-
-beqi3:	
-	movi 27, r7
-	# We shouldn't branch here.
-	beqi/u r7, 23, tr2
-	# We should proceed to pass here.
-
-okay:
-	pass
-	
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/media/bge.cgs b/sim/testsuite/sim/sh64/media/bge.cgs
deleted file mode 100644
index 832ff06ac21..00000000000
--- a/sim/testsuite/sim/sh64/media/bge.cgs
+++ /dev/null
@@ -1,40 +0,0 @@
-# sh testcase for bge$likely $rm, $rn, $tra -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-	.global bge
-init:
-	pta bge2, tr0
-	pta bge3, tr1
-	pta wrong, tr2
-	movi 0, r0
-	
-bge1:
-	# Compare r0 with itself.
-	bge/l r0, r0, tr0
-	# We should branch here.
-	fail
-
-bge2:
-	movi 1, r1
-	movi 1, r2
-	bge r1, r2, tr1
-	# We should branch here.
-	fail
-
-bge3:
-	movi -1, r1
-	movi 1, r2
-	bge r1, r2, tr2
-	# We should not branch here.
-
-okay:
-	pass
-
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/media/bgeu.cgs b/sim/testsuite/sim/sh64/media/bgeu.cgs
deleted file mode 100644
index da469d0e4ae..00000000000
--- a/sim/testsuite/sim/sh64/media/bgeu.cgs
+++ /dev/null
@@ -1,47 +0,0 @@
-# sh testcase for bgeu$likely $rm, $rn, $tra -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-	.global bgeu
-init:
-	movi 0, r0
-	
-bgeu1:
-	# Compare r0 with itself.
-	pta bgeu2, tr0
-	bgeu/l r0, r0, tr0
-	# We should branch here.
-	fail
-
-bgeu2:
-	movi 1, r1
-	movi 1, r2
-	pta bge3, tr0
-	bgeu r1, r2, tr0
-	# We should branch here.
-	fail
-
-bge3:
-	movi -1, r1
-	movi 1, r2
-	# We SHOULD branch here.
-	pta bge4, tr0
-	bgeu r1, r2, tr0
-	fail
-
-bge4:
-	movi 1, r1
-	movi -1, r2
-	# We should not branch here.
-	pta wrong, tr0
-	bgeu r1, r2, tr0
-okay:
-	pass
-
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/media/bgt.cgs b/sim/testsuite/sim/sh64/media/bgt.cgs
deleted file mode 100644
index 8866635b818..00000000000
--- a/sim/testsuite/sim/sh64/media/bgt.cgs
+++ /dev/null
@@ -1,32 +0,0 @@
-# sh testcase for bgt$likely $rm, $rn, $tra -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-
-init:
-	pta wrong, tr0
-
-bgt1:
-	movi 1, r0
-	movi -1, r1
-	bgt r1, r0, tr0
-
-bgt2:
-	bgt r0, r0, tr0
- 
-bgt3:
-	pta okay, tr1
-	movi -1, r0
-	movi 1, r1
-	bgt r0, r1, tr0
-
-okay:
-	pass
-
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/media/bgtu.cgs b/sim/testsuite/sim/sh64/media/bgtu.cgs
deleted file mode 100644
index 3cc02696e75..00000000000
--- a/sim/testsuite/sim/sh64/media/bgtu.cgs
+++ /dev/null
@@ -1,36 +0,0 @@
-# sh testcase for bgtu$likely $rm, $rn, $tra -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-
-init:
-	pta wrong, tr0
-
-bgtu1:
-	movi 1, r0
-	movi -1, r1
-	pta bgt2, tr1
-	bgtu r1, r0, tr1
-	fail
-
-bgt2:
-	bgtu r0, r0, tr0
- 
-bgt3:
-	pta okay, tr1
-	movi -1, r0
-	movi 1, r1
-	pta okay, tr1
-	bgtu r0, r1, tr1
-	fail
-
-okay:
-	pass
-
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/media/blink.cgs b/sim/testsuite/sim/sh64/media/blink.cgs
deleted file mode 100644
index 000d1f597f2..00000000000
--- a/sim/testsuite/sim/sh64/media/blink.cgs
+++ /dev/null
@@ -1,17 +0,0 @@
-# sh testcase for blink $trb, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-blink:
-	pta target, tr0
-	gettr tr0, r1
-	ptabs r1, tr0
-	blink tr0, r0
-	fail
-
-target:
-	pass
diff --git a/sim/testsuite/sim/sh64/media/bne.cgs b/sim/testsuite/sim/sh64/media/bne.cgs
deleted file mode 100644
index f574147e3de..00000000000
--- a/sim/testsuite/sim/sh64/media/bne.cgs
+++ /dev/null
@@ -1,23 +0,0 @@
-# sh testcase for bne$likely $rm, $rn, $tra -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-init:
-	movi 1, r0
-	pta wrong, tr0
-	pta okay, tr1
-
-bne1:	
-	bne r63, r63, tr0
-bne2:
-	bne r0, r63, tr1
-bad:
-	fail
-okay:
-	pass
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/media/bnei.cgs b/sim/testsuite/sim/sh64/media/bnei.cgs
deleted file mode 100644
index 5ce33991c0d..00000000000
--- a/sim/testsuite/sim/sh64/media/bnei.cgs
+++ /dev/null
@@ -1,23 +0,0 @@
-# sh testcase for bnei$likely $rm, $imm6, $tra -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-init:
-	movi 1, r0
-	pta wrong, tr0
-	pta okay, tr1
-
-bnei1:
-	bnei r63, 0, tr0
-bnei2:
-	bnei r0, 3, tr1
-bad:
-	fail
-okay:
-	pass
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/media/brk.cgs b/sim/testsuite/sim/sh64/media/brk.cgs
deleted file mode 100644
index 073641443ec..00000000000
--- a/sim/testsuite/sim/sh64/media/brk.cgs
+++ /dev/null
@@ -1,11 +0,0 @@
-# sh testcase for brk -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-	# brk will cause the sim to trap, so avoid it.
-	pass
-	brk
diff --git a/sim/testsuite/sim/sh64/media/byterev.cgs b/sim/testsuite/sim/sh64/media/byterev.cgs
deleted file mode 100644
index d97c3adb7b0..00000000000
--- a/sim/testsuite/sim/sh64/media/byterev.cgs
+++ /dev/null
@@ -1,67 +0,0 @@
-# sh testcase for byterev $rm, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-	pta wrong, tr0
-init:
-	# Put a distinctive pattern in r0.
-	movi 10, r0
-	shlli r0, 8, r0
-	ori r0, 20, r0
-	shlli r0, 8, r0
-	ori r0, 30, r0
-	shlli r0, 8, r0
-	ori r0, 40, r0
-	shlli r0, 8, r0
-	ori r0, 50, r0
-	shlli r0, 8, r0
-	ori r0, 60, r0
-	shlli r0, 8, r0
-	ori r0, 70, r0
-	shlli r0, 8, r0
-	ori r0, 80, r0
-
-byterev:
-	byterev r0, r1
-
-check:
-	andi r1, 255, r2
-	movi 10, r3
-	bne r2, r3, tr0
-	shlri r1, 8, r1
-	andi r1, 255, r2
-	movi 20, r3
-	bne r2, r3, tr0
-	shlri r1, 8, r1
-	andi r1, 255, r2
-	movi 30, r3
-	bne r2, r3, tr0
-	shlri r1, 8, r1
-	andi r1, 255, r2
-	movi 40, r3
-	bne r2, r3, tr0
-	shlri r1, 8, r1
-	andi r1, 255, r2
-	movi 50, r3
-	bne r2, r3, tr0
-	shlri r1, 8, r1
-	andi r1, 255, r2
-	movi 60, r3
-	bne r2, r3, tr0
-	shlri r1, 8, r1
-	andi r1, 255, r2
-	movi 70, r3
-	bne r2, r3, tr0
-	shlri r1, 8, r1
-	andi r1, 255, r2
-	movi 80, r3
-	bne r2, r3, tr0
-
-okay:
-	pass
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/media/cmpeq.cgs b/sim/testsuite/sim/sh64/media/cmpeq.cgs
deleted file mode 100644
index 78f51f4a65d..00000000000
--- a/sim/testsuite/sim/sh64/media/cmpeq.cgs
+++ /dev/null
@@ -1,42 +0,0 @@
-# sh testcase for cmpeq $rm, $rn, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-init:
-	pta wrong, tr0
-	movi 0, r0
-	movi 1, r1
-	movi 2, r2
-	movi 2, r3
-	movi 3, r4
-
-cmpeq1:
-	cmpeq r2, r2, r7
-	bne r7, r1, tr0
-
-cmpeq2:
-	cmpeq r2, r3, r7
-	bne r7, r1, tr0
-
-cmpeq3:
-	cmpeq r2, r4, r7
-	bne r7, r0, tr0
-
-cmpeq4:
-	movi 1, r2
-	shlli r2, 63, r2
-	movi 1, r3
-	shlli r3, 63, r3
-	cmpeq r2, r3, r7
-	bne r7, r1, tr0
-
-okay:
-	pass
-
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/media/cmpgt.cgs b/sim/testsuite/sim/sh64/media/cmpgt.cgs
deleted file mode 100644
index e4a971bd5ee..00000000000
--- a/sim/testsuite/sim/sh64/media/cmpgt.cgs
+++ /dev/null
@@ -1,43 +0,0 @@
-# sh testcase for cmpgt $rm, $rn, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-init:
-	pta wrong, tr0
-	movi 0, r0
-	movi 1, r1
-	movi 2, r2
-	movi 2, r3
-	movi 3, r4
-
-cmpgt1:
-	cmpgt r2, r2, r7
-	bne r7, r0, tr0
-
-cmpgt2:
-	cmpgt r2, r3, r7
-	bne r7, r0, tr0
-
-cmpgt3:
-	cmpgt r4, r2, r7
-	bne r7, r1, tr0
-
-cmpgt4:
-	movi 1, r2
-	shlli r2, 63, r2
-	movi 1, r3
-	shlli r3, 63, r3
-	addi r3, 1, r3
-	cmpgt r3, r2, r7
-	bne r7, r1, tr0
-
-okay:
-	pass
-
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/media/cmpgtu.cgs b/sim/testsuite/sim/sh64/media/cmpgtu.cgs
deleted file mode 100644
index b896dfcb9fd..00000000000
--- a/sim/testsuite/sim/sh64/media/cmpgtu.cgs
+++ /dev/null
@@ -1,43 +0,0 @@
-# sh testcase for cmpgtu $rm, $rn, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-init:
-	pta wrong, tr0
-	movi 0, r0
-	movi 1, r1
-	movi 2, r2
-	movi 2, r3
-	movi 3, r4
-
-cmpgt1:
-	cmpgtu r2, r2, r7
-	bne r7, r0, tr0
-
-cmpgt2:
-	cmpgtu r2, r3, r7
-	bne r7, r0, tr0
-
-cmpgt3:
-	cmpgtu r4, r2, r7
-	bne r7, r1, tr0
-
-cmpgt4:
-	movi 1, r2
-	shlli r2, 63, r2
-	movi 1, r3
-	shlli r3, 63, r3
-	addi r3, 1, r3
-	cmpgtu r3, r2, r7
-	bne r7, r1, tr0
-
-okay:
-	pass
-
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/media/cmveq.cgs b/sim/testsuite/sim/sh64/media/cmveq.cgs
deleted file mode 100644
index 0f49733de36..00000000000
--- a/sim/testsuite/sim/sh64/media/cmveq.cgs
+++ /dev/null
@@ -1,32 +0,0 @@
-# sh testcase for cmveq $rm, $rn, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-init:
-	pta wrong, tr0
-
-	movi 0, r0
-	movi 1, r1
-	movi 2, r2
-	movi 21, r3
-
-cmveq:
-	# Zap r7.
-	movi 0, r7
-
-	cmveq r0, r2, r7
-	bne r2, r7, tr0
-
-	cmveq r1, r3, r7
-	# Make sure r7 is still equal to r2.
-	bne r2, r7, tr0
-
-okay:
-	pass
-
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/media/cmvne.cgs b/sim/testsuite/sim/sh64/media/cmvne.cgs
deleted file mode 100644
index 909179afc76..00000000000
--- a/sim/testsuite/sim/sh64/media/cmvne.cgs
+++ /dev/null
@@ -1,32 +0,0 @@
-# sh testcase for cmvne $rm, $rn, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-init:
-	pta wrong, tr0
-
-	movi 0, r0
-	movi 1, r1
-	movi 2, r2
-	movi 21, r3
-
-cmvne:
-	# Zap r7.
-	movi 0, r7
-
-	cmvne r1, r2, r7
-	bne r2, r7, tr0
-
-	cmvne r0, r3, r7
-	# Make sure r7 is still equal to r2.
-	bne r2, r7, tr0
-
-okay:
-	pass
-
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/media/fabsd.cgs b/sim/testsuite/sim/sh64/media/fabsd.cgs
deleted file mode 100644
index 47060fcc44b..00000000000
--- a/sim/testsuite/sim/sh64/media/fabsd.cgs
+++ /dev/null
@@ -1,39 +0,0 @@
-# sh testcase for fabs.d $drgh, $drf -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-init:
-	pta wrong, tr0
-	movi 0, r0
-	movi 1, r1
-
-fabs0:
-	# Ensure fabs(-1) = 1.
-	fmov.ls r0, fr7
-	float.ld fr7, dr0
-	fmov.ls r1, fr7
-	float.ld fr7, dr2
-	fsub.d dr0, dr2, dr4
-	fabs.d dr4, dr6
-	fcmpeq.d dr6, dr2, r7
-	bnei r7, 1, tr0
-
-fabs1:
-	# Ensure fabs(1) = 1.
-	fmov.ls r0, fr7
-	float.ld fr7, dr0
-	fmov.ls r1, fr7
-	float.ld fr7, dr2
-	fabs.d dr2, dr4
-	fcmpeq.d dr2, dr4, r7
-	bnei r7, 1, tr0
-
-okay:
-	pass
-
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/media/fabss.cgs b/sim/testsuite/sim/sh64/media/fabss.cgs
deleted file mode 100644
index dd9aec7e640..00000000000
--- a/sim/testsuite/sim/sh64/media/fabss.cgs
+++ /dev/null
@@ -1,39 +0,0 @@
-# sh testcase for fabs.s $frgh, $frf -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-init:
-	pta wrong, tr0
-	movi 0, r0
-	movi 1, r1
-
-fabs0:
-	# Ensure fabs(-1) = 1.
-	fmov.ls r0, fr7
-	float.ls fr7, fr0
-	fmov.ls r1, fr7
-	float.ls fr7, fr1
-	fsub.s fr0, fr1, fr2
-	fabs.s fr2, fr3
-	fcmpeq.s fr3, fr1, r7
-	bnei r7, 1, tr0
-
-fabs1:
-	# Ensure fabs(1) = 1.
-	fmov.ls r0, fr7
-	float.ls fr7, fr0
-	fmov.ls r1, fr7
-	float.ls fr7, fr1
-	fabs.s fr1, fr2
-	fcmpeq.s fr1, fr2, r7
-	bnei r7, 1, tr0
-
-okay:
-	pass
-
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/media/faddd.cgs b/sim/testsuite/sim/sh64/media/faddd.cgs
deleted file mode 100644
index 096f8528946..00000000000
--- a/sim/testsuite/sim/sh64/media/faddd.cgs
+++ /dev/null
@@ -1,33 +0,0 @@
-# sh testcase for fadd.d $drg, $drh, $drf -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-init:
-	pta wrong, tr0
-	movi 2, r0
-	movi 3, r1
-
-fadd0:
-	# Add 2 and 3.
-	fmov.ls r0, fr7
-	float.ld fr7, dr0
-	fmov.ls r1, fr7
-	float.ld fr7, dr2
-	fadd.d dr0, dr2, dr4
-	# Check to make sure we got 5.
-	movi 5, r2
-	fmov.ls r2, fr7
-	float.ld fr7, dr6
-	fcmpeq.d dr4, dr6, r7
-	bnei r7, 1, tr0
-
-okay:	
-	pass
-
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/media/fadds.cgs b/sim/testsuite/sim/sh64/media/fadds.cgs
deleted file mode 100644
index fb93979c737..00000000000
--- a/sim/testsuite/sim/sh64/media/fadds.cgs
+++ /dev/null
@@ -1,34 +0,0 @@
-# sh testcase for fadd.s $frg, $frh, $frf -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-	.global fadds
-init:
-	pta wrong, tr0
-	movi 2, r0
-	movi 3, r1
-
-fadd0:
-	# Add 2 and 3.
-	fmov.ls r0, fr7
-	float.ls fr7, fr0
-	fmov.ls r1, fr7
-	float.ls fr7, fr1
-	fadd.s fr0, fr1, fr2
-	# Check to make sure we got 5.
-	movi 5, r2
-	fmov.ls r2, fr7
-	float.ls fr7, fr3
-	fcmpeq.s fr2, fr3, r7
-	bnei r7, 1, tr0
-
-okay:	
-	pass
-
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/media/fcmpeqd.cgs b/sim/testsuite/sim/sh64/media/fcmpeqd.cgs
deleted file mode 100644
index c19356476f9..00000000000
--- a/sim/testsuite/sim/sh64/media/fcmpeqd.cgs
+++ /dev/null
@@ -1,36 +0,0 @@
-# sh testcase for fcmpeq.d $drg, $drh, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-init:
-	pta wrong, tr0
-
-fcmpeq1:
-	movi 1, r0
-	fmov.ls r0, fr0
-	fmov.ls r0, fr1
-	float.ld fr0, dr2
-	float.ld fr1, dr4
-	fcmpeq.d dr2, dr2, r7
-	bnei r7, 1, tr0 
-
-fcmpeq2:
-	movi 1, r0
-	fmov.ls r0, fr0
-	movi 2, r1
-	fmov.ls r1, fr1
-	float.ld fr0, dr4
-	float.ld fr1, dr6
-	fcmpeq.d dr4, dr6, r7
-	bnei r7, 0, tr0
-
-okay:
-	pass
-
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/media/fcmpeqs.cgs b/sim/testsuite/sim/sh64/media/fcmpeqs.cgs
deleted file mode 100644
index 216894d7d20..00000000000
--- a/sim/testsuite/sim/sh64/media/fcmpeqs.cgs
+++ /dev/null
@@ -1,36 +0,0 @@
-# sh testcase for fcmpeq.s $frg, $frh, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-init:
-	pta wrong, tr0
-
-fcmpeq1:
-	movi 1, r0
-	fmov.ls r0, fr0
-	fmov.ls r0, fr1
-	float.ls fr0, fr2
-	float.ls fr1, fr3
-	fcmpeq.s fr2, fr3, r7
-	bnei r7, 1, tr0 
-
-fcmpeq2:
-	movi 1, r0
-	fmov.ls r0, fr0
-	movi 2, r1
-	fmov.ls r1, fr1
-	float.ls fr0, fr2
-	float.ls fr1, fr3
-	fcmpeq.s fr2, fr3, r7
-	bnei r7, 0, tr0
-
-okay:
-	pass
-
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/media/fcmpged.cgs b/sim/testsuite/sim/sh64/media/fcmpged.cgs
deleted file mode 100644
index 52496cc6b14..00000000000
--- a/sim/testsuite/sim/sh64/media/fcmpged.cgs
+++ /dev/null
@@ -1,46 +0,0 @@
-# sh testcase for fcmpge.d $drg, $drh, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-init:
-	pta wrong, tr0
-
-fcmpge1: # 2 = 2.
-	movi 2, r0
-	fmov.ls r0, fr0
-	fmov.ls r0, fr1
-	float.ld fr0, dr2
-	float.ld fr1, dr4
-	fcmpge.d dr2, dr4, r7
-	bnei r7, 1, tr0
-
-fcmpge2: # 4 > 2.
-	movi 4, r0
-	fmov.ls r0, fr0
-	movi 2, r0
-	fmov.ls r0, fr1
-	float.ld fr0, dr2
-	float.ld fr1, dr4
-	fcmpge.d dr2, dr4, r7
-	bnei r7, 1, tr0
-
-fcmpge3: # 2 < 4.
-	movi 2, r0
-	fmov.ls r0, fr0
-	movi 4, r0
-	fmov.ls r0, fr1
-	float.ld fr0, dr2
-	float.ld fr1, dr4
-	fcmpge.d dr2, dr4, r7
-	bnei r7, 0, tr0
-
-okay:
-	pass
-
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/media/fcmpges.cgs b/sim/testsuite/sim/sh64/media/fcmpges.cgs
deleted file mode 100644
index 2dd0a35fd27..00000000000
--- a/sim/testsuite/sim/sh64/media/fcmpges.cgs
+++ /dev/null
@@ -1,46 +0,0 @@
-# sh testcase for fcmpge.s $frg, $frh, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-init:
-	pta wrong, tr0
-
-fcmpge1: # 2 = 2.
-	movi 2, r0
-	fmov.ls r0, fr0
-	fmov.ls r0, fr1
-	float.ls fr0, fr2
-	float.ls fr1, fr3
-	fcmpge.s fr2, fr3, r7
-	bnei r7, 1, tr0
-
-fcmpge2: # 3 > 2.
-	movi 3, r0
-	fmov.ls r0, fr0
-	movi 2, r0
-	fmov.ls r0, fr1
-	float.ls fr0, fr2
-	float.ls fr1, fr3
-	fcmpge.s fr2, fr3, r7
-	bnei r7, 1, tr0
-
-fcmpge3: # 2 < 3.
-	movi 2, r0
-	fmov.ls r0, fr0
-	movi 3, r0
-	fmov.ls r0, fr1
-	float.ls fr0, fr2
-	float.ls fr1, fr3
-	fcmpge.s fr2, fr3, r7
-	bnei r7, 0, tr0
-
-okay:
-	pass
-
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/media/fcmpgtd.cgs b/sim/testsuite/sim/sh64/media/fcmpgtd.cgs
deleted file mode 100644
index aec952097de..00000000000
--- a/sim/testsuite/sim/sh64/media/fcmpgtd.cgs
+++ /dev/null
@@ -1,36 +0,0 @@
-# sh testcase for fcmpgt.d $drg, $drh, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-init:
-	pta wrong, tr0
-
-fcmpgt1:
-	movi 2, r0
-	fmov.qd r0, dr0
-	movi 1, r1
-	fmov.qd r1, dr2
-	float.qd dr0, dr4
-	float.qd dr2, dr6
-	fcmpgt.d dr4, dr6, r7
-	bnei r7, 1, tr0 
-
-fcmpgt2:
-	movi 1, r0
-	fmov.qd r0, dr0
-	fmov.qd r0, dr2
-	float.qd dr0, dr4
-	float.qd dr2, dr6
-	fcmpgt.d dr4, dr6, r7
-	bnei r7, 0, tr0
-
-okay:
-	pass
-
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/media/fcmpgts.cgs b/sim/testsuite/sim/sh64/media/fcmpgts.cgs
deleted file mode 100644
index 893bbcbf60b..00000000000
--- a/sim/testsuite/sim/sh64/media/fcmpgts.cgs
+++ /dev/null
@@ -1,36 +0,0 @@
-# sh testcase for fcmpgt.s $frg, $frh, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-init:
-	pta wrong, tr0
-
-fcmpgt1:
-	movi 2, r0
-	fmov.ls r0, fr0
-	movi 1, r1
-	fmov.ls r1, fr1
-	float.ls fr0, fr2
-	float.ls fr1, fr3
-	fcmpgt.s fr2, fr3, r7
-	bnei r7, 1, tr0 
-
-fcmpgt2:
-	movi 1, r0
-	fmov.ls r0, fr0
-	fmov.ls r0, fr1
-	float.ls fr0, fr2
-	float.ls fr1, fr3
-	fcmpgt.s fr2, fr3, r7
-	bnei r7, 0, tr0
-
-okay:
-	pass
-
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/media/fcmpund.cgs b/sim/testsuite/sim/sh64/media/fcmpund.cgs
deleted file mode 100644
index b87fb8d9fb6..00000000000
--- a/sim/testsuite/sim/sh64/media/fcmpund.cgs
+++ /dev/null
@@ -1,26 +0,0 @@
-# sh testcase for fcmpun.d $drg, $drh, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-init:
-	pta wrong, tr0
-
-fcmpund:	
-	movi 0, r0
-	movi 1, r1
-	fmov.qd r0, dr0
-	float.qd dr0, dr0
-	fmov.qd r1, dr2
-	float.qd dr2, dr2
-	fcmpun.d dr0, dr2, r7
-	bnei r7, 0, tr0
-
-okay:	
-	pass
-
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/media/fcmpuns.cgs b/sim/testsuite/sim/sh64/media/fcmpuns.cgs
deleted file mode 100644
index 6c2ed96b4a3..00000000000
--- a/sim/testsuite/sim/sh64/media/fcmpuns.cgs
+++ /dev/null
@@ -1,26 +0,0 @@
-# sh testcase for fcmpun.s $frg, $frh, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-init:
-	pta wrong, tr0
-
-fcmpuns:	
-	movi 0, r0
-	movi 1, r1
-	fmov.ls r0, fr0
-	float.ls fr0, fr0
-	fmov.ls r1, fr1
-	float.ls fr1, fr1
-	fcmpun.s fr0, fr1, r7
-	bnei r7, 0, tr0
-
-okay:	
-	pass
-
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/media/fcnvds.cgs b/sim/testsuite/sim/sh64/media/fcnvds.cgs
deleted file mode 100644
index aa6c993fb85..00000000000
--- a/sim/testsuite/sim/sh64/media/fcnvds.cgs
+++ /dev/null
@@ -1,27 +0,0 @@
-# sh testcase for fcnv.ds $drgh, $frf -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-init:
-	pta wrong, tr0
-
-fcnvds:
-	movi 9, r0
-	fmov.qd r0, dr0
-	float.qd dr0, dr0
-	fcnv.ds dr0, fr3
-	movi 9, r0
-	fmov.ls r0, fr4
-	float.ls fr4, fr4
-	fcmpeq.s fr3, fr4, r7
-	bnei r7, 1, tr0
-
-okay:
-	pass
-
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/media/fcnvsd.cgs b/sim/testsuite/sim/sh64/media/fcnvsd.cgs
deleted file mode 100644
index 6c2396fe815..00000000000
--- a/sim/testsuite/sim/sh64/media/fcnvsd.cgs
+++ /dev/null
@@ -1,27 +0,0 @@
-# sh testcase for fcnv.sd $frgh, $drf -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-init:
-	pta wrong, tr0
-
-fcnvsd:	
-	movi 9, r0
-	fmov.ls r0, fr0
-	float.ls fr0, fr0
-	fcnv.sd fr0, dr2
-	movi 9, r0
-	fmov.qd r0, dr4
-	float.qd dr4, dr4
-	fcmpeq.d dr2, dr4, r7
-	bnei r7, 1, tr0
-
-okay:	
-	pass
-
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/media/fdivd.cgs b/sim/testsuite/sim/sh64/media/fdivd.cgs
deleted file mode 100644
index 62401c6b47e..00000000000
--- a/sim/testsuite/sim/sh64/media/fdivd.cgs
+++ /dev/null
@@ -1,39 +0,0 @@
-# sh testcase for fdiv.d $drg, $drh, $drf -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-init:
-	pta wrong, tr0
-
-fdivd1:
-	movi 1, r0
-	fmov.qd r0, dr0
-	float.qd dr0, dr0
-	movi 2, r1
-	fmov.qd r1, dr2
-	float.qd dr2, dr2
-	fdiv.d dr0, dr2, dr4
-
-fdvid2:
-	movi 6, r0
-	fmov.qd r0, dr0
-	float.qd dr0, dr0
-	movi 2, r1
-	fmov.qd r1, dr2
-	float.qd dr2, dr2
-	fdiv.d dr0, dr2, dr4
-	movi 3, r3
-	fmov.qd r3, dr6
-	float.qd dr6, dr6
-	fcmpeq.d dr4, dr6, r7
-	bnei r7, 1, tr0
-
-okay:
-	pass
-
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/media/fdivs.cgs b/sim/testsuite/sim/sh64/media/fdivs.cgs
deleted file mode 100644
index 9b20f686b92..00000000000
--- a/sim/testsuite/sim/sh64/media/fdivs.cgs
+++ /dev/null
@@ -1,39 +0,0 @@
-# sh testcase for fdiv.s $frg, $frh, $frf -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-init:
-	pta wrong, tr0
-
-fdivs1:
-	movi 1, r0
-	fmov.ls r0, fr0
-	float.ls fr0, fr0
-	movi 2, r1
-	fmov.ls r1, fr1
-	float.ls fr1, fr1
-	fdiv.s fr0, fr1, fr2
-
-fdvis2:
-	movi 6, r0
-	fmov.ls r0, fr0
-	float.ls fr0, fr0
-	movi 2, r1
-	fmov.ls r1, fr1
-	float.ls fr1, fr1
-	fdiv.s fr0, fr1, fr2
-	movi 3, r3
-	fmov.ls r3, fr3
-	float.ls fr3, fr3
-	fcmpeq.s fr2, fr3, r7
-	bnei r7, 1, tr0
-
-okay:
-	pass
-
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/media/fgetscr.cgs b/sim/testsuite/sim/sh64/media/fgetscr.cgs
deleted file mode 100644
index 6aa227480ce..00000000000
--- a/sim/testsuite/sim/sh64/media/fgetscr.cgs
+++ /dev/null
@@ -1,14 +0,0 @@
-# sh testcase for fgetscr $frf -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-	.global fgetscr
-fgetscr:
-	fgetscr fr0
-
-	pass
diff --git a/sim/testsuite/sim/sh64/media/fiprs.cgs b/sim/testsuite/sim/sh64/media/fiprs.cgs
deleted file mode 100644
index fef62d11c7c..00000000000
--- a/sim/testsuite/sim/sh64/media/fiprs.cgs
+++ /dev/null
@@ -1,42 +0,0 @@
-# sh testcase for fipr.s $fvg, $fvh, $frf -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	.macro _load val, fpreg
-	# This macro clobbers r0.
-	movi \val, r0
-	fmov.ls r0, \fpreg 
-	float.ls \fpreg, \fpreg
-	.endm
-
-	start
-
-	.global fiprs
-init:
-	pta wrong, tr0
-
-	_load 1, fr0
-	_load 2, fr1
-	_load 3, fr2
-	_load 4, fr3
-	_load 1, fr4
-	_load 2, fr5
-	_load 3, fr6
-	_load 4, fr7
-
-fiprs:
-	fipr.s fv0, fv4, fr9
-
-check:
-	_load 30, fr10
-	fcmpeq.s fr9, fr10, r7
-	bnei r7, 1, tr0
-
-okay:
-	pass
-
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/media/fldd.cgs b/sim/testsuite/sim/sh64/media/fldd.cgs
deleted file mode 100644
index ded2a9fe8f5..00000000000
--- a/sim/testsuite/sim/sh64/media/fldd.cgs
+++ /dev/null
@@ -1,13 +0,0 @@
-# sh testcase for fld.d $rm, $disp10x8, $drf -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-	movi 0x2800, r0
-	fld.d r0, 0, dr0
-	fld.d r0, 8, dr0
-	fld.d r0, -8, dr0
-	pass
diff --git a/sim/testsuite/sim/sh64/media/fldp.cgs b/sim/testsuite/sim/sh64/media/fldp.cgs
deleted file mode 100644
index 8727110378c..00000000000
--- a/sim/testsuite/sim/sh64/media/fldp.cgs
+++ /dev/null
@@ -1,16 +0,0 @@
-# sh testcase for fld.p $rm, $disp10x8, $fpf -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-init:
-	movi 0x2800, r0
-
-fldp:
-	fld.p r0, 0, fp0
-	fld.p r0, 8, fp2
-	fld.p r0, -8, fp4
-	pass
diff --git a/sim/testsuite/sim/sh64/media/flds.cgs b/sim/testsuite/sim/sh64/media/flds.cgs
deleted file mode 100644
index 75d5e961e26..00000000000
--- a/sim/testsuite/sim/sh64/media/flds.cgs
+++ /dev/null
@@ -1,13 +0,0 @@
-# sh testcase for fld.s $rm, $disp10x4, $frf -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-	movi 0x2800, r0
-	fld.s r0, 0, fr0
-	fld.s r0, 4, fr0
-	fld.s r0, -4, fr0
-	pass
diff --git a/sim/testsuite/sim/sh64/media/fldxd.cgs b/sim/testsuite/sim/sh64/media/fldxd.cgs
deleted file mode 100644
index 63cb56bb06f..00000000000
--- a/sim/testsuite/sim/sh64/media/fldxd.cgs
+++ /dev/null
@@ -1,16 +0,0 @@
-# sh testcase for fldx.d $rm, $rn, $drf -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-	movi 0x2800, r0
-	movi 0, r1
-	fldx.d r0, r1, dr0
-	movi 8, r1
-	fldx.d r0, r1, dr0
-	movi -8, r1
-	fldx.d r0, r1, dr0
-	pass
diff --git a/sim/testsuite/sim/sh64/media/fldxp.cgs b/sim/testsuite/sim/sh64/media/fldxp.cgs
deleted file mode 100644
index 3d929c6fef8..00000000000
--- a/sim/testsuite/sim/sh64/media/fldxp.cgs
+++ /dev/null
@@ -1,22 +0,0 @@
-# sh testcase for fldx.p $rm, $rn, $fpf -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-init:
-	movi 0x2800, r0
-
-fldxp:
-	movi 0, r1
-	fldx.p r0, r1, fp0
-
-	movi 8, r1
-	fldx.p r0, r1, fp2
-
-	movi -8, r1
-	fldx.p r0, r1, fp4
-
-	pass
diff --git a/sim/testsuite/sim/sh64/media/fldxs.cgs b/sim/testsuite/sim/sh64/media/fldxs.cgs
deleted file mode 100644
index 10feb3e54a9..00000000000
--- a/sim/testsuite/sim/sh64/media/fldxs.cgs
+++ /dev/null
@@ -1,16 +0,0 @@
-# sh testcase for fldx.s $rm, $rn, $frf -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-	movi 0x2800, r0
-	movi 0, r1
-	fldx.s r0, r1, fr0
-	movi 4, r1
-	fldx.s r0, r1, fr0
-	movi -4, r1
-	fldx.s r0, r1, fr0
-	pass
diff --git a/sim/testsuite/sim/sh64/media/floatld.cgs b/sim/testsuite/sim/sh64/media/floatld.cgs
deleted file mode 100644
index 31f6111061b..00000000000
--- a/sim/testsuite/sim/sh64/media/floatld.cgs
+++ /dev/null
@@ -1,12 +0,0 @@
-# sh testcase for float.ld $frgh, $drf -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-	movi 1, r0
-	fmov.ls r0, fr0
-	float.ld fr0, dr0
-	pass
diff --git a/sim/testsuite/sim/sh64/media/floatls.cgs b/sim/testsuite/sim/sh64/media/floatls.cgs
deleted file mode 100644
index 4c8fb992798..00000000000
--- a/sim/testsuite/sim/sh64/media/floatls.cgs
+++ /dev/null
@@ -1,12 +0,0 @@
-# sh testcase for float.ls $frgh, $frf -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-	movi 1, r0
-	fmov.ls r0, fr0
-	float.ls fr0, fr0
-	pass
diff --git a/sim/testsuite/sim/sh64/media/floatqd.cgs b/sim/testsuite/sim/sh64/media/floatqd.cgs
deleted file mode 100644
index ea5ddd9e49a..00000000000
--- a/sim/testsuite/sim/sh64/media/floatqd.cgs
+++ /dev/null
@@ -1,12 +0,0 @@
-# sh testcase for float.qd $drgh, $drf -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-	movi 1, r0
-	fmov.qd r0, dr0
-	float.qd dr0, dr2
-	pass
diff --git a/sim/testsuite/sim/sh64/media/floatqs.cgs b/sim/testsuite/sim/sh64/media/floatqs.cgs
deleted file mode 100644
index fcf35e29548..00000000000
--- a/sim/testsuite/sim/sh64/media/floatqs.cgs
+++ /dev/null
@@ -1,12 +0,0 @@
-# sh testcase for float.qs $drgh, $frf -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-	movi 1, r0
-	fmov.qd r0, dr0
-	float.qs dr0, fr1
-	pass
diff --git a/sim/testsuite/sim/sh64/media/fmacs.cgs b/sim/testsuite/sim/sh64/media/fmacs.cgs
deleted file mode 100644
index 62219c5fafd..00000000000
--- a/sim/testsuite/sim/sh64/media/fmacs.cgs
+++ /dev/null
@@ -1,39 +0,0 @@
-# sh testcase for fmac.s $frg, $frh, $frf -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-init:
-	pta wrong, tr0
-	
-fmacs:
-	movi 2, r0
-	fmov.ls r0, fr0
-	float.ls fr0, fr0
-
-	movi 3, r1
-	fmov.ls r1, fr1
-	float.ls fr1, fr1
-
-	movi 4, r2
-	fmov.ls r2, fr2
-	float.ls fr2, fr2
-
-	fmac.s fr0, fr1, fr2
-
-	movi 10, r3
-	fmov.ls r3, fr3
-	float.ls fr3, fr3
-
-	fcmpeq.s fr2, fr3, r7
-	bnei r7, 1, tr0
-
-okay:
-	pass
-
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/media/fmovd.cgs b/sim/testsuite/sim/sh64/media/fmovd.cgs
deleted file mode 100644
index 03c05ad1776..00000000000
--- a/sim/testsuite/sim/sh64/media/fmovd.cgs
+++ /dev/null
@@ -1,24 +0,0 @@
-# sh testcase for fmov.d $drgh, $drf -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-init:
-	pta wrong, tr0
-
-fmovd:	
-	movi 4, r0
-	fmov.qd r0, dr0
-	float.qd dr0, dr2
-	fmov.d dr2, dr4
-	fcmpeq.d dr2, dr4, r7
-	bnei r7, 1, tr0
-
-okay:
-	pass
-	
-wrong:	
-	fail	
diff --git a/sim/testsuite/sim/sh64/media/fmovdq.cgs b/sim/testsuite/sim/sh64/media/fmovdq.cgs
deleted file mode 100644
index ff5c3fe9302..00000000000
--- a/sim/testsuite/sim/sh64/media/fmovdq.cgs
+++ /dev/null
@@ -1,23 +0,0 @@
-# sh testcase for fmov.dq $drgh, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-init:
-	pta wrong, tr0
-
-fmovdq:
-	movi 4, r0
-	fmov.qd r0, dr0
-	fmov.dq dr0, r1
-	bne r0, r1, tr0
-
-okay:
-	pass
-
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/media/fmovls.cgs b/sim/testsuite/sim/sh64/media/fmovls.cgs
deleted file mode 100644
index 850ec33d160..00000000000
--- a/sim/testsuite/sim/sh64/media/fmovls.cgs
+++ /dev/null
@@ -1,26 +0,0 @@
-# sh testcase for fmov.ls $rm, $frf -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-fmovls0:
-	movi 0, r0
-	fmov.ls r0, fr0
-
-fmovls1:
-	movi 1, r1
-	fmov.ls r1, fr1
-
-upper:
-	movi 1, r2
-	shlli r2, 63, r2
-	ori r2, 3, r2
-	# Bit 63 should be ignored.
-	fmov.ls r2, fr2
-
-okay:
-	pass
diff --git a/sim/testsuite/sim/sh64/media/fmovqd.cgs b/sim/testsuite/sim/sh64/media/fmovqd.cgs
deleted file mode 100644
index 64eac72b3df..00000000000
--- a/sim/testsuite/sim/sh64/media/fmovqd.cgs
+++ /dev/null
@@ -1,22 +0,0 @@
-# sh testcase for fmov.qd $rm, $drf -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-init:
-	pta wrong, tr0
-
-fmovdq:
-	movi 4, r0
-	fmov.qd r0, dr0
-	fmov.dq dr0, r1
-	bne r0, r1, tr0
-
-okay:
-	pass
-
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/media/fmovs.cgs b/sim/testsuite/sim/sh64/media/fmovs.cgs
deleted file mode 100644
index f126aa5a41c..00000000000
--- a/sim/testsuite/sim/sh64/media/fmovs.cgs
+++ /dev/null
@@ -1,24 +0,0 @@
-# sh testcase for fmov.s $frgh, $frf -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-init:
-	pta wrong, tr0
-	
-fmovs:
-	movi 8, r0
-	fmov.ls r0, fr7
-	float.ls fr7, fr0
-	fmov.s fr0, fr1
-	fcmpeq.s fr0, fr1, r7
-	bnei r7, 1, tr0
-
-okay:
-	pass
-
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/media/fmovsl.cgs b/sim/testsuite/sim/sh64/media/fmovsl.cgs
deleted file mode 100644
index 7dfdab1d145..00000000000
--- a/sim/testsuite/sim/sh64/media/fmovsl.cgs
+++ /dev/null
@@ -1,21 +0,0 @@
-# sh testcase for fmov.sl $frgh, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-fmovsl:	
-	pta wrong, tr0
-	movi 9, r0
-	fmov.ls r0, fr0
-	fmov.sl fr0, r1
-	bne r0, r1, tr0
-
-okay:	
-	pass
-
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/media/fmuld.cgs b/sim/testsuite/sim/sh64/media/fmuld.cgs
deleted file mode 100644
index 2ad67cdc532..00000000000
--- a/sim/testsuite/sim/sh64/media/fmuld.cgs
+++ /dev/null
@@ -1,30 +0,0 @@
-# sh testcase for fmul.d $drg, $drh, $drf -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-init:
-	pta wrong, tr0
-
-fmuld1:
-	movi 2, r0
-	fmov.qd r0, dr0
-	float.qd dr0, dr0
-	movi 3, r1
-	fmov.qd r1, dr2
-	float.qd dr2, dr2
-	fmul.d dr0, dr2, dr4
-	movi 6, r2
-	fmov.qd r2, dr6
-	float.qd dr6, dr6
-	fcmpeq.d dr4, dr6, r7
-	bnei r7, 1, tr0
-
-okay:
-	pass
-
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/media/fmuls.cgs b/sim/testsuite/sim/sh64/media/fmuls.cgs
deleted file mode 100644
index 4b8875f0c59..00000000000
--- a/sim/testsuite/sim/sh64/media/fmuls.cgs
+++ /dev/null
@@ -1,31 +0,0 @@
-# sh testcase for fmul.s $frg, $frh, $frf -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-init:
-	pta wrong, tr0
-
-fmuls1:
-	movi 2, r0
-	fmov.ls r0, fr0
-	float.ls fr0, fr0
-	movi 3, r1
-	fmov.ls r1, fr1
-	float.ls fr1, fr1
-	fmul.s fr0, fr1, fr2
-	movi 6, r2
-	fmov.ls r2, fr3
-	float.ls fr3, fr3
-	fcmpeq.s fr2, fr3, r7
-	bnei r7, 1, tr0
-
-okay:
-	pass
-
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/media/fnegd.cgs b/sim/testsuite/sim/sh64/media/fnegd.cgs
deleted file mode 100644
index 67b381345b6..00000000000
--- a/sim/testsuite/sim/sh64/media/fnegd.cgs
+++ /dev/null
@@ -1,35 +0,0 @@
-# sh testcase for fneg.d $drgh, $drf -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-init:
-	pta wrong, tr0
-	movi 0, r0
-	movi 1, r1
-
-fnegd0:
-	# Ensure fnegd(0) = 0.
-	fmov.ls r0, fr7
-	float.ld fr7, dr0
-	fneg.d dr0, dr2
-	fcmpeq.d dr0, dr2, r7
-	bnei r7, 1, tr0
-
-fnegd1:
-	# Ensure fnegd(fnegd(1)) = 1.
-	fmov.ls r1, fr7
-	float.ld fr7, dr0
-	fneg.d dr0, dr2
-	fneg.d dr2, dr4
-	fcmpeq.d dr0, dr4, r7
-	bnei r7, 1, tr0
-	
-okay:
-	pass
-
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/media/fnegs.cgs b/sim/testsuite/sim/sh64/media/fnegs.cgs
deleted file mode 100644
index 9ad625a1f1f..00000000000
--- a/sim/testsuite/sim/sh64/media/fnegs.cgs
+++ /dev/null
@@ -1,35 +0,0 @@
-# sh testcase for fneg.s $frgh, $frf -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-init:
-	pta wrong, tr0
-	movi 0, r0
-	movi 1, r1
-
-fnegs0:
-	# Ensure fnegs(0) = 0.
-	fmov.ls r0, fr7
-	float.ls fr7, fr0
-	fneg.s fr0, fr1
-	fcmpeq.s fr0, fr1, r7
-	bnei r7, 1, tr0
-
-fnegs1:
-	# Ensure fnegs(fnegs(1)) = 1.
-	fmov.ls r1, fr7
-	float.ls fr7, fr0
-	fneg.s fr0, fr1
-	fneg.s fr1, fr2
-	fcmpeq.s fr0, fr2, r7
-	bnei r7, 1, tr0
-
-okay:
-	pass
-
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/media/fputscr.cgs b/sim/testsuite/sim/sh64/media/fputscr.cgs
deleted file mode 100644
index 28d2e7230ee..00000000000
--- a/sim/testsuite/sim/sh64/media/fputscr.cgs
+++ /dev/null
@@ -1,14 +0,0 @@
-# sh testcase for fputscr $frgh -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-	.global fputscr
-fputscr:
-	fputscr fr0
-
-	pass
diff --git a/sim/testsuite/sim/sh64/media/fsqrtd.cgs b/sim/testsuite/sim/sh64/media/fsqrtd.cgs
deleted file mode 100644
index ae6120002e0..00000000000
--- a/sim/testsuite/sim/sh64/media/fsqrtd.cgs
+++ /dev/null
@@ -1,27 +0,0 @@
-# sh testcase for fsqrt.d $frgh, $frf -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-init:
-	pta wrong, tr0
-	movi 9, r0
-	fmov.ls r0, fr7
-	float.ld fr7, dr0
-	movi 3, r1
-	fmov.ls r1, fr7
-	float.ld fr7, dr2
-
-fsqrtd:
-	fsqrt.d dr0, dr4
-	fcmpeq.d dr2, dr4, r7
-	bnei r7, 1, tr0
-
-okay:
-	pass
-
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/media/fsqrts.cgs b/sim/testsuite/sim/sh64/media/fsqrts.cgs
deleted file mode 100644
index f1183933159..00000000000
--- a/sim/testsuite/sim/sh64/media/fsqrts.cgs
+++ /dev/null
@@ -1,27 +0,0 @@
-# sh testcase for fsqrt.s $frgh, $frf -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-init:
-	pta wrong, tr0
-	movi 9, r0
-	fmov.ls r0, fr7
-	float.ls fr7, fr0
-	movi 3, r1
-	fmov.ls r1, fr7
-	float.ls fr7, fr2
-
-fsqrts:
-	fsqrt.s fr0, fr1
-	fcmpeq.s fr1, fr2, r7
-	bnei r7, 1, tr0
-
-okay:
-	pass
-
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/media/fstd.cgs b/sim/testsuite/sim/sh64/media/fstd.cgs
deleted file mode 100644
index 16ab5b6672c..00000000000
--- a/sim/testsuite/sim/sh64/media/fstd.cgs
+++ /dev/null
@@ -1,34 +0,0 @@
-# sh testcase for fst.d $rm, $disp10x8, $drf -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-	.global fstd
-fstd:	
-	movi 0x1020, r0
-	shlli r0, 8, r0
-	ori r0, 0x30, r0
-	shlli r0, 8, r0
-	ori r0, 0x40, r0
-	shlli r0, 8, r0
-	ori r0, 0x50, r0
-	shlli r0, 8, r0
-	ori r0, 0x60, r0
-	shlli r0, 8, r0
-	ori r0, 0x70, r0
-	shlli r0, 8, r0
-	ori r0, 0x80, r0
-	# Set target address.
-	movi 0x2800, r1
-	fmov.qd r0, dr0
-
-	fst.d r1, 0, dr0
-	fst.d r1, 8, dr0
-	fst.d r1, -8, dr0
-
-okay:
-	pass
diff --git a/sim/testsuite/sim/sh64/media/fstp.cgs b/sim/testsuite/sim/sh64/media/fstp.cgs
deleted file mode 100644
index e0c396ac59a..00000000000
--- a/sim/testsuite/sim/sh64/media/fstp.cgs
+++ /dev/null
@@ -1,14 +0,0 @@
-# sh testcase for fst.p $rm, $disp10x8, $fpf -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-	.global fstp
-fstp:
-	fst.p r0, 0, fp0
-
-	pass
diff --git a/sim/testsuite/sim/sh64/media/fsts.cgs b/sim/testsuite/sim/sh64/media/fsts.cgs
deleted file mode 100644
index fb692cf274c..00000000000
--- a/sim/testsuite/sim/sh64/media/fsts.cgs
+++ /dev/null
@@ -1,34 +0,0 @@
-# sh testcase for fst.s $rm, $disp10x4, $frf -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-	.global fsts
-fsts:
-	movi 0x1020, r0
-	shlli r0, 8, r0
-	ori r0, 0x30, r0
-	shlli r0, 8, r0
-	ori r0, 0x40, r0
-	shlli r0, 8, r0
-	ori r0, 0x50, r0
-	shlli r0, 8, r0
-	ori r0, 0x60, r0
-	shlli r0, 8, r0
-	ori r0, 0x70, r0
-	shlli r0, 8, r0
-	ori r0, 0x80, r0
-	# Set target address.
-	movi 0x2800, r1
-	fmov.ls r0, fr0
-
-	fst.s r1, 0, fr0
-	fst.s r1, 4, fr0
-	fst.s r1, -4, fr0
-
-okay:
-	pass
diff --git a/sim/testsuite/sim/sh64/media/fstxd.cgs b/sim/testsuite/sim/sh64/media/fstxd.cgs
deleted file mode 100644
index 10f6c1436b5..00000000000
--- a/sim/testsuite/sim/sh64/media/fstxd.cgs
+++ /dev/null
@@ -1,31 +0,0 @@
-# sh testcase for fstx.d $rm, $rn, $drf -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-	.global fstxd
-fstxd:
-	movi 0x1020, r0
-	shlli r0, 8, r0
-	ori r0, 0x30, r0
-	shlli r0, 8, r0
-	ori r0, 0x40, r0
-	shlli r0, 8, r0
-	ori r0, 0x50, r0
-	shlli r0, 8, r0
-	ori r0, 0x60, r0
-	shlli r0, 8, r0
-	ori r0, 0x70, r0
-	shlli r0, 8, r0
-	ori r0, 0x80, r0
-	fmov.qd r0, dr0
-	movi 0x2800, r1
-	movi -8, r2
-	fstx.d r1, r2, dr0
-
-okay:
-	pass
diff --git a/sim/testsuite/sim/sh64/media/fstxp.cgs b/sim/testsuite/sim/sh64/media/fstxp.cgs
deleted file mode 100644
index 1829f58eb25..00000000000
--- a/sim/testsuite/sim/sh64/media/fstxp.cgs
+++ /dev/null
@@ -1,14 +0,0 @@
-# sh testcase for fstx.p $rm, $rn, $fpf -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-	.global fstxp
-fstxp:
-	fstx.p r0, r0, fp0
-
-	pass
diff --git a/sim/testsuite/sim/sh64/media/fstxs.cgs b/sim/testsuite/sim/sh64/media/fstxs.cgs
deleted file mode 100644
index 0b4ff96dba9..00000000000
--- a/sim/testsuite/sim/sh64/media/fstxs.cgs
+++ /dev/null
@@ -1,30 +0,0 @@
-# sh testcase for fstx.s $rm, $rn, $frf -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-	.global fstxs
-fstxs:
-	movi 0x1020, r0
-	shlli r0, 8, r0
-	ori r0, 0x30, r0
-	shlli r0, 8, r0
-	ori r0, 0x40, r0
-	shlli r0, 8, r0
-	ori r0, 0x50, r0
-	shlli r0, 8, r0
-	ori r0, 0x60, r0
-	shlli r0, 8, r0
-	ori r0, 0x70, r0
-	shlli r0, 8, r0
-	ori r0, 0x80, r0
-	fmov.ls r0, fr0
-	movi 0x2800, r1
-	movi -8, r2
-	fstx.s r1, r2, fr0
-
-okay:
-	pass
diff --git a/sim/testsuite/sim/sh64/media/fsubd.cgs b/sim/testsuite/sim/sh64/media/fsubd.cgs
deleted file mode 100644
index 93dc421b01f..00000000000
--- a/sim/testsuite/sim/sh64/media/fsubd.cgs
+++ /dev/null
@@ -1,36 +0,0 @@
-# sh testcase for fsub.d $drg, $drh, $drf -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-	.global fsubd
-init:
-	pta wrong, tr0
-
-fsubd:
-	movi 9, r0
-	fmov.qd r0, dr0
-	float.qd dr0, dr0
-
-	movi 3, r0
-	fmov.qd r0, dr2
-	float.qd dr2, dr2
-
-	fsub.d dr0, dr2, dr4
-	
-	movi 6, r0
-	fmov.qd r0, dr6
-	float.qd dr6, dr6 
-
-	fcmpeq.d dr4, dr6, r7
-	bnei r7, 1, tr0
-
-okay:
-	pass
-
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/media/fsubs.cgs b/sim/testsuite/sim/sh64/media/fsubs.cgs
deleted file mode 100644
index b009f094054..00000000000
--- a/sim/testsuite/sim/sh64/media/fsubs.cgs
+++ /dev/null
@@ -1,36 +0,0 @@
-# sh testcase for fsub.s $frg, $frh, $frf -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-	.global fsubs
-init:
-	pta wrong, tr0
-
-fsubs:
-	movi 9, r0
-	fmov.ls r0, fr0
-	float.ls fr0, fr0
-
-	movi 3, r0
-	fmov.ls r0, fr1 
-	float.ls fr1, fr1
-
-	fsub.s fr0, fr1, fr2
-	
-	movi 6, r0
-	fmov.ls r0, fr3
-	float.ls fr3, fr3
-
-	fcmpeq.s fr2, fr3, r7
-	bnei r7, 1, tr0
-
-okay:
-	pass
-
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/media/ftrcdl.cgs b/sim/testsuite/sim/sh64/media/ftrcdl.cgs
deleted file mode 100644
index 3aafb83dca3..00000000000
--- a/sim/testsuite/sim/sh64/media/ftrcdl.cgs
+++ /dev/null
@@ -1,26 +0,0 @@
-# sh testcase for ftrc.dl $drgh, $frf -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-	.global ftrcdl
-init:
-	pta wrong, tr0
-
-ftrcdl:
-	movi -9, r0
-	fmov.qd r0, dr0
-	float.qd dr0, dr0
-	ftrc.dl dr0, fr0
-	fmov.sl fr0, r1
-	bne r0, r1, tr0
-
-okay:
-	pass
-
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/media/ftrcdq.cgs b/sim/testsuite/sim/sh64/media/ftrcdq.cgs
deleted file mode 100644
index 6cd63fb029e..00000000000
--- a/sim/testsuite/sim/sh64/media/ftrcdq.cgs
+++ /dev/null
@@ -1,24 +0,0 @@
-# sh testcase for ftrc.dq $drgh, $drf -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-init:
-	pta wrong, tr0
-
-ftrcdq:
-	movi -9, r0
-	fmov.qd r0, dr0
-	float.qd dr0, dr0
-	ftrc.dq dr0, dr2
-	fmov.dq dr2, r1
-	bne r0, r1, tr0
-
-okay:
-	pass
-
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/media/ftrcsl.cgs b/sim/testsuite/sim/sh64/media/ftrcsl.cgs
deleted file mode 100644
index 9fd7faebd1a..00000000000
--- a/sim/testsuite/sim/sh64/media/ftrcsl.cgs
+++ /dev/null
@@ -1,26 +0,0 @@
-# sh testcase for ftrc.sl $frgh, $frf -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-	.global ftrcsl
-init:
-	pta wrong, tr0
-
-ftrcsl:
-	movi -9, r0
-	fmov.ls r0, fr0
-	float.ls fr0, fr0
-	ftrc.sl fr0, fr1
-	fmov.sl fr1, r1
-	bne r0, r1, tr0
-
-okay:
-	pass
-
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/media/ftrcsq.cgs b/sim/testsuite/sim/sh64/media/ftrcsq.cgs
deleted file mode 100644
index 8f19d595e10..00000000000
--- a/sim/testsuite/sim/sh64/media/ftrcsq.cgs
+++ /dev/null
@@ -1,25 +0,0 @@
-# sh testcase for ftrc.sq $frgh, $drf -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-init:
-	pta wrong, tr0
-
-ftrcsq:
-	movi -9, r0
-	fmov.ls r0, fr0
-	float.ls fr0, fr0
-	ftrc.sq fr0, dr2
-	fmov.dq dr2, r1
-	bne r0, r1, tr0
-
-okay:
-	pass
-
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/media/ftrvs.cgs b/sim/testsuite/sim/sh64/media/ftrvs.cgs
deleted file mode 100644
index be7a75ad885..00000000000
--- a/sim/testsuite/sim/sh64/media/ftrvs.cgs
+++ /dev/null
@@ -1,67 +0,0 @@
-# sh testcase for ftrv.s $mtrxg, $fvh, $fvf -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	.macro _load val, fpreg
-	# This macro clobbers r0.
-	movi \val, r0
-	fmov.ls r0, \fpreg 
-	float.ls \fpreg, \fpreg
-	.endm
-
-	start
-
-init:
-	pta wrong, tr0
-
-	_load 1,  fr0
-	_load 2,  fr4
-	_load 3,  fr8
-	_load 4,  fr12
-	_load 5,  fr1
-	_load 6,  fr5
-	_load 7,  fr9
-	_load 8,  fr13
-	_load 9,  fr2
-	_load 10, fr6
-	_load 11, fr10
-	_load 12, fr14
-	_load 13, fr3
-	_load 14, fr7
-	_load 15, fr11
-	_load 16, fr15
-
-	_load 1, fr16
-	_load 2, fr17
-	_load 3, fr18
-	_load 4, fr19
-
-ftrvs:
-	ftrv.s mtrx0, fv16, fv20
-
-check:
-	_load 30, fr0
-	_load 70, fr1
-	_load 110, fr2
-	_load 150, fr3
-
-	fcmpeq.s fr0, fr20, r0
-	bnei r0, 1, tr0
-	
-	fcmpeq.s fr1, fr21, r0
-	bnei r0, 1, tr0
-
-	fcmpeq.s fr2, fr22, r0
-	bnei r0, 1, tr0
-
-	fcmpeq.s fr3, fr23, r0
-	bnei r0, 1, tr0
-	
-okay:
-	pass
-
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/media/getcfg.cgs b/sim/testsuite/sim/sh64/media/getcfg.cgs
deleted file mode 100644
index d151739846e..00000000000
--- a/sim/testsuite/sim/sh64/media/getcfg.cgs
+++ /dev/null
@@ -1,10 +0,0 @@
-# sh testcase for getcfg $rm, $disp6, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-	getcfg r0, 0, r0
-	pass
diff --git a/sim/testsuite/sim/sh64/media/getcon.cgs b/sim/testsuite/sim/sh64/media/getcon.cgs
deleted file mode 100644
index 8eeb43cd5b0..00000000000
--- a/sim/testsuite/sim/sh64/media/getcon.cgs
+++ /dev/null
@@ -1,29 +0,0 @@
-# sh testcase for getcon $crk, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-init:
-	pta wrong, tr0
-
-getcon1:	
-	movi 22, r0
-	putcon r0, cr0
-	getcon cr0, r1
-	bne r0, r1, tr0
-
-getcon2:
-	movi 12, r0
-	shlli r0, 35, r0
-	putcon r0, cr20
-	getcon cr20, r20
-	bne r0, r20, tr0
-
-okay:
-	pass
-
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/media/gettr.cgs b/sim/testsuite/sim/sh64/media/gettr.cgs
deleted file mode 100644
index 8840a361bb0..00000000000
--- a/sim/testsuite/sim/sh64/media/gettr.cgs
+++ /dev/null
@@ -1,48 +0,0 @@
-# sh testcase for gettr $trb, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-init:
-	# tr0 is reserved.
-	# don't use it anywhere else in this test.
-	pta wrong, tr0
-
-gettr1:
-	# Put garbage in r1, r2.
-	movi 20, r1
-	movi 30, r2
-
-	pta foo, tr1
-	pta foo, tr2
-
-check1:
-	gettr tr1, r1
-	gettr tr2, r2
-	bne r1, r2, tr0
-
-gettr2:
-	# Put garbage in r3, r4.
-	movi 21, r3
-	movi 42, r4
-	
-check2:
-	pta foo, tr1
-	gettr tr1, r2
-	ptabs r2, tr2
-	gettr tr2, r3
-	ptabs r3, tr3
-	gettr tr3, r4
-	bne r2, r4, tr0
-	
-okay:	
-	pass
-
-wrong:
-	fail
-
-foo:
-	nop
diff --git a/sim/testsuite/sim/sh64/media/icbi.cgs b/sim/testsuite/sim/sh64/media/icbi.cgs
deleted file mode 100644
index 9ba18452ef6..00000000000
--- a/sim/testsuite/sim/sh64/media/icbi.cgs
+++ /dev/null
@@ -1,10 +0,0 @@
-# sh testcase for icbi $rm, $disp6x32 -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-	icbi r0, 0
-	pass
diff --git a/sim/testsuite/sim/sh64/media/ldb.cgs b/sim/testsuite/sim/sh64/media/ldb.cgs
deleted file mode 100644
index fad1e6e15ee..00000000000
--- a/sim/testsuite/sim/sh64/media/ldb.cgs
+++ /dev/null
@@ -1,21 +0,0 @@
-# sh testcase for ld.b $rm, $disp10, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-init:
-	movi 20, r3
-	shlli r3, 8, r3
-
-ldb1:
-	ld.b r3, 0, r0
-ldb2:
-	ld.b r3, -1, r0
-ldb3:
-	ld.b r3, 1, r0
-
-okay:
-	pass
diff --git a/sim/testsuite/sim/sh64/media/ldhil.cgs b/sim/testsuite/sim/sh64/media/ldhil.cgs
deleted file mode 100644
index 4323985ea49..00000000000
--- a/sim/testsuite/sim/sh64/media/ldhil.cgs
+++ /dev/null
@@ -1,14 +0,0 @@
-# sh testcase for ldhi.l $rm, $disp6, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-	.global ldhil
-ldhil:
-	ldhi.l r0, 0, r0
-
-	pass
diff --git a/sim/testsuite/sim/sh64/media/ldhiq.cgs b/sim/testsuite/sim/sh64/media/ldhiq.cgs
deleted file mode 100644
index c34a952bba7..00000000000
--- a/sim/testsuite/sim/sh64/media/ldhiq.cgs
+++ /dev/null
@@ -1,14 +0,0 @@
-# sh testcase for ldhi.q $rm, $disp6, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-	.global ldhiq
-ldhiq:
-	ldhi.q r0, 0, r0
-
-	pass
diff --git a/sim/testsuite/sim/sh64/media/ldl.cgs b/sim/testsuite/sim/sh64/media/ldl.cgs
deleted file mode 100644
index b8b8725dee1..00000000000
--- a/sim/testsuite/sim/sh64/media/ldl.cgs
+++ /dev/null
@@ -1,21 +0,0 @@
-# sh testcase for ld.l $rm, $disp10x4, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-init:
-	movi 20, r3
-	shlli r3, 8, r3
-
-ldl1:
-	ld.l r3, 0, r0
-ldl2:
-	ld.l r3, -4, r0
-ldl3:
-	ld.l r3, 4, r0
-
-okay:
-	pass
diff --git a/sim/testsuite/sim/sh64/media/ldlol.cgs b/sim/testsuite/sim/sh64/media/ldlol.cgs
deleted file mode 100644
index 8204f40ebf4..00000000000
--- a/sim/testsuite/sim/sh64/media/ldlol.cgs
+++ /dev/null
@@ -1,14 +0,0 @@
-# sh testcase for ldlo.l $rm, $disp6, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-	.global ldlol
-ldlol:
-	ldlo.l r0, 0, r0
-
-	pass
diff --git a/sim/testsuite/sim/sh64/media/ldloq.cgs b/sim/testsuite/sim/sh64/media/ldloq.cgs
deleted file mode 100644
index 0cf128e2013..00000000000
--- a/sim/testsuite/sim/sh64/media/ldloq.cgs
+++ /dev/null
@@ -1,14 +0,0 @@
-# sh testcase for ldlo.q $rm, $disp6, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-	.global ldloq
-ldloq:
-	ldlo.q r0, 0, r0
-
-	pass
diff --git a/sim/testsuite/sim/sh64/media/ldq.cgs b/sim/testsuite/sim/sh64/media/ldq.cgs
deleted file mode 100644
index cacc076bb90..00000000000
--- a/sim/testsuite/sim/sh64/media/ldq.cgs
+++ /dev/null
@@ -1,21 +0,0 @@
-# sh testcase for ld.q $rm, $disp10x8, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-init:
-	movi 20, r3
-	shlli r3, 8, r3
-
-ldl1:
-	ld.q r3, 0, r0
-ldl2:
-	ld.q r3, -8, r0
-ldl3:
-	ld.q r3, 8, r0
-
-okay:
-	pass
diff --git a/sim/testsuite/sim/sh64/media/ldub.cgs b/sim/testsuite/sim/sh64/media/ldub.cgs
deleted file mode 100644
index 825ce642e31..00000000000
--- a/sim/testsuite/sim/sh64/media/ldub.cgs
+++ /dev/null
@@ -1,22 +0,0 @@
-# sh testcase for ld.ub $rm, $disp10, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-init:
-	movi 20, r3
-	shlli r3, 8, r3
-
-ldub1:
-	ld.ub r3, 0, r0
-ldub2:
-	ld.ub r3, -1, r0
-ldub3:
-	ld.ub r3, 1, r0
-
-okay:
-	pass
diff --git a/sim/testsuite/sim/sh64/media/lduw.cgs b/sim/testsuite/sim/sh64/media/lduw.cgs
deleted file mode 100644
index a329802e22b..00000000000
--- a/sim/testsuite/sim/sh64/media/lduw.cgs
+++ /dev/null
@@ -1,22 +0,0 @@
-# sh testcase for ld.uw $rm, $disp10, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-init:
-	movi 20, r3
-	shlli r3, 8, r3
-
-lduw1:
-	ld.uw r3, 0, r0
-lduw2:
-	ld.uw r3, -2, r0
-lduw3:
-	ld.uw r3, 2, r0
-
-okay:
-	pass
diff --git a/sim/testsuite/sim/sh64/media/ldw.cgs b/sim/testsuite/sim/sh64/media/ldw.cgs
deleted file mode 100644
index d39405515a9..00000000000
--- a/sim/testsuite/sim/sh64/media/ldw.cgs
+++ /dev/null
@@ -1,21 +0,0 @@
-# sh testcase for ld.w $rm, $disp10, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-init:
-	movi 20, r3
-	shlli r3, 8, r3
-
-ldw1:
-	ld.w r3, 0, r0
-ldw2:
-	ld.w r3, -2, r0
-ldw3:
-	ld.w r3, 2, r0
-
-okay:
-	pass
diff --git a/sim/testsuite/sim/sh64/media/ldxb.cgs b/sim/testsuite/sim/sh64/media/ldxb.cgs
deleted file mode 100644
index 36038df8da4..00000000000
--- a/sim/testsuite/sim/sh64/media/ldxb.cgs
+++ /dev/null
@@ -1,28 +0,0 @@
-# sh testcase for ldx.b $rm, $rn, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-ldxb1:
-	movi 20, r3
-	shlli r3, 8, r3
-	movi 0, r4
-	ldx.b r3, r4, r0
-
-ldxb2:
-	movi 20, r3
-	shlli r3, 8, r3
-	movi 1, r4
-	ldx.b r3, r4, r0
-
-ldxb3:
-	movi 20, r3
-	shlli r3, 8, r3
-	movi -1, r4
-	ldx.b r3, r4, r0
-
-okay:
-	pass
diff --git a/sim/testsuite/sim/sh64/media/ldxl.cgs b/sim/testsuite/sim/sh64/media/ldxl.cgs
deleted file mode 100644
index 0596e9f325b..00000000000
--- a/sim/testsuite/sim/sh64/media/ldxl.cgs
+++ /dev/null
@@ -1,28 +0,0 @@
-# sh testcase for ldx.l $rm, $rn, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-ldxl1:
-	movi 20, r3
-	shlli r3, 8, r3
-	movi 0, r4
-	ldx.l r3, r4, r0
-
-ldxl2:
-	movi 20, r3
-	shlli r3, 8, r3
-	movi 4, r4
-	ldx.l r3, r4, r0
-
-ldxl3:
-	movi 20, r3
-	shlli r3, 8, r3
-	movi -4, r4
-	ldx.l r3, r4, r0
-
-okay:
-	pass
diff --git a/sim/testsuite/sim/sh64/media/ldxq.cgs b/sim/testsuite/sim/sh64/media/ldxq.cgs
deleted file mode 100644
index 1247f220562..00000000000
--- a/sim/testsuite/sim/sh64/media/ldxq.cgs
+++ /dev/null
@@ -1,28 +0,0 @@
-# sh testcase for ldx.q $rm, $rn, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-ldxq1:
-	movi 20, r3
-	shlli r3, 8, r3
-	movi 0, r4
-	ldx.q r3, r4, r0
-
-ldxq2:
-	movi 20, r3
-	shlli r3, 8, r3
-	movi 8, r4
-	ldx.q r3, r4, r0
-
-ldxq3:
-	movi 20, r3
-	shlli r3, 8, r3
-	movi -8, r4
-	ldx.q r3, r4, r0
-
-okay:
-	pass
diff --git a/sim/testsuite/sim/sh64/media/ldxub.cgs b/sim/testsuite/sim/sh64/media/ldxub.cgs
deleted file mode 100644
index e863a3bfccf..00000000000
--- a/sim/testsuite/sim/sh64/media/ldxub.cgs
+++ /dev/null
@@ -1,28 +0,0 @@
-# sh testcase for ldx.ub $rm, $rn, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-ldxub1:
-	movi 20, r3
-	shlli r3, 8, r3
-	movi 0, r4
-	ldx.ub r3, r4, r0
-
-ldxub2:
-	movi 20, r3
-	shlli r3, 8, r3
-	movi 1, r4
-	ldx.ub r3, r4, r0
-
-ldxub3:
-	movi 20, r3
-	shlli r3, 8, r3
-	movi -1, r4
-	ldx.ub r3, r4, r0
-
-okay:
-	pass
diff --git a/sim/testsuite/sim/sh64/media/ldxuw.cgs b/sim/testsuite/sim/sh64/media/ldxuw.cgs
deleted file mode 100644
index 282812db895..00000000000
--- a/sim/testsuite/sim/sh64/media/ldxuw.cgs
+++ /dev/null
@@ -1,29 +0,0 @@
-# sh testcase for ldx.uw $rm, $rn, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-ldxuw1:
-	movi 20, r3
-	shlli r3, 8, r3
-	movi 0, r4
-	ldx.uw r3, r4, r0
-
-ldxuw2:
-	movi 20, r3
-	shlli r3, 8, r3
-	movi 2, r4
-	ldx.uw r3, r4, r0
-
-ldxuw3:
-	movi 20, r3
-	shlli r3, 8, r3
-	movi -2, r4
-	ldx.uw r3, r4, r0
-
-okay:
-	pass
diff --git a/sim/testsuite/sim/sh64/media/ldxw.cgs b/sim/testsuite/sim/sh64/media/ldxw.cgs
deleted file mode 100644
index d377fef6177..00000000000
--- a/sim/testsuite/sim/sh64/media/ldxw.cgs
+++ /dev/null
@@ -1,29 +0,0 @@
-# sh testcase for ldx.w $rm, $rn, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-ldxw1:
-	movi 20, r3
-	shlli r3, 8, r3
-	movi 0, r4
-	ldx.w r3, r4, r0
-
-ldxw2:
-	movi 20, r3
-	shlli r3, 8, r3
-	movi 2, r4
-	ldx.w r3, r4, r0
-
-ldxw3:
-	movi 20, r3
-	shlli r3, 8, r3
-	movi -2, r4
-	ldx.w r3, r4, r0
-
-okay:
-	pass
diff --git a/sim/testsuite/sim/sh64/media/mabsl.cgs b/sim/testsuite/sim/sh64/media/mabsl.cgs
deleted file mode 100644
index a8af663ea12..00000000000
--- a/sim/testsuite/sim/sh64/media/mabsl.cgs
+++ /dev/null
@@ -1,39 +0,0 @@
-# sh testcase for mabs.l $rm, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-	.global mabsl
-init:
-	pta wrong, tr0
-
-mabsl1:
-	# Pack { 1 3 } into R0.
-	_packl 1, 3, r0
-
-	mabs.l r0, r1
-
-	# Test for { 1 3 } in R0.
-	_packl 1, 3, r2
-	bne r0, r2, tr0
-	
-mabsl2:
-	# Pack { -1, -1 } into R0.
-	_packl 1, 1, r0
-	
-	# Set the left sign bit.
-	movi 1, r1
-	shlli r1, 63, r1
-	or r0, r1, r0
-
-	mabs.l r0, r2
-
-okay:
-	pass
-
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/media/mabsw.cgs b/sim/testsuite/sim/sh64/media/mabsw.cgs
deleted file mode 100644
index f4e980a19c6..00000000000
--- a/sim/testsuite/sim/sh64/media/mabsw.cgs
+++ /dev/null
@@ -1,38 +0,0 @@
-# sh testcase for mabs.w $rm, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-init:
-	pta wrong, tr0
-
-mabsw1:
-	# Pack { 1 3 5 7 } into R0.
-	_packw 1, 3, 5, 7, r0
-
-	mabs.l r0, r1
-
-	# Test for { 1 3 5 7 } in R0.
-	_packw 1, 3, 5, 7, r2
-	bne r0, r2, tr0
-
-mabsw2:
-	# Pack { -1, -1, -1, -1 } into R0.
-	_packw 1, 1, 1, 1, r0
-
-	# Set the left sign bit
-	movi 1, r1
-	shlli r1, 63, r1
-	or r0, r1, r0
-
-	mabs.w r0, r2
-
-okay:
-	pass
-
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/media/maddl.cgs b/sim/testsuite/sim/sh64/media/maddl.cgs
deleted file mode 100644
index 4bdf5463866..00000000000
--- a/sim/testsuite/sim/sh64/media/maddl.cgs
+++ /dev/null
@@ -1,29 +0,0 @@
-# sh testcase for madd.l $rm, $rn, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-init:
-	pta wrong, tr0
-
-maddl:
-	# Load { 1 2 } into r0.
-	_packl 1, 2, r0
-	# Load { 3 4 } into r1.
-	_packl 3, 4, r1
-	
-	# Add slices to produce { 4 6 }.
-	madd.l r0, r1, r2
-
-	_packl 4, 6, r3
-	bne r2, r3, tr0
-
-okay:
-	pass
-
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/media/maddsl.cgs b/sim/testsuite/sim/sh64/media/maddsl.cgs
deleted file mode 100644
index 3977275dc89..00000000000
--- a/sim/testsuite/sim/sh64/media/maddsl.cgs
+++ /dev/null
@@ -1,14 +0,0 @@
-# sh testcase for madds.l $rm, $rn, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-	.global maddsl
-maddsl:
-	madds.l r0, r0, r0
-
-	pass
diff --git a/sim/testsuite/sim/sh64/media/maddsub.cgs b/sim/testsuite/sim/sh64/media/maddsub.cgs
deleted file mode 100644
index a55f927a3e1..00000000000
--- a/sim/testsuite/sim/sh64/media/maddsub.cgs
+++ /dev/null
@@ -1,14 +0,0 @@
-# sh testcase for madds.ub $rm, $rn, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-	.global maddsub
-maddsub:
-	madds.ub r0, r0, r0
-
-	pass
diff --git a/sim/testsuite/sim/sh64/media/maddsw.cgs b/sim/testsuite/sim/sh64/media/maddsw.cgs
deleted file mode 100644
index 45a774ed2fc..00000000000
--- a/sim/testsuite/sim/sh64/media/maddsw.cgs
+++ /dev/null
@@ -1,14 +0,0 @@
-# sh testcase for madds.w $rm, $rn, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-	.global maddsw
-maddsw:
-	madds.w r0, r0, r0
-
-	pass
diff --git a/sim/testsuite/sim/sh64/media/maddw.cgs b/sim/testsuite/sim/sh64/media/maddw.cgs
deleted file mode 100644
index b220ef4aee6..00000000000
--- a/sim/testsuite/sim/sh64/media/maddw.cgs
+++ /dev/null
@@ -1,29 +0,0 @@
-# sh testcase for madd.w $rm, $rn, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-init:
-	pta wrong, tr0
-
-maddw:
-	# Load { 1 2 3 4 } into R0.
-	_packw 1, 2, 3, 4, r0
-
-	# Load { 3 4 5 6 } into R1.
-	_packw 3, 4, 5, 6, r1
-
-	# Add slices to produce { 4 6 8 10 }.
-	madd.w r0, r1, r2
-
-	_packw 4, 6, 8, 10, r3
-	bne r2, r3, tr0
-
-okay:
-	pass
-	
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/media/mcmpeqb.cgs b/sim/testsuite/sim/sh64/media/mcmpeqb.cgs
deleted file mode 100644
index d7af6fa5f58..00000000000
--- a/sim/testsuite/sim/sh64/media/mcmpeqb.cgs
+++ /dev/null
@@ -1,14 +0,0 @@
-# sh testcase for mcmpeq.b $rm, $rn, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-	.global mcmpeqb
-mcmpeqb:
-	mcmpeq.b r0, r0, r0
-
-	pass
diff --git a/sim/testsuite/sim/sh64/media/mcmpeql.cgs b/sim/testsuite/sim/sh64/media/mcmpeql.cgs
deleted file mode 100644
index 2851e80fc5e..00000000000
--- a/sim/testsuite/sim/sh64/media/mcmpeql.cgs
+++ /dev/null
@@ -1,14 +0,0 @@
-# sh testcase for mcmpeq.l $rm, $rn, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-	.global mcmpeql
-mcmpeql:
-	mcmpeq.l r0, r0, r0
-
-	pass
diff --git a/sim/testsuite/sim/sh64/media/mcmpeqw.cgs b/sim/testsuite/sim/sh64/media/mcmpeqw.cgs
deleted file mode 100644
index 085df84eeb9..00000000000
--- a/sim/testsuite/sim/sh64/media/mcmpeqw.cgs
+++ /dev/null
@@ -1,14 +0,0 @@
-# sh testcase for mcmpeq.w $rm, $rn, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-	.global mcmpeqw
-mcmpeqw:
-	mcmpeq.w r0, r0, r0
-
-	pass
diff --git a/sim/testsuite/sim/sh64/media/mcmpgtl.cgs b/sim/testsuite/sim/sh64/media/mcmpgtl.cgs
deleted file mode 100644
index 2ace0480506..00000000000
--- a/sim/testsuite/sim/sh64/media/mcmpgtl.cgs
+++ /dev/null
@@ -1,14 +0,0 @@
-# sh testcase for mcmpgt.l $rm, $rn, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-	.global mcmpgtl
-mcmpgtl:
-	mcmpgt.l r0, r0, r0
-
-	pass
diff --git a/sim/testsuite/sim/sh64/media/mcmpgtub.cgs b/sim/testsuite/sim/sh64/media/mcmpgtub.cgs
deleted file mode 100644
index 540ce966092..00000000000
--- a/sim/testsuite/sim/sh64/media/mcmpgtub.cgs
+++ /dev/null
@@ -1,14 +0,0 @@
-# sh testcase for mcmpgt.ub $rm, $rn, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-	.global mcmpgtub
-mcmpgtub:
-	mcmpgt.ub r0, r0, r0
-
-	pass
diff --git a/sim/testsuite/sim/sh64/media/mcmpgtw.cgs b/sim/testsuite/sim/sh64/media/mcmpgtw.cgs
deleted file mode 100644
index 83274512d5e..00000000000
--- a/sim/testsuite/sim/sh64/media/mcmpgtw.cgs
+++ /dev/null
@@ -1,14 +0,0 @@
-# sh testcase for mcmpgt.w $rm, $rn, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-	.global mcmpgtw
-mcmpgtw:
-	mcmpgt.w r0, r0, r0
-
-	pass
diff --git a/sim/testsuite/sim/sh64/media/mcmv.cgs b/sim/testsuite/sim/sh64/media/mcmv.cgs
deleted file mode 100644
index c1f59aa4f88..00000000000
--- a/sim/testsuite/sim/sh64/media/mcmv.cgs
+++ /dev/null
@@ -1,14 +0,0 @@
-# sh testcase for mcmv $rm, $rn, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-	.global mcmv
-mcmv:
-	mcmv r0, r0, r0
-
-	pass
diff --git a/sim/testsuite/sim/sh64/media/mcnvslw.cgs b/sim/testsuite/sim/sh64/media/mcnvslw.cgs
deleted file mode 100644
index 005108b7669..00000000000
--- a/sim/testsuite/sim/sh64/media/mcnvslw.cgs
+++ /dev/null
@@ -1,14 +0,0 @@
-# sh testcase for mcnvs.lw $rm, $rn, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-	.global mcnvslw
-mcnvslw:
-	mcnvs.lw r0, r0, r0
-
-	pass
diff --git a/sim/testsuite/sim/sh64/media/mcnvswb.cgs b/sim/testsuite/sim/sh64/media/mcnvswb.cgs
deleted file mode 100644
index 0d25920f310..00000000000
--- a/sim/testsuite/sim/sh64/media/mcnvswb.cgs
+++ /dev/null
@@ -1,14 +0,0 @@
-# sh testcase for mcnvs.wb $rm, $rn, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-	.global mcnvswb
-mcnvswb:
-	mcnvs.wb r0, r0, r0
-
-	pass
diff --git a/sim/testsuite/sim/sh64/media/mcnvswub.cgs b/sim/testsuite/sim/sh64/media/mcnvswub.cgs
deleted file mode 100644
index 2fc74466dd0..00000000000
--- a/sim/testsuite/sim/sh64/media/mcnvswub.cgs
+++ /dev/null
@@ -1,14 +0,0 @@
-# sh testcase for mcnvs.wub $rm, $rn, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-	.global mcnvswub
-mcnvswub:
-	mcnvs.wub r0, r0, r0
-
-	pass
diff --git a/sim/testsuite/sim/sh64/media/mextr1.cgs b/sim/testsuite/sim/sh64/media/mextr1.cgs
deleted file mode 100644
index b2cb3c3ff29..00000000000
--- a/sim/testsuite/sim/sh64/media/mextr1.cgs
+++ /dev/null
@@ -1,67 +0,0 @@
-# sh testcase for mextr1 $rm, $rn, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-init:
-	# Put a distinguised bit pattern in R0.
-	movi 0x1020, r0
-	shlli r0, 8, r0
-	ori r0, 0x30, r0
-	shlli r0, 8, r0
-	ori r0, 0x40, r0
-	shlli r0, 8, r0
-	ori r0, 0x50, r0
-	shlli r0, 8, r0
-	ori r0, 0x60, r0
-	shlli r0, 8, r0
-	ori r0, 0x70, r0
-	shlli r0, 8, r0
-	ori r0, 0x80, r0
-
-	# Put another distinguished bit pattern in R1.
-	movi 0x1525, r1
-	shlli r1, 8, r1
-	ori r1, 0x35, r1
-	shlli r1, 8, r1
-	ori r1, 0x45, r1
-	shlli r1, 8, r1
-	ori r1, 0x55, r1
-	shlli r1, 8, r1
-	ori r1, 0x65, r1
-	shlli r1, 8, r1
-	ori r1, 0x75, r1
-	shlli r1, 8, r1
-	ori r1, 0x85, r1
- 
-mextr1:
-	mextr1 r0, r1, r2
-
-check:
-	# Put the result in R3.
-	movi 0x2535, r3
-	shlli r3, 8, r3
-	ori r3, 0x45, r3
-	shlli r3, 8, r3
-	ori r3, 0x55, r3
-	shlli r3, 8, r3
-	ori r3, 0x65, r3
-	shlli r3, 8, r3
-	ori r3, 0x75, r3
-	shlli r3, 8, r3
-	ori r3, 0x85, r3
-	shlli r3, 8, r3
-	ori r3, 0x10, r3
-
-	pta wrong, tr0
-	bne r2, r3, tr0
-
-okay:
-	pass
-
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/media/mextr2.cgs b/sim/testsuite/sim/sh64/media/mextr2.cgs
deleted file mode 100644
index cf136be8176..00000000000
--- a/sim/testsuite/sim/sh64/media/mextr2.cgs
+++ /dev/null
@@ -1,67 +0,0 @@
-# sh testcase for mextr2 $rm, $rn, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-init:
-	# Put a distinguised bit pattern in R0.
-	movi 0x1020, r0
-	shlli r0, 8, r0
-	ori r0, 0x30, r0
-	shlli r0, 8, r0
-	ori r0, 0x40, r0
-	shlli r0, 8, r0
-	ori r0, 0x50, r0
-	shlli r0, 8, r0
-	ori r0, 0x60, r0
-	shlli r0, 8, r0
-	ori r0, 0x70, r0
-	shlli r0, 8, r0
-	ori r0, 0x80, r0
-
-	# Put another distinguished bit pattern in R1.
-	movi 0x1525, r1
-	shlli r1, 8, r1
-	ori r1, 0x35, r1
-	shlli r1, 8, r1
-	ori r1, 0x45, r1
-	shlli r1, 8, r1
-	ori r1, 0x55, r1
-	shlli r1, 8, r1
-	ori r1, 0x65, r1
-	shlli r1, 8, r1
-	ori r1, 0x75, r1
-	shlli r1, 8, r1
-	ori r1, 0x85, r1
- 
-mextr2:
-	mextr2 r0, r1, r2
-
-check:
-        # Put the result in R3.
-        movi 0x3545, r3
-        shlli r3, 8, r3
-        ori r3, 0x55, r3
-        shlli r3, 8, r3
-        ori r3, 0x65, r3
-        shlli r3, 8, r3
-        ori r3, 0x75, r3
-        shlli r3, 8, r3
-        ori r3, 0x85, r3
-        shlli r3, 8, r3
-        ori r3, 0x10, r3
-        shlli r3, 8, r3
-        ori r3, 0x20, r3
-
-        pta wrong, tr0
-        bne r2, r3, tr0
-
-okay:
-	pass
-
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/media/mextr3.cgs b/sim/testsuite/sim/sh64/media/mextr3.cgs
deleted file mode 100644
index b8d60a447bc..00000000000
--- a/sim/testsuite/sim/sh64/media/mextr3.cgs
+++ /dev/null
@@ -1,67 +0,0 @@
-# sh testcase for mextr3 $rm, $rn, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-init:
-	# Put a distinguised bit pattern in R0.
-	movi 0x1020, r0
-	shlli r0, 8, r0
-	ori r0, 0x30, r0
-	shlli r0, 8, r0
-	ori r0, 0x40, r0
-	shlli r0, 8, r0
-	ori r0, 0x50, r0
-	shlli r0, 8, r0
-	ori r0, 0x60, r0
-	shlli r0, 8, r0
-	ori r0, 0x70, r0
-	shlli r0, 8, r0
-	ori r0, 0x80, r0
-
-	# Put another distinguished bit pattern in R1.
-	movi 0x1525, r1
-	shlli r1, 8, r1
-	ori r1, 0x35, r1
-	shlli r1, 8, r1
-	ori r1, 0x45, r1
-	shlli r1, 8, r1
-	ori r1, 0x55, r1
-	shlli r1, 8, r1
-	ori r1, 0x65, r1
-	shlli r1, 8, r1
-	ori r1, 0x75, r1
-	shlli r1, 8, r1
-	ori r1, 0x85, r1
- 
-mextr3:
-	mextr3 r0, r1, r2
-
-check:
-        # Put the result in R3.
-        movi 0x4555, r3
-        shlli r3, 8, r3
-        ori r3, 0x65, r3
-        shlli r3, 8, r3
-        ori r3, 0x75, r3
-        shlli r3, 8, r3
-        ori r3, 0x85, r3
-        shlli r3, 8, r3
-        ori r3, 0x10, r3
-        shlli r3, 8, r3
-        ori r3, 0x20, r3
-        shlli r3, 8, r3
-        ori r3, 0x30, r3
-
-        pta wrong, tr0
-        bne r2, r3, tr0
-
-okay:
-	pass
-
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/media/mextr4.cgs b/sim/testsuite/sim/sh64/media/mextr4.cgs
deleted file mode 100644
index e9ebff9be7b..00000000000
--- a/sim/testsuite/sim/sh64/media/mextr4.cgs
+++ /dev/null
@@ -1,67 +0,0 @@
-# sh testcase for mextr4 $rm, $rn, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-init:
-	# Put a distinguised bit pattern in R0.
-	movi 0x1020, r0
-	shlli r0, 8, r0
-	ori r0, 0x30, r0
-	shlli r0, 8, r0
-	ori r0, 0x40, r0
-	shlli r0, 8, r0
-	ori r0, 0x50, r0
-	shlli r0, 8, r0
-	ori r0, 0x60, r0
-	shlli r0, 8, r0
-	ori r0, 0x70, r0
-	shlli r0, 8, r0
-	ori r0, 0x80, r0
-
-	# Put another distinguished bit pattern in R1.
-	movi 0x1525, r1
-	shlli r1, 8, r1
-	ori r1, 0x35, r1
-	shlli r1, 8, r1
-	ori r1, 0x45, r1
-	shlli r1, 8, r1
-	ori r1, 0x55, r1
-	shlli r1, 8, r1
-	ori r1, 0x65, r1
-	shlli r1, 8, r1
-	ori r1, 0x75, r1
-	shlli r1, 8, r1
-	ori r1, 0x85, r1
- 
-mextr4:
-	mextr4 r0, r1, r2
-
-check:
-        # Put the result in R3.
-        movi 0x5565, r3
-        shlli r3, 8, r3
-        ori r3, 0x75, r3
-        shlli r3, 8, r3
-        ori r3, 0x85, r3
-        shlli r3, 8, r3
-        ori r3, 0x10, r3
-        shlli r3, 8, r3
-        ori r3, 0x20, r3
-        shlli r3, 8, r3
-        ori r3, 0x30, r3
-        shlli r3, 8, r3
-        ori r3, 0x40, r3
-
-        pta wrong, tr0
-        bne r2, r3, tr0
-
-okay:
-	pass
-
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/media/mextr5.cgs b/sim/testsuite/sim/sh64/media/mextr5.cgs
deleted file mode 100644
index c61a0c89f52..00000000000
--- a/sim/testsuite/sim/sh64/media/mextr5.cgs
+++ /dev/null
@@ -1,67 +0,0 @@
-# sh testcase for mextr5 $rm, $rn, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-init:
-	# Put a distinguised bit pattern in R0.
-	movi 0x1020, r0
-	shlli r0, 8, r0
-	ori r0, 0x30, r0
-	shlli r0, 8, r0
-	ori r0, 0x40, r0
-	shlli r0, 8, r0
-	ori r0, 0x50, r0
-	shlli r0, 8, r0
-	ori r0, 0x60, r0
-	shlli r0, 8, r0
-	ori r0, 0x70, r0
-	shlli r0, 8, r0
-	ori r0, 0x80, r0
-
-	# Put another distinguished bit pattern in R1.
-	movi 0x1525, r1
-	shlli r1, 8, r1
-	ori r1, 0x35, r1
-	shlli r1, 8, r1
-	ori r1, 0x45, r1
-	shlli r1, 8, r1
-	ori r1, 0x55, r1
-	shlli r1, 8, r1
-	ori r1, 0x65, r1
-	shlli r1, 8, r1
-	ori r1, 0x75, r1
-	shlli r1, 8, r1
-	ori r1, 0x85, r1
- 
-mextr5:
-	mextr5 r0, r1, r2
-
-check:
-        # Put the result in R3.
-        movi 0x6575, r3
-        shlli r3, 8, r3
-        ori r3, 0x85, r3
-        shlli r3, 8, r3
-        ori r3, 0x10, r3
-        shlli r3, 8, r3
-        ori r3, 0x20, r3
-        shlli r3, 8, r3
-        ori r3, 0x30, r3
-        shlli r3, 8, r3
-        ori r3, 0x40, r3
-        shlli r3, 8, r3
-        ori r3, 0x50, r3
-
-        pta wrong, tr0
-        bne r2, r3, tr0
-
-okay:
-	pass
-
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/media/mextr6.cgs b/sim/testsuite/sim/sh64/media/mextr6.cgs
deleted file mode 100644
index 5c6c7f60c79..00000000000
--- a/sim/testsuite/sim/sh64/media/mextr6.cgs
+++ /dev/null
@@ -1,67 +0,0 @@
-# sh testcase for mextr6 $rm, $rn, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-init:
-	# Put a distinguised bit pattern in R0.
-	movi 0x1020, r0
-	shlli r0, 8, r0
-	ori r0, 0x30, r0
-	shlli r0, 8, r0
-	ori r0, 0x40, r0
-	shlli r0, 8, r0
-	ori r0, 0x50, r0
-	shlli r0, 8, r0
-	ori r0, 0x60, r0
-	shlli r0, 8, r0
-	ori r0, 0x70, r0
-	shlli r0, 8, r0
-	ori r0, 0x80, r0
-
-	# Put another distinguished bit pattern in R1.
-	movi 0x1525, r1
-	shlli r1, 8, r1
-	ori r1, 0x35, r1
-	shlli r1, 8, r1
-	ori r1, 0x45, r1
-	shlli r1, 8, r1
-	ori r1, 0x55, r1
-	shlli r1, 8, r1
-	ori r1, 0x65, r1
-	shlli r1, 8, r1
-	ori r1, 0x75, r1
-	shlli r1, 8, r1
-	ori r1, 0x85, r1
- 
-mextr6:
-	mextr6 r0, r1, r2
-
-check:
-        # Put the result in R3.
-        movi 0x7585, r3
-        shlli r3, 8, r3
-        ori r3, 0x10, r3
-        shlli r3, 8, r3
-        ori r3, 0x20, r3
-        shlli r3, 8, r3
-        ori r3, 0x30, r3
-        shlli r3, 8, r3
-        ori r3, 0x40, r3
-        shlli r3, 8, r3
-        ori r3, 0x50, r3
-        shlli r3, 8, r3
-        ori r3, 0x60, r3
-
-        pta wrong, tr0
-        bne r2, r3, tr0
-
-okay:
-	pass
-
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/media/mextr7.cgs b/sim/testsuite/sim/sh64/media/mextr7.cgs
deleted file mode 100644
index e05ec7f9ab3..00000000000
--- a/sim/testsuite/sim/sh64/media/mextr7.cgs
+++ /dev/null
@@ -1,67 +0,0 @@
-# sh testcase for mextr7 $rm, $rn, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-init:
-	# Put a distinguised bit pattern in R0.
-	movi 0x1020, r0
-	shlli r0, 8, r0
-	ori r0, 0x30, r0
-	shlli r0, 8, r0
-	ori r0, 0x40, r0
-	shlli r0, 8, r0
-	ori r0, 0x50, r0
-	shlli r0, 8, r0
-	ori r0, 0x60, r0
-	shlli r0, 8, r0
-	ori r0, 0x70, r0
-	shlli r0, 8, r0
-	ori r0, 0x80, r0
-
-	# Put another distinguished bit pattern in R1.
-	movi 0x1525, r1
-	shlli r1, 8, r1
-	ori r1, 0x35, r1
-	shlli r1, 8, r1
-	ori r1, 0x45, r1
-	shlli r1, 8, r1
-	ori r1, 0x55, r1
-	shlli r1, 8, r1
-	ori r1, 0x65, r1
-	shlli r1, 8, r1
-	ori r1, 0x75, r1
-	shlli r1, 8, r1
-	ori r1, 0x85, r1
- 
-mextr7:
-	mextr7 r0, r1, r2
-
-check:
-        # Put the result in R3.
-        movi 0x8510, r3
-        shlli r3, 8, r3
-        ori r3, 0x20, r3
-        shlli r3, 8, r3
-        ori r3, 0x30, r3
-        shlli r3, 8, r3
-        ori r3, 0x40, r3
-        shlli r3, 8, r3
-        ori r3, 0x50, r3
-        shlli r3, 8, r3
-        ori r3, 0x60, r3
-        shlli r3, 8, r3
-        ori r3, 0x70, r3
-
-        pta wrong, tr0
-        bne r2, r3, tr0
-
-okay:
-	pass
-
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/media/mmacfxwl.cgs b/sim/testsuite/sim/sh64/media/mmacfxwl.cgs
deleted file mode 100644
index dd2d9a41ae7..00000000000
--- a/sim/testsuite/sim/sh64/media/mmacfxwl.cgs
+++ /dev/null
@@ -1,14 +0,0 @@
-# sh testcase for mmacfx.wl $rm, $rn, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-	.global mmacfxwl
-mmacfxwl:
-	mmacfx.wl r0, r0, r0
-
-	pass
diff --git a/sim/testsuite/sim/sh64/media/mmacnfx-wl.cgs b/sim/testsuite/sim/sh64/media/mmacnfx-wl.cgs
deleted file mode 100644
index ba634d207a3..00000000000
--- a/sim/testsuite/sim/sh64/media/mmacnfx-wl.cgs
+++ /dev/null
@@ -1,14 +0,0 @@
-# sh testcase for mmacnfx.wl $rm, $rn, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-	.global mmacnfx_wl
-mmacnfx_wl:
-	mmacnfx.wl r0, r0, r0
-
-	pass
diff --git a/sim/testsuite/sim/sh64/media/mmulfxl.cgs b/sim/testsuite/sim/sh64/media/mmulfxl.cgs
deleted file mode 100644
index 7d2d1a63268..00000000000
--- a/sim/testsuite/sim/sh64/media/mmulfxl.cgs
+++ /dev/null
@@ -1,14 +0,0 @@
-# sh testcase for mmulfx.l $rm, $rn, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-	.global mmulfxl
-mmulfxl:
-	mmulfx.l r0, r0, r0
-
-	pass
diff --git a/sim/testsuite/sim/sh64/media/mmulfxrpw.cgs b/sim/testsuite/sim/sh64/media/mmulfxrpw.cgs
deleted file mode 100644
index 13fdcc71d0e..00000000000
--- a/sim/testsuite/sim/sh64/media/mmulfxrpw.cgs
+++ /dev/null
@@ -1,14 +0,0 @@
-# sh testcase for mmulfxrp.w $rm, $rn, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-	.global mmulfxrpw
-mmulfxrpw:
-	mmulfxrp.w r0, r0, r0
-
-	pass
diff --git a/sim/testsuite/sim/sh64/media/mmulfxw.cgs b/sim/testsuite/sim/sh64/media/mmulfxw.cgs
deleted file mode 100644
index e2a66a7c11d..00000000000
--- a/sim/testsuite/sim/sh64/media/mmulfxw.cgs
+++ /dev/null
@@ -1,14 +0,0 @@
-# sh testcase for mmulfx.w $rm, $rn, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-	.global mmulfxw
-mmulfxw:
-	mmulfx.w r0, r0, r0
-
-	pass
diff --git a/sim/testsuite/sim/sh64/media/mmulhiwl.cgs b/sim/testsuite/sim/sh64/media/mmulhiwl.cgs
deleted file mode 100644
index 1a41ac59286..00000000000
--- a/sim/testsuite/sim/sh64/media/mmulhiwl.cgs
+++ /dev/null
@@ -1,14 +0,0 @@
-# sh testcase for mmulhi.wl $rm, $rn, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-	.global mmulhiwl
-mmulhiwl:
-	mmulhi.wl r0, r0, r0
-
-	pass
diff --git a/sim/testsuite/sim/sh64/media/mmull.cgs b/sim/testsuite/sim/sh64/media/mmull.cgs
deleted file mode 100644
index b3ed9df3f35..00000000000
--- a/sim/testsuite/sim/sh64/media/mmull.cgs
+++ /dev/null
@@ -1,14 +0,0 @@
-# sh testcase for mmul.l $rm, $rn, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-	.global mmull
-mmull:
-	mmul.l r0, r0, r0
-
-	pass
diff --git a/sim/testsuite/sim/sh64/media/mmullowl.cgs b/sim/testsuite/sim/sh64/media/mmullowl.cgs
deleted file mode 100644
index b50ccfcb5dd..00000000000
--- a/sim/testsuite/sim/sh64/media/mmullowl.cgs
+++ /dev/null
@@ -1,14 +0,0 @@
-# sh testcase for mmullo.wl $rm, $rn, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-	.global mmullowl
-mmullowl:
-	mmullo.wl r0, r0, r0
-
-	pass
diff --git a/sim/testsuite/sim/sh64/media/mmulsumwq.cgs b/sim/testsuite/sim/sh64/media/mmulsumwq.cgs
deleted file mode 100644
index 344710b0e98..00000000000
--- a/sim/testsuite/sim/sh64/media/mmulsumwq.cgs
+++ /dev/null
@@ -1,14 +0,0 @@
-# sh testcase for mmulsum.wq $rm, $rn, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-	.global mmulsumwq
-mmulsumwq:
-	mmulsum.wq r0, r0, r0
-
-	pass
diff --git a/sim/testsuite/sim/sh64/media/mmulw.cgs b/sim/testsuite/sim/sh64/media/mmulw.cgs
deleted file mode 100644
index 675c620fadc..00000000000
--- a/sim/testsuite/sim/sh64/media/mmulw.cgs
+++ /dev/null
@@ -1,14 +0,0 @@
-# sh testcase for mmul.w $rm, $rn, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-	.global mmulw
-mmulw:
-	mmul.w r0, r0, r0
-
-	pass
diff --git a/sim/testsuite/sim/sh64/media/movi.cgs b/sim/testsuite/sim/sh64/media/movi.cgs
deleted file mode 100644
index a01bcae84df..00000000000
--- a/sim/testsuite/sim/sh64/media/movi.cgs
+++ /dev/null
@@ -1,29 +0,0 @@
-# sh testcase for movi $imm16, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-init:
-	pta wrong, tr0
-
-movi0:
-	movi 0, r0
-	bnei r0, 0, tr0
-movi1:
-	movi 1, r0
-	bnei r0, 1, tr0
-movi2:
-	movi 23, r0
-	bnei r0, 23, tr0
-movn:
-	movi -1, r0
-	addi r0, 1, r0
-	bnei r0, 0, tr0
-
-okay:
-	pass
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/media/mpermw.cgs b/sim/testsuite/sim/sh64/media/mpermw.cgs
deleted file mode 100644
index 3b6741e8107..00000000000
--- a/sim/testsuite/sim/sh64/media/mpermw.cgs
+++ /dev/null
@@ -1,51 +0,0 @@
-# sh testcase for mperm.w $rm, $rn, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-init:
-	pta wrong, tr0
-	movi 27, r1
-	movi 0x1020, r0
-	shlli r0, 8, r0
-	ori r0, 0x30, r0
-	shlli r0, 8, r0
-	ori r0, 0x40, r0
-	shlli r0, 8, r0
-	ori r0, 0x50, r0
-	shlli r0, 8, r0
-	ori r0, 0x60, r0
-	shlli r0, 8, r0
-	ori r0, 0x70, r0
-	shlli r0, 8, r0
-	ori r0, 0x80, r0
-
-mpermw:
-	mperm.w r0, r1, r2
-
-check:
-	# Expect 0x7080506030401020.
-	movi 0x7080, r0
-	shlli r0, 8, r0
-	ori r0, 0x50, r0
-	shlli r0, 8, r0
-	ori r0, 0x60, r0
-	shlli r0, 8, r0
-	ori r0, 0x30, r0
-	shlli r0, 8, r0
-	ori r0, 0x40, r0
-	shlli r0, 8, r0
-	ori r0, 0x10, r0
-	shlli r0, 8, r0
-	ori r0, 0x20, r0
-
-	bne r0, r2, tr0
-
-okay:
-	pass
-
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/media/msadubq.cgs b/sim/testsuite/sim/sh64/media/msadubq.cgs
deleted file mode 100644
index 4361883b870..00000000000
--- a/sim/testsuite/sim/sh64/media/msadubq.cgs
+++ /dev/null
@@ -1,14 +0,0 @@
-# sh testcase for msad.ubq $rm, $rn, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-	.global msadubq
-msadubq:
-	msad.ubq r0, r0, r0
-
-	pass
diff --git a/sim/testsuite/sim/sh64/media/mshaldsl.cgs b/sim/testsuite/sim/sh64/media/mshaldsl.cgs
deleted file mode 100644
index 1dd86ec6bb6..00000000000
--- a/sim/testsuite/sim/sh64/media/mshaldsl.cgs
+++ /dev/null
@@ -1,14 +0,0 @@
-# sh testcase for mshalds.l $rm, $rn, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-	.global mshaldsl
-mshaldsl:
-	mshalds.l r0, r0, r0
-
-	pass
diff --git a/sim/testsuite/sim/sh64/media/mshaldsw.cgs b/sim/testsuite/sim/sh64/media/mshaldsw.cgs
deleted file mode 100644
index 7ab6797e9a6..00000000000
--- a/sim/testsuite/sim/sh64/media/mshaldsw.cgs
+++ /dev/null
@@ -1,14 +0,0 @@
-# sh testcase for mshalds.w $rm, $rn, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-	.global mshaldsw
-mshaldsw:
-	mshalds.w r0, r0, r0
-
-	pass
diff --git a/sim/testsuite/sim/sh64/media/mshardl.cgs b/sim/testsuite/sim/sh64/media/mshardl.cgs
deleted file mode 100644
index 0dc102e337a..00000000000
--- a/sim/testsuite/sim/sh64/media/mshardl.cgs
+++ /dev/null
@@ -1,14 +0,0 @@
-# sh testcase for mshard.l $rm, $rn, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-	.global mshardl
-mshardl:
-	mshard.l r0, r0, r0
-
-	pass
diff --git a/sim/testsuite/sim/sh64/media/mshardsq.cgs b/sim/testsuite/sim/sh64/media/mshardsq.cgs
deleted file mode 100644
index 5f29afb8b1b..00000000000
--- a/sim/testsuite/sim/sh64/media/mshardsq.cgs
+++ /dev/null
@@ -1,14 +0,0 @@
-# sh testcase for mshards.q $rm, $rn, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-	.global mshardsq
-mshardsq:
-	mshards.q r0, r0, r0
-
-	pass
diff --git a/sim/testsuite/sim/sh64/media/mshardw.cgs b/sim/testsuite/sim/sh64/media/mshardw.cgs
deleted file mode 100644
index ecc7004febd..00000000000
--- a/sim/testsuite/sim/sh64/media/mshardw.cgs
+++ /dev/null
@@ -1,14 +0,0 @@
-# sh testcase for mshard.w $rm, $rn, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-	.global mshardw
-mshardw:
-	mshard.w r0, r0, r0
-
-	pass
diff --git a/sim/testsuite/sim/sh64/media/mshfhib.cgs b/sim/testsuite/sim/sh64/media/mshfhib.cgs
deleted file mode 100644
index b7b245e79ae..00000000000
--- a/sim/testsuite/sim/sh64/media/mshfhib.cgs
+++ /dev/null
@@ -1,14 +0,0 @@
-# sh testcase for mshfhi.b $rm, $rn, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-	.global mshfhib
-mshfhib:
-	mshfhi.b r0, r0, r0
-
-	pass
diff --git a/sim/testsuite/sim/sh64/media/mshfhil.cgs b/sim/testsuite/sim/sh64/media/mshfhil.cgs
deleted file mode 100644
index 2fab7ae1fd9..00000000000
--- a/sim/testsuite/sim/sh64/media/mshfhil.cgs
+++ /dev/null
@@ -1,14 +0,0 @@
-# sh testcase for mshfhi.l $rm, $rn, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-	.global mshfhil
-mshfhil:
-	mshfhi.l r0, r0, r0
-
-	pass
diff --git a/sim/testsuite/sim/sh64/media/mshfhiw.cgs b/sim/testsuite/sim/sh64/media/mshfhiw.cgs
deleted file mode 100644
index 03111413cf1..00000000000
--- a/sim/testsuite/sim/sh64/media/mshfhiw.cgs
+++ /dev/null
@@ -1,14 +0,0 @@
-# sh testcase for mshfhi.w $rm, $rn, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-	.global mshfhiw
-mshfhiw:
-	mshfhi.w r0, r0, r0
-
-	pass
diff --git a/sim/testsuite/sim/sh64/media/mshflob.cgs b/sim/testsuite/sim/sh64/media/mshflob.cgs
deleted file mode 100644
index 400e81a0598..00000000000
--- a/sim/testsuite/sim/sh64/media/mshflob.cgs
+++ /dev/null
@@ -1,14 +0,0 @@
-# sh testcase for mshflo.b $rm, $rn, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-	.global mshflob
-mshflob:
-	mshflo.b r0, r0, r0
-
-	pass
diff --git a/sim/testsuite/sim/sh64/media/mshflol.cgs b/sim/testsuite/sim/sh64/media/mshflol.cgs
deleted file mode 100644
index 2fbdf894e60..00000000000
--- a/sim/testsuite/sim/sh64/media/mshflol.cgs
+++ /dev/null
@@ -1,14 +0,0 @@
-# sh testcase for mshflo.l $rm, $rn, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-	.global mshflol
-mshflol:
-	mshflo.l r0, r0, r0
-
-	pass
diff --git a/sim/testsuite/sim/sh64/media/mshflow.cgs b/sim/testsuite/sim/sh64/media/mshflow.cgs
deleted file mode 100644
index 542eb042c52..00000000000
--- a/sim/testsuite/sim/sh64/media/mshflow.cgs
+++ /dev/null
@@ -1,14 +0,0 @@
-# sh testcase for mshflo.w $rm, $rn, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-	.global mshflow
-mshflow:
-	mshflo.w r0, r0, r0
-
-	pass
diff --git a/sim/testsuite/sim/sh64/media/mshlldl.cgs b/sim/testsuite/sim/sh64/media/mshlldl.cgs
deleted file mode 100644
index 2a17c33002e..00000000000
--- a/sim/testsuite/sim/sh64/media/mshlldl.cgs
+++ /dev/null
@@ -1,14 +0,0 @@
-# sh testcase for mshlld.l $rm, $rn, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-	.global mshlldl
-mshlldl:
-	mshlld.l r0, r0, r0
-
-	pass
diff --git a/sim/testsuite/sim/sh64/media/mshlldw.cgs b/sim/testsuite/sim/sh64/media/mshlldw.cgs
deleted file mode 100644
index e4afe3d732a..00000000000
--- a/sim/testsuite/sim/sh64/media/mshlldw.cgs
+++ /dev/null
@@ -1,14 +0,0 @@
-# sh testcase for mshlld.w $rm, $rn, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-	.global mshlldw
-mshlldw:
-	mshlld.w r0, r0, r0
-
-	pass
diff --git a/sim/testsuite/sim/sh64/media/mshlrdl.cgs b/sim/testsuite/sim/sh64/media/mshlrdl.cgs
deleted file mode 100644
index 89e70772b7f..00000000000
--- a/sim/testsuite/sim/sh64/media/mshlrdl.cgs
+++ /dev/null
@@ -1,14 +0,0 @@
-# sh testcase for mshlrd.l $rm, $rn, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-	.global mshlrdl
-mshlrdl:
-	mshlrd.l r0, r0, r0
-
-	pass
diff --git a/sim/testsuite/sim/sh64/media/mshlrdw.cgs b/sim/testsuite/sim/sh64/media/mshlrdw.cgs
deleted file mode 100644
index 4cbf2807f9c..00000000000
--- a/sim/testsuite/sim/sh64/media/mshlrdw.cgs
+++ /dev/null
@@ -1,14 +0,0 @@
-# sh testcase for mshlrd.w $rm, $rn, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-	.global mshlrdw
-mshlrdw:
-	mshlrd.w r0, r0, r0
-
-	pass
diff --git a/sim/testsuite/sim/sh64/media/msubl.cgs b/sim/testsuite/sim/sh64/media/msubl.cgs
deleted file mode 100644
index 87151fad728..00000000000
--- a/sim/testsuite/sim/sh64/media/msubl.cgs
+++ /dev/null
@@ -1,14 +0,0 @@
-# sh testcase for msub.l $rm, $rn, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-	.global msubl
-msubl:
-	msub.l r0, r0, r0
-
-	pass
diff --git a/sim/testsuite/sim/sh64/media/msubsl.cgs b/sim/testsuite/sim/sh64/media/msubsl.cgs
deleted file mode 100644
index 014422ed8f3..00000000000
--- a/sim/testsuite/sim/sh64/media/msubsl.cgs
+++ /dev/null
@@ -1,14 +0,0 @@
-# sh testcase for msubs.l $rm, $rn, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-	.global msubsl
-msubsl:
-	msubs.l r0, r0, r0
-
-	pass
diff --git a/sim/testsuite/sim/sh64/media/msubsub.cgs b/sim/testsuite/sim/sh64/media/msubsub.cgs
deleted file mode 100644
index c92c77ee72e..00000000000
--- a/sim/testsuite/sim/sh64/media/msubsub.cgs
+++ /dev/null
@@ -1,14 +0,0 @@
-# sh testcase for msubs.ub $rm, $rn, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-	.global msubsub
-msubsub:
-	msubs.ub r0, r0, r0
-
-	pass
diff --git a/sim/testsuite/sim/sh64/media/msubsw.cgs b/sim/testsuite/sim/sh64/media/msubsw.cgs
deleted file mode 100644
index 83b76a1b4b3..00000000000
--- a/sim/testsuite/sim/sh64/media/msubsw.cgs
+++ /dev/null
@@ -1,14 +0,0 @@
-# sh testcase for msubs.w $rm, $rn, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-	.global msubsw
-msubsw:
-	msubs.w r0, r0, r0
-
-	pass
diff --git a/sim/testsuite/sim/sh64/media/msubw.cgs b/sim/testsuite/sim/sh64/media/msubw.cgs
deleted file mode 100644
index 9d5e639f240..00000000000
--- a/sim/testsuite/sim/sh64/media/msubw.cgs
+++ /dev/null
@@ -1,14 +0,0 @@
-# sh testcase for msub.w $rm, $rn, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-	.global msubw
-msubw:
-	msub.w r0, r0, r0
-
-	pass
diff --git a/sim/testsuite/sim/sh64/media/mulsl.cgs b/sim/testsuite/sim/sh64/media/mulsl.cgs
deleted file mode 100644
index d65c80cadf2..00000000000
--- a/sim/testsuite/sim/sh64/media/mulsl.cgs
+++ /dev/null
@@ -1,54 +0,0 @@
-# sh testcase for muls.l $rm, $rn, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-	.global mulsl
-init:
-	pta wrong, tr0
-	
-mulsl1:
-	movi 0, r0
-	muls.l r0, r0, r1
-	bnei r1, 0, tr0
-
-mulsl2:
-	movi 0, r0
-	movi 1, r1
-	muls.l r0, r1, r2
-	bnei r2, 0, tr0
-
-mulsl3:
-	movi 1, r0
-	movi 0, r1
-	muls.l r0, r1, r2
-	bnei r2, 0, tr0
-
-mulsl4:
-	movi 1, r0
-	movi 1, r1
-	muls.l r0, r1, r2
-	bnei r2, 1, tr0
-
-mulsl5:
-	movi 2, r0
-	movi 9, r1
-	muls.l r0, r1, r2
-	bnei r2, 18, tr0
-
-mulsl6:
-	movi 2, r0
-	movi -9, r1
-	muls.l r0, r1, r2
-	bnei r2, -18, tr0
-
-okay:
-	pass
-
-wrong:
-	fail
-	
diff --git a/sim/testsuite/sim/sh64/media/mulul.cgs b/sim/testsuite/sim/sh64/media/mulul.cgs
deleted file mode 100644
index b795cf79ec0..00000000000
--- a/sim/testsuite/sim/sh64/media/mulul.cgs
+++ /dev/null
@@ -1,54 +0,0 @@
-# sh testcase for mulu.l $rm, $rn, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-	.global mulul
-init:
-	pta wrong, tr0
-	
-mulul1:
-	movi 0, r0
-	mulu.l r0, r0, r1
-	bnei r1, 0, tr0
-
-mulul2:
-	movi 0, r0
-	movi 1, r1
-	mulu.l r0, r1, r2
-	bnei r2, 0, tr0
-
-mulul3:
-	movi 1, r0
-	movi 0, r1
-	mulu.l r0, r1, r2
-	bnei r2, 0, tr0
-
-mulul4:
-	movi 1, r0
-	movi 1, r1
-	mulu.l r0, r1, r2
-	bnei r2, 1, tr0
-
-mulul5:
-	movi 2, r0
-	movi 9, r1
-	mulu.l r0, r1, r2
-	bnei r2, 18, tr0
-
-mulul6:
-	movi 2, r0
-	movi -9, r1
-	mulu.l r0, r1, r2
-	beqi r2, -18, tr0
-
-okay:
-	pass
-
-wrong:
-	fail
-	
diff --git a/sim/testsuite/sim/sh64/media/nop.cgs b/sim/testsuite/sim/sh64/media/nop.cgs
deleted file mode 100644
index a0e57530542..00000000000
--- a/sim/testsuite/sim/sh64/media/nop.cgs
+++ /dev/null
@@ -1,10 +0,0 @@
-# sh testcase for nop -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-	nop
-	pass
diff --git a/sim/testsuite/sim/sh64/media/nsb.cgs b/sim/testsuite/sim/sh64/media/nsb.cgs
deleted file mode 100644
index 8b3cffef4a8..00000000000
--- a/sim/testsuite/sim/sh64/media/nsb.cgs
+++ /dev/null
@@ -1,66 +0,0 @@
-# sh testcase for nsb $rm, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-init:
-	pta wrong, tr0
-
-nsb0:
-	movi 0, r0
-	nsb r0, r1
-check0:
-	movi 63, r4
-	bne r1, r4, tr0
-
-nsb1:
-	# set up a loop target reg.
-	pta again1, tr1
-	# r4 holds the loop count.
-	movi 62, r4
-	movi 1, r0
-again1:
-	nsb r0, r1
-	bne r1, r4, tr0
-	# okay? go around again.
-	shlli r0, 1, r0
-	addi r4, -1, r4
-	bnei r4, 0, tr1
-
-nsb2:
-	# set up a loop target reg.
-	pta again2, tr1
-	# r4 holds the loop count.
-	movi 63, r4
-	movi -1, r0
-again2:
-	nsb r0, r1
-	bne r1, r4, tr0
-	# okay? go around again.
-	shlli r0, 1, r0
-	addi r4, -1, r4
-	bnei r4, 0, tr1
-
-nsb3:
-	movi 1, r0
-	shlli r0, 63, r0
-	nsb r0, r1
-check3:
-	movi 0, r4
-	bne r1, r4, tr0
-
-nsb4:
-	movi 7, r0
-	shlli r0, 61, r0
-	nsb r0, r1
-check4:
-	movi 2, r4
-	bne r1, r4, tr0
-
-okay:
-	pass
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/media/ocbi.cgs b/sim/testsuite/sim/sh64/media/ocbi.cgs
deleted file mode 100644
index b210216e3db..00000000000
--- a/sim/testsuite/sim/sh64/media/ocbi.cgs
+++ /dev/null
@@ -1,10 +0,0 @@
-# sh testcase for ocbi $rm, $disp6x32 -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-	ocbi r0, 0
-	pass
diff --git a/sim/testsuite/sim/sh64/media/ocbp.cgs b/sim/testsuite/sim/sh64/media/ocbp.cgs
deleted file mode 100644
index 9158c6f4518..00000000000
--- a/sim/testsuite/sim/sh64/media/ocbp.cgs
+++ /dev/null
@@ -1,10 +0,0 @@
-# sh testcase for ocbp $rm, $disp6x32 -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-	ocbp r0, 0
-	pass
diff --git a/sim/testsuite/sim/sh64/media/ocbwb.cgs b/sim/testsuite/sim/sh64/media/ocbwb.cgs
deleted file mode 100644
index 6addabcf461..00000000000
--- a/sim/testsuite/sim/sh64/media/ocbwb.cgs
+++ /dev/null
@@ -1,10 +0,0 @@
-# sh testcase for ocbwb $rm, $disp6x32 -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-	ocbwb r0, 0
-	pass
diff --git a/sim/testsuite/sim/sh64/media/or.cgs b/sim/testsuite/sim/sh64/media/or.cgs
deleted file mode 100644
index e06759225ba..00000000000
--- a/sim/testsuite/sim/sh64/media/or.cgs
+++ /dev/null
@@ -1,44 +0,0 @@
-# sh testcase for or $rm, $rn, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-init:
-	pta wrong, tr0
-
-or1:
-	movi 0, r0
-	or r0, r0, r1
-	bnei r1, 0, tr0
-
-or2:
-	movi 0, r0
-	movi 1, r1
-	or r0, r1, r2
-	bnei r2, 1, tr0
-
-or3:
-	movi 1, r0
-	movi 0, r1
-	or r0, r1, r2
-	bnei r2, 1, tr0
-
-or4:
-	movi 1, r0
-	or r0, r0, r1
-	bnei r1, 1, tr0
-
-or5:
-	movi 1, r0
-	shlli r0, 63, r0
-	movi 1, r1
-	or r0, r1, r2
-
-okay:
-	pass
-
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/media/ori.cgs b/sim/testsuite/sim/sh64/media/ori.cgs
deleted file mode 100644
index 7b2554227da..00000000000
--- a/sim/testsuite/sim/sh64/media/ori.cgs
+++ /dev/null
@@ -1,41 +0,0 @@
-# sh testcase for ori $rm, $imm10, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-init:
-	pta wrong, tr0
-
-or1:
-	movi 0, r0
-	ori r0, 0, r1
-	bnei r1, 0, tr0
-
-or2:
-	movi 0, r0
-	ori r0, 1, r2
-	bnei r2, 1, tr0
-
-or3:
-	movi 1, r0
-	ori r0, 0, r2
-	bnei r2, 1, tr0
-
-or4:
-	movi 1, r0
-	ori r0, 1, r1
-	bnei r1, 1, tr0
-
-or5:
-	movi 1, r0
-	shlli r0, 63, r0
-	ori r0, 1, r2
-
-okay:
-	pass
-
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/media/prefi.cgs b/sim/testsuite/sim/sh64/media/prefi.cgs
deleted file mode 100644
index 68d7bfe29a4..00000000000
--- a/sim/testsuite/sim/sh64/media/prefi.cgs
+++ /dev/null
@@ -1,10 +0,0 @@
-# sh testcase for prefi $rm, $disp6x32 -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-	prefi r0, 0
-	pass
diff --git a/sim/testsuite/sim/sh64/media/pta.cgs b/sim/testsuite/sim/sh64/media/pta.cgs
deleted file mode 100644
index 9f6484a8d4c..00000000000
--- a/sim/testsuite/sim/sh64/media/pta.cgs
+++ /dev/null
@@ -1,26 +0,0 @@
-# sh testcase for pta$likely $disp16, $tra -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-pta0:
-	pta foo, tr0
-pta1:
-	pta/l bar, tr1
-pta2:
-	pta/u baz, tr2
-	movi 0, r0
-	bnei r0, 1, tr2
-	fail
-
-foo:
-bar:
-baz:
-	pass
-	fail
-	fail
-	fail
-	fail
diff --git a/sim/testsuite/sim/sh64/media/ptabs.cgs b/sim/testsuite/sim/sh64/media/ptabs.cgs
deleted file mode 100644
index 0c01f838eb8..00000000000
--- a/sim/testsuite/sim/sh64/media/ptabs.cgs
+++ /dev/null
@@ -1,25 +0,0 @@
-# sh testcase for ptabs$likely $rn, $tra -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-	.global ptabs
-ptabs:
-	movi 16, r0
-	shlli r0, 8, r0
-	# Add one to stay in SHmedia mode.
-	addi r0, 29, r0
-	ptabs r0, tr0
-
-	# Now jump.
-	beqi r63, 0, tr0
-
-wrong:
-	fail
-
-okay:
-	pass
diff --git a/sim/testsuite/sim/sh64/media/ptb.cgs b/sim/testsuite/sim/sh64/media/ptb.cgs
deleted file mode 100644
index 129d6260439..00000000000
--- a/sim/testsuite/sim/sh64/media/ptb.cgs
+++ /dev/null
@@ -1,29 +0,0 @@
-# sh testcase for ptb$likely $disp16, $tra -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-ptb0:
-	ptb foo, tr0
-ptb:
-	ptb/l bar, tr1
-ptb2:
-	ptb/u baz, tr2
-	movi 0, r0
-	bnei r0, 1, tr2
-	fail
-
-.mode SHcompact
-
-foo:
-bar:
-baz:
-	trapa #253
-        trapa #254
-        trapa #254 
-        trapa #254 
-        trapa #254 
diff --git a/sim/testsuite/sim/sh64/media/ptrel.cgs b/sim/testsuite/sim/sh64/media/ptrel.cgs
deleted file mode 100644
index 7e5f19b1b9c..00000000000
--- a/sim/testsuite/sim/sh64/media/ptrel.cgs
+++ /dev/null
@@ -1,22 +0,0 @@
-# sh testcase for ptrel$likely $rn, $tra -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-	# Add one to stay in SHmedia mode.
-	movi 53, r0
-	ptrel r0, tr0
-	movi 0, r0
-	# Always branch.
-	bnei r0, 1, tr0
-	fail
-	fail
-	fail
-	fail
-	fail
-	pass
-	fail
-	fail
diff --git a/sim/testsuite/sim/sh64/media/putcfg.cgs b/sim/testsuite/sim/sh64/media/putcfg.cgs
deleted file mode 100644
index 85385754a48..00000000000
--- a/sim/testsuite/sim/sh64/media/putcfg.cgs
+++ /dev/null
@@ -1,10 +0,0 @@
-# sh testcase for putcfg $rm, $disp6, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-	putcfg r0, 0, r0
-	pass
diff --git a/sim/testsuite/sim/sh64/media/putcon.cgs b/sim/testsuite/sim/sh64/media/putcon.cgs
deleted file mode 100644
index 39dfc036280..00000000000
--- a/sim/testsuite/sim/sh64/media/putcon.cgs
+++ /dev/null
@@ -1,30 +0,0 @@
-# sh testcase for putcon $rm, $crj -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-init:
-	pta wrong, tr0
-
-putcon1:
-	movi 22, r0
-	putcon r0, cr0
-	getcon cr0, r1
-	bne r0, r1, tr0
-
-putcon2:
-	movi 12, r0
-	shlli r0, 35, r0
-	putcon r0, cr20
-	getcon cr20, r20
-	bne r0, r20, tr0
-
-okay:
-	pass
-
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/media/rte.cgs b/sim/testsuite/sim/sh64/media/rte.cgs
deleted file mode 100644
index e80f08541cc..00000000000
--- a/sim/testsuite/sim/sh64/media/rte.cgs
+++ /dev/null
@@ -1,11 +0,0 @@
-# sh testcase for rte -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-	# Unimplemented.
-	rte
-	pass
diff --git a/sim/testsuite/sim/sh64/media/shard.cgs b/sim/testsuite/sim/sh64/media/shard.cgs
deleted file mode 100644
index 029e52902a2..00000000000
--- a/sim/testsuite/sim/sh64/media/shard.cgs
+++ /dev/null
@@ -1,30 +0,0 @@
-# sh testcase for shard $rm, $rn, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-init:
-	pta wrong, tr0
-
-shard1:
-	movi 128, r0
-	movi 3, r1
-	shard r0, r1, r2
-	bnei r2, 16, tr0
-
-shard2:
-	movi -4, r0
-	movi 2, r1
-	shard r0, r1, r2
-	addi r2, 1, r2
-	bnei r2, 0, tr0
-
-okay:
-	pass
-
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/media/shardl.cgs b/sim/testsuite/sim/sh64/media/shardl.cgs
deleted file mode 100644
index d9acaa54f69..00000000000
--- a/sim/testsuite/sim/sh64/media/shardl.cgs
+++ /dev/null
@@ -1,45 +0,0 @@
-# sh testcase for shard.l $rm, $rn, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-init:
-	pta wrong, tr0
-
-shardl1:
-	movi 0x1020, r0
-	shlli r0, 8, r0
-	ori r0, 0x30, r0
-	shlli r0, 8, r0
-	ori r0, 0x40, r0
-	shlli r0, 8, r0
-	ori r0, 0x50, r0
-	shlli r0, 8, r0
-	ori r0, 0x60, r0
-	shlli r0, 8, r0
-	ori r0, 0x70, r0
-	shlli r0, 8, r0
-	ori r0, 0x80, r0
-
-	movi 1, r1
-	shard.l r0, r1, r0
-	shard.l r0, r1, r0
-	shard.l r0, r1, r0
-	shard.l r0, r1, r0
-	shard.l r0, r1, r0
-	shard.l r0, r1, r0
-	shard.l r0, r1, r0
-	shard.l r0, r1, r0
-	movi  20, r1
-	shard.l r0, r1, r0
-	bnei r0, 5, tr0
-
-okay:	
-	pass
-
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/media/shari.cgs b/sim/testsuite/sim/sh64/media/shari.cgs
deleted file mode 100644
index 3d3a650fb0c..00000000000
--- a/sim/testsuite/sim/sh64/media/shari.cgs
+++ /dev/null
@@ -1,28 +0,0 @@
-# sh testcase for shari $rm, $imm, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-init:
-	pta wrong, tr0
-
-shari1:
-	movi 128, r0
-	shari r0, 3, r2
-	bnei r2, 16, tr0
-
-shari2:
-	movi -4, r0
-	shari r0, 2, r2
-	addi r2, 1, r2
-	bnei r2, 0, tr0
-
-okay:
-	pass
-
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/media/sharil.cgs b/sim/testsuite/sim/sh64/media/sharil.cgs
deleted file mode 100644
index be946e0c84d..00000000000
--- a/sim/testsuite/sim/sh64/media/sharil.cgs
+++ /dev/null
@@ -1,45 +0,0 @@
-# sh testcase for shari.l $rm, $imm6, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-init:
-	pta wrong, tr0
-
-sharil1:
-	movi 0x1020, r0
-	shlli r0, 8, r0
-	ori r0, 0x30, r0
-	shlli r0, 8, r0
-	ori r0, 0x40, r0
-	shlli r0, 8, r0
-	ori r0, 0x50, r0
-	shlli r0, 8, r0
-	ori r0, 0x60, r0
-	shlli r0, 8, r0
-	ori r0, 0x70, r0
-	shlli r0, 8, r0
-	ori r0, 0x80, r0
-
-	movi 1, r1
-	shari.l r0, 1, r0
-	shari.l r0, 1, r0
-	shari.l r0, 1, r0
-	shari.l r0, 1, r0
-	shari.l r0, 1, r0
-	shari.l r0, 1, r0
-	shari.l r0, 1, r0
-	shari.l r0, 1, r0
-	shari.l r0, 20, r0
-	bnei r0, 5, tr0
-
-okay:	
-	pass
-
-wrong:
-	fail
-
diff --git a/sim/testsuite/sim/sh64/media/shlld.cgs b/sim/testsuite/sim/sh64/media/shlld.cgs
deleted file mode 100644
index 05d2da4cd68..00000000000
--- a/sim/testsuite/sim/sh64/media/shlld.cgs
+++ /dev/null
@@ -1,36 +0,0 @@
-# sh testcase for shlld $rm, $rn, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-init:
-	pta wrong, tr0
-
-shlld1:
-	movi 1, r0
-	movi 5, r1
-	shlld r0, r1, r2
-	movi 32, r7
-	bne r2, r7, tr0
-
-shlld2:
-	movi 2, r1
-	shlld r2, r1, r3
-	movi 128, r7
-	bne r3, r7, tr0
-
-shlld3:
-	movi 32, r1
-	shlld r0, r1, r7
-	shlld r7, r1, r2
-	bnei r2, 0, tr0
-
-okay:
-	pass
-
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/media/shlldl.cgs b/sim/testsuite/sim/sh64/media/shlldl.cgs
deleted file mode 100644
index 3d37f53a76b..00000000000
--- a/sim/testsuite/sim/sh64/media/shlldl.cgs
+++ /dev/null
@@ -1,34 +0,0 @@
-# sh testcase for shlld.l $rm, $rn, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-init:
-	pta wrong, tr0
-
-shlldl1:
-	movi 1, r0
-	shlli r0, 32, r0
-	ori r0, 1, r0
-	movi 1, r1
-	shlli r1, 7, r1
-	ori r1, 3, r1
-	
-	shlld.l r0, r1, r2
-	
-check1:
-	bnei r2, 8, tr0
-
-shlldl2:
-	movi 1, r0
-	movi 31, r1
-	shlld.l r0, r1, r2
-
-okay:
-	pass
-
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/media/shlli.cgs b/sim/testsuite/sim/sh64/media/shlli.cgs
deleted file mode 100644
index 9ab331c0930..00000000000
--- a/sim/testsuite/sim/sh64/media/shlli.cgs
+++ /dev/null
@@ -1,30 +0,0 @@
-# sh testcase for shlli $rm, $imm6, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-init:
-	pta wrong, tr0
-
-shlli:
-	movi 1, r0
-	shlli r0, 3, r0
-	bnei r0, 8, tr0
-
-shlli2:
-	shlli r0, 3, r0
-
-shlli3:
-	# Shift all bits out of sight.
-	shlli r0, 63, r0
-	bnei r0, 0, tr0
-
-okay:
-	pass
-
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/media/shllil.cgs b/sim/testsuite/sim/sh64/media/shllil.cgs
deleted file mode 100644
index 347acd64084..00000000000
--- a/sim/testsuite/sim/sh64/media/shllil.cgs
+++ /dev/null
@@ -1,14 +0,0 @@
-# sh testcase for shlli.l $rm, $imm6, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-	.global shllil
-shllil:
-	shlli.l r0, 0, r0
-
-	pass
diff --git a/sim/testsuite/sim/sh64/media/shlrd.cgs b/sim/testsuite/sim/sh64/media/shlrd.cgs
deleted file mode 100644
index 56f10bf1c0e..00000000000
--- a/sim/testsuite/sim/sh64/media/shlrd.cgs
+++ /dev/null
@@ -1,30 +0,0 @@
-# sh testcase for shlrd $rm, $rn, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-init:
-	pta wrong, tr0
-
-shlrd1:
-	movi 128, r0
-	movi 3, r1
-	shlrd r0, r1, r2
-	bnei r2, 16, tr0
-
-shlrd2:
-	movi -4, r0
-	movi 2, r1
-	shlrd r0, r1, r2
-	addi r2, 1, r2
-	beqi r2, 0, tr0
-
-okay:
-	pass
-
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/media/shlrdl.cgs b/sim/testsuite/sim/sh64/media/shlrdl.cgs
deleted file mode 100644
index 32b20c0a3cd..00000000000
--- a/sim/testsuite/sim/sh64/media/shlrdl.cgs
+++ /dev/null
@@ -1,37 +0,0 @@
-# sh testcase for shlrd.l $rm, $rn, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-init:
-	pta wrong, tr0
-
-shlrdl1:
-	movi 1, r0
-	shlli r0, 32, r0
-	ori r0, 8, r0
-	movi 1, r1
-	shlli r1, 7, r1
-	ori r1, 3, r1
-	
-	shlrd.l r0, r1, r2
-	
-check1:
-	bnei r2, 1, tr0
-
-shlrdl2:
-	movi 1, r0
-	shlli r0, 31, r0
-	movi 31, r1
-	shlld.l r0, r1, r2
-	bnei r2, 0, tr0
-
-okay:
-	pass
-
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/media/shlri.cgs b/sim/testsuite/sim/sh64/media/shlri.cgs
deleted file mode 100644
index 488cac9aec8..00000000000
--- a/sim/testsuite/sim/sh64/media/shlri.cgs
+++ /dev/null
@@ -1,28 +0,0 @@
-# sh testcase for shlri $rm, $imm, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-init:
-	pta wrong, tr0
-
-shlri1:
-	movi 128, r0
-	shlri r0, 3, r2
-	bnei r2, 16, tr0
-
-shlri2:
-	movi -4, r0
-	shlri r0, 2, r2
-	addi r2, 1, r2
-	beqi r2, 0, tr0
-
-okay:
-	pass
-
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/media/shlril.cgs b/sim/testsuite/sim/sh64/media/shlril.cgs
deleted file mode 100644
index bb1b2a6eaf0..00000000000
--- a/sim/testsuite/sim/sh64/media/shlril.cgs
+++ /dev/null
@@ -1,14 +0,0 @@
-# sh testcase for shlri.l $rm, $imm6, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-	.global shlril
-shlril:
-	shlri.l r0, 0, r0
-
-	pass
diff --git a/sim/testsuite/sim/sh64/media/shori.cgs b/sim/testsuite/sim/sh64/media/shori.cgs
deleted file mode 100644
index 5f02b7d2c5f..00000000000
--- a/sim/testsuite/sim/sh64/media/shori.cgs
+++ /dev/null
@@ -1,35 +0,0 @@
-# sh testcase for shori $imm16, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-init:
-	pta wrong, tr0
-
-shori1:
-	movi 1, r0
-	shori 7, r0
-	# check it.
-	andi r0, 15, r7
-	bnei r7, 7, tr0
-	shlri r0, 16, r0
-	bnei r0, 1, tr0
-
-shori2:
-	# Test for zero extension bug reported by
-	# Alexandre Oliva <aoliva@redhat.com>.
-	movi 0, r0
-	shori 65535, r0
-	# check it.
-	movi 0xffff, r1
-	bne r0, r1, tr0
-
-okay:
-	pass
-
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/media/sleep.cgs b/sim/testsuite/sim/sh64/media/sleep.cgs
deleted file mode 100644
index b4c35ee8f96..00000000000
--- a/sim/testsuite/sim/sh64/media/sleep.cgs
+++ /dev/null
@@ -1,10 +0,0 @@
-# sh testcase for sleep -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-	sleep
-	pass
diff --git a/sim/testsuite/sim/sh64/media/stb.cgs b/sim/testsuite/sim/sh64/media/stb.cgs
deleted file mode 100644
index 09de47b14a9..00000000000
--- a/sim/testsuite/sim/sh64/media/stb.cgs
+++ /dev/null
@@ -1,26 +0,0 @@
-# sh testcase for st.b $rm, $disp10, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-init:
-	movi -1, r7
-	xori r7, 13, r7
-	movi 40, r0
-	shlli r0, 8, r0
-
-stb1:
-	st.b r0, 0, r7
-
-stb2:
-	st.b r0, 1, r7
-
-stb3:
-	st.b r0, -1, r7
-
-okay:
-	pass
diff --git a/sim/testsuite/sim/sh64/media/sthil.cgs b/sim/testsuite/sim/sh64/media/sthil.cgs
deleted file mode 100644
index cfee28444f8..00000000000
--- a/sim/testsuite/sim/sh64/media/sthil.cgs
+++ /dev/null
@@ -1,55 +0,0 @@
-# sh testcase for sthi.l $rm, $disp6, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-init:
-	pta wrong, tr0
-
-	movi 40, r0
-	shlli r0, 8, r0
-	
-	movi 0x1020, r1
-	shlli r1, 8, r1
-	addi r1, 0x30, r1
-	shlli r1, 8, r1
-	addi r1, 0x40, r1
-	shlli r1, 8, r1
-	addi r1, 0x50, r1
-	shlli r1, 8, r1
-	addi r1, 0x60, r1
-	shlli r1, 8, r1
-	addi r1, 0x70, r1
-	shlli r1, 8, r1
-	addi r1, 0x80, r1
-
-sthil1:
-	sthi.l r0, 0, r1
-
-sthil2:
-	sthi.l r0, 1, r1
-
-sthil3:	
-	sthi.l r0, 2, r1
-
-sthil4:	
-	sthi.l r0, 3, r1
-
-sthil5:	
-	sthi.l r0, -1, r1
-
-sthil6:	
-	sthi.l r0, -2, r1
-
-sthil7:	
-	sthi.l r0, -3, r1
-
-okay:	
-	pass
-
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/media/sthiq.cgs b/sim/testsuite/sim/sh64/media/sthiq.cgs
deleted file mode 100644
index 6310d43e5ad..00000000000
--- a/sim/testsuite/sim/sh64/media/sthiq.cgs
+++ /dev/null
@@ -1,79 +0,0 @@
-# sh testcase for sthi.q $rm, $disp6, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-init:
-	pta wrong, tr0
-
-	movi 40, r0
-	shlli r0, 8, r0
-	
-	movi 0x1020, r1
-	shlli r1, 8, r1
-	addi r1, 0x30, r1
-	shlli r1, 8, r1
-	addi r1, 0x40, r1
-	shlli r1, 8, r1
-	addi r1, 0x50, r1
-	shlli r1, 8, r1
-	addi r1, 0x60, r1
-	shlli r1, 8, r1
-	addi r1, 0x70, r1
-	shlli r1, 8, r1
-	addi r1, 0x80, r1
-
-sthiq1:
-	sthi.q r0, 0, r1
-
-sthiq2:
-	sthi.q r0, 1, r1
-
-sthiq3:	
-	sthi.q r0, 2, r1
-
-sthiq4:	
-	sthi.q r0, 3, r1
-
-sthiq5:	
-	sthi.q r0, 4, r1
-
-sthiq6:	
-	sthi.q r0, 5, r1
-
-sthiq7:	
-	sthi.q r0, 6, r1
-
-sthiq8:	
-	sthi.q r0, 7, r1
-
-sthiq9:	
-	sthi.q r0, -1, r1
-
-sthiq10:	
-	sthi.q r0, -2, r1
-
-sthiq11:
-	sthi.q r0, -3, r1
-
-sthiq12:	
-	sthi.q r0, -4, r1
-
-sthiq13:	
-	sthi.q r0, -5, r1
-
-sthiq14:
-	sthi.q r0, -6, r1
-
-sthiq15:	
-	sthi.q r0, -7, r1
-
-okay:	
-	pass
-
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/media/stl.cgs b/sim/testsuite/sim/sh64/media/stl.cgs
deleted file mode 100644
index 8737e354c5b..00000000000
--- a/sim/testsuite/sim/sh64/media/stl.cgs
+++ /dev/null
@@ -1,26 +0,0 @@
-# sh testcase for st.l $rm, $disp10, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-init:
-	movi -1, r7
-	xori r7, 13, r7
-	movi 40, r0
-	shlli r0, 8, r0
-
-stl1:
-	st.l r0, 0, r7
-
-stl2:
-	st.l r0, 4, r7
-
-stl3:
-	st.l r0, -4, r7
-
-okay:
-	pass
diff --git a/sim/testsuite/sim/sh64/media/stlol.cgs b/sim/testsuite/sim/sh64/media/stlol.cgs
deleted file mode 100644
index f2d90552509..00000000000
--- a/sim/testsuite/sim/sh64/media/stlol.cgs
+++ /dev/null
@@ -1,14 +0,0 @@
-# sh testcase for stlo.l $rm, $disp6, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-	.global stlol
-stlol:
-	stlo.l r0, 0, r0
-
-	pass
diff --git a/sim/testsuite/sim/sh64/media/stloq.cgs b/sim/testsuite/sim/sh64/media/stloq.cgs
deleted file mode 100644
index 35c84c255cc..00000000000
--- a/sim/testsuite/sim/sh64/media/stloq.cgs
+++ /dev/null
@@ -1,14 +0,0 @@
-# sh testcase for stlo.q $rm, $disp6, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-	.global stloq
-stloq:
-	stlo.q r0, 0, r0
-
-	pass
diff --git a/sim/testsuite/sim/sh64/media/stq.cgs b/sim/testsuite/sim/sh64/media/stq.cgs
deleted file mode 100644
index e1af7956b84..00000000000
--- a/sim/testsuite/sim/sh64/media/stq.cgs
+++ /dev/null
@@ -1,26 +0,0 @@
-# sh testcase for st.q $rm, $disp10, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-init:
-	movi -1, r7
-	xori r7, 13, r7
-	movi 40, r0
-	shlli r0, 8, r0
-
-stq1:
-	st.q r0, 0, r7
-
-stq2:
-	st.q r0, 8, r7
-
-stq3:
-	st.q r0, -8, r7
-
-okay:
-	pass
diff --git a/sim/testsuite/sim/sh64/media/stw.cgs b/sim/testsuite/sim/sh64/media/stw.cgs
deleted file mode 100644
index 2446aa62795..00000000000
--- a/sim/testsuite/sim/sh64/media/stw.cgs
+++ /dev/null
@@ -1,26 +0,0 @@
-# sh testcase for st.q $rm, $disp10, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-init:
-	movi -1, r7
-	xori r7, 13, r7
-	movi 40, r0
-	shlli r0, 8, r0
-
-stw1:
-	st.w r0, 0, r7
-
-stw2:
-	st.w r0, 2, r7
-
-stw3:
-	st.w r0, -2, r7
-
-okay:
-	pass
diff --git a/sim/testsuite/sim/sh64/media/stxb.cgs b/sim/testsuite/sim/sh64/media/stxb.cgs
deleted file mode 100644
index 8ab2ae31d23..00000000000
--- a/sim/testsuite/sim/sh64/media/stxb.cgs
+++ /dev/null
@@ -1,29 +0,0 @@
-# sh testcase for stx.b $rm, $rn, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-init:
-	movi -1, r7
-	xori r7, 13, r7
-	movi 40, r0
-	shlli r0, 8, r0
-
-stxb1:
-	movi 0, r1
-	stx.b r0, r1, r7
-
-stxb2:
-	movi 1, r1
-	stx.b r0, r1, r7
-
-stxb3:
-	movi -1, r1
-	stx.b r0, r1, r7
-
-okay:
-	pass
diff --git a/sim/testsuite/sim/sh64/media/stxl.cgs b/sim/testsuite/sim/sh64/media/stxl.cgs
deleted file mode 100644
index 8ed2e366ab3..00000000000
--- a/sim/testsuite/sim/sh64/media/stxl.cgs
+++ /dev/null
@@ -1,29 +0,0 @@
-# sh testcase for stx.l $rm, $rn, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-init:
-	movi -1, r7
-	xori r7, 13, r7
-	movi 40, r0
-	shlli r0, 8, r0
-
-stxl1:
-	movi 0, r1
-	stx.l r0, r1, r7
-
-stxl2:
-	movi 4, r1
-	stx.l r0, r1, r7
-
-stxl3:
-	movi -4, r1
-	stx.l r0, r1, r7
-
-okay:
-	pass
diff --git a/sim/testsuite/sim/sh64/media/stxq.cgs b/sim/testsuite/sim/sh64/media/stxq.cgs
deleted file mode 100644
index 10759fd4414..00000000000
--- a/sim/testsuite/sim/sh64/media/stxq.cgs
+++ /dev/null
@@ -1,29 +0,0 @@
-# sh testcase for stx.q $rm, $rn, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-init:
-	movi -1, r7
-	xori r7, 13, r7
-	movi 40, r0
-	shlli r0, 8, r0
-
-stxq1:
-	movi 0, r1
-	stx.q r0, r1, r7
-
-stxq2:
-	movi 8, r1
-	stx.q r0, r1, r7
-
-stxq3:
-	movi -8, r1
-	stx.q r0, r1, r7
-
-okay:
-	pass
diff --git a/sim/testsuite/sim/sh64/media/stxw.cgs b/sim/testsuite/sim/sh64/media/stxw.cgs
deleted file mode 100644
index d03981146a2..00000000000
--- a/sim/testsuite/sim/sh64/media/stxw.cgs
+++ /dev/null
@@ -1,29 +0,0 @@
-# sh testcase for stx.w $rm, $rn, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-init:
-	movi -1, r7
-	xori r7, 13, r7
-	movi 40, r0
-	shlli r0, 8, r0
-
-stxw1:
-	movi 0, r1
-	stx.w r0, r1, r7
-
-stxw2:
-	movi 2, r1
-	stx.w r0, r1, r7
-
-stxw3:
-	movi -2, r1
-	stx.w r0, r1, r7
-
-okay:
-	pass
diff --git a/sim/testsuite/sim/sh64/media/sub.cgs b/sim/testsuite/sim/sh64/media/sub.cgs
deleted file mode 100644
index e5e7530100b..00000000000
--- a/sim/testsuite/sim/sh64/media/sub.cgs
+++ /dev/null
@@ -1,42 +0,0 @@
-# sh testcase for sub $rm, $rn, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-init:
-	pta wrong, tr0
-	movi 0, r0
-	movi 1, r1
-
-sub1:
-	# 0 - 0 = 0.
-	sub r0, r0, r2
-	bnei r2, 0, tr0
-
-sub2:
-	# 1 - 0 = 1.
-	sub r1, r0, r2
-	bnei r2, 1, tr0
-
-sub3:
-	# 0 - 1 = -1.
-	sub r0, r1, r2
-	addi r2, 1, r2
-	bnei r2, 0, tr0
-
-sub4:
-	# 5 - 2 = 3.
-	movi 5, r0
-	movi 2, r1
-	sub r0, r1, r2
-	bnei r2, 3, tr0
-
-okay:
-	pass
-
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/media/subl.cgs b/sim/testsuite/sim/sh64/media/subl.cgs
deleted file mode 100644
index 98abe59f666..00000000000
--- a/sim/testsuite/sim/sh64/media/subl.cgs
+++ /dev/null
@@ -1,38 +0,0 @@
-# sh testcase for sub.l $rm, $rn, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-
-init:
-	pta wrong, tr0
-
-subl1:
-	# Test that the top 32 bits are ignored.
-	movi 1, r0
-	shlli r0, 32, r0
-	ori r0, 7, r0
-
-	movi 1, r1
-	shlli r1, 32, r1
-	ori r1, 2, r1
-
-	sub.l r0, r1, r2
-	bnei r2, 5, tr0
-
-subl2:
-	# Test that 0 - 1 is sign extended.
-	movi 0, r0
-	movi 1, r1
-	sub.l r0, r1, r2
-	addi r2, 1, r2
-	bnei r2, 0, tr0
-
-okay:
-	pass
-
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/media/swapq.cgs b/sim/testsuite/sim/sh64/media/swapq.cgs
deleted file mode 100644
index 6f168b1ff48..00000000000
--- a/sim/testsuite/sim/sh64/media/swapq.cgs
+++ /dev/null
@@ -1,36 +0,0 @@
-# sh testcase for swap.q $rm, $rn, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-init:
-	movi 10, r0
-	shlli r0, 8, r0
-	ori r0, 20, r0
-	shlli r0, 8, r0
-	ori r0, 30, r0
-	shlli r0, 8, r0
-	ori r0, 40, r0
-	shlli r0, 8, r0
-	ori r0, 50, r0
-	shlli r0, 8, r0
-	ori r0, 60, r0
-	shlli r0, 8, r0
-	ori r0, 70, r0
-	shlli r0, 8, r0
-	ori r0, 80, r0
-
-	# Set up two address operands.
-	
-	movi 40, r1
-	shlli r1, 8, r1
-	movi 8, r2
-	
-swapq:
-	swap.q r1, r2, r0
-
-okay:	
-	pass
diff --git a/sim/testsuite/sim/sh64/media/synci.cgs b/sim/testsuite/sim/sh64/media/synci.cgs
deleted file mode 100644
index 65e06213a50..00000000000
--- a/sim/testsuite/sim/sh64/media/synci.cgs
+++ /dev/null
@@ -1,10 +0,0 @@
-# sh testcase for synci -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-	synci
-	pass
diff --git a/sim/testsuite/sim/sh64/media/synco.cgs b/sim/testsuite/sim/sh64/media/synco.cgs
deleted file mode 100644
index 2db6df343d4..00000000000
--- a/sim/testsuite/sim/sh64/media/synco.cgs
+++ /dev/null
@@ -1,10 +0,0 @@
-# sh testcase for synco -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-	synco
-	pass
diff --git a/sim/testsuite/sim/sh64/media/testutils.inc b/sim/testsuite/sim/sh64/media/testutils.inc
deleted file mode 100644
index d3b383a1efb..00000000000
--- a/sim/testsuite/sim/sh64/media/testutils.inc
+++ /dev/null
@@ -1,51 +0,0 @@
-# Support macros for the assembly test cases.
-
-	.macro start
-	.text
-	.global start
-start:
-	.endm
-
-	.macro pass
-	movi 253, r0
-	trapa r0
-	.endm
-
-	.macro fail
-	movi 254, r0
-	trapa r0
-	.endm
-
-	.macro _packb v1 v2 v3 v4 v5 v6 v7 v8 reg
-	movi \v1, \reg
-	shlli \reg, 8, \reg
-	addi \reg, \v2, \reg
-	shlli \reg, 8, \reg
-	addi \reg, \v3, \reg
-	shlli \reg, 8, \reg
-	addi \reg, \v4, \reg
-	shlli \reg, 8, \reg
-	addi \reg, \v5, \reg
-	shlli \reg, 8, \reg
-	addi \reg, \v6, \reg
-	shlli \reg, 8, \reg
-	addi \reg, \v7, \reg
-	shlli \reg, 8, \reg
-	addi \reg, \v8, \reg
-	.endm
-
-	.macro _packw v1 v2 v3 v4 reg
-	movi \v1, \reg
-	shlli \reg, 16, \reg
-	addi \reg, \v2, \reg
-	shlli \reg, 16, \reg
-	addi \reg, \v3, \reg
-	shlli \reg, 16, \reg
-	addi \reg, \v4, \reg
-	.endm
-
-	.macro _packl v1 v2 reg
-	movi \v1, \reg
-	shlli \reg, 32, \reg
-	addi \reg, \v2, \reg 
-	.endm
diff --git a/sim/testsuite/sim/sh64/media/trapa.cgs b/sim/testsuite/sim/sh64/media/trapa.cgs
deleted file mode 100644
index c961bac73ba..00000000000
--- a/sim/testsuite/sim/sh64/media/trapa.cgs
+++ /dev/null
@@ -1,11 +0,0 @@
-# sh testcase for trapa $rm -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-	# This performs a trap to emit "pass".
-	movi 253, r0
-	trapa r0
diff --git a/sim/testsuite/sim/sh64/media/xor.cgs b/sim/testsuite/sim/sh64/media/xor.cgs
deleted file mode 100644
index 80278f0a3e0..00000000000
--- a/sim/testsuite/sim/sh64/media/xor.cgs
+++ /dev/null
@@ -1,54 +0,0 @@
-# sh testcase for xor $rm, $rn, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-init:
-	pta wrong, tr0
-
-xor1:
-	# 0 xor 0 = 0.
-	movi 0, r0
-	movi 0, r1
-	xor r0, r1, r2
-	bnei r2, 0, tr0
-
-xor2:
-	# 0 xor 1 = 1.
-	movi 0, r0
-	movi 1, r1
-	xor r0, r1, r2
-	bnei r2, 1, tr0
-
-xor3:
-	# 1 xor 0 = 1.
-	movi 1, r0
-	movi 0, r1
-	xor r0, r1, r2
-	bnei r2, 1, tr0
-
-xor4:
-	# 1 xor 1 = 0.
-	movi 1, r0
-	movi 1, r1
-	xor r0, r1, r2
-	bnei r2, 0, tr0
-
-xor5:
-	movi 1, r0
-	shlli r0, 63, r0
-	ori r0, 1, r0
-	movi 3, r1
-	xor r0, r1, r2
-	andi r2, 255, r2
-	bnei r2, 2, tr0
-
-okay:	
-	pass
-
-wrong:
-	fail
-	
diff --git a/sim/testsuite/sim/sh64/media/xori.cgs b/sim/testsuite/sim/sh64/media/xori.cgs
deleted file mode 100644
index 0d4d96a779d..00000000000
--- a/sim/testsuite/sim/sh64/media/xori.cgs
+++ /dev/null
@@ -1,48 +0,0 @@
-# sh testcase for xori $rm, $imm6, $rd -*- Asm -*-
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-	.include "media/testutils.inc"
-
-	start
-init:
-	pta wrong, tr0
-
-xori1:
-	# 0 xor 0 = 0.
-	movi 0, r0
-	xori r0, 0, r2
-	bnei r2, 0, tr0
-
-xori2:
-	# 0 xor 1 = 1.
-	movi 0, r0
-	xori r0, 1, r2
-	bnei r2, 1, tr0
-
-xori3:
-	# 1 xor 0 = 1.
-	movi 1, r0
-	xori r0, 0, r2
-	bnei r2, 1, tr0
-
-xori4:
-	# 1 xor 1 = 0.
-	movi 1, r0
-	xori r0, 1, r2
-	bnei r2, 0, tr0
-
-xori5:
-	movi 1, r0
-	shlli r0, 63, r0
-	ori r0, 1, r0
-	xori r0, 3, r2
-	andi r2, 255, r2
-	bnei r2, 2, tr0
-
-okay:	
-	pass
-
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh64/misc/fr-dr.s b/sim/testsuite/sim/sh64/misc/fr-dr.s
deleted file mode 100644
index 52f0e136638..00000000000
--- a/sim/testsuite/sim/sh64/misc/fr-dr.s
+++ /dev/null
@@ -1,22 +0,0 @@
-# sh testcase for floating point register shared state (see below).
-# mach: all
-# as: -isa=shmedia
-# ld: -m shelf64
-
-# (fr, dr, fp, fv amd mtrx provide different views of the same architecrual state).
-# Hitachi SH-5 CPU volume 1, p. 15.
-
-	.include "media/testutils.inc"
-
-	start
-
-	movi 42, r0
-	fmov.ls r0, fr12
-	# save this reg.
-	fmov.s fr12, fr14
-
-	movi 42, r0
-	fmov.qd r0, dr12
-	
-okay:
-	pass